@0xsquid/react-hooks 8.8.1-beta-canton.4 → 8.9.0

package/dist/{index-D5QOR7JT.js → index-BL_AUWQg.js}

@@ -10,9 +10,9 @@ import axios, { AxiosError } from 'axios';
 import { WalletConnectModal } from '@walletconnect/modal';
 import UniversalProvider from '@walletconnect/universal-provider';
 import { isValidXAddress, isValidClassicAddress } from 'ripple-address-codec';
-import { getAssociatedTokenAddress, createAssociatedTokenAccountInstruction, createTransferInstruction } from '@solana/spl-token';
+import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID, getAssociatedTokenAddress, createAssociatedTokenAccountInstruction, createTransferInstruction } from '@solana/spl-token';
 import { StandardWalletAdapter } from '@solana/wallet-standard-wallet-adapter-base';
-import { PublicKey, VersionedTransaction, Transaction, SystemProgram, Connection } from '@solana/web3.js';
+import { PublicKey, Transaction, SystemProgram, VersionedTransaction, Connection } from '@solana/web3.js';
 import { StrKey, Networks, nativeToScVal, Address, rpc, TransactionBuilder, BASE_FEE, Contract, TimeoutInfinite, scValToNative, Asset, Operation, Transaction as Transaction$1, xdr } from '@stellar/stellar-sdk';
 import { SUI_TESTNET_CHAIN, SUI_MAINNET_CHAIN } from '@mysten/wallet-standard';
 import { CloudflareProvider, JsonRpcProvider, ethers, Interface, BrowserProvider, JsonRpcSigner, Contract as Contract$1, isError } from 'ethers';
@@ -57,8 +57,6 @@ const solanaZeroAddress = "11111111111111111111111111111111";
 const suiZeroAddress = "0x0000000000000000000000000000000000000000";
 const xrplZeroAddress = "rrrrrrrrrrrrrrrrrrrrrhoLvTp";
 const stellarZeroAddress = "GAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWHF";
-// TODO: check
-const cantonZeroAddress = "none::12200000000000000000000000000000000000000000000000000000000000000000";
 const chainTypeToZeroAddressMap = {
     [ChainType.EVM]: zeroAddress$1,
     [ChainType.COSMOS]: cosmosZeroAddress,
@@ -67,7 +65,6 @@ const chainTypeToZeroAddressMap = {
     [ChainType.SUI]: suiZeroAddress,
     [ChainType.XRPL]: xrplZeroAddress,
     [ChainType.STELLAR]: stellarZeroAddress,
-    [ChainType.CANTON]: cantonZeroAddress,
 };
 const nativeEvmTokenAddress = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 const nativeCosmosTokenAddress = "uosmo";
@@ -76,7 +73,6 @@ const nativeBitcoinTokenAddress = "satoshi";
 const nativeSuiTokenAddress = "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI";
 const nativeXrplTokenAddress = "xrp";
 const nativeStellarTokenAddress = "CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA";
-const nativeCantonTokenAddress = "DSO::1220b1431ef217342db44d516bb9befde802be7d8899637d290895fa58880f19accc";
 // by setting slippage to undefined, it's set to "auto"
 const defaultSlippage = undefined;
 const destinationAddressResetValue = "null";
@@ -140,7 +136,6 @@ const CHAIN_IDS = {
     XRPL_TESTNET: "xrpl-testnet",
     STELLAR: "stellar-mainnet",
     STELLAR_TESTNET: "stellar-testnet",
-    CANTON: "canton",
 };
 const chainTypeToDefaultChainIdMap = {
     [ChainType.EVM]: CHAIN_IDS.ETHEREUM,
@@ -150,7 +145,6 @@ const chainTypeToDefaultChainIdMap = {
     [ChainType.SUI]: CHAIN_IDS.SUI,
     [ChainType.XRPL]: CHAIN_IDS.XRPL,
     [ChainType.STELLAR]: CHAIN_IDS.STELLAR,
-    [ChainType.CANTON]: CHAIN_IDS.CANTON,
 };
 const chainTypeToNativeTokenAddressMap = {
     [ChainType.EVM]: nativeEvmTokenAddress,
@@ -160,7 +154,6 @@ const chainTypeToNativeTokenAddressMap = {
     [ChainType.SUI]: nativeSuiTokenAddress,
     [ChainType.XRPL]: nativeXrplTokenAddress,
     [ChainType.STELLAR]: nativeStellarTokenAddress,
-    [ChainType.CANTON]: nativeCantonTokenAddress,
 };
 const defaultConfigValues = {
     integratorId: INTEGRATOR_ID,
@@ -20858,17 +20851,31 @@ const isBitcoinAddressValid = (address$1) => {
     }
 };
 
-// Canton PartyID = address
-const CANTON_PARTY_ID_SEPARATOR = "::";
-function isCantonAddressValid(address) {
-    // Canton address format: `name::fingerprint`, where name is an arbitrary string
-    // and fingerprint is a 64-character hex string with a 1220 prefix (SHA-256 hash of the public key)
-    const parts = address.split(CANTON_PARTY_ID_SEPARATOR);
-    if (parts.length !== 2)
-        return false;
-    const [name, fingerprint] = parts;
-    return name.length > 0 && /^1220[0-9a-f]{64}$/.test(fingerprint);
-}
+const solanaTokenProgramIdByAddress = {
+    [TOKEN_PROGRAM_ID.toBase58()]: TOKEN_PROGRAM_ID,
+    [TOKEN_2022_PROGRAM_ID.toBase58()]: TOKEN_2022_PROGRAM_ID,
+};
+const isSupportedSolanaTokenProgramId = (programId) => programId.toBase58() in solanaTokenProgramIdByAddress;
+const getSupportedSolanaTokenProgramId = (tokenProgramId) => {
+    if (!tokenProgramId)
+        return undefined;
+    return solanaTokenProgramIdByAddress[tokenProgramId];
+};
+const resolveSolanaTokenProgramId = async ({ connection, token, }) => {
+    const tokenProgramId = getSupportedSolanaTokenProgramId(token.tokenProgramId);
+    if (tokenProgramId) {
+        return tokenProgramId;
+    }
+    const mint = new PublicKey(token.address);
+    const mintAccount = await connection.getAccountInfo(mint);
+    if (!mintAccount) {
+        throw new Error(`Solana mint account not found: ${token.address}`);
+    }
+    if (!isSupportedSolanaTokenProgramId(mintAccount.owner)) {
+        throw new Error(`Unsupported Solana token program for mint ${token.address}: ${mintAccount.owner.toBase58()}`);
+    }
+    return mintAccount.owner;
+};
 
 var HistoryTxType;
 (function (HistoryTxType) {
@@ -20983,7 +20990,6 @@ const getSourceExplorerTxUrl = (chain, txID) => {
         case CHAIN_IDS.AGORIC:
         case CHAIN_IDS.XRPL:
         case CHAIN_IDS.XRPL_TESTNET:
-        case CHAIN_IDS.CANTON:
             txSuffix = "/transactions/";
             break;
         case CHAIN_IDS.HEDERA:
@@ -21093,16 +21099,10 @@ const simplifyRouteAction = (action) => {
 };
 const fetchSwapTransactionStatus = async ({ transaction, integratorId, apiUrl, }) => {
     const statusEndpoint = `${apiUrl}/v2/status`;
-    const isCanton = transaction?.fromChain === CHAIN_IDS.CANTON;
-    // For Canton, the backend handles all tx detection/submission from the quoteId
-    // alone, so no transactionId is sent — only the quoteId param below.
-    const transactionId = isCanton
-        ? undefined
-        : transaction?.transactionIdForStatus ?? transaction?.transactionId;
     try {
         const response = await axios.get(statusEndpoint, {
             params: {
-                transactionId,
+                transactionId: transaction?.transactionIdForStatus ?? transaction?.transactionId,
                 fromChainId: transaction?.fromChain,
                 toChainId: transaction?.toChain,
                 bridgeType: transaction?.bridgeType,
@@ -21149,7 +21149,7 @@ function isActionCompletedOnSourceTx(action, fromChainId) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-const isChainflipDepositRoute = (route) => {
+const isDepositRoute = (route) => {
     return (!!route &&
         route.transactionRequest?.type === SquidDataType.ChainflipDepositAddress);
 };
@@ -21174,12 +21174,6 @@ function isOnChainTxData(squidData) {
         SquidDataType.DepositAddressWithMemo,
     ].includes(squidData.type);
 }
-/**
- * Checks if a route is of type DepositAddressDirectTransfer
- */
-function isDepositAddressDirectTransferRoute(squidData) {
-    return (squidData.type === SquidDataType.DepositAddressDirectTransfer);
-}
 function getHistoryTransactionId(tx) {
     switch (tx.txType) {
         case HistoryTxType.SWAP:
@@ -21362,6 +21356,16 @@ const isSolanaAddressValid = (address) => {
         return false;
     }
 };
+const deserializeSolanaTransaction = (transactionBuffer) => {
+    // Squid can return legacy Solana transactions (ITS) or versioned transactions
+    // (Jupiter/Chainflip). Deserialize once to detect the payload type. Legacy
+    // transactions need to be converted to Transaction because their blockhash is
+    // mutable and must be refreshed before signing.
+    const versionedTransaction = VersionedTransaction.deserialize(transactionBuffer);
+    return versionedTransaction.version === "legacy"
+        ? Transaction.from(transactionBuffer)
+        : versionedTransaction;
+};
 /**
  * Execute a Solana swap transaction
  * This will be used for the swap flow - Using Jupiter Dex under the hood
@@ -21372,13 +21376,16 @@ const executeSolanaSwap = async ({ route, signer, connection, onSigned, }) => {
     }
     const swapRequest = route.transactionRequest.data;
     const swapTransactionBuf = Buffer.from(swapRequest, "base64");
-    // TODO: fix types
-    // const transaction = VersionedTransaction.deserialize(
-    //   Uint8Array.from(swapTransactionBuf)
-    // );
-    const transaction = VersionedTransaction.deserialize(swapTransactionBuf);
+    const transaction = deserializeSolanaTransaction(swapTransactionBuf);
     try {
         const latestBlockhash = await connection.getLatestBlockhash();
+        if (transaction instanceof Transaction) {
+            // ITS legacy transactions arrive with the placeholder blockhash
+            // 11111111111111111111111111111111.
+            // Refresh it right before signing so the submitted transaction
+            // uses a valid blockhash. Versioned transactions are not mutable here.
+            transaction.recentBlockhash = latestBlockhash.blockhash;
+        }
         const signature = await signer.sendTransaction(transaction, connection);
         onSigned?.(signature);
         await connection.confirmTransaction({
@@ -21427,16 +21434,20 @@ const executeSolanaTransfer = async ({ amount, target, signer, connection, sourc
     else {
         // Handle SPL token transfer
         const mint = new PublicKey(sourceToken.address);
+        const tokenProgramId = await resolveSolanaTokenProgramId({
+            connection,
+            token: sourceToken,
+        });
         // Get Associated Token Accounts (ATAs) for both source and target
-        const sourceATA = await getAssociatedTokenAddress(mint, signer.publicKey, true);
-        const targetATA = await getAssociatedTokenAddress(mint, targetPubKey, true);
+        const sourceATA = await getAssociatedTokenAddress(mint, signer.publicKey, true, tokenProgramId);
+        const targetATA = await getAssociatedTokenAddress(mint, targetPubKey, true, tokenProgramId);
         // Check if target ATA exists and create if needed
         const targetAccount = await connection.getAccountInfo(targetATA);
         if (!targetAccount) {
-            transaction.add(createAssociatedTokenAccountInstruction(signer.publicKey, targetATA, targetPubKey, mint));
+            transaction.add(createAssociatedTokenAccountInstruction(signer.publicKey, targetATA, targetPubKey, mint, tokenProgramId));
         }
         // Add the token transfer instruction
-        transaction.add(createTransferInstruction(sourceATA, targetATA, signer.publicKey, amount));
+        transaction.add(createTransferInstruction(sourceATA, targetATA, signer.publicKey, amount, [], tokenProgramId));
     }
     // Get latest blockhash and sign transaction
     const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
@@ -21682,17 +21693,7 @@ const chainTypeToTrimLength = {
         start: 4,
         end: 4,
     },
-    // abc...123::abc...123
-    [ChainType.CANTON]: {
-        start: 3,
-        end: 3,
-    },
 };
-const truncateWithEllipsis = (value, startLength, endLength) => value.length <= startLength + endLength
-    ? value
-    : value.slice(0, startLength) +
-        "..." +
-        value.slice(value.length - endLength);
 const formatHash = ({ chainType, hash }) => {
     if (!hash)
         return "";
@@ -21705,15 +21706,14 @@ const formatHash = ({ chainType, hash }) => {
             chainTypeFormat = ChainType.COSMOS;
         }
     }
-    const { start, end } = chainTypeToTrimLength[chainTypeFormat];
-    if (chainTypeFormat === ChainType.CANTON &&
-        hash.includes(CANTON_PARTY_ID_SEPARATOR)) {
-        const [namespace, identifier] = hash.split(CANTON_PARTY_ID_SEPARATOR);
-        return (truncateWithEllipsis(namespace, start, end) +
-            CANTON_PARTY_ID_SEPARATOR +
-            truncateWithEllipsis(identifier, start, end));
-    }
-    return truncateWithEllipsis(hash, start, end);
+    const trimLengthStart = chainTypeToTrimLength[chainTypeFormat].start;
+    const trimLengthEnd = chainTypeToTrimLength[chainTypeFormat].end;
+    // return the same hash if its length is less than the trim length
+    if (hash.length <= trimLengthStart + trimLengthEnd)
+        return hash;
+    return (hash.slice(0, trimLengthStart) +
+        "..." +
+        hash.slice(hash.length - trimLengthEnd, hash.length));
 };
 const isWalletAddressValid = (chainData, address) => {
     if (!address || !chainData?.chainType)
@@ -21733,8 +21733,6 @@ const isWalletAddressValid = (chainData, address) => {
             return isXrplAddressValid(address);
         case ChainType.STELLAR:
             return isStellarAddressValid(address);
-        case ChainType.CANTON:
-            return isCantonAddressValid(address);
     }
 };
 const redirectToExtensionsStore = (wallet) => {
@@ -21996,8 +21994,6 @@ const connectByChainType = async (chainType, wallet, defaultChain, params) => {
                     connector,
                 },
             });
-        case ChainType.CANTON:
-            return null;
     }
 };
 const getChainTypesToConnect = (selectedChainTypes, defaultChain, supportedChains) => {
@@ -23072,10 +23068,7 @@ const getNewSwapParamsFromInput = ({ inputParams, initialSwapRoute, tokens, chai
     else {
         newFallbackAddress = fallbackAddress ?? initialSwapRoute?.fallbackAddress;
     }
-    const sourceChainChanged = fromChainId !== undefined && fromChainId !== initialSwapRoute?.fromChainId;
-    const newDepositRefundAddress = sourceChainChanged
-        ? undefined
-        : depositRefundAddress || initialSwapRoute?.depositRefundAddress;
+    const newDepositRefundAddress = depositRefundAddress || initialSwapRoute?.depositRefundAddress;
     return {
         fromChainId: srcChainId,
         fromTokenAddress: sourceTokenAddress,
@@ -23354,7 +23347,7 @@ const filterViewableTokens = (tokens, config, direction) => {
 };
 const getSecretNetworkBalances = async (chainData, cosmosAddress, squidTokens, keplrTypeWallet) => {
     const squidSecretTokens = squidTokens.filter((t) => t.chainId === CHAIN_IDS.SECRET);
-    const { fetchAllSecretBalances } = await import('./secretService-DOOg6zVn.js');
+    const { fetchAllSecretBalances } = await import('./secretService-DxQ78j5I.js');
     return fetchAllSecretBalances(chainData, cosmosAddress, squidSecretTokens, keplrTypeWallet);
 };
 function getTokenAssetsKey(token) {
@@ -23381,29 +23374,9 @@ async function fetchAssetsColors() {
         };
     }
 }
-const supportedChainTypes = new Set(Object.values(ChainType));
-function isSupportedChainType(chainType) {
-    return supportedChainTypes.has(chainType);
-}
-/**
- * Normalizes SDK data after each init/refetch before the rest of hooks consumes it.
- *
- * - Removes chains whose chainType is not supported by the local package.
- * - Drops tokens for those removed chains.
- * - Converts Evmos chains/tokens to EVM.
- * - Applies optional asset colors.
- */
-function initializeSquidData(squid, assetsColors = {
-    chains: {},
-    tokens: {},
-}) {
-    const supportedChains = squid.chains.filter((chain) => isSupportedChainType(chain.chainType));
-    const supportedChainIds = new Set(supportedChains.map((chain) => chain.chainId));
-    const evmosChainIds = supportedChains
-        .filter(isEvmosChain)
-        .map((c) => c.chainId);
-    const supportedTokens = squid.tokens.filter((token) => supportedChainIds.has(token.chainId));
-    squid.tokens = supportedTokens.map((token) => {
+function initializeSquidWithAssetsColors(squid, assetsColors) {
+    const evmosChainIds = squid.chains.filter(isEvmosChain).map((c) => c.chainId);
+    squid.tokens = squid.tokens.map((token) => {
         const isEvmosToken = evmosChainIds.includes(token.chainId);
         return {
             ...token,
@@ -23412,7 +23385,7 @@ function initializeSquidData(squid, assetsColors = {
             textColor: assetsColors.tokens[getTokenAssetsKey(token)]?.textColor,
         };
     });
-    squid.chains = supportedChains.map((chain) => {
+    squid.chains = squid.chains.map((chain) => {
         const bgColor = assetsColors.chains[chain.chainId]?.bgColor;
         // convert evmos cosmos chains to evm chains
         // TODO: this will be fixed in the backend
@@ -25289,7 +25262,7 @@ const useSquid = () => {
         queryFn: async () => {
             if (squid) {
                 await squid?.init();
-                initializeSquidData(squid, assetsColors);
+                initializeSquidWithAssetsColors(squid, assetsColors);
                 return squid;
             }
             return null;
@@ -25348,7 +25321,7 @@ const useSquidTokens = (direction) => {
         config.availableChains,
         direction,
     ]);
-    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, cantonTokens, } = useMemo(() => {
+    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, } = useMemo(() => {
         return tokens?.reduce((acc, token) => {
             switch (token.type) {
                 case ChainType.EVM:
@@ -25372,9 +25345,6 @@ const useSquidTokens = (direction) => {
                 case ChainType.STELLAR:
                     acc.stellarTokens.push(token);
                     break;
-                case ChainType.CANTON:
-                    acc.cantonTokens.push(token);
-                    break;
             }
             return acc;
         }, {
@@ -25385,7 +25355,6 @@ const useSquidTokens = (direction) => {
             suiTokens: [],
             xrplTokens: [],
             stellarTokens: [],
-            cantonTokens: [],
         });
     }, [tokens]);
     const findToken = useCallback((address, chainId) => {
@@ -25403,7 +25372,6 @@ const useSquidTokens = (direction) => {
         suiTokens,
         xrplTokens,
         stellarTokens,
-        cantonTokens,
     };
 };
 
@@ -25941,7 +25909,6 @@ const chainTypeToRefetchInterval = {
     [ChainType.SUI]: 1_000,
     [ChainType.XRPL]: 1_000,
     [ChainType.STELLAR]: 1_000,
-    [ChainType.CANTON]: 1_000,
 };
 /**
  * Returns the status refetch interval of a Send transaction
@@ -26208,7 +26175,7 @@ const useSquidChains = (direction) => {
         const chain = findChain(chainId);
         return chain?.chainType;
     }, [findChain]);
-    const { evmChains, cosmosChains, suiChains, stellarChains, xrplChains, cantonChains, } = useMemo(() => {
+    const { evmChains, cosmosChains, suiChains, stellarChains, xrplChains } = useMemo(() => {
         return chains.reduce((acc, chain) => {
             switch (chain.chainType) {
                 case ChainType.EVM:
@@ -26226,9 +26193,6 @@ const useSquidChains = (direction) => {
                 case ChainType.STELLAR:
                     acc.stellarChains.push(chain);
                     break;
-                case ChainType.CANTON:
-                    acc.cantonChains.push(chain);
-                    break;
             }
             return acc;
         }, {
@@ -26237,7 +26201,6 @@ const useSquidChains = (direction) => {
             suiChains: [],
             xrplChains: [],
             stellarChains: [],
-            cantonChains: [],
         });
     }, [chains]);
     const { supportedSourceChains, supportedDestinationChains } = useMemo(() => {
@@ -26258,7 +26221,6 @@ const useSquidChains = (direction) => {
         suiChains,
         xrplChains,
         stellarChains,
-        cantonChains,
         getChainType,
         findChain,
     };
@@ -26783,7 +26745,7 @@ function useStellarWallets() {
             try {
                 const { allowAllModules: initializeAllModules } = await import('@creit.tech/stellar-wallets-kit');
                 const { LedgerModule } = await import('@creit.tech/stellar-wallets-kit/modules/ledger.module.mjs');
-                const { formatStellarWallet } = await import('./stellarService.client-C-pOt34O.js');
+                const { formatStellarWallet } = await import('./stellarService.client-CkP5ng2n.js');
                 const modules = [...initializeAllModules(), new LedgerModule()];
                 const promises = modules.map(async (module) => {
                     const isAvailable = await module.isAvailable();
@@ -27482,7 +27444,6 @@ const useMultiChainWallet = (chain) => {
     const suiAddress = connectedAddresses[ChainType.SUI];
     const xrplAddress = connectedAddresses[ChainType.XRPL];
     const stellarAddress = connectedAddresses[ChainType.STELLAR];
-    const cantonAddress = connectedAddresses[ChainType.CANTON];
     // Cosmos is a special case because the address changes on every chain
     // so we can't use the default cosmos connected address
     const { data: cosmosAddress } = useCosmosForChain(chain);
@@ -27570,16 +27531,6 @@ const useMultiChainWallet = (chain) => {
                         chainType: chain.chainType,
                     }),
                 };
-            case ChainType.CANTON:
-                if (!cantonAddress)
-                    return {};
-                return {
-                    address: cantonAddress,
-                    formatted: formatHash({
-                        hash: cantonAddress,
-                        chainType: chain.chainType,
-                    }),
-                };
         }
     }, [
         chain?.chainType,
@@ -27591,7 +27542,6 @@ const useMultiChainWallet = (chain) => {
         suiAddress,
         xrplAddress,
         stellarAddress,
-        cantonAddress,
     ]);
     /**
      * Change current network for desired chain
@@ -28416,8 +28366,6 @@ async function createClient(chain) {
             return new XrplRpcClient(chain.rpc);
         case ChainType.STELLAR:
             return new StellarRpcClient(chain.rpc);
-        case ChainType.CANTON:
-            return null;
     }
 }
 
@@ -29254,6 +29202,10 @@ const getSolanaTokenBalance = async (userAddress, tokenAddress) => {
     if (tokenAddress.toLowerCase() === nativeSolanaTokenAddress.toLowerCase()) {
         return getSolanaNativeBalance(userAddress);
     }
+    const balances = await getSolanaTokensBalance(userAddress, [tokenAddress]);
+    return balances[tokenAddress] || BigInt(0);
+};
+const getSolanaTokenAccountsByProgram = async (userAddress, programId) => {
     const response = await fetch(SOLANA_RPC_URL, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -29263,43 +29215,45 @@ const getSolanaTokenBalance = async (userAddress, tokenAddress) => {
             method: "getTokenAccountsByOwner",
             params: [
                 userAddress,
-                { programId: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" },
+                { programId },
                 { encoding: "jsonParsed" },
             ],
         }),
     });
     const data = await response.json();
-    const tokenAccount = data.result?.value?.find((acc) => acc.account.data.parsed.info.mint.toLowerCase() ===
-        tokenAddress.toLowerCase());
-    return BigInt(tokenAccount?.account.data.parsed.info.tokenAmount.amount || 0);
+    if (data.error) {
+        throw new Error(data.error.message || "Failed to fetch Solana balances");
+    }
+    return data.result?.value || [];
 };
 const getSolanaTokensBalance = async (userAddress, tokenAddresses) => {
-    const response = await fetch(SOLANA_RPC_URL, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-            jsonrpc: "2.0",
-            id: 1,
-            method: "getTokenAccountsByOwner",
-            params: [
-                userAddress,
-                { programId: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" },
-                { encoding: "jsonParsed" },
-            ],
-        }),
-    });
-    const data = await response.json();
-    return tokenAddresses.reduce((acc, address) => {
-        const tokenAccount = data.result?.value?.find((accountInfo) => accountInfo.account.data.parsed.info.mint.toLowerCase() ===
-            address.toLowerCase());
-        acc[address] = BigInt(tokenAccount?.account.data.parsed.info.tokenAmount.amount || 0);
+    const balancesByAddress = tokenAddresses.reduce((acc, address) => {
+        acc[address] = BigInt(0);
         return acc;
     }, {});
+    if (tokenAddresses.length === 0) {
+        return balancesByAddress;
+    }
+    const addressByLowercase = tokenAddresses.reduce((acc, address) => {
+        acc[address.toLowerCase()] = address;
+        return acc;
+    }, {});
+    const tokenAccountsByProgram = await Promise.all([TOKEN_PROGRAM_ID, TOKEN_2022_PROGRAM_ID].map((programId) => getSolanaTokenAccountsByProgram(userAddress, programId.toBase58())));
+    tokenAccountsByProgram.flat().forEach((tokenAccount) => {
+        const tokenInfo = tokenAccount.account?.data?.parsed?.info;
+        const address = tokenInfo?.mint
+            ? addressByLowercase[tokenInfo.mint.toLowerCase()]
+            : undefined;
+        if (!address)
+            return;
+        balancesByAddress[address] += BigInt(tokenInfo?.tokenAmount?.amount || 0);
+    });
+    return balancesByAddress;
 };
 const getAllSolanaTokensBalance = async (solanaTokens, userAddress) => {
     try {
-        const nativeToken = solanaTokens.find((t) => t.address === nativeEvmTokenAddress);
-        const otherTokens = solanaTokens.filter((t) => t.address !== nativeEvmTokenAddress);
+        const nativeToken = solanaTokens.find((t) => t.address.toLowerCase() === nativeSolanaTokenAddress.toLowerCase());
+        const otherTokens = solanaTokens.filter((t) => t.address.toLowerCase() !== nativeSolanaTokenAddress.toLowerCase());
         const [nativeBalance, tokenBalances] = await Promise.all([
             nativeToken
                 ? getSolanaNativeBalance(userAddress)
@@ -29308,7 +29262,7 @@ const getAllSolanaTokensBalance = async (solanaTokens, userAddress) => {
         ]);
         return solanaTokens.map((token) => ({
             ...token,
-            balance: token.address === nativeEvmTokenAddress
+            balance: token.address.toLowerCase() === nativeSolanaTokenAddress.toLowerCase()
                 ? formatBNToReadable(nativeBalance, token.decimals)
                 : formatBNToReadable(tokenBalances[token.address], token.decimals),
         }));
@@ -29610,7 +29564,7 @@ const useStellarBalance = ({ userAddress, chain, enabled, token, refreshInterval
 };
 
 function useNativeTokenForChain(chain) {
-    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, cantonTokens, } = useSquidTokens();
+    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, } = useSquidTokens();
     const getTokensForChainType = () => {
         if (!chain?.chainType)
             return [];
@@ -29629,8 +29583,6 @@ function useNativeTokenForChain(chain) {
                 return xrplTokens;
             case ChainType.STELLAR:
                 return stellarTokens;
-            case ChainType.CANTON:
-                return cantonTokens;
         }
     };
     const nativeTokenForChainType = useMemo(() => {
@@ -29865,11 +29817,6 @@ const useNativeBalance = (chain) => {
                 break;
             case ChainType.STELLAR:
                 balance = nativeStellarBalance;
-                break;
-            case ChainType.CANTON:
-                // TODO: implement canton balance fetching
-                balance = undefined;
-                break;
         }
         const balanceFormatted = !!balance
             ? formatBNToReadable(balance.value, balance.decimals)
@@ -29906,9 +29853,6 @@ const useNativeBalance = (chain) => {
                 return isXrpLoading;
             case ChainType.STELLAR:
                 return isStellarLoading;
-            case ChainType.CANTON:
-                // TODO: implement canton balance fetching
-                return false;
         }
     }, [
         chain?.chainType,
@@ -30133,7 +30077,7 @@ function hederaWalletConnect(parameters) {
                 const optionalChains = config.chains.map((x) => x.id);
                 if (!optionalChains.length)
                     return;
-                const { EthereumProvider } = await import('./index.es-Cq4mUT_n.js');
+                const { EthereumProvider } = await import('./index.es-DSQHpime.js');
                 const rawProvider = await EthereumProvider.init({
                     ...restParameters,
                     disableProviderPing: true,
@@ -30363,8 +30307,6 @@ const useSigner = ({ chain }) => {
                 return isXrplSignerReady;
             case ChainType.STELLAR:
                 return isStellarSignerReady;
-            case ChainType.CANTON:
-                return false;
         }
     }, [
         chain?.chainType,
@@ -30814,21 +30756,21 @@ const useSendTransactionStore = create((set, get) => ({
 
 const useDepositAddressStore = create((set) => ({
     deposit: null,
-    selectedPaymentMethod: "connectedWallet",
+    isEnabled: false,
     setDeposit: (data) => {
         set({ deposit: data });
     },
-    setPaymentMethod: (method) => {
-        set({ selectedPaymentMethod: method });
+    toggleDepositFlow: (enabled) => {
+        set({ isEnabled: enabled });
     },
 }));
 
 function useDepositAddress(squidRoute) {
-    const { selectedPaymentMethod, depositAddress } = useDepositAddressStore((state) => ({
-        selectedPaymentMethod: state.selectedPaymentMethod,
+    const { isEnabled, depositAddress } = useDepositAddressStore((state) => ({
+        isEnabled: state.isEnabled,
         depositAddress: state.deposit?.depositAddress,
     }));
-    const { setDeposit, setPaymentMethod, deposit } = useDepositAddressStore();
+    const { setDeposit, toggleDepositFlow, deposit } = useDepositAddressStore();
     const { squid } = useSquidStore();
     const { fromChain } = useSwap();
     const isAvailableAsPaymentMethod = useMemo(() => {
@@ -30837,7 +30779,6 @@ function useDepositAddress(squidRoute) {
         const chainsSupportingDepositAddress = [
             CHAIN_IDS.BITCOIN,
             CHAIN_IDS.SOLANA,
-            CHAIN_IDS.CANTON,
         ];
         return chainsSupportingDepositAddress.includes(fromChain.chainId);
     }, [fromChain?.chainId]);
@@ -30845,50 +30786,34 @@ function useDepositAddress(squidRoute) {
         return (squidRoute?.transactionRequest?.type ===
             SquidDataType.ChainflipDepositAddress);
     }, [squidRoute?.transactionRequest?.type]);
-    // Effective payment method: the user's intent clamped by what the current
-    // source chain can actually do. Reading this (instead of raw intent) is what
-    // keeps every consumer in sync — if the source chain can't use a deposit
-    // address, the effective method is "connectedWallet" immediately at read time.
-    const paymentMethod = isAvailableAsPaymentMethod
-        ? selectedPaymentMethod
-        : "connectedWallet";
-    const isDepositAddressActive = paymentMethod === "depositAddress";
+    const enable = useCallback(() => {
+        toggleDepositFlow(true);
+    }, [toggleDepositFlow]);
+    const disable = useCallback(() => {
+        toggleDepositFlow(false);
+    }, [toggleDepositFlow]);
     const closeDepositChannel = useCallback(() => {
+        toggleDepositFlow(false);
         setDeposit(null);
-    }, [setDeposit]);
+    }, [toggleDepositFlow, setDeposit]);
     const getRouteWithDeposit = useMutation(async ({ route }) => {
-        if (!squid || !route.transactionRequest)
-            throw new Error("Missing required params");
-        if (isChainflipDepositRoute(route)) {
-            const depositAddressResponse = (await squid.executeRoute({
-                signer: {},
-                route,
-            }));
-            setDeposit({
-                amount: depositAddressResponse.amount,
-                depositAddress: depositAddressResponse.depositAddress,
-                statusTrackingId: depositAddressResponse.chainflipStatusTrackingId,
-            });
-            return;
-        }
-        else if (isDepositAddressDirectTransferRoute(route.transactionRequest)) {
-            const orderHash = route.transactionRequest.data;
-            setDeposit({
-                amount: route.params.fromAmount ?? "",
-                depositAddress: route.transactionRequest.target,
-                // Squid Scan indexes the Canton tx by the orderHash
-                statusTrackingId: orderHash,
-                memo: orderHash,
-            });
-            return;
-        }
+        if (!squid)
+            throw new Error("Squid SDK not initialized");
+        const depositAddressResponse = (await squid.executeRoute({
+            signer: {},
+            route,
+        }));
+        setDeposit(depositAddressResponse);
+        return {
+            depositAddress: depositAddressResponse,
+        };
     });
     return {
-        paymentMethod,
-        isDepositAddressActive,
+        isEnabled,
         isAvailableAsPaymentMethod,
         swapWillGenerateDepositAddress,
-        setPaymentMethod,
+        enable,
+        disable,
         getRouteWithDeposit,
         depositAddress,
         closeDepositChannel,
@@ -30920,7 +30845,7 @@ const useUrlSwapParams = () => {
 
 const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, queryOptions, }) => {
     const { evmChains, cosmosChains, suiChains, xrplChains, stellarChains } = useSquidChains(direction);
-    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, cantonTokens, } = useSquidTokens(direction);
+    const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, stellarTokens, } = useSquidTokens(direction);
     const { keplrTypeWallet } = useCosmosContext();
     const placeholderData = useMemo(() => {
         const tokens = {
@@ -30931,7 +30856,6 @@ const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, qu
             [ChainType.SUI]: suiTokens.map((t) => ({ ...t, balance: "0" })),
             [ChainType.XRPL]: xrplTokens.map((t) => ({ ...t, balance: "0" })),
             [ChainType.STELLAR]: stellarTokens.map((t) => ({ ...t, balance: "0" })),
-            [ChainType.CANTON]: cantonTokens.map((t) => ({ ...t, balance: "0" })),
         };
         if (!chainType) {
             // Return all tokens with zero balance
@@ -30953,7 +30877,6 @@ const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, qu
         suiTokens,
         xrplTokens,
         stellarTokens,
-        cantonTokens,
     ]);
     const isQueryEnabled = useMemo(() => {
         // Respect the queryOptions.enabled override if provided
@@ -30976,8 +30899,6 @@ const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, qu
                 return xrplTokens.length > 0;
             case ChainType.STELLAR:
                 return stellarTokens.length > 0;
-            case ChainType.CANTON:
-                return cantonTokens.length > 0;
         }
     }, [
         chainType,
@@ -30990,7 +30911,6 @@ const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, qu
         suiTokens.length,
         xrplTokens.length,
         stellarTokens.length,
-        cantonTokens.length,
     ]);
     const query = useQuery(keys().allTokensBalance(address, chainType, direction), async () => {
         // Return zero balances if no address
@@ -31100,12 +31020,6 @@ const useAllConnectedWalletBalances = ({ direction, queryOptions = {
         direction,
         queryOptions,
     });
-    const cantonBalancesQuery = useAllTokensWithBalanceForChainType({
-        chainType: ChainType.CANTON,
-        address: connectedAddresses?.[ChainType.CANTON],
-        direction,
-        queryOptions,
-    });
     // Create a map of chain type to balance query results
     const balanceQueries = useMemo(() => ({
         [ChainType.EVM]: evmBalancesQuery,
@@ -31115,7 +31029,6 @@ const useAllConnectedWalletBalances = ({ direction, queryOptions = {
         [ChainType.SUI]: suiBalancesQuery,
         [ChainType.XRPL]: xrplBalancesQuery,
         [ChainType.STELLAR]: stellarBalancesQuery,
-        [ChainType.CANTON]: cantonBalancesQuery,
     }), [
         evmBalancesQuery,
         cosmosBalancesQuery,
@@ -31124,7 +31037,6 @@ const useAllConnectedWalletBalances = ({ direction, queryOptions = {
         suiBalancesQuery,
         xrplBalancesQuery,
         stellarBalancesQuery,
-        cantonBalancesQuery,
     ]);
     // Combine all tokens from different chains
     const allTokens = useMemo(() => Object.values(balanceQueries).flatMap((query) => query.data?.tokens ?? []), [balanceQueries]);
@@ -31224,9 +31136,6 @@ const useMultiChainBalance = ({ chain, token, userAddress, enabled = true, }) =>
                 return xrplBalance;
             case ChainType.STELLAR:
                 return stellarBalance;
-            case ChainType.CANTON:
-                // TODO: implement canton balance fetching
-                return "0";
         }
     }, [
         chain?.chainType,
@@ -32335,9 +32244,6 @@ function useSendTransaction({ to, amount, token, chain, }) {
                         chain,
                     });
                     break;
-                case ChainType.CANTON: {
-                    throw new Error("Not implemented");
-                }
             }
             return {
                 amount,
@@ -32541,8 +32447,6 @@ async function getSendTransactionStatus({ chain, txHash, }) {
                 txHash,
                 chain,
             });
-        case ChainType.CANTON:
-            throw new Error("Not implemented");
     }
 }
 
@@ -32566,7 +32470,7 @@ const useHistory = (txType) => {
             fromChain: tx.params.fromChain,
             fromToken: tx.params.fromToken,
             fromAddress: tx.params.fromAddress,
-            fromAmount: tx.params.fromAmount ?? "",
+            fromAmount: tx.params.fromAmount,
             toChain: tx.params.toChain,
             toToken: tx.params.toToken,
             toAddress: tx.params.toAddress,
@@ -32994,129 +32898,6 @@ const useApproval = ({ squidRoute, }) => {
     };
 };
 
-const useSwapStatusQuery = ({ transaction, retry = 25, refetchOnWindowFocus = "always", enabled = true, onStatus, onEndStatus, onNotFound, onError, }) => {
-    const config = useConfigStore((state) => state.config);
-    const isInitialized = useConfigStore((state) => state.isInitialized);
-    const [isTransactionComplete, setIsTransactionComplete] = useState(false);
-    const [refetchInterval, setRefetchInterval] = useState(getSwapTxStatusRefetchInterval(transaction));
-    const { getChainType } = useSquidChains();
-    const fetchTransactionStatusWithLatestConfig = useCallback(async () => {
-        const latestConfig = useConfigStore.getState().config;
-        return fetchSwapTransactionStatus({
-            transaction,
-            integratorId: latestConfig.integratorId,
-            apiUrl: latestConfig.apiUrl,
-        });
-    }, [transaction]);
-    const transactionStatusQuery = useQuery(keys().swapTransactionStatus(transaction?.transactionId), fetchTransactionStatusWithLatestConfig, {
-        enabled: enabled &&
-            transaction?.transactionId !== "0" &&
-            !!transaction?.transactionId &&
-            !!transaction.fromAddress &&
-            !!config.apiUrl &&
-            transaction !== undefined &&
-            !isTransactionComplete &&
-            isInitialized,
-        refetchInterval(statusResponse) {
-            if (statusResponse &&
-                transactionEndStatuses.includes(getTransactionStatus(statusResponse) ?? "")) {
-                return false;
-            }
-            return refetchInterval;
-        },
-        retryDelay: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 5000 : 3000,
-        retry: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 6 : retry,
-        refetchOnWindowFocus,
-        onSuccess: (statusResponse) => {
-            WidgetEvents.getInstance().dispatchSwapStatus(statusResponse.squidTransactionStatus ?? "");
-            onStatus?.({
-                status: getTransactionStatus(statusResponse) ?? "",
-                statusResponse,
-            });
-            const endStatus = getTransactionEndStatus({ statusResponse });
-            if (endStatus) {
-                setIsTransactionComplete(true);
-                onEndStatus?.({ status: endStatus, statusResponse });
-            }
-        },
-        onError: (error) => {
-            if (is404Error(error.cause)) {
-                onNotFound?.();
-                return;
-            }
-            setRefetchInterval(-1);
-            setIsTransactionComplete(true);
-            onError?.();
-        },
-    });
-    return {
-        transactionStatusQuery,
-    };
-};
-
-// Statuses that indicate the source deposit has been received and the swap is
-// now progressing — the point at which it becomes a history-backed transaction.
-const sourceReceivedStatuses = [
-    // Chainflip
-    "DEPOSIT_RECEIVED",
-    "BROADCAST_REQUESTED",
-    "COMPLETE",
-    // Canton (Squid Intents)
-    "awaiting",
-    "success",
-];
-/**
- * Tracks a generated deposit address before it becomes a persisted swap history item.
- *
- * Mirrors the hooks-first pattern of `useExecuteTransaction`: once the source deposit
- * is received, it registers the transaction in the transaction + history stores, then
- * signals the view (via `onReceived`) to navigate. The view never writes to the stores.
- */
-const useDepositTransactionStatus = ({ transaction, route, retry = 25, refetchOnWindowFocus = "always", enabled = true, onReceived, }) => {
-    const { fromChain, toChain } = useSwap();
-    const { addSwapTransaction } = useHistory();
-    const getTransaction = useTransactionStore((state) => state.getTransaction);
-    const setTransactionStoreState = useTransactionStore((state) => state.setTransactionState);
-    return useSwapStatusQuery({
-        transaction,
-        retry,
-        refetchOnWindowFocus,
-        enabled,
-        onStatus: ({ status }) => {
-            if (!sourceReceivedStatuses.includes(status))
-                return;
-            if (!transaction?.transactionId || !route?.transactionRequest)
-                return;
-            const txLocalId = transaction.transactionId;
-            if (getTransaction(txLocalId))
-                return;
-            useTransactionStore.setState({
-                txLocalId,
-                currentTransaction: undefined,
-            });
-            const tx = {
-                routeType: route.transactionRequest.type,
-                fromChain,
-                toChain,
-                fromAddress: transaction.fromAddress,
-                transactionId: txLocalId,
-                transactionIdForStatus: transaction.transactionIdForStatus,
-                quoteId: transaction.quoteId ?? "",
-                status: TransactionStatus.ONGOING,
-                sourceStatus: TransactionStatus.SUCCESS,
-                timestamp: Date.now(),
-            };
-            setTransactionStoreState(txLocalId, tx);
-            addSwapTransaction({
-                ...tx,
-                params: route.params,
-                estimate: route.estimate,
-            });
-            onReceived?.();
-        },
-    });
-};
-
 const DEFAULT_PROVIDER_IMAGE_URL = "https://raw.githubusercontent.com/0xsquid/assets/main/images/webp128/providers/squid.webp";
 const AXELAR_PROVIDER_IMAGE_URL = "https://raw.githubusercontent.com/0xsquid/assets/main/images/webp128/providers/axelar.webp";
 const useEstimate = (squidRoute) => {
@@ -36435,7 +36216,7 @@ const useExecuteTransaction = (squidRoute) => {
             if (!route.params.fromAddress || !route.params.toAddress) {
                 throw new Error("From or to address is required");
             }
-            const isDirectTransfer = isChainflipDepositRoute(route);
+            const isDirectTransfer = isDepositRoute(route);
             // Means it's a transfer to a deposit address
             // Instead of a Swap/Contract call using a DEX like Jupiter
             if (isDirectTransfer) {
@@ -36446,7 +36227,7 @@ const useExecuteTransaction = (squidRoute) => {
                     throw new Error("Deposit address is required");
                 }
                 const signature = await executeSolanaTransfer({
-                    amount: BigInt(route.params.fromAmount ?? ""),
+                    amount: BigInt(route.params.fromAmount),
                     target: depositData.depositAddress,
                     signer: solanaSigner,
                     connection: solanaConnection,
@@ -36456,7 +36237,7 @@ const useExecuteTransaction = (squidRoute) => {
                         const txParams = setTransactionState({
                             route,
                             txHash,
-                            transactionIdForStatus: depositData.statusTrackingId,
+                            transactionIdForStatus: depositData.chainflipStatusTrackingId,
                             userAddress: sourceUserAddress,
                             status: TransactionStatus.INITIAL_LOADING,
                             sourceStatus: TransactionStatus.ONGOING,
@@ -36507,7 +36288,7 @@ const useExecuteTransaction = (squidRoute) => {
         }
     });
     const swapMutationBitcoin = useMutation(async ({ id, route }) => {
-        const { depositAddress, amount: sendAmount, statusTrackingId, } = useDepositAddressStore.getState().deposit ?? {};
+        const { depositAddress, amount: sendAmount, chainflipStatusTrackingId, } = useDepositAddressStore.getState().deposit ?? {};
         if (!depositAddress) {
             throw new Error(`Invalid deposit address: ${depositAddress}`);
         }
@@ -36530,7 +36311,7 @@ const useExecuteTransaction = (squidRoute) => {
                     txHash,
                     // When bridging from Bitcoin we need to send the chainflipId to the status endpoint
                     // instead of the Bitcoin transaction hash
-                    transactionIdForStatus: statusTrackingId,
+                    transactionIdForStatus: chainflipStatusTrackingId,
                     userAddress: sourceUserAddress,
                     status: TransactionStatus.INITIAL_LOADING,
                     sourceStatus: TransactionStatus.ONGOING,
@@ -36978,7 +36759,7 @@ refetchIntervalInBackground = false, refetchInterval = 30000, quoteOnly = true,
     const squid = useSquidStore((state) => state.squid);
     const fallbackAddress = useSwapRoutePersistStore((store) => store.swapRoute?.fallbackAddress);
     const depositRefundAddress = useSwapRoutePersistStore((store) => store.swapRoute?.depositRefundAddress);
-    const { isDepositAddressActive } = useDepositAddress();
+    const { isAvailableAsPaymentMethod, isEnabled: isDepositAddressEnabled } = useDepositAddress();
     const getRouteMutation = useGetRoute();
     const { fromChain, toChain, fromPrice, destinationAddress: { address: destinationAddress } = {}, fromToken, toToken, } = useSwap();
     const { connectedAddress: { address: sourceConnectedAddress }, } = useMultiChainWallet(fromChain);
@@ -36986,7 +36767,7 @@ refetchIntervalInBackground = false, refetchInterval = 30000, quoteOnly = true,
     // Tokens will be sent to this address in case of swap failure
     //
     // If deposit address is not selected, we use the connected address as the source address instead
-    const sourceUserAddress = isDepositAddressActive
+    const sourceUserAddress = isDepositAddressEnabled && isAvailableAsPaymentMethod
         ? depositRefundAddress ?? sourceConnectedAddress
         : sourceConnectedAddress;
     const squidRouteQueryKeys = useMemo(() => keys().transaction(fromChain?.chainId, toChain?.chainId, toToken?.address, fromToken?.address, fromPrice, config.slippage, sourceUserAddress, config.degenMode, destinationAddress, fallbackAddress, quoteOnly, fromChain?.chainType, config.preHook, config.postHook, config.overrideGasRefundAddress), [
@@ -37131,50 +36912,94 @@ function useSendTransactionStatus({ chain, txHash, }) {
  * Fetch status of a Swap transaction
  */
 const useSwapTransactionStatus = ({ transaction, retry = 25, refetchOnWindowFocus = "always", enabled = true, }) => {
+    const config = useConfigStore((state) => state.config);
+    const isInitialized = useConfigStore((state) => state.isInitialized);
     const { replaceSwapTransactionStatus } = useHistory();
     const findTransaction = useHistoryStore((state) => state.findTransaction);
+    const [isTransactionComplete, setIsTransactionComplete] = useState(false);
+    const [refetchInterval, setRefetchInterval] = useState(getSwapTxStatusRefetchInterval(transaction));
+    const { getChainType } = useSquidChains();
     const currentHistoryItem = useMemo(() => findTransaction({
         transactionId: transaction?.transactionId,
         txType: HistoryTxType.SWAP,
     }), [findTransaction, transaction?.transactionId]);
-    const transactionStatusQuery = useSwapStatusQuery({
-        transaction,
-        retry,
-        refetchOnWindowFocus,
+    /**
+     * Transaction status endpoint
+     * Squid api is using axelar endpoint and parsing the response
+     * @returns {StatusResponse} Status response
+     */
+    const fetchTransactionStatusWithLatestConfig = useCallback(async () => {
+        const latestConfig = useConfigStore.getState().config;
+        return fetchSwapTransactionStatus({
+            transaction,
+            integratorId: latestConfig.integratorId,
+            apiUrl: latestConfig.apiUrl,
+        });
+    }, [transaction]);
+    const transactionStatusQuery = useQuery(keys().swapTransactionStatus(transaction?.transactionId), fetchTransactionStatusWithLatestConfig, {
         enabled: enabled &&
+            transaction?.transactionId !== "0" &&
+            !!transaction?.transactionId &&
+            !!transaction.fromAddress &&
+            !!config.apiUrl &&
+            transaction !== undefined &&
+            !isTransactionComplete &&
+            isInitialized &&
             !!currentHistoryItem &&
             !isHistoryTransactionEnded({
                 data: currentHistoryItem?.data,
                 txType: HistoryTxType.SWAP,
             }),
-        onEndStatus: ({ status, statusResponse }) => {
-            if (!transaction?.transactionId)
-                return;
-            replaceSwapTransactionStatus({
-                transactionId: transaction.transactionId,
-                statusResponse,
-                status,
-            });
+        refetchInterval(statusResponse) {
+            // If the status response is something telling that the transaction
+            // is finished, then store transaction history state if success
+            // And return false to indicate refetcher to stop
+            if (statusResponse &&
+                transactionEndStatuses.includes(getTransactionStatus(statusResponse) ?? "")) {
+                return false;
+            }
+            return refetchInterval; // Had to handle a variable here because after onError, we want the interval to stop
         },
-        onNotFound: () => {
-            if (!transaction?.transactionId)
-                return;
-            replaceSwapTransactionStatus({
-                transactionId: transaction.transactionId,
-                statusResponse: undefined,
-                status: TransactionStatus.NOT_FOUND,
-            });
+        // At the moment Cosmos indexing takes more time, so need more time between retries
+        retryDelay: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 5000 : 3000,
+        retry: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 6 : retry,
+        refetchOnWindowFocus,
+        onSuccess: (statusResponse) => {
+            // Dispatch event
+            WidgetEvents.getInstance().dispatchSwapStatus(statusResponse.squidTransactionStatus ?? "");
+            const endStatus = getTransactionEndStatus({ statusResponse });
+            if (endStatus && transaction?.transactionId) {
+                setIsTransactionComplete(true);
+                replaceSwapTransactionStatus({
+                    transactionId: transaction.transactionId,
+                    statusResponse,
+                    status: endStatus,
+                });
+            }
         },
-        onError: () => {
+        onError: (error) => {
+            // `fetchTransactionStatus` throws an error with a cause being an AxiosError
+            const is404 = is404Error(error.cause);
             if (!transaction?.transactionId)
                 return;
-            replaceSwapTransactionStatus({
-                transactionId: transaction.transactionId,
-                statusResponse: undefined,
-                status: TransactionStatus.ERROR,
-            });
+            if (is404) {
+                replaceSwapTransactionStatus({
+                    transactionId: transaction.transactionId,
+                    statusResponse: undefined,
+                    status: TransactionStatus.NOT_FOUND,
+                });
+            }
+            else {
+                setRefetchInterval(-1);
+                setIsTransactionComplete(true);
+                replaceSwapTransactionStatus({
+                    transactionId: transaction.transactionId,
+                    statusResponse: undefined,
+                    status: TransactionStatus.ERROR,
+                });
+            }
         },
-    }).transactionStatusQuery;
+    });
     return {
         transactionStatusQuery,
         latestStatus: transactionStatusQuery.data
@@ -37573,10 +37398,8 @@ const SquidProvider = ({ children, config, placeholder, }) => {
             }
             if (assetsColorsResponse.status === "fulfilled") {
                 useAssetsColorsStore.setState(assetsColorsResponse.value);
+                initializeSquidWithAssetsColors(squid, assetsColorsResponse.value);
             }
-            initializeSquidData(squid, assetsColorsResponse.status === "fulfilled"
-                ? assetsColorsResponse.value
-                : undefined);
             const shouldResetSwapRouteStore = 
             // reset swap route if specified in config
             !config?.loadPreviousStateFromLocalStorage ||
@@ -37653,5 +37476,5 @@ const SquidProvider = ({ children, config, placeholder, }) => {
                                     React.createElement(CosmosProvider, null, children)))))))))) : (placeholder);
 };
 
-export { useDepositAddress as $, AxelarStatusResponseType as A, useHederaTokenAssociations as B, CHAIN_IDS as C, DEFAULT_LOCALE as D, useKeyboardNavigation as E, useSquidQueryClient as F, useSquid as G, HistoryTxType as H, useStellarAccountActivation as I, useStellarTrustLine as J, useAddressBookStore as K, useAssetsColorsStore as L, useFavoriteTokensStore as M, Nr as N, useHistoryStore as O, useSendTransactionStore as P, QueryKeys as Q, useConfigStore as R, SquidStatusErrorType as S, TransactionErrorType as T, useSquidStore as U, useSwapRoutePersistStore as V, Wo as W, XamanXrplNetwork as X, useTransactionStore as Y, ConnectingWalletStatus as Z, useWalletStore as _, WindowWalletFlag as a, useRecommendedQuote as a$, useSwap as a0, buildUrlSearchParamsFromSwapEvent as a1, parseInitialAssetsFromUrl as a2, useUrlSwapParams as a3, useAllConnectedWalletBalances as a4, useAllTokensWithBalanceForChainType as a5, useCosmosBalance as a6, useEvmBalance as a7, useMultiChainBalance as a8, useMultipleTokenPrices as a9, useSendTransactionStatus as aA, useSwapTransactionStatus as aB, useAvatar as aC, useHistory as aD, useDebouncedValue as aE, useAddToken as aF, useAutoConnect as aG, useEnsDataForAddress as aH, useEnsSearch as aI, useGnosisContext as aJ, useIsSameAddressAndGnosisContext as aK, useIntegratorContext as aL, useMultiChainWallet as aM, useSigner as aN, useWallet as aO, useWallets as aP, useXrplTrustLine as aQ, TX_STATUS_CONSTANTS as aR, FINAL_TRANSACTION_STATUSES as aS, useGetFiatQuote as aT, useGetOnRampConfig as aU, useExecuteFiatQuote as aV, useFiatOnRampTxStatus as aW, useFiatTransactions as aX, useCurrencyDetails as aY, useCountryDetails as aZ, useAvailableQuotes as a_, useBitcoinNativeBalance as aa, useCosmosNativeBalance as ab, useEvmNativeBalance as ac, useNativeBalance as ad, useSolanaNativeBalance as ae, useStellarNativeBalance as af, useSuiNativeBalance as ag, useXrplNativeBalance as ah, useNativeTokenForChain as ai, useSingleTokenPrice as aj, useSourceChainGasToken as ak, useSquidTokens as al, useHistoricalData as am, useTokensData as an, useEstimateSendTransaction as ao, useSendTransaction as ap, useSendTransactionGas as aq, useAllTransactionsStatus as ar, useApproval as as, useDepositTransactionStatus as at, useEstimate as au, useEstimatePriceImpact as av, useExecuteTransaction as aw, useGetRoute as ax, useGetRouteWrapper as ay, useRouteWarnings as az, chainTypeToZeroAddressMap as b, parseEvmAddress as b$, useGetOnrampPaymentTypes as b0, useSuggestedFiatAmounts as b1, SquidProvider as b2, EnsService as b3, getXummClient as b4, isXamanXAppContext as b5, getQueryHeaders as b6, getStatusCode as b7, is404Error as b8, assetsBaseUrl as b9, getTokensForChain as bA, getFirstAvailableChainId as bB, fetchHighestBalanceToken as bC, getInitialOrDefaultTokenAddressForChain as bD, getInitialTokenAddressForChain as bE, filterTokensForDestination as bF, getInitialChainIdFromConfig as bG, getCosmosKey as bH, getKeysSettled as bI, getAllKeysForSupportedCosmosChains as bJ, isCosmosAddressValid as bK, getCosmosSigningClient as bL, getCosmosChainInfosObject as bM, connectCosmosWallet as bN, isFallbackAddressNeeded as bO, suggestChainOrThrow as bP, normalizeError as bQ, transactionErrorCode as bR, isUserRejectionError as bS, getTransactionError as bT, handleTransactionErrorEvents as bU, isSwapRouteError as bV, isStatusError as bW, createQuoteRequestParamsHash as bX, WidgetEvents as bY, EvmNetworkNotSupportedErrorCode as bZ, addEthereumChain as b_, shareSubgraphId as ba, sortTokensBySharedSubgraphIds as bb, getSupportedChainIdsForDirection as bc, filterChains as bd, filterTokens as be, getTokenImage as bf, getNewSwapParamsFromInput as bg, sortAllTokens as bh, findToken as bi, findNativeToken as bj, normalizeIbcAddress as bk, groupTokensBySymbol as bl, groupTokensByChainId as bm, filterViewableTokens as bn, getSecretNetworkBalances as bo, getTokenAssetsKey as bp, fetchAssetsColors as bq, isSupportedChainType as br, initializeSquidData as bs, isEmptyObject as bt, normalizeTokenSymbol as bu, areTokenSymbolsCompatible as bv, isEvmosChain as bw, resolveChainIdFromAsset as bx, getConfigWithDefaults as by, randomIntFromInterval as bz, chainTypeToNativeTokenAddressMap as c, getBridgeType as c$, formatEvmWallet as c0, filterWagmiConnector as c1, waitForReceiptWithRetry as c2, getUserCountry as c3, getCountryData as c4, getCurrencyData as c5, adaptiveRound as c6, getSuggestedAmountsForCurrency as c7, HederaExtensionHelper as c8, convertHederaAccountIdToEvmAddress as c9, getStellarHorizonApiUrl as cA, isValidIssuedAsset as cB, isValidHorizonAsset as cC, formatTransactionHistoryDate as cD, getAxelarExplorerTxUrl as cE, getSourceExplorerTxUrl as cF, getMainExplorerUrl as cG, formatDistance as cH, formatSeconds as cI, formatSwapTxStatusResponseForStorage as cJ, simplifyRouteAction as cK, fetchSwapTransactionStatus as cL, compareTransactionIds as cM, isCoralBridgeAction as cN, isActionCompletedOnSourceTx as cO, sleep as cP, isChainflipDepositRoute as cQ, isChainflipBridgeTransaction as cR, isOnChainTxData as cS, isDepositAddressDirectTransferRoute as cT, getHistoryTransactionId as cU, getStepStatuses as cV, getHalfSuccessState as cW, getStepsInfos as cX, getSwapTxStatusRefetchInterval as cY, getSendTxStatusRefetchInterval as cZ, chainflipMultihopBridgeType as c_, convertEvmAddressToHederaAccountId as ca, scaleHbarToWei as cb, scaleWeiToHbar as cc, parseToBigInt as cd, roundNumericValue as ce, formatUnitsRounded as cf, formatTokenAmount as cg, formatUsdAmount as ch, trimExtraDecimals as ci, getNumericValue as cj, cleanAmount as ck, convertTokenAmountToUSD as cl, convertUSDToTokenAmount as cm, calculateTotal24hChange as cn, getRouteExpiry as co, searchTokens as cp, filterSolanaWallets as cq, isSolanaAddressValid as cr, executeSolanaSwap as cs, executeSolanaTransfer as ct, isStellarAddressValid as cu, getStellarNetwork as cv, stellarAddressToScVal as cw, getStellarTrustLineAsset as cx, isStellarToken as cy, isStellarIssuedToken as cz, definedInWindow as d, getTransactionStatus as d0, getTransactionEndStatus as d1, isHistoryTransactionPending as d2, isHistoryTransactionFailed as d3, isHistoryTransactionWarning as d4, isHistoryTransactionEnded as d5, formatHash as d6, isWalletAddressValid as d7, redirectToExtensionsStore as d8, accessProperty as d9, populateWallets as da, getDefaultChain as db, sortWallets as dc, areSameAddress as dd, sortAddressBook as de, calculateTotalUsdBalanceUSD as df, addTokenToWallet as dg, isEvmChainNotSupportedError as dh, getWalletSupportedChainTypes as di, getConnectorForChainType as dj, walletSupportsChainType as dk, connectWallet as dl, cancelConnectWallet as dm, isProblematicConnector as dn, mergeWallets as dp, isXionSmartContractAddress as dq, isXrplAddressValid as dr, buildXrplTrustSetTx as ds, getXrplNetwork as dt, parseXrplPaymentTx as du, parseXrplTokenAddress as dv, er as e, formatBNToReadable as f, DEFAULT_ROUTE_REFETCH_INTERVAL as g, destinationAddressResetValue as h, fallbackAddressResetValue as i, nativeCosmosTokenAddress as j, nativeEvmTokenAddress as k, nativeSolanaTokenAddress as l, nativeStellarTokenAddress as m, nativeBitcoinTokenAddress as n, nativeSuiTokenAddress as o, nativeXrplTokenAddress as p, CosmosProvider as q, SendTransactionStatus as r, TransactionStatus as s, useTrackSearchEmpty as t, useCosmosContext as u, useSquidChains as v, walletIconBaseUrl as w, useClient as x, useCosmosForChain as y, useHederaAccountActivation as z };
-//# sourceMappingURL=index-D5QOR7JT.js.map
+export { useDepositAddress as $, AxelarStatusResponseType as A, useHederaTokenAssociations as B, CHAIN_IDS as C, DEFAULT_LOCALE as D, useKeyboardNavigation as E, useSquidQueryClient as F, useSquid as G, HistoryTxType as H, useStellarAccountActivation as I, useStellarTrustLine as J, useAddressBookStore as K, useAssetsColorsStore as L, useFavoriteTokensStore as M, Nr as N, useHistoryStore as O, useSendTransactionStore as P, QueryKeys as Q, useConfigStore as R, SquidStatusErrorType as S, TransactionErrorType as T, useSquidStore as U, useSwapRoutePersistStore as V, Wo as W, XamanXrplNetwork as X, useTransactionStore as Y, ConnectingWalletStatus as Z, useWalletStore as _, WindowWalletFlag as a, useGetOnrampPaymentTypes as a$, useSwap as a0, buildUrlSearchParamsFromSwapEvent as a1, parseInitialAssetsFromUrl as a2, useUrlSwapParams as a3, useAllConnectedWalletBalances as a4, useAllTokensWithBalanceForChainType as a5, useCosmosBalance as a6, useEvmBalance as a7, useMultiChainBalance as a8, useMultipleTokenPrices as a9, useSwapTransactionStatus as aA, useAvatar as aB, useHistory as aC, useDebouncedValue as aD, useAddToken as aE, useAutoConnect as aF, useEnsDataForAddress as aG, useEnsSearch as aH, useGnosisContext as aI, useIsSameAddressAndGnosisContext as aJ, useIntegratorContext as aK, useMultiChainWallet as aL, useSigner as aM, useWallet as aN, useWallets as aO, useXrplTrustLine as aP, TX_STATUS_CONSTANTS as aQ, FINAL_TRANSACTION_STATUSES as aR, useGetFiatQuote as aS, useGetOnRampConfig as aT, useExecuteFiatQuote as aU, useFiatOnRampTxStatus as aV, useFiatTransactions as aW, useCurrencyDetails as aX, useCountryDetails as aY, useAvailableQuotes as aZ, useRecommendedQuote as a_, useBitcoinNativeBalance as aa, useCosmosNativeBalance as ab, useEvmNativeBalance as ac, useNativeBalance as ad, useSolanaNativeBalance as ae, useStellarNativeBalance as af, useSuiNativeBalance as ag, useXrplNativeBalance as ah, useNativeTokenForChain as ai, useSingleTokenPrice as aj, useSourceChainGasToken as ak, useSquidTokens as al, useHistoricalData as am, useTokensData as an, useEstimateSendTransaction as ao, useSendTransaction as ap, useSendTransactionGas as aq, useAllTransactionsStatus as ar, useApproval as as, useEstimate as at, useEstimatePriceImpact as au, useExecuteTransaction as av, useGetRoute as aw, useGetRouteWrapper as ax, useRouteWarnings as ay, useSendTransactionStatus as az, chainTypeToZeroAddressMap as b, filterWagmiConnector as b$, useSuggestedFiatAmounts as b0, SquidProvider as b1, EnsService as b2, getXummClient as b3, isXamanXAppContext as b4, getQueryHeaders as b5, getStatusCode as b6, is404Error as b7, assetsBaseUrl as b8, shareSubgraphId as b9, fetchHighestBalanceToken as bA, getInitialOrDefaultTokenAddressForChain as bB, getInitialTokenAddressForChain as bC, filterTokensForDestination as bD, getInitialChainIdFromConfig as bE, getCosmosKey as bF, getKeysSettled as bG, getAllKeysForSupportedCosmosChains as bH, isCosmosAddressValid as bI, getCosmosSigningClient as bJ, getCosmosChainInfosObject as bK, connectCosmosWallet as bL, isFallbackAddressNeeded as bM, suggestChainOrThrow as bN, normalizeError as bO, transactionErrorCode as bP, isUserRejectionError as bQ, getTransactionError as bR, handleTransactionErrorEvents as bS, isSwapRouteError as bT, isStatusError as bU, createQuoteRequestParamsHash as bV, WidgetEvents as bW, EvmNetworkNotSupportedErrorCode as bX, addEthereumChain as bY, parseEvmAddress as bZ, formatEvmWallet as b_, sortTokensBySharedSubgraphIds as ba, getSupportedChainIdsForDirection as bb, filterChains as bc, filterTokens as bd, getTokenImage as be, getNewSwapParamsFromInput as bf, sortAllTokens as bg, findToken as bh, findNativeToken as bi, normalizeIbcAddress as bj, groupTokensBySymbol as bk, groupTokensByChainId as bl, filterViewableTokens as bm, getSecretNetworkBalances as bn, getTokenAssetsKey as bo, fetchAssetsColors as bp, initializeSquidWithAssetsColors as bq, isEmptyObject as br, normalizeTokenSymbol as bs, areTokenSymbolsCompatible as bt, isEvmosChain as bu, resolveChainIdFromAsset as bv, getConfigWithDefaults as bw, randomIntFromInterval as bx, getTokensForChain as by, getFirstAvailableChainId as bz, chainTypeToNativeTokenAddressMap as c, isHistoryTransactionPending as c$, waitForReceiptWithRetry as c0, getUserCountry as c1, getCountryData as c2, getCurrencyData as c3, adaptiveRound as c4, getSuggestedAmountsForCurrency as c5, HederaExtensionHelper as c6, convertHederaAccountIdToEvmAddress as c7, convertEvmAddressToHederaAccountId as c8, scaleHbarToWei as c9, isValidHorizonAsset as cA, formatTransactionHistoryDate as cB, getAxelarExplorerTxUrl as cC, getSourceExplorerTxUrl as cD, getMainExplorerUrl as cE, formatDistance as cF, formatSeconds as cG, formatSwapTxStatusResponseForStorage as cH, simplifyRouteAction as cI, fetchSwapTransactionStatus as cJ, compareTransactionIds as cK, isCoralBridgeAction as cL, isActionCompletedOnSourceTx as cM, sleep as cN, isDepositRoute as cO, isChainflipBridgeTransaction as cP, isOnChainTxData as cQ, getHistoryTransactionId as cR, getStepStatuses as cS, getHalfSuccessState as cT, getStepsInfos as cU, getSwapTxStatusRefetchInterval as cV, getSendTxStatusRefetchInterval as cW, chainflipMultihopBridgeType as cX, getBridgeType as cY, getTransactionStatus as cZ, getTransactionEndStatus as c_, scaleWeiToHbar as ca, parseToBigInt as cb, roundNumericValue as cc, formatUnitsRounded as cd, formatTokenAmount as ce, formatUsdAmount as cf, trimExtraDecimals as cg, getNumericValue as ch, cleanAmount as ci, convertTokenAmountToUSD as cj, convertUSDToTokenAmount as ck, calculateTotal24hChange as cl, getRouteExpiry as cm, searchTokens as cn, filterSolanaWallets as co, isSolanaAddressValid as cp, executeSolanaSwap as cq, executeSolanaTransfer as cr, isStellarAddressValid as cs, getStellarNetwork as ct, stellarAddressToScVal as cu, getStellarTrustLineAsset as cv, isStellarToken as cw, isStellarIssuedToken as cx, getStellarHorizonApiUrl as cy, isValidIssuedAsset as cz, definedInWindow as d, isHistoryTransactionFailed as d0, isHistoryTransactionWarning as d1, isHistoryTransactionEnded as d2, formatHash as d3, isWalletAddressValid as d4, redirectToExtensionsStore as d5, accessProperty as d6, populateWallets as d7, getDefaultChain as d8, sortWallets as d9, areSameAddress as da, sortAddressBook as db, calculateTotalUsdBalanceUSD as dc, addTokenToWallet as dd, isEvmChainNotSupportedError as de, getWalletSupportedChainTypes as df, getConnectorForChainType as dg, walletSupportsChainType as dh, connectWallet as di, cancelConnectWallet as dj, isProblematicConnector as dk, mergeWallets as dl, isXionSmartContractAddress as dm, isXrplAddressValid as dn, buildXrplTrustSetTx as dp, getXrplNetwork as dq, parseXrplPaymentTx as dr, parseXrplTokenAddress as ds, er as e, formatBNToReadable as f, DEFAULT_ROUTE_REFETCH_INTERVAL as g, destinationAddressResetValue as h, fallbackAddressResetValue as i, nativeCosmosTokenAddress as j, nativeEvmTokenAddress as k, nativeSolanaTokenAddress as l, nativeStellarTokenAddress as m, nativeBitcoinTokenAddress as n, nativeSuiTokenAddress as o, nativeXrplTokenAddress as p, CosmosProvider as q, SendTransactionStatus as r, TransactionStatus as s, useTrackSearchEmpty as t, useCosmosContext as u, useSquidChains as v, walletIconBaseUrl as w, useClient as x, useCosmosForChain as y, useHederaAccountActivation as z };
+//# sourceMappingURL=index-BL_AUWQg.js.map