diff --git a/.gitignore b/.gitignore
index 2eadbdd5..0a6a87db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+src/chains/
 tests/downloads/
 
 # dependencies
diff --git a/package-lock.json b/package-lock.json
index 26cadf5a..f5910bfe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
     "": {
       "name": "ibc-dot-fun",
       "version": "0.1.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@cosmjs/amino": "^0.31.0",
         "@cosmjs/cosmwasm-stargate": "^0.31.0",
@@ -36,7 +37,7 @@
         "@radix-ui/react-dialog": "^1.0.4",
         "@radix-ui/react-toast": "^1.1.4",
         "@radix-ui/react-tooltip": "^1.0.6",
-        "@skip-router/core": "^0.1.0-rc12",
+        "@skip-router/core": "^0.1.0-rc13",
         "@tanstack/react-query": "^4.29.5",
         "@types/node": "20.1.2",
         "@types/react": "18.2.6",
@@ -5516,9 +5517,9 @@
       }
     },
     "node_modules/@skip-router/core": {
-      "version": "0.1.0-rc12",
-      "resolved": "https://registry.npmjs.org/@skip-router/core/-/core-0.1.0-rc12.tgz",
-      "integrity": "sha512-6YcT2+AonBsL4tCxd6Ebj3MkeCqvj2njfqaeQOA/nwN8xSplMf/3KH770wzEVFgpmBhA7tgn/mL7IiaYulEUmQ==",
+      "version": "0.1.0-rc13",
+      "resolved": "https://registry.npmjs.org/@skip-router/core/-/core-0.1.0-rc13.tgz",
+      "integrity": "sha512-117uNndVWgAVTGAPz3FbqwgqZZJY41ms9ceyxdpdz84eqY1sx5jjiCmEBwt7geFpzZ3DfzkK7pFrdXcT44NyXg==",
       "dependencies": {
         "@axelar-network/axelarjs-sdk": "^0.13.6",
         "@cosmjs/amino": "^0.31.1",
@@ -24077,9 +24078,9 @@
       }
     },
     "@skip-router/core": {
-      "version": "0.1.0-rc12",
-      "resolved": "https://registry.npmjs.org/@skip-router/core/-/core-0.1.0-rc12.tgz",
-      "integrity": "sha512-6YcT2+AonBsL4tCxd6Ebj3MkeCqvj2njfqaeQOA/nwN8xSplMf/3KH770wzEVFgpmBhA7tgn/mL7IiaYulEUmQ==",
+      "version": "0.1.0-rc13",
+      "resolved": "https://registry.npmjs.org/@skip-router/core/-/core-0.1.0-rc13.tgz",
+      "integrity": "sha512-117uNndVWgAVTGAPz3FbqwgqZZJY41ms9ceyxdpdz84eqY1sx5jjiCmEBwt7geFpzZ3DfzkK7pFrdXcT44NyXg==",
       "requires": {
         "@axelar-network/axelarjs-sdk": "^0.13.6",
         "@cosmjs/amino": "^0.31.1",
diff --git a/package.json b/package.json
index 9649fb9a..910b9c9e 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "dev": "next dev",
     "build": "next build",
+    "postinstall": "node ./scripts/generate.js",
     "start": "next start",
     "lint": "next lint",
     "test": "jest",
@@ -39,7 +40,7 @@
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.4",
     "@radix-ui/react-tooltip": "^1.0.6",
-    "@skip-router/core": "^0.1.0-rc12",
+    "@skip-router/core": "^0.1.0-rc13",
     "@tanstack/react-query": "^4.29.5",
     "@types/node": "20.1.2",
     "@types/react": "18.2.6",
diff --git a/scripts/generate.js b/scripts/generate.js
new file mode 100644
index 00000000..64cb8db9
--- /dev/null
+++ b/scripts/generate.js
@@ -0,0 +1,54 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+
+const { chains } = require("chain-registry");
+const fs = require("fs/promises");
+
+async function generate() {
+  /** @type {string[]} */
+  const chainIds = [];
+
+  /** @type {Record<string, any>} */
+  const chainRecord = {};
+
+  for (const chain of chains) {
+    if (!chain.chain_id) continue;
+    chainIds.push(chain.chain_id);
+    chainRecord[chain.chain_id] = chain;
+  }
+
+  await fs.mkdir("src/chains/", { recursive: true }).catch(() => {});
+
+  await fs.writeFile(
+    "src/chains/chainIds.js",
+    "module.exports=" + JSON.stringify(chainIds),
+    "utf-8",
+  );
+
+  const chainIdLiteralType = chainIds
+    .map((id) => `"${id}"`)
+    .concat("(string & {})")
+    .join("|");
+
+  const chainIdsDts = `/* eslint-disable */
+export type ChainId = ${chainIdLiteralType};
+declare const chainIds: ChainId[];
+export default chainIds;
+`;
+  await fs.writeFile("src/chains/chainIds.d.ts", chainIdsDts, "utf-8");
+
+  await fs.writeFile(
+    "src/chains/chainRecord.js",
+    "module.exports=" + JSON.stringify(chainRecord),
+    "utf-8",
+  );
+
+  const chainRecordDts = `/* eslint-disable */
+import { Chain } from "@chain-registry/types";
+import { ChainId } from "./chainIds";
+declare const chainRecord: Record<ChainId, Chain>;
+export default chainRecord;
+`;
+  await fs.writeFile("src/chains/chainRecord.d.ts", chainRecordDts, "utf-8");
+}
+
+void generate();
diff --git a/src/components/SwapWidget/SwapWidget.tsx b/src/components/SwapWidget/SwapWidget.tsx
index 5eebc18d..eda0f4d9 100644
--- a/src/components/SwapWidget/SwapWidget.tsx
+++ b/src/components/SwapWidget/SwapWidget.tsx
@@ -3,7 +3,6 @@ import { FC, Fragment } from "react";
 
 import { useChains as useSkipChains } from "@/api/queries";
 import { useAccount } from "@/hooks/useAccount";
-import { getExplorerLinkForTx } from "@/utils/utils";
 
 import AssetInput from "../AssetInput";
 import { ConnectedWalletButton } from "../ConnectedWalletButton";
@@ -36,6 +35,7 @@ export const SwapWidget: FC = () => {
     onSourceAssetChange,
     onDestinationChainChange,
     onDestinationAssetChange,
+    noRouteFound,
   } = useSwapWidget();
 
   const { address, isWalletConnected, wallet } = useAccount(
@@ -148,6 +148,11 @@ export const SwapWidget: FC = () => {
               numberOfTransactions={numberOfTransactions}
             />
           )}
+          {noRouteFound && (
+            <div className="bg-red-50 text-red-500 font-medium uppercase text-xs p-3 rounded-md flex items-center w-full text-left">
+              <p className="flex-1">No route found</p>
+            </div>
+          )}
           {sourceChain && !isWalletConnected && (
             <button
               className="bg-[#FF486E] text-white font-semibold py-4 rounded-md w-full transition-transform hover:scale-105 hover:rotate-1"
diff --git a/src/components/SwapWidget/useSwapWidget.ts b/src/components/SwapWidget/useSwapWidget.ts
index c68f593a..b733d190 100644
--- a/src/components/SwapWidget/useSwapWidget.ts
+++ b/src/components/SwapWidget/useSwapWidget.ts
@@ -34,7 +34,11 @@ export function useSwapWidget() {
     }
   }, [formValues.amountIn, formValues.sourceAsset]);
 
-  const { data: routeResponse, fetchStatus: routeFetchStatus } = useRoute(
+  const {
+    data: routeResponse,
+    fetchStatus: routeFetchStatus,
+    isError: routeQueryIsError,
+  } = useRoute(
     amountInWei,
     formValues.sourceAsset?.denom,
     formValues.sourceAsset?.chainID,
@@ -135,6 +139,7 @@ export function useSwapWidget() {
     onSourceAssetChange,
     onDestinationChainChange,
     onDestinationAssetChange,
+    noRouteFound: routeQueryIsError,
   };
 }
 
diff --git a/src/components/TransactionDialog/TransactionDialogContent.tsx b/src/components/TransactionDialog/TransactionDialogContent.tsx
index 65b2c0c0..c7b594b2 100644
--- a/src/components/TransactionDialog/TransactionDialogContent.tsx
+++ b/src/components/TransactionDialog/TransactionDialogContent.tsx
@@ -142,6 +142,7 @@ const TransactionDialogContent: FC<Props> = ({
       await skipRouter.executeRoute({
         route,
         userAddresses,
+        validateGasBalance: true,
         getCosmosSigner: async (chainID) => {
           const chain = chains.find((c) => c.chainID === chainID);
           if (!chain) {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 367ea0f1..2fecb760 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -29,33 +29,30 @@ import { LeapClient } from "@cosmos-kit/leap-extension/dist/extension/client";
 import { OfflineAminoSigner } from "@keplr-wallet/types";
 import { SkipRouter } from "@skip-router/core";
 import { useQuery } from "@tanstack/react-query";
-import * as chainRegistry from "chain-registry";
 import { SignMode } from "cosmjs-types/cosmos/tx/signing/v1beta1/signing";
 import { TxRaw } from "cosmjs-types/cosmos/tx/v1beta1/tx";
 import { erc20ABI, PublicClient, usePublicClient } from "wagmi";
 
 import { Chain } from "@/api/queries";
+import { ChainId } from "@/chains/chainIds";
+import chainRecord from "@/chains/chainRecord";
 import { multicall3ABI } from "@/constants/abis";
 import { EVM_CHAINS } from "@/constants/constants";
 import { useSkipClient } from "@/solve";
 
-export function getChainByID(chainID: string) {
-  return chainRegistry.chains.find(
-    (chain) => chain.chain_id === chainID,
-  ) as (typeof chainRegistry.chains)[0];
+export function getChainByID(chainID: ChainId) {
+  return chainRecord[chainID];
 }
 
 // cache clients to reuse later
 const STARGATE_CLIENTS: Record<string, StargateClient> = {};
 
-export async function getStargateClientForChainID(chainID: string) {
+export async function getStargateClientForChainID(chainID: ChainId) {
   if (STARGATE_CLIENTS[chainID]) {
     return STARGATE_CLIENTS[chainID];
   }
 
-  const chain = chainRegistry.chains.find(
-    (chain) => chain.chain_id === chainID,
-  );
+  const chain = getChainByID(chainID);
 
   if (!chain) {
     throw new Error(`Chain with ID ${chainID} not found`);
@@ -88,13 +85,11 @@ export async function getStargateClientForChainID(chainID: string) {
 }
 
 export async function getSigningStargateClientForChainID(
-  chainID: string,
+  chainID: ChainId,
   signer: OfflineSigner,
   options?: SigningStargateClientOptions,
 ) {
-  const chain = chainRegistry.chains.find(
-    (chain) => chain.chain_id === chainID,
-  );
+  const chain = getChainByID(chainID);
 
   if (!chain) {
     throw new Error(`Chain with ID ${chainID} not found`);
@@ -136,7 +131,7 @@ export async function getSigningStargateClientForChainID(
 
 export async function getAddressForCosmosChain(
   walletClient: WalletClient,
-  chainId: string,
+  chainId: ChainId,
 ) {
   if (walletClient.getOfflineSigner) {
     const signer = await walletClient.getOfflineSigner(chainId);
@@ -149,13 +144,11 @@ export async function getAddressForCosmosChain(
 }
 
 export async function getSigningCosmWasmClientForChainID(
-  chainID: string,
+  chainID: ChainId,
   signer: OfflineSigner,
   options?: SigningCosmWasmClientOptions,
 ) {
-  const chain = chainRegistry.chains.find(
-    (chain) => chain.chain_id === chainID,
-  );
+  const chain = getChainByID(chainID);
 
   if (!chain) {
     throw new Error(`Chain with ID ${chainID} not found`);
@@ -214,7 +207,7 @@ export async function enableChains(
   throw new Error("Unsupported wallet");
 }
 
-export async function getAccount(walletClient: WalletClient, chainId: string) {
+export async function getAccount(walletClient: WalletClient, chainId: ChainId) {
   if (walletClient.getAccount) {
     return walletClient.getAccount(chainId);
   }
@@ -224,7 +217,7 @@ export async function getAccount(walletClient: WalletClient, chainId: string) {
 
 export async function getOfflineSigner(
   walletClient: WalletClient,
-  chainId: string,
+  chainId: ChainId,
 ) {
   if (walletClient.getOfflineSignerDirect) {
     return walletClient.getOfflineSignerDirect(chainId);
@@ -235,7 +228,7 @@ export async function getOfflineSigner(
 
 export async function getOfflineSignerOnlyAmino(
   walletClient: WalletClient,
-  chainId: string,
+  chainId: ChainId,
 ) {
   if (walletClient.getOfflineSignerAmino) {
     const signer = walletClient.getOfflineSignerAmino(chainId);
@@ -245,7 +238,7 @@ export async function getOfflineSignerOnlyAmino(
   throw new Error("unsupported wallet");
 }
 
-export function getFee(chainID: string) {
+export function getFee(chainID: ChainId) {
   const chain = getChainByID(chainID);
 
   const feeInfo = chain.fees?.fee_tokens[0];
@@ -264,7 +257,7 @@ export function getFee(chainID: string) {
   return amountNeeded;
 }
 
-export async function isLedger(walletClient: WalletClient, chainID: string) {
+export async function isLedger(walletClient: WalletClient, chainID: ChainId) {
   if (walletClient instanceof KeplrClient && window.keplr) {
     const key = await window.keplr.getKey(chainID);
     return key.isNanoLedger;
@@ -289,7 +282,7 @@ export async function isLedger(walletClient: WalletClient, chainID: string) {
   return false;
 }
 
-export function getExplorerLinkForTx(chainID: string, txHash: string) {
+export function getExplorerLinkForTx(chainID: ChainId, txHash: string) {
   const evmChain = EVM_CHAINS.find((c) => c.id === parseInt(chainID));
 
   if (evmChain) {
@@ -388,7 +381,7 @@ export async function signAmino(
   });
 }
 
-export async function getBalancesByChain(address: string, chainID: string) {
+export async function getBalancesByChain(address: string, chainID: ChainId) {
   const client = await getStargateClientForChainID(chainID);
 
   const balances = await client.getAllBalances(address);
@@ -446,7 +439,7 @@ async function getEvmChainBalances(
   skipClient: SkipRouter,
   publicClient: PublicClient,
   address: string,
-  chainID: string,
+  chainID: ChainId,
 ) {
   const assets = await skipClient.assets({
     chainID,