@skip-go/widget 3.13.0 → 3.14.1

package/build/{index-CHcxuRst.js → index-DESptRlh.js}

@@ -3,10 +3,10 @@ import o, { useContext, useState, useMemo, useEffect, useRef, useDebugValue, cre
 import { Scope } from "react-shadow-scope";
 import { atom as atom$1, useAtomValue, useAtom, useSetAtom, createStore, Provider } from "jotai";
 import NiceModal, { useModal } from "@ebay/nice-modal-react";
-import { assets, chains, bridges, venues, ChainType, getSigningStargateClient, route, executeRoute, balances, BridgeType, FeeType, GAS_STATION_CHAIN_IDS, subscribeToRouteStatus, setClientOptions } from "@skip-go/client";
+import { assets, chains, bridges, venues, ChainType, getSigningStargateClient, route, balances, executeMultipleRoutes, executeRoute, BridgeType, FeeType, GAS_STATION_CHAIN_IDS, subscribeToRouteStatus, setClientOptions } from "@skip-go/client";
 import { atomWithQuery, atomWithMutation } from "jotai-tanstack-query";
 import pluralize from "pluralize";
-import { track, setUserId, init, add } from "@amplitude/analytics-browser";
+import { track, init, add, setUserId } from "@amplitude/analytics-browser";
 import { atomEffect } from "jotai-effect";
 import { WalletType, isWalletConnect, useActiveWalletType, useDisconnect, getWallet, checkWallet, connect, useAccount as useAccount$1, getChainInfo as getChainInfo$1, GrazProvider } from "graz";
 import { createPenumbraClient } from "@penumbra-zone/client";
@@ -1765,8 +1765,8 @@ const flexProps = lt`
   ${({ flexDirection }) => flexDirection && `flex-direction: ${flexDirection}`};
 `;
 const Row = dt.div`
-  ${({ width }) => width && `width: ${width}px`};
-  ${({ height }) => height && `height: ${height}px`};
+  ${({ width }) => width !== void 0 && `width: ${typeof width === "number" ? `${width}px` : width}`};
+  ${({ height }) => height !== void 0 && `height: ${typeof height === "number" ? `${height}px` : height}`};
   flex-direction: row;
   ${flexProps};
 `;
@@ -1774,10 +1774,24 @@ const Column = dt(Row)`
   flex-direction: column;
 `;
 const Spacer = dt.div`
-  ${({ width }) => width && `width: ${width}px`};
-  ${({ height }) => height && `height: ${height}px`};
+  position: relative;
   flex-shrink: 0;
   flex-grow: 0;
+  ${({ width }) => width !== void 0 && `width: ${typeof width === "number" ? `${width}px` : width}`};
+  ${({ height }) => height !== void 0 && `height: ${typeof height === "number" ? `${height}px` : height}`};
+
+  ${({ showLine, lineColor = "#ccc", lineThickness = 1 }) => showLine && `
+      &::after {
+        content: '';
+        position: absolute;
+        top: 50%;
+        left: 0;
+        width: 100%;
+        height: ${lineThickness}px;
+        background-color: ${lineColor};
+        transform: translateY(-50%);
+      }
+    `}
 `;
 const withBoundProps = (WrappedComponent, boundProps) => {
   return (props) => {
@@ -2193,7 +2207,7 @@ const Text = dt(SmallText)`
   ${({ useWindowsTextHack }) => useWindowsTextHack && isWindows() ? "margin-bottom: -4px" : ""};
   ${textProps}
 `;
-const TextButton = dt(Text).attrs({ as: "button" })`
+dt(Text).attrs({ as: "button" })`
   ${removeButtonStyles}
   cursor: pointer;
 `;
@@ -4143,11 +4157,7 @@ function shouldReduceFontSize(value) {
   return valueWithoutCommas.length >= 14;
 }
 const formatDisplayAmount = (input, options = {}) => {
-  const {
-    showLessThanSign = true,
-    decimals = DEFAULT_DECIMAL_PLACES,
-    abbreviate = true
-  } = options;
+  const { showLessThanSign = true, decimals = DEFAULT_DECIMAL_PLACES, abbreviate = true } = options;
   if (input === void 0) {
     return "";
   }
@@ -5950,6 +5960,47 @@ const _mainnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "axone-1",
+    currencies: [
+      {
+        coinDenom: "axone",
+        coinMinimalDenom: "uaxone",
+        coinDecimals: 6
+      }
+    ],
+    rest: "https://api.axone.cumulo.com.es",
+    rpc: "https://rpc.axone.cumulo.com.es",
+    bech32Config: {
+      bech32PrefixAccAddr: "axone",
+      bech32PrefixAccPub: "axonepub",
+      bech32PrefixValAddr: "axonevaloper",
+      bech32PrefixValPub: "axonevaloperpub",
+      bech32PrefixConsAddr: "axonevalcons",
+      bech32PrefixConsPub: "axonevalconspub"
+    },
+    chainName: "axone",
+    feeCurrencies: [
+      {
+        coinDenom: "axone",
+        coinMinimalDenom: "uaxone",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 1e-3,
+          average: 5e-3,
+          high: 0.01
+        }
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "axone",
+      coinMinimalDenom: "uaxone",
+      coinDecimals: 6
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "bbn-1",
     currencies: [
@@ -6300,11 +6351,6 @@ const _mainnetChains = [
         coinDenom: "badge",
         coinMinimalDenom: "ubadge",
         coinDecimals: 9
-      },
-      {
-        coinDenom: "stake",
-        coinMinimalDenom: "ustake",
-        coinDecimals: 9
       }
     ],
     rest: "http://134.122.12.165:1317",
@@ -8712,6 +8758,16 @@ const _mainnetChains = [
           average: 0.025,
           high: 0.03
         }
+      },
+      {
+        coinDenom: "xrp",
+        coinMinimalDenom: "ibc/8464A63954C0350A26C8588E20719F3A0AC8705E4CA0F7450B60C3F16B2D3421",
+        coinDecimals: 18,
+        gasPriceStep: {
+          low: 11395e6,
+          average: 21395e6,
+          high: 31395e6
+        }
       }
     ],
     stakeCurrency: {
@@ -10238,6 +10294,11 @@ const _mainnetChains = [
         coinDenom: "Hydro Wrapped hINJ",
         coinMinimalDenom: "factory/inj14ejqjyq8um4p3xfqj74yld5waqljf88f9eneuk/inj18luqttqyckgpddndh8hvaq25d5nfwjc78m56lc",
         coinDecimals: 18
+      },
+      {
+        coinDenom: "wbtc",
+        coinMinimalDenom: "ibc/0E293A7622DC9A6439DB60E6D234B5AF446962E27CA3AB44D0590603DFF6968E",
+        coinDecimals: 8
       }
     ],
     rest: "https://6d0ff611-9009-4bd1-a7a7-acec7c70d454.injective-1.mesa-rest.newmetric.xyz",
@@ -11261,6 +11322,26 @@ const _mainnetChains = [
           average: 0.025,
           high: 0.03
         }
+      },
+      {
+        coinDenom: "kUSD",
+        coinMinimalDenom: "ukusd",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 0.01,
+          average: 0.025,
+          high: 0.03
+        }
+      },
+      {
+        coinDenom: "USDC",
+        coinMinimalDenom: "ibc/295548A78785A1007F232DE286149A6FF512F180AF5657780FC89C009E2C348F",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 0.01,
+          average: 0.025,
+          high: 0.03
+        }
       }
     ],
     stakeCurrency: {
@@ -12920,12 +13001,12 @@ const _mainnetChains = [
     currencies: [
       {
         coinDenom: "mtgbp",
-        coinMinimalDenom: "mtgbp",
-        coinDecimals: 0
+        coinMinimalDenom: "umtgbp",
+        coinDecimals: 6
       }
     ],
     rest: "https://lcd.mtgbp.com",
-    rpc: "https://rcp.mtgbp.com",
+    rpc: "https://rpc.mtgbp.com",
     bech32Config: {
       bech32PrefixAccAddr: "mtgbp",
       bech32PrefixAccPub: "mtgbppub",
@@ -12938,22 +13019,22 @@ const _mainnetChains = [
     feeCurrencies: [
       {
         coinDenom: "mtgbp",
-        coinMinimalDenom: "mtgbp",
-        coinDecimals: 0,
+        coinMinimalDenom: "umtgbp",
+        coinDecimals: 6,
         gasPriceStep: {
-          low: 1e-6,
-          average: 5e-6,
-          high: 1e-4
+          low: 0.025,
+          average: 0.03,
+          high: 0.035
         }
       }
     ],
     stakeCurrency: {
       coinDenom: "mtgbp",
-      coinMinimalDenom: "mtgbp",
-      coinDecimals: 0
+      coinMinimalDenom: "umtgbp",
+      coinDecimals: 6
     },
     bip44: {
-      coinType: 1179993441
+      coinType: 118
     }
   },
   {
@@ -13326,6 +13407,11 @@ const _mainnetChains = [
         coinDenom: "ltc",
         coinMinimalDenom: "ibc/C4C791209A16419A4BB3C3177E5E8AE4477C9D7457842E7F531F91C513FA79A0",
         coinDecimals: 8
+      },
+      {
+        coinDenom: "TAB",
+        coinMinimalDenom: "factory/neutron1r5qx58l3xx2y8gzjtkqjndjgx69mktmapl45vns0pa73z0zpn7fqgltnll/TAB",
+        coinDecimals: 6
       }
     ],
     rest: "https://rest-lb.neutron.org",
@@ -17085,6 +17171,21 @@ const _mainnetChains = [
         coinDenom: "XRP",
         coinMinimalDenom: "ibc/46EB46DB30D3BBC6F404A9232C09785F36D40DA05C662A8E295712ECBAFF1609",
         coinDecimals: 18
+      },
+      {
+        coinDenom: "titan",
+        coinMinimalDenom: "ibc/87B7A56E83C08DBFD567F0DE6463EC54181B8B819B3CAD7A584C47D59A2A05CF",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "ebaby",
+        coinMinimalDenom: "factory/osmo12r3yc76u9lxe33yemstatnw8602culdjzrtr8lmnpycmd3z7d4jsxx60kc/FwNhFaW3zLxoLUgXCdWjqBzcvGNPaB7B2XZqm2xgrB93",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "FOST",
+        coinMinimalDenom: "factory/osmo1q77cw0mmlluxu0wr29fcdd0tdnh78gzhkvhe4n6ulal9qvrtu43qtd0nh8/fost",
+        coinDecimals: 6
       }
     ],
     rest: "https://lcd.osmosis.zone/",
@@ -19364,6 +19465,16 @@ const _mainnetChains = [
         coinMinimalDenom: "lp:33:upryzm",
         coinDecimals: 6
       },
+      {
+        coinDenom: "lp:34:pryzmypt-pryzm",
+        coinMinimalDenom: "lp:34:upryzmypt-upryzm",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "lp:35:pryzm-usdc",
+        coinMinimalDenom: "lp:35:upryzm-uusdc",
+        coinDecimals: 6
+      },
       {
         coinDenom: "lp:36:susds",
         coinMinimalDenom: "lp:36:asusds",
@@ -19422,6 +19533,26 @@ const _mainnetChains = [
     },
     chainName: "pryzm",
     feeCurrencies: [
+      {
+        coinDenom: "auuu",
+        coinMinimalDenom: "factory/pryzm1jnhcsa5ddjsjq2t97v6a82z542rduxvtw6wd9h/uauuu",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 0.1,
+          average: 0.15,
+          high: 0.2
+        }
+      },
+      {
+        coinDenom: "pryzm",
+        coinMinimalDenom: "upryzm",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 0.02,
+          average: 0.03,
+          high: 0.04
+        }
+      },
       {
         coinDenom: "atom",
         coinMinimalDenom: "ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2",
@@ -19482,16 +19613,6 @@ const _mainnetChains = [
           high: 0.04
         }
       },
-      {
-        coinDenom: "auuu",
-        coinMinimalDenom: "factory/pryzm1jnhcsa5ddjsjq2t97v6a82z542rduxvtw6wd9h/uauuu",
-        coinDecimals: 6,
-        gasPriceStep: {
-          low: 0.01,
-          average: 0.015,
-          high: 0.02
-        }
-      },
       {
         coinDenom: "dydx",
         coinMinimalDenom: "ibc/F8CA5236869F819BC006EEF088E67889A26E4140339757878F0F4E229CDDA858",
@@ -19629,12 +19750,12 @@ const _mainnetChains = [
     currencies: [
       {
         coinDenom: "qfs",
-        coinMinimalDenom: "qfs",
-        coinDecimals: 0
+        coinMinimalDenom: "uqfs",
+        coinDecimals: 6
       }
     ],
     rest: "https://lcd.qfsone.com",
-    rpc: "https://rcp.qfsone.com",
+    rpc: "https://rpc.qfsone.com",
     bech32Config: {
       bech32PrefixAccAddr: "qfs",
       bech32PrefixAccPub: "qfspub",
@@ -19647,22 +19768,22 @@ const _mainnetChains = [
     feeCurrencies: [
       {
         coinDenom: "qfs",
-        coinMinimalDenom: "qfs",
-        coinDecimals: 0,
+        coinMinimalDenom: "uqfs",
+        coinDecimals: 6,
         gasPriceStep: {
-          low: 1e-6,
-          average: 5e-6,
-          high: 1e-4
+          low: 0.025,
+          average: 0.03,
+          high: 0.035
         }
       }
     ],
     stakeCurrency: {
       coinDenom: "qfs",
-      coinMinimalDenom: "qfs",
-      coinDecimals: 0
+      coinMinimalDenom: "uqfs",
+      coinDecimals: 6
     },
     bip44: {
-      coinType: 1179993431
+      coinType: 118
     }
   },
   {
@@ -21628,44 +21749,44 @@ const _mainnetChains = [
     }
   },
   {
-    chainId: "taketitan-12",
+    chainId: "taketitan-1",
     currencies: [
       {
-        coinDenom: "ttnc",
-        coinMinimalDenom: "ttnc",
-        coinDecimals: 0
+        coinDenom: "titan",
+        coinMinimalDenom: "utitan",
+        coinDecimals: 6
       }
     ],
-    rest: "https://lcdttnc.taketitan.com",
-    rpc: "https://rcpttnc.taketitan.com",
+    rest: "https://lcd.taketitan.com",
+    rpc: "https://rpc.taketitan.com",
     bech32Config: {
-      bech32PrefixAccAddr: "taketitan",
-      bech32PrefixAccPub: "taketitanpub",
-      bech32PrefixValAddr: "taketitanvaloper",
-      bech32PrefixValPub: "taketitanvaloperpub",
-      bech32PrefixConsAddr: "taketitanvalcons",
-      bech32PrefixConsPub: "taketitanvalconspub"
+      bech32PrefixAccAddr: "titan",
+      bech32PrefixAccPub: "titanpub",
+      bech32PrefixValAddr: "titanvaloper",
+      bech32PrefixValPub: "titanvaloperpub",
+      bech32PrefixConsAddr: "titanvalcons",
+      bech32PrefixConsPub: "titanvalconspub"
     },
     chainName: "taketitan",
     feeCurrencies: [
       {
-        coinDenom: "ttnc",
-        coinMinimalDenom: "ttnc",
-        coinDecimals: 0,
+        coinDenom: "titan",
+        coinMinimalDenom: "utitan",
+        coinDecimals: 6,
         gasPriceStep: {
-          low: 1e-6,
-          average: 5e-6,
-          high: 1e-4
+          low: 0.025,
+          average: 0.03,
+          high: 0.035
         }
       }
     ],
     stakeCurrency: {
-      coinDenom: "ttnc",
-      coinMinimalDenom: "ttnc",
-      coinDecimals: 0
+      coinDenom: "titan",
+      coinMinimalDenom: "utitan",
+      coinDecimals: 6
     },
     bip44: {
-      coinType: 1179993421
+      coinType: 118
     }
   },
   {
@@ -25796,7 +25917,7 @@ const _testnetChains = [
         coinDecimals: 6,
         gasPriceStep: {
           low: 0.01,
-          average: 0.025,
+          average: 0.02,
           high: 0.03
         }
       }
@@ -31465,6 +31586,12 @@ const _explorers = [
         url: "https://explorer.whenmoonwhenlambo.money/arkeo",
         txPage: "https://explorer.whenmoonwhenlambo.money/arkeo/tx/${txHash}",
         accountPage: "https://explorer.whenmoonwhenlambo.money/arkeo/account/${accountAddress}"
+      },
+      {
+        kind: "NodeStake",
+        url: "https://explorer.nodestake.org/arkeo",
+        txPage: "https://explorer.nodestake.org/arkeo/tx/${txHash}",
+        accountPage: "https://explorer.nodestake.org/arkeo/account/${accountAddress}"
       }
     ]
   },
@@ -31732,6 +31859,23 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "axone-1",
+    explorers: [
+      {
+        kind: "valopers",
+        url: "https://axone.valopers.com/",
+        txPage: "https://axone.valopers.com/transactions/${txHash}",
+        accountPage: "https://axone.valopers.com/account/${accountAddress}"
+      },
+      {
+        kind: "NodeStake",
+        url: "https://explorer.nodestake.org/axone",
+        txPage: "https://explorer.nodestake.org/axone/tx/${txHash}",
+        accountPage: "https://explorer.nodestake.org/axone/account/${accountAddress}"
+      }
+    ]
+  },
   {
     chainId: "bbn-1",
     explorers: [
@@ -32552,9 +32696,8 @@ const _explorers = [
     chainId: "cifer-2",
     explorers: [
       {
-        kind: "bigdipper",
-        url: "https://explorer.cifer.ai/",
-        txPage: "https://explorer.cifer.ai/transactions/${txHash}"
+        url: "https://www.cifscan.com/",
+        txPage: "https://www.cifscan.com/tx/${txHash}"
       }
     ]
   },
@@ -35349,7 +35492,7 @@ const _explorers = [
     explorers: [
       {
         kind: "ping.pub",
-        url: "https://blockexplorer.mtgbp.com/mtgbp",
+        url: "https://blockexplorer.mtgbp.com",
         txPage: "https://blockexplorer.mtgbp.com/mtgbp/tx/${txHash}",
         accountPage: "https://blockexplorer.mtgbp.com/mtgbp/accounts/${accountAddress}"
       }
@@ -36248,6 +36391,12 @@ const _explorers = [
         url: "https://shannon.pokt.network",
         txPage: "https://shannon.pokt.network/tx/${txHash}",
         accountPage: "https://shannon.pokt.network/poktroll/account/${accountAddress}"
+      },
+      {
+        kind: "🗺 Ping Pub fork Explorer by Blockval",
+        url: "https://explorer.blockval.io/pocket",
+        txPage: "https://explorer.blockval.io/pocket/tx/${txHash}",
+        accountPage: "https://explorer.blockval.io/pocket/account/${accountAddress}"
       }
     ]
   },
@@ -36417,7 +36566,7 @@ const _explorers = [
     explorers: [
       {
         kind: "ping.pub",
-        url: "https://blockexplorer.qfsone.com/qfs",
+        url: "https://blockexplorer.qfsone.com",
         txPage: "https://blockexplorer.qfsone.com/qfs/tx/${txHash}",
         accountPage: "https://blockexplorer.qfsone.com/qfs/accounts/${accountAddress}"
       }
@@ -37767,13 +37916,13 @@ const _explorers = [
     ]
   },
   {
-    chainId: "taketitan-12",
+    chainId: "taketitan-1",
     explorers: [
       {
         kind: "ping.pub",
-        url: "https://scan.taketitan.com/taketitan",
-        txPage: "https://scan.taketitan.com/taketitan/tx/${txHash}",
-        accountPage: "https://scan.taketitan.com/taketitan/accounts/${accountAddress}"
+        url: "https://blockexplorer.taketitan.com",
+        txPage: "https://blockexplorer.taketitan.com/taketitan/tx/${txHash}",
+        accountPage: "https://blockexplorer.taketitan.com/taketitan/accounts/${accountAddress}"
       }
     ]
   },
@@ -41327,6 +41476,7 @@ const setRouteToDefaultRouteAtom = atom$1(null, (get, set, assets2) => {
 var HISTORY_VERSION = /* @__PURE__ */ ((HISTORY_VERSION2) => {
   HISTORY_VERSION2[HISTORY_VERSION2["camelCase"] = 0] = "camelCase";
   HISTORY_VERSION2[HISTORY_VERSION2["routeDetails"] = 1] = "routeDetails";
+  HISTORY_VERSION2[HISTORY_VERSION2["userAddresses"] = 2] = "userAddresses";
   return HISTORY_VERSION2;
 })(HISTORY_VERSION || {});
 const transactionHistoryVersionAtom = atomWithStorage(
@@ -41339,9 +41489,16 @@ const transactionHistoryAtom = atomWithStorage(
 );
 const sortedHistoryItemsAtom = atom$1((get) => {
   const history = get(transactionHistoryAtom);
-  return history.filter(
-    (historyItem) => historyItem.txsSigned > 0 && historyItem.transactionDetails.some((tx) => tx.txHash)
-  ).sort((a, b) => b.timestamp - a.timestamp);
+  const sortedAndFiltered = history.filter(
+    (historyItem) => historyItem.txsSigned > 0 && historyItem.mainRouteId === void 0 && historyItem.transactionDetails.some((tx) => tx.txHash)
+  ).map((historyItem) => {
+    const relatedRoutes = [...historyItem.relatedRoutes ?? []];
+    return {
+      ...historyItem,
+      relatedRoutes
+    };
+  }).sort((a, b) => b.timestamp - a.timestamp);
+  return sortedAndFiltered;
 });
 const setTransactionHistoryAtom = atom$1(
   null,
@@ -41354,7 +41511,9 @@ const setTransactionHistoryAtom = atom$1(
       newHistory[index] = { ...oldItem, ...historyItem };
     } else {
       if (historyItem.id) {
-        set(setCurrentTransactionIdAtom, historyItem.id);
+        if (historyItem.mainRouteId === void 0) {
+          set(setCurrentTransactionIdAtom, historyItem.id);
+        }
         newHistory.push(historyItem);
       }
     }
@@ -41367,7 +41526,7 @@ const currentTransactionAtom = atom$1((get) => {
   return history.find((historyItem) => historyItem.id === currentTransactionId);
 });
 const lastTransactionInTimeAtom = atom$1((get) => {
-  const history = get(transactionHistoryAtom);
+  const history = get(sortedHistoryItemsAtom);
   if (history.length === 0) return;
   const sorted = [...history].sort((a, b) => b.timestamp - a.timestamp);
   return sorted.at(0);
@@ -45415,7 +45574,7 @@ function walletConnect(parameters) {
         const optionalChains = config2.chains.map((x2) => x2.id);
         if (!optionalChains.length)
           return;
-        const { EthereumProvider } = await import("./index.es-DOVSLdtw.js");
+        const { EthereumProvider } = await import("./index.es-MjDHEa3g.js");
         return await EthereumProvider.init({
           ...parameters,
           disableProviderPing: true,
@@ -45751,7 +45910,291 @@ const createSkipExplorerLink = (transactionDetails) => {
   const initialTxChainId = (_b = transactionDetails == null ? void 0 : transactionDetails[0]) == null ? void 0 : _b.chainId;
   return `https://explorer.skip.build/?tx_hash=${txHashCommaSeperatedList}&chain_id=${initialTxChainId}${isTestnet ? "&is_testnet=true" : ""}`;
 };
+const skipAllBalancesRequestAtom = atom$1(void 0);
+const skipAllBalancesAtom = atomWithQuery((get) => {
+  const params = get(skipAllBalancesRequestAtom);
+  const isInvertingSwap = get(isInvertingSwapAtom);
+  const enabled = params && !isInvertingSwap;
+  return {
+    queryKey: ["skipBalances", params],
+    queryFn: async () => {
+      if (!params) {
+        return { chains: {} };
+      }
+      if (Object.keys((params == null ? void 0 : params.chains) ?? {}).length === 0) {
+        return { chains: {} };
+      }
+      const res = await balances({ ...params, abortDuplicateRequests: true });
+      if (res === void 0) {
+        return { chains: {} };
+      }
+      if (res.chains === void 0) {
+        return { chains: {} };
+      }
+      return res;
+    },
+    enabled,
+    refetchInterval: 1e3 * 60,
+    retry: 1,
+    gcTime: 0,
+    placeholderData: (prevData) => prevData
+  };
+});
+const GAS_ON_RECEIVE_AMOUNT_USD = {
+  [ChainType.Cosmos]: 0.1,
+  evm_l2: 2
+};
+const gasOnReceiveAtom = atom$1(void 0);
+const gasOnReceiveAmountAtom = atom$1(void 0);
+const gasOnReceiveRouteRequestAtom = atom$1((get) => {
+  var _a, _b, _c, _d, _e2, _f;
+  const balances2 = get(skipAllBalancesAtom);
+  const chains2 = get(skipChainsAtom);
+  const sourceAsset = get(sourceAssetAtom);
+  const destinationAsset = get(destinationAssetAtom);
+  const _amount = get(gasOnReceiveAmountAtom);
+  if (!sourceAsset || !destinationAsset) return;
+  const destinationChain = (_a = chains2.data) == null ? void 0 : _a.find((c) => c.chainId === (destinationAsset == null ? void 0 : destinationAsset.chainId));
+  const amountUsd = (() => {
+    if (_amount !== void 0) {
+      const parsedAmount = Number(_amount);
+      if (!isNaN(parsedAmount)) return parsedAmount;
+    }
+    if ((destinationChain == null ? void 0 : destinationChain.chainType) === ChainType.Evm) {
+      return GAS_ON_RECEIVE_AMOUNT_USD.evm_l2;
+    }
+    return GAS_ON_RECEIVE_AMOUNT_USD[ChainType.Cosmos];
+  })();
+  const destinationFeeAssets = (() => {
+    var _a2;
+    if ((destinationChain == null ? void 0 : destinationChain.chainType) === ChainType.Evm) {
+      const assets2 = get(skipAssetsAtom);
+      const evmFeeAsset = (_a2 = assets2.data) == null ? void 0 : _a2.find(
+        (asset) => asset.chain_key === (destinationChain == null ? void 0 : destinationChain.chainId) && asset.denom.includes("-native")
+      );
+      if (evmFeeAsset) {
+        return [{ amountOut: void 0, denom: evmFeeAsset.denom }];
+      }
+    }
+    return destinationChain == null ? void 0 : destinationChain.feeAssets.map((asset) => {
+      var _a3, _b2, _c2;
+      const gasPrice = ((_a3 = asset.gasPrice) == null ? void 0 : _a3.average) ?? ((_b2 = asset.gasPrice) == null ? void 0 : _b2.high) ?? ((_c2 = asset.gasPrice) == null ? void 0 : _c2.low);
+      return {
+        amountOut: gasPrice && convertHumanReadableAmountToCryptoAmount(
+          BigNumber(gasPrice).multipliedBy(3).toNumber(),
+          destinationAsset == null ? void 0 : destinationAsset.decimals
+        ),
+        denom: asset.denom
+      };
+    });
+  })();
+  if (!(sourceAsset == null ? void 0 : sourceAsset.chainId) || !sourceAsset.denom || !destinationFeeAssets) return;
+  const sourceAssetUsdPrice = (_f = (_e2 = (_d = (_c = (_b = balances2 == null ? void 0 : balances2.data) == null ? void 0 : _b.chains) == null ? void 0 : _c[sourceAsset == null ? void 0 : sourceAsset.chainId]) == null ? void 0 : _d.denoms) == null ? void 0 : _e2[sourceAsset == null ? void 0 : sourceAsset.denom]) == null ? void 0 : _f.price;
+  if (!sourceAssetUsdPrice) return;
+  const amount = BigNumber(sourceAssetUsdPrice).multipliedBy(amountUsd).toString();
+  return {
+    amountIn: convertHumanReadableAmountToCryptoAmount(amount, destinationAsset == null ? void 0 : destinationAsset.decimals),
+    sourceAssetChainId: sourceAsset.chainId,
+    sourceAssetDenom: sourceAsset.denom,
+    destAssetChainId: destinationAsset == null ? void 0 : destinationAsset.chainId,
+    destAssetDenoms: destinationFeeAssets
+  };
+});
+const isSomeDestinationFeeBalanceAvailableAtom = atomWithQuery((get) => {
+  const chainAddresses = get(chainAddressesAtom);
+  const chainAddressesArray = Object.values(chainAddresses);
+  const destination = chainAddressesArray == null ? void 0 : chainAddressesArray[chainAddressesArray.length - 1];
+  const destinationAddress = destination == null ? void 0 : destination.address;
+  const gasOnReceiveRouteParams = get(gasOnReceiveRouteRequestAtom);
+  const queryEnabled = !!destinationAddress && !!gasOnReceiveRouteParams;
+  return {
+    enabled: queryEnabled,
+    retry: false,
+    refetchOnReconnect: false,
+    refetchOnWindowFocus: false,
+    refetchInterval: false,
+    queryKey: ["destinationBalances", { destination, gasOnReceiveRouteParams }],
+    queryFn: async () => {
+      if (!gasOnReceiveRouteParams) return false;
+      const balanceResponse = await balances({
+        chains: {
+          [destination.chainId]: {
+            address: destinationAddress
+          }
+        }
+      });
+      const isSomeBalanceAvailable = gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.destAssetDenoms.some(
+        ({ denom, amountOut }) => {
+          var _a, _b, _c, _d;
+          const balanceAmount = (_d = (_c = (_b = (_a = balanceResponse == null ? void 0 : balanceResponse.chains) == null ? void 0 : _a[destination.chainId]) == null ? void 0 : _b.denoms) == null ? void 0 : _c[denom]) == null ? void 0 : _d.amount;
+          const isMoreThanAmountOut = !!balanceAmount && !!amountOut && BigNumber(balanceAmount).isGreaterThanOrEqualTo(amountOut);
+          return amountOut ? isMoreThanAmountOut : balanceAmount && balanceAmount !== "0";
+        }
+      );
+      if (!isSomeBalanceAvailable) {
+        track("gas on receive: no destination balance");
+      }
+      return isSomeBalanceAvailable;
+    }
+  };
+});
+const gasOnReceiveAtomEffect = atomEffect((get, set) => {
+  var _a;
+  const gorRoute = get(gasOnReceiveRouteAtom);
+  const isSomeDestinationFeeBalanceAvailable = get(isSomeDestinationFeeBalanceAvailableAtom);
+  const currentTransactionItem = get(currentTransactionAtom);
+  if (gorRoute.isLoading || isSomeDestinationFeeBalanceAvailable.isLoading) return;
+  if (currentTransactionItem) return;
+  if (!((_a = gorRoute.data) == null ? void 0 : _a.gasOnReceiveAsset)) return;
+  if (isSomeDestinationFeeBalanceAvailable.data) {
+    set(gasOnReceiveAtom, (prev2) => prev2 ?? false);
+  } else {
+    set(gasOnReceiveAtom, (prev2) => prev2 ?? true);
+  }
+});
+const gasOnReceiveRouteAtom = atomWithQuery((get) => {
+  const { data: chains2 } = get(skipChainsAtom);
+  const { data: originalRoute } = get(skipRouteAtom);
+  const params = get(skipRouteRequestAtom);
+  const currentPage = get(currentPageAtom);
+  const destinationAsset = get(destinationAssetAtom);
+  const routeConfig = get(routeConfigAtom);
+  const swapSettings = get(swapSettingsAtom);
+  const gasOnReceiveRouteParams = get(gasOnReceiveRouteRequestAtom);
+  const currentTransactionItem = get(currentTransactionAtom);
+  const destinationAssetIsAFeeAsset = gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.destAssetDenoms.map((i) => i.denom).includes((destinationAsset == null ? void 0 : destinationAsset.denom) ?? "");
+  const chainAddresses = get(chainAddressesAtom);
+  const chainAddressesArray = Object.values(chainAddresses);
+  const destination = chainAddressesArray == null ? void 0 : chainAddressesArray[chainAddressesArray.length - 1];
+  const destinationAddress = destination == null ? void 0 : destination.address;
+  const enabledDestinationChainType = [ChainType.Cosmos, ChainType.Evm];
+  const disabledChainIds = ["1", "solana"];
+  const chain = chains2 == null ? void 0 : chains2.find((i) => i.chainId === (destination == null ? void 0 : destination.chainId));
+  const isRouteEnabled = (() => {
+    if (!chain) return false;
+    if (!enabledDestinationChainType.includes(chain.chainType)) return false;
+    if (disabledChainIds.includes(chain.chainId)) return false;
+    return true;
+  })();
+  const queryEnabled = originalRoute && currentPage === Routes.SwapExecutionPage && !destinationAssetIsAFeeAsset && !!destinationAddress && isRouteEnabled && !currentTransactionItem;
+  return {
+    enabled: queryEnabled,
+    queryKey: [
+      "gasOnReceiveRoute",
+      {
+        originalRoute: {
+          usdAmountOut: originalRoute == null ? void 0 : originalRoute.usdAmountOut
+        },
+        params,
+        destinationAddress,
+        sourceAssetChainId: gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.sourceAssetChainId,
+        sourceAssetDenom: gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.sourceAssetDenom,
+        destAssetChainId: gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.destAssetChainId,
+        destAssetDenoms: gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.destAssetDenoms
+      }
+    ],
+    retry: false,
+    refetchInterval: false,
+    queryFn: async () => {
+      if (!params) throw new Error("No route request provided");
+      let feeRoute;
+      if (destinationAssetIsAFeeAsset || !(gasOnReceiveRouteParams == null ? void 0 : gasOnReceiveRouteParams.destAssetDenoms) || gasOnReceiveRouteParams.destAssetDenoms.length === 0) {
+        return null;
+      }
+      const {
+        destAssetDenoms,
+        amountIn: amountInFallback,
+        ...restParams
+      } = gasOnReceiveRouteParams;
+      const splitDenoms = chunkArray(destAssetDenoms);
+      for (const chunk of splitDenoms) {
+        const feeAssetRoutes = chunk.map(async ({ amountOut, denom }) => {
+          try {
+            const res = await route({
+              destAssetDenom: denom,
+              amountIn: amountOut ? void 0 : amountInFallback,
+              amountOut: amountOut ?? void 0,
+              ...restParams,
+              smartRelay: true,
+              ...routeConfig,
+              goFast: swapSettings.routePreference === RoutePreference.FASTEST,
+              allowMultiTx: false,
+              abortDuplicateRequests: true
+            });
+            return res;
+          } catch (_e2) {
+            return null;
+          }
+        });
+        const result = await Promise.all(feeAssetRoutes);
+        const _feeRoute = result.find((result2) => result2 == null ? void 0 : result2.usdAmountOut);
+        if (_feeRoute == null ? void 0 : _feeRoute.usdAmountOut) {
+          feeRoute = _feeRoute;
+          break;
+        }
+      }
+      if (!(feeRoute == null ? void 0 : feeRoute.amountOut) || !originalRoute) return null;
+      params.amountIn = BigNumber(originalRoute.amountIn ?? 0).minus(BigNumber((feeRoute == null ? void 0 : feeRoute.amountIn) ?? 0)).toString();
+      params.amountOut = void 0;
+      const mainRoute = await route({
+        ...params,
+        smartRelay: true,
+        ...routeConfig,
+        goFast: swapSettings.routePreference === RoutePreference.FASTEST,
+        abortDuplicateRequests: true
+      });
+      if (!mainRoute) return null;
+      return {
+        mainRoute,
+        feeRoute,
+        gasOnReceiveAsset: {
+          amountOut: feeRoute.amountOut,
+          amountUsd: feeRoute.usdAmountOut,
+          denom: feeRoute.destAssetDenom,
+          chainId: feeRoute.destAssetChainId
+        }
+      };
+    }
+  };
+});
+const chunkArray = (arr, size2 = 3) => {
+  const result = [];
+  for (let i = 0; i < arr.length; i += size2) {
+    result.push(arr.slice(i, i + size2));
+  }
+  return result;
+};
 const chainAddressesAtom = atom$1({});
+const feeRouteChainAddressesAtom = atom$1({});
+const feeRouteAddressesAtomEffect = atomEffect((get, set) => {
+  var _a;
+  const isEnabled = get(gasOnReceiveAtom);
+  const gasRoute = get(gasOnReceiveRouteAtom);
+  const _chainAddresses = get(chainAddressesAtom);
+  const chainAddresses = Object.values(_chainAddresses);
+  const { data: chains2 } = get(skipChainsAtom);
+  if (isEnabled && ((_a = gasRoute.data) == null ? void 0 : _a.feeRoute)) {
+    gasRoute.data.feeRoute.requiredChainAddresses.forEach((chainId, i) => {
+      const chain = chains2 == null ? void 0 : chains2.find((c) => c.chainId === chainId);
+      const findAddress = chainAddresses.find((address) => address.chainId === chainId);
+      if (findAddress) {
+        set(feeRouteChainAddressesAtom, (prev2) => ({
+          ...prev2,
+          [i]: findAddress
+        }));
+      } else {
+        set(feeRouteChainAddressesAtom, (prev2) => ({
+          ...prev2,
+          [i]: {
+            chainId,
+            address: void 0,
+            chainType: chain == null ? void 0 : chain.chainType
+          }
+        }));
+      }
+    });
+  }
+});
 const swapExecutionStateAtom = atomWithStorageNoCrossTabSync(
   LOCAL_STORAGE_KEYS.swapExecutionState,
   {
@@ -45767,6 +46210,31 @@ const setCurrentTransactionIdAtom = atom$1(null, (_get, set, transactionId) => {
     currentTransactionId: transactionId
   }));
 });
+const gasRouteEffect = atomEffect((get, set) => {
+  const { data: originalRoute } = get(skipRouteAtom);
+  const { data: gorRoute } = get(gasOnReceiveRouteAtom);
+  const isGorEnabled = get(gasOnReceiveAtom);
+  const currentTransaction = get(currentTransactionAtom);
+  if (currentTransaction) return;
+  set(swapExecutionStateAtom, (prev2) => {
+    var _a;
+    return {
+      ...prev2,
+      mainRoute: gorRoute == null ? void 0 : gorRoute.mainRoute,
+      feeRoute: gorRoute == null ? void 0 : gorRoute.feeRoute,
+      isFeeRouteEnabled: isGorEnabled,
+      ...isGorEnabled && (gorRoute == null ? void 0 : gorRoute.mainRoute) ? {
+        route: gorRoute.mainRoute,
+        clientOperations: getClientOperations(gorRoute.mainRoute.operations)
+      } : {
+        route: originalRoute ?? prev2.originalRoute,
+        clientOperations: getClientOperations(
+          (originalRoute == null ? void 0 : originalRoute.operations) ?? ((_a = prev2.originalRoute) == null ? void 0 : _a.operations)
+        )
+      }
+    };
+  });
+});
 const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
   var _a;
   const { data: route2 } = get(skipRouteAtom);
@@ -45789,16 +46257,26 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
       address: ""
     };
   });
+  set(gasOnReceiveAtom, void 0);
   set(chainAddressesAtom, initialChainAddresses);
   set(swapExecutionStateAtom, {
     userAddresses: [],
-    transactionDetailsArray: [],
     route: route2,
+    originalRoute: route2,
+    feeRoute: void 0,
+    mainRoute: void 0,
     clientOperations: getClientOperations(route2.operations),
     currentTransactionId: void 0
   });
   set(submitSwapExecutionCallbacksAtom, {
     onRouteStatusUpdated: async (routeStatus) => {
+      var _a2;
+      const failedFeeRoute = (_a2 = routeStatus == null ? void 0 : routeStatus.relatedRoutes) == null ? void 0 : _a2.find(
+        (relatedRoute) => relatedRoute.status === "failed"
+      );
+      if (failedFeeRoute) {
+        track("gas on receive: fee route failed", { feeRoute: failedFeeRoute });
+      }
       set(setTransactionHistoryAtom, routeStatus);
     },
     onTransactionUpdated: (txInfo) => {
@@ -45911,7 +46389,7 @@ atom$1(
     }));
   }
 );
-const chainAddressEffectAtom = atomEffect((get, set) => {
+const userAddressesEffectAtom = atomEffect((get, set) => {
   const chainAddresses = get(chainAddressesAtom);
   const addressesMatch = Object.values(chainAddresses).every(
     (chainAddress) => !!chainAddress.address
@@ -45928,18 +46406,37 @@ const chainAddressEffectAtom = atomEffect((get, set) => {
     userAddresses
   }));
 });
+const feeRouteUserAddressesEffectAtom = atomEffect((get, set) => {
+  const chainAddresses = get(feeRouteChainAddressesAtom);
+  const addressesMatch = Object.values(chainAddresses).every(
+    (chainAddress) => !!chainAddress.address
+  );
+  if (!addressesMatch) return;
+  const userAddresses = Object.values(chainAddresses).map((chainAddress) => {
+    return {
+      chainId: chainAddress.chainId,
+      address: chainAddress.address
+    };
+  });
+  set(swapExecutionStateAtom, (prev2) => ({
+    ...prev2,
+    feeRouteUserAddresses: userAddresses
+  }));
+});
 const submitSwapExecutionCallbacksAtom = atom$1();
 const simulateTxAtom = atom$1();
 const batchSignTxsAtom = atom$1(true);
 const skipSubmitSwapExecutionAtom = atomWithMutation((get) => {
   var _a;
-  const { route: route2, userAddresses } = get(swapExecutionStateAtom);
+  const { userAddresses, route: route2, mainRoute, feeRoute, isFeeRouteEnabled, feeRouteUserAddresses } = get(swapExecutionStateAtom);
+  const gorRoute = get(gasOnReceiveRouteAtom);
   const submitSwapExecutionCallbacks = get(submitSwapExecutionCallbacksAtom);
   const simulateTx = get(simulateTxAtom);
   const batchSignTxs = get(batchSignTxsAtom);
   const swapSettings = get(swapSettingsAtom);
   const getSigners = get(getConnectedSignersAtom);
   const wallets = get(walletsAtom);
+  const isDestinationFeeBalanceAvailable = get(isSomeDestinationFeeBalanceAvailableAtom);
   const { timeoutSeconds } = get(routeConfigAtom);
   const { data: chains2 } = get(skipChainsAtom);
   const sourceAsset = get(sourceAssetAtom);
@@ -45958,17 +46455,12 @@ const skipSubmitSwapExecutionAtom = atomWithMutation((get) => {
   return {
     gcTime: Infinity,
     mutationFn: async ({ getSvmSigner }) => {
-      var _a2;
-      if (!route2) return;
-      if (!userAddresses.length) return;
-      try {
-        await executeRoute({
-          route: route2,
-          userAddresses,
+      var _a2, _b;
+      const createParams = (sourceChainId) => {
+        return {
           timeoutSeconds,
-          slippageTolerancePercent: swapSettings.slippage.toString(),
           useUnlimitedApproval: swapSettings.useUnlimitedApproval,
-          simulate: simulateTx !== void 0 ? simulateTx : route2.sourceAssetChainId !== "984122",
+          simulate: simulateTx !== void 0 ? simulateTx : sourceChainId !== "984122",
           batchSignTxs: batchSignTxs !== void 0 ? batchSignTxs : true,
           ...submitSwapExecutionCallbacks,
           getCosmosSigner: async (chainId) => {
@@ -46006,11 +46498,53 @@ const skipSubmitSwapExecutionAtom = atomWithMutation((get) => {
             }
             return adapter;
           }
-        });
+        };
+      };
+      try {
+        if (isFeeRouteEnabled && mainRoute && feeRoute) {
+          if (!(feeRouteUserAddresses == null ? void 0 : feeRouteUserAddresses.length)) return;
+          track("execute route", {
+            gasOnReceive: true,
+            isFeeRouteAvailable: true,
+            isDestinationFeeBalanceAvailable: isDestinationFeeBalanceAvailable.data,
+            mainRoute,
+            feeRoute
+          });
+          await executeMultipleRoutes({
+            route: {
+              mainRoute,
+              ...isFeeRouteEnabled ? { feeRoute } : {}
+            },
+            userAddresses: {
+              mainRoute: userAddresses,
+              ...isFeeRouteEnabled ? { feeRoute: feeRouteUserAddresses } : {}
+            },
+            slippageTolerancePercent: {
+              mainRoute: swapSettings.slippage.toString(),
+              ...isFeeRouteEnabled ? { feeRoute: "10" } : {}
+            },
+            ...createParams(mainRoute.sourceAssetChainId)
+          });
+        } else {
+          if (!route2) return;
+          if (!userAddresses.length) return;
+          track("execute route", {
+            gasOnReceive: false,
+            isFeeRouteAvailable: !!((_a2 = gorRoute.data) == null ? void 0 : _a2.gasOnReceiveAsset),
+            isDestinationFeeBalanceAvailable: isDestinationFeeBalanceAvailable.data,
+            mainRoute: route2
+          });
+          await executeRoute({
+            route: route2,
+            userAddresses,
+            slippageTolerancePercent: swapSettings.slippage.toString(),
+            ...createParams(route2.sourceAssetChainId)
+          });
+        }
       } catch (error) {
         console.error(error);
         const currentTransaction = get(currentTransactionAtom);
-        (_a2 = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _a2.call(submitSwapExecutionCallbacks, error, currentTransaction == null ? void 0 : currentTransaction.transactionDetails);
+        (_b = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _b.call(submitSwapExecutionCallbacks, error, currentTransaction == null ? void 0 : currentTransaction.transactionDetails);
       }
       return null;
     },
@@ -46537,13 +47071,12 @@ const ModalRowItem = ({
   rightContent,
   onClick,
   style,
-  eureka,
-  as = "button"
+  eureka
 }) => {
   return /* @__PURE__ */ jsxs(
     StyledModalRowItemContainer,
     {
-      as,
+      as: "button",
       align: "center",
       justify: "space-between",
       onClick,
@@ -46557,29 +47090,16 @@ const ModalRowItem = ({
     }
   );
 };
-const StyledModalRowItemContainer = dt(Row).attrs(
-  ({ onClick, as }) => ({
-    ...as === "div" && !!onClick && {
-      role: "button",
-      tabIndex: 0,
-      onKeyDown: (e) => {
-        if (e.key === "Enter") {
-          e.preventDefault();
-          onClick();
-        }
-      }
-    }
-  })
-)`
+const StyledModalRowItemContainer = dt(Row)`
   ${removeButtonStyles};
   position: relative;
-  width: ${({ as }) => as === "div" ? "-webkit-fill-available" : "100%"};
   height: 60px;
   border-radius: ${({ theme }) => {
   var _a;
   return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.rowItem);
 }};
-  padding: ${({ as }) => as === "div" ? "0 15px" : "12px 15px"};
+  width: 100%;
+  padding: 12px 15px;
   margin-top: 5px;
 
   z-index: 0;
@@ -46811,29 +47331,6 @@ const useCopyAddress = () => {
     isShowingCopyAddressFeedback
   };
 };
-const skipAllBalancesRequestAtom = atom$1(void 0);
-const skipAllBalancesAtom = atomWithQuery((get) => {
-  const params = get(skipAllBalancesRequestAtom);
-  const isInvertingSwap = get(isInvertingSwapAtom);
-  const enabled = params && !isInvertingSwap;
-  return {
-    queryKey: ["skipBalances", params],
-    queryFn: async () => {
-      if (!params) {
-        return { chains: {} };
-      }
-      if (Object.keys((params == null ? void 0 : params.chains) ?? {}).length === 0) {
-        return { chains: {} };
-      }
-      return balances({ ...params, abortDuplicateRequests: true });
-    },
-    enabled,
-    refetchInterval: 1e3 * 60,
-    retry: 1,
-    gcTime: 0,
-    placeholderData: (prevData) => prevData
-  };
-});
 const useGetBalance = () => {
   const { data: skipBalances } = useAtomValue(skipAllBalancesAtom);
   const getBalance = useCallback(
@@ -47061,10 +47558,17 @@ const SwapExecutionPageRouteDetailedRow = ({
     const selectedChainAddress = context === "destination" ? lastChainAddress : firstChainAddressFoundForChainId;
     return {
       address: selectedChainAddress == null ? void 0 : selectedChainAddress.address,
-      image: (selectedChainAddress == null ? void 0 : selectedChainAddress.source) === "wallet" && ((_a2 = selectedChainAddress == null ? void 0 : selectedChainAddress.wallet) == null ? void 0 : _a2.walletInfo.logo) || void 0
+      image: (selectedChainAddress == null ? void 0 : selectedChainAddress.source) === "wallet" && ((_a2 = selectedChainAddress == null ? void 0 : selectedChainAddress.wallet) == null ? void 0 : _a2.walletInfo.logo) || void 0,
+      source: selectedChainAddress == null ? void 0 : selectedChainAddress.source
     };
   }, [chainAddresses, chainId, context]);
   const walletImage = useCroppedImage(chainAddressWallet.image);
+  const renderWalletImage = useMemo(() => {
+    if ((chainAddressWallet == null ? void 0 : chainAddressWallet.source) === "injected" || (chainAddressWallet == null ? void 0 : chainAddressWallet.source) === "input") return;
+    if (!chainAddressWallet.address) return;
+    if (walletImage) return /* @__PURE__ */ jsx("img", { height: "100%", src: walletImage });
+    return /* @__PURE__ */ jsx(SkeletonElement, { height: 18, width: 18 });
+  }, [chainAddressWallet.address, chainAddressWallet == null ? void 0 : chainAddressWallet.source, walletImage]);
   const renderAddress = useMemo(() => {
     const Container2 = shouldRenderEditDestinationWallet ? ({ children }) => /* @__PURE__ */ jsx(Row, { gap: 5, children }) : o.Fragment;
     if (!chainAddressWallet.address) return;
@@ -47080,15 +47584,7 @@ const SwapExecutionPageRouteDetailedRow = ({
     };
     return /* @__PURE__ */ jsxs(Container2, { children: [
       /* @__PURE__ */ jsxs(AddressPillButton, { onClick: () => copyAddress(chainAddressWallet == null ? void 0 : chainAddressWallet.address), children: [
-        walletImage ? /* @__PURE__ */ jsx(
-          "img",
-          {
-            src: walletImage,
-            style: {
-              height: "100%"
-            }
-          }
-        ) : /* @__PURE__ */ jsx(SkeletonElement, { height: 18, width: 18 }),
+        renderWalletImage,
         renderContent()
       ] }),
       shouldRenderEditDestinationWallet && /* @__PURE__ */ jsx(
@@ -47104,7 +47600,7 @@ const SwapExecutionPageRouteDetailedRow = ({
   }, [
     shouldRenderEditDestinationWallet,
     chainAddressWallet.address,
-    walletImage,
+    renderWalletImage,
     isMobileScreenSize,
     onClickEditDestinationWallet,
     theme.primary.text.lowContrast,
@@ -47148,7 +47644,7 @@ const SwapExecutionPageRouteDetailedRow = ({
         },
         justify: "space-between",
         children: /* @__PURE__ */ jsxs(Row, { align: "center", children: [
-          /* @__PURE__ */ jsxs(LeftContent, { children: [
+          /* @__PURE__ */ jsxs(LeftContent, { gap: 5, children: [
             /* @__PURE__ */ jsxs(Row, { gap: 5, align: "center", children: [
               /* @__PURE__ */ jsx(StyledAssetAmount, { normalTextColor: true, title: assetDetails == null ? void 0 : assetDetails.amount, children: formatDisplayAmount(assetDetails == null ? void 0 : assetDetails.amount) }),
               /* @__PURE__ */ jsx(StyledSymbol, { normalTextColor: true, children: assetDetails == null ? void 0 : assetDetails.symbol }),
@@ -48249,7 +48745,6 @@ const ConnectEcoRow = ({
   return /* @__PURE__ */ jsx(
     ModalRowItem,
     {
-      as: "div",
       style: { marginTop: ITEM_GAP$1, minHeight: `${ITEM_HEIGHT$2}px` },
       onClick: handleConnectClick,
       leftContent: account ? /* @__PURE__ */ jsxs(Row, { align: "center", gap: 10, children: [
@@ -48286,7 +48781,7 @@ const ConnectEcoRow = ({
           ),
           /* @__PURE__ */ jsx(ChainIndicator, { chainId: accountchainId })
         ] })
-      ] }) : /* @__PURE__ */ jsxs(TextButton, { children: [
+      ] }) : /* @__PURE__ */ jsxs(Text, { children: [
         "Connect to",
         " ",
         chainType === ChainType.Cosmos ? "Cosmos" : chainType === ChainType.Evm ? "Ethereum" : "Solana"
@@ -48439,7 +48934,7 @@ const RouteArrow = ({ color = "currentColor" }) => /* @__PURE__ */ jsx("svg", {
 function formatUSD(amount) {
   const amountNumber = typeof amount === "string" ? parseFloat(amount) : amount;
   const minDisplayable = 1 / Math.pow(10, 2);
-  if (amountNumber > 0 && amountNumber < minDisplayable) {
+  if (amountNumber >= 0 && amountNumber < minDisplayable) {
     return `< ${usdFormatter.format(minDisplayable)}`;
   }
   return usdFormatter.format(amountNumber);
@@ -48528,6 +49023,16 @@ const QuestionMarkIcon = ({
     )
   }
 );
+const QuestionMarkTooltip = ({ content }) => {
+  return /* @__PURE__ */ jsx(Tooltip, { content, children: /* @__PURE__ */ jsx(StyledQuestionMarkIcon, {}) });
+};
+const StyledQuestionMarkIcon = dt(QuestionMarkIcon)`
+  color: ${({ theme }) => theme.primary.text.ultraLowContrast};
+  &:hover {
+    color: ${({ theme }) => theme.primary.text.normal};
+  }
+  transition: color 0.2s ease;
+`;
 const SlippageSelector = () => {
   const [isInputFocused, setIsInputFocused] = useState(false);
   const [customSlippageInput, setCustomSlippageInput] = useState("");
@@ -48543,10 +49048,9 @@ const SlippageSelector = () => {
       "Max Slippage",
       /* @__PURE__ */ jsx(Spacer, { width: 5 }),
       /* @__PURE__ */ jsx(
-        Tooltip,
+        QuestionMarkTooltip,
         {
-          content: /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, style: { width: 250 }, children: "If price changes unfavorably during the transaction by more than this amount, the transaction will revert." }),
-          children: /* @__PURE__ */ jsx(QuestionMarkIcon, {})
+          content: /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, style: { width: 250 }, children: "If price changes unfavorably during the transaction by more than this amount, the transaction will revert." })
         }
       )
     ] }),
@@ -48699,10 +49203,9 @@ const RoutePreferenceSelector = () => {
       "Route Preference",
       /* @__PURE__ */ jsx(Spacer, { width: 5 }),
       /* @__PURE__ */ jsx(
-        Tooltip,
+        QuestionMarkTooltip,
         {
-          content: /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, style: { width: 250 }, children: "Choose if faster or cheaper routes should be prioritized. Fast routes require a $50 minimum from Ethereum and may not be available if there is insufficient liquidity for an asset." }),
-          children: /* @__PURE__ */ jsx(QuestionMarkIcon, {})
+          content: /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, style: { width: 250 }, children: "Choose if faster or cheaper routes should be prioritized. Fast routes require a $50 minimum from Ethereum and may not be available if there is insufficient liquidity for an asset." })
         }
       )
     ] }),
@@ -49428,7 +49931,7 @@ const SwapPageAssetChainInput = ({
             "%"
           ] })
         ] }) : /* @__PURE__ */ jsx(SmallText, { children: usdValue && formatUSD(usdValue) }),
-        usdValue && feeLabel && /* @__PURE__ */ jsx(Row, { align: "center", gap: 4, children: /* @__PURE__ */ jsx(SmallText, { color: feeColor, children: feeLabel }) })
+        usdValue && feeLabel && /* @__PURE__ */ jsx(Row, { style: { color: feeColor }, align: "center", gap: 4, children: typeof feeLabel === "string" ? /* @__PURE__ */ jsx(SmallText, { children: feeLabel }) : feeLabel })
       ] }),
       (assetDetails == null ? void 0 : assetDetails.chainName) ? /* @__PURE__ */ jsx(
         StyledOnChainGhostButton,
@@ -49872,9 +50375,9 @@ var WalletSource = /* @__PURE__ */ ((WalletSource2) => {
 const SetAddressModal = createModal((modalProps) => {
   var _a, _b, _c;
   const isMobileScreenSize = useIsMobileScreenSize();
-  const { chainId, chainAddressIndex } = modalProps;
-  const { route: route2 } = useAtomValue(swapExecutionStateAtom);
-  const requiredChainAddresses = route2 == null ? void 0 : route2.requiredChainAddresses;
+  const { chainId, chainAddressIndex, isFeeRoute } = modalProps;
+  const { route: route2, feeRoute } = useAtomValue(swapExecutionStateAtom);
+  const requiredChainAddresses = isFeeRoute ? feeRoute == null ? void 0 : feeRoute.requiredChainAddresses : route2 == null ? void 0 : route2.requiredChainAddresses;
   if (modalProps.chainAddressIndex === void 0) {
     throw new Error("chain address index cannot be undefined");
   }
@@ -49886,7 +50389,10 @@ const SetAddressModal = createModal((modalProps) => {
   const [showManualAddressInput, setShowManualAddressInput] = useState(false);
   const [manualWalletAddress, setManualWalletAddress] = useState("");
   const _walletList = useWalletList({ chainId, destinationWalletList: true });
-  const [chainAddresses, setChainAddresses] = useAtom(chainAddressesAtom);
+  const [_chainAddresses, _setChainAddresses] = useAtom(chainAddressesAtom);
+  const [feeRouteChainAddresses, setFeeRouteChainAddresses] = useAtom(feeRouteChainAddressesAtom);
+  const chainAddresses = isFeeRoute ? feeRouteChainAddresses : _chainAddresses;
+  const setChainAddresses = isFeeRoute ? setFeeRouteChainAddresses : _setChainAddresses;
   const showWithdrawalWarning = new Set(Object.values(chainAddresses).map(({ chainId: chainId2 }) => chainId2)).size > 1;
   const mobile = isMobile();
   const manualWalletEntry = {
@@ -50556,6 +51062,20 @@ const SwapExecutionPageRouteSimpleRow = ({
   });
   const groupedAssets = useGroupedAssetByRecommendedSymbol();
   const groupedAsset = groupedAssets == null ? void 0 : groupedAssets.find((i) => i.id === (assetDetails == null ? void 0 : assetDetails.symbol));
+  const { feeRoute } = useAtomValue(swapExecutionStateAtom);
+  const isGorEnabled = useAtomValue(gasOnReceiveAtom);
+  const { data: assets2 } = useAtomValue(skipAssetsAtom);
+  const gasOnReceiveAsset = useMemo(() => {
+    const gasAsset = {
+      chainId: feeRoute == null ? void 0 : feeRoute.destAssetChainId,
+      denom: feeRoute == null ? void 0 : feeRoute.destAssetDenom
+    };
+    if (!gasAsset) return;
+    const asset = assets2 == null ? void 0 : assets2.find(
+      (a) => a.chainId === (gasAsset == null ? void 0 : gasAsset.chainId) && a.denom === (gasAsset == null ? void 0 : gasAsset.denom)
+    );
+    return asset;
+  }, [assets2, feeRoute == null ? void 0 : feeRoute.destAssetChainId, feeRoute == null ? void 0 : feeRoute.destAssetDenom]);
   const chainAddresses = useAtomValue(chainAddressesAtom);
   const source = useMemo(() => {
     var _a, _b;
@@ -50581,11 +51101,21 @@ const SwapExecutionPageRouteSimpleRow = ({
   }, [chainAddresses, context]);
   const walletImage = useCroppedImage(source.image);
   const renderWalletImage = useMemo(() => {
-    if (source.source === "injected") return;
+    if (source.source === "injected" || source.source === "input") return;
     if (!source.address) return;
     if (walletImage) return /* @__PURE__ */ jsx("img", { height: 12, width: 12, src: walletImage });
     return /* @__PURE__ */ jsx(SkeletonElement, { height: 12, width: 12 });
   }, [source.address, source.source, walletImage]);
+  const renderGasRouteAmount = useMemo(() => {
+    var _a;
+    if (!isGorEnabled) return;
+    if (context === "source") return;
+    if (!gasOnReceiveAsset) return;
+    const amountUsd = feeRoute == null ? void 0 : feeRoute.usdAmountOut;
+    if (!amountUsd) return;
+    const assetSymbol = ((_a = gasOnReceiveAsset == null ? void 0 : gasOnReceiveAsset.recommendedSymbol) == null ? void 0 : _a.toUpperCase()) ?? "";
+    return `+ ${formatUSD(amountUsd)} in ${assetSymbol}`;
+  }, [context, feeRoute == null ? void 0 : feeRoute.usdAmountOut, gasOnReceiveAsset, isGorEnabled]);
   const renderExplorerLink = useMemo(() => {
     if (!explorerLink) return;
     if (isMobileScreenSize) {
@@ -50618,7 +51148,11 @@ const SwapExecutionPageRouteSimpleRow = ({
         " ",
         assetDetails == null ? void 0 : assetDetails.symbol
       ] }),
-      usdValue && /* @__PURE__ */ jsx(SmallText, { children: formatUSD(usdValue) }),
+      usdValue && /* @__PURE__ */ jsxs(SmallText, { children: [
+        formatUSD(usdValue),
+        " ",
+        renderGasRouteAmount
+      ] }),
       /* @__PURE__ */ jsxs(Row, { align: "center", height: 18, gap: 5, children: [
         /* @__PURE__ */ jsxs(StyledChainName, { normalTextColor: true, textWrap: "nowrap", children: [
           "on ",
@@ -50698,11 +51232,12 @@ const SwapExecutionPageRouteSimple = ({
   statusData,
   onClickEditDestinationWallet,
   swapExecutionState,
-  firstOperationStatus
+  firstOperationStatus,
+  bottomContent
 }) => {
   var _a, _b;
   const theme = nt();
-  const { route: route2 } = useAtomValue(swapExecutionStateAtom);
+  const { route: route2, originalRoute } = useAtomValue(swapExecutionStateAtom);
   const firstOperation = operations[0];
   const lastOperation = operations[operations.length - 1];
   const status = statusData == null ? void 0 : statusData.transferEvents;
@@ -50718,10 +51253,10 @@ const SwapExecutionPageRouteSimple = ({
     }
   }, [firstOperationStatus, lastOperation.transferIndex, status, swapExecutionState]);
   const source = {
-    denom: firstOperation.denomIn,
-    tokenAmount: firstOperation.amountIn,
-    chainId: firstOperation.fromChainId ?? firstOperation.chainId,
-    usdValue: route2 == null ? void 0 : route2.usdAmountIn
+    denom: originalRoute == null ? void 0 : originalRoute.sourceAssetDenom,
+    tokenAmount: (originalRoute == null ? void 0 : originalRoute.amountIn) ?? "",
+    chainId: originalRoute == null ? void 0 : originalRoute.sourceAssetChainId,
+    usdValue: originalRoute == null ? void 0 : originalRoute.usdAmountIn
   };
   const destination = {
     denom: lastOperation.denomOut,
@@ -50752,7 +51287,8 @@ const SwapExecutionPageRouteSimple = ({
         explorerLink: destinationExplorerLink,
         context: "destination"
       }
-    )
+    ),
+    bottomContent
   ] });
 };
 const StyledBridgeArrowIcon = dt(BridgeArrowIcon)`
@@ -50761,11 +51297,6 @@ const StyledBridgeArrowIcon = dt(BridgeArrowIcon)`
 `;
 const StyledSwapExecutionPageRoute$1 = dt(Column)`
   padding: 30px;
-  background: ${({ theme }) => theme.primary.background.normal};
-  border-radius: ${({ theme }) => {
-  var _a;
-  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
-}};
   min-height: 225px;
 `;
 const SwapExecutionBridgeIcon = ({
@@ -50892,13 +51423,14 @@ const SwapExecutionPageRouteDetailed = ({
   onClickEditDestinationWallet,
   swapExecutionState,
   firstOperationStatus,
-  secondOperationStatus
+  secondOperationStatus,
+  bottomContent
 }) => {
   var _a;
   const { data: swapVenues } = useAtomValue(skipSwapVenuesAtom);
   const { data: bridges2 } = useAtomValue(skipBridgesAtom);
+  const { originalRoute } = useAtomValue(swapExecutionStateAtom);
   const isGasStationTx = useIsGasStationTx();
-  const firstOperation = operations[0];
   const status = statusData == null ? void 0 : statusData.transferEvents;
   const getBridgeSwapVenue = useCallback(
     (operation) => {
@@ -51004,22 +51536,25 @@ const SwapExecutionPageRouteDetailed = ({
     status,
     statusData
   ]);
-  return /* @__PURE__ */ jsx(StyledSwapExecutionPageRoute, { children: /* @__PURE__ */ jsxs(Column, { children: [
-    /* @__PURE__ */ jsx(
-      SwapExecutionPageRouteDetailedRow,
-      {
-        tokenAmount: firstOperation.amountIn,
-        denom: firstOperation.denomIn,
-        chainId: firstOperation.fromChainId,
-        explorerLink: (_a = status == null ? void 0 : status[0]) == null ? void 0 : _a.fromExplorerLink,
-        status: firstOperationStatus,
-        context: "source",
-        index: 0
-      }
-    ),
-    renderOperations,
-    isGasStationTx && /* @__PURE__ */ jsx(StyledGasStationTxText, { children: "Transactions from EVM to Babylon have gas provided automatically if no gas tokens are found." })
-  ] }) });
+  return /* @__PURE__ */ jsxs(StyledSwapExecutionPageRoute, { children: [
+    /* @__PURE__ */ jsxs(Column, { children: [
+      /* @__PURE__ */ jsx(
+        SwapExecutionPageRouteDetailedRow,
+        {
+          tokenAmount: (originalRoute == null ? void 0 : originalRoute.amountIn) ?? "",
+          denom: originalRoute == null ? void 0 : originalRoute.sourceAssetDenom,
+          chainId: originalRoute == null ? void 0 : originalRoute.sourceAssetChainId,
+          explorerLink: (_a = status == null ? void 0 : status[0]) == null ? void 0 : _a.fromExplorerLink,
+          status: firstOperationStatus,
+          context: "source",
+          index: 0
+        }
+      ),
+      renderOperations,
+      isGasStationTx && /* @__PURE__ */ jsx(StyledGasStationTxText, { children: "Transactions from EVM to Babylon have gas provided automatically if no gas tokens are found." })
+    ] }),
+    bottomContent
+  ] });
 };
 const OperationTypeIconContainer = dt(Column).attrs({
   as: Column
@@ -51031,12 +51566,7 @@ const OperationTypeIconContainer = dt(Column).attrs({
 `;
 const StyledSwapExecutionPageRoute = dt(Column)`
   padding: 25px;
-  gap: 20px;
-  background: ${({ theme }) => theme.primary.background.normal};
-  border-radius: ${({ theme }) => {
-  var _a;
-  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
-}};
+  gap: 5px;
   min-height: 225px;
 `;
 const StyledSwapVenueOrBridgeImage = dt.img`
@@ -51065,6 +51595,50 @@ const StyledGasStationTxText = dt(SmallText)`
   padding: 12px;
   border-radius: 6px;
 `;
+const SwapExecutionPageRouteContainer = ({
+  showDetailed,
+  ...routeProps
+}) => {
+  const simpleRef = useRef(null);
+  const detailedRef = useRef(null);
+  const [containerHeight, setContainerHeight] = useState(0);
+  useEffect(() => {
+    const updateHeight = () => {
+      const activeRef = showDetailed ? detailedRef : simpleRef;
+      if (activeRef.current) {
+        const height = activeRef.current.scrollHeight;
+        setContainerHeight(height);
+      }
+    };
+    updateHeight();
+    const timeoutId = setTimeout(updateHeight, 10);
+    return () => clearTimeout(timeoutId);
+  }, [showDetailed, routeProps.operations, routeProps.statusData, routeProps.bottomContent]);
+  return /* @__PURE__ */ jsxs(StyledContainer$1, { style: { height: containerHeight }, children: [
+    /* @__PURE__ */ jsx(StyledRouteWrapper, { ref: simpleRef, isVisible: !showDetailed, isActive: !showDetailed, children: /* @__PURE__ */ jsx(SwapExecutionPageRouteSimple, { ...routeProps }) }),
+    /* @__PURE__ */ jsx(StyledRouteWrapper, { ref: detailedRef, isVisible: showDetailed, isActive: showDetailed, children: /* @__PURE__ */ jsx(SwapExecutionPageRouteDetailed, { ...routeProps }) })
+  ] });
+};
+const StyledContainer$1 = dt.div`
+  position: relative;
+  overflow: hidden;
+  transition: height 0.25s cubic-bezier(0.4, 0, 0.2, 1);
+  min-height: 225px;
+  background: ${({ theme }) => theme.primary.background.normal};
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.main);
+}};
+`;
+const StyledRouteWrapper = dt.div`
+  position: ${({ isActive: $isActive }) => $isActive ? "relative" : "absolute"};
+  top: 0;
+  left: 0;
+  right: 0;
+  opacity: ${({ isVisible: $isVisible }) => $isVisible ? 1 : 0};
+  transition: opacity 0.2s cubic-bezier(0.4, 0, 0.2, 1);
+  pointer-events: ${({ isVisible: $isVisible }) => $isVisible ? "auto" : "none"};
+`;
 const useAutoSetAddress = () => {
   var _a, _b, _c;
   const [chainAddresses, setChainAddresses] = useAtom(chainAddressesAtom);
@@ -51080,7 +51654,7 @@ const useAutoSetAddress = () => {
   const { createCosmosWallets } = useCreateCosmosWallets();
   const { createEvmWallets } = useCreateEvmWallets();
   const { createSolanaWallets } = useCreateSolanaWallets();
-  useAtom(chainAddressEffectAtom);
+  useAtom(userAddressesEffectAtom);
   const connectedAddress = useAtomValue(connectedAddressesAtom);
   const signRequiredChains = useMemo(() => {
     if (!(route2 == null ? void 0 : route2.operations)) return;
@@ -51283,10 +51857,15 @@ const useHandleTransactionTimeout = (swapExecutionState) => {
 };
 function useSwapExecutionState({
   chainAddresses,
-  route: route2,
-  isLoading
+  requiredChainAddresses,
+  isGettingAddressesLoading,
+  isFetchingDestinationBalance,
+  feeRouteChainAddresses,
+  feeRouteRequiredChainAddresses,
+  isGettingFeeRouteAddressesLoading
 }) {
   const currentTransaction = useAtomValue(currentTransactionAtom);
+  const isFeeRouteEnabled = useAtomValue(gasOnReceiveAtom);
   const showSignaturesRemaining = useMemo(() => {
     if (!currentTransaction) return false;
     if ((currentTransaction == null ? void 0 : currentTransaction.txsRequired) >= 2 && (currentTransaction == null ? void 0 : currentTransaction.txsSigned) !== (currentTransaction == null ? void 0 : currentTransaction.txsRequired)) {
@@ -51296,9 +51875,11 @@ function useSwapExecutionState({
   }, [currentTransaction]);
   return useMemo(() => {
     var _a;
-    if (isLoading) return SwapExecutionState.pendingGettingAddresses;
+    if (isFetchingDestinationBalance) return SwapExecutionState.pendingGettingDestinationBalance;
+    if (isGettingAddressesLoading) return SwapExecutionState.pendingGettingAddresses;
+    if (isFeeRouteEnabled && isGettingFeeRouteAddressesLoading)
+      return SwapExecutionState.pendingGettingFeeRouteAddresses;
     if (!chainAddresses) return SwapExecutionState.destinationAddressUnset;
-    const requiredChainAddresses = route2 == null ? void 0 : route2.requiredChainAddresses;
     if (!requiredChainAddresses) return SwapExecutionState.destinationAddressUnset;
     const allAddressesSet = requiredChainAddresses.every(
       (_chainId, index) => {
@@ -51306,7 +51887,16 @@ function useSwapExecutionState({
         return (_a2 = chainAddresses[index]) == null ? void 0 : _a2.address;
       }
     );
+    const feeRouteAllAddressesSet = feeRouteRequiredChainAddresses == null ? void 0 : feeRouteRequiredChainAddresses.every(
+      (_chainId, index) => {
+        var _a2;
+        return (_a2 = feeRouteChainAddresses == null ? void 0 : feeRouteChainAddresses[index]) == null ? void 0 : _a2.address;
+      }
+    );
     const lastChainAddress = (_a = chainAddresses[requiredChainAddresses.length - 1]) == null ? void 0 : _a.address;
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "failed") {
+      return SwapExecutionState.pendingError;
+    }
     if ((currentTransaction == null ? void 0 : currentTransaction.status) === "completed") {
       return SwapExecutionState.confirmed;
     }
@@ -51331,12 +51921,20 @@ function useSwapExecutionState({
     if (!allAddressesSet) {
       return SwapExecutionState.recoveryAddressUnset;
     }
+    if (isFeeRouteEnabled && feeRouteRequiredChainAddresses && !feeRouteAllAddressesSet) {
+      return SwapExecutionState.feeRouteRecoveryAddressUnset;
+    }
     return SwapExecutionState.ready;
   }, [
-    isLoading,
+    isFetchingDestinationBalance,
+    isGettingAddressesLoading,
+    isFeeRouteEnabled,
+    isGettingFeeRouteAddressesLoading,
     chainAddresses,
-    route2 == null ? void 0 : route2.requiredChainAddresses,
+    requiredChainAddresses,
+    feeRouteRequiredChainAddresses,
     currentTransaction == null ? void 0 : currentTransaction.status,
+    feeRouteChainAddresses,
     showSignaturesRemaining
   ]);
 }
@@ -51422,18 +52020,29 @@ const useCountdown = ({
   }, [estimatedRouteDurationSeconds, enabled, timer]);
   return countdown;
 };
+function useDebouncedValue(value, delay) {
+  const [debouncedValue, setDebouncedValue] = useState(value);
+  useEffect(() => {
+    const timeout = setTimeout(() => setDebouncedValue(value), delay);
+    return () => clearTimeout(timeout);
+  }, [value, delay]);
+  return debouncedValue;
+}
 const SwapExecutionButton = ({
   swapExecutionState,
   route: route2,
   signaturesRemaining,
   lastOperation,
   connectRequiredChains,
+  connectFeeRouteRequiredChains,
   submitExecuteRouteMutation
 }) => {
+  var _a, _b, _c;
   const countdown = useCountdown({
     estimatedRouteDurationSeconds: route2 == null ? void 0 : route2.estimatedRouteDurationSeconds,
     enabled: swapExecutionState === SwapExecutionState.pending
   });
+  const chainAddresses = useAtomValue(chainAddressesAtom);
   const { wallets: solanaWallets2 } = useWallet();
   const svmWallet = useAtomValue(svmWalletAtom);
   const theme = nt();
@@ -51453,7 +52062,8 @@ const SwapExecutionButton = ({
     route2 == null ? void 0 : route2.destAssetChainId,
     route2 == null ? void 0 : route2.txsRequired
   ]);
-  switch (swapExecutionState) {
+  const debouncedSwapExecutionState = useDebouncedValue(swapExecutionState, 150);
+  switch (debouncedSwapExecutionState) {
     case SwapExecutionState.recoveryAddressUnset:
       return /* @__PURE__ */ jsx(
         MainButton,
@@ -51466,6 +52076,18 @@ const SwapExecutionButton = ({
           }
         }
       );
+    case SwapExecutionState.feeRouteRecoveryAddressUnset:
+      return /* @__PURE__ */ jsx(
+        MainButton,
+        {
+          label: "Set intermediary address",
+          icon: ICONS.rightArrow,
+          onClick: () => {
+            track("swap execution page: set recovery address button - clicked");
+            connectFeeRouteRequiredChains == null ? void 0 : connectFeeRouteRequiredChains(true);
+          }
+        }
+      );
     case SwapExecutionState.destinationAddressUnset:
       return /* @__PURE__ */ jsx(
         MainButton,
@@ -51485,7 +52107,8 @@ const SwapExecutionButton = ({
         }
       );
     case SwapExecutionState.ready: {
-      track("swap execution page: confirm button - clicked", { route: route2 });
+      const destinationWalletSource = ((_a = route2 == null ? void 0 : route2.requiredChainAddresses) == null ? void 0 : _a.length) && ((_c = chainAddresses[((_b = route2 == null ? void 0 : route2.requiredChainAddresses) == null ? void 0 : _b.length) - 1]) == null ? void 0 : _c.source);
+      track("swap execution page: confirm button - clicked", { route: route2, destinationWalletSource });
       const onClickConfirmSwap = () => {
         if ((route2 == null ? void 0 : route2.txsRequired) && route2.txsRequired > 1) {
           track("warning page: additional signing required", { route: route2 });
@@ -51563,6 +52186,10 @@ const SwapExecutionButton = ({
       );
     case SwapExecutionState.pendingGettingAddresses:
       return /* @__PURE__ */ jsx(MainButton, { label: "Getting addresses", loading: true });
+    case SwapExecutionState.pendingGettingDestinationBalance:
+      return /* @__PURE__ */ jsx(MainButton, { label: "Getting destination balance", loading: true });
+    case SwapExecutionState.pendingError:
+      return /* @__PURE__ */ jsx(MainButton, { label: "Awaiting result", loading: true });
     default:
       return null;
   }
@@ -51676,6 +52303,345 @@ function usePreventPageUnload(shouldWarn) {
     return () => window.removeEventListener("beforeunload", handleBeforeUnload);
   }, [shouldWarn]);
 }
+const GasIcon = ({ color = "currentColor" }) => /* @__PURE__ */ jsx("svg", { width: "16", height: "15", viewBox: "0 0 16 15", fill: "none", xmlns: "http://www.w3.org/2000/svg", children: /* @__PURE__ */ jsx(
+  "path",
+  {
+    d: "M1.22261 1.84952C1.24188 1.32934 1.4249 0.895862 1.77169 0.549076C2.11847 0.202289 2.55195 0.0192658 3.07213 0H7.69592C8.2161 0.0192658 8.64958 0.202289 8.99636 0.549076C9.34315 0.895862 9.52617 1.32934 9.54544 1.84952V7.39807H9.77663C10.4895 7.41734 11.0867 7.66779 11.5684 8.14944C12.05 8.63109 12.3005 9.22832 12.3197 9.94116V10.8659C12.3582 11.2898 12.5894 11.521 13.0133 11.5595C13.4371 11.521 13.6683 11.2898 13.7069 10.8659V6.38662C13.3023 6.29029 12.9748 6.07836 12.7243 5.75084C12.4546 5.44259 12.3197 5.06691 12.3197 4.62379V2.77428L11.395 1.84952C11.1445 1.54126 11.1445 1.23301 11.395 0.924759C11.7032 0.674302 12.0115 0.674302 12.3197 0.924759L14.5449 3.14996C14.911 3.51601 15.094 3.95912 15.094 4.4793V10.8659C15.0747 11.4632 14.8724 11.9544 14.4871 12.3398C14.1018 12.7251 13.6105 12.9274 13.0133 12.9466C12.416 12.9274 11.9248 12.7251 11.5395 12.3398C11.1541 11.9544 10.9518 11.4632 10.9326 10.8659V9.94116C10.9326 9.61364 10.817 9.33429 10.5858 9.1031C10.3739 8.89117 10.1042 8.77558 9.77663 8.75631H9.54544V12.9466C9.81516 12.9466 10.0367 13.0333 10.2101 13.2067C10.3835 13.3801 10.4702 13.6017 10.4702 13.8714C10.4702 14.1411 10.3835 14.3627 10.2101 14.5361C10.0367 14.7094 9.81516 14.7961 9.54544 14.7961H1.22261C0.952888 14.7961 0.731333 14.7094 0.55794 14.5361C0.384547 14.3627 0.297852 14.1411 0.297852 13.8714C0.297852 13.6017 0.384547 13.3801 0.55794 13.2067C0.731333 13.0333 0.952888 12.9466 1.22261 12.9466V1.84952ZM3.07213 5.08617C3.09139 5.37516 3.24552 5.52929 3.53451 5.54855H7.23354C7.52253 5.52929 7.67666 5.37516 7.69592 5.08617V2.3119C7.67666 2.02291 7.52253 1.86878 7.23354 1.84952H3.53451C3.24552 1.86878 3.09139 2.02291 3.07213 2.3119V5.08617Z",
+    fill: color
+  }
+) });
+const SwitchWrapper = dt.div`
+  width: 42px;
+  height: 24px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
+  background-color: ${({ checked, theme }) => checked ? theme.brandColor : theme.secondary.background.transparent};
+  display: flex;
+  align-items: center;
+  padding: 6px;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  user-select: none;
+`;
+const SwitchThumb = dt.div`
+  width: 16px;
+  height: 16px;
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
+  background-color: ${({ checked, theme }) => checked ? theme.secondary.background.normal : theme.primary.text.ultraLowContrast};
+  transition: transform 0.2s ease;
+  transform: translateX(${({ checked }) => checked ? "16px" : "0"});
+`;
+const Switch = ({ checked = false, onChange }) => {
+  const toggle = () => {
+    onChange == null ? void 0 : onChange(!checked);
+  };
+  return /* @__PURE__ */ jsx(SwitchWrapper, { checked, onClick: toggle, children: /* @__PURE__ */ jsx(SwitchThumb, { checked }) });
+};
+const SpinnerIcon = (props) => {
+  return /* @__PURE__ */ jsxs("svg", { fill: "none", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", ...props, children: [
+    /* @__PURE__ */ jsx("circle", { cx: "12", cy: "12", opacity: ".25", r: "10", stroke: "currentColor", strokeWidth: "4" }),
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z",
+        fill: "currentColor",
+        opacity: ".75"
+      }
+    )
+  ] });
+};
+const GasOnReceive = ({ routeDetails, hideContainer } = {}) => {
+  var _a, _b, _c, _d, _e2;
+  const theme = nt();
+  const [gasOnReceive, setGasOnReceive] = useAtom(gasOnReceiveAtom);
+  const { isLoading: fetchingGasRoute } = useAtomValue(gasOnReceiveRouteAtom);
+  const { feeRoute } = useAtomValue(swapExecutionStateAtom);
+  const { data: assets2 } = useAtomValue(skipAssetsAtom);
+  const isSomeDestinationFeeBalanceAvailable = useAtomValue(
+    isSomeDestinationFeeBalanceAvailableAtom
+  );
+  const currentTransaction = useAtomValue(currentTransactionAtom);
+  const isFetchingBalance = isSomeDestinationFeeBalanceAvailable.isLoading;
+  const gasOnReceiveAsset = useMemo(() => {
+    var _a2, _b2;
+    const gasAsset = {
+      chainId: ((_a2 = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _a2.destAssetChainId) ?? (feeRoute == null ? void 0 : feeRoute.destAssetChainId),
+      denom: ((_b2 = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _b2.destAssetDenom) ?? (feeRoute == null ? void 0 : feeRoute.destAssetDenom)
+    };
+    if (!gasAsset) return;
+    const asset = assets2 == null ? void 0 : assets2.find(
+      (a) => a.chainId === (gasAsset == null ? void 0 : gasAsset.chainId) && a.denom === (gasAsset == null ? void 0 : gasAsset.denom)
+    );
+    return asset;
+  }, [
+    assets2,
+    feeRoute == null ? void 0 : feeRoute.destAssetChainId,
+    feeRoute == null ? void 0 : feeRoute.destAssetDenom,
+    (_a = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _a.destAssetChainId,
+    (_b = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _b.destAssetDenom
+  ]);
+  const amountUsd = ((_c = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _c.usdAmountOut) ?? (feeRoute == null ? void 0 : feeRoute.usdAmountOut);
+  const amountOut = ((_d = routeDetails == null ? void 0 : routeDetails.route) == null ? void 0 : _d.amountOut) ?? (feeRoute == null ? void 0 : feeRoute.amountOut) ?? "";
+  const assetSymbol = ((_e2 = gasOnReceiveAsset == null ? void 0 : gasOnReceiveAsset.recommendedSymbol) == null ? void 0 : _e2.toUpperCase()) ?? "";
+  const gasOnReceiveText = useMemo(() => {
+    var _a2;
+    const formattedAmountText = amountUsd && Number(amountUsd) > 0 ? `${formatUSD(amountUsd)} in ${assetSymbol}` : `${convertTokenAmountToHumanReadableAmount(amountOut, gasOnReceiveAsset == null ? void 0 : gasOnReceiveAsset.decimals)} ${assetSymbol}`;
+    const transferAssetRelease = routeDetails == null ? void 0 : routeDetails.transferAssetRelease;
+    const transferAssetReleaseDetails = assets2 == null ? void 0 : assets2.find(
+      (a) => a.chainId === (transferAssetRelease == null ? void 0 : transferAssetRelease.chainId) && a.denom === (transferAssetRelease == null ? void 0 : transferAssetRelease.denom)
+    );
+    switch (routeDetails == null ? void 0 : routeDetails.status) {
+      case "pending":
+        return `Receiving ${formattedAmountText}`;
+      case "completed":
+        return `Received ${formattedAmountText} as gas top-up`;
+      case "failed":
+        if (transferAssetReleaseDetails) {
+          return `Gas top-up failed. Assets released as ${(transferAssetRelease == null ? void 0 : transferAssetRelease.amount) ? convertTokenAmountToHumanReadableAmount(transferAssetRelease == null ? void 0 : transferAssetRelease.amount, transferAssetReleaseDetails == null ? void 0 : transferAssetReleaseDetails.decimals) : void 0} ${(_a2 = transferAssetReleaseDetails == null ? void 0 : transferAssetReleaseDetails.recommendedSymbol) == null ? void 0 : _a2.toUpperCase()}`;
+        }
+        return `Failed to receive ${formattedAmountText} as gas top-up`;
+      default:
+        return /* @__PURE__ */ jsxs(Row, { align: "center", gap: 8, children: [
+          "Enable gas top up",
+          /* @__PURE__ */ jsx(
+            QuestionMarkTooltip,
+            {
+              content: /* @__PURE__ */ jsxs(SmallText, { normalTextColor: true, style: { whiteSpace: "nowrap" }, children: [
+                "You'll get ",
+                formattedAmountText
+              ] })
+            }
+          )
+        ] });
+    }
+  }, [amountOut, amountUsd, assetSymbol, assets2, gasOnReceiveAsset == null ? void 0 : gasOnReceiveAsset.decimals, routeDetails]);
+  const renderIcon = useMemo(() => {
+    if ((routeDetails == null ? void 0 : routeDetails.status) === "pending") {
+      return /* @__PURE__ */ jsx(
+        SmallText,
+        {
+          style: {
+            marginLeft: "8px",
+            marginRight: "8px",
+            position: "relative"
+          },
+          children: /* @__PURE__ */ jsx(
+            SpinnerIcon,
+            {
+              style: {
+                animation: "spin 1s linear infinite",
+                position: "absolute",
+                height: 14,
+                width: 14
+              }
+            }
+          )
+        }
+      );
+    }
+    return /* @__PURE__ */ jsx(
+      GasIcon,
+      {
+        color: (routeDetails == null ? void 0 : routeDetails.status) === "failed" ? theme.warning.text : theme.primary.text.lowContrast
+      }
+    );
+  }, [routeDetails == null ? void 0 : routeDetails.status, theme.primary.text.lowContrast, theme.warning.text]);
+  if (!routeDetails && (!feeRoute || !gasOnReceiveAsset)) {
+    return null;
+  }
+  return /* @__PURE__ */ jsxs(GasOnReceiveContainer, { hideContainer, align: "center", justify: "space-between", children: [
+    /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
+      renderIcon,
+      (isFetchingBalance || fetchingGasRoute) && !routeDetails ? /* @__PURE__ */ jsx(SkeletonElement, { height: 20, width: 300 }) : /* @__PURE__ */ jsx(
+        SmallText,
+        {
+          color: (routeDetails == null ? void 0 : routeDetails.status) === "failed" ? theme.warning.text : theme.primary.text.lowContrast,
+          children: gasOnReceiveText
+        }
+      )
+    ] }),
+    routeDetails ? null : !isFetchingBalance && !currentTransaction && /* @__PURE__ */ jsx(
+      Switch,
+      {
+        checked: gasOnReceive,
+        onChange: (value) => {
+          track("gas on receive: toggle button - clicked", {
+            gasOnReceive: value
+          });
+          setGasOnReceive(value);
+        }
+      }
+    )
+  ] });
+};
+const GasOnReceiveContainer = dt(Row)`
+  ${({ hideContainer, theme }) => !hideContainer && lt`
+      background-color: ${theme.secondary.background.transparent};
+      padding: 15px 20px;
+      height: 40px;
+    `}
+  border-radius: ${({ theme }) => {
+  var _a;
+  return convertToPxValue((_a = theme.borderRadius) == null ? void 0 : _a.selectionButton);
+}};
+`;
+const useFeeRouteAutoSetAddress = () => {
+  var _a, _b, _c;
+  const [feeRouteChainAddresses, setFeeRouteChainAddresses] = useAtom(feeRouteChainAddressesAtom);
+  const { feeRoute, isFeeRouteEnabled } = useAtomValue(swapExecutionStateAtom);
+  const [isLoading, setIsLoading] = useState(true);
+  const connectedAddress = useAtomValue(connectedAddressesAtom);
+  const sourceWallet = useAtomValue(walletsAtom);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
+  const [walletHasChanged, setWalletHasChanged] = useState(false);
+  const [currentSourceWallets, setCurrentSourceWallets] = useState();
+  const [currentConnectedAddress, setCurrentConnectedAddress] = useState();
+  const { createCosmosWallets } = useCreateCosmosWallets();
+  const { createEvmWallets } = useCreateEvmWallets();
+  const { createSolanaWallets } = useCreateSolanaWallets();
+  useAtom(feeRouteUserAddressesEffectAtom);
+  const connectRequiredChains = useCallback(
+    async (openModal) => {
+      setIsLoading(true);
+      const createWallets = {
+        [ChainType.Cosmos]: createCosmosWallets,
+        [ChainType.Evm]: createEvmWallets,
+        [ChainType.Svm]: createSolanaWallets
+      };
+      try {
+        if (!feeRoute || !isFeeRouteEnabled) return;
+        const requiredChainAddresses = feeRoute.requiredChainAddresses;
+        if (!requiredChainAddresses) return;
+        Object.entries(feeRouteChainAddresses).forEach(async ([_index, chainAddress], index) => {
+          var _a2, _b2;
+          if (!chainAddress.address || chainAddress.address === "") {
+            const injectedAddress = connectedAddress == null ? void 0 : connectedAddress[chainAddress.chainId];
+            if (injectedAddress) {
+              setFeeRouteChainAddresses((prev2) => ({
+                ...prev2,
+                [index]: {
+                  ...chainAddress,
+                  address: injectedAddress,
+                  source: WalletSource.Injected
+                }
+              }));
+            } else {
+              if (!chainAddress.chainType) return;
+              const wallets = createWallets[chainAddress.chainType](chainAddress.chainId);
+              const walletName = (_a2 = sourceWallet[chainAddress.chainType]) == null ? void 0 : _a2.walletName;
+              const wallet = wallets.find((w2) => w2.walletName === walletName);
+              const response = await ((_b2 = wallet == null ? void 0 : wallet.getAddress) == null ? void 0 : _b2.call(wallet, {}));
+              const getLogo = () => {
+                var _a3;
+                if ((wallet == null ? void 0 : wallet.walletChainType) === "evm" && (wallet == null ? void 0 : wallet.walletName) === "app.keplr") {
+                  return getCosmosWalletInfo(WalletType.KEPLR).imgSrc;
+                }
+                return (response == null ? void 0 : response.logo) ?? ((_a3 = wallet == null ? void 0 : wallet.walletInfo) == null ? void 0 : _a3.logo);
+              };
+              if (response == null ? void 0 : response.address) {
+                setFeeRouteChainAddresses((prev2) => ({
+                  ...prev2,
+                  [index]: {
+                    ...chainAddress,
+                    address: response.address,
+                    logo: response.logo,
+                    source: WalletSource.Wallet,
+                    wallet: wallet ? {
+                      walletName: wallet == null ? void 0 : wallet.walletName,
+                      walletPrettyName: wallet == null ? void 0 : wallet.walletPrettyName,
+                      walletChainType: chainAddress.chainType,
+                      walletInfo: {
+                        logo: getLogo()
+                      }
+                    } : void 0
+                  }
+                }));
+              } else if (openModal) {
+                NiceModal.show(Modals.SetAddressModal, {
+                  chainId: chainAddress.chainId,
+                  chainAddressIndex: index,
+                  isFeeRoute: true
+                });
+              }
+            }
+          }
+        });
+      } catch (error) {
+        console.error("Error connecting required chains:", error);
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [
+      connectedAddress,
+      createCosmosWallets,
+      createEvmWallets,
+      createSolanaWallets,
+      feeRoute,
+      feeRouteChainAddresses,
+      isFeeRouteEnabled,
+      setFeeRouteChainAddresses,
+      sourceWallet
+    ]
+  );
+  useEffect(() => {
+    var _a2, _b2, _c2, _d, _e2, _f;
+    if (currentTransaction && (currentTransaction == null ? void 0 : currentTransaction.status) !== "unconfirmed") {
+      setIsLoading(false);
+      return;
+    }
+    const hasWalletChanged = ((_a2 = sourceWallet.cosmos) == null ? void 0 : _a2.id) !== ((_b2 = currentSourceWallets == null ? void 0 : currentSourceWallets.cosmos) == null ? void 0 : _b2.id) || ((_c2 = sourceWallet.evm) == null ? void 0 : _c2.id) !== ((_d = currentSourceWallets == null ? void 0 : currentSourceWallets.evm) == null ? void 0 : _d.id) || ((_e2 = sourceWallet.svm) == null ? void 0 : _e2.id) !== ((_f = currentSourceWallets == null ? void 0 : currentSourceWallets.svm) == null ? void 0 : _f.id);
+    const hasConnectedAddressChanged = JSON.stringify(connectedAddress) !== JSON.stringify(currentConnectedAddress);
+    if (hasConnectedAddressChanged) {
+      setCurrentConnectedAddress(connectedAddress);
+      setWalletHasChanged(true);
+    }
+    if (hasWalletChanged) {
+      setCurrentSourceWallets(sourceWallet);
+      setWalletHasChanged(true);
+    }
+  }, [
+    connectRequiredChains,
+    connectedAddress,
+    currentConnectedAddress,
+    (_a = currentSourceWallets == null ? void 0 : currentSourceWallets.cosmos) == null ? void 0 : _a.id,
+    (_b = currentSourceWallets == null ? void 0 : currentSourceWallets.evm) == null ? void 0 : _b.id,
+    (_c = currentSourceWallets == null ? void 0 : currentSourceWallets.svm) == null ? void 0 : _c.id,
+    currentTransaction,
+    currentTransaction == null ? void 0 : currentTransaction.status,
+    isLoading,
+    feeRoute == null ? void 0 : feeRoute.requiredChainAddresses,
+    sourceWallet
+  ]);
+  useEffect(() => {
+    if (!isFeeRouteEnabled) {
+      setIsLoading(false);
+      return;
+    } else {
+      setWalletHasChanged(true);
+    }
+  }, [isFeeRouteEnabled]);
+  useEffect(() => {
+    if (walletHasChanged && isFeeRouteEnabled) {
+      connectRequiredChains();
+      setWalletHasChanged(false);
+    }
+  }, [
+    connectRequiredChains,
+    isFeeRouteEnabled,
+    feeRoute == null ? void 0 : feeRoute.requiredChainAddresses,
+    walletHasChanged
+  ]);
+  return {
+    connectRequiredChains,
+    isLoading
+  };
+};
 var SwapExecutionState = /* @__PURE__ */ ((SwapExecutionState2) => {
   SwapExecutionState2[SwapExecutionState2["recoveryAddressUnset"] = 0] = "recoveryAddressUnset";
   SwapExecutionState2[SwapExecutionState2["destinationAddressUnset"] = 1] = "destinationAddressUnset";
@@ -51687,15 +52653,34 @@ var SwapExecutionState = /* @__PURE__ */ ((SwapExecutionState2) => {
   SwapExecutionState2[SwapExecutionState2["validatingGasBalance"] = 7] = "validatingGasBalance";
   SwapExecutionState2[SwapExecutionState2["approving"] = 8] = "approving";
   SwapExecutionState2[SwapExecutionState2["pendingGettingAddresses"] = 9] = "pendingGettingAddresses";
+  SwapExecutionState2[SwapExecutionState2["pendingGettingDestinationBalance"] = 10] = "pendingGettingDestinationBalance";
+  SwapExecutionState2[SwapExecutionState2["pendingGettingFeeRouteAddresses"] = 11] = "pendingGettingFeeRouteAddresses";
+  SwapExecutionState2[SwapExecutionState2["feeRouteRecoveryAddressUnset"] = 12] = "feeRouteRecoveryAddressUnset";
+  SwapExecutionState2[SwapExecutionState2["pendingError"] = 13] = "pendingError";
   return SwapExecutionState2;
 })(SwapExecutionState || {});
 const SwapExecutionPage = () => {
+  const theme = nt();
   const setCurrentPage = useSetAtom(currentPageAtom);
-  const { route: route2, clientOperations } = useAtomValue(swapExecutionStateAtom);
+  const { route: route2, clientOperations, feeRoute } = useAtomValue(swapExecutionStateAtom);
   const currentTransaction = useAtomValue(currentTransactionAtom);
   const chainAddresses = useAtomValue(chainAddressesAtom);
-  const { connectRequiredChains, isLoading } = useAutoSetAddress();
+  const feeRouteChainAddresses = useAtomValue(feeRouteChainAddressesAtom);
+  const { connectRequiredChains, isLoading: isGettingAddressesLoading } = useAutoSetAddress();
+  const {
+    connectRequiredChains: connectFeeRouteRequiredChains,
+    isLoading: isGettingFeeRouteAddressesLoading
+  } = useFeeRouteAutoSetAddress();
   const [simpleRoute, setSimpleRoute] = useState(true);
+  const isSomeDestinationFeeBalanceAvailable = useAtomValue(
+    isSomeDestinationFeeBalanceAvailableAtom
+  );
+  const { data: gasRoute, isLoading: isGasRouteLoading } = useAtomValue(gasOnReceiveRouteAtom);
+  const gasRouteEnabled = useAtomValue(gasOnReceiveAtom);
+  const isFetchingDestinationBalance = isSomeDestinationFeeBalanceAvailable.isLoading || isGasRouteLoading;
+  useAtom(gasRouteEffect);
+  useAtom(feeRouteAddressesAtomEffect);
+  useAtom(gasOnReceiveAtomEffect);
   const { mutate: submitExecuteRouteMutation, error } = useAtomValue(skipSubmitSwapExecutionAtom);
   const signaturesRemaining = useMemo(() => {
     if (!currentTransaction) return 0;
@@ -51707,8 +52692,12 @@ const SwapExecutionPage = () => {
   const lastOperation = clientOperations[clientOperations.length - 1];
   const swapExecutionState = useSwapExecutionState({
     chainAddresses,
-    route: route2,
-    isLoading
+    requiredChainAddresses: route2 == null ? void 0 : route2.requiredChainAddresses,
+    feeRouteChainAddresses,
+    feeRouteRequiredChainAddresses: feeRoute == null ? void 0 : feeRoute.requiredChainAddresses,
+    isGettingAddressesLoading,
+    isGettingFeeRouteAddressesLoading,
+    isFetchingDestinationBalance
   });
   const isSafeToleave = (route2 == null ? void 0 : route2.txsRequired) === (currentTransaction == null ? void 0 : currentTransaction.transactionDetails.length);
   usePreventPageUnload(
@@ -51755,8 +52744,22 @@ const SwapExecutionPage = () => {
       });
     };
   }, [swapExecutionState, lastOperation.signRequired, lastOperation.fromChain, route2]);
-  const SwapExecutionPageRoute = simpleRoute ? SwapExecutionPageRouteSimple : SwapExecutionPageRouteDetailed;
   const shouldRenderTrackProgressButton = lastTxHash && lastTxChainId && (route2 == null ? void 0 : route2.txsRequired) === (currentTransaction == null ? void 0 : currentTransaction.transactionDetails.length);
+  const gasOnReceiveComponent = useMemo(() => {
+    var _a;
+    return (gasRoute || feeRoute) && !isGasRouteLoading && !currentTransaction && !isFetchingDestinationBalance || currentTransaction && gasRouteEnabled ? /* @__PURE__ */ jsxs(Column, { children: [
+      /* @__PURE__ */ jsx(Spacer, { height: 30, showLine: true, lineColor: theme.secondary.background.transparent }),
+      /* @__PURE__ */ jsx(GasOnReceive, { routeDetails: (_a = currentTransaction == null ? void 0 : currentTransaction.relatedRoutes) == null ? void 0 : _a[0] })
+    ] }) : null;
+  }, [
+    currentTransaction,
+    feeRoute,
+    gasRoute,
+    gasRouteEnabled,
+    isFetchingDestinationBalance,
+    isGasRouteLoading,
+    theme.secondary.background.transparent
+  ]);
   return /* @__PURE__ */ jsxs(Column, { gap: 5, children: [
     /* @__PURE__ */ jsx(
       PageHeader,
@@ -51794,14 +52797,16 @@ const SwapExecutionPage = () => {
       }
     ),
     /* @__PURE__ */ jsx(
-      SwapExecutionPageRoute,
+      SwapExecutionPageRouteContainer,
       {
+        showDetailed: !simpleRoute,
         onClickEditDestinationWallet,
         operations: clientOperations,
         statusData: currentTransaction,
         swapExecutionState,
         firstOperationStatus,
-        secondOperationStatus
+        secondOperationStatus,
+        bottomContent: gasOnReceiveComponent
       }
     ),
     /* @__PURE__ */ jsx(
@@ -51812,6 +52817,7 @@ const SwapExecutionPage = () => {
         signaturesRemaining,
         lastOperation,
         connectRequiredChains,
+        connectFeeRouteRequiredChains,
         submitExecuteRouteMutation
       }
     ),
@@ -52242,8 +53248,8 @@ const useCleanupDebouncedAtoms = () => {
   }, [cleanupDebouncedDestinationAssetAmount, cleanupDebouncedSourceAssetAmount]);
 };
 const useUpdateAmountWhenRouteChanges = () => {
-  const [route2] = useAtom(skipRouteAtom);
-  const [direction] = useAtom(swapDirectionAtom);
+  const route2 = useAtomValue(skipRouteAtom);
+  const direction = useAtomValue(swapDirectionAtom);
   const [sourceAsset, setSourceAsset] = useAtom(sourceAssetAtom);
   const [destinationAsset, setDestinationAsset] = useAtom(destinationAssetAtom);
   const prevRoute = useRef(route2.data);
@@ -52264,12 +53270,16 @@ const useUpdateAmountWhenRouteChanges = () => {
     if (direction === "swap-in") {
       setDestinationAsset((old) => ({
         ...old,
-        amount: removeTrailingZeros(swapInAmount)
+        amount: removeTrailingZeros(
+          formatDisplayAmount(swapInAmount, { decimals: 5, abbreviate: false })
+        )
       }));
     } else if (direction === "swap-out") {
       setSourceAsset((old) => ({
         ...old,
-        amount: removeTrailingZeros(swapOutAmount)
+        amount: removeTrailingZeros(
+          formatDisplayAmount(swapOutAmount, { decimals: 5, abbreviate: false })
+        )
       }));
     }
   }, [route2.data, direction, sourceAsset, destinationAsset, setSourceAsset, setDestinationAsset]);
@@ -52289,19 +53299,6 @@ const useShowCosmosLedgerWarning = () => {
     return !!(account == null ? void 0 : account.wallet.isLedger);
   }, [sourceAsset == null ? void 0 : sourceAsset.chainId, chainType, getAccount]);
 };
-const SpinnerIcon = (props) => {
-  return /* @__PURE__ */ jsxs("svg", { fill: "none", viewBox: "0 0 24 24", xmlns: "http://www.w3.org/2000/svg", ...props, children: [
-    /* @__PURE__ */ jsx("circle", { cx: "12", cy: "12", opacity: ".25", r: "10", stroke: "currentColor", strokeWidth: "4" }),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z",
-        fill: "currentColor",
-        opacity: ".75"
-      }
-    )
-  ] });
-};
 const ConnectedWalletContent = () => {
   const sourceAsset = useAtomValue(sourceAssetAtom);
   const getAccount = useGetAccount();
@@ -52384,18 +53381,44 @@ const ConnectedWalletContent = () => {
 };
 const useTxHistory = ({ txHistoryItem }) => {
   const setTransactionHistory = useSetAtom(setTransactionHistoryAtom);
-  const [subscribed, setSubscribed] = useState(false);
+  const unsubscribersRef = useRef(null);
+  const subscribedIdsRef = useRef(/* @__PURE__ */ new Set());
   useEffect(() => {
-    if (!txHistoryItem || subscribed) return;
-    const unsubscribe = subscribeToRouteStatus({
-      routeDetails: txHistoryItem,
-      onRouteStatusUpdated: (routeStatus) => setTransactionHistory(routeStatus)
+    var _a;
+    if (!txHistoryItem) return;
+    const unsubscribers = [];
+    const subscribedRouteIds = /* @__PURE__ */ new Set();
+    const subscribe = (route2) => {
+      if (!route2.id || subscribedRouteIds.has(route2.id)) return;
+      subscribedRouteIds.add(route2.id);
+      unsubscribers.push(
+        subscribeToRouteStatus({
+          routeDetails: route2,
+          onRouteStatusUpdated: (routeStatus) => {
+            var _a2;
+            const failedFeeRoute = (_a2 = routeStatus == null ? void 0 : routeStatus.relatedRoutes) == null ? void 0 : _a2.find(
+              (relatedRoute) => relatedRoute.status === "failed"
+            );
+            if (failedFeeRoute) {
+              track("gas on receive: fee route failed", { feeRoute: failedFeeRoute });
+            }
+            setTransactionHistory(routeStatus);
+          }
+        })
+      );
+    };
+    subscribe(txHistoryItem);
+    (_a = txHistoryItem.relatedRoutes) == null ? void 0 : _a.forEach((relatedRoute) => {
+      if (relatedRoute && relatedRoute.id) {
+        subscribe(relatedRoute);
+      }
     });
-    setSubscribed(true);
+    unsubscribersRef.current = unsubscribers;
+    subscribedIdsRef.current = subscribedRouteIds;
     return () => {
-      unsubscribe();
+      unsubscribers.forEach((unsub) => unsub());
     };
-  }, [setTransactionHistory, subscribed, txHistoryItem]);
+  }, [txHistoryItem, setTransactionHistory]);
   return txHistoryItem;
 };
 const SwapPageHeader = memo(() => {
@@ -52508,6 +53531,183 @@ const useConnectToMissingCosmosChain = () => {
   }, [sourceAsset, wallets, extraChainIdsToConnect, addExtraChainIdsToConnectForWalletType]);
   return { isAskingToApproveConnection };
 };
+const name = "@skip-go/widget";
+const description = "Swap widget";
+const version = "3.14.1";
+const repository = {
+  url: "https://github.com/skip-mev/skip-go",
+  directory: "packages/widget"
+};
+const type = "module";
+const scripts = {
+  dev: "vite --force --host",
+  "dev:visual-test": "VISUAL_TEST=true yarn dev",
+  "dev:storybook": "storybook dev -p 6006",
+  build: "npm run generate-chains && NODE_OPTIONS=--max-old-space-size=16384 vite build",
+  "watch:build": "vite build --watch",
+  lint: "NODE_OPTIONS=--max-old-space-size=32384 eslint . --fix",
+  preview: "vite preview",
+  "build:web-component": "NODE_OPTIONS=--max-old-space-size=32384 webpack --config webpack.config.js",
+  "publish:web-component": "npm run build:web-component && cd web-component && npm publish && cd ..",
+  prepack: "yarn run pre",
+  postpack: "yarn run post",
+  pre: "npm run build && node scripts/prepublish.cjs",
+  post: "git checkout -- package.json",
+  "generate-chains": "node scripts/generate-chains.cjs",
+  "update-registries": "yarn up @initia/initia-registry chain-registry",
+  test: "yarn playwright test",
+  "update-screenshots": "UPDATE_SCREENSHOTS=true yarn playwright test Keplr.test.tsx",
+  "combine-images": "node scripts/combine-images.mjs"
+};
+const exports = {
+  ".": {
+    types: "./build/index.d.ts",
+    "import": "./build/index.js"
+  }
+};
+const types = "./build/index.d.ts";
+const files = [
+  "build",
+  "README.md"
+];
+const devDependencies = {
+  "@chromatic-com/storybook": "^1.6.1",
+  "@eslint/js": "^9.9.0",
+  "@initia/initia-registry": "^1.0.6",
+  "@keplr-wallet/types": "^0.12.125",
+  "@playwright/test": "^1.51.1",
+  "@storybook/addon-essentials": "^8.2.6",
+  "@storybook/addon-interactions": "^8.2.6",
+  "@storybook/addon-links": "^8.2.6",
+  "@storybook/addon-onboarding": "^8.2.6",
+  "@storybook/blocks": "^8.2.6",
+  "@storybook/react": "^8.2.6",
+  "@storybook/react-vite": "^8.2.6",
+  "@storybook/test": "^8.2.6",
+  "@testing-library/dom": "^10.4.0",
+  "@testing-library/react": "^16.2.0",
+  "@types/eslint__js": "^8.42.3",
+  "@types/pluralize": "^0.0.33",
+  "@types/pngjs": "^6.0.5",
+  "@types/react": "^19.0.10",
+  "@types/react-dom": "^19.0.4",
+  "@typescript-eslint/eslint-plugin": "^7.15.0",
+  "@typescript-eslint/parser": "^7.15.0",
+  "@vitejs/plugin-react": "^4.3.1",
+  buffer: "^6.0.3",
+  "chain-registry": "^2.0.34",
+  download: "^8.0.0",
+  eslint: "^9.9.0",
+  "eslint-config-prettier": "^9.1.0",
+  "eslint-plugin-prettier": "^5.2.1",
+  "eslint-plugin-react-hooks": "^4.6.2",
+  "fs-extra": "^11.3.0",
+  "node-polyfill-webpack-plugin": "^4.0.0",
+  "pino-pretty": "^13.0.0",
+  pixelmatch: "^7.1.0",
+  pngjs: "^7.0.0",
+  "postcss-loader": "^8.1.1",
+  prettier: "^3.4.2",
+  process: "^0.11.10",
+  pureimage: "^0.4.18",
+  "raw-loader": "^4.0.2",
+  react: ">=17.0.0",
+  "react-dom": ">=17.0.0",
+  starknet: "6.11.0",
+  storybook: "^8.2.6",
+  "ts-loader": "^9.5.1",
+  typescript: "^5.5.4",
+  "typescript-eslint": "^8.2.0",
+  "url-loader": "^4.1.1",
+  vite: "^5.3.4",
+  "vite-plugin-dts": "^4.0.0-beta.1",
+  "vite-plugin-node-polyfills": "^0.22.0",
+  webpack: "^5.94.0",
+  "webpack-cli": "^5.1.4"
+};
+const peerDependencies = {
+  "@tanstack/react-query": "^5.51.21",
+  react: ">=17.0.0",
+  "react-dom": ">=17.0.0",
+  viem: "^2.21.55",
+  wagmi: "^2.14.1"
+};
+const dependencies = {
+  "@amplitude/analytics-browser": "^2.11.12",
+  "@amplitude/plugin-session-replay-browser": "^1.16.5",
+  "@cosmjs/amino": "0.33.1",
+  "@cosmjs/cosmwasm-stargate": "0.33.1",
+  "@cosmjs/encoding": "0.33.1",
+  "@cosmjs/math": "0.33.1",
+  "@cosmjs/proto-signing": "0.33.1",
+  "@cosmjs/stargate": "0.33.1",
+  "@ebay/nice-modal-react": "^1.2.13",
+  "@eslint/compat": "^1.1.1",
+  "@penumbra-zone/bech32m": "^13.0.0",
+  "@penumbra-zone/client": "^24.0.0",
+  "@penumbra-zone/protobuf": "^7.2.0",
+  "@penumbra-zone/transport-dom": "^7.5.0",
+  "@r2wc/react-to-web-component": "^2.0.3",
+  "@skip-go/client": "workspace:^",
+  "@solana/spl-token": "^0.4.8",
+  "@solana/wallet-adapter-ledger": "^0.9.25",
+  "@solana/wallet-adapter-react": "^0.15.39",
+  "@solana/wallet-adapter-wallets": "^0.19.37",
+  "@solana/web3.js": "^1.95.8",
+  "@tanstack/query-core": "^5.51.21",
+  "@walletconnect/modal": "^2.7.0",
+  "@walletconnect/sign-client": "^2.20.3",
+  "@walletconnect/solana-adapter": "^0.0.8",
+  add: "^2.0.6",
+  bech32: "^2.0.0",
+  graz: "0.3.3",
+  jotai: "^2.10.1",
+  "jotai-effect": "^1.0.2",
+  "jotai-tanstack-query": "^0.8.6",
+  "lodash.debounce": "^4.0.8",
+  pluralize: "^8.0.0",
+  "rc-virtual-list": "^3.14.5",
+  "react-error-boundary": "^4.0.13",
+  "react-shadow-scope": "^1.0.5",
+  "styled-components": "^6.1.13",
+  uuid: "^11.1.0",
+  yarn: "^1.22.22",
+  zod: "^3.23.8"
+};
+const publishConfig = {
+  access: "public"
+};
+const packageJson = {
+  name,
+  description,
+  version,
+  repository,
+  type,
+  scripts,
+  exports,
+  types,
+  files,
+  devDependencies,
+  peerDependencies,
+  dependencies,
+  publishConfig
+};
+let isAmplitudeInitialized = false;
+const initAmplitude = () => {
+  if (isAmplitudeInitialized) return;
+  init("14616a575f32087cf0403ab8f3ea3ce0", {
+    appVersion: version
+  });
+  isAmplitudeInitialized = true;
+};
+const startAmplitudeSessionReplay = () => {
+  if (isAmplitudeInitialized) {
+    const plugin = sessionReplayPlugin({
+      sampleRate: 1
+    });
+    add(plugin);
+  }
+};
 const SwapPage = () => {
   var _a;
   const { SettingsFooter, drawerOpen } = useSettingsDrawer();
@@ -52538,6 +53738,7 @@ const SwapPage = () => {
   const getBalance = useGetBalance();
   const callbacks = useAtomValue(callbacksAtom);
   const setChainAddresses = useSetAtom(chainAddressesAtom);
+  const setFeeRouteChainAddresses = useSetAtom(feeRouteChainAddressesAtom);
   useFetchAllBalances();
   useCleanupDebouncedAtoms();
   useUpdateAmountWhenRouteChanges();
@@ -52660,9 +53861,12 @@ const SwapPage = () => {
     var _a2;
     const formattedUsdAmount = (_a2 = getTotalFees(fees2)) == null ? void 0 : _a2.formattedUsdAmount;
     if (formattedUsdAmount) {
-      return `${formattedUsdAmount} in fees`;
+      return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(SmallText, { color: "inherit", children: [
+        formattedUsdAmount,
+        " in fees"
+      ] }) });
     }
-    return "no fees";
+    return /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsx(SmallText, { color: "inherit", children: "no fees" }) });
   }, [fees2]);
   const feeWarning = useMemo(() => {
     if (!(route2 == null ? void 0 : route2.usdAmountIn) || !(route2 == null ? void 0 : route2.usdAmountOut)) return false;
@@ -52728,6 +53932,7 @@ const SwapPage = () => {
     }
     const onClick = () => {
       var _a3, _b;
+      startAmplitudeSessionReplay();
       track("swap page: continue button - clicked", {
         route: route2,
         type: isSwapOperation ? "swap" : "send",
@@ -52738,6 +53943,7 @@ const SwapPage = () => {
         startTransition(() => {
           setError(void 0);
           setChainAddresses({});
+          setFeeRouteChainAddresses({});
           setSwapExecutionState();
           setCurrentPage(Routes.SwapExecutionPage);
         });
@@ -52830,6 +54036,7 @@ const SwapPage = () => {
     showGoFastWarning,
     isGoFast,
     setChainAddresses,
+    setFeeRouteChainAddresses,
     setCurrentPage,
     setSwapExecutionState,
     setError
@@ -52936,7 +54143,10 @@ const TransactionHistoryPageHistoryItemDetails = ({
   absoluteTimeString,
   onClickDelete,
   transferAssetRelease,
-  transactionDetails
+  transactionDetails,
+  feeAssetRouteDetails,
+  senderAddress,
+  receiverAddress
 }) => {
   var _a;
   const theme = nt();
@@ -53006,6 +54216,18 @@ const TransactionHistoryPageHistoryItemDetails = ({
         }
       )
     ] }),
+    senderAddress && /* @__PURE__ */ jsxs(StyledHistoryItemDetailRow, { align: "center", children: [
+      /* @__PURE__ */ jsx(StyledDetailsLabel, { children: "Sender" }),
+      /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, children: senderAddress })
+    ] }),
+    receiverAddress && /* @__PURE__ */ jsxs(StyledHistoryItemDetailRow, { align: "center", children: [
+      /* @__PURE__ */ jsx(StyledDetailsLabel, { children: "Receiver" }),
+      /* @__PURE__ */ jsx(SmallText, { normalTextColor: true, children: receiverAddress })
+    ] }),
+    feeAssetRouteDetails && /* @__PURE__ */ jsx(StyledHistoryItemDetailRow, { align: "center", children: /* @__PURE__ */ jsxs(Column, { width: "100%", children: [
+      /* @__PURE__ */ jsx(Spacer, { height: 20, showLine: true, lineColor: theme.secondary.background.transparent }),
+      /* @__PURE__ */ jsx(GasOnReceive, { hideContainer: true, routeDetails: feeAssetRouteDetails })
+    ] }) }),
     /* @__PURE__ */ jsx(Row, { align: "center", style: { marginTop: 10, padding: "0px 10px" }, children: /* @__PURE__ */ jsxs(Button, { onClick: onClickDelete, gap: 5, align: "center", children: [
       /* @__PURE__ */ jsx(SmallText, { color: theme.error.text, children: "Delete" }),
       /* @__PURE__ */ jsx(TrashIcon, { color: theme.error.text })
@@ -53671,6 +54893,7 @@ const TransactionHistoryPageHistoryItem = forwardRef(
     onClickRow,
     onClickDelete
   }, ref) => {
+    var _a, _b;
     const theme = nt();
     const isMobileScreenSize = useIsMobileScreenSize();
     const historyItem = useTxHistory({
@@ -53689,10 +54912,21 @@ const TransactionHistoryPageHistoryItem = forwardRef(
       timestamp,
       transactionDetails
     } = txHistoryItem;
+    const totalSourceTokenAmount = useMemo(() => {
+      var _a2;
+      const totalRelatedRouteSourceAmount = ((_a2 = txHistoryItem == null ? void 0 : txHistoryItem.relatedRoutes) == null ? void 0 : _a2.reduce(
+        (acc, routeDetail) => {
+          var _a3;
+          return BigNumber(acc).plus(BigNumber(((_a3 = routeDetail.route) == null ? void 0 : _a3.amountIn) || 0)).toNumber();
+        },
+        0
+      )) ?? 0;
+      return BigNumber(amountIn ?? 0).plus(BigNumber(totalRelatedRouteSourceAmount)).toString();
+    }, [amountIn, txHistoryItem]);
     const sourceAssetDetails = useGetAssetDetails({
       assetDenom: sourceAssetDenom,
       chainId: sourceAssetChainId,
-      tokenAmount: amountIn
+      tokenAmount: totalSourceTokenAmount
     });
     const destinationAssetDetails = useGetAssetDetails({
       assetDenom: destAssetDenom,
@@ -53711,6 +54945,10 @@ const TransactionHistoryPageHistoryItem = forwardRef(
       assetImage: destinationAssetDetails.assetImage ?? "",
       chainName: destinationAssetDetails.chainName
     };
+    const feeAssetRouteDetails = useMemo(() => {
+      var _a2, _b2;
+      return ((_a2 = historyItem == null ? void 0 : historyItem.relatedRoutes) == null ? void 0 : _a2[0]) || ((_b2 = txHistoryItem == null ? void 0 : txHistoryItem.relatedRoutes) == null ? void 0 : _b2[0]);
+    }, [historyItem, txHistoryItem]);
     const renderStatus = useMemo(() => {
       switch (historyItem == null ? void 0 : historyItem.status) {
         case "unconfirmed":
@@ -53755,6 +54993,36 @@ const TransactionHistoryPageHistoryItem = forwardRef(
         addSuffix: true
       }).replace("minutes", "mins").replace("minute", "min").replace("hours", "hrs").replace("hour", "hr").replace("seconds", "secs").replace("second", "sec").replace("months", "mos").replace("month", "mo").replace("years", "yrs").replace("year", "yr");
     }, [historyItem == null ? void 0 : historyItem.status, timestamp]);
+    const senderAddress = useMemo(() => {
+      var _a2, _b2;
+      return (_b2 = (_a2 = historyItem == null ? void 0 : historyItem.userAddresses) == null ? void 0 : _a2.find(
+        (address) => {
+          var _a3;
+          return address.chainId === ((_a3 = historyItem == null ? void 0 : historyItem.route) == null ? void 0 : _a3.sourceAssetChainId);
+        }
+      )) == null ? void 0 : _b2.address;
+    }, [(_a = historyItem == null ? void 0 : historyItem.route) == null ? void 0 : _a.sourceAssetChainId, historyItem == null ? void 0 : historyItem.userAddresses]);
+    const receiverAddress = useMemo(() => {
+      var _a2, _b2, _c, _d;
+      if ((historyItem == null ? void 0 : historyItem.transferAssetRelease) !== void 0) {
+        return (_b2 = (_a2 = historyItem == null ? void 0 : historyItem.userAddresses) == null ? void 0 : _a2.find(
+          (address) => {
+            var _a3;
+            return address.chainId === ((_a3 = historyItem == null ? void 0 : historyItem.transferAssetRelease) == null ? void 0 : _a3.chainId);
+          }
+        )) == null ? void 0 : _b2.address;
+      }
+      return (_d = (_c = historyItem == null ? void 0 : historyItem.userAddresses) == null ? void 0 : _c.find(
+        (address) => {
+          var _a3;
+          return address.chainId === ((_a3 = historyItem == null ? void 0 : historyItem.route) == null ? void 0 : _a3.destAssetChainId);
+        }
+      )) == null ? void 0 : _d.address;
+    }, [
+      (_b = historyItem == null ? void 0 : historyItem.route) == null ? void 0 : _b.destAssetChainId,
+      historyItem == null ? void 0 : historyItem.transferAssetRelease,
+      historyItem == null ? void 0 : historyItem.userAddresses
+    ]);
     if (!txHistoryItem.route) return null;
     return /* @__PURE__ */ jsxs(StyledHistoryContainer, { ref, showDetails, children: [
       /* @__PURE__ */ jsxs(StyledHistoryItemRow, { align: "center", justify: "space-between", onClick: onClickRow, children: [
@@ -53780,7 +55048,10 @@ const TransactionHistoryPageHistoryItem = forwardRef(
             removeTransactionHistoryItem(txHistoryItem.timestamp);
             onClickDelete == null ? void 0 : onClickDelete();
           },
-          transferAssetRelease: historyItem == null ? void 0 : historyItem.transferAssetRelease
+          transferAssetRelease: historyItem == null ? void 0 : historyItem.transferAssetRelease,
+          feeAssetRouteDetails,
+          senderAddress,
+          receiverAddress
         }
       )
     ] });
@@ -54048,176 +55319,6 @@ const useMobileRouteConfig = () => {
     }));
   }, [isMobile2, setRouteConfig]);
 };
-const name = "@skip-go/widget";
-const description = "Swap widget";
-const version = "3.13.0";
-const repository = {
-  url: "https://github.com/skip-mev/skip-go",
-  directory: "packages/widget"
-};
-const type = "module";
-const scripts = {
-  dev: "vite --force --host",
-  "dev:visual-test": "VISUAL_TEST=true yarn dev",
-  "dev:storybook": "storybook dev -p 6006",
-  build: "npm run generate-chains && NODE_OPTIONS=--max-old-space-size=16384 vite build",
-  "watch:build": "vite build --watch",
-  lint: "NODE_OPTIONS=--max-old-space-size=32384 eslint . --fix",
-  preview: "vite preview",
-  "build:web-component": "NODE_OPTIONS=--max-old-space-size=32384 webpack --config webpack.config.js",
-  "publish:web-component": "npm run build:web-component && cd web-component && npm publish && cd ..",
-  prepack: "yarn run pre",
-  postpack: "yarn run post",
-  pre: "npm run build && node scripts/prepublish.cjs",
-  post: "git checkout -- package.json",
-  "generate-chains": "node scripts/generate-chains.cjs",
-  "update-registries": "yarn up @initia/initia-registry chain-registry",
-  test: "yarn playwright test",
-  "update-screenshots": "UPDATE_SCREENSHOTS=true yarn playwright test Keplr.test.tsx",
-  "combine-images": "node scripts/combine-images.mjs"
-};
-const exports = {
-  ".": {
-    types: "./build/index.d.ts",
-    "import": "./build/index.js"
-  }
-};
-const types = "./build/index.d.ts";
-const files = [
-  "build",
-  "README.md"
-];
-const devDependencies = {
-  "@chromatic-com/storybook": "^1.6.1",
-  "@eslint/js": "^9.9.0",
-  "@initia/initia-registry": "^1.0.6",
-  "@keplr-wallet/types": "^0.12.125",
-  "@playwright/test": "^1.51.1",
-  "@storybook/addon-essentials": "^8.2.6",
-  "@storybook/addon-interactions": "^8.2.6",
-  "@storybook/addon-links": "^8.2.6",
-  "@storybook/addon-onboarding": "^8.2.6",
-  "@storybook/blocks": "^8.2.6",
-  "@storybook/react": "^8.2.6",
-  "@storybook/react-vite": "^8.2.6",
-  "@storybook/test": "^8.2.6",
-  "@testing-library/dom": "^10.4.0",
-  "@testing-library/react": "^16.2.0",
-  "@types/eslint__js": "^8.42.3",
-  "@types/pluralize": "^0.0.33",
-  "@types/pngjs": "^6.0.5",
-  "@types/react": "^19.0.10",
-  "@types/react-dom": "^19.0.4",
-  "@typescript-eslint/eslint-plugin": "^7.15.0",
-  "@typescript-eslint/parser": "^7.15.0",
-  "@vitejs/plugin-react": "^4.3.1",
-  buffer: "^6.0.3",
-  "chain-registry": "^2.0.18",
-  download: "^8.0.0",
-  eslint: "^9.9.0",
-  "eslint-config-prettier": "^9.1.0",
-  "eslint-plugin-prettier": "^5.2.1",
-  "eslint-plugin-react-hooks": "^4.6.2",
-  "fs-extra": "^11.3.0",
-  "node-polyfill-webpack-plugin": "^4.0.0",
-  "pino-pretty": "^13.0.0",
-  pixelmatch: "^7.1.0",
-  pngjs: "^7.0.0",
-  "postcss-loader": "^8.1.1",
-  prettier: "^3.4.2",
-  process: "^0.11.10",
-  pureimage: "^0.4.18",
-  "raw-loader": "^4.0.2",
-  react: ">=17.0.0",
-  "react-dom": ">=17.0.0",
-  starknet: "6.11.0",
-  storybook: "^8.2.6",
-  "ts-loader": "^9.5.1",
-  typescript: "^5.5.4",
-  "typescript-eslint": "^8.2.0",
-  "url-loader": "^4.1.1",
-  vite: "^5.3.4",
-  "vite-plugin-dts": "^4.0.0-beta.1",
-  "vite-plugin-node-polyfills": "^0.22.0",
-  webpack: "^5.94.0",
-  "webpack-cli": "^5.1.4"
-};
-const peerDependencies = {
-  "@tanstack/react-query": "^5.51.21",
-  react: ">=17.0.0",
-  "react-dom": ">=17.0.0",
-  viem: "^2.21.55",
-  wagmi: "^2.14.1"
-};
-const dependencies = {
-  "@amplitude/analytics-browser": "^2.11.12",
-  "@amplitude/plugin-session-replay-browser": "^1.16.5",
-  "@cosmjs/amino": "0.33.1",
-  "@cosmjs/cosmwasm-stargate": "0.33.1",
-  "@cosmjs/encoding": "0.33.1",
-  "@cosmjs/math": "0.33.1",
-  "@cosmjs/proto-signing": "0.33.1",
-  "@cosmjs/stargate": "0.33.1",
-  "@ebay/nice-modal-react": "^1.2.13",
-  "@eslint/compat": "^1.1.1",
-  "@penumbra-zone/bech32m": "^13.0.0",
-  "@penumbra-zone/client": "^24.0.0",
-  "@penumbra-zone/protobuf": "^7.2.0",
-  "@penumbra-zone/transport-dom": "^7.5.0",
-  "@r2wc/react-to-web-component": "^2.0.3",
-  "@skip-go/client": "workspace:^",
-  "@solana/spl-token": "^0.4.8",
-  "@solana/wallet-adapter-ledger": "^0.9.25",
-  "@solana/wallet-adapter-react": "^0.15.39",
-  "@solana/wallet-adapter-wallets": "^0.19.37",
-  "@solana/web3.js": "^1.95.8",
-  "@tanstack/query-core": "^5.51.21",
-  "@walletconnect/modal": "^2.7.0",
-  "@walletconnect/sign-client": "^2.20.3",
-  "@walletconnect/solana-adapter": "^0.0.8",
-  add: "^2.0.6",
-  bech32: "^2.0.0",
-  graz: "0.3.3",
-  jotai: "^2.10.1",
-  "jotai-effect": "^1.0.2",
-  "jotai-tanstack-query": "^0.8.6",
-  "lodash.debounce": "^4.0.8",
-  pluralize: "^8.0.0",
-  "rc-virtual-list": "^3.14.5",
-  "react-error-boundary": "^4.0.13",
-  "react-shadow-scope": "^1.0.5",
-  "styled-components": "^6.1.13",
-  uuid: "^11.1.0",
-  yarn: "^1.22.22",
-  zod: "^3.23.8"
-};
-const publishConfig = {
-  access: "public"
-};
-const packageJson = {
-  name,
-  description,
-  version,
-  repository,
-  type,
-  scripts,
-  exports,
-  types,
-  files,
-  devDependencies,
-  peerDependencies,
-  dependencies,
-  publishConfig
-};
-const initAmplitude = () => {
-  init("14616a575f32087cf0403ab8f3ea3ce0", {
-    appVersion: version
-  });
-  const plugin = sessionReplayPlugin({
-    sampleRate: 1
-  });
-  add(plugin);
-};
 const useInitWidget = (props) => {
   var _a, _b;
   if (props.enableAmplitudeAnalytics) {
@@ -54247,16 +55348,18 @@ const useInitWidget = (props) => {
   const getSigners = useAtomValue(getConnectedSignersAtom);
   const wallets = useAtomValue(walletsAtom);
   const mergedSkipClientConfig = useMemo(() => {
-    const { apiUrl, chainIdsToAffiliates, endpointOptions: endpointOptions2 } = props;
+    const { apiUrl, chainIdsToAffiliates, endpointOptions: endpointOptions2, apiKey } = props;
     const fromWidgetProps = {
       apiUrl,
       chainIdsToAffiliates,
-      endpointOptions: endpointOptions2
+      endpointOptions: endpointOptions2,
+      apiKey
     };
     return {
       apiUrl: fromWidgetProps.apiUrl ?? defaultSkipClientConfig.apiUrl,
       endpointOptions: fromWidgetProps.endpointOptions ?? defaultSkipClientConfig.endpointOptions,
-      chainIdsToAffiliates: fromWidgetProps.chainIdsToAffiliates ?? {}
+      chainIdsToAffiliates: fromWidgetProps.chainIdsToAffiliates ?? {},
+      apiKey: fromWidgetProps.apiKey
     };
   }, [props]);
   const mergedTheme = useMemo(() => {
@@ -54488,6 +55591,50 @@ const getTransactionDetailsWithSimpleTransactionDetailsStatus = (transactionDeta
     };
   });
 };
+const updateHistoryFromRouteDetailsToUserAddresses = () => {
+  const { set } = jotaiStore;
+  try {
+    const transactionHistoryVersion = JSON.parse(
+      localStorage.getItem(LOCAL_STORAGE_KEYS.transactionHistoryVersion) ?? "0"
+    );
+    const transactionHistory = JSON.parse(
+      localStorage.getItem(LOCAL_STORAGE_KEYS.transactionHistory) ?? "[]"
+    );
+    if (!transactionHistory) {
+      throw new Error("transactionHistory not found in localStorage");
+    }
+    if (transactionHistoryVersion === HISTORY_VERSION.routeDetails) {
+      const updatedTransactionHistory = transactionHistory.map((txHistoryItem) => {
+        const { senderAddress, receiverAddress, ...rest } = txHistoryItem;
+        return {
+          ...rest,
+          userAddresses: [
+            {
+              chainId: txHistoryItem.route.sourceAssetChainId,
+              address: senderAddress
+            },
+            {
+              chainId: txHistoryItem.route.destAssetChainId,
+              address: receiverAddress
+            }
+          ]
+        };
+      });
+      localStorage.setItem(
+        LOCAL_STORAGE_KEYS.transactionHistory,
+        JSON.stringify(updatedTransactionHistory)
+      );
+      console.info(
+        `updated from transactionHistoryVersion ${HISTORY_VERSION.routeDetails} to ${HISTORY_VERSION.userAddresses}`
+      );
+      set(transactionHistoryVersionAtom, HISTORY_VERSION.userAddresses);
+    }
+  } catch {
+    console.warn(
+      `Failed to update transactionHistoryVersion from ${HISTORY_VERSION.routeDetails} to ${HISTORY_VERSION.userAddresses}`
+    );
+  }
+};
 const migrateOldLocalStorageValues = () => {
   if (typeof window === "undefined") return;
   const { set } = jotaiStore;
@@ -54528,6 +55675,7 @@ const migrateOldLocalStorageValues = () => {
     }
   });
   updateHistoryFromCamelCaseToRouteDetails();
+  updateHistoryFromRouteDetailsToUserAddresses();
 };
 function toCamelCase(obj) {
   return convertKeys(obj, (key) => {