@rash2x/bridge-widget 0.8.5 → 0.8.8

package/dist/evaa-bridge.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-CytmPXNr.cjs");
+const index = require("./index-CCiUu9QP.cjs");
 exports.DEFAULT_SLIPPAGE_BPS = index.DEFAULT_SLIPPAGE_BPS;
 exports.EvaaBridge = index.EvaaBridge;
 exports.RoutePriority = index.RoutePriority;
@@ -40,6 +40,8 @@ exports.makeTokenBalanceKey = index.makeTokenBalanceKey;
 exports.normalizeTickerSymbol = index.normalizeTickerSymbol;
 exports.pollUntilDelivered = index.pollUntilDelivered;
 exports.reportBridgeTransaction = index.reportBridgeTransaction;
+exports.resolveBridgeDestinationTokenOnChainFromMatrix = index.resolveBridgeDestinationTokenOnChainFromMatrix;
+exports.resolveBridgeSourceTokenOnChainFromMatrix = index.resolveBridgeSourceTokenOnChainFromMatrix;
 exports.resolveTokenOnChain = index.resolveTokenOnChain;
 exports.resolveTokenOnChainFromMatrix = index.resolveTokenOnChainFromMatrix;
 exports.toLD = index.toLD;

package/dist/evaa-bridge.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"evaa-bridge.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"evaa-bridge.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/evaa-bridge.mjs

@@ -1,15 +1,15 @@
-import { L, d, f, e, D, Q, H, y, B, U, w, s, v, r, p, q, G, Z, a6, $, a3, x, z, a0, A, _, a4, a5, X, Y, S, a1, P, I, V, a2, W, a7, a8, J, K, F, N, t, o, i, u, l, m, j, n, h, k } from "./index-BIpr23sm.js";
+import { P, d, f, e, D, U, H, y, B, W, w, s, v, r, p, q, G, $, a8, a1, a5, x, z, a2, A, a0, a6, a7, Z, _, V, a3, S, I, X, a4, Y, a9, aa, N, L, J, K, F, Q, t, o, i, u, l, m, j, n, h, k } from "./index-JmSrX7Hz.js";
 export {
-  L as DEFAULT_SLIPPAGE_BPS,
+  P as DEFAULT_SLIPPAGE_BPS,
   d as EvaaBridge,
   f as RoutePriority,
   e as RouteType,
   D as addNetworkFeesToQuote,
-  Q as addrForApi,
+  U as addrForApi,
   H as buildAssetMatrix,
   y as calculateMinReceived,
   B as computeFeeBreakdownUsd,
-  U as findNativeMeta,
+  W as findNativeMeta,
   w as formatAddress,
   s as formatBalance,
   v as formatHash,
@@ -17,32 +17,34 @@ export {
   p as formatTokenAmount,
   q as formatUsd,
   G as fromLD,
-  Z as getChains,
-  a6 as getDeliveryStatus,
-  $ as getDestTokens,
-  a3 as getEvmBalances,
+  $ as getChains,
+  a8 as getDeliveryStatus,
+  a1 as getDestTokens,
+  a5 as getEvmBalances,
   x as getQuoteAmounts,
   z as getQuoteDetails,
-  a0 as getQuotesByPriority,
+  a2 as getQuotesByPriority,
   A as getRouteDisplayName,
-  _ as getTokens,
-  a4 as getTonBalances,
-  a5 as getTronBalances,
-  X as isAllowedFromChain,
-  Y as isAllowedToChain,
-  S as isNativeAddrEqual,
-  a1 as isNativeAddress,
-  P as isZeroAddr,
+  a0 as getTokens,
+  a6 as getTonBalances,
+  a7 as getTronBalances,
+  Z as isAllowedFromChain,
+  _ as isAllowedToChain,
+  V as isNativeAddrEqual,
+  a3 as isNativeAddress,
+  S as isZeroAddr,
   I as listAssetsForSelect,
-  V as lookupTokenMeta,
-  a2 as makeTokenBalanceKey,
-  W as normalizeTickerSymbol,
-  a7 as pollUntilDelivered,
-  a8 as reportBridgeTransaction,
+  X as lookupTokenMeta,
+  a4 as makeTokenBalanceKey,
+  Y as normalizeTickerSymbol,
+  a9 as pollUntilDelivered,
+  aa as reportBridgeTransaction,
+  N as resolveBridgeDestinationTokenOnChainFromMatrix,
+  L as resolveBridgeSourceTokenOnChainFromMatrix,
   J as resolveTokenOnChain,
   K as resolveTokenOnChainFromMatrix,
   F as toLD,
-  N as tonNorm,
+  Q as tonNorm,
   t as truncateToDecimals,
   o as useBridgeExternalData,
   i as useBridgeQuoteStore,

package/dist/{index-CytmPXNr.cjs → index-CCiUu9QP.cjs}

@@ -1088,6 +1088,7 @@ const useTokensStore = zustand.create((set2) => ({
     });
   }
 }));
+const STARGATE_API_BASE_URL = "https://stargate-archive.vercel.app/api/";
 const ALLOWED_TO_CHAINS = /* @__PURE__ */ new Set([
   "ethereum",
   "manta",
@@ -1132,7 +1133,7 @@ function isAllowedToChain(chainKey) {
   return ALLOWED_TO_CHAINS.has(chainKey);
 }
 async function getChains() {
-  const res = await fetch("https://stargate.finance/api/v1/chains", {
+  const res = await fetch(`${STARGATE_API_BASE_URL}v1/chains`, {
     credentials: "same-origin"
   });
   if (!res.ok) {
@@ -1143,7 +1144,7 @@ async function getChains() {
   return all.filter((c2) => ALLOWED_TO_CHAINS.has(c2.chainKey));
 }
 async function getTokens() {
-  const res = await fetch("https://stargate.finance/api/v1/tokens", {
+  const res = await fetch(`${STARGATE_API_BASE_URL}v1/tokens`, {
     credentials: "same-origin"
   });
   if (!res.ok) {
@@ -1154,7 +1155,7 @@ async function getTokens() {
   return tokens.map(normalizeTokenSymbol);
 }
 async function getDestTokens(srcChainKey, srcTokenAddr) {
-  const url = new URL("https://stargate.finance/api/v1/tokens");
+  const url = new URL(`${STARGATE_API_BASE_URL}v1/tokens`);
   url.searchParams.set("srcChainKey", srcChainKey);
   url.searchParams.set("srcToken", srcTokenAddr);
   const res = await fetch(url.toString(), { credentials: "omit" });
@@ -1351,9 +1352,14 @@ const ChainSelectModal = ({
   const switchToEquivalentIfNeeded = React.useCallback(
     (chainKey) => {
       if (!selectedAssetSymbol || !assetMatrix) return;
-      const effectiveSym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, chainKey);
-      if (effectiveSym !== selectedAssetSymbol.toUpperCase()) {
-        setSelectedAssetSymbol(effectiveSym);
+      const hasDirectToken = !!assetMatrix[selectedAssetSymbol.toUpperCase()]?.[chainKey];
+      if (!hasDirectToken) {
+        for (const eq of getEquivalentSymbols(selectedAssetSymbol)) {
+          if (assetMatrix[eq]?.[chainKey]) {
+            setSelectedAssetSymbol(eq);
+            break;
+          }
+        }
       }
     },
     [selectedAssetSymbol, assetMatrix, setSelectedAssetSymbol]
@@ -1673,6 +1679,7 @@ const WalletInlineButton = ({
   const connection = chainRegistry.getStrategyByType(walletType);
   const account = connection?.getAccount();
   const isConnected = connection?.isConnected();
+  const isReconnecting = connection?.isConnecting();
   const error = connection?.getError();
   const availableConnections = React.useMemo(
     () => connection?.getAvailableConnections() ?? [],
@@ -1696,10 +1703,11 @@ const WalletInlineButton = ({
   }, [onOpen, addressType]);
   const buttonText = React.useMemo(() => {
     if (isConnected && account) return formatAddress(account);
+    if (isReconnecting) return t2("wallets.reconnecting") ?? "Reconnecting...";
     if (wallet === "ton") return t2("wallets.addTonWallet");
     if (wallet === "tronlink") return t2("wallets.addTronWallet");
     return t2("wallets.addEvmWallet");
-  }, [wallet, isConnected, account, t2]);
+  }, [wallet, isConnected, isReconnecting, account, t2]);
   const connectedIcon = React.useMemo(() => {
     if (!isConnected) return null;
     if (walletType === "tron" && activeTronConnection) {
@@ -2270,7 +2278,7 @@ async function fetchQuotes(req) {
   if (req.dstNativeAmount && req.dstNativeAmount !== "0")
     params.dstNativeAmount = req.dstNativeAmount;
   if (req.slippage && req.slippage > 0) params.slippage = String(req.slippage);
-  const url = `https://stargate.finance/api/v1/quotes?${new URLSearchParams(
+  const url = `${STARGATE_API_BASE_URL}v1/quotes?${new URLSearchParams(
     params
   ).toString()}`;
   const res = await fetch(url);
@@ -2320,6 +2328,21 @@ function resolveTokenOnChainFromMatrix$1(assetMatrix, assetSymbol, chainKey) {
   const byChain = assetMatrix[assetSymbol.toUpperCase()];
   return byChain?.[chainKey];
 }
+function resolveBridgeSourceTokenOnChainFromMatrix(assetMatrix, assetSymbol, chainKey) {
+  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
+  const resolvedSymbol = getBridgeTokenSymbol(assetSymbol, assetMatrix, chainKey);
+  return resolveTokenOnChainFromMatrix$1(assetMatrix, resolvedSymbol, chainKey);
+}
+function resolveBridgeDestinationTokenOnChainFromMatrix(assetMatrix, assetSymbol, chainKey) {
+  if (!assetMatrix || !assetSymbol || !chainKey) return void 0;
+  const direct = resolveTokenOnChainFromMatrix$1(assetMatrix, assetSymbol, chainKey);
+  if (direct) return direct;
+  for (const eq of getEquivalentSymbols(assetSymbol)) {
+    const eqToken = resolveTokenOnChainFromMatrix$1(assetMatrix, eq, chainKey);
+    if (eqToken) return eqToken;
+  }
+  return void 0;
+}
 const DEFAULT_SLIPPAGE_BPS = 50;
 const lower = (s2) => (s2 ?? "").toLowerCase();
 const normSym = (s2) => (s2 ?? "").toUpperCase().replace(/₮/g, "T").replace(/[^A-Z0-9]/g, "");
@@ -2666,12 +2689,25 @@ function useBridgeQuote() {
   const srcTokenOnFrom = React.useMemo(() => {
     if (!assetMatrix || !selectedAssetSymbol || !fromChain?.chainKey) return void 0;
     const sym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, fromChain.chainKey);
-    return resolveTokenOnChainFromMatrix$1(assetMatrix, sym, fromChain.chainKey);
+    const token = resolveTokenOnChainFromMatrix$1(assetMatrix, sym, fromChain.chainKey);
+    console.log("[quote] srcToken", { selected: selectedAssetSymbol, resolved: sym, chain: fromChain.chainKey, addr: token?.address });
+    return token;
   }, [assetMatrix, selectedAssetSymbol, fromChain?.chainKey]);
   const dstTokenOnTo = React.useMemo(() => {
     if (!assetMatrix || !selectedAssetSymbol || !toChain?.chainKey) return void 0;
-    const sym = getBridgeTokenSymbol(selectedAssetSymbol, assetMatrix, toChain.chainKey);
-    return resolveTokenOnChainFromMatrix$1(assetMatrix, sym, toChain.chainKey);
+    const direct = resolveTokenOnChainFromMatrix$1(assetMatrix, selectedAssetSymbol, toChain.chainKey);
+    if (direct) {
+      console.log("[quote] dstToken", { selected: selectedAssetSymbol, resolved: selectedAssetSymbol, chain: toChain.chainKey, addr: direct.address });
+      return direct;
+    }
+    for (const eq of getEquivalentSymbols(selectedAssetSymbol)) {
+      const eqToken = resolveTokenOnChainFromMatrix$1(assetMatrix, eq, toChain.chainKey);
+      if (eqToken) {
+        console.log("[quote] dstToken", { selected: selectedAssetSymbol, resolved: eq, chain: toChain.chainKey, addr: eqToken.address });
+        return eqToken;
+      }
+    }
+    return void 0;
   }, [assetMatrix, selectedAssetSymbol, toChain?.chainKey]);
   const [loading, setLoading] = React.useState(false);
   React.useEffect(() => {
@@ -3892,12 +3928,12 @@ function useFeeBreakdown() {
   const { tokens, allTokens, selectedAssetSymbol, assetMatrix } = useTokensStore();
   const { fromChain, toChain, chains } = useChainsStore();
   return React.useMemo(() => {
-    const srcToken = resolveTokenOnChainFromMatrix$1(
+    const srcToken = resolveBridgeSourceTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       fromChain?.chainKey
     );
-    const dstToken = resolveTokenOnChainFromMatrix$1(
+    const dstToken = resolveBridgeDestinationTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       toChain?.chainKey
@@ -3974,12 +4010,12 @@ function buildBridgeExternalData({
     dstChain: toChain?.chainKey,
     amount: normalizedAmount || void 0
   };
-  const sourceToken = resolveTokenOnChainFromMatrix$1(
+  const sourceToken = resolveBridgeSourceTokenOnChainFromMatrix(
     assetMatrix,
     selectedAssetSymbol,
     fromChain?.chainKey
   );
-  const destinationToken = resolveTokenOnChainFromMatrix$1(
+  const destinationToken = resolveBridgeDestinationTokenOnChainFromMatrix(
     assetMatrix,
     selectedAssetSymbol,
     toChain?.chainKey
@@ -4448,9 +4484,9 @@ async function getDeliveryStatus(params) {
   if (params.dstChainKey) query.set("dstChainKey", params.dstChainKey);
   query.set("srcTxHash", params.srcTxHash);
   const bases2 = [
-    `https://stargate.finance/api/v1/transactions?${query.toString()}`,
-    `https://stargate.finance/api/v1/txStatus?${query.toString()}`,
-    `https://stargate.finance/api/v1/messageStatus?${query.toString()}`
+    `${STARGATE_API_BASE_URL}v1/transactions?${query.toString()}`,
+    `${STARGATE_API_BASE_URL}v1/txStatus?${query.toString()}`,
+    `${STARGATE_API_BASE_URL}v1/messageStatus?${query.toString()}`
   ];
   for (const url of bases2) {
     const json = await tryFetch(url);
@@ -4913,8 +4949,13 @@ function useSilentValidations(amountString) {
     const hasTooManyDecimals = (() => {
       if (!amountString || !fromChain?.chainKey || !selectedAssetSymbol)
         return false;
+      const resolvedSym = getBridgeTokenSymbol(
+        selectedAssetSymbol,
+        assetMatrix,
+        fromChain.chainKey
+      );
       const sourceToken = tokens?.find(
-        (t2) => t2.chainKey === fromChain.chainKey && (t2.symbol ?? "").toUpperCase() === (selectedAssetSymbol ?? "").toUpperCase()
+        (t2) => t2.chainKey === fromChain.chainKey && (t2.symbol ?? "").toUpperCase() === resolvedSym
       );
       if (!sourceToken) return false;
       const decimalPart = amountString.split(".")[1];
@@ -4925,11 +4966,18 @@ function useSilentValidations(amountString) {
       if (!selectedAssetSymbol || !fromChain?.chainKey || !toChain?.chainKey)
         return false;
       if (!assetMatrix) return false;
-      const normalizedSymbol = selectedAssetSymbol.toUpperCase();
-      const tokenMatrix = assetMatrix[normalizedSymbol];
-      if (!tokenMatrix) return true;
-      const existsOnSource = !!tokenMatrix[fromChain.chainKey];
-      const existsOnDestination = !!tokenMatrix[toChain.chainKey];
+      const allSymbols = [
+        selectedAssetSymbol.toUpperCase(),
+        ...getEquivalentSymbols(selectedAssetSymbol).map(
+          (s2) => s2.toUpperCase()
+        )
+      ];
+      const existsOnSource = allSymbols.some(
+        (sym) => !!assetMatrix[sym]?.[fromChain.chainKey]
+      );
+      const existsOnDestination = allSymbols.some(
+        (sym) => !!assetMatrix[sym]?.[toChain.chainKey]
+      );
       return !existsOnSource || !existsOnDestination;
     })();
     const hasInsufficientLiquidity = (() => {
@@ -5261,7 +5309,7 @@ const WalletSelectModal = () => {
   const { t: t2 } = useBridgeTranslation();
   const { isOpen, onClose } = useWalletSelectModal();
   const { connectors } = wagmi.useConnect();
-  const { address: evmAddress, connector: connectedConnector } = wagmi.useAccount();
+  const { address: evmAddress, connector: connectedConnector, isReconnecting: evmIsReconnecting } = wagmi.useAccount();
   const { chainRegistry } = useChainStrategies();
   const tonWallet = chainRegistry.getStrategyByType(CHAIN_TYPES.TON);
   const metaMaskWallet = chainRegistry.getStrategyByType(CHAIN_TYPES.EVM);
@@ -5305,6 +5353,14 @@ const WalletSelectModal = () => {
       address: evmAddress,
       onDisconnect: () => metaMaskWallet?.disconnect()
     });
+  } else if (evmIsReconnecting) {
+    evmConnectedWallets.push({
+      id: "walletConnect",
+      name: t2("wallets.reconnecting") || "Reconnecting...",
+      icon: WalletConnectIcon,
+      address: "...",
+      onDisconnect: () => metaMaskWallet?.disconnect()
+    });
   }
   const tronConnectedWallets = [];
   tronConnections.forEach((connection) => {
@@ -5326,7 +5382,7 @@ const WalletSelectModal = () => {
       enabled: true
     }
   ];
-  const evmWallets = evmConnectedWallets.length > 0 ? [] : connectors.filter(
+  const evmWallets = evmConnectedWallets.length > 0 || evmIsReconnecting ? [] : connectors.filter(
     (connector) => connector.id === "walletConnect" || connector.id === "metaMaskSDK"
   ).map((connector) => ({
     id: connector.id,
@@ -5858,7 +5914,7 @@ class EvmChainStrategy {
     return !!this.config.evmIsConnected;
   }
   isConnecting() {
-    return false;
+    return !!this.config.evmIsReconnecting;
   }
   getAccount() {
     return this.config.evmAddress || null;
@@ -5875,15 +5931,49 @@ class EvmChainStrategy {
   getClient() {
     return this.walletClient;
   }
-  async getBalances(address, tokens) {
-    const chainKey = tokens[0]?.chainKey;
+  resolvePublicClientForChain(chainKey) {
     let client = this.publicClient;
-    if (chainKey && this.config.getPublicClientForChain && this.config.chainKeyToId) {
-      const chainId = this.config.chainKeyToId[chainKey.toLowerCase()];
-      if (chainId) {
-        client = this.config.getPublicClientForChain(chainId) ?? client;
-      }
+    if (!chainKey || !this.config.getPublicClientForChain || !this.config.chainKeyToId) {
+      return client;
+    }
+    const chainId = this.config.chainKeyToId[chainKey.toLowerCase()];
+    if (!chainId) {
+      return client;
+    }
+    client = this.config.getPublicClientForChain(chainId) ?? client;
+    return client;
+  }
+  getRpcErrorDetails(error) {
+    if (error instanceof Error) {
+      const rpcError = error;
+      return {
+        code: rpcError.code,
+        message: rpcError.message,
+        shortMessage: rpcError.shortMessage,
+        details: rpcError.details
+      };
     }
+    if (typeof error === "object" && error !== null) {
+      const candidate = error;
+      return {
+        code: typeof candidate.code === "number" ? candidate.code : void 0,
+        message: typeof candidate.message === "string" ? candidate.message : String(error),
+        shortMessage: typeof candidate.shortMessage === "string" ? candidate.shortMessage : void 0,
+        details: typeof candidate.details === "string" ? candidate.details : void 0
+      };
+    }
+    return { message: String(error) };
+  }
+  logRpcWarning(context, error, extra) {
+    const rpcError = this.getRpcErrorDetails(error);
+    console.warn(`[evm] ${context}`, {
+      ...extra,
+      ...rpcError
+    });
+  }
+  async getBalances(address, tokens) {
+    const chainKey = tokens[0]?.chainKey;
+    const client = this.resolvePublicClientForChain(chainKey);
     if (!client) {
       return {};
     }
@@ -5922,7 +6012,7 @@ class EvmChainStrategy {
     }
   }
   async estimateNetworkFee(steps) {
-    if (!this.walletClient) {
+    if (!this.config.evmAddress) {
       return 0;
     }
     const account = this.config.evmAddress;
@@ -5939,23 +6029,67 @@ class EvmChainStrategy {
       return (feePerGas * scaled + 99n) / 100n;
     };
     let totalFeeWei = 0n;
-    for (const step of txSteps) {
+    for (let i3 = 0; i3 < txSteps.length; i3++) {
+      const step = txSteps[i3];
       const tx = step.transaction;
       if (!tx?.to) continue;
+      const client = this.resolvePublicClientForChain(step.chainKey);
+      if (!client) {
+        this.logRpcWarning("Skipped network fee estimation: no public client", "no-client", {
+          chainKey: step.chainKey,
+          stepType: step.type,
+          stepIndex: i3 + 1,
+          totalSteps: txSteps.length
+        });
+        continue;
+      }
       try {
-        const request = await this.walletClient.prepareTransactionRequest({
+        const gas = await client.estimateGas({
           account: tx.from || account,
           to: tx.to,
           data: tx.data,
-          value: tx.value ? BigInt(tx.value) : void 0,
-          chain: this.walletClient.chain
+          value: tx.value ? BigInt(tx.value) : void 0
         });
-        const gasLimit = request.gas;
-        const maxFeePerGas = request.maxFeePerGas ?? request.gasPrice;
-        if (gasLimit && maxFeePerGas) {
-          totalFeeWei += gasLimit * applyFeeMultiplier(maxFeePerGas);
+        let feePerGas;
+        try {
+          const estimatedFees = await client.estimateFeesPerGas();
+          feePerGas = estimatedFees.maxFeePerGas ?? estimatedFees.gasPrice;
+        } catch (feeError) {
+          this.logRpcWarning(
+            "Failed to estimate fees per gas, falling back to gas price",
+            feeError,
+            {
+              chainKey: step.chainKey,
+              stepType: step.type,
+              stepIndex: i3 + 1,
+              totalSteps: txSteps.length
+            }
+          );
+          try {
+            feePerGas = await client.getGasPrice();
+          } catch (gasPriceError) {
+            this.logRpcWarning("Failed to get gas price for network fee estimation", gasPriceError, {
+              chainKey: step.chainKey,
+              stepType: step.type,
+              stepIndex: i3 + 1,
+              totalSteps: txSteps.length
+            });
+          }
         }
-      } catch {
+        if (gas && feePerGas) {
+          totalFeeWei += gas * applyFeeMultiplier(feePerGas);
+        }
+      } catch (error) {
+        this.logRpcWarning("Failed to estimate gas for network fee", error, {
+          chainKey: step.chainKey,
+          stepType: step.type,
+          stepIndex: i3 + 1,
+          totalSteps: txSteps.length,
+          to: tx.to,
+          from: tx.from || account,
+          hasData: Boolean(tx.data),
+          hasValue: Boolean(tx.value)
+        });
       }
     }
     if (totalFeeWei === 0n) {
@@ -7160,6 +7294,7 @@ function ChainStrategyProvider({
     () => new EvmChainStrategy({
       evmAddress: evmWallet.address,
       evmIsConnected: evmWallet.isConnected,
+      evmIsReconnecting: evmWallet.isReconnecting,
       evmDisconnect: evmWallet.disconnect,
       walletClient: evmWallet.walletClient,
       publicClient: evmWallet.publicClient,
@@ -7169,6 +7304,7 @@ function ChainStrategyProvider({
     [
       evmWallet.address,
       evmWallet.isConnected,
+      evmWallet.isReconnecting,
       evmWallet.disconnect,
       evmWallet.walletClient,
       evmWallet.publicClient,
@@ -26621,7 +26757,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await Promise.resolve().then(() => require("./index-DiFbb5zn.cjs"));
+      await Promise.resolve().then(() => require("./index-CrZzrVbc.cjs"));
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -26738,10 +26874,12 @@ function useTronWalletConnect(projectId) {
   appliedThemeRef.current = appliedTheme;
   React.useEffect(() => {
     if (!projectId || providerRef.current) return;
+    let cancelled = false;
     const initProvider = async () => {
       try {
         const provider = await N.init({
           projectId,
+          name: "evaa-bridge-tron",
           metadata: {
             name: "EVAA Bridge",
             description: "Cross-chain bridge powered by Stargate Protocol",
@@ -26749,6 +26887,7 @@ function useTronWalletConnect(projectId) {
             icons: [`${window.location.origin}/favicon.ico`]
           }
         });
+        if (cancelled) return;
         providerRef.current = provider;
         if (projectId) {
           const modal = new WalletConnectModal({
@@ -26778,17 +26917,32 @@ function useTronWalletConnect(projectId) {
           console.log("TRON WalletConnect session deleted");
           setAddress(null);
         });
-        if (provider.session) {
-          const accounts = provider.session.namespaces?.tron?.accounts || [];
-          if (accounts.length > 0) {
-            const account = accounts[0];
-            const extractedAddress = account.split(":")[2];
-            console.log(
-              "TRON WalletConnect restored session:",
-              extractedAddress
-            );
+        let tronAccounts = [];
+        if (provider.session?.namespaces?.tron?.accounts?.length) {
+          tronAccounts = provider.session.namespaces.tron.accounts;
+          console.log("TRON WalletConnect: found session via provider.session");
+        } else if (provider.client?.session) {
+          const allSessions = provider.client.session.getAll();
+          console.log("TRON WalletConnect: searching all sessions, count:", allSessions.length);
+          const tronSession = allSessions.find(
+            (s2) => s2.namespaces?.tron?.accounts?.length
+          );
+          if (tronSession) {
+            tronAccounts = tronSession.namespaces.tron.accounts;
+            console.log("TRON WalletConnect: found tron session in all sessions");
+          }
+        }
+        if (tronAccounts.length > 0) {
+          const extractedAddress = tronAccounts[0].split(":")[2];
+          console.log(
+            "TRON WalletConnect restored session:",
+            extractedAddress
+          );
+          if (!cancelled) {
             setAddress(extractedAddress);
           }
+        } else {
+          console.log("TRON WalletConnect: no tron session found to restore");
         }
       } catch (error) {
         console.error("Failed to initialize TRON WalletConnect:", error);
@@ -26796,17 +26950,15 @@ function useTronWalletConnect(projectId) {
     };
     initProvider();
     return () => {
-      console.warn("TRON WalletConnect useEffect CLEANUP running");
+      cancelled = true;
       if (abortControllerRef.current) {
         abortControllerRef.current.abort();
       }
-      if (providerRef.current) {
-        console.warn("TRON WalletConnect: disconnecting provider in cleanup");
-        providerRef.current.disconnect();
-      }
       if (modalRef.current) {
         modalRef.current.closeModal();
       }
+      providerRef.current = null;
+      modalRef.current = null;
     };
   }, [projectId, setAddress]);
   React.useEffect(() => {
@@ -27193,7 +27345,7 @@ function useUrlSync(options) {
 const EvaaBridgeWithProviders = (props) => {
   const [tonConnectUI] = uiReact.useTonConnectUI();
   const tonAddress = uiReact.useTonAddress();
-  const { address: evmAddress, isConnected: evmIsConnected } = wagmi.useAccount();
+  const { address: evmAddress, isConnected: evmIsConnected, isReconnecting: evmIsReconnecting } = wagmi.useAccount();
   const wagmiConfig = wagmi.useConfig();
   const { disconnect: evmDisconnect } = wagmi.useDisconnect();
   const { data: walletClient } = wagmi.useWalletClient();
@@ -27257,6 +27409,7 @@ const EvaaBridgeWithProviders = (props) => {
       evmWallet: {
         address: evmAddress,
         isConnected: evmIsConnected,
+        isReconnecting: evmIsReconnecting,
         disconnect: evmDisconnect,
         walletClient,
         publicClient,
@@ -27334,12 +27487,12 @@ const EvaaBridgeContent = ({
   );
   const outputAmount = React.useMemo(() => {
     if (!quote || loading) return "";
-    const srcToken = resolveTokenOnChainFromMatrix$1(
+    const srcToken = resolveBridgeSourceTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       fromChain?.chainKey
     );
-    const dstToken = resolveTokenOnChainFromMatrix$1(
+    const dstToken = resolveBridgeDestinationTokenOnChainFromMatrix(
       assetMatrix,
       selectedAssetSymbol,
       toChain?.chainKey
@@ -27510,6 +27663,8 @@ exports.makeTokenBalanceKey = makeTokenBalanceKey;
 exports.normalizeTickerSymbol = normalizeTickerSymbol;
 exports.pollUntilDelivered = pollUntilDelivered;
 exports.reportBridgeTransaction = reportBridgeTransaction;
+exports.resolveBridgeDestinationTokenOnChainFromMatrix = resolveBridgeDestinationTokenOnChainFromMatrix;
+exports.resolveBridgeSourceTokenOnChainFromMatrix = resolveBridgeSourceTokenOnChainFromMatrix;
 exports.resolveTokenOnChain = resolveTokenOnChain;
 exports.resolveTokenOnChainFromMatrix = resolveTokenOnChainFromMatrix$1;
 exports.toLD = toLD;
@@ -27524,4 +27679,4 @@ exports.useSettingsStore = useSettingsStore;
 exports.useSwapModel = useSwapModel;
 exports.useTokensStore = useTokensStore;
 exports.useTransactionStore = useTransactionStore;
-//# sourceMappingURL=index-CytmPXNr.cjs.map
+//# sourceMappingURL=index-CCiUu9QP.cjs.map