@skip-go/widget 3.12.11 → 3.13.0

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

@@ -3,12 +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, transactionStatus, ChainType, getSigningStargateClient, route, executeRoute, balances, BridgeType, FeeType, GAS_STATION_CHAIN_IDS, setClientOptions } from "@skip-go/client";
+import { assets, chains, bridges, venues, ChainType, getSigningStargateClient, route, executeRoute, balances, 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 as init$1, add } from "@amplitude/analytics-browser";
-import { setTag, setUser, getReplay, init, breadcrumbsIntegration, dedupeIntegration, functionToStringIntegration, httpContextIntegration, inboundFiltersIntegration, linkedErrorsIntegration, browserSessionIntegration, replayIntegration } from "@sentry/react";
-import { useQuery, useMutation, QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { track, setUserId, init, add } 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";
@@ -19,12 +17,14 @@ import { createConfig, createStorage, useAccount, useConnect, useConnectors, Wag
 import { ErrorBoundary } from "react-error-boundary";
 import { createPortal } from "react-dom";
 import List from "rc-virtual-list";
+import { useMutation, useQuery, QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { useWallet, WalletProvider } from "@solana/wallet-adapter-react";
 import { PublicKey } from "@solana/web3.js";
 import { CosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import { Decimal } from "@cosmjs/math";
 import { GasPrice, calculateFee } from "@cosmjs/stargate";
 import { sessionReplayPlugin } from "@amplitude/plugin-session-replay-browser";
+import { v4 } from "uuid";
 import { LedgerWalletAdapter } from "@solana/wallet-adapter-ledger";
 import { WalletConnectWalletAdapter } from "@walletconnect/solana-adapter";
 function getDefaultExportFromCjs$1(x2) {
@@ -4616,9 +4616,6 @@ const UnexpectedErrorPageUnexpected = ({
   const theme = nt();
   const setErrorWarningAtom = useSetAtom(errorWarningAtom);
   const setCurrentPage = useSetAtom(currentPageAtom);
-  useEffect(() => {
-    setTag("errorMessage", error == null ? void 0 : error.message);
-  }, [error == null ? void 0 : error.message]);
   const onClickRetry = () => {
     setErrorWarningAtom(void 0);
     setCurrentPage(Routes.SwapPage);
@@ -4663,336 +4660,6 @@ const UnexpectedErrorPageUnexpected = ({
     )
   ] });
 };
-var OperationType = /* @__PURE__ */ ((OperationType2) => {
-  OperationType2["swap"] = "swap";
-  OperationType2["evmSwap"] = "evmSwap";
-  OperationType2["transfer"] = "transfer";
-  OperationType2["axelarTransfer"] = "axelarTransfer";
-  OperationType2["cctpTransfer"] = "cctpTransfer";
-  OperationType2["hyperlaneTransfer"] = "hyperlaneTransfer";
-  OperationType2["opInitTransfer"] = "opInitTransfer";
-  OperationType2["bankSend"] = "bankSend";
-  OperationType2["goFastTransfer"] = "goFastTransfer";
-  OperationType2["stargateTransfer"] = "stargateTransfer";
-  OperationType2["eurekaTransfer"] = "eurekaTransfer";
-  OperationType2["layerZeroTransfer"] = "layerZeroTransfer";
-  return OperationType2;
-})(OperationType || {});
-function getOperationDetailsAndType(operation) {
-  const combinedOperation = operation;
-  let returnValue = {
-    details: {},
-    type: void 0
-  };
-  Object.values(OperationType).find((type2) => {
-    var _a;
-    const originalDetails = combinedOperation == null ? void 0 : combinedOperation[type2];
-    if (originalDetails) {
-      const operationDetails = { ...originalDetails };
-      switch (type2) {
-        case "swap":
-        case "evmSwap":
-          operationDetails.toChainId = originalDetails.fromChainId;
-          break;
-        case "axelarTransfer":
-          operationDetails.denomIn = ((_a = originalDetails.ibcTransferToAxelar) == null ? void 0 : _a.denomIn) ?? originalDetails.denomIn;
-          break;
-        case "bankSend": {
-          const bankSend = originalDetails;
-          operationDetails.denomIn = bankSend.denom;
-          operationDetails.denomOut = bankSend.denom;
-          operationDetails.fromChainId = bankSend.chainId;
-          operationDetails.toChainId = bankSend.chainId;
-          break;
-        }
-      }
-      returnValue = {
-        details: operationDetails,
-        type: type2
-      };
-    }
-  });
-  return returnValue;
-}
-function getClientOperation(operation) {
-  const { details, type: type2 } = getOperationDetailsAndType(operation);
-  return {
-    type: type2,
-    ...details,
-    txIndex: operation.txIndex,
-    amountIn: operation.amountIn,
-    amountOut: operation.amountOut,
-    swapVenues: [
-      ...details.swapVenues ?? [],
-      ...(details == null ? void 0 : details.swapIn) ? [details == null ? void 0 : details.swapIn.swapVenue] : [],
-      ...(details == null ? void 0 : details.swapOut) ? [details == null ? void 0 : details.swapOut.swapVenue] : []
-    ]
-  };
-}
-function getClientOperations(operations) {
-  if (!operations) return [];
-  let transferIndex = 0;
-  const filteredOperations = filterNeutronSwapFee(operations);
-  return filteredOperations.map((operation, index, arr) => {
-    const prevOperation = arr[index - 1];
-    const signRequired = (() => {
-      if (index === 0) {
-        return false;
-      } else {
-        if (operation.txIndex > prevOperation.txIndex) {
-          return true;
-        }
-        return false;
-      }
-    })();
-    const clientOperation = getClientOperation(operation);
-    const isSwap = clientOperation.type === "swap" || clientOperation.type === "evmSwap";
-    const result = {
-      ...clientOperation,
-      transferIndex,
-      signRequired,
-      isSwap
-    };
-    if (!isSwap) {
-      transferIndex++;
-    }
-    return result;
-  });
-}
-function filterNeutronSwapFee(operations) {
-  return operations.filter((op, i) => {
-    var _a, _b, _c, _d, _e2, _f, _g, _h;
-    const clientOperation = getClientOperation(op);
-    if (clientOperation.type === "swap" && ((_b = (_a = clientOperation.swapOut) == null ? void 0 : _a.swapVenue) == null ? void 0 : _b.name) === "neutron-astroport" && ((_c = clientOperation.swapOut) == null ? void 0 : _c.swapVenue.chainId) === "neutron-1" && clientOperation.chainId === "neutron-1" && clientOperation.denomOut === "untrn" && clientOperation.fromChainId === "neutron-1" && ((_d = clientOperation.swapOut) == null ? void 0 : _d.swapAmountOut) === "200000") {
-      const nextOperation = operations[i + 1];
-      if (nextOperation) {
-        const nextClientOperation = getClientOperation(nextOperation);
-        if (nextClientOperation.type === "swap" && ((_f = (_e2 = nextClientOperation.swapIn) == null ? void 0 : _e2.swapVenue) == null ? void 0 : _f.name) === "neutron-astroport" && ((_h = (_g = nextClientOperation.swapIn) == null ? void 0 : _g.swapVenue) == null ? void 0 : _h.chainId) === "neutron-1" && nextClientOperation.chainId === "neutron-1") {
-          return false;
-        }
-      }
-    }
-    return true;
-  });
-}
-function getClientTransferEvent(transferEvent) {
-  const combinedTransferEvent = transferEvent;
-  const axelarTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.axelarTransfer;
-  const ibcTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.ibcTransfer;
-  const cctpTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.cctpTransfer;
-  const hyperlaneTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.hyperlaneTransfer;
-  const opInitTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.opInitTransfer;
-  const goFastTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.goFastTransfer;
-  const stargateTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.stargateTransfer;
-  const eurekaTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.eurekaTransfer;
-  const layerZeroTransfer = combinedTransferEvent == null ? void 0 : combinedTransferEvent.layerZeroTransfer;
-  let transferType = "";
-  if (axelarTransfer) {
-    transferType = "axelarTransfer";
-  } else if (ibcTransfer) {
-    transferType = "ibcTransfer";
-  } else if (cctpTransfer) {
-    transferType = "cctpTransfer";
-  } else if (hyperlaneTransfer) {
-    transferType = "hyperlaneTransfer";
-  } else if (opInitTransfer) {
-    transferType = "opInitTransfer";
-  } else if (goFastTransfer) {
-    transferType = "goFastTransfer";
-  } else if (stargateTransfer) {
-    transferType = "stargateTransfer";
-  } else if (eurekaTransfer) {
-    transferType = "eurekaTransfer";
-  } else if (layerZeroTransfer) {
-    transferType = "layerZeroTransfer";
-  }
-  const getExplorerLink = (type2) => {
-    var _a, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l;
-    switch (transferType) {
-      case "ibcTransfer":
-        if (type2 === "send") {
-          return (_a = ibcTransfer.packetTxs.sendTx) == null ? void 0 : _a.explorerLink;
-        }
-        return (_b = ibcTransfer.packetTxs.receiveTx) == null ? void 0 : _b.explorerLink;
-      case "eurekaTransfer":
-        if (type2 === "send") {
-          return (_c = eurekaTransfer.packetTxs.sendTx) == null ? void 0 : _c.explorerLink;
-        }
-        return (_d = eurekaTransfer.packetTxs.receiveTx) == null ? void 0 : _d.explorerLink;
-      case "goFastTransfer":
-        if (type2 === "send") {
-          return (_e2 = goFastTransfer.txs.orderSubmittedTx) == null ? void 0 : _e2.explorerLink;
-        }
-        return (_f = goFastTransfer.txs.orderFilledTx) == null ? void 0 : _f.explorerLink;
-      case "axelarTransfer":
-        return axelarTransfer == null ? void 0 : axelarTransfer.axelarScanLink;
-      default:
-        if (type2 === "send") {
-          return (_i = (_h = (_g = combinedTransferEvent[transferType]) == null ? void 0 : _g.txs) == null ? void 0 : _h.sendTx) == null ? void 0 : _i.explorerLink;
-        }
-        return (_l = (_k = (_j = combinedTransferEvent[transferType]) == null ? void 0 : _j.txs) == null ? void 0 : _k.receiveTx) == null ? void 0 : _l.explorerLink;
-    }
-  };
-  const _result = {
-    ...ibcTransfer,
-    ...axelarTransfer,
-    ...cctpTransfer,
-    ...hyperlaneTransfer,
-    ...stargateTransfer,
-    ...hyperlaneTransfer,
-    ...opInitTransfer,
-    ...goFastTransfer,
-    ...stargateTransfer,
-    ...eurekaTransfer,
-    ...layerZeroTransfer,
-    fromExplorerLink: getExplorerLink("send"),
-    toExplorerLink: getExplorerLink("receive")
-  };
-  const status = getSimpleStatus(_result.state);
-  const result = {
-    ..._result,
-    status
-  };
-  return result;
-}
-function getTransferEventsFromTxStatusResponse(txStatusResponse) {
-  if (!txStatusResponse) return [];
-  return txStatusResponse == null ? void 0 : txStatusResponse.flatMap((txStatus) => {
-    return txStatus.transferSequence.map((transferEvent) => {
-      return getClientTransferEvent(transferEvent);
-    });
-  });
-}
-function getSimpleOverallStatus(state) {
-  switch (state) {
-    case "STATE_SUBMITTED":
-    case "STATE_PENDING":
-      return "pending";
-    case "STATE_COMPLETED_SUCCESS":
-      return "success";
-    case "STATE_COMPLETED_ERROR":
-    case "STATE_PENDING_ERROR":
-    default:
-      return "failed";
-  }
-}
-function getSimpleStatus(state) {
-  switch (state) {
-    case "TRANSFER_PENDING":
-    case "TRANSFER_RECEIVED":
-    case "AXELAR_TRANSFER_PENDING_CONFIRMATION":
-    case "AXELAR_TRANSFER_PENDING_RECEIPT":
-    case "CCTP_TRANSFER_SENT":
-    case "CCTP_TRANSFER_PENDING_CONFIRMATION":
-    case "CCTP_TRANSFER_CONFIRMED":
-    case "HYPERLANE_TRANSFER_SENT":
-    case "OPINIT_TRANSFER_SENT":
-    case "GO_FAST_TRANSFER_SENT":
-    case "STARGATE_TRANSFER_SENT":
-    case "LAYER_ZERO_TRANSFER_SENT":
-    case "LAYER_ZERO_TRANSFER_WAITING_FOR_COMPOSE":
-      return "pending";
-    case "TRANSFER_SUCCESS":
-    case "AXELAR_TRANSFER_SUCCESS":
-    case "CCTP_TRANSFER_RECEIVED":
-    case "HYPERLANE_TRANSFER_RECEIVED":
-    case "OPINIT_TRANSFER_RECEIVED":
-    case "STARGATE_TRANSFER_RECEIVED":
-    case "GO_FAST_TRANSFER_FILLED":
-    case "LAYER_ZERO_TRANSFER_RECEIVED":
-      return "completed";
-    default:
-      return "failed";
-  }
-}
-const useBroadcastedTxsStatus = ({
-  transactionDetails,
-  txsRequired,
-  enabled
-}) => {
-  const [isSettled, setIsSettled] = useState(false);
-  const [prevData, setPrevData] = useState(void 0);
-  const queryKey = useMemo(
-    () => ["txs-status", txsRequired, transactionDetails],
-    [transactionDetails, txsRequired]
-  );
-  const incompleteTxs = useMemo(() => {
-    return transactionDetails == null ? void 0 : transactionDetails.filter(
-      (tx) => {
-        var _a, _b, _c;
-        return ((_a = tx.status) == null ? void 0 : _a.state) !== "STATE_COMPLETED_SUCCESS" && ((_b = tx.status) == null ? void 0 : _b.state) !== "STATE_COMPLETED_ERROR" && ((_c = tx.status) == null ? void 0 : _c.state) !== "STATE_ABANDONED";
-      }
-    );
-  }, [transactionDetails]);
-  const queryEnabled = useMemo(() => {
-    return (incompleteTxs == null ? void 0 : incompleteTxs.length) !== 0 && enabled;
-  }, [enabled, incompleteTxs == null ? void 0 : incompleteTxs.length]);
-  return useQuery({
-    queryKey,
-    queryFn: async ({ queryKey: [, txsRequired2, txs] }) => {
-      var _a, _b;
-      if (!txs || !incompleteTxs) return;
-      try {
-        const statusResponseMap = /* @__PURE__ */ new Map();
-        txs.forEach((tx) => {
-          if (tx.status) statusResponseMap.set(tx.txHash, tx.status);
-        });
-        await Promise.all(
-          incompleteTxs.map(async (tx) => {
-            const status = await transactionStatus(tx);
-            statusResponseMap.set(tx.txHash, status);
-          })
-        );
-        const updatedTransactionDetails = txs.map((tx) => ({
-          ...tx,
-          status: statusResponseMap.get(tx.txHash) ?? tx.status
-        }));
-        const validStatuses = updatedTransactionDetails.map((tx) => tx.status).filter((status) => status !== void 0);
-        const transferEvents = getTransferEventsFromTxStatusResponse(validStatuses);
-        const isFinalState = (state) => {
-          return state === "STATE_COMPLETED_SUCCESS" || state === "STATE_COMPLETED_ERROR" || state === "STATE_ABANDONED";
-        };
-        const isAllSettled = txsRequired2 === validStatuses.length && validStatuses.every((status) => isFinalState(status.state));
-        if (isAllSettled) {
-          setIsSettled(true);
-        }
-        const someTxFailed = validStatuses.some(
-          (status) => status.state === "STATE_COMPLETED_ERROR" || status.state === "STATE_ABANDONED"
-        );
-        const lastTx = validStatuses.at(-1);
-        const lastTxStatus = (lastTx == null ? void 0 : lastTx.state) ? getSimpleOverallStatus(lastTx.state) : void 0;
-        const transferAssetRelease = (_a = validStatuses.reverse().find((tx) => tx.transferAssetRelease)) == null ? void 0 : _a.transferAssetRelease;
-        const resData = {
-          isSuccess: isAllSettled && !someTxFailed && lastTxStatus === "success",
-          lastTxStatus,
-          transactionDetails: updatedTransactionDetails,
-          isSettled: isAllSettled,
-          transferEvents,
-          transferAssetRelease
-        };
-        setPrevData(resData);
-        return resData;
-      } catch (_error) {
-        const validStatuses = (transactionDetails ?? []).map((tx) => tx.status).filter((status) => status !== void 0);
-        const transferEvents = getTransferEventsFromTxStatusResponse(validStatuses);
-        const transferAssetRelease = (_b = validStatuses.reverse().find((tx) => tx.transferAssetRelease)) == null ? void 0 : _b.transferAssetRelease;
-        const fallbackData = {
-          isSuccess: false,
-          isSettled: true,
-          transactionDetails: transactionDetails ?? [],
-          lastTxStatus: "failed",
-          transferEvents,
-          transferAssetRelease
-        };
-        setPrevData(fallbackData);
-        return fallbackData;
-      }
-    },
-    enabled: !isSettled && queryEnabled,
-    refetchInterval: 500,
-    initialData: prevData
-  });
-};
 function atomWithDebounce(delayMilliseconds = 250) {
   const prevTimeoutAtom = atom$1(void 0);
   const _currentValueAtom = atom$1();
@@ -7560,6 +7227,11 @@ const _mainnetChains = [
         coinMinimalDenom: "factory/chihuahua1x4q2vkrz4dfgd9hcw0p5m2f2nuv2uqmt9xr8k2/achihuahuawifhat",
         coinDecimals: 6
       },
+      {
+        coinDenom: "BEER",
+        coinMinimalDenom: "factory/chihuahua1sj9verkuk8aa9jrngnpwup6zjht4vwngjlpemnt9w38ccp0qnlcswvsuzc/beer",
+        coinDecimals: 6
+      },
       {
         coinDenom: "WOOF",
         coinMinimalDenom: "factory/chihuahua13jawsn574rf3f0u5rhu7e8n6sayx5gkw3eddhp/uwoof",
@@ -7703,8 +7375,8 @@ const _mainnetChains = [
         coinDecimals: 6
       }
     ],
-    rest: "https://api.cifer.ai",
-    rpc: "http://34.128.114.243:26657",
+    rest: "https://lcd.cifer.ai",
+    rpc: "https://rpc.cifer.ai",
     bech32Config: {
       bech32PrefixAccAddr: "cife",
       bech32PrefixAccPub: "cifepub",
@@ -8992,6 +8664,11 @@ const _mainnetChains = [
         coinDenom: "saga",
         coinMinimalDenom: "ibc/B88C39AD6C8550716DFD64C3AD28F355633554821249AC9F8BCC21341641CD18",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "xrp",
+        coinMinimalDenom: "ibc/8464A63954C0350A26C8588E20719F3A0AC8705E4CA0F7450B60C3F16B2D3421",
+        coinDecimals: 18
       }
     ],
     rest: "https://api.elys.network",
@@ -17405,7 +17082,7 @@ const _mainnetChains = [
         coinDecimals: 6
       },
       {
-        coinDenom: "xrp",
+        coinDenom: "XRP",
         coinMinimalDenom: "ibc/46EB46DB30D3BBC6F404A9232C09785F36D40DA05C662A8E295712ECBAFF1609",
         coinDecimals: 18
       }
@@ -18530,7 +18207,7 @@ const _mainnetChains = [
         coinDecimals: 6
       }
     ],
-    rest: "https://shannon-grove-rest.mainnet.poktroll.com",
+    rest: "https://shannon-grove-api.mainnet.poktroll.com",
     rpc: "https://shannon-grove-rpc.mainnet.poktroll.com",
     bech32Config: {
       bech32PrefixAccAddr: "pokt",
@@ -21853,6 +21530,62 @@ const _mainnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "symphony-1",
+    currencies: [
+      {
+        coinDenom: "mld",
+        coinMinimalDenom: "note",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "husd",
+        coinMinimalDenom: "uusd",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "hkhd",
+        coinMinimalDenom: "ukhd",
+        coinDecimals: 6
+      },
+      {
+        coinDenom: "hvnd",
+        coinMinimalDenom: "uvnd",
+        coinDecimals: 6
+      }
+    ],
+    rest: "https://symphony.api.nodeshub.online/",
+    rpc: "https://symphony.rpc.nodeshub.online/",
+    bech32Config: {
+      bech32PrefixAccAddr: "symphony",
+      bech32PrefixAccPub: "symphonypub",
+      bech32PrefixValAddr: "symphonyvaloper",
+      bech32PrefixValPub: "symphonyvaloperpub",
+      bech32PrefixConsAddr: "symphonyvalcons",
+      bech32PrefixConsPub: "symphonyvalconspub"
+    },
+    chainName: "symphony",
+    feeCurrencies: [
+      {
+        coinDenom: "mld",
+        coinMinimalDenom: "note",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 25e-5,
+          average: 25e-4,
+          high: 4e-3
+        }
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "mld",
+      coinMinimalDenom: "note",
+      coinDecimals: 6
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "synternet-1",
     currencies: [
@@ -24052,6 +23785,42 @@ const _mainnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "xarchain",
+    currencies: [
+      {
+        coinDenom: "stxar",
+        coinMinimalDenom: "stxar",
+        coinDecimals: 0
+      }
+    ],
+    rest: "https://cosmos01-testnet.arcana.network",
+    rpc: "https://cosmos01-testnet.arcana.network:26650",
+    bech32Config: {
+      bech32PrefixAccAddr: "arcana",
+      bech32PrefixAccPub: "arcanapub",
+      bech32PrefixValAddr: "arcanavaloper",
+      bech32PrefixValPub: "arcanavaloperpub",
+      bech32PrefixConsAddr: "arcanavalcons",
+      bech32PrefixConsPub: "arcanavalconspub"
+    },
+    chainName: "xarchain",
+    feeCurrencies: [
+      {
+        coinDenom: "stxar",
+        coinMinimalDenom: "stxar",
+        coinDecimals: 0
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "stxar",
+      coinMinimalDenom: "stxar",
+      coinDecimals: 0
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "xion-mainnet-1",
     currencies: [
@@ -27650,7 +27419,7 @@ const _testnetChains = [
     }
   },
   {
-    chainId: "lumera-testnet-1",
+    chainId: "lumera-testnet-2",
     currencies: [
       {
         coinDenom: "LUME",
@@ -29453,6 +29222,47 @@ const _testnetChains = [
       coinType: 118
     }
   },
+  {
+    chainId: "safro-testnet-1",
+    currencies: [
+      {
+        coinDenom: "saf",
+        coinMinimalDenom: "usaf",
+        coinDecimals: 6
+      }
+    ],
+    rest: "https://rest.testnet.safrochain.com",
+    rpc: "https://rpc.testnet.safrochain.com",
+    bech32Config: {
+      bech32PrefixAccAddr: "addr_safro",
+      bech32PrefixAccPub: "addr_safropub",
+      bech32PrefixValAddr: "addr_safrovaloper",
+      bech32PrefixValPub: "addr_safrovaloperpub",
+      bech32PrefixConsAddr: "addr_safrovalcons",
+      bech32PrefixConsPub: "addr_safrovalconspub"
+    },
+    chainName: "safrochaintestnet",
+    feeCurrencies: [
+      {
+        coinDenom: "saf",
+        coinMinimalDenom: "usaf",
+        coinDecimals: 6,
+        gasPriceStep: {
+          low: 25e-4,
+          average: 0.025,
+          high: 0.04
+        }
+      }
+    ],
+    stakeCurrency: {
+      coinDenom: "saf",
+      coinMinimalDenom: "usaf",
+      coinDecimals: 6
+    },
+    bip44: {
+      coinType: 118
+    }
+  },
   {
     chainId: "ssc-testnet-2",
     currencies: [
@@ -30003,7 +29813,7 @@ const _testnetChains = [
     }
   },
   {
-    chainId: "sunrise-test-0.1",
+    chainId: "sunrise-test-da-5",
     currencies: [
       {
         coinDenom: "vrise",
@@ -30014,10 +29824,15 @@ const _testnetChains = [
         coinDenom: "rise",
         coinMinimalDenom: "urise",
         coinDecimals: 6
+      },
+      {
+        coinDenom: "usdrise",
+        coinMinimalDenom: "uusdrise",
+        coinDecimals: 6
       }
     ],
-    rest: "https://a-node.sunrise-test-1.cauchye.net:1318",
-    rpc: "https://a-node.sunrise-test-1.cauchye.net/",
+    rest: "https://sunrise-test-da-5.cauchye.net:1318",
+    rpc: "https://sunrise-test-da-5.cauchye.net",
     bech32Config: {
       bech32PrefixAccAddr: "sunrise",
       bech32PrefixAccPub: "sunrisepub",
@@ -30029,8 +29844,8 @@ const _testnetChains = [
     chainName: "sunrisetestnet",
     feeCurrencies: [
       {
-        coinDenom: "rise",
-        coinMinimalDenom: "urise",
+        coinDenom: "usdrise",
+        coinMinimalDenom: "uusdrise",
         coinDecimals: 6,
         gasPriceStep: {
           low: 25e-4,
@@ -30140,62 +29955,6 @@ const _testnetChains = [
       coinType: 118
     }
   },
-  {
-    chainId: "symphony-testnet-3",
-    currencies: [
-      {
-        coinDenom: "mld",
-        coinMinimalDenom: "note",
-        coinDecimals: 6
-      },
-      {
-        coinDenom: "husd",
-        coinMinimalDenom: "uusd",
-        coinDecimals: 6
-      },
-      {
-        coinDenom: "hkhd",
-        coinMinimalDenom: "ukhd",
-        coinDecimals: 6
-      },
-      {
-        coinDenom: "hvnd",
-        coinMinimalDenom: "uvnd",
-        coinDecimals: 6
-      }
-    ],
-    rest: "https://symphony.test.api.nodeshub.online/",
-    rpc: "https://symphony.test.rpc.nodeshub.online/",
-    bech32Config: {
-      bech32PrefixAccAddr: "symphony",
-      bech32PrefixAccPub: "symphonypub",
-      bech32PrefixValAddr: "symphonyvaloper",
-      bech32PrefixValPub: "symphonyvaloperpub",
-      bech32PrefixConsAddr: "symphonyvalcons",
-      bech32PrefixConsPub: "symphonyvalconspub"
-    },
-    chainName: "symphonytestnet3",
-    feeCurrencies: [
-      {
-        coinDenom: "mld",
-        coinMinimalDenom: "note",
-        coinDecimals: 6,
-        gasPriceStep: {
-          low: 25e-4,
-          average: 0.025,
-          high: 0.04
-        }
-      }
-    ],
-    stakeCurrency: {
-      coinDenom: "mld",
-      coinMinimalDenom: "note",
-      coinDecimals: 6
-    },
-    bip44: {
-      coinType: 118
-    }
-  },
   {
     chainId: "amber-2",
     currencies: [
@@ -32403,6 +32162,16 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "bcx_323-1",
+    explorers: [
+      {
+        kind: "pingpub",
+        url: "https://cosmos.buycex.net",
+        txPage: "https://cosmos.buycex.net/tx/${txHash}"
+      }
+    ]
+  },
   {
     chainId: "canto_7700-1",
     explorers: [
@@ -37964,6 +37733,17 @@ const _explorers = [
     chainId: "sunrise-1",
     explorers: []
   },
+  {
+    chainId: "symphony-1",
+    explorers: [
+      {
+        kind: "VinjanXplorer",
+        url: "https://xplorer.vinjan.xyz/symphony",
+        txPage: "https://xplorer.vinjan.xyz/symphony/tx/${txHash}",
+        accountPage: "https://xplorer.vinjan.xyz/symphony/account/${accountAddress}"
+      }
+    ]
+  },
   {
     chainId: "synternet-1",
     explorers: [
@@ -38251,12 +38031,6 @@ const _explorers = [
   {
     chainId: "umee-1",
     explorers: [
-      {
-        kind: "mintscan",
-        url: "https://www.mintscan.io/umee/",
-        txPage: "https://www.mintscan.io/umee/transactions/${txHash}",
-        accountPage: "https://www.mintscan.io/umee/accounts/${accountAddress}"
-      },
       {
         kind: "ping.pub",
         url: "https://ping.pub/umee",
@@ -38442,6 +38216,15 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "xarchain",
+    explorers: [
+      {
+        kind: "arcana ceries intent explorer",
+        url: "https://explorer.arcana.network"
+      }
+    ]
+  },
   {
     chainId: "xion-mainnet-1",
     explorers: [
@@ -39546,7 +39329,7 @@ const _explorers = [
     ]
   },
   {
-    chainId: "lumera-testnet-1",
+    chainId: "lumera-testnet-2",
     explorers: [
       {
         kind: "ping.pub",
@@ -39947,6 +39730,16 @@ const _explorers = [
       }
     ]
   },
+  {
+    chainId: "safro-testnet-1",
+    explorers: [
+      {
+        kind: "bigdipper",
+        url: "https://explorer.testnet.safrochain.com",
+        txPage: "https://explorer.testnet.safrochain.com/transactions/${txHash}"
+      }
+    ]
+  },
   {
     chainId: "ssc-testnet-2",
     explorers: [
@@ -40142,7 +39935,7 @@ const _explorers = [
     ]
   },
   {
-    chainId: "sunrise-test-0.1",
+    chainId: "sunrise-test-da-5",
     explorers: []
   },
   {
@@ -40156,10 +39949,15 @@ const _explorers = [
     ]
   },
   {
-    chainId: "symphony-testnet-4"
-  },
-  {
-    chainId: "symphony-testnet-3"
+    chainId: "symphony-testnet-4",
+    explorers: [
+      {
+        kind: "VinjanXplorer",
+        url: "https://xplorer.vinjan.xyz/symphony-testnet",
+        txPage: "https://xplorer.vinjan.xyz/symphony-testnet/tx/${txHash}",
+        accountPage: "https://xplorer.vinjan.xyz/symphony-testnet/account/${accountAddress}"
+      }
+    ]
   },
   {
     chainId: "amber-2",
@@ -41372,6 +41170,10 @@ const routePreferenceAtom = atom$1(
   }
 );
 const goFastWarningAtom = atomWithStorageNoCrossTabSync("showGoFastWarning", true);
+const ROUTE_ERROR_CODE_MAP = {
+  5: "no route found",
+  12: "no route found"
+};
 const initializeDebounceValuesEffect = atomEffect(
   (get, set) => {
     const sourceAsset = get(sourceAssetAtom);
@@ -41467,10 +41269,15 @@ const _skipRouteAtom = atomWithQuery((get) => {
   };
 });
 const skipRouteAtom = atom$1((get) => {
+  var _a;
   const { data, isError, error, isFetching, isPending } = get(_skipRouteAtom);
   const caughtError = data;
   const routeResponse = data;
   if (caughtError == null ? void 0 : caughtError.isError) {
+    const error2 = caughtError.error;
+    if (((_a = caughtError == null ? void 0 : caughtError.error) == null ? void 0 : _a.code) && ROUTE_ERROR_CODE_MAP[caughtError.error.code]) {
+      error2.message = ROUTE_ERROR_CODE_MAP[caughtError.error.code];
+    }
     return {
       data: void 0,
       isError: true,
@@ -41519,6 +41326,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";
   return HISTORY_VERSION2;
 })(HISTORY_VERSION || {});
 const transactionHistoryVersionAtom = atomWithStorage(
@@ -41529,31 +41337,40 @@ const transactionHistoryAtom = atomWithStorage(
   LOCAL_STORAGE_KEYS.transactionHistory,
   []
 );
+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 setTransactionHistoryAtom = atom$1(
   null,
   (get, set, historyItem) => {
     const history = get(transactionHistoryAtom);
-    const index = history.findIndex((item) => item.timestamp === historyItem.timestamp);
+    const index = history.findIndex((item) => item.id === historyItem.id);
     const newHistory = [...history];
     if (index !== -1) {
       const oldItem = newHistory[index];
       newHistory[index] = { ...oldItem, ...historyItem };
     } else {
-      newHistory.push(historyItem);
+      if (historyItem.id) {
+        set(setCurrentTransactionIdAtom, historyItem.id);
+        newHistory.push(historyItem);
+      }
     }
     set(transactionHistoryAtom, newHistory);
   }
 );
+const currentTransactionAtom = atom$1((get) => {
+  const { currentTransactionId } = get(swapExecutionStateAtom);
+  const history = get(transactionHistoryAtom);
+  return history.find((historyItem) => historyItem.id === currentTransactionId);
+});
 const lastTransactionInTimeAtom = atom$1((get) => {
   const history = get(transactionHistoryAtom);
   if (history.length === 0) return;
   const sorted = [...history].sort((a, b) => b.timestamp - a.timestamp);
-  const lastTx = sorted[0];
-  const originalIndex = history.findIndex((tx) => tx.timestamp === lastTx.timestamp);
-  return {
-    transactionHistoryItem: lastTx,
-    index: originalIndex
-  };
+  return sorted.at(0);
 });
 const removeTransactionHistoryItemAtom = atom$1(null, (get, set, timestamp) => {
   const history = get(transactionHistoryAtom);
@@ -41561,6 +41378,118 @@ const removeTransactionHistoryItemAtom = atom$1(null, (get, set, timestamp) => {
   const newHistory = history.filter((item) => item.timestamp !== timestamp);
   set(transactionHistoryAtom, newHistory);
 });
+var OperationType = /* @__PURE__ */ ((OperationType2) => {
+  OperationType2["swap"] = "swap";
+  OperationType2["evmSwap"] = "evmSwap";
+  OperationType2["transfer"] = "transfer";
+  OperationType2["axelarTransfer"] = "axelarTransfer";
+  OperationType2["cctpTransfer"] = "cctpTransfer";
+  OperationType2["hyperlaneTransfer"] = "hyperlaneTransfer";
+  OperationType2["opInitTransfer"] = "opInitTransfer";
+  OperationType2["bankSend"] = "bankSend";
+  OperationType2["goFastTransfer"] = "goFastTransfer";
+  OperationType2["stargateTransfer"] = "stargateTransfer";
+  OperationType2["eurekaTransfer"] = "eurekaTransfer";
+  OperationType2["layerZeroTransfer"] = "layerZeroTransfer";
+  return OperationType2;
+})(OperationType || {});
+function getOperationDetailsAndType(operation) {
+  const combinedOperation = operation;
+  let returnValue = {
+    details: {},
+    type: void 0
+  };
+  Object.values(OperationType).find((type2) => {
+    var _a;
+    const originalDetails = combinedOperation == null ? void 0 : combinedOperation[type2];
+    if (originalDetails) {
+      const operationDetails = { ...originalDetails };
+      switch (type2) {
+        case "swap":
+        case "evmSwap":
+          operationDetails.toChainId = originalDetails.fromChainId;
+          break;
+        case "axelarTransfer":
+          operationDetails.denomIn = ((_a = originalDetails.ibcTransferToAxelar) == null ? void 0 : _a.denomIn) ?? originalDetails.denomIn;
+          break;
+        case "bankSend": {
+          const bankSend = originalDetails;
+          operationDetails.denomIn = bankSend.denom;
+          operationDetails.denomOut = bankSend.denom;
+          operationDetails.fromChainId = bankSend.chainId;
+          operationDetails.toChainId = bankSend.chainId;
+          break;
+        }
+      }
+      returnValue = {
+        details: operationDetails,
+        type: type2
+      };
+    }
+  });
+  return returnValue;
+}
+function getClientOperation(operation) {
+  const { details, type: type2 } = getOperationDetailsAndType(operation);
+  return {
+    type: type2,
+    ...details,
+    txIndex: operation.txIndex,
+    amountIn: operation.amountIn,
+    amountOut: operation.amountOut,
+    swapVenues: [
+      ...details.swapVenues ?? [],
+      ...(details == null ? void 0 : details.swapIn) ? [details == null ? void 0 : details.swapIn.swapVenue] : [],
+      ...(details == null ? void 0 : details.swapOut) ? [details == null ? void 0 : details.swapOut.swapVenue] : []
+    ]
+  };
+}
+function getClientOperations(operations) {
+  if (!operations) return [];
+  let transferIndex = 0;
+  const filteredOperations = filterNeutronSwapFee(operations);
+  return filteredOperations.map((operation, index, arr) => {
+    const prevOperation = arr[index - 1];
+    const signRequired = (() => {
+      if (index === 0) {
+        return false;
+      } else {
+        if (operation.txIndex > prevOperation.txIndex) {
+          return true;
+        }
+        return false;
+      }
+    })();
+    const clientOperation = getClientOperation(operation);
+    const isSwap = clientOperation.type === "swap" || clientOperation.type === "evmSwap";
+    const result = {
+      ...clientOperation,
+      transferIndex,
+      signRequired,
+      isSwap
+    };
+    if (!isSwap) {
+      transferIndex++;
+    }
+    return result;
+  });
+}
+function filterNeutronSwapFee(operations) {
+  return operations.filter((op, i) => {
+    var _a, _b, _c, _d, _e2, _f, _g, _h;
+    const clientOperation = getClientOperation(op);
+    if (clientOperation.type === "swap" && ((_b = (_a = clientOperation.swapOut) == null ? void 0 : _a.swapVenue) == null ? void 0 : _b.name) === "neutron-astroport" && ((_c = clientOperation.swapOut) == null ? void 0 : _c.swapVenue.chainId) === "neutron-1" && clientOperation.chainId === "neutron-1" && clientOperation.denomOut === "untrn" && clientOperation.fromChainId === "neutron-1" && ((_d = clientOperation.swapOut) == null ? void 0 : _d.swapAmountOut) === "200000") {
+      const nextOperation = operations[i + 1];
+      if (nextOperation) {
+        const nextClientOperation = getClientOperation(nextOperation);
+        if (nextClientOperation.type === "swap" && ((_f = (_e2 = nextClientOperation.swapIn) == null ? void 0 : _e2.swapVenue) == null ? void 0 : _f.name) === "neutron-astroport" && ((_h = (_g = nextClientOperation.swapIn) == null ? void 0 : _g.swapVenue) == null ? void 0 : _h.chainId) === "neutron-1" && nextClientOperation.chainId === "neutron-1") {
+          return false;
+        }
+      }
+    }
+    return true;
+  });
+}
 function isUserRejectedRequestError(input) {
   if (input instanceof Error) {
     if (
@@ -45486,7 +45415,7 @@ function walletConnect(parameters) {
         const optionalChains = config2.chains.map((x2) => x2.id);
         if (!optionalChains.length)
           return;
-        const { EthereumProvider } = await import("./index.es-BhgJ58L0.js");
+        const { EthereumProvider } = await import("./index.es-DOVSLdtw.js");
         return await EthereumProvider.init({
           ...parameters,
           disableProviderPing: true,
@@ -45815,6 +45744,7 @@ const createExplorerLink = ({
 };
 const createSkipExplorerLink = (transactionDetails) => {
   var _a, _b;
+  if (!transactionDetails) return "";
   const { get } = jotaiStore;
   const txHashCommaSeperatedList = (_a = transactionDetails == null ? void 0 : transactionDetails.map((txDetails) => txDetails.txHash)) == null ? void 0 : _a.join(",");
   const isTestnet = get(onlyTestnetsAtom);
@@ -45828,30 +45758,20 @@ const swapExecutionStateAtom = atomWithStorageNoCrossTabSync(
     route: void 0,
     clientOperations: [],
     userAddresses: [],
-    transactionDetailsArray: [],
-    transactionHistoryIndex: 0,
-    overallStatus: "unconfirmed",
-    isValidatingGasBalance: void 0,
-    transactionsSigned: 0,
-    timestamp: -1
+    currentTransactionId: void 0
   }
 );
-const setOverallStatusAtom = atom$1(null, (_get, set, status) => {
-  set(swapExecutionStateAtom, (state) => ({ ...state, overallStatus: status }));
-});
-const clearIsValidatingGasBalanceAtom = atom$1(null, (_get, set) => {
-  set(swapExecutionStateAtom, (state) => ({
-    ...state,
-    isValidatingGasBalance: void 0
+const setCurrentTransactionIdAtom = atom$1(null, (_get, set, transactionId) => {
+  set(swapExecutionStateAtom, (prev2) => ({
+    ...prev2,
+    currentTransactionId: transactionId
   }));
 });
 const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
   var _a;
   const { data: route2 } = get(skipRouteAtom);
   const { data: chains2 } = get(skipChainsAtom);
-  const transactionHistory = get(transactionHistoryAtom);
   const callbacks = get(callbacksAtom);
-  const transactionHistoryIndex = Array.isArray(transactionHistory) ? transactionHistory.length : 0;
   if (!route2) return;
   const {
     requiredChainAddresses,
@@ -45875,46 +45795,43 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
     transactionDetailsArray: [],
     route: route2,
     clientOperations: getClientOperations(route2.operations),
-    transactionHistoryIndex,
-    overallStatus: "unconfirmed",
-    isValidatingGasBalance: void 0,
-    transactionsSigned: 0,
-    timestamp: Date.now()
+    currentTransactionId: void 0
   });
   set(submitSwapExecutionCallbacksAtom, {
-    onTransactionSignRequested: async (props) => {
-      var _a2;
-      track("execute route: transaction sign requested", { props });
-      (_a2 = callbacks == null ? void 0 : callbacks.onTransactionSignRequested) == null ? void 0 : _a2.call(callbacks, props);
+    onRouteStatusUpdated: async (routeStatus) => {
+      set(setTransactionHistoryAtom, routeStatus);
     },
     onTransactionUpdated: (txInfo) => {
-      var _a2;
       track("execute route: transaction updated", { txInfo });
-      if (((_a2 = txInfo.status) == null ? void 0 : _a2.status) !== "STATE_COMPLETED") {
-        set(setTransactionDetailsAtom, {
-          transactionDetails: txInfo
-        });
-      }
     },
     onApproveAllowance: async ({ status, allowance }) => {
       track("execute route: approve allowance", { status, allowance });
-      if (allowance && status === "pending") {
-        set(setOverallStatusAtom, "approving");
-      }
+    },
+    onTransactionSigned: async (txInfo) => {
+      track("execute route: transaction signed");
+      set(swapExecutionStateAtom, (prev2) => {
+        const clientOperations = prev2.clientOperations;
+        const signRequiredIndex = clientOperations.findIndex((operation) => {
+          return operation.signRequired && (operation.chainId === txInfo.chainId || operation.fromChainId === txInfo.chainId);
+        });
+        if (signRequiredIndex >= 0) {
+          clientOperations[signRequiredIndex].signRequired = false;
+        }
+        return {
+          ...prev2,
+          clientOperations
+        };
+      });
     },
     onTransactionBroadcast: async (txInfo) => {
       var _a2;
       track("execute route: transaction broadcasted", { txInfo });
-      setUser({ id: txInfo == null ? void 0 : txInfo.txHash });
       const chain = chains2 == null ? void 0 : chains2.find((chain2) => chain2.chainId === txInfo.chainId);
       const explorerLink = createExplorerLink({
         chainId: txInfo.chainId,
         chainType: chain == null ? void 0 : chain.chainType,
         txHash: txInfo.txHash
       });
-      set(setTransactionDetailsAtom, {
-        transactionDetails: { ...txInfo, explorerLink, status: void 0 }
-      });
       (_a2 = callbacks == null ? void 0 : callbacks.onTransactionBroadcasted) == null ? void 0 : _a2.call(callbacks, {
         chainId: txInfo.chainId,
         txHash: txInfo.txHash,
@@ -45929,8 +45846,11 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
     },
     onTransactionCompleted: async ({ chainId, txHash, status }) => {
       var _a2;
-      track("execute route: transaction completed", { chainId, txHash, status });
-      setTag("txCompleted", true);
+      track("execute route: transaction completed", {
+        chainId,
+        txHash,
+        status
+      });
       const chain = chains2 == null ? void 0 : chains2.find((chain2) => chain2.chainId === chainId);
       const explorerLink = createExplorerLink({
         chainId,
@@ -45949,34 +45869,10 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
         destAssetChainId
       });
     },
-    onTransactionSigned: async (txInfo) => {
-      track("execute route: transaction signed");
-      let transactionsSigned = 0;
-      set(swapExecutionStateAtom, (prev2) => {
-        transactionsSigned = (prev2.transactionsSigned ?? 0) + 1;
-        const clientOperations = prev2.clientOperations;
-        const signRequiredIndex = clientOperations.findIndex((operation) => {
-          return operation.signRequired && (operation.chainId === txInfo.chainId || operation.fromChainId === txInfo.chainId);
-        });
-        if (signRequiredIndex >= 0) {
-          clientOperations[signRequiredIndex].signRequired = false;
-        }
-        return {
-          ...prev2,
-          clientOperations,
-          transactionsSigned
-        };
-      });
-      const { timestamp } = get(swapExecutionStateAtom);
-      set(setTransactionHistoryAtom, {
-        timestamp,
-        signatures: transactionsSigned
-      });
-      set(setOverallStatusAtom, "pending");
-    },
     onError: (error) => {
       var _a2, _b, _c;
       const currentPage = get(currentPageAtom);
+      set(setCurrentTransactionIdAtom);
       track("execute route: error", { error, route: route2 });
       (_a2 = callbacks == null ? void 0 : callbacks.onTransactionFailed) == null ? void 0 : _a2.call(callbacks, {
         error: error == null ? void 0 : error.message
@@ -45985,80 +45881,34 @@ const setSwapExecutionStateAtom = atom$1(null, (get, set) => {
         track("expected error page: user rejected request");
         if (currentPage === Routes.SwapExecutionPage) {
           set(errorWarningAtom, {
-            errorWarningType: ErrorWarningType.AuthFailed,
-            onClickBack: () => {
-              set(setOverallStatusAtom, "unconfirmed");
-              set(clearIsValidatingGasBalanceAtom);
-            }
+            errorWarningType: ErrorWarningType.AuthFailed
           });
         }
       } else if ((_b = error == null ? void 0 : error.message) == null ? void 0 : _b.toLowerCase().includes("relay fee quote has expired")) {
-        track("error page: relay fee quote has expired");
+        track("expected error page: relay fee quote has expired");
         set(errorWarningAtom, {
-          errorWarningType: ErrorWarningType.ExpiredRelayFeeQuote,
-          error,
-          onClickBack: () => {
-            set(setOverallStatusAtom, "unconfirmed");
-          }
+          errorWarningType: ErrorWarningType.ExpiredRelayFeeQuote
         });
       } else if ((_c = error == null ? void 0 : error.message) == null ? void 0 : _c.toLowerCase().includes("insufficient balance for gas")) {
         track("expected error page: insufficient gas balance");
         set(errorWarningAtom, {
           errorWarningType: ErrorWarningType.InsufficientBalanceForGas,
-          error,
-          onClickBack: () => {
-            set(setOverallStatusAtom, "unconfirmed");
-          }
+          error
         });
       }
     },
     onValidateGasBalance: async (props) => {
       track("execute route: validate gas balance", { props });
-      if (props.status === "pending") {
-        set(setValidatingGasBalanceAtom, { status: "pending" });
-      } else if (props.status === "completed") {
-        set(setValidatingGasBalanceAtom, { status: "completed" });
-        set(setOverallStatusAtom, "signing");
-      }
     }
   });
 });
-const setValidatingGasBalanceAtom = atom$1(
+atom$1(
   null,
   (_get, set, isValidatingGasBalance) => {
-    set(swapExecutionStateAtom, (state) => ({ ...state, isValidatingGasBalance }));
-  }
-);
-const setTransactionDetailsAtom = atom$1(
-  null,
-  (get, set, { transactionDetails, status }) => {
-    const swapExecutionState = get(swapExecutionStateAtom);
-    const { transactionDetailsArray, route: route2 } = swapExecutionState;
-    const newTransactionDetailsArray = [...transactionDetailsArray];
-    const transactionIndexFound = newTransactionDetailsArray.findIndex(
-      (transaction) => transaction.txHash.toLowerCase() === transactionDetails.txHash.toLowerCase()
-    );
-    if (transactionIndexFound !== -1) {
-      newTransactionDetailsArray[transactionIndexFound] = {
-        ...newTransactionDetailsArray[transactionIndexFound],
-        ...transactionDetails
-      };
-    } else {
-      newTransactionDetailsArray.push(transactionDetails);
-    }
-    set(swapExecutionStateAtom, {
-      ...swapExecutionState,
-      transactionDetailsArray: newTransactionDetailsArray
-    });
-    set(setTransactionHistoryAtom, {
-      route: route2,
-      transactionDetails: newTransactionDetailsArray,
-      transferEvents: [],
-      isSettled: false,
-      isSuccess: false,
-      timestamp: swapExecutionState == null ? void 0 : swapExecutionState.timestamp,
-      ...status && { status }
-    });
+    set(swapExecutionStateAtom, (state) => ({
+      ...state,
+      isValidatingGasBalance
+    }));
   }
 );
 const chainAddressEffectAtom = atomEffect((get, set) => {
@@ -46083,7 +45933,7 @@ const simulateTxAtom = atom$1();
 const batchSignTxsAtom = atom$1(true);
 const skipSubmitSwapExecutionAtom = atomWithMutation((get) => {
   var _a;
-  const { route: route2, userAddresses, transactionDetailsArray } = get(swapExecutionStateAtom);
+  const { route: route2, userAddresses } = get(swapExecutionStateAtom);
   const submitSwapExecutionCallbacks = get(submitSwapExecutionCallbacksAtom);
   const simulateTx = get(simulateTxAtom);
   const batchSignTxs = get(batchSignTxsAtom);
@@ -46159,14 +46009,16 @@ const skipSubmitSwapExecutionAtom = atomWithMutation((get) => {
         });
       } catch (error) {
         console.error(error);
-        (_a2 = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _a2.call(submitSwapExecutionCallbacks, error, transactionDetailsArray);
+        const currentTransaction = get(currentTransactionAtom);
+        (_a2 = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _a2.call(submitSwapExecutionCallbacks, error, currentTransaction == null ? void 0 : currentTransaction.transactionDetails);
       }
       return null;
     },
     onError: (error) => {
       var _a2;
       console.error(error);
-      (_a2 = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _a2.call(submitSwapExecutionCallbacks, error, transactionDetailsArray);
+      const currentTransaction = get(currentTransactionAtom);
+      (_a2 = submitSwapExecutionCallbacks == null ? void 0 : submitSwapExecutionCallbacks.onError) == null ? void 0 : _a2.call(submitSwapExecutionCallbacks, error, currentTransaction == null ? void 0 : currentTransaction.transactionDetails);
     }
   };
 });
@@ -46191,18 +46043,15 @@ const UnexpectedErrorPageTimeout = ({
   const theme = nt();
   const [errorWarning, setErrorWarning] = useAtom(errorWarningAtom);
   const setCurrentPage = useSetAtom(currentPageAtom);
-  const { route: route2, transactionDetailsArray } = useAtomValue(swapExecutionStateAtom);
+  const { route: route2 } = useAtomValue(swapExecutionStateAtom);
   const isGoFast = useIsGoFast(route2);
-  const { data } = useBroadcastedTxsStatus({
-    txsRequired: route2 == null ? void 0 : route2.txsRequired,
-    transactionDetails: transactionDetailsArray
-  });
+  const lastTransactionInTime = useAtomValue(lastTransactionInTimeAtom);
   useEffect(() => {
-    if (errorWarning && (data == null ? void 0 : data.isSettled)) {
+    if (errorWarning && (lastTransactionInTime == null ? void 0 : lastTransactionInTime.status) !== "pending") {
       track("unexpected error page: transaction timeover - transaction settled");
       setErrorWarning(void 0);
     }
-  }, [data == null ? void 0 : data.isSettled, errorWarning, setErrorWarning]);
+  }, [errorWarning, lastTransactionInTime == null ? void 0 : lastTransactionInTime.status, setErrorWarning]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       PageHeader,
@@ -46688,12 +46537,13 @@ const ModalRowItem = ({
   rightContent,
   onClick,
   style,
-  eureka
+  eureka,
+  as = "button"
 }) => {
   return /* @__PURE__ */ jsxs(
     StyledModalRowItemContainer,
     {
-      as: "button",
+      as,
       align: "center",
       justify: "space-between",
       onClick,
@@ -46707,16 +46557,29 @@ const ModalRowItem = ({
     }
   );
 };
-const StyledModalRowItemContainer = dt(Row)`
+const StyledModalRowItemContainer = dt(Row).attrs(
+  ({ onClick, as }) => ({
+    ...as === "div" && !!onClick && {
+      role: "button",
+      tabIndex: 0,
+      onKeyDown: (e) => {
+        if (e.key === "Enter") {
+          e.preventDefault();
+          onClick();
+        }
+      }
+    }
+  })
+)`
   ${removeButtonStyles};
   position: relative;
-  width: 100%;
+  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: 12px 15px;
+  padding: ${({ as }) => as === "div" ? "0 15px" : "12px 15px"};
   margin-top: 5px;
 
   z-index: 0;
@@ -46812,6 +46675,7 @@ const VirtualList = ({
 }) => {
   const theme = nt();
   const [currentlyFocusedElement, setCurrentlyFocusedElement] = useState();
+  const [currentlyFocusedItemKey, setCurrentlyFocusedItemKey] = useState();
   const listHeight = useListHeight(itemHeight);
   const listRef = useRef(null);
   const itemRefs = useRef({});
@@ -46856,10 +46720,11 @@ const VirtualList = ({
   useEffect(() => {
     if (!listRef.current || expandedItemKey == null) return;
     const index = listItems.findIndex((item) => itemKey(item) === expandedItemKey);
-    if (index !== -1) {
+    if (index !== -1 && currentlyFocusedItemKey !== expandedItemKey) {
       listRef.current.scrollTo({ index, align: "top" });
+      setCurrentlyFocusedItemKey(expandedItemKey);
     }
-  }, [expandedItemKey, listItems, itemKey]);
+  }, [expandedItemKey, listItems, itemKey, currentlyFocusedElement, currentlyFocusedItemKey]);
   if (listItems.length === 0) {
     return /* @__PURE__ */ jsxs(StyledNoResultsContainer, { gap: 10, height: height ?? listHeight, children: [
       empty == null ? void 0 : empty.icon,
@@ -48384,6 +48249,7 @@ 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: [
@@ -48883,7 +48749,7 @@ const SwapSettingsDrawer = createModal(() => {
   }, [route2]);
   return /* @__PURE__ */ jsxs(StyledSwapPageSettings, { gap: 15, children: [
     /* @__PURE__ */ jsxs(Column, { gap: 10, children: [
-      /* @__PURE__ */ jsxs(Row, { justify: "space-between", align: "center", children: [
+      route2 && /* @__PURE__ */ jsxs(Row, { justify: "space-between", align: "center", children: [
         /* @__PURE__ */ jsx(SwapDetailText, { children: "Route" }),
         /* @__PURE__ */ jsx(Row, { align: "center", gap: 5, children: chainsRoute == null ? void 0 : chainsRoute.map((chain, index) => {
           var _a;
@@ -50278,7 +50144,6 @@ const RoutePreferenceLabel = ({ preference }) => {
 };
 const SwapPageFooterItems = ({
   content,
-  showRouteInfo = false,
   showEstimatedTime = false,
   highlightSettings = false
 }) => {
@@ -50287,11 +50152,12 @@ const SwapPageFooterItems = ({
   const settingsChanged = useSettingsChanged();
   const isMobile2 = useIsMobileScreenSize();
   const isGoFast = useIsGoFast(route2);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
   const estimatedSeconds = route2 == null ? void 0 : route2.estimatedRouteDurationSeconds;
-  const signaturesRequired = (route2 == null ? void 0 : route2.txsRequired) ?? 1;
+  const signaturesRequired = route2 ? (route2 == null ? void 0 : route2.txsRequired) - ((currentTransaction == null ? void 0 : currentTransaction.txsSigned) ?? 0) : 0;
   const leftContent = () => {
     if (content) return content;
-    if (isLoading || !showRouteInfo || !route2) return null;
+    if (isLoading) return null;
     return /* @__PURE__ */ jsxs(Row, { align: "flex-end", gap: 10, height: isMobile2 ? void 0 : 13, children: [
       showEstimatedTime && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(SettingsButton, { highlight: highlightSettings, changed: settingsChanged }),
@@ -50345,7 +50211,6 @@ const settingsDrawerAtom = atom$1(void 0);
 const useSettingsDrawer = () => {
   const [drawerOpen, setDrawerOpen] = useState(false);
   const settingsDrawer = useAtomValue(settingsDrawerAtom);
-  const { isError: isRouteError, data: route2 } = useAtomValue(skipRouteAtom);
   const isWaitingForNewRoute = useAtomValue(isWaitingForNewRouteAtom);
   const setShowGoFastErrorAtom = useSetAtom(goFastWarningAtom);
   const SettingsFooter = ({ content, ...props }) => {
@@ -50368,8 +50233,7 @@ const useSettingsDrawer = () => {
     return /* @__PURE__ */ jsx(
       SwapPageFooter,
       {
-        disabled: isRouteError || isWaitingForNewRoute || route2 === void 0,
-        showRouteInfo: true,
+        disabled: isWaitingForNewRoute,
         showEstimatedTime: true,
         onClick: openSettingsDrawer,
         ...props
@@ -50385,7 +50249,6 @@ const WarningPageGoFast = ({ onClickBack, onClickContinue }) => {
   const theme = nt();
   useEffect(() => {
     setShowGoFastErrorAtom(false);
-    setTag("goFastWarning", true);
   }, [setShowGoFastErrorAtom]);
   const handleOnClickBack = () => {
     setErrorWarningAtom(void 0);
@@ -50544,9 +50407,6 @@ const ExpectedErrorPageInsufficientGasBalance = ({
   const theme = nt();
   const setErrorWarningAtom = useSetAtom(errorWarningAtom);
   const setCurrentPage = useSetAtom(currentPageAtom);
-  useEffect(() => {
-    setTag("errorMessage", error == null ? void 0 : error.message);
-  }, [error == null ? void 0 : error.message]);
   const onClickRetry = () => {
     setErrorWarningAtom(void 0);
     setCurrentPage(Routes.SwapPage);
@@ -50592,15 +50452,11 @@ const ExpectedErrorPageInsufficientGasBalance = ({
   ] });
 };
 const ExpectedErrorPageRelayFeeQuoteExpired = ({
-  error,
   onClickBack
 }) => {
   const theme = nt();
   const setErrorAtom = useSetAtom(errorWarningAtom);
   const setCurrentPage = useSetAtom(currentPageAtom);
-  useEffect(() => {
-    setTag("errorMessage", error == null ? void 0 : error.message);
-  }, [error == null ? void 0 : error.message]);
   const onClickRetry = () => {
     setErrorAtom(void 0);
     setCurrentPage(Routes.SwapPage);
@@ -50613,7 +50469,7 @@ const ExpectedErrorPageRelayFeeQuoteExpired = ({
           label: "Back",
           icon: ICONS.thinArrow,
           onClick: () => {
-            track("error page: relay fee quote expired - header back button clicked");
+            track("expected error page: relay fee quote expired - header back button clicked");
             setErrorAtom(void 0);
             onClickBack == null ? void 0 : onClickBack();
             setCurrentPage(Routes.SwapPage);
@@ -50637,7 +50493,7 @@ const ExpectedErrorPageRelayFeeQuoteExpired = ({
         label: "Retry",
         icon: ICONS.rightArrow,
         onClick: () => {
-          track("error page: relay fee quote expired - retry button clicked");
+          track("expected error page: relay fee quote expired - retry button clicked");
           onClickRetry();
         },
         backgroundColor: theme.error.text
@@ -51212,7 +51068,8 @@ const StyledGasStationTxText = dt(SmallText)`
 const useAutoSetAddress = () => {
   var _a, _b, _c;
   const [chainAddresses, setChainAddresses] = useAtom(chainAddressesAtom);
-  const { route: route2, overallStatus } = useAtomValue(swapExecutionStateAtom);
+  const { route: route2 } = useAtomValue(swapExecutionStateAtom);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
   const requiredChainAddresses = route2 == null ? void 0 : route2.requiredChainAddresses;
   const { data: chains2 } = useAtomValue(skipChainsAtom);
   const sourceWallet = useAtomValue(walletsAtom);
@@ -51347,7 +51204,7 @@ const useAutoSetAddress = () => {
   );
   useEffect(() => {
     var _a2, _b2, _c2, _d, _e2, _f;
-    if (overallStatus !== "unconfirmed") {
+    if (currentTransaction && (currentTransaction == null ? void 0 : currentTransaction.status) !== "unconfirmed") {
       setIsLoading(false);
       return;
     }
@@ -51368,8 +51225,9 @@ const useAutoSetAddress = () => {
     (_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,
-    overallStatus,
     requiredChainAddresses,
     sourceWallet
   ]);
@@ -51382,27 +51240,31 @@ const useAutoSetAddress = () => {
   return { connectRequiredChains, isLoading };
 };
 const useHandleTransactionTimeout = (swapExecutionState) => {
-  const { route: route2, transactionDetailsArray } = useAtomValue(swapExecutionStateAtom);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
+  const setCurrentTransactionId = useSetAtom(setCurrentTransactionIdAtom);
   const setError = useSetAtom(errorWarningAtom);
-  const setOverallStatus = useSetAtom(setOverallStatusAtom);
   const [transactionTimeoutTimer, setTransactionTimeoutTimer] = useState();
   useEffect(() => {
-    if (!(route2 == null ? void 0 : route2.estimatedRouteDurationSeconds) || !(route2 == null ? void 0 : route2.txsRequired)) return;
-    if (swapExecutionState === SwapExecutionState.pending && transactionTimeoutTimer === void 0 && route2.txsRequired === transactionDetailsArray.length) {
-      const lastTransaction = transactionDetailsArray[transactionDetailsArray.length - 1];
+    var _a, _b, _c;
+    if (!((_a = currentTransaction == null ? void 0 : currentTransaction.route) == null ? void 0 : _a.estimatedRouteDurationSeconds) || !(currentTransaction == null ? void 0 : currentTransaction.txsRequired))
+      return;
+    if (swapExecutionState === SwapExecutionState.pending && transactionTimeoutTimer === void 0 && (currentTransaction == null ? void 0 : currentTransaction.txsRequired) === ((_b = currentTransaction == null ? void 0 : currentTransaction.transactionDetails) == null ? void 0 : _b.length)) {
       const timeoutTimer = setTimeout(
         () => {
-          track("unexpected error page: transaction timeover", { route: route2 });
+          var _a2, _b2;
+          track("unexpected error page: transaction timeover", {
+            route: currentTransaction == null ? void 0 : currentTransaction.route
+          });
           setError({
             errorWarningType: ErrorWarningType.Timeout,
             onClickBack: () => {
-              setOverallStatus("unconfirmed");
+              setCurrentTransactionId();
             },
-            explorerLink: createSkipExplorerLink(transactionDetailsArray),
-            txHash: lastTransaction == null ? void 0 : lastTransaction.txHash
+            explorerLink: (currentTransaction == null ? void 0 : currentTransaction.transactionDetails) ? createSkipExplorerLink(currentTransaction.transactionDetails) : "",
+            txHash: ((_b2 = (_a2 = currentTransaction == null ? void 0 : currentTransaction.transactionDetails) == null ? void 0 : _a2.at(-1)) == null ? void 0 : _b2.txHash) ?? ""
           });
         },
-        route2.estimatedRouteDurationSeconds * 1e3 * 3
+        ((_c = currentTransaction == null ? void 0 : currentTransaction.route) == null ? void 0 : _c.estimatedRouteDurationSeconds) * 1e3 * 3
       );
       setTransactionTimeoutTimer(timeoutTimer);
     }
@@ -51410,98 +51272,28 @@ const useHandleTransactionTimeout = (swapExecutionState) => {
       clearTimeout(transactionTimeoutTimer);
     };
   }, [
-    route2,
+    currentTransaction == null ? void 0 : currentTransaction.route,
+    currentTransaction == null ? void 0 : currentTransaction.transactionDetails,
+    currentTransaction == null ? void 0 : currentTransaction.txsRequired,
+    setCurrentTransactionId,
     setError,
-    setOverallStatus,
     swapExecutionState,
-    transactionDetailsArray,
     transactionTimeoutTimer
   ]);
 };
-const useSyncTxStatus = ({
-  statusData,
-  timestamp
-}) => {
-  const transferEvents = statusData == null ? void 0 : statusData.transferEvents;
-  const setOverallStatus = useSetAtom(setOverallStatusAtom);
-  const {
-    route: route2,
-    transactionDetailsArray,
-    overallStatus,
-    transactionHistoryIndex: currentTransactionHistoryIndex
-  } = useAtomValue(swapExecutionStateAtom);
-  const setTransactionHistory = useSetAtom(setTransactionHistoryAtom);
-  const transactionHistoryItems = useAtomValue(transactionHistoryAtom);
-  const { isPending } = useAtomValue(skipSubmitSwapExecutionAtom);
-  const clientOperations = useMemo(() => {
-    if (!(route2 == null ? void 0 : route2.operations)) return [];
-    return getClientOperations(route2.operations);
-  }, [route2 == null ? void 0 : route2.operations]);
-  const computedSwapStatus = useMemo(() => {
-    if ((statusData == null ? void 0 : statusData.lastTxStatus) === "pending") {
-      if (isPending) {
-        setOverallStatus("pending");
-      }
-      return "pending";
-    }
-    if (!transferEvents) return;
-    if (statusData.isSuccess) {
-      return "completed";
-    }
-    if (!statusData.isSuccess && statusData.isSettled) {
-      return "failed";
-    }
-    if (transferEvents == null ? void 0 : transferEvents.find(({ status }) => status === "pending")) {
-      return "pending";
-    }
-    if (transferEvents == null ? void 0 : transferEvents.every(({ status }) => status === "unconfirmed")) {
-      return "unconfirmed";
-    }
-  }, [
-    statusData == null ? void 0 : statusData.lastTxStatus,
-    statusData == null ? void 0 : statusData.isSettled,
-    statusData == null ? void 0 : statusData.isSuccess,
-    transferEvents,
-    isPending,
-    setOverallStatus
-  ]);
-  useEffect(() => {
-    if (computedSwapStatus && timestamp !== void 0) {
-      const index = transactionHistoryItems.findIndex(
-        (txHistoryItem) => txHistoryItem.timestamp === timestamp
-      );
-      const oldTxHistoryItem = transactionHistoryItems[index];
-      const newTxHistoryItem = {
-        ...oldTxHistoryItem,
-        ...statusData,
-        status: computedSwapStatus
-      };
-      if (JSON.stringify(newTxHistoryItem) !== JSON.stringify(oldTxHistoryItem)) {
-        setTransactionHistory(newTxHistoryItem);
-        setOverallStatus(computedSwapStatus);
-      }
-    }
-  }, [
-    clientOperations,
-    overallStatus,
-    computedSwapStatus,
-    setOverallStatus,
-    transactionDetailsArray.length,
-    transactionHistoryItems,
-    statusData,
-    setTransactionHistory,
-    currentTransactionHistoryIndex,
-    timestamp
-  ]);
-};
 function useSwapExecutionState({
   chainAddresses,
   route: route2,
-  overallStatus,
-  isValidatingGasBalance,
-  signaturesRemaining,
   isLoading
 }) {
+  const currentTransaction = useAtomValue(currentTransactionAtom);
+  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)) {
+      return true;
+    }
+    return false;
+  }, [currentTransaction]);
   return useMemo(() => {
     var _a;
     if (isLoading) return SwapExecutionState.pendingGettingAddresses;
@@ -51515,22 +51307,22 @@ function useSwapExecutionState({
       }
     );
     const lastChainAddress = (_a = chainAddresses[requiredChainAddresses.length - 1]) == null ? void 0 : _a.address;
-    if (overallStatus === "completed") {
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "completed") {
       return SwapExecutionState.confirmed;
     }
-    if (overallStatus === "pending" || overallStatus === "failed") {
-      if (signaturesRemaining > 0) {
-        return SwapExecutionState.signaturesRemaining;
-      }
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "pending") {
       return SwapExecutionState.pending;
     }
-    if (overallStatus === "approving") {
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "allowance") {
       return SwapExecutionState.approving;
     }
-    if (isValidatingGasBalance && isValidatingGasBalance.status !== "completed") {
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "validating") {
       return SwapExecutionState.validatingGasBalance;
     }
-    if (overallStatus === "signing") {
+    if ((currentTransaction == null ? void 0 : currentTransaction.status) === "signing") {
+      if (showSignaturesRemaining) {
+        return SwapExecutionState.signaturesRemaining;
+      }
       return SwapExecutionState.waitingForSigning;
     }
     if (!lastChainAddress) {
@@ -51544,9 +51336,8 @@ function useSwapExecutionState({
     isLoading,
     chainAddresses,
     route2 == null ? void 0 : route2.requiredChainAddresses,
-    overallStatus,
-    isValidatingGasBalance,
-    signaturesRemaining
+    currentTransaction == null ? void 0 : currentTransaction.status,
+    showSignaturesRemaining
   ]);
 }
 const LightningIcon = ({
@@ -51781,11 +51572,12 @@ const useHandleTransactionFailed = (error, statusData) => {
   const setErrorWarning = useSetAtom(errorWarningAtom);
   const setCurrentPage = useSetAtom(currentPageAtom);
   const setSourceAsset = useSetAtom(sourceAssetAtom);
+  const setCurrentTransactionId = useSetAtom(setCurrentTransactionIdAtom);
   const setDebouncedSourceAssetAmount = useSetAtom(debouncedSourceAssetAmountAtom);
-  const setOverallStatus = useSetAtom(setOverallStatusAtom);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
   const [{ data: assets2 }] = useAtom(skipAssetsAtom);
-  const { transactionDetailsArray, route: route2 } = useAtomValue(swapExecutionStateAtom);
-  const lastTransaction = transactionDetailsArray.at(-1);
+  const { route: route2 } = useAtomValue(swapExecutionStateAtom);
+  const lastTransaction = currentTransaction == null ? void 0 : currentTransaction.transactionDetails.at(-1);
   const lastTxHash = lastTransaction == null ? void 0 : lastTransaction.txHash;
   const getClientAsset = useCallback(
     (denom, chainId) => {
@@ -51796,7 +51588,7 @@ const useHandleTransactionFailed = (error, statusData) => {
     },
     [assets2]
   );
-  const explorerLink = createSkipExplorerLink(transactionDetailsArray);
+  const explorerLink = createSkipExplorerLink(currentTransaction == null ? void 0 : currentTransaction.transactionDetails);
   const handleTransactionFailed = useCallback(() => {
     var _a, _b;
     track("unexpected error page: error occurred", { error, route: route2 });
@@ -51838,7 +51630,9 @@ const useHandleTransactionFailed = (error, statusData) => {
       setErrorWarning({
         errorWarningType: ErrorWarningType.Unexpected,
         error,
-        onClickBack: () => setOverallStatus("unconfirmed")
+        onClickBack: () => {
+          setCurrentTransactionId();
+        }
       });
     }
   }, [
@@ -51849,28 +51643,24 @@ const useHandleTransactionFailed = (error, statusData) => {
     lastTxHash,
     route2,
     setCurrentPage,
+    setCurrentTransactionId,
     setDebouncedSourceAssetAmount,
     setErrorWarning,
-    setOverallStatus,
     setSourceAsset,
     statusData == null ? void 0 : statusData.transferAssetRelease
   ]);
   useEffect(() => {
-    if ((statusData == null ? void 0 : statusData.isSuccess) || !(statusData == null ? void 0 : statusData.isSettled)) return;
-    const timeout = setTimeout(() => {
-      handleTransactionFailed();
-    }, DELAY_EXPECTING_TRANSFER_ASSET_RELEASE);
-    if (statusData.transferAssetRelease) {
-      clearTimeout(timeout);
-      handleTransactionFailed();
+    if ((statusData == null ? void 0 : statusData.status) === "failed" || (statusData == null ? void 0 : statusData.status) === "incomplete") {
+      const timeout = setTimeout(() => {
+        handleTransactionFailed();
+      }, DELAY_EXPECTING_TRANSFER_ASSET_RELEASE);
+      if (statusData == null ? void 0 : statusData.transferAssetRelease) {
+        clearTimeout(timeout);
+        handleTransactionFailed();
+      }
+      return () => clearTimeout(timeout);
     }
-    return () => clearTimeout(timeout);
-  }, [
-    statusData == null ? void 0 : statusData.isSettled,
-    statusData == null ? void 0 : statusData.isSuccess,
-    statusData == null ? void 0 : statusData.transferAssetRelease,
-    handleTransactionFailed
-  ]);
+  }, [statusData == null ? void 0 : statusData.transferAssetRelease, handleTransactionFailed, statusData == null ? void 0 : statusData.status, statusData]);
 };
 function usePreventPageUnload(shouldWarn) {
   useEffect(() => {
@@ -51900,48 +51690,31 @@ var SwapExecutionState = /* @__PURE__ */ ((SwapExecutionState2) => {
   return SwapExecutionState2;
 })(SwapExecutionState || {});
 const SwapExecutionPage = () => {
-  var _a;
   const setCurrentPage = useSetAtom(currentPageAtom);
-  const {
-    route: route2,
-    clientOperations,
-    overallStatus,
-    transactionDetailsArray,
-    isValidatingGasBalance,
-    transactionsSigned
-  } = useAtomValue(swapExecutionStateAtom);
-  const lastTransactionInTime = useAtomValue(lastTransactionInTimeAtom);
+  const { route: route2, clientOperations } = useAtomValue(swapExecutionStateAtom);
+  const currentTransaction = useAtomValue(currentTransactionAtom);
   const chainAddresses = useAtomValue(chainAddressesAtom);
   const { connectRequiredChains, isLoading } = useAutoSetAddress();
   const [simpleRoute, setSimpleRoute] = useState(true);
   const { mutate: submitExecuteRouteMutation, error } = useAtomValue(skipSubmitSwapExecutionAtom);
-  const shouldDisplaySignaturesRemaining = (route2 == null ? void 0 : route2.txsRequired) && route2.txsRequired > 1;
-  const signaturesRemaining = shouldDisplaySignaturesRemaining ? route2.txsRequired - transactionsSigned : 0;
-  const { data: statusData } = useBroadcastedTxsStatus({
-    txsRequired: route2 == null ? void 0 : route2.txsRequired,
-    transactionDetails: transactionDetailsArray
-  });
-  const lastTransaction = transactionDetailsArray.at(-1);
+  const signaturesRemaining = useMemo(() => {
+    if (!currentTransaction) return 0;
+    return currentTransaction.txsRequired - currentTransaction.txsSigned;
+  }, [currentTransaction]);
+  const lastTransaction = currentTransaction == null ? void 0 : currentTransaction.transactionDetails.at(-1);
   const lastTxHash = lastTransaction == null ? void 0 : lastTransaction.txHash;
   const lastTxChainId = lastTransaction == null ? void 0 : lastTransaction.chainId;
-  useSyncTxStatus({
-    statusData,
-    timestamp: (_a = lastTransactionInTime == null ? void 0 : lastTransactionInTime.transactionHistoryItem) == null ? void 0 : _a.timestamp
-  });
   const lastOperation = clientOperations[clientOperations.length - 1];
   const swapExecutionState = useSwapExecutionState({
     chainAddresses,
     route: route2,
-    overallStatus,
-    isValidatingGasBalance,
-    signaturesRemaining,
     isLoading
   });
-  const isSafeToleave = (route2 == null ? void 0 : route2.txsRequired) === transactionDetailsArray.length;
+  const isSafeToleave = (route2 == null ? void 0 : route2.txsRequired) === (currentTransaction == null ? void 0 : currentTransaction.transactionDetails.length);
   usePreventPageUnload(
     swapExecutionState === 5 || swapExecutionState === 4 || swapExecutionState === 8 || swapExecutionState === 7 || !isSafeToleave
   );
-  useHandleTransactionFailed(error, statusData);
+  useHandleTransactionFailed(error, currentTransaction);
   useHandleTransactionTimeout(swapExecutionState);
   const firstOperationStatus = useMemo(() => {
     if (swapExecutionState === 6 || swapExecutionState === 3 || swapExecutionState === 5) {
@@ -51949,18 +51722,18 @@ const SwapExecutionPage = () => {
     }
   }, [swapExecutionState]);
   const secondOperationStatus = useMemo(() => {
-    var _a2;
-    const status = statusData == null ? void 0 : statusData.transferEvents;
+    var _a;
+    const status = currentTransaction == null ? void 0 : currentTransaction.transferEvents;
     if (swapExecutionState === 6) {
       return "completed";
     }
-    if ((_a2 = status == null ? void 0 : status[0]) == null ? void 0 : _a2.status) {
+    if ((_a = status == null ? void 0 : status[0]) == null ? void 0 : _a.status) {
       return status[0].status;
     }
     if (swapExecutionState === 3 || swapExecutionState === 5) {
       return "pending";
     }
-  }, [statusData, swapExecutionState]);
+  }, [currentTransaction == null ? void 0 : currentTransaction.transferEvents, swapExecutionState]);
   const onClickEditDestinationWallet = useMemo(() => {
     track("swap execution page: edit destination address button - clicked");
     const loadingStates = [
@@ -51983,7 +51756,7 @@ const SwapExecutionPage = () => {
     };
   }, [swapExecutionState, lastOperation.signRequired, lastOperation.fromChain, route2]);
   const SwapExecutionPageRoute = simpleRoute ? SwapExecutionPageRouteSimple : SwapExecutionPageRouteDetailed;
-  const shouldRenderTrackProgressButton = lastTxHash && lastTxChainId && (route2 == null ? void 0 : route2.txsRequired) === transactionDetailsArray.length;
+  const shouldRenderTrackProgressButton = lastTxHash && lastTxChainId && (route2 == null ? void 0 : route2.txsRequired) === (currentTransaction == null ? void 0 : currentTransaction.transactionDetails.length);
   return /* @__PURE__ */ jsxs(Column, { gap: 5, children: [
     /* @__PURE__ */ jsx(
       PageHeader,
@@ -51999,7 +51772,10 @@ const SwapExecutionPage = () => {
         centerButton: shouldRenderTrackProgressButton ? {
           label: "Track progress",
           onClick: () => {
-            window.open(createSkipExplorerLink(transactionDetailsArray), "_blank");
+            window.open(
+              createSkipExplorerLink(currentTransaction == null ? void 0 : currentTransaction.transactionDetails),
+              "_blank"
+            );
             track("swap execution page: track progress button - clicked", {
               txHash: lastTxHash
             });
@@ -52022,7 +51798,7 @@ const SwapExecutionPage = () => {
       {
         onClickEditDestinationWallet,
         operations: clientOperations,
-        statusData,
+        statusData: currentTransaction,
         swapExecutionState,
         firstOperationStatus,
         secondOperationStatus
@@ -52039,7 +51815,7 @@ const SwapExecutionPage = () => {
         submitExecuteRouteMutation
       }
     ),
-    /* @__PURE__ */ jsx(SwapPageFooter, { showRouteInfo: overallStatus === "unconfirmed" })
+    /* @__PURE__ */ jsx(SwapPageFooter, {})
   ] });
 };
 const BridgeIcon = ({
@@ -52607,54 +52383,20 @@ const ConnectedWalletContent = () => {
   );
 };
 const useTxHistory = ({ txHistoryItem }) => {
-  var _a, _b;
-  const { data: chains2 } = useAtomValue(skipChainsAtom);
-  const transactionDetails = txHistoryItem == null ? void 0 : txHistoryItem.transactionDetails;
-  const chainIdFound = chains2 == null ? void 0 : chains2.some(
-    (chain) => transactionDetails == null ? void 0 : transactionDetails.map((tx) => tx.chainId).includes(chain.chainId ?? "")
-  );
-  const txsRequired = (_a = txHistoryItem == null ? void 0 : txHistoryItem.route) == null ? void 0 : _a.txsRequired;
-  let statusData = {
-    isSuccess: false,
-    isSettled: false,
-    transferEvents: [],
-    ...txHistoryItem,
-    transactionDetails: transactionDetails ?? []
-  };
-  const shouldFetchStatus = !(txHistoryItem == null ? void 0 : txHistoryItem.isSettled) && transactionDetails !== void 0 && chainIdFound;
-  const { data, isFetching, isPending } = useBroadcastedTxsStatus({
-    txsRequired,
-    transactionDetails,
-    enabled: shouldFetchStatus
-  });
-  if (data !== void 0) {
-    statusData = data;
-  }
-  useSyncTxStatus({
-    statusData,
-    timestamp: txHistoryItem == null ? void 0 : txHistoryItem.timestamp
-  });
-  const explorerLinks = /* @__PURE__ */ new Set();
-  (_b = statusData == null ? void 0 : statusData.transferEvents) == null ? void 0 : _b.forEach((transferEvent) => {
-    explorerLinks.add(transferEvent.fromExplorerLink);
-    explorerLinks.add(transferEvent.toExplorerLink);
-  });
-  const query = useQuery({
-    queryKey: ["tx-history-status", { transactionDetails, txsRequired, statusData }],
-    queryFn: () => {
-      if ((transactionDetails == null ? void 0 : transactionDetails.length) !== txsRequired) return "incomplete";
-      if (isFetching && isPending) return "unconfirmed";
-      if ((statusData == null ? void 0 : statusData.isSettled) && (statusData == null ? void 0 : statusData.isSuccess)) return "completed";
-      if ((statusData == null ? void 0 : statusData.isSettled) && !(statusData == null ? void 0 : statusData.isSuccess) || !chainIdFound) return "failed";
-      return "pending";
-    },
-    enabled: transactionDetails !== void 0 && txsRequired !== void 0 && statusData !== void 0
-  });
-  return {
-    status: query.data,
-    explorerLinks: Array.from(explorerLinks).filter((link) => link),
-    transferAssetRelease: (statusData == null ? void 0 : statusData.transferAssetRelease) ?? (txHistoryItem == null ? void 0 : txHistoryItem.transferAssetRelease)
-  };
+  const setTransactionHistory = useSetAtom(setTransactionHistoryAtom);
+  const [subscribed, setSubscribed] = useState(false);
+  useEffect(() => {
+    if (!txHistoryItem || subscribed) return;
+    const unsubscribe = subscribeToRouteStatus({
+      routeDetails: txHistoryItem,
+      onRouteStatusUpdated: (routeStatus) => setTransactionHistory(routeStatus)
+    });
+    setSubscribed(true);
+    return () => {
+      unsubscribe();
+    };
+  }, [setTransactionHistory, subscribed, txHistoryItem]);
+  return txHistoryItem;
 };
 const SwapPageHeader = memo(() => {
   const setCurrentPage = useSetAtom(currentPageAtom);
@@ -52713,15 +52455,9 @@ const SwapPageHeader = memo(() => {
 });
 const TrackLatestTxHistoryItemStatus = memo(() => {
   const lastTxHistoryItemInTime = useAtomValue(lastTransactionInTimeAtom);
-  const setOverallStatus = useSetAtom(setOverallStatusAtom);
-  const { transactionsSigned, transactionDetailsArray } = useAtomValue(swapExecutionStateAtom);
-  const { isPending } = useAtomValue(skipSubmitSwapExecutionAtom);
-  const { transferAssetRelease } = useTxHistory({
-    txHistoryItem: lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem
+  useTxHistory({
+    txHistoryItem: lastTxHistoryItemInTime
   });
-  if (transferAssetRelease && transactionsSigned !== transactionDetailsArray.length && !isPending) {
-    setOverallStatus("failed");
-  }
   return null;
 });
 const noHistoryItemsAtom = atom$1((get) => {
@@ -52729,10 +52465,8 @@ const noHistoryItemsAtom = atom$1((get) => {
   return (txHistoryItems == null ? void 0 : txHistoryItems.length) === 0;
 });
 const isFetchingLastTransactionStatusAtom = atom$1((get) => {
-  var _a, _b, _c;
-  const { overallStatus, route: route2, transactionsSigned } = get(swapExecutionStateAtom);
   const lastTxHistoryItemInTime = get(lastTransactionInTimeAtom);
-  return overallStatus === "pending" && transactionsSigned === (route2 == null ? void 0 : route2.txsRequired) || ((_a = lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem) == null ? void 0 : _a.isSettled) !== true && ((_c = (_b = lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.transactionHistoryItem) == null ? void 0 : _b.route) == null ? void 0 : _c.txsRequired) === 1;
+  return (lastTxHistoryItemInTime == null ? void 0 : lastTxHistoryItemInTime.status) === "pending";
 });
 const useConnectToMissingCosmosChain = () => {
   const sourceAsset = useAtomValue(sourceAssetAtom);
@@ -52932,7 +52666,7 @@ const SwapPage = () => {
   }, [fees2]);
   const feeWarning = useMemo(() => {
     if (!(route2 == null ? void 0 : route2.usdAmountIn) || !(route2 == null ? void 0 : route2.usdAmountOut)) return false;
-    return parseFloat(route2.usdAmountOut) <= parseFloat(route2.usdAmountIn) * 0.9;
+    return parseFloat(route2.usdAmountOut) < parseFloat(route2.usdAmountIn) * 0.9;
   }, [route2 == null ? void 0 : route2.usdAmountIn, route2 == null ? void 0 : route2.usdAmountOut]);
   const swapButton = useMemo(() => {
     var _a2;
@@ -53005,11 +52739,6 @@ const SwapPage = () => {
           setError(void 0);
           setChainAddresses({});
           setSwapExecutionState();
-          setUser({ username: sourceAccount == null ? void 0 : sourceAccount.address });
-          if (sourceAccount == null ? void 0 : sourceAccount.address) {
-            const replay = getReplay();
-            replay == null ? void 0 : replay.start();
-          }
           setCurrentPage(Routes.SwapExecutionPage);
         });
       };
@@ -53190,6 +52919,8 @@ const HistoryArrowIcon = ({
 );
 const statusMap = {
   unconfirmed: "Unconfirmed",
+  allowance: "In Progress",
+  validating: "In Progress",
   signing: "In Progress",
   broadcasted: "In Progress",
   pending: "In Progress",
@@ -53933,118 +53664,128 @@ const FilledWarningIcon = ({
     }
   )
 ] });
-const TransactionHistoryPageHistoryItem = forwardRef(({ txHistoryItem, showDetails, onClickRow }, ref) => {
-  const theme = nt();
-  const isMobileScreenSize = useIsMobileScreenSize();
-  const { status: historyStatus, transferAssetRelease } = useTxHistory({
-    txHistoryItem
-  });
-  const removeTransactionHistoryItem = useSetAtom(removeTransactionHistoryItemAtom);
-  const {
-    route: {
-      amountIn,
-      amountOut,
-      sourceAssetDenom,
-      sourceAssetChainId,
-      destAssetDenom,
-      destAssetChainId
-    } = {},
-    timestamp,
-    transactionDetails
-  } = txHistoryItem;
-  const sourceAssetDetails = useGetAssetDetails({
-    assetDenom: sourceAssetDenom,
-    chainId: sourceAssetChainId,
-    tokenAmount: amountIn
-  });
-  const destinationAssetDetails = useGetAssetDetails({
-    assetDenom: destAssetDenom,
-    chainId: destAssetChainId,
-    tokenAmount: amountOut
-  });
-  const source = {
-    amount: sourceAssetDetails.amount,
-    asset: sourceAssetDetails.asset,
-    assetImage: sourceAssetDetails.assetImage ?? "",
-    chainName: sourceAssetDetails.chainName
-  };
-  const destination = {
-    amount: destinationAssetDetails.amount,
-    asset: destinationAssetDetails.asset,
-    assetImage: destinationAssetDetails.assetImage ?? "",
-    chainName: destinationAssetDetails.chainName
-  };
-  const renderStatus = useMemo(() => {
-    switch (historyStatus) {
-      case "unconfirmed":
-      case "pending":
-        return /* @__PURE__ */ jsx(
-          StyledAnimatedBorder,
-          {
-            width: 10,
-            height: 10,
-            backgroundColor: theme.primary.text.normal,
-            status: "pending"
-          }
-        );
-      case "completed":
-        return /* @__PURE__ */ jsx(StyledGreenDot, {});
-      case "incomplete":
-      case "failed": {
-        if (transferAssetRelease) {
-          return /* @__PURE__ */ jsx(FilledWarningIcon, { backgroundColor: theme.warning.text });
-        } else return /* @__PURE__ */ jsx(XIcon, { color: theme.error.text });
-      }
-    }
-  }, [
-    historyStatus,
-    theme.primary.text.normal,
-    theme.error.text,
-    theme.warning.text,
-    transferAssetRelease
-  ]);
-  const absoluteTimeString = useMemo(() => {
-    if (isMobileScreenSize) {
-      return getMobileDateFormat(new Date(timestamp));
-    }
-    return new Date(timestamp).toLocaleString();
-  }, [isMobileScreenSize, timestamp]);
-  const relativeTime = useMemo(() => {
-    if (historyStatus === "pending") {
-      return "In Progress";
-    }
-    if (!timestamp) return "";
-    return formatDistanceStrict(new Date(timestamp), /* @__PURE__ */ new Date(), {
-      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");
-  }, [timestamp, historyStatus]);
-  if (!txHistoryItem.route) return null;
-  return /* @__PURE__ */ jsxs(StyledHistoryContainer, { ref, showDetails, children: [
-    /* @__PURE__ */ jsxs(StyledHistoryItemRow, { align: "center", justify: "space-between", onClick: onClickRow, children: [
-      /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
-        /* @__PURE__ */ jsx(RenderAssetAmount, { ...source, sourceAsset: true }),
-        /* @__PURE__ */ jsx(ThinArrowIcon, { color: theme.primary.text.lowContrast, direction: "right" }),
-        /* @__PURE__ */ jsx(RenderAssetAmount, { ...destination })
+const TransactionHistoryPageHistoryItem = forwardRef(
+  ({
+    txHistoryItem,
+    showDetails,
+    onClickRow,
+    onClickDelete
+  }, ref) => {
+    const theme = nt();
+    const isMobileScreenSize = useIsMobileScreenSize();
+    const historyItem = useTxHistory({
+      txHistoryItem
+    });
+    const removeTransactionHistoryItem = useSetAtom(removeTransactionHistoryItemAtom);
+    const {
+      route: {
+        amountIn,
+        amountOut,
+        sourceAssetDenom,
+        sourceAssetChainId,
+        destAssetDenom,
+        destAssetChainId
+      },
+      timestamp,
+      transactionDetails
+    } = txHistoryItem;
+    const sourceAssetDetails = useGetAssetDetails({
+      assetDenom: sourceAssetDenom,
+      chainId: sourceAssetChainId,
+      tokenAmount: amountIn
+    });
+    const destinationAssetDetails = useGetAssetDetails({
+      assetDenom: destAssetDenom,
+      chainId: destAssetChainId,
+      tokenAmount: amountOut
+    });
+    const source = {
+      amount: sourceAssetDetails.amount,
+      asset: sourceAssetDetails.asset,
+      assetImage: sourceAssetDetails.assetImage ?? "",
+      chainName: sourceAssetDetails.chainName
+    };
+    const destination = {
+      amount: destinationAssetDetails.amount,
+      asset: destinationAssetDetails.asset,
+      assetImage: destinationAssetDetails.assetImage ?? "",
+      chainName: destinationAssetDetails.chainName
+    };
+    const renderStatus = useMemo(() => {
+      switch (historyItem == null ? void 0 : historyItem.status) {
+        case "unconfirmed":
+        case "pending":
+          return /* @__PURE__ */ jsx(
+            StyledAnimatedBorder,
+            {
+              width: 10,
+              height: 10,
+              backgroundColor: theme.primary.text.normal,
+              status: "pending"
+            }
+          );
+        case "completed":
+          return /* @__PURE__ */ jsx(StyledGreenDot, {});
+        case "incomplete":
+        case "failed": {
+          if (historyItem == null ? void 0 : historyItem.transferAssetRelease) {
+            return /* @__PURE__ */ jsx(FilledWarningIcon, { backgroundColor: theme.warning.text });
+          } else return /* @__PURE__ */ jsx(XIcon, { color: theme.error.text });
+        }
+      }
+    }, [
+      historyItem == null ? void 0 : historyItem.status,
+      historyItem == null ? void 0 : historyItem.transferAssetRelease,
+      theme.primary.text.normal,
+      theme.error.text,
+      theme.warning.text
+    ]);
+    const absoluteTimeString = useMemo(() => {
+      if (isMobileScreenSize) {
+        return getMobileDateFormat(new Date(timestamp));
+      }
+      return new Date(timestamp).toLocaleString();
+    }, [isMobileScreenSize, timestamp]);
+    const relativeTime = useMemo(() => {
+      if ((historyItem == null ? void 0 : historyItem.status) === "pending") {
+        return "In Progress";
+      }
+      if (!timestamp) return "";
+      return formatDistanceStrict(new Date(timestamp), /* @__PURE__ */ new Date(), {
+        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]);
+    if (!txHistoryItem.route) return null;
+    return /* @__PURE__ */ jsxs(StyledHistoryContainer, { ref, showDetails, children: [
+      /* @__PURE__ */ jsxs(StyledHistoryItemRow, { align: "center", justify: "space-between", onClick: onClickRow, children: [
+        /* @__PURE__ */ jsxs(Row, { gap: 8, align: "center", children: [
+          /* @__PURE__ */ jsx(RenderAssetAmount, { ...source, sourceAsset: true }),
+          /* @__PURE__ */ jsx(ThinArrowIcon, { color: theme.primary.text.lowContrast, direction: "right" }),
+          /* @__PURE__ */ jsx(RenderAssetAmount, { ...destination })
+        ] }),
+        /* @__PURE__ */ jsxs(Row, { align: "center", gap: 6, children: [
+          /* @__PURE__ */ jsx(SmallText, { children: relativeTime }),
+          /* @__PURE__ */ jsx(Row, { width: 20, align: "center", justify: "center", children: renderStatus })
+        ] })
       ] }),
-      /* @__PURE__ */ jsxs(Row, { align: "center", gap: 6, children: [
-        /* @__PURE__ */ jsx(SmallText, { children: relativeTime }),
-        /* @__PURE__ */ jsx(Row, { width: 20, align: "center", justify: "center", children: renderStatus })
-      ] })
-    ] }),
-    showDetails && /* @__PURE__ */ jsx(
-      TransactionHistoryPageHistoryItemDetails,
-      {
-        status: historyStatus,
-        transactionDetails,
-        sourceChainName: sourceAssetDetails.chainName ?? "--",
-        destinationChainName: destinationAssetDetails.chainName ?? "--",
-        absoluteTimeString,
-        onClickDelete: () => removeTransactionHistoryItem(txHistoryItem.timestamp),
-        transferAssetRelease
-      }
-    )
-  ] });
-});
+      showDetails && /* @__PURE__ */ jsx(
+        TransactionHistoryPageHistoryItemDetails,
+        {
+          status: historyItem == null ? void 0 : historyItem.status,
+          transactionDetails,
+          sourceChainName: sourceAssetDetails.chainName ?? "--",
+          destinationChainName: destinationAssetDetails.chainName ?? "--",
+          absoluteTimeString,
+          onClickDelete: () => {
+            removeTransactionHistoryItem(txHistoryItem.timestamp);
+            onClickDelete == null ? void 0 : onClickDelete();
+          },
+          transferAssetRelease: historyItem == null ? void 0 : historyItem.transferAssetRelease
+        }
+      )
+    ] });
+  }
+);
 TransactionHistoryPageHistoryItem.displayName = "TransactionHistoryPageHistoryItem";
 const RenderAssetAmount = ({
   amount,
@@ -54099,15 +53840,11 @@ const StyledGreenDot = dt.div`
   border-radius: 50%;
 `;
 const TransactionHistoryPage = () => {
-  var _a, _b, _c;
+  var _a, _b;
   const theme = nt();
   const setCurrentPage = useSetAtom(currentPageAtom);
   const [itemIndexToShowDetail, setItemIndexToShowDetail] = useState(void 0);
-  const txHistory = useAtomValue(transactionHistoryAtom);
-  const historyList = useMemo(
-    () => txHistory.sort((a, b) => b.timestamp - a.timestamp),
-    [txHistory]
-  );
+  const sortedHistoryItems = useAtomValue(sortedHistoryItemsAtom);
   return /* @__PURE__ */ jsxs(Column, { gap: 5, children: [
     /* @__PURE__ */ jsx(
       PageHeader,
@@ -54125,7 +53862,7 @@ const TransactionHistoryPage = () => {
     /* @__PURE__ */ jsx(StyledContainer, { gap: 5, children: /* @__PURE__ */ jsx(
       VirtualList,
       {
-        listItems: historyList,
+        listItems: sortedHistoryItems,
         height: 262,
         empty: {
           details: "No transactions yet",
@@ -54144,18 +53881,15 @@ const TransactionHistoryPage = () => {
                 item
               });
               setItemIndexToShowDetail((prev2) => prev2 === index ? void 0 : index);
-            }
+            },
+            onClickDelete: () => setItemIndexToShowDetail(void 0)
           }
         ),
-        itemKey: (item) => {
-          var _a2;
-          return (_a2 = item.timestamp) == null ? void 0 : _a2.toString();
-        },
-        expandedItemKey: itemIndexToShowDetail ? (_c = (_b = historyList[itemIndexToShowDetail]) == null ? void 0 : _b.timestamp) == null ? void 0 : _c.toString() : void 0
+        itemKey: (item) => item.id,
+        expandedItemKey: itemIndexToShowDetail ? (_b = sortedHistoryItems[itemIndexToShowDetail]) == null ? void 0 : _b.id : void 0
       },
-      txHistory.length
-    ) }),
-    /* @__PURE__ */ jsx(SwapPageFooter, {})
+      sortedHistoryItems.length
+    ) })
   ] });
 };
 const StyledContainer = dt(Column)`
@@ -54304,37 +54038,19 @@ const useInitDefaultRoute = (defaultRoute) => {
     setRouteToDefaultRoute(assets2);
   }, [assets2, defaultRoute, setDefaultRoute, setRouteToDefaultRoute]);
 };
-let isSentryInitialized = false;
-const initSentry = () => {
-  if (isSentryInitialized) return;
-  init({
-    dsn: "https://10ce608bdd1c68a13d3849d6b242333c@o4504768725909504.ingest.us.sentry.io/4508485201231872",
-    tunnel: "https://go.skip.build/api/sentry",
-    defaultIntegrations: false,
-    integrations: [
-      breadcrumbsIntegration(),
-      dedupeIntegration(),
-      functionToStringIntegration(),
-      httpContextIntegration(),
-      inboundFiltersIntegration(),
-      linkedErrorsIntegration(),
-      browserSessionIntegration(),
-      replayIntegration({
-        maskAllText: false,
-        maskAllInputs: false,
-        blockAllMedia: false,
-        networkDetailAllowUrls: [/^https:\/\/go\.skip\.build\//],
-        networkRequestHeaders: ["X-Custom-Header"],
-        networkResponseHeaders: ["X-Custom-Header"],
-        useCompression: false
-      })
-    ]
-  });
-  isSentryInitialized = true;
+const useMobileRouteConfig = () => {
+  const isMobile2 = useIsMobileScreenSize();
+  const setRouteConfig = useSetAtom(routeConfigAtom);
+  useEffect(() => {
+    setRouteConfig((prev2) => ({
+      ...prev2,
+      allowMultiTx: !isMobile2
+    }));
+  }, [isMobile2, setRouteConfig]);
 };
 const name = "@skip-go/widget";
 const description = "Swap widget";
-const version = "3.12.11";
+const version = "3.13.0";
 const repository = {
   url: "https://github.com/skip-mev/skip-go",
   directory: "packages/widget"
@@ -54396,7 +54112,7 @@ const devDependencies = {
   "@typescript-eslint/parser": "^7.15.0",
   "@vitejs/plugin-react": "^4.3.1",
   buffer: "^6.0.3",
-  "chain-registry": "^2.0.11",
+  "chain-registry": "^2.0.18",
   download: "^8.0.0",
   eslint: "^9.9.0",
   "eslint-config-prettier": "^9.1.0",
@@ -54449,7 +54165,6 @@ const dependencies = {
   "@penumbra-zone/protobuf": "^7.2.0",
   "@penumbra-zone/transport-dom": "^7.5.0",
   "@r2wc/react-to-web-component": "^2.0.3",
-  "@sentry/react": "^8.46.0",
   "@skip-go/client": "workspace:^",
   "@solana/spl-token": "^0.4.8",
   "@solana/wallet-adapter-ledger": "^0.9.25",
@@ -54462,7 +54177,7 @@ const dependencies = {
   "@walletconnect/solana-adapter": "^0.0.8",
   add: "^2.0.6",
   bech32: "^2.0.0",
-  graz: "0.3.2",
+  graz: "0.3.3",
   jotai: "^2.10.1",
   "jotai-effect": "^1.0.2",
   "jotai-tanstack-query": "^0.8.6",
@@ -54472,6 +54187,7 @@ const dependencies = {
   "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"
 };
@@ -54493,18 +54209,8 @@ const packageJson = {
   dependencies,
   publishConfig
 };
-const useMobileRouteConfig = () => {
-  const isMobile2 = useIsMobileScreenSize();
-  const setRouteConfig = useSetAtom(routeConfigAtom);
-  useEffect(() => {
-    setRouteConfig((prev2) => ({
-      ...prev2,
-      allowMultiTx: !isMobile2
-    }));
-  }, [isMobile2, setRouteConfig]);
-};
 const initAmplitude = () => {
-  init$1("14616a575f32087cf0403ab8f3ea3ce0", {
+  init("14616a575f32087cf0403ab8f3ea3ce0", {
     appVersion: version
   });
   const plugin = sessionReplayPlugin({
@@ -54514,13 +54220,9 @@ const initAmplitude = () => {
 };
 const useInitWidget = (props) => {
   var _a, _b;
-  if (props.enableSentrySessionReplays) {
-    initSentry();
-  }
   if (props.enableAmplitudeAnalytics) {
     initAmplitude();
   }
-  setTag("widget_version", version);
   useInitDefaultRoute(props.defaultRoute);
   useInitGetSigners(props);
   useMobileRouteConfig();
@@ -54706,6 +54408,86 @@ const useInitGetSigners = (props) => {
     }));
   }, [props.getCosmosSigner, props.getEvmSigner, props.getSvmSigner, setGetSigners]);
 };
+const updateHistoryFromCamelCaseToRouteDetails = () => {
+  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.camelCase) {
+      const updatedTransactionHistory = transactionHistory.map(
+        (txHistoryItem) => {
+          var _a, _b, _c, _d;
+          return {
+            id: v4(),
+            timestamp: txHistoryItem.timestamp,
+            route: getSimpleRoute(txHistoryItem.route),
+            status: txHistoryItem.status,
+            txsRequired: (_a = txHistoryItem.route) == null ? void 0 : _a.txsRequired,
+            txsSigned: txHistoryItem.signatures,
+            transactionDetails: getTransactionDetailsWithSimpleTransactionDetailsStatus(
+              txHistoryItem.transactionDetails
+            ),
+            transferEvents: txHistoryItem.transferEvents,
+            transferAssetRelease: txHistoryItem.transferAssetRelease ?? ((_d = (_c = (_b = txHistoryItem.transactionDetails) == null ? void 0 : _b.at(-1)) == null ? void 0 : _c.status) == null ? void 0 : _d.transferAssetRelease)
+          };
+        }
+      );
+      localStorage.setItem(
+        LOCAL_STORAGE_KEYS.transactionHistory,
+        JSON.stringify(updatedTransactionHistory)
+      );
+      console.info(
+        `updated from transactionHistoryVersion ${HISTORY_VERSION.camelCase} to ${HISTORY_VERSION.routeDetails}`
+      );
+      set(transactionHistoryVersionAtom, HISTORY_VERSION.routeDetails);
+    }
+  } catch {
+    console.warn(
+      `Failed to update transactionHistoryVersion from ${HISTORY_VERSION.camelCase} to ${HISTORY_VERSION.routeDetails}`
+    );
+  }
+};
+const getSimpleRoute = (route2) => {
+  return {
+    amountIn: route2 == null ? void 0 : route2.amountIn,
+    amountOut: route2 == null ? void 0 : route2.amountOut,
+    sourceAssetDenom: route2 == null ? void 0 : route2.sourceAssetDenom,
+    sourceAssetChainId: route2 == null ? void 0 : route2.sourceAssetChainId,
+    destAssetDenom: route2 == null ? void 0 : route2.destAssetDenom,
+    destAssetChainId: route2 == null ? void 0 : route2.destAssetChainId,
+    estimatedRouteDurationSeconds: route2 == null ? void 0 : route2.estimatedRouteDurationSeconds
+  };
+};
+const getTransactionStatus = (state) => {
+  switch (state) {
+    case "STATE_SUBMITTED":
+    case "STATE_PENDING":
+      return "pending";
+    case "STATE_COMPLETED_SUCCESS":
+      return "success";
+    case "STATE_COMPLETED_ERROR":
+    case "STATE_PENDING_ERROR":
+      return "failed";
+    default:
+      return "pending";
+  }
+};
+const getTransactionDetailsWithSimpleTransactionDetailsStatus = (transactionDetails) => {
+  return transactionDetails.map((txDetails) => {
+    var _a;
+    return {
+      ...txDetails,
+      status: getTransactionStatus((_a = txDetails.status) == null ? void 0 : _a.state)
+    };
+  });
+};
 const migrateOldLocalStorageValues = () => {
   if (typeof window === "undefined") return;
   const { set } = jotaiStore;
@@ -54745,6 +54527,7 @@ const migrateOldLocalStorageValues = () => {
       console.warn(`Failed to migrate localStorage key "${key}":`, err);
     }
   });
+  updateHistoryFromCamelCaseToRouteDetails();
 };
 function toCamelCase(obj) {
   return convertKeys(obj, (key) => {