diff --git a/fixtures/chains.ts b/fixtures/chains.ts
index 693eb1fc..8bbaad8a 100644
--- a/fixtures/chains.ts
+++ b/fixtures/chains.ts
@@ -1,9 +1,43 @@
 export const CHAINS_RESPONSE = {
   chains: [
     {
-      chain_name: "noble",
-      chain_id: "noble-1",
-      pfm_enabled: true,
+      chain_name: "Arbitrum",
+      chain_id: "42161",
+      pfm_enabled: false,
+      cosmos_sdk_version: "",
+      modules: {},
+      cosmos_module_support: {
+        authz: false,
+        feegrant: false,
+      },
+      supports_memo: false,
+      logo_uri:
+        "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrum/info/logo.png",
+      bech32_prefix: "",
+      fee_assets: [],
+      chain_type: "evm",
+    },
+    {
+      chain_name: "Polygon",
+      chain_id: "137",
+      pfm_enabled: false,
+      cosmos_sdk_version: "",
+      modules: {},
+      cosmos_module_support: {
+        authz: false,
+        feegrant: false,
+      },
+      supports_memo: false,
+      logo_uri:
+        "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/info/logo.png",
+      bech32_prefix: "",
+      fee_assets: [],
+      chain_type: "evm",
+    },
+    {
+      chain_name: "loyal",
+      chain_id: "loyal-main-02",
+      pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
       cosmos_module_support: {
@@ -12,52 +46,36 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/noble/images/stake.png",
-      bech32_prefix: "noble",
-      fee_assets: [
-        {
-          denom:
-            "ibc/EF48E6B1A1A19F47ECAEA62F5670C37C0580E86A9E88498B7E393EB6F49F33C0",
-          gas_price: {
-            low: "0.001",
-            average: "0.001",
-            high: "0.001",
-          },
-        },
-        {
-          denom: "uusdc",
-          gas_price: {
-            low: "0",
-            average: "0",
-            high: "0.01",
-          },
-        },
-      ],
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/loyal/images/lyl.png",
+      bech32_prefix: "loyal",
+      fee_assets: [],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "archway",
-      chain_id: "archway-1",
-      pfm_enabled: false,
+      chain_name: "osmosis",
+      chain_id: "osmosis-1",
+      pfm_enabled: true,
       cosmos_sdk_version: "",
       modules: {},
       cosmos_module_support: {
         authz: true,
-        feegrant: true,
+        feegrant: false,
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/archway/images/archway.png",
-      bech32_prefix: "archway",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/osmosis/images/osmosis-chain-logo.png",
+      bech32_prefix: "osmo",
       fee_assets: [
         {
-          denom: "aarch",
+          denom: "uosmo",
           gas_price: {
-            low: "1000000000000",
-            average: "1500000000000",
-            high: "2000000000000",
+            low: "0.0025",
+            average: "0.025",
+            high: "0.04",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "kichain",
@@ -74,10 +92,11 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/kichain/images/xki.png",
       bech32_prefix: "ki",
       fee_assets: [],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "planq",
-      chain_id: "planq_7070-2",
+      chain_name: "archway",
+      chain_id: "archway-1",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -87,18 +106,19 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/planq/images/planq.png",
-      bech32_prefix: "plq",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/archway/images/archway.png",
+      bech32_prefix: "archway",
       fee_assets: [
         {
-          denom: "aplanq",
+          denom: "aarch",
           gas_price: {
-            low: "30000000000",
-            average: "35000000000",
-            high: "40000000000",
+            low: "1000000000000",
+            average: "1500000000000",
+            high: "2000000000000",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "injective",
@@ -124,6 +144,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "akash",
@@ -145,22 +166,7 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
-    },
-    {
-      chain_name: "loyal",
-      chain_id: "loyal-main-02",
-      pfm_enabled: false,
-      cosmos_sdk_version: "",
-      modules: {},
-      cosmos_module_support: {
-        authz: true,
-        feegrant: true,
-      },
-      supports_memo: true,
-      logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/loyal/images/lyl.png",
-      bech32_prefix: "loyal",
-      fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "nyx",
@@ -186,6 +192,7 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "lum",
@@ -211,6 +218,68 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
+    },
+    {
+      chain_name: "noble",
+      chain_id: "noble-1",
+      pfm_enabled: true,
+      cosmos_sdk_version: "",
+      modules: {},
+      cosmos_module_support: {
+        authz: true,
+        feegrant: true,
+      },
+      supports_memo: true,
+      logo_uri:
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/noble/images/stake.png",
+      bech32_prefix: "noble",
+      fee_assets: [
+        {
+          denom:
+            "ibc/EF48E6B1A1A19F47ECAEA62F5670C37C0580E86A9E88498B7E393EB6F49F33C0",
+          gas_price: {
+            low: "0.001",
+            average: "0.001",
+            high: "0.001",
+          },
+        },
+        {
+          denom: "uusdc",
+          gas_price: {
+            low: "0",
+            average: "0",
+            high: "0.01",
+          },
+        },
+      ],
+      chain_type: "cosmos",
+    },
+    {
+      chain_name: "planq",
+      chain_id: "planq_7070-2",
+      pfm_enabled: false,
+      cosmos_sdk_version: "",
+      modules: {},
+      cosmos_module_support: {
+        authz: true,
+        feegrant: true,
+      },
+      supports_memo: true,
+      logo_uri:
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/planq/images/planq.png",
+      bech32_prefix: "plq",
+      fee_assets: [
+        {
+          denom: "aplanq",
+          gas_price: {
+            low: "30000000000",
+            average: "35000000000",
+            high: "40000000000",
+          },
+        },
+      ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "secret",
@@ -236,6 +305,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "fetchhub",
@@ -261,6 +331,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "quicksilver",
@@ -286,6 +357,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "assetmantle",
@@ -311,31 +383,24 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "osmosis",
-      chain_id: "osmosis-1",
-      pfm_enabled: true,
+      chain_name: "konstellation",
+      chain_id: "darchub",
+      pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
       cosmos_module_support: {
         authz: true,
-        feegrant: false,
+        feegrant: true,
       },
-      supports_memo: true,
+      supports_memo: false,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/osmosis/images/osmosis-chain-logo.png",
-      bech32_prefix: "osmo",
-      fee_assets: [
-        {
-          denom: "uosmo",
-          gas_price: {
-            low: "0.0025",
-            average: "0.025",
-            high: "0.04",
-          },
-        },
-      ],
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/konstellation/images/Konstellation-dark.png",
+      bech32_prefix: "darc",
+      fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "aura",
@@ -361,22 +426,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
-    },
-    {
-      chain_name: "konstellation",
-      chain_id: "darchub",
-      pfm_enabled: false,
-      cosmos_sdk_version: "",
-      modules: {},
-      cosmos_module_support: {
-        authz: true,
-        feegrant: true,
-      },
-      supports_memo: false,
-      logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/konstellation/images/Konstellation-dark.png",
-      bech32_prefix: "darc",
-      fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "umee",
@@ -402,6 +452,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "neutron",
@@ -418,6 +469,14 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/neutron/images/neutron-black-logo.png",
       bech32_prefix: "neutron",
       fee_assets: [
+        {
+          denom: "untrn",
+          gas_price: {
+            low: "0.01",
+            average: "0.01",
+            high: "0.01",
+          },
+        },
         {
           denom:
             "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9",
@@ -436,15 +495,8 @@ export const CHAINS_RESPONSE = {
             high: "0.05",
           },
         },
-        {
-          denom: "untrn",
-          gas_price: {
-            low: "0.01",
-            average: "0.01",
-            high: "0.01",
-          },
-        },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "passage",
@@ -461,10 +513,11 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/passage/images/pasg.png",
       bech32_prefix: "pasg",
       fee_assets: [],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "agoric",
-      chain_id: "agoric-3",
+      chain_name: "terra",
+      chain_id: "columbus-5",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -474,30 +527,31 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/agoric/images/Agoric-logo-color.png",
-      bech32_prefix: "agoric",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/terra/images/luna.png",
+      bech32_prefix: "terra",
       fee_assets: [
         {
-          denom: "ubld",
+          denom: "uluna",
           gas_price: {
-            low: "0.03",
-            average: "0.05",
-            high: "0.07",
+            low: "28.325",
+            average: "28.325",
+            high: "28.325",
           },
         },
         {
-          denom: "uist",
+          denom: "uusd",
           gas_price: {
-            low: "0.0034",
-            average: "0.007",
-            high: "0.02",
+            low: "0.75",
+            average: "0.75",
+            high: "0.75",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "terra",
-      chain_id: "columbus-5",
+      chain_name: "agoric",
+      chain_id: "agoric-3",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -507,30 +561,31 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/terra/images/luna.png",
-      bech32_prefix: "terra",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/agoric/images/Agoric-logo-color.png",
+      bech32_prefix: "agoric",
       fee_assets: [
         {
-          denom: "uluna",
+          denom: "ubld",
           gas_price: {
-            low: "28.325",
-            average: "28.325",
-            high: "28.325",
+            low: "0.03",
+            average: "0.05",
+            high: "0.07",
           },
         },
         {
-          denom: "uusd",
+          denom: "uist",
           gas_price: {
-            low: "0.75",
-            average: "0.75",
-            high: "0.75",
+            low: "0.0034",
+            average: "0.007",
+            high: "0.02",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "ununifi",
-      chain_id: "ununifi-beta-v1",
+      chain_name: "chihuahua",
+      chain_id: "chihuahua-1",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -540,9 +595,19 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/ununifi/images/ununifi.png",
-      bech32_prefix: "ununifi",
-      fee_assets: [],
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/chihuahua/images/huahua.png",
+      bech32_prefix: "chihuahua",
+      fee_assets: [
+        {
+          denom: "uhuahua",
+          gas_price: {
+            low: "500",
+            average: "1250",
+            high: "2000",
+          },
+        },
+      ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "nois",
@@ -568,6 +633,24 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
+    },
+    {
+      chain_name: "ununifi",
+      chain_id: "ununifi-beta-v1",
+      pfm_enabled: false,
+      cosmos_sdk_version: "",
+      modules: {},
+      cosmos_module_support: {
+        authz: true,
+        feegrant: true,
+      },
+      supports_memo: true,
+      logo_uri:
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/ununifi/images/ununifi.png",
+      bech32_prefix: "ununifi",
+      fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "canto",
@@ -593,6 +676,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "crescent",
@@ -611,7 +695,33 @@ export const CHAINS_RESPONSE = {
       fee_assets: [
         {
           denom:
-            "ibc/CD01034D6749F20AAC5330EF4FD8B8CA7C40F7527AB8C4A302FBD2A070852EE1",
+            "ibc/61DF64ADF65230540C14C63D64897BE08A3DC9A516A91425913F01240E2F432F",
+          gas_price: {
+            low: "0.008146",
+            average: "0.020365",
+            high: "0.024438",
+          },
+        },
+        {
+          denom: "ubcre",
+          gas_price: {
+            low: "0.0083",
+            average: "0.02075",
+            high: "0.0249",
+          },
+        },
+        {
+          denom:
+            "ibc/764D1629980B02BAFF3D25BEE4FB1E0C5E350AFA252FDF66E68E10D2179A826A",
+          gas_price: {
+            low: "200000000",
+            average: "500000000",
+            high: "600000000",
+          },
+        },
+        {
+          denom:
+            "ibc/9EC8A1701813BB7B73BFED2496009ABB2C8BF187E6CDFA788D77F68E08BC05CD",
           gas_price: {
             low: "0.000842",
             average: "0.002105",
@@ -638,21 +748,13 @@ export const CHAINS_RESPONSE = {
         },
         {
           denom:
-            "ibc/9EC8A1701813BB7B73BFED2496009ABB2C8BF187E6CDFA788D77F68E08BC05CD",
+            "ibc/CD01034D6749F20AAC5330EF4FD8B8CA7C40F7527AB8C4A302FBD2A070852EE1",
           gas_price: {
             low: "0.000842",
             average: "0.002105",
             high: "0.002526",
           },
         },
-        {
-          denom: "ucre",
-          gas_price: {
-            low: "0.01",
-            average: "0.025",
-            high: "0.03",
-          },
-        },
         {
           denom:
             "ibc/8F865D9760B482FF6254EDFEC1FF2F1273B9AB6873A7DE484F89639795D73D75",
@@ -662,14 +764,6 @@ export const CHAINS_RESPONSE = {
             high: "0.0012",
           },
         },
-        {
-          denom: "ubcre",
-          gas_price: {
-            low: "0.0083",
-            average: "0.02075",
-            high: "0.0249",
-          },
-        },
         {
           denom:
             "ibc/BFF0D3805B50D93E2FA5C0B2DDF7E0B30A631076CD80BC12A48C0E95404B4A41",
@@ -690,29 +784,20 @@ export const CHAINS_RESPONSE = {
         },
         {
           denom:
-            "ibc/764D1629980B02BAFF3D25BEE4FB1E0C5E350AFA252FDF66E68E10D2179A826A",
-          gas_price: {
-            low: "200000000",
-            average: "500000000",
-            high: "600000000",
-          },
-        },
-        {
-          denom:
-            "ibc/61DF64ADF65230540C14C63D64897BE08A3DC9A516A91425913F01240E2F432F",
+            "ibc/5A76568E079A31FA12165E4559BA9F1E9D4C97F9C2060B538C84DCD503815E30",
           gas_price: {
-            low: "0.008146",
-            average: "0.020365",
-            high: "0.024438",
+            low: "3350000000",
+            average: "8375000000",
+            high: "10050000000",
           },
         },
         {
           denom:
-            "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9",
+            "ibc/11F940BCDFD7CFBFD7EDA13F25DA95D308286D441209D780C9863FD4271514EB",
           gas_price: {
-            low: "0.000063",
-            average: "0.0001575",
-            high: "0.000189",
+            low: "0.002",
+            average: "0.005",
+            high: "0.006",
           },
         },
         {
@@ -726,11 +811,11 @@ export const CHAINS_RESPONSE = {
         },
         {
           denom:
-            "ibc/CA1261224952DF089EFD363D8DBB30A8AB6D8CD181E60EE9E68E432F8DE14FE3",
+            "ibc/C4CFF46FD6DE35CA4CF4CE031E643C8FDC9BA4B99AE598E9B0ED98FE3A2319F9",
           gas_price: {
-            low: "0.000842",
-            average: "0.002105",
-            high: "0.002526",
+            low: "0.000063",
+            average: "0.0001575",
+            high: "0.000189",
           },
         },
         {
@@ -744,23 +829,23 @@ export const CHAINS_RESPONSE = {
         },
         {
           denom:
-            "ibc/11F940BCDFD7CFBFD7EDA13F25DA95D308286D441209D780C9863FD4271514EB",
+            "ibc/CA1261224952DF089EFD363D8DBB30A8AB6D8CD181E60EE9E68E432F8DE14FE3",
           gas_price: {
-            low: "0.002",
-            average: "0.005",
-            high: "0.006",
+            low: "0.000842",
+            average: "0.002105",
+            high: "0.002526",
           },
         },
         {
-          denom:
-            "ibc/5A76568E079A31FA12165E4559BA9F1E9D4C97F9C2060B538C84DCD503815E30",
+          denom: "ucre",
           gas_price: {
-            low: "3350000000",
-            average: "8375000000",
-            high: "10050000000",
+            low: "0.01",
+            average: "0.025",
+            high: "0.03",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "xpla",
@@ -786,6 +871,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "bitsong",
@@ -802,6 +888,7 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/bitsong/images/btsg.png",
       bech32_prefix: "bitsong",
       fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "mars",
@@ -827,6 +914,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "gravitybridge",
@@ -852,17 +940,11 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
         {
-          denom:
-            "ibc/29A7122D024B5B8FA8A2EFBB4FA47272C25C8926AA005A96807127208082DAB3",
-          gas_price: null,
-        },
-        {
-          denom:
-            "ibc/00F2B62EB069321A454B708876476AFCD9C23C8C9C4A5A206DDF1CD96B645057",
+          denom: "gravity0xa670d7237398238DE01267472C6f13e5B8010FD1",
           gas_price: null,
         },
         {
-          denom: "gravity0x817bbDbC3e8A1204f3691d14bB44992841e3dB35",
+          denom: "gravity0xBA11D00c5f74255f56a5E366F4F77f5A186d7f55",
           gas_price: null,
         },
         {
@@ -882,115 +964,121 @@ export const CHAINS_RESPONSE = {
           },
         },
         {
-          denom: "gravity0xBA11D00c5f74255f56a5E366F4F77f5A186d7f55",
+          denom: "gravity0x817bbDbC3e8A1204f3691d14bB44992841e3dB35",
           gas_price: null,
         },
         {
-          denom: "gravity0x8D983cb9388EaC77af0474fA441C4815500Cb7BB",
+          denom: "gravity0xd8e2F184EedC79A9bdE9Eb7E34B0fF34e98692B7",
           gas_price: null,
         },
         {
-          denom: "gravity0x8a854288a5976036A725879164Ca3e91d30c6A1B",
+          denom:
+            "ibc/00F2B62EB069321A454B708876476AFCD9C23C8C9C4A5A206DDF1CD96B645057",
           gas_price: null,
         },
         {
-          denom: "gravity0xa670d7237398238DE01267472C6f13e5B8010FD1",
+          denom:
+            "ibc/29A7122D024B5B8FA8A2EFBB4FA47272C25C8926AA005A96807127208082DAB3",
           gas_price: null,
         },
         {
-          denom: "gravity0x514910771AF9Ca656af840dff83E8264EcF986CA",
+          denom: "gravity0x93581991f68DBaE1eA105233b67f7FA0D6BDeE7b",
           gas_price: null,
         },
         {
-          denom: "gravity0xA0b73E1Ff0B80914AB6fe0444E65848C4C34450b",
+          denom: "gravity0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE",
           gas_price: null,
         },
         {
           denom:
-            "ibc/2E5D0AC026AC1AFA65A23023BA4F24BB8DDF94F118EDC0BAD6F625BFC557CDED",
+            "ibc/5012B1C96F286E8A6604A87037CE51241C6F1CA195B71D1E261FCACB69FB6BC2",
           gas_price: null,
         },
         {
-          denom: "gravity0x93581991f68DBaE1eA105233b67f7FA0D6BDeE7b",
+          denom: "gravity0x514910771AF9Ca656af840dff83E8264EcF986CA",
           gas_price: null,
         },
         {
-          denom: "gravity0xa693B19d2931d498c5B318dF961919BB4aee87a5",
+          denom: "gravity0x8D983cb9388EaC77af0474fA441C4815500Cb7BB",
           gas_price: null,
         },
         {
-          denom: "gravity0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+          denom:
+            "ibc/D157AD8A50DAB0FC4EB95BBE1D9407A590FA2CDEE04C90A76C005089BF76E519",
           gas_price: null,
         },
         {
-          denom: "gravity0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE",
+          denom: "ugraviton",
           gas_price: null,
         },
         {
-          denom: "gravity0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
+          denom: "gravity0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC",
           gas_price: null,
         },
         {
-          denom: "gravity0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+          denom:
+            "ibc/2E5D0AC026AC1AFA65A23023BA4F24BB8DDF94F118EDC0BAD6F625BFC557CDED",
           gas_price: null,
         },
         {
-          denom: "gravity0xaea46A60368A7bD060eec7DF8CBa43b7EF41Ad85",
+          denom: "gravity0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
           gas_price: null,
         },
         {
-          denom: "gravity0xc3761EB917CD790B30dAD99f6Cc5b4Ff93C4F9eA",
+          denom: "gravity0x2C5Bcad9Ade17428874855913Def0A02D8bE2324",
           gas_price: null,
         },
         {
-          denom: "gravity0xfB5c6815cA3AC72Ce9F5006869AE67f18bF77006",
+          denom: "gravity0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
           gas_price: null,
         },
         {
-          denom:
-            "ibc/D157AD8A50DAB0FC4EB95BBE1D9407A590FA2CDEE04C90A76C005089BF76E519",
+          denom: "gravity0xaea46A60368A7bD060eec7DF8CBa43b7EF41Ad85",
           gas_price: null,
         },
         {
-          denom: "gravity0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",
+          denom: "gravity0xa693B19d2931d498c5B318dF961919BB4aee87a5",
           gas_price: null,
         },
         {
-          denom: "gravity0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
+          denom: "gravity0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
           gas_price: null,
         },
         {
-          denom: "gravity0x2C5Bcad9Ade17428874855913Def0A02D8bE2324",
+          denom: "gravity0x8a854288a5976036A725879164Ca3e91d30c6A1B",
           gas_price: null,
         },
         {
-          denom: "gravity0xB64ef51C888972c908CFacf59B47C1AfBC0Ab8aC",
+          denom: "gravity0xfB5c6815cA3AC72Ce9F5006869AE67f18bF77006",
           gas_price: null,
         },
         {
-          denom: "ugraviton",
+          denom: "gravity0xA0b73E1Ff0B80914AB6fe0444E65848C4C34450b",
           gas_price: null,
         },
         {
-          denom: "gravity0x853d955aCEf822Db058eb8505911ED77F175b99e",
+          denom: "gravity0xa47c8bf37f92aBed4A126BDA807A7b7498661acD",
           gas_price: null,
         },
         {
-          denom:
-            "ibc/0C273962C274B2C05B22D9474BFE5B84D6A6FCAD198CB9B0ACD35EA521A36606",
+          denom: "gravity0xc3761EB917CD790B30dAD99f6Cc5b4Ff93C4F9eA",
           gas_price: null,
         },
         {
-          denom: "gravity0xd8e2F184EedC79A9bdE9Eb7E34B0fF34e98692B7",
+          denom: "gravity0x01e0E2e61f554eCAaeC0cC933E739Ad90f24a86d",
           gas_price: null,
         },
         {
-          denom: "gravity0x01e0E2e61f554eCAaeC0cC933E739Ad90f24a86d",
+          denom: "gravity0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+          gas_price: null,
+        },
+        {
+          denom: "gravity0x853d955aCEf822Db058eb8505911ED77F175b99e",
           gas_price: null,
         },
         {
           denom:
-            "ibc/5012B1C96F286E8A6604A87037CE51241C6F1CA195B71D1E261FCACB69FB6BC2",
+            "ibc/0C273962C274B2C05B22D9474BFE5B84D6A6FCAD198CB9B0ACD35EA521A36606",
           gas_price: null,
         },
         {
@@ -1028,15 +1116,15 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
         {
-          denom: "gravity0x35a532d376FFd9a705d0Bb319532837337A398E7",
+          denom: "gravity0x6B175474E89094C44Da98b954EedeAC495271d0F",
           gas_price: null,
         },
         {
-          denom: "gravity0x45804880De22913dAFE09f4980848ECE6EcbAf78",
+          denom: "gravity0x35a532d376FFd9a705d0Bb319532837337A398E7",
           gas_price: null,
         },
         {
-          denom: "gravity0x6B175474E89094C44Da98b954EedeAC495271d0F",
+          denom: "gravity0x45804880De22913dAFE09f4980848ECE6EcbAf78",
           gas_price: null,
         },
         {
@@ -1048,6 +1136,7 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "cronos",
@@ -1064,6 +1153,7 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/cronos/images/cronos.png",
       bech32_prefix: "crc",
       fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "omniflixhub",
@@ -1089,6 +1179,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "jackal",
@@ -1114,6 +1205,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "nolus",
@@ -1139,6 +1231,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "meme",
@@ -1164,6 +1257,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "comdex",
@@ -1189,6 +1283,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "quasar",
@@ -1207,7 +1302,7 @@ export const CHAINS_RESPONSE = {
       fee_assets: [
         {
           denom:
-            "ibc/FA7775734CC73176B7425910DE001A1D2AD9B6D9E93129A5D0750EAD13E4E63A",
+            "ibc/0471F1C4E7AFD3F07702BEF6DC365268D64570F7C1FDC98EA6098DD6DE59817B",
           gas_price: {
             low: "0.01",
             average: "0.01",
@@ -1216,7 +1311,7 @@ export const CHAINS_RESPONSE = {
         },
         {
           denom:
-            "ibc/0471F1C4E7AFD3F07702BEF6DC365268D64570F7C1FDC98EA6098DD6DE59817B",
+            "ibc/FA7775734CC73176B7425910DE001A1D2AD9B6D9E93129A5D0750EAD13E4E63A",
           gas_price: {
             low: "0.01",
             average: "0.01",
@@ -1233,10 +1328,11 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "bitcanna",
-      chain_id: "bitcanna-1",
+      chain_name: "evmos",
+      chain_id: "evmos_9001-2",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -1246,22 +1342,23 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/bitcanna/images/bcna.png",
-      bech32_prefix: "bcna",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/evmos/images/evmos.png",
+      bech32_prefix: "evmos",
       fee_assets: [
         {
-          denom: "ubcna",
+          denom: "aevmos",
           gas_price: {
-            low: "0.001",
-            average: "0.0025",
-            high: "0.01",
+            low: "80000000000",
+            average: "80000000000",
+            high: "80000000000",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "evmos",
-      chain_id: "evmos_9001-2",
+      chain_name: "bitcanna",
+      chain_id: "bitcanna-1",
       pfm_enabled: false,
       cosmos_sdk_version: "",
       modules: {},
@@ -1271,18 +1368,19 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/evmos/images/evmos.png",
-      bech32_prefix: "evmos",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/bitcanna/images/bcna.png",
+      bech32_prefix: "bcna",
       fee_assets: [
         {
-          denom: "aevmos",
+          denom: "ubcna",
           gas_price: {
-            low: "80000000000",
-            average: "80000000000",
-            high: "80000000000",
+            low: "0.001",
+            average: "0.0025",
+            high: "0.01",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "sifchain",
@@ -1308,6 +1406,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "8ball",
@@ -1329,10 +1428,11 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "migaloo",
-      chain_id: "migaloo-1",
+      chain_name: "teritori",
+      chain_id: "teritori-1",
       pfm_enabled: true,
       cosmos_sdk_version: "",
       modules: {},
@@ -1342,22 +1442,23 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/migaloo/images/migaloo-light.png",
-      bech32_prefix: "migaloo",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/teritori/images/chain.png",
+      bech32_prefix: "tori",
       fee_assets: [
         {
-          denom: "uwhale",
+          denom: "utori",
           gas_price: {
-            low: "0.25",
-            average: "0.3",
-            high: "0.35",
+            low: "0",
+            average: "0.025",
+            high: "0.04",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
-      chain_name: "teritori",
-      chain_id: "teritori-1",
+      chain_name: "migaloo",
+      chain_id: "migaloo-1",
       pfm_enabled: true,
       cosmos_sdk_version: "",
       modules: {},
@@ -1367,18 +1468,19 @@ export const CHAINS_RESPONSE = {
       },
       supports_memo: true,
       logo_uri:
-        "https://raw.githubusercontent.com/cosmos/chain-registry/master/teritori/images/chain.png",
-      bech32_prefix: "tori",
+        "https://raw.githubusercontent.com/cosmos/chain-registry/master/migaloo/images/migaloo-light.png",
+      bech32_prefix: "migaloo",
       fee_assets: [
         {
-          denom: "utori",
+          denom: "uwhale",
           gas_price: {
-            low: "0",
-            average: "0.025",
-            high: "0.04",
+            low: "0.25",
+            average: "0.3",
+            high: "0.35",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "persistence",
@@ -1404,6 +1506,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "shentu",
@@ -1418,8 +1521,9 @@ export const CHAINS_RESPONSE = {
       supports_memo: true,
       logo_uri:
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/shentu/images/ctk.png",
-      bech32_prefix: "certik",
+      bech32_prefix: "shentu",
       fee_assets: [],
+      chain_type: "cosmos",
     },
     {
       chain_name: "axelar",
@@ -1445,6 +1549,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "stride",
@@ -1461,6 +1566,15 @@ export const CHAINS_RESPONSE = {
         "https://raw.githubusercontent.com/cosmos/chain-registry/master/stride/images/stride-chain-logo.png",
       bech32_prefix: "stride",
       fee_assets: [
+        {
+          denom:
+            "ibc/D24B4564BCD51D3D02D9987D92571EAC5915676A9BD6D9B0C1D0254CB8A5EA34",
+          gas_price: {
+            low: "0.001",
+            average: "0.01",
+            high: "0.1",
+          },
+        },
         {
           denom:
             "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
@@ -1494,16 +1608,8 @@ export const CHAINS_RESPONSE = {
             high: "0.05",
           },
         },
-        {
-          denom:
-            "ibc/D24B4564BCD51D3D02D9987D92571EAC5915676A9BD6D9B0C1D0254CB8A5EA34",
-          gas_price: {
-            low: "0.001",
-            average: "0.01",
-            high: "0.1",
-          },
-        },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "kujira",
@@ -1522,47 +1628,47 @@ export const CHAINS_RESPONSE = {
       fee_assets: [
         {
           denom:
-            "ibc/004EBF085BBED1029326D56BE8A2E67C08CECE670A94AC1947DF413EF5130EB2",
+            "ibc/295548A78785A1007F232DE286149A6FF512F180AF5657780FC89C009E2C348F",
           gas_price: null,
         },
         {
           denom:
-            "ibc/295548A78785A1007F232DE286149A6FF512F180AF5657780FC89C009E2C348F",
+            "ibc/A358D7F19237777AF6D8AD0E0F53268F8B18AE8A53ED318095C14D6D7F3B2DB5",
           gas_price: null,
         },
         {
           denom:
-            "ibc/47BD209179859CDE4A2806763D7189B6E6FE13A17880FE2B42DE1E6C1E329E23",
+            "ibc/EFF323CC632EC4F747C61BCE238A758EFDB7699C3226565F7C20DA06509D59A5",
           gas_price: null,
         },
         {
           denom:
-            "ibc/F3AA7EF362EC5E791FE78A0F4CCC69FEE1F9A7485EB1A8CAB3F6601C00522F10",
+            "ibc/004EBF085BBED1029326D56BE8A2E67C08CECE670A94AC1947DF413EF5130EB2",
           gas_price: null,
         },
         {
           denom:
-            "ibc/A358D7F19237777AF6D8AD0E0F53268F8B18AE8A53ED318095C14D6D7F3B2DB5",
+            "ibc/47BD209179859CDE4A2806763D7189B6E6FE13A17880FE2B42DE1E6C1E329E23",
           gas_price: null,
         },
         {
           denom:
-            "ibc/EFF323CC632EC4F747C61BCE238A758EFDB7699C3226565F7C20DA06509D59A5",
+            "factory/kujira1qk00h5atutpsv900x202pxx42npjr9thg58dnqpa72f2p7m2luase444a7/uusk",
           gas_price: null,
         },
         {
           denom:
-            "factory/kujira1qk00h5atutpsv900x202pxx42npjr9thg58dnqpa72f2p7m2luase444a7/uusk",
+            "ibc/F3AA7EF362EC5E791FE78A0F4CCC69FEE1F9A7485EB1A8CAB3F6601C00522F10",
           gas_price: null,
         },
         {
           denom:
-            "ibc/1B38805B1C75352B28169284F96DF56BDEBD9E8FAC005BDCC8CF0378C82AA8E7",
+            "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
           gas_price: null,
         },
         {
           denom:
-            "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
+            "ibc/1B38805B1C75352B28169284F96DF56BDEBD9E8FAC005BDCC8CF0378C82AA8E7",
           gas_price: null,
         },
         {
@@ -1580,6 +1686,7 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "terra2",
@@ -1605,6 +1712,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "cosmoshub",
@@ -1624,12 +1732,13 @@ export const CHAINS_RESPONSE = {
         {
           denom: "uatom",
           gas_price: {
-            low: "0.01",
+            low: "0.0013",
             average: "0.025",
             high: "0.03",
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "kava",
@@ -1655,6 +1764,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "sommelier",
@@ -1676,6 +1786,7 @@ export const CHAINS_RESPONSE = {
           gas_price: null,
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "cryptoorgchain",
@@ -1701,6 +1812,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "stargaze",
@@ -1726,6 +1838,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
     {
       chain_name: "juno",
@@ -1760,6 +1873,7 @@ export const CHAINS_RESPONSE = {
           },
         },
       ],
+      chain_type: "cosmos",
     },
   ],
 };
diff --git a/src/components/__tests__/SwapWidget.test.tsx b/src/components/__tests__/SwapWidget.test.tsx
index db251732..5a994a59 100644
--- a/src/components/__tests__/SwapWidget.test.tsx
+++ b/src/components/__tests__/SwapWidget.test.tsx
@@ -4,12 +4,16 @@ import { setupServer } from "msw/node";
 import { act, fireEvent, render, screen, waitFor, within } from "@/test";
 
 import { ASSETS_RESPONSE } from "../../../fixtures/assets";
+import { CHAINS_RESPONSE } from "../../../fixtures/chains";
 import { SwapWidget } from "../SwapWidget";
 import { LAST_SOURCE_CHAIN_KEY } from "../SwapWidget/useSwapWidget";
 
 const API_URL = "https://solve-dev.skip.money";
 
 const handlers = [
+  rest.get(`${API_URL}/v1/info/chains`, (_, res, ctx) => {
+    return res(ctx.status(200), ctx.json(CHAINS_RESPONSE));
+  }),
   rest.get(`${API_URL}/v1/fungible/assets`, (_, res, ctx) => {
     return res(ctx.status(200), ctx.json(ASSETS_RESPONSE));
   }),
@@ -367,7 +371,7 @@ describe("SwapWidget", () => {
     );
   });
 
-  it("displays the connect destination wallet button if the source chain and destination chain are not the same chain type", async () => {
+  it("does not show the connect destination wallet button if the source chain and destination chain are the same chain type", async () => {
     await act(async () => {
       render(<SwapWidget />);
     });
@@ -404,6 +408,22 @@ describe("SwapWidget", () => {
     expect(
       screen.queryByTestId("destination-wallet-btn"),
     ).not.toBeInTheDocument();
+  });
+
+  it("displays the connect destination wallet button if the source chain and destination chain are not the same chain type", async () => {
+    await act(async () => {
+      render(<SwapWidget />);
+    });
+
+    const sourceAssetSection = await screen.findByTestId("source");
+    const destinationAssetSection = await screen.findByTestId("destination");
+
+    const sourceChainButton =
+      within(sourceAssetSection).getByText("Cosmos Hub");
+
+    const destinationChainButton = within(destinationAssetSection).getByText(
+      "Select Chain",
+    );
 
     // select Arbitrum and Osmosis
     await act(() => {