@trustware/sdk-staging 1.1.9-staging.5 → 1.1.9-staging.6

package/dist/index.mjs

@@ -408,7 +408,7 @@ var init_constants = __esm({
   "src/constants.ts"() {
     "use strict";
     SDK_NAME = "@trustware/sdk";
-    SDK_VERSION = "1.1.9-staging.5";
+    SDK_VERSION = "1.1.9-staging.6";
     API_ROOT = "https://bv-staging-api.trustware.io";
     GTM_ID = "GTM-TZDGNCXB";
     API_PREFIX = "/api";
@@ -1013,21 +1013,28 @@ function formatDeepLink(id, currentUrl) {
   const enc = encodeURIComponent(currentUrl);
   switch (id) {
     // EVM
+    // MetaMask's dapp browser also exposes its Wallet Standard Solana
+    // provider in the same session, so "metamask-solana" reuses this link.
     case "metamask":
+    case "metamask-solana":
       return `metamask://dapp/${currentUrl}`;
     case "coinbase":
       return `coinbase://wallet/dapp?url=${enc}`;
     case "rainbow":
-      return `rainbow://connect?uri=${enc}`;
+      return `https://rainbow.me/dapp?url=${enc}`;
     case "trust":
       return `https://link.trustwallet.com/open_url?coin_id=60&url=${enc}`;
     case "okx":
       return `okx://wallet/dapp/url?dappUrl=${enc}`;
     // Solana
+    // Phantom is one app with one in-app browser — browsing there injects
+    // both window.ethereum and window.phantom.solana, so "phantom-evm"
+    // reuses the same browse link as "phantom-solana".
     case "phantom-solana":
-      return `phantom://browse/${enc}`;
+    case "phantom-evm":
+      return `https://phantom.app/ul/browse/${enc}?ref=${enc}`;
     case "solflare":
-      return `solflare://ul/v1/browse/${enc}`;
+      return `https://solflare.com/ul/v1/browse/${enc}?ref=${enc}`;
     case "backpack":
       return `https://backpack.app/ul/v1/browse/${enc}?ref=${enc}`;
     // No confirmed deep link scheme
@@ -1137,8 +1144,10 @@ var init_metadata = __esm({
         homepage: "https://phantom.app/",
         ios: "https://apps.apple.com/app/phantom-crypto-wallet/id1598432977",
         android: "https://play.google.com/store/apps/details?id=app.phantom",
-        detectFlags: ["isPhantom"]
-        // No EVM dapp browser deep link — falls back to app store
+        detectFlags: ["isPhantom"],
+        // Same app/in-app browser as "phantom-solana" — browsing there injects
+        // window.ethereum too.
+        deepLink: (url) => formatDeepLink("phantom-evm", url) ?? ""
       },
       {
         id: "phantom-solana",
@@ -1186,8 +1195,10 @@ var init_metadata = __esm({
         emoji: "\u{1F98A}",
         homepage: "https://metamask.io/",
         ios: "https://apps.apple.com/app/metamask/id1438144202",
-        android: "https://play.google.com/store/apps/details?id=io.metamask"
-        // No Solana-specific deep link for MetaMask
+        android: "https://play.google.com/store/apps/details?id=io.metamask",
+        // Same app/in-app browser as "metamask" — its Wallet Standard Solana
+        // provider is exposed in that same browse session.
+        deepLink: (url) => formatDeepLink("metamask-solana", url) ?? ""
       },
       // ── Extension/desktop only — hidden on mobile ─────────────────────────────
       {
@@ -2776,7 +2787,7 @@ var init_walletconnect = __esm({
     solanaMainnet = {
       id: 900,
       chainNamespace: "solana",
-      caipNetworkId: "solana:5eykt4UsFv8P8NJdTREpY1vzqAQ3H1FQ",
+      caipNetworkId: "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
       name: "Solana Mainnet",
       nativeCurrency: {
         name: "Solana",
@@ -3655,8 +3666,62 @@ function getChainMeta(chainId) {
     rpcUrls: chain.rpcUrls.default.http
   };
 }
-async function buildWalletConnectAPI(walletCfg) {
+function extractSolanaAddress(connector) {
+  const caipAccount = connector.provider.session?.namespaces?.solana?.accounts?.[0];
+  if (!caipAccount) return null;
+  return caipAccount.split(":")[2] ?? null;
+}
+function buildWalletConnectSolanaProvider(connector) {
+  return {
+    get publicKey() {
+      const address = extractSolanaAddress(connector);
+      return address ? { toString: () => address } : void 0;
+    },
+    async connect() {
+      const address = extractSolanaAddress(connector);
+      if (!address) {
+        throw new Error(
+          "This wallet did not approve a Solana account over WalletConnect."
+        );
+      }
+      return { publicKey: { toString: () => address } };
+    },
+    async disconnect() {
+    },
+    async signTransaction(transaction) {
+      const tx = transaction;
+      const rawBytes = "version" in tx ? tx.serialize() : tx.serialize({
+        requireAllSignatures: false,
+        verifySignatures: false
+      });
+      const result = await connector.provider.request(
+        {
+          method: "solana_signTransaction",
+          params: { transaction: encodeBase64(rawBytes) }
+        },
+        solanaMainnet.caipNetworkId
+      );
+      if (!result.transaction) {
+        throw new Error(
+          "WalletConnect wallet did not return a signed Solana transaction."
+        );
+      }
+      const signedBytes = decodeBase64(result.transaction);
+      return { serialize: () => signedBytes };
+    },
+    on() {
+    },
+    off() {
+    },
+    removeListener() {
+    }
+  };
+}
+async function buildWalletConnectAPI(walletCfg, ecosystem = "evm") {
   const connector = await getUniversalConnector(walletCfg);
+  if (ecosystem === "solana") {
+    return toSolanaWalletInterface(buildWalletConnectSolanaProvider(connector));
+  }
   const provider = connector.provider;
   const api = {
     ecosystem: "evm",
@@ -3732,7 +3797,7 @@ function useWireDetectionIntoManager() {
 function useWalletConnectConnect(walletCfg) {
   const cfgRef = { current: walletCfg };
   return useCallback(
-    () => walletManager.connectWalletConnect(cfgRef.current),
+    (ecosystem) => walletManager.connectWalletConnect(cfgRef.current, ecosystem),
     []
   );
 }
@@ -3752,6 +3817,7 @@ function useWalletInfo(wagmi) {
     connectedVia: snapshot.connectedVia,
     walletType: snapshot.walletType,
     status: snapshot.status,
+    detected: snapshot.detected,
     disconnect
   };
 }
@@ -3903,44 +3969,39 @@ var init_manager = __esm({
           this.emit();
         }
       }
-      async connectWalletConnect(walletCfg) {
-        if (this._status === "connected" && this._connectedVia === "walletconnect" && this._wallet) {
+      async connectWalletConnect(walletCfg, ecosystem = "evm") {
+        if (this._status === "connected" && this._connectedVia === "walletconnect" && this._wallet && this._wallet.ecosystem === ecosystem) {
           this.emit();
           return { error: null, api: this._wallet };
         }
+        if (this._connectedVia === "walletconnect" && this._wallet) {
+          await this._wallet.disconnect?.().catch(() => {
+          });
+          resetUniversalConnector();
+        }
         this._status = "connecting";
         this.clearConnectedState();
         this.emit();
         try {
           const connector = await getUniversalConnector(walletCfg);
           await connector.connect();
-          const api = await buildWalletConnectAPI(walletCfg);
+          const api = await buildWalletConnectAPI(walletCfg, ecosystem);
+          try {
+            await api.getAddress();
+          } catch {
+            await api.disconnect?.().catch(() => {
+            });
+            resetUniversalConnector();
+            throw new Error(
+              `This wallet did not approve a${ecosystem === "evm" ? "n" : ""} ${ecosystem === "evm" ? "EVM" : "Solana"} account over WalletConnect.`
+            );
+          }
           this._wallet = api;
           this._connectedVia = "walletconnect";
           this._connectedWalletId = "walletconnect";
-          const provider = connector.provider;
-          this._providerCleanup = bindWalletConnectEvents(provider, {
-            onAccountsChanged: (accounts) => {
-              if (accounts.length === 0) {
-                this.fullReset();
-                this.triggerExternalDisconnect();
-                this.emit();
-                return;
-              }
-              void this.syncIdentityFromWallet("walletconnect");
-              this.emit();
-            },
-            onChainChanged: () => {
-              void this.syncIdentityFromWallet("walletconnect");
-              this.emit();
-            },
-            onDisconnect: () => {
-              this.fullReset();
-              resetUniversalConnector();
-              this.triggerExternalDisconnect();
-              this.emit();
-            }
-          });
+          this._providerCleanup = this.bindWalletConnectProviderEvents(
+            connector.provider
+          );
           await this.syncIdentityFromWallet("walletconnect");
           this._status = "connected";
           this._error = null;
@@ -3955,6 +4016,100 @@ var init_manager = __esm({
           return { error: message, api: null };
         }
       }
+      bindWalletConnectProviderEvents(provider) {
+        return bindWalletConnectEvents(provider, {
+          onAccountsChanged: (accounts) => {
+            if (accounts.length === 0) {
+              this.fullReset();
+              this.triggerExternalDisconnect();
+              this.emit();
+              return;
+            }
+            void this.syncIdentityFromWallet("walletconnect");
+            this.emit();
+          },
+          onChainChanged: () => {
+            void this.syncIdentityFromWallet("walletconnect");
+            this.emit();
+          },
+          onDisconnect: () => {
+            this.fullReset();
+            resetUniversalConnector();
+            this.triggerExternalDisconnect();
+            this.emit();
+          }
+        });
+      }
+      // WalletConnect's own SignClient auto-restores the last persisted session
+      // from storage on every init — including after a fresh page load — but
+      // that restoration happens silently inside the library. Nothing calls back
+      // into our code for it. On mobile, backgrounding the tab to approve in a
+      // wallet app can cause the OS to reload the page before the original
+      // connect() promise ever resolves, so the connect flow that triggered the
+      // approval never gets to record it as "connected" here — even though
+      // WalletConnect itself already has a live, approved session sitting in
+      // storage. Call this on mount to pick that back up.
+      async restoreWalletConnectSession(walletCfg) {
+        if (this._status === "connected" && this._connectedVia === "walletconnect") {
+          return this._wallet?.ecosystem === "solana" ? "solana" : "evm";
+        }
+        if (typeof window === "undefined") return null;
+        try {
+          if (!Object.keys(window.localStorage).some((key) => key.startsWith("wc@2"))) {
+            return null;
+          }
+        } catch {
+        }
+        let connector;
+        try {
+          connector = await getUniversalConnector(walletCfg);
+        } catch (e2) {
+          console.warn(
+            "[Trustware SDK] Failed to restore WalletConnect session:",
+            e2
+          );
+          return null;
+        }
+        const session = connector.provider.session;
+        if (!session) return null;
+        const ecosystem = session.namespaces?.solana?.accounts?.length ? "solana" : session.namespaces?.eip155?.accounts?.length ? "evm" : null;
+        if (!ecosystem) return null;
+        try {
+          const api = await buildWalletConnectAPI(walletCfg, ecosystem);
+          this._wallet = api;
+          this._connectedVia = "walletconnect";
+          this._connectedWalletId = "walletconnect";
+          this._providerCleanup = this.bindWalletConnectProviderEvents(
+            connector.provider
+          );
+          await this.syncIdentityFromWallet("walletconnect");
+          this._status = "connected";
+          this._error = null;
+          this.emit();
+          return ecosystem;
+        } catch {
+          return null;
+        }
+      }
+      // Forcibly abandon an in-progress connect() call the caller has decided is
+      // stuck (e.g. the UI's own connect timeout elapsed with no response).
+      // There's no clean way to cancel a pending WalletConnect pairing proposal
+      // from this side, so this tears down the whole connector — the next
+      // connect attempt starts against a brand new SignClient/pairing instead of
+      // racing the abandoned one, which would otherwise risk reproducing the
+      // "No matching key. proposal" class of error a real retry needs to avoid.
+      cancelWalletConnectAttempt() {
+        if (this._connectedVia === "walletconnect" && this._status === "connected") {
+          return;
+        }
+        resetUniversalConnector();
+        if (this._status === "connecting") {
+          this.clearConnectedState();
+          this._status = "idle";
+          this._error = null;
+          this.emit();
+        }
+      }
       async disconnect(wagmi) {
         if (wagmi && this._connectedVia === "extension") {
           await wagmi.disconnect().catch(() => {
@@ -7654,15 +7809,74 @@ var init_useWalletSessionState = __esm({
 });
 
 // src/widget/state/deposit/useWalletConnect.ts
-import { useCallback as useCallback6 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect8, useRef, useState as useState8 } from "react";
 function useWalletConnect({
   setWalletType,
-  setCurrentStep
+  setCurrentStep,
+  selectedNamespace,
+  setSelectedNamespace
 }) {
   const walletConnectCfg = TrustwareConfigStore.peek()?.walletConnect;
   const connectWC = useWalletConnectConnect(walletConnectCfg);
+  const ecosystem = selectedNamespace.trim().toLowerCase() === "solana" ? "solana" : "evm";
+  const [wcStatus, setWcStatus] = useState8("idle");
+  const [wcErrorMessage, setWcErrorMessage] = useState8(null);
+  const wcTimeoutRef = useRef(null);
+  const clearWcTimeout = useCallback6(() => {
+    if (wcTimeoutRef.current !== null) {
+      clearTimeout(wcTimeoutRef.current);
+      wcTimeoutRef.current = null;
+    }
+  }, []);
+  const beginWcAttempt = useCallback6(() => {
+    setWcStatus("connecting");
+    setWcErrorMessage(null);
+    clearWcTimeout();
+    wcTimeoutRef.current = setTimeout(() => {
+      wcTimeoutRef.current = null;
+      setWcStatus((prev) => prev === "connecting" ? "timedOut" : prev);
+    }, WC_CONNECT_TIMEOUT_MS);
+  }, [clearWcTimeout]);
+  const resolveWcAttempt = useCallback6(() => {
+    clearWcTimeout();
+    setWcStatus("idle");
+    setWcErrorMessage(null);
+  }, [clearWcTimeout]);
+  const failWcAttempt = useCallback6(
+    (message) => {
+      clearWcTimeout();
+      setWcStatus("failed");
+      setWcErrorMessage(message);
+    },
+    [clearWcTimeout]
+  );
+  const dismissWcStatus = useCallback6(() => {
+    clearWcTimeout();
+    setWcStatus("idle");
+    setWcErrorMessage(null);
+  }, [clearWcTimeout]);
+  useEffect8(() => clearWcTimeout, [clearWcTimeout]);
+  useEffect8(() => {
+    let cancelled = false;
+    beginWcAttempt();
+    void (async () => {
+      const restoredEcosystem = await walletManager.restoreWalletConnectSession(walletConnectCfg);
+      if (cancelled) return;
+      resolveWcAttempt();
+      if (!restoredEcosystem) return;
+      setWalletType("walletconnect");
+      if (restoredEcosystem === "solana") {
+        setSelectedNamespace("Solana");
+      }
+      const address = walletManager.identity?.addresses[0]?.address ?? null;
+      if (address) setCurrentStep("crypto-pay");
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, []);
   const WalletConnect = useCallback6(async () => {
-    if (walletManager.status === "connected" && walletManager.connectedVia === "walletconnect") {
+    if (walletManager.status === "connected" && walletManager.connectedVia === "walletconnect" && walletManager.wallet?.ecosystem === ecosystem) {
       const address = walletManager.identity?.addresses[0]?.address ?? null;
       if (address) {
         setWalletType("walletconnect");
@@ -7671,40 +7885,66 @@ function useWalletConnect({
       }
     }
     setWalletType("walletconnect");
-    const { error } = await connectWC();
+    beginWcAttempt();
+    const { error } = await connectWC(ecosystem);
     if (!error) {
       const address = walletManager.identity?.addresses[0]?.address ?? null;
       if (address) {
+        resolveWcAttempt();
         setCurrentStep("crypto-pay");
+      } else {
+        const message = `WalletConnect session established but no address resolved for ecosystem "${ecosystem}".`;
+        console.error(`[Trustware SDK] ${message}`);
+        failWcAttempt(message);
       }
     } else {
+      console.error("[Trustware SDK] WalletConnect connection failed:", error);
+      failWcAttempt(error);
       setWalletType("other");
     }
-  }, [connectWC, setCurrentStep, setWalletType]);
+  }, [
+    beginWcAttempt,
+    connectWC,
+    ecosystem,
+    failWcAttempt,
+    resolveWcAttempt,
+    setCurrentStep,
+    setWalletType
+  ]);
+  const retryWalletConnect = useCallback6(() => {
+    walletManager.cancelWalletConnectAttempt();
+    void WalletConnect();
+  }, [WalletConnect]);
   const disconnectWalletConnect = useCallback6(async () => {
     await walletManager.disconnect();
     setWalletType("other");
     setCurrentStep("home");
   }, [setCurrentStep, setWalletType]);
-  const walletConnectAddress = walletManager.status === "connected" && walletManager.connectedVia === "walletconnect" ? walletManager.wallet?.ecosystem === "evm" ? walletManager.identity?.addresses[0]?.address ?? null : null : null;
+  const walletConnectAddress = walletManager.status === "connected" && walletManager.connectedVia === "walletconnect" ? walletManager.identity?.addresses[0]?.address ?? null : null;
   return {
     walletConnectAddress,
     WalletConnect,
-    disconnectWalletConnect
+    disconnectWalletConnect,
+    wcStatus,
+    wcErrorMessage,
+    retryWalletConnect,
+    dismissWcStatus
   };
 }
+var WC_CONNECT_TIMEOUT_MS;
 var init_useWalletConnect = __esm({
   "src/widget/state/deposit/useWalletConnect.ts"() {
     "use strict";
     init_config2();
     init_wallets();
+    WC_CONNECT_TIMEOUT_MS = 3e4;
   }
 });
 
 // src/hooks/useTrustwareConfig.ts
-import { useEffect as useEffect8, useState as useState8 } from "react";
+import { useEffect as useEffect9, useState as useState9 } from "react";
 function useTrustwareConfig() {
-  const [cfg, setCfg] = useState8(() => {
+  const [cfg, setCfg] = useState9(() => {
     try {
       return TrustwareConfigStore.get();
     } catch {
@@ -7741,7 +7981,7 @@ function useTrustwareConfig() {
       };
     }
   });
-  useEffect8(() => {
+  useEffect9(() => {
     const unsubscribe = TrustwareConfigStore.subscribe(setCfg);
     return () => {
       unsubscribe();
@@ -7758,7 +7998,7 @@ var init_useTrustwareConfig = __esm({
 });
 
 // src/widget/context/DepositContext.tsx
-import React2, { createContext as createContext2, useContext as useContext2, useState as useState9, useMemo as useMemo5 } from "react";
+import React2, { createContext as createContext2, useContext as useContext2, useState as useState10, useMemo as useMemo5 } from "react";
 import { jsx as jsx2 } from "react/jsx-runtime";
 function DepositProvider({
   children,
@@ -7783,20 +8023,30 @@ function DepositProvider({
     connectWallet,
     disconnectWallet
   } = useWalletSessionState();
-  const [amountInputMode, setAmountInputMode] = useState9(
+  const [amountInputMode, setAmountInputMode] = useState10(
     "usd"
   );
-  const [walletType, setWalletType] = useState9(
+  const [walletType, setWalletType] = useState10(
     "other"
   );
-  const { walletConnectAddress, WalletConnect, disconnectWalletConnect } = useWalletConnect({
+  const [selectedNamespace, setSelectedNamespace] = useState10("evm");
+  const {
+    walletConnectAddress,
+    WalletConnect,
+    disconnectWalletConnect,
+    wcStatus,
+    wcErrorMessage,
+    retryWalletConnect,
+    dismissWcStatus
+  } = useWalletConnect({
     setWalletType,
-    setCurrentStep
+    setCurrentStep,
+    selectedNamespace,
+    setSelectedNamespace
   });
-  const [selectedToken, setSelectedToken] = useState9(null);
-  const [selectedChain, setSelectedChain] = useState9(null);
-  const [amount, setAmount] = useState9("");
-  const [selectedNamespace, setSelectedNamespace] = useState9("evm");
+  const [selectedToken, setSelectedToken] = useState10(null);
+  const [selectedChain, setSelectedChain] = useState10(null);
+  const [amount, setAmount] = useState10("");
   const walletAddress = useMemo5(
     () => walletType === "walletconnect" ? walletConnectAddress : otherWalletAddress,
     [walletType, walletConnectAddress, otherWalletAddress]
@@ -7814,11 +8064,11 @@ function DepositProvider({
     selectedToken,
     setSelectedToken
   });
-  const [transactionStatus, setTransactionStatus] = useState9("idle");
-  const [transactionHash, setTransactionHash] = useState9(null);
-  const [errorMessage, setErrorMessage] = useState9(null);
-  const [intentId, setIntentId] = useState9(null);
-  const [paymentMethod, setPaymentMethod] = useState9("crypto");
+  const [transactionStatus, setTransactionStatus] = useState10("idle");
+  const [transactionHash, setTransactionHash] = useState10(null);
+  const [errorMessage, setErrorMessage] = useState10(null);
+  const [intentId, setIntentId] = useState10(null);
+  const [paymentMethod, setPaymentMethod] = useState10("crypto");
   const resetState = React2.useCallback(() => {
     resetNavigation();
     setSelectedToken(null);
@@ -7868,7 +8118,11 @@ function DepositProvider({
       setWalletType,
       walletType,
       selectedNamespace,
-      setSelectedNamespace
+      setSelectedNamespace,
+      wcStatus,
+      wcErrorMessage,
+      retryWalletConnect,
+      dismissWcStatus
     }),
     [
       WalletConnect,
@@ -7884,7 +8138,11 @@ function DepositProvider({
       yourWalletTokens,
       yourWalletTokensLoading,
       selectedNamespace,
-      setSelectedNamespace
+      setSelectedNamespace,
+      wcStatus,
+      wcErrorMessage,
+      retryWalletConnect,
+      dismissWcStatus
     ]
   );
   const formValue = useMemo5(
@@ -7987,7 +8245,7 @@ var init_DepositContext = __esm({
 });
 
 // src/widget/hooks/useRouteBuilder.ts
-import { useEffect as useEffect9, useMemo as useMemo6, useRef, useState as useState10 } from "react";
+import { useEffect as useEffect10, useMemo as useMemo6, useRef as useRef2, useState as useState11 } from "react";
 function useRouteBuilder({
   enabled = true,
   debounceMs = 300,
@@ -8008,7 +8266,7 @@ function useRouteBuilder({
   const { selectedToken, selectedChain, amount } = useDepositForm();
   const { walletAddress } = useDepositWallet();
   const { errorMessage } = useDepositTransaction();
-  const [state, setState] = useState10({
+  const [state, setState] = useState11({
     isLoadingRoute: false,
     networkFees: null,
     estimatedReceive: null,
@@ -8016,8 +8274,8 @@ function useRouteBuilder({
     intentId: null,
     routeResult: null
   });
-  const abortRef = useRef(null);
-  const [refreshTick, setRefreshTick] = useState10(0);
+  const abortRef = useRef2(null);
+  const [refreshTick, setRefreshTick] = useState11(0);
   const routeKey = useMemo6(() => {
     if (!enabled || !selectedToken || !selectedChain || !amount || !walletAddress) {
       return null;
@@ -8058,7 +8316,7 @@ function useRouteBuilder({
   ]);
   const hasFromChainId = fromChainId !== void 0 && fromChainId !== null && String(fromChainId).trim() !== "";
   const hasToChainId = toChainId !== void 0 && toChainId !== null && String(toChainId).trim() !== "";
-  useEffect9(() => {
+  useEffect10(() => {
     if (!fromChain || !hasFromChainId || !hasToChainId || !fromToken || !toToken || !fromAmountWei || !fromAddress || !toAddress)
       return;
     abortRef.current?.abort();
@@ -8194,7 +8452,7 @@ function useRouteBuilder({
     walletAddress,
     errorMessage
   ]);
-  useEffect9(() => {
+  useEffect10(() => {
     if (!enabled || !routeKey || !refreshMs || refreshMs <= 0) return;
     const id = setInterval(() => {
       setRefreshTick((tick) => tick + 1);
@@ -8317,7 +8575,7 @@ var init_useAmountConstraints = __esm({
 });
 
 // src/widget/hooks/useTransactionSubmit.ts
-import { useCallback as useCallback7, useState as useState11 } from "react";
+import { useCallback as useCallback7, useState as useState12 } from "react";
 function useTransactionSubmit() {
   const { selectedChain } = useDepositForm();
   const { setCurrentStep } = useDepositNavigation();
@@ -8327,7 +8585,7 @@ function useTransactionSubmit() {
     setErrorMessage,
     setIntentId
   } = useDepositTransaction();
-  const [state, setState] = useState11({
+  const [state, setState] = useState12({
     isSubmitting: false,
     txHash: null,
     error: null
@@ -8461,10 +8719,10 @@ var init_useTransactionSubmit = __esm({
 });
 
 // src/hooks/useGTM.ts
-import { useEffect as useEffect10, useRef as useRef2, useCallback as useCallback8 } from "react";
+import { useEffect as useEffect11, useRef as useRef3, useCallback as useCallback8 } from "react";
 function useGTM(gtmId) {
-  const isInitialized = useRef2(false);
-  const scriptRef = useRef2(null);
+  const isInitialized = useRef3(false);
+  const scriptRef = useRef3(null);
   const isGA4Allowed = useCallback8(() => {
     try {
       return Trustware.getConfig().features.shouldAllowGA4;
@@ -8472,7 +8730,7 @@ function useGTM(gtmId) {
       return false;
     }
   }, []);
-  useEffect10(() => {
+  useEffect11(() => {
     if (!isGA4Allowed()) {
       console.warn(
         "useGTM: GA4 tracking is disabled or Trustware config not initialized."
@@ -8610,7 +8868,7 @@ var init_hooks = __esm({
 });
 
 // src/widget/hooks/useTransactionPolling.ts
-import { useCallback as useCallback9, useEffect as useEffect11, useRef as useRef3, useState as useState12 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect12, useRef as useRef4, useState as useState13 } from "react";
 function useTransactionPolling() {
   const { setCurrentStep } = useDepositNavigation();
   const { setTransactionStatus, setErrorMessage } = useDepositTransaction();
@@ -8624,18 +8882,18 @@ function useTransactionPolling() {
     }
   })();
   const { trackEvent } = useGTM(GTM_ID);
-  const [state, setState] = useState12({
+  const [state, setState] = useState13({
     isPolling: false,
     apiStatus: null,
     error: null,
     transaction: null,
     receiptSubmitted: false
   });
-  const pollingRef = useRef3(null);
-  const timeoutRef = useRef3(null);
-  const abortRef = useRef3(false);
-  const startTimeRef = useRef3(0);
-  const pollCountRef = useRef3(0);
+  const pollingRef = useRef4(null);
+  const timeoutRef = useRef4(null);
+  const abortRef = useRef4(false);
+  const startTimeRef = useRef4(0);
+  const pollCountRef = useRef4(0);
   const clearPolling = useCallback9(() => {
     abortRef.current = true;
     if (pollingRef.current) {
@@ -8793,9 +9051,9 @@ function useTransactionPolling() {
       receiptSubmitted: false
     });
   }, [clearPolling]);
-  const clearPollingRef = useRef3(clearPolling);
+  const clearPollingRef = useRef4(clearPolling);
   clearPollingRef.current = clearPolling;
-  useEffect11(() => {
+  useEffect12(() => {
     return () => {
       clearPollingRef.current();
     };
@@ -8884,7 +9142,7 @@ var init_hooks2 = __esm({
 });
 
 // src/widget/state/deposit/useWalletTokenState.ts
-import { useCallback as useCallback10, useEffect as useEffect12, useRef as useRef4, useState as useState13 } from "react";
+import { useCallback as useCallback10, useEffect as useEffect13, useRef as useRef5, useState as useState14 } from "react";
 function useWalletTokenState({
   walletAddress,
   selectedChain,
@@ -8892,19 +9150,19 @@ function useWalletTokenState({
   selectedToken,
   setSelectedToken
 }) {
-  const [yourWalletTokens, setYourWalletTokens] = useState13([]);
-  const [yourWalletTokensLoading, setYourWalletTokensLoading] = useState13(false);
-  const [walletTokensReloadNonce, setWalletTokensReloadNonce] = useState13(0);
-  const lastLoadedWalletRef = useRef4(null);
+  const [yourWalletTokens, setYourWalletTokens] = useState14([]);
+  const [yourWalletTokensLoading, setYourWalletTokensLoading] = useState14(false);
+  const [walletTokensReloadNonce, setWalletTokensReloadNonce] = useState14(0);
+  const lastLoadedWalletRef = useRef5(null);
   const { tokens } = useTokens(null);
   const { chains } = useChains();
-  const selectedChainRef = useRef4(selectedChain);
+  const selectedChainRef = useRef5(selectedChain);
   selectedChainRef.current = selectedChain;
-  const selectedTokenRef = useRef4(selectedToken);
+  const selectedTokenRef = useRef5(selectedToken);
   selectedTokenRef.current = selectedToken;
-  const setSelectedChainRef = useRef4(setSelectedChain);
+  const setSelectedChainRef = useRef5(setSelectedChain);
   setSelectedChainRef.current = setSelectedChain;
-  const setSelectedTokenRef = useRef4(setSelectedToken);
+  const setSelectedTokenRef = useRef5(setSelectedToken);
   setSelectedTokenRef.current = setSelectedToken;
   const { address: fallbackAddress } = useWalletInfo();
   const getCurrentWalletAddress = useCallback10(
@@ -8913,7 +9171,7 @@ function useWalletTokenState({
     },
     [fallbackAddress]
   );
-  useEffect12(() => {
+  useEffect13(() => {
     if (!walletAddress || chains.length === 0 || tokens.length === 0) {
       setYourWalletTokens([]);
       if (!walletAddress) {
@@ -10016,7 +10274,7 @@ var init_AmountSlider = __esm({
 });
 
 // src/widget/components/AmountInputDisplay.tsx
-import { useRef as useRef5, useState as useState14 } from "react";
+import { useRef as useRef6, useState as useState15 } from "react";
 import { jsx as jsx4, jsxs as jsxs2 } from "react/jsx-runtime";
 function formatDisplayAmount(value) {
   if (!Number.isFinite(value) || value <= 0) return "0";
@@ -10055,8 +10313,8 @@ function AmountInputDisplay({
   style,
   inputAriaLabel = "Deposit amount"
 }) {
-  const [isEditing, setIsEditing] = useState14(false);
-  const inputRef = useRef5(null);
+  const [isEditing, setIsEditing] = useState15(false);
+  const inputRef = useRef6(null);
   const handleAmountClick = () => {
     if (isFixedAmount) return;
     const isZeroish = !amount || parseFloat(amount) === 0;
@@ -10289,15 +10547,15 @@ __export(ConfettiEffect_exports, {
   ConfettiEffect: () => ConfettiEffect,
   default: () => ConfettiEffect_default
 });
-import { useEffect as useEffect13, useState as useState15 } from "react";
+import { useEffect as useEffect14, useState as useState16 } from "react";
 import { jsx as jsx6 } from "react/jsx-runtime";
 function ConfettiEffect({
   isActive,
   clearDelay = 3e3,
   pieceCount = 50
 }) {
-  const [pieces, setPieces] = useState15([]);
-  useEffect13(() => {
+  const [pieces, setPieces] = useState16([]);
+  useEffect14(() => {
     if (isActive) {
       const colors2 = [
         "#10b981",
@@ -10382,7 +10640,7 @@ var init_ConfettiEffect = __esm({
 });
 
 // src/widget/components/Dialog.tsx
-import { useEffect as useEffect14, useRef as useRef6 } from "react";
+import { useEffect as useEffect15, useRef as useRef7 } from "react";
 import { Fragment, jsx as jsx7, jsxs as jsxs4 } from "react/jsx-runtime";
 var Dialog;
 var init_Dialog = __esm({
@@ -10399,11 +10657,11 @@ var init_Dialog = __esm({
       confirmText = "Close Anyway",
       isDark = false
     }) => {
-      const dialogRef = useRef6(null);
-      const overlayRef = useRef6(null);
-      const firstButtonRef = useRef6(null);
-      const lastButtonRef = useRef6(null);
-      useEffect14(() => {
+      const dialogRef = useRef7(null);
+      const overlayRef = useRef7(null);
+      const firstButtonRef = useRef7(null);
+      const lastButtonRef = useRef7(null);
+      useEffect15(() => {
         const handleEscape = (e2) => {
           if (e2.key === "Escape" && open) {
             e2.preventDefault();
@@ -10417,7 +10675,7 @@ var init_Dialog = __esm({
           document.removeEventListener("keydown", handleEscape);
         };
       }, [open, onCancel]);
-      useEffect14(() => {
+      useEffect15(() => {
         const handleTabKey = (e2) => {
           if (!open) return;
           if (e2.key === "Tab") {
@@ -10441,7 +10699,7 @@ var init_Dialog = __esm({
           document.removeEventListener("keydown", handleTabKey);
         };
       }, [open]);
-      useEffect14(() => {
+      useEffect15(() => {
         if (open) {
           const originalStyle = window.getComputedStyle(document.body).overflow;
           document.body.style.overflow = "hidden";
@@ -10747,7 +11005,7 @@ var init_TransactionHashLink = __esm({
 });
 
 // src/widget/components/SwipeToConfirmTokens.tsx
-import { useState as useState16, useRef as useRef7, useCallback as useCallback12, useEffect as useEffect15 } from "react";
+import { useState as useState17, useRef as useRef8, useCallback as useCallback12, useEffect as useEffect16 } from "react";
 import { jsx as jsx9, jsxs as jsxs6 } from "react/jsx-runtime";
 function SwipeToConfirmTokens({
   fromToken,
@@ -10762,16 +11020,16 @@ function SwipeToConfirmTokens({
   style,
   text
 }) {
-  const [dragX, setDragX] = useState16(0);
-  const [isDragging, setIsDragging] = useState16(false);
-  const [isComplete, setIsComplete] = useState16(false);
-  const trackRef = useRef7(null);
-  const thumbRef = useRef7(null);
-  const [isLongPressing, setIsLongPressing] = useState16(false);
-  const [longPressProgress, setLongPressProgress] = useState16(0);
-  const longPressTimerRef = useRef7(null);
-  const longPressStartRef = useRef7(null);
-  const longPressAnimationRef = useRef7(null);
+  const [dragX, setDragX] = useState17(0);
+  const [isDragging, setIsDragging] = useState17(false);
+  const [isComplete, setIsComplete] = useState17(false);
+  const trackRef = useRef8(null);
+  const thumbRef = useRef8(null);
+  const [isLongPressing, setIsLongPressing] = useState17(false);
+  const [longPressProgress, setLongPressProgress] = useState17(0);
+  const longPressTimerRef = useRef8(null);
+  const longPressStartRef = useRef8(null);
+  const longPressAnimationRef = useRef8(null);
   const LONG_PRESS_DURATION = 1500;
   const thumbSize = 48;
   const padding = 4;
@@ -10869,7 +11127,7 @@ function SwipeToConfirmTokens({
     },
     [cancelLongPress]
   );
-  useEffect15(() => {
+  useEffect16(() => {
     return () => {
       if (longPressTimerRef.current) clearTimeout(longPressTimerRef.current);
       if (longPressAnimationRef.current)
@@ -10888,7 +11146,7 @@ function SwipeToConfirmTokens({
   const handleTouchStart = () => handleDragStart();
   const handleTouchMove = (e2) => handleDragMove(e2.touches[0].clientX);
   const handleTouchEnd = () => handleDragEnd();
-  useEffect15(() => {
+  useEffect16(() => {
     if (isDragging) {
       window.addEventListener("mousemove", handleMouseMove);
       window.addEventListener("mouseup", handleMouseUp);
@@ -10900,8 +11158,8 @@ function SwipeToConfirmTokens({
   }, [isDragging, handleMouseMove, handleMouseUp]);
   const progress = getProgress();
   const effectiveProgress = isLongPressing ? longPressProgress : progress;
-  const [blinkOpacity, setBlinkOpacity] = useState16(1);
-  useEffect15(() => {
+  const [blinkOpacity, setBlinkOpacity] = useState17(1);
+  useEffect16(() => {
     if (disabled || isComplete || isDragging || isLongPressing) {
       setBlinkOpacity(1);
       return;
@@ -11363,7 +11621,7 @@ var init_ThemeToggle = __esm({
 });
 
 // src/widget/components/Toast.tsx
-import { useEffect as useEffect16, useState as useState17, useCallback as useCallback13 } from "react";
+import { useEffect as useEffect17, useState as useState18, useCallback as useCallback13 } from "react";
 import { jsx as jsx11, jsxs as jsxs8 } from "react/jsx-runtime";
 function ToastItem({
   id,
@@ -11373,14 +11631,14 @@ function ToastItem({
   duration = 4e3,
   onDismiss
 }) {
-  const [isExiting, setIsExiting] = useState17(false);
-  useEffect16(() => {
+  const [isExiting, setIsExiting] = useState18(false);
+  useEffect17(() => {
     const timer = setTimeout(() => {
       setIsExiting(true);
     }, duration);
     return () => clearTimeout(timer);
   }, [duration]);
-  useEffect16(() => {
+  useEffect17(() => {
     if (isExiting) {
       const exitTimer = setTimeout(() => {
         onDismiss(id);
@@ -11579,8 +11837,8 @@ function toast(data) {
   };
 }
 function ToastContainer() {
-  const [activeToasts, setActiveToasts] = useState17([]);
-  useEffect16(() => {
+  const [activeToasts, setActiveToasts] = useState18([]);
+  useEffect17(() => {
     const listener = (newToasts) => {
       setActiveToasts(newToasts);
     };
@@ -11662,10 +11920,10 @@ var init_Toast = __esm({
 
 // src/widget/components/TokenSwipePill.tsx
 import React9, {
-  useState as useState18,
-  useRef as useRef8,
+  useState as useState19,
+  useRef as useRef9,
   useCallback as useCallback14,
-  useEffect as useEffect17,
+  useEffect as useEffect18,
   useMemo as useMemo9
 } from "react";
 import { jsx as jsx12, jsxs as jsxs9 } from "react/jsx-runtime";
@@ -11678,10 +11936,10 @@ function TokenSwipePill({
   walletAddress,
   style
 }) {
-  const [isDragging, setIsDragging] = useState18(false);
-  const [dragOffset, setDragOffset] = useState18(0);
-  const startXRef = useRef8(0);
-  const containerRef = useRef8(null);
+  const [isDragging, setIsDragging] = useState19(false);
+  const [dragOffset, setDragOffset] = useState19(0);
+  const startXRef = useRef9(0);
+  const containerRef = useRef9(null);
   const currentIndex = tokens.findIndex(
     (t) => normalizeAddress2(
       t.address,
@@ -11752,7 +12010,7 @@ function TokenSwipePill({
   const handleTouchEnd = () => {
     handleDragEnd();
   };
-  useEffect17(() => {
+  useEffect18(() => {
     if (isDragging) {
       window.addEventListener("mousemove", handleMouseMove);
       window.addEventListener("mouseup", handleMouseUp);
@@ -12457,7 +12715,7 @@ var init_TransactionSteps = __esm({
 });
 
 // src/widget/components/WidgetContainer.tsx
-import { useEffect as useEffect18, useState as useState19 } from "react";
+import { useEffect as useEffect19, useState as useState20 } from "react";
 import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs11 } from "react/jsx-runtime";
 function WidgetContainer({
   children,
@@ -12465,8 +12723,8 @@ function WidgetContainer({
   className,
   style
 }) {
-  const [resolvedTheme, setResolvedTheme] = useState19("light");
-  useEffect18(() => {
+  const [resolvedTheme, setResolvedTheme] = useState20("light");
+  useEffect19(() => {
     if (theme === "system") {
       const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mediaQuery.matches ? "dark" : "light");
@@ -13011,7 +13269,7 @@ var init_ErrorPage = __esm({
 });
 
 // src/widget/components/ImageLoader.tsx
-import { useCallback as useCallback15, useEffect as useEffect19, useMemo as useMemo11, useRef as useRef9, useState as useState20 } from "react";
+import { useCallback as useCallback15, useEffect as useEffect20, useMemo as useMemo11, useRef as useRef10, useState as useState21 } from "react";
 import { jsx as jsx18, jsxs as jsxs15 } from "react/jsx-runtime";
 function Skeleton({
   background,
@@ -13040,18 +13298,18 @@ function ImageLoader({
   onLoad,
   onError
 }) {
-  const [status, setStatus] = useState20("idle");
-  const [attempt, setAttempt] = useState20(0);
-  const [srcIsEmpty, setSrcIsEmpty] = useState20(false);
-  const imgRef = useRef9(null);
-  const observerRef = useRef9(null);
-  const onLoadRef = useRef9(onLoad);
-  const onErrorRef = useRef9(onError);
-  useEffect19(() => {
+  const [status, setStatus] = useState21("idle");
+  const [attempt, setAttempt] = useState21(0);
+  const [srcIsEmpty, setSrcIsEmpty] = useState21(false);
+  const imgRef = useRef10(null);
+  const observerRef = useRef10(null);
+  const onLoadRef = useRef10(onLoad);
+  const onErrorRef = useRef10(onError);
+  useEffect20(() => {
     onLoadRef.current = onLoad;
     onErrorRef.current = onError;
   }, [onLoad, onError]);
-  useEffect19(() => {
+  useEffect20(() => {
     if (status === "error" && attempt < retry) {
       const timer = setTimeout(() => {
         setAttempt((prev) => prev + 1);
@@ -13078,7 +13336,7 @@ function ImageLoader({
       onErrorRef.current?.();
     };
   }, [src]);
-  useEffect19(() => {
+  useEffect20(() => {
     if (!lazy3) {
       const timer = setTimeout(() => loadImage(), 0);
       return () => clearTimeout(timer);
@@ -13548,7 +13806,7 @@ var init_AvailableTokenListItem = __esm({
 });
 
 // src/widget/features/token-selection/components/ChainSelectorPanel.tsx
-import { useState as useState21, useMemo as useMemo12 } from "react";
+import { useState as useState22, useMemo as useMemo12 } from "react";
 import { Fragment as Fragment3, jsx as jsx22, jsxs as jsxs19 } from "react/jsx-runtime";
 function ChainItem({
   chain,
@@ -13760,7 +14018,7 @@ function ChainSelectorPanel({
   otherChains,
   popularChains
 }) {
-  const [chainSearch, setChainSearch] = useState21("");
+  const [chainSearch, setChainSearch] = useState22("");
   const filteredPopular = useMemo12(() => {
     if (!chainSearch) return popularChains;
     const q = chainSearch.toLowerCase();
@@ -14519,7 +14777,7 @@ var init_WalletTokenListItem = __esm({
 });
 
 // src/widget/features/token-selection/components/TokenSelectorPanel.tsx
-import { useState as useState22, useEffect as useEffect20 } from "react";
+import { useState as useState23, useEffect as useEffect21 } from "react";
 import { Fragment as Fragment4, jsx as jsx26, jsxs as jsxs23 } from "react/jsx-runtime";
 function TokenSectionLabel({
   children,
@@ -14615,8 +14873,8 @@ function TokenSelectorPanel({
   setSearchQuery,
   tokensError
 }) {
-  const [showAll, setShowAll] = useState22(false);
-  useEffect20(() => {
+  const [showAll, setShowAll] = useState23(false);
+  useEffect21(() => {
     setShowAll(false);
   }, [selectedChain, searchQuery]);
   const hasWalletTokens = filteredWalletTokens.length > 0;
@@ -15540,7 +15798,7 @@ var init_CryptoPayAmountSection = __esm({
 });
 
 // src/widget/features/amount/hooks/useDepositAmountModel.ts
-import { useEffect as useEffect21, useMemo as useMemo15 } from "react";
+import { useEffect as useEffect22, useMemo as useMemo15 } from "react";
 function useDepositAmountModel({
   amount,
   setAmount,
@@ -15561,7 +15819,7 @@ function useDepositAmountModel({
     );
     return Number.isFinite(normalized) ? normalized : 0;
   }, [selectedToken?.balance, selectedToken?.decimals]);
-  useEffect21(() => {
+  useEffect22(() => {
     if (fixedFromAmountString) return;
     if (isReady && !hasUsdPrice && amountInputMode === "usd") {
       setAmountInputMode("token");
@@ -15573,7 +15831,7 @@ function useDepositAmountModel({
     isReady,
     setAmountInputMode
   ]);
-  useEffect21(() => {
+  useEffect22(() => {
     if (!fixedFromAmountString) return;
     if (amount !== fixedFromAmountString) {
       setAmount(fixedFromAmountString);
@@ -15751,7 +16009,7 @@ var init_useDepositAmountModel = __esm({
 });
 
 // src/widget/features/amount/hooks/useHomeAmountModel.ts
-import { useEffect as useEffect22, useMemo as useMemo16 } from "react";
+import { useEffect as useEffect23, useMemo as useMemo16 } from "react";
 function useHomeAmountModel({
   amount,
   setAmount,
@@ -15762,7 +16020,7 @@ function useHomeAmountModel({
   minAmountUsd,
   maxAmountUsd
 }) {
-  useEffect22(() => {
+  useEffect23(() => {
     if (!fixedFromAmountString) return;
     if (amount !== fixedFromAmountString) {
       setAmount(fixedFromAmountString);
@@ -16172,8 +16430,20 @@ var init_WalletNamespaceTabs = __esm({
 });
 
 // src/widget/features/wallet/components/CryptoWalletDropdownContent.tsx
-import { useEffect as useEffect23, useMemo as useMemo17, useRef as useRef10, useState as useState23 } from "react";
+import { useEffect as useEffect24, useMemo as useMemo17, useRef as useRef11, useState as useState24 } from "react";
 import { Fragment as Fragment7, jsx as jsx36, jsxs as jsxs30 } from "react/jsx-runtime";
+function ecosystemToNamespace(ecosystem) {
+  switch (ecosystem.trim().toLowerCase()) {
+    case "evm":
+      return "evm";
+    case "solana":
+      return "Solana";
+    case "bitcoin":
+      return "bitcoin";
+    default:
+      return null;
+  }
+}
 function DesktopWalletDropdownContent({
   browserWallets,
   handleWalletConnect,
@@ -16239,38 +16509,70 @@ function DesktopWalletDropdownContent({
   );
 }
 function MobileWalletDropdownContent({
-  handleWalletConnect
+  browserWallets,
+  handleWalletConnect,
+  handleWalletSelect: connectDetectedWallet2
 }) {
   const { setCurrentStep } = useDepositNavigation();
-  const { selectedNamespace } = useDepositWallet();
-  const { walletMetaId, isConnected, status } = useWalletInfo();
-  const [hoveredId, setHoveredId] = useState23(null);
-  const storeFallbackTimeoutRef = useRef10(
+  const { selectedNamespace, setSelectedNamespace } = useDepositWallet();
+  const { walletMetaId, isConnected, status, detected } = useWalletInfo();
+  const [hoveredId, setHoveredId] = useState24(null);
+  const storeFallbackTimeoutRef = useRef11(
     null
   );
-  useEffect23(() => {
+  useEffect24(() => {
     return () => {
       if (storeFallbackTimeoutRef.current !== null) {
         clearTimeout(storeFallbackTimeoutRef.current);
       }
     };
   }, []);
+  useEffect24(() => {
+    if (browserWallets.length > 0) return;
+    const otherEcosystemWallet = detected.find((d) => {
+      if (d.meta.id === "walletconnect") return false;
+      const ecosystem = d.meta.ecosystem.trim().toLowerCase();
+      return ecosystem !== "multi" && ecosystem !== selectedNamespace.trim().toLowerCase();
+    });
+    if (!otherEcosystemWallet) return;
+    const nextNamespace = ecosystemToNamespace(
+      otherEcosystemWallet.meta.ecosystem
+    );
+    if (nextNamespace) setSelectedNamespace(nextNamespace);
+  }, [browserWallets, detected, selectedNamespace, setSelectedNamespace]);
   const connectedWalletId = isConnected ? walletMetaId : null;
   const currentUrl = window.location.href;
-  const mobileWallets = useMemo17(
-    () => WALLETS.filter((w) => {
-      if (w.id === "walletconnect") return true;
+  const mobileWallets = useMemo17(() => {
+    const entries = WALLETS.filter((w) => {
+      if (w.id === "walletconnect") {
+        return selectedNamespace.trim().toLowerCase() === "evm";
+      }
+      const isDetected = browserWallets.some((d) => d.meta.id === w.id);
       const hasMobileLink = Boolean(w.deepLink);
-      if (!hasMobileLink) return false;
+      if (!hasMobileLink && !isDetected) return false;
       return w.ecosystem.trim().toLowerCase() === "multi" || w.ecosystem.trim().toLowerCase() === selectedNamespace.trim().toLowerCase();
-    }),
-    [selectedNamespace]
-  );
-  const handleWalletSelect = (wallet) => {
+    }).map((meta) => ({
+      meta,
+      detectedWallet: browserWallets.find((d) => d.meta.id === meta.id) ?? null
+    }));
+    const listedIds = new Set(entries.map((e2) => e2.meta.id));
+    for (const detected2 of browserWallets) {
+      if (!listedIds.has(detected2.meta.id)) {
+        entries.push({ meta: detected2.meta, detectedWallet: detected2 });
+      }
+    }
+    return entries;
+  }, [browserWallets, selectedNamespace]);
+  const handleWalletSelect = (entry) => {
+    const { meta: wallet, detectedWallet } = entry;
     if (wallet.id === "walletconnect") {
       handleWalletConnect();
       return;
     }
+    if (detectedWallet) {
+      void connectDetectedWallet2(detectedWallet);
+      return;
+    }
     if (wallet.deepLink) {
       const deepLinkUrl = wallet.deepLink(currentUrl);
       if (deepLinkUrl) {
@@ -16340,15 +16642,16 @@ function MobileWalletDropdownContent({
               scrollbarWidth: "thin",
               scrollbarColor: `${colors.muted} transparent`
             },
-            children: mobileWallets.map((wallet) => {
+            children: mobileWallets.map((entry) => {
+              const wallet = entry.meta;
               const isConnectedWallet = wallet.id === connectedWalletId;
-              const isDisabled = isConnected && !isConnectedWallet;
+              const isDisabled = isConnected && !isConnectedWallet && !entry.detectedWallet;
               const isHovered = hoveredId === wallet.id;
               return /* @__PURE__ */ jsxs30(
                 "button",
                 {
                   type: "button",
-                  onClick: () => !isDisabled && handleWalletSelect(wallet),
+                  onClick: () => !isDisabled && handleWalletSelect(entry),
                   onMouseEnter: () => !isDisabled && setHoveredId(wallet.id),
                   onMouseLeave: () => setHoveredId(null),
                   style: {
@@ -16424,7 +16727,7 @@ function MobileWalletDropdownContent({
                               }
                             }
                           ),
-                          /* @__PURE__ */ jsx36("span", { style: { fontSize: fontSize.xs, color: "#22c55e" }, children: "Connected" })
+                          /* @__PURE__ */ jsx36("span", { style: { fontSize: fontSize.xs, color: "#22c55e" }, children: "Continue" })
                         ]
                       }
                     )
@@ -16489,7 +16792,9 @@ function CryptoWalletDropdownContent({
     isMobile && /* @__PURE__ */ jsx36(
       MobileWalletDropdownContent,
       {
-        handleWalletConnect
+        browserWallets,
+        handleWalletConnect,
+        handleWalletSelect
       }
     )
   ] });
@@ -16959,7 +17264,7 @@ var init_HomePaymentOptions = __esm({
 });
 
 // src/widget/features/wallet/hooks/useHomeWalletActions.ts
-import { useCallback as useCallback18, useEffect as useEffect24, useMemo as useMemo18, useRef as useRef11, useState as useState24 } from "react";
+import { useCallback as useCallback18, useEffect as useEffect25, useMemo as useMemo18, useRef as useRef12, useState as useState25 } from "react";
 function useHomeWalletActions({
   connectWallet,
   detectedWallets,
@@ -16968,12 +17273,12 @@ function useHomeWalletActions({
   WalletConnect
   // setCurrentStepInternal,
 }) {
-  const [isCryptoDropdownOpen, setIsCryptoDropdownOpen] = useState24(false);
-  const [isFiatDropdownOpen, setIsFiatDropdownOpen] = useState24(false);
-  const cryptoDropdownRef = useRef11(null);
-  const fiatDropdownRef = useRef11(null);
+  const [isCryptoDropdownOpen, setIsCryptoDropdownOpen] = useState25(false);
+  const [isFiatDropdownOpen, setIsFiatDropdownOpen] = useState25(false);
+  const cryptoDropdownRef = useRef12(null);
+  const fiatDropdownRef = useRef12(null);
   const { disconnect } = useWalletInfo();
-  useEffect24(() => {
+  useEffect25(() => {
     const handleClickOutside = (event) => {
       if (cryptoDropdownRef.current && !cryptoDropdownRef.current.contains(event.target)) {
         setIsCryptoDropdownOpen(false);
@@ -17023,9 +17328,11 @@ function useHomeWalletActions({
   const { selectedNamespace } = useDepositWallet();
   const browserWallets = useMemo18(() => {
     if (!detectedWallets?.length) return [];
-    return detectedWallets.filter(
-      (wallet) => wallet?.meta?.id !== "walletconnect" && wallet?.meta?.ecosystem.trim().toLowerCase() === selectedNamespace.trim().toLowerCase()
-    );
+    return detectedWallets.filter((wallet) => {
+      if (wallet?.meta?.id === "walletconnect") return false;
+      const ecosystem = wallet?.meta?.ecosystem.trim().toLowerCase();
+      return ecosystem === "multi" || ecosystem === selectedNamespace.trim().toLowerCase();
+    });
   }, [detectedWallets, selectedNamespace]);
   return {
     browserWallets,
@@ -17059,11 +17366,114 @@ var init_wallet = __esm({
 });
 
 // src/widget/pages/Home.tsx
-import { jsx as jsx44, jsxs as jsxs35 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx44, jsxs as jsxs35 } from "react/jsx-runtime";
+function WalletConnectStatusBanner({
+  status,
+  errorMessage,
+  onRetry,
+  onDismiss
+}) {
+  const isDone = status !== "connecting";
+  const isFailed = status === "failed";
+  const { text, icon } = wcBannerCopy[status];
+  return /* @__PURE__ */ jsxs35(
+    "div",
+    {
+      style: {
+        display: "flex",
+        alignItems: "center",
+        gap: spacing[2],
+        width: "100%",
+        padding: `${spacing[2.5]} ${spacing[3]}`,
+        marginBottom: spacing[4],
+        borderRadius: borderRadius.lg,
+        backgroundColor: isFailed ? "rgba(239,68,68,0.1)" : isDone ? "rgba(234,179,8,0.1)" : colors.muted,
+        border: isFailed ? "1px solid rgba(239,68,68,0.4)" : isDone ? "1px solid rgba(234,179,8,0.4)" : `1px solid ${colors.border}`
+      },
+      children: [
+        icon === "spinner" ? /* @__PURE__ */ jsx44(
+          "div",
+          {
+            style: {
+              width: "0.875rem",
+              height: "0.875rem",
+              border: `2px solid ${colors.mutedForeground}`,
+              borderTopColor: "transparent",
+              borderRadius: "9999px",
+              animation: "tw-spin 1s linear infinite",
+              flexShrink: 0
+            }
+          }
+        ) : /* @__PURE__ */ jsx44("span", { style: { fontSize: fontSize.sm, flexShrink: 0 }, "aria-hidden": true, children: icon }),
+        /* @__PURE__ */ jsxs35(
+          "p",
+          {
+            style: {
+              flex: 1,
+              fontSize: fontSize.xs,
+              color: isDone ? colors.foreground : colors.mutedForeground,
+              margin: 0
+            },
+            children: [
+              text,
+              isFailed && errorMessage ? ` ${errorMessage}` : ""
+            ]
+          }
+        ),
+        isDone && /* @__PURE__ */ jsxs35(Fragment8, { children: [
+          /* @__PURE__ */ jsx44(
+            "button",
+            {
+              type: "button",
+              onClick: onRetry,
+              style: {
+                fontSize: fontSize.xs,
+                fontWeight: fontWeight.semibold,
+                color: colors.primary,
+                backgroundColor: "transparent",
+                border: 0,
+                cursor: "pointer",
+                flexShrink: 0
+              },
+              children: "Retry"
+            }
+          ),
+          /* @__PURE__ */ jsx44(
+            "button",
+            {
+              type: "button",
+              onClick: onDismiss,
+              "aria-label": "Dismiss",
+              style: {
+                fontSize: fontSize.xs,
+                color: colors.mutedForeground,
+                backgroundColor: "transparent",
+                border: 0,
+                cursor: "pointer",
+                flexShrink: 0,
+                padding: 0,
+                lineHeight: 1
+              },
+              children: "\xD7"
+            }
+          )
+        ] })
+      ]
+    }
+  );
+}
 function Home({ style: _style }) {
   const { amount, setAmount, amountInputMode, setAmountInputMode } = useDepositForm();
   const { setCurrentStep, setCurrentStepInternal } = useDepositNavigation();
-  const { connectWallet, WalletConnect, setWalletType } = useDepositWallet();
+  const {
+    connectWallet,
+    WalletConnect,
+    setWalletType,
+    wcStatus,
+    wcErrorMessage,
+    retryWalletConnect,
+    dismissWcStatus
+  } = useDepositWallet();
   const { resolvedTheme } = useDepositUi();
   const { fixedFromAmountString, isFixedAmount, minAmountUsd, maxAmountUsd } = useAmountConstraints();
   const { detected: detectedWallets } = useWalletDetection();
@@ -17145,6 +17555,15 @@ function Home({ style: _style }) {
               position: "relative"
             },
             children: [
+              wcStatus !== "idle" && /* @__PURE__ */ jsx44(
+                WalletConnectStatusBanner,
+                {
+                  status: wcStatus,
+                  errorMessage: wcErrorMessage,
+                  onRetry: retryWalletConnect,
+                  onDismiss: dismissWcStatus
+                }
+              ),
               /* @__PURE__ */ jsx44(
                 "p",
                 {
@@ -17220,6 +17639,7 @@ function Home({ style: _style }) {
     }
   );
 }
+var wcBannerCopy;
 var init_Home = __esm({
   "src/widget/pages/Home.tsx"() {
     "use strict";
@@ -17229,6 +17649,20 @@ var init_Home = __esm({
     init_amount();
     init_wallets();
     init_wallet();
+    wcBannerCopy = {
+      connecting: {
+        text: "Waiting for wallet approval via WalletConnect\u2026",
+        icon: "spinner"
+      },
+      timedOut: {
+        text: "Still waiting on WalletConnect \u2014 this is taking longer than expected.",
+        icon: "\u26A0\uFE0F"
+      },
+      failed: {
+        text: "WalletConnect connection failed.",
+        icon: "\u2715"
+      }
+    };
   }
 });
 
@@ -31079,7 +31513,7 @@ var init_smart_account2 = __esm({
 });
 
 // src/widget/features/transaction/hooks/useTransactionActionModel.ts
-import { useCallback as useCallback19, useEffect as useEffect25, useMemo as useMemo20, useRef as useRef12, useState as useState25 } from "react";
+import { useCallback as useCallback19, useEffect as useEffect26, useMemo as useMemo20, useRef as useRef13, useState as useState26 } from "react";
 import { encodeFunctionData as encodeFunctionData8, erc20Abi } from "viem";
 function normalizeTokenAddressForCompare(chain, addr) {
   const chainType = (chain.type ?? chain.chainType ?? "").toLowerCase();
@@ -31101,7 +31535,7 @@ function useTransactionActionModel({
   walletAddress,
   walletStatus
 }) {
-  const feeDataCacheRef = useRef12({});
+  const feeDataCacheRef = useRef13({});
   const { isSubmitting, submitTransaction } = useTransactionSubmit();
   const { trackEvent } = useGTM(GTM_ID);
   const destinationConfig = (() => {
@@ -31153,10 +31587,10 @@ function useTransactionActionModel({
     const addr = txReq?.to ?? txReq?.target;
     return addr ?? null;
   }, [routeResult?.txReq]);
-  const [allowanceWei, setAllowanceWei] = useState25(0n);
-  const [isReadingAllowance, setIsReadingAllowance] = useState25(false);
-  const [isApproving, setIsApproving] = useState25(false);
-  const [gasReservationWei, setGasReservationWei] = useState25(0n);
+  const [allowanceWei, setAllowanceWei] = useState26(0n);
+  const [isReadingAllowance, setIsReadingAllowance] = useState26(false);
+  const [isApproving, setIsApproving] = useState26(false);
+  const [gasReservationWei, setGasReservationWei] = useState26(0n);
   const readAllowance = useCallback19(async () => {
     if (!isEvm || isNativeSelected || !!routeResult?.sponsorship || // sponsored routes: SA approves bridge inside the UO batch
     !backendChainId2 || !selectedTokenOnBackendChain || !walletAddress || !spender || !selectedToken?.address) {
@@ -31187,7 +31621,7 @@ function useTransactionActionModel({
     spender,
     walletAddress
   ]);
-  useEffect25(() => {
+  useEffect26(() => {
     void readAllowance();
   }, [readAllowance]);
   const needsApproval = isEvm && !isNativeSelected && !routeResult?.sponsorship && // sponsored routes use Permit2 + SA internal batch — no EOA bridge approval
@@ -31391,13 +31825,13 @@ function useTransactionActionModel({
     routeResult?.txReq,
     walletAddress
   ]);
-  useEffect25(() => {
+  useEffect26(() => {
     if (routeResult) {
       void estimateGasReservationWei();
     }
   }, [estimateGasReservationWei, routeResult]);
-  const [smartAccountFailed, setSmartAccountFailed] = useState25(false);
-  useEffect25(() => {
+  const [smartAccountFailed, setSmartAccountFailed] = useState26(false);
+  useEffect26(() => {
     setSmartAccountFailed(false);
   }, [routeResult?.intentId]);
   const handleConfirm = useCallback19(async () => {
@@ -31731,12 +32165,12 @@ var init_DefaultCryptoPay = __esm({
 });
 
 // src/widget/pages/CryptoPay/RouteQuoteLoader.tsx
-import { useState as useState26, useEffect as useEffect26 } from "react";
+import { useState as useState27, useEffect as useEffect27 } from "react";
 import { jsx as jsx49, jsxs as jsxs39 } from "react/jsx-runtime";
 function RouteQuoteLoader({ selectedToken }) {
-  const [messageIndex, setMessageIndex] = useState26(0);
-  const [visible, setVisible] = useState26(true);
-  useEffect26(() => {
+  const [messageIndex, setMessageIndex] = useState27(0);
+  const [visible, setVisible] = useState27(true);
+  useEffect27(() => {
     let t = null;
     const interval = setInterval(() => {
       setVisible(false);
@@ -31912,8 +32346,8 @@ var init_RouteQuoteLoader = __esm({
 });
 
 // src/widget/pages/CryptoPay/index.tsx
-import { useEffect as useEffect27, useMemo as useMemo21 } from "react";
-import { Fragment as Fragment8, jsx as jsx50, jsxs as jsxs40 } from "react/jsx-runtime";
+import { useEffect as useEffect28, useMemo as useMemo21 } from "react";
+import { Fragment as Fragment9, jsx as jsx50, jsxs as jsxs40 } from "react/jsx-runtime";
 function CryptoPay({ style: _style }) {
   const {
     amount,
@@ -32022,7 +32456,7 @@ function CryptoPay({ style: _style }) {
   });
   const { emitError } = useTrustware();
   const readySelectedToken = isReady ? selectedToken : null;
-  useEffect27(() => {
+  useEffect28(() => {
     if (currentStep !== "crypto-pay" || !actionErrorMessage) return;
     emitError?.(
       new TrustwareError({
@@ -32152,7 +32586,7 @@ function CryptoPay({ style: _style }) {
             ]
           }
         ),
-        showSkeleton ? /* @__PURE__ */ jsx50(Fragment8, { children: /* @__PURE__ */ jsx50(
+        showSkeleton ? /* @__PURE__ */ jsx50(Fragment9, { children: /* @__PURE__ */ jsx50(
           "div",
           {
             style: {
@@ -32163,8 +32597,8 @@ function CryptoPay({ style: _style }) {
             },
             children: /* @__PURE__ */ jsx50(LoadingSkeleton, {})
           }
-        ) }) : /* @__PURE__ */ jsxs40(Fragment8, { children: [
-          isReady && /* @__PURE__ */ jsx50(Fragment8, { children: isLoadingRoute && !routeResult ? /* @__PURE__ */ jsx50(RouteQuoteLoader, { selectedToken: readySelectedToken }) : /* @__PURE__ */ jsxs40(Fragment8, { children: [
+        ) }) : /* @__PURE__ */ jsxs40(Fragment9, { children: [
+          isReady && /* @__PURE__ */ jsx50(Fragment9, { children: isLoadingRoute && !routeResult ? /* @__PURE__ */ jsx50(RouteQuoteLoader, { selectedToken: readySelectedToken }) : /* @__PURE__ */ jsxs40(Fragment9, { children: [
             /* @__PURE__ */ jsx50(
               CryptoPayAmountSection,
               {
@@ -32243,7 +32677,7 @@ var init_CryptoPay = __esm({
 });
 
 // src/widget/pages/Processing.tsx
-import { useEffect as useEffect28, useMemo as useMemo22, useRef as useRef13 } from "react";
+import { useEffect as useEffect29, useMemo as useMemo22, useRef as useRef14 } from "react";
 import { jsx as jsx51, jsxs as jsxs41 } from "react/jsx-runtime";
 function getProgressFromStatus(status) {
   switch (status) {
@@ -32282,13 +32716,13 @@ function Processing({ style }) {
   const { resetState, setCurrentStep } = useDepositNavigation();
   const { transactionStatus, transactionHash, intentId } = useDepositTransaction();
   const { transaction, startPolling, isPolling } = useTransactionPolling();
-  const hasStartedPolling = useRef13(false);
-  useEffect28(() => {
+  const hasStartedPolling = useRef14(false);
+  useEffect29(() => {
     return () => {
       hasStartedPolling.current = false;
     };
   }, []);
-  useEffect28(() => {
+  useEffect29(() => {
     if (intentId && transactionHash && !isPolling && !hasStartedPolling.current && transactionStatus !== "success" && transactionStatus !== "error") {
       hasStartedPolling.current = true;
       startPolling(intentId, transactionHash);
@@ -32788,14 +33222,14 @@ var init_WidgetRouter = __esm({
 });
 
 // src/modes/swap/hooks/useSwapRoute.ts
-import { useCallback as useCallback20, useRef as useRef14, useState as useState27 } from "react";
+import { useCallback as useCallback20, useRef as useRef15, useState as useState28 } from "react";
 function useSwapRoute() {
-  const [state, setState] = useState27({
+  const [state, setState] = useState28({
     data: null,
     loading: false,
     error: null
   });
-  const abortRef = useRef14(false);
+  const abortRef = useRef15(false);
   const fetch2 = useCallback20(
     async (params) => {
       const { fromToken, fromChain, toToken, toChain, amount, walletAddress } = params;
@@ -32854,7 +33288,7 @@ var init_useSwapRoute = __esm({
 });
 
 // src/modes/swap/hooks/useSwapExecution.ts
-import { useCallback as useCallback21, useRef as useRef15, useState as useState28 } from "react";
+import { useCallback as useCallback21, useRef as useRef16, useState as useState29 } from "react";
 import { encodeFunctionData as encodeFunctionData9, erc20Abi as erc20Abi2 } from "viem";
 function normalizeTx(raw) {
   const r = raw;
@@ -32889,7 +33323,7 @@ async function waitForApprovalConfirmation(chainId, txHash) {
   throw new Error("Timed out waiting for approval confirmation");
 }
 function useSwapExecution(fromChain) {
-  const [state, setState] = useState28({
+  const [state, setState] = useState29({
     txStatus: "idle",
     txHash: null,
     intentId: null,
@@ -32898,11 +33332,11 @@ function useSwapExecution(fromChain) {
     isSubmitting: false,
     allowanceStatus: "unknown"
   });
-  const saFailedUntilRef = useRef15(0);
-  const pollingRef = useRef15(null);
-  const timeoutRef = useRef15(null);
-  const abortRef = useRef15(false);
-  const pollCountRef = useRef15(0);
+  const saFailedUntilRef = useRef16(0);
+  const pollingRef = useRef16(null);
+  const timeoutRef = useRef16(null);
+  const abortRef = useRef16(false);
+  const pollCountRef = useRef16(0);
   const clearPolling = useCallback21(() => {
     abortRef.current = true;
     if (pollingRef.current) clearTimeout(pollingRef.current);
@@ -33265,13 +33699,13 @@ var init_forex = __esm({
 });
 
 // src/modes/swap/hooks/useForex.ts
-import { useEffect as useEffect29, useRef as useRef16, useState as useState29 } from "react";
+import { useEffect as useEffect30, useRef as useRef17, useState as useState30 } from "react";
 function useForex() {
-  const [rates, setRates] = useState29({ USD: 1 });
-  const [error, setError] = useState29(null);
-  const [lastUpdated, setLastUpdated] = useState29(null);
-  const timerRef = useRef16(null);
-  useEffect29(() => {
+  const [rates, setRates] = useState30({ USD: 1 });
+  const [error, setError] = useState30(null);
+  const [lastUpdated, setLastUpdated] = useState30(null);
+  const timerRef = useRef17(null);
+  useEffect30(() => {
     let cancelled = false;
     const load = () => {
       fetchForexRates("USD").then((r) => {
@@ -33308,7 +33742,7 @@ var init_useForex = __esm({
 });
 
 // src/modes/swap/components/SwapTokenSelect.tsx
-import { useState as useState30, useMemo as useMemo26, useEffect as useEffect30 } from "react";
+import { useState as useState31, useMemo as useMemo26, useEffect as useEffect31 } from "react";
 import { jsx as jsx55, jsxs as jsxs43 } from "react/jsx-runtime";
 function SwapTokenSelect({
   side,
@@ -33324,10 +33758,10 @@ function SwapTokenSelect({
   allowedTokens,
   excludeToken
 }) {
-  const [localChain, setLocalChain] = useState30(initialChain);
-  const [pinnedTokens, setPinnedTokens] = useState30([]);
-  const [pinnedLoading, setPinnedLoading] = useState30(false);
-  useEffect30(() => {
+  const [localChain, setLocalChain] = useState31(initialChain);
+  const [pinnedTokens, setPinnedTokens] = useState31([]);
+  const [pinnedLoading, setPinnedLoading] = useState31(false);
+  useEffect31(() => {
     if (!allowedTokens || allowedTokens.length === 0 || !localChain) {
       setPinnedTokens([]);
       return;
@@ -33629,8 +34063,8 @@ var init_currency = __esm({
 });
 
 // src/modes/swap/components/SwapWalletSelector/SwapWalletSelectorMobile.tsx
-import { useEffect as useEffect31, useMemo as useMemo27, useRef as useRef17, useState as useState31 } from "react";
-import { Fragment as Fragment9, jsx as jsx56, jsxs as jsxs44 } from "react/jsx-runtime";
+import { useEffect as useEffect32, useMemo as useMemo27, useRef as useRef18, useState as useState32 } from "react";
+import { Fragment as Fragment10, jsx as jsx56, jsxs as jsxs44 } from "react/jsx-runtime";
 function SwapWalletSelectorMobile({
   walletStatus,
   walletAddress,
@@ -33647,14 +34081,14 @@ function SwapWalletSelectorMobile({
   } = useWalletInfo();
   const walletConnectCfg = TrustwareConfigStore.peek()?.walletConnect;
   const connectWC = useWalletConnectConnect(walletConnectCfg);
-  const [wcConnecting, setWcConnecting] = useState31(false);
-  const [connectingId, setConnectingId] = useState31(null);
-  const [selectedNamespace, setSelectedNamespace] = useState31("evm");
-  const prevStatusRef = useRef17(walletStatus);
-  const storeFallbackTimeoutRef = useRef17(
+  const [wcConnecting, setWcConnecting] = useState32(false);
+  const [connectingId, setConnectingId] = useState32(null);
+  const [selectedNamespace, setSelectedNamespace] = useState32("evm");
+  const prevStatusRef = useRef18(walletStatus);
+  const storeFallbackTimeoutRef = useRef18(
     null
   );
-  useEffect31(() => {
+  useEffect32(() => {
     const prev = prevStatusRef.current;
     if (prev !== walletStatus) {
       if (prev === "connecting" && (walletStatus === "connected" || walletStatus === "error")) {
@@ -33663,7 +34097,7 @@ function SwapWalletSelectorMobile({
       prevStatusRef.current = walletStatus;
     }
   }, [walletStatus]);
-  useEffect31(() => {
+  useEffect32(() => {
     return () => {
       if (storeFallbackTimeoutRef.current !== null) {
         clearTimeout(storeFallbackTimeoutRef.current);
@@ -33928,6 +34362,7 @@ function SwapWalletSelectorMobile({
                     const { meta } = entry;
                     const isWalletConnected = managerConnected && walletMetaId === meta.id;
                     const isConnecting = connectingId === meta.id && walletStatus === "connecting";
+                    const isRowDisabled = managerConnected && !isWalletConnected && !entry.detectedWallet;
                     return /* @__PURE__ */ jsxs44(
                       "div",
                       {
@@ -33945,7 +34380,8 @@ function SwapWalletSelectorMobile({
                           isWalletConnected && {
                             boxShadow: `0 0 0 2px ${colors.primary}`,
                             border: `1px solid ${colors.primary}`
-                          }
+                          },
+                          isRowDisabled && { opacity: 0.4 }
                         ),
                         children: [
                           /* @__PURE__ */ jsx56(
@@ -34036,7 +34472,7 @@ function SwapWalletSelectorMobile({
                             "button",
                             {
                               onClick: () => void handleClick(entry),
-                              disabled: walletStatus === "connecting",
+                              disabled: walletStatus === "connecting" || isRowDisabled,
                               style: mergeStyles(
                                 {
                                   padding: `${spacing[1.5]} ${spacing[3]}`,
@@ -34049,7 +34485,7 @@ function SwapWalletSelectorMobile({
                                   cursor: "pointer",
                                   flexShrink: 0
                                 },
-                                walletStatus === "connecting" && {
+                                (walletStatus === "connecting" || isRowDisabled) && {
                                   opacity: 0.5,
                                   cursor: "not-allowed"
                                 }
@@ -34064,7 +34500,7 @@ function SwapWalletSelectorMobile({
                   })
                 }
               ),
-              selectedNamespace === "evm" && /* @__PURE__ */ jsxs44(Fragment9, { children: [
+              selectedNamespace === "evm" && /* @__PURE__ */ jsxs44(Fragment10, { children: [
                 /* @__PURE__ */ jsx56(
                   "div",
                   {
@@ -34077,6 +34513,7 @@ function SwapWalletSelectorMobile({
                 ),
                 (() => {
                   const wcConnected = managerConnected && connectedVia === "walletconnect";
+                  const wcRowDisabled = managerConnected && !wcConnected;
                   return /* @__PURE__ */ jsxs44(
                     "div",
                     {
@@ -34095,9 +34532,10 @@ function SwapWalletSelectorMobile({
                         wcConnected && {
                           boxShadow: `0 0 0 2px ${colors.primary}`,
                           border: `1px solid ${colors.primary}`
-                        }
+                        },
+                        wcRowDisabled && { opacity: 0.4, cursor: "not-allowed" }
                       ),
-                      onClick: !wcConnected ? () => void handleWalletConnect() : void 0,
+                      onClick: !wcConnected && !wcRowDisabled ? () => void handleWalletConnect() : void 0,
                       children: [
                         /* @__PURE__ */ jsx56(
                           "div",
@@ -34193,18 +34631,24 @@ function SwapWalletSelectorMobile({
                               e2.stopPropagation();
                               void handleWalletConnect();
                             },
-                            disabled: wcConnecting,
-                            style: {
-                              padding: `${spacing[1.5]} ${spacing[3]}`,
-                              borderRadius: "9999px",
-                              backgroundColor: "rgba(59,130,246,0.1)",
-                              color: colors.primary,
-                              fontSize: fontSize.xs,
-                              fontWeight: fontWeight.medium,
-                              border: 0,
-                              cursor: "pointer",
-                              flexShrink: 0
-                            },
+                            disabled: wcConnecting || wcRowDisabled,
+                            style: mergeStyles(
+                              {
+                                padding: `${spacing[1.5]} ${spacing[3]}`,
+                                borderRadius: "9999px",
+                                backgroundColor: "rgba(59,130,246,0.1)",
+                                color: colors.primary,
+                                fontSize: fontSize.xs,
+                                fontWeight: fontWeight.medium,
+                                border: 0,
+                                cursor: "pointer",
+                                flexShrink: 0
+                              },
+                              (wcConnecting || wcRowDisabled) && {
+                                opacity: 0.5,
+                                cursor: "not-allowed"
+                              }
+                            ),
                             children: "Connect"
                           }
                         )
@@ -34235,8 +34679,8 @@ var init_SwapWalletSelectorMobile = __esm({
 });
 
 // src/modes/swap/components/SwapWalletSelector/SwapWalletSelectorDesktop.tsx
-import { useEffect as useEffect32, useMemo as useMemo28, useRef as useRef18, useState as useState32 } from "react";
-import { Fragment as Fragment10, jsx as jsx57, jsxs as jsxs45 } from "react/jsx-runtime";
+import { useEffect as useEffect33, useMemo as useMemo28, useRef as useRef19, useState as useState33 } from "react";
+import { Fragment as Fragment11, jsx as jsx57, jsxs as jsxs45 } from "react/jsx-runtime";
 function SwapWalletSelectorDesktop({
   walletStatus,
   walletAddress,
@@ -34252,16 +34696,16 @@ function SwapWalletSelectorDesktop({
   } = useWalletInfo();
   const walletConnectCfg = TrustwareConfigStore.peek()?.walletConnect;
   const connectWC = useWalletConnectConnect(walletConnectCfg);
-  const [wcConnecting, setWcConnecting] = useState32(false);
-  const [connectingId, setConnectingId] = useState32(null);
-  const [timerExpired, setTimerExpired] = useState32(false);
-  const [selectedNamespace, setSelectedNamespace] = useState32("evm");
-  const prevStatusRef = useRef18(walletStatus);
-  useEffect32(() => {
+  const [wcConnecting, setWcConnecting] = useState33(false);
+  const [connectingId, setConnectingId] = useState33(null);
+  const [timerExpired, setTimerExpired] = useState33(false);
+  const [selectedNamespace, setSelectedNamespace] = useState33("evm");
+  const prevStatusRef = useRef19(walletStatus);
+  useEffect33(() => {
     const t = setTimeout(() => setTimerExpired(true), 450);
     return () => clearTimeout(t);
   }, []);
-  useEffect32(() => {
+  useEffect33(() => {
     const prev = prevStatusRef.current;
     if (prev !== walletStatus) {
       if (prev === "connecting" && (walletStatus === "connected" || walletStatus === "error")) {
@@ -34694,7 +35138,7 @@ function SwapWalletSelectorDesktop({
           })
         }
       ),
-      selectedNamespace === "evm" && /* @__PURE__ */ jsxs45(Fragment10, { children: [
+      selectedNamespace === "evm" && /* @__PURE__ */ jsxs45(Fragment11, { children: [
         /* @__PURE__ */ jsx57(
           "div",
           {
@@ -34858,7 +35302,7 @@ var init_SwapWalletSelectorDesktop = __esm({
 });
 
 // src/modes/swap/components/SwapWalletSelector/index.tsx
-import { Fragment as Fragment11, jsx as jsx58, jsxs as jsxs46 } from "react/jsx-runtime";
+import { Fragment as Fragment12, jsx as jsx58, jsxs as jsxs46 } from "react/jsx-runtime";
 function SwapWalletSelector({
   walletStatus,
   walletAddress,
@@ -34866,7 +35310,7 @@ function SwapWalletSelector({
   onBack
 }) {
   const isMobile = useIsMobile();
-  return /* @__PURE__ */ jsxs46(Fragment11, { children: [
+  return /* @__PURE__ */ jsxs46(Fragment12, { children: [
     isMobile && /* @__PURE__ */ jsx58(
       SwapWalletSelectorMobile_default,
       {
@@ -34911,13 +35355,13 @@ import {
   lazy as lazy2,
   Suspense as Suspense2,
   useCallback as useCallback22,
-  useEffect as useEffect33,
+  useEffect as useEffect34,
   useMemo as useMemo29,
-  useRef as useRef19,
-  useState as useState33
+  useRef as useRef20,
+  useState as useState34
 } from "react";
 import ReactDOM from "react-dom";
-import { Fragment as Fragment12, jsx as jsx59, jsxs as jsxs47 } from "react/jsx-runtime";
+import { Fragment as Fragment13, jsx as jsx59, jsxs as jsxs47 } from "react/jsx-runtime";
 function fmtAmount(n, max = 6) {
   if (!isFinite(n) || n === 0) return "0";
   return n.toLocaleString(void 0, { maximumFractionDigits: max });
@@ -35009,36 +35453,36 @@ function SwapMode({
   theme: themeProp,
   style
 }) {
-  const [stage, setStage] = useState33("home");
-  const [fromToken, setFromToken] = useState33(
+  const [stage, setStage] = useState34("home");
+  const [fromToken, setFromToken] = useState34(
     null
   );
-  const [fromChain, setFromChain] = useState33(null);
-  const [toToken, setToToken] = useState33(null);
-  const [toChain, setToChain] = useState33(null);
-  const [amount, setAmount] = useState33("");
-  const [amountInputMode, setAmountInputMode] = useState33(
+  const [fromChain, setFromChain] = useState34(null);
+  const [toToken, setToToken] = useState34(null);
+  const [toChain, setToChain] = useState34(null);
+  const [amount, setAmount] = useState34("");
+  const [amountInputMode, setAmountInputMode] = useState34(
     "usd"
   );
-  const [hoverSell, setHoverSell] = useState33(false);
-  const [showRateDetails, setShowRateDetails] = useState33(false);
-  const [showReviewDetails, setShowReviewDetails] = useState33(false);
-  const [showSettings, setShowSettings] = useState33(false);
-  const [maxApproval, setMaxApproval] = useState33(false);
-  const [slippage, setSlippage] = useState33(0.5);
-  const [slippageInput, setSlippageInput] = useState33("");
-  const [selectedCurrency, setSelectedCurrency] = useState33("USD");
-  const [showCurrencyDropdown, setShowCurrencyDropdown] = useState33(false);
-  const [completedAt, setCompletedAt] = useState33(null);
-  const [copiedHash, setCopiedHash] = useState33(null);
-  const [rateUpdated, setRateUpdated] = useState33(false);
-  const prevToAmountRef = useRef19(null);
-  const [destAddress, setDestAddress] = useState33("");
-  const [quoteAge, setQuoteAge] = useState33(0);
-  const quoteTimestampRef = useRef19(null);
-  const [quoteLoadingMsgIdx, setQuoteLoadingMsgIdx] = useState33(0);
-  const [quoteLoadingMsgVisible, setQuoteLoadingMsgVisible] = useState33(true);
-  const latestFetchParamsRef = useRef19(null);
+  const [hoverSell, setHoverSell] = useState34(false);
+  const [showRateDetails, setShowRateDetails] = useState34(false);
+  const [showReviewDetails, setShowReviewDetails] = useState34(false);
+  const [showSettings, setShowSettings] = useState34(false);
+  const [maxApproval, setMaxApproval] = useState34(false);
+  const [slippage, setSlippage] = useState34(0.5);
+  const [slippageInput, setSlippageInput] = useState34("");
+  const [selectedCurrency, setSelectedCurrency] = useState34("USD");
+  const [showCurrencyDropdown, setShowCurrencyDropdown] = useState34(false);
+  const [completedAt, setCompletedAt] = useState34(null);
+  const [copiedHash, setCopiedHash] = useState34(null);
+  const [rateUpdated, setRateUpdated] = useState34(false);
+  const prevToAmountRef = useRef20(null);
+  const [destAddress, setDestAddress] = useState34("");
+  const [quoteAge, setQuoteAge] = useState34(0);
+  const quoteTimestampRef = useRef20(null);
+  const [quoteLoadingMsgIdx, setQuoteLoadingMsgIdx] = useState34(0);
+  const [quoteLoadingMsgVisible, setQuoteLoadingMsgVisible] = useState34(true);
+  const latestFetchParamsRef = useRef20(null);
   const { rates: forexRates } = useForex();
   const currencyMeta = getCurrencyMeta(selectedCurrency);
   const currencyRate = forexRates[selectedCurrency] ?? 1;
@@ -35054,8 +35498,8 @@ function SwapMode({
     },
     [currencyRate, selectedCurrency]
   );
-  const settingsRef = useRef19(null);
-  const currencyDropdownRef = useRef19(null);
+  const settingsRef = useRef20(null);
+  const currencyDropdownRef = useRef20(null);
   const { emitEvent } = useTrustware();
   const { features, theme: configTheme } = useTrustwareConfig();
   const effectiveThemeSetting = themeProp ?? configTheme ?? "system";
@@ -35089,8 +35533,8 @@ function SwapMode({
     () => [...popularChains, ...otherChains],
     [popularChains, otherChains]
   );
-  const destInitialized = useRef19(false);
-  useEffect33(() => {
+  const destInitialized = useRef20(false);
+  useEffect34(() => {
     if (!defaultDestRef || destInitialized.current || allChains.length === 0)
       return;
     const chain = allChains.find(
@@ -35120,7 +35564,7 @@ function SwapMode({
     }).catch(() => {
     });
   }, [defaultDestRef, allChains]);
-  const { walletAddress, walletStatus, connectWallet, disconnectWallet } = useWalletSessionState();
+  const { walletAddress, walletStatus, connectWallet } = useWalletSessionState();
   const setFromTokenStable = useCallback22(
     (t) => setFromToken(t),
     []
@@ -35495,13 +35939,13 @@ function SwapMode({
   const hasAmount = rawSellNum > 0 && (amountInputMode === "token" || hasFromUsdPrice);
   const isConnected = walletStatus === "connected" && !!walletAddress;
   const canGetQuote = hasTokens && hasAmount && !insufficient && isConnected && (!needsDestAddress || isValidDestAddress);
-  useEffect33(() => {
+  useEffect34(() => {
     if (!fromToken) return;
     if (!hasFromUsdPrice && amountInputMode === "usd") {
       setAmountInputMode("token");
     }
   }, [fromToken, hasFromUsdPrice, amountInputMode]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (displayToAmount === null) {
       prevToAmountRef.current = null;
       return;
@@ -35515,14 +35959,14 @@ function SwapMode({
     const t = setTimeout(() => setRateUpdated(false), 700);
     return () => clearTimeout(t);
   }, [displayToAmount]);
-  useEffect33(() => {
+  useEffect34(() => {
     setDestAddress("");
   }, [toChainType]);
-  const fetchRef = useRef19(route.fetch);
-  useEffect33(() => {
+  const fetchRef = useRef20(route.fetch);
+  useEffect34(() => {
     fetchRef.current = route.fetch;
   });
-  useEffect33(() => {
+  useEffect34(() => {
     if (!canGetQuote || stage !== "home") return;
     if (!fromToken || !fromChain || !toToken || !toChain || !walletAddress)
       return;
@@ -35551,7 +35995,7 @@ function SwapMode({
     destAddress,
     slippage
   ]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (!canGetQuote || !fromToken || !fromChain || !toToken || !toChain || !walletAddress) {
       latestFetchParamsRef.current = null;
       return;
@@ -35578,12 +36022,12 @@ function SwapMode({
     destAddress,
     slippage
   ]);
-  useEffect33(() => {
+  useEffect34(() => {
     quoteTimestampRef.current = route.data ? Date.now() : null;
     setQuoteAge(0);
   }, [route.data]);
-  const msgTimeoutRef = useRef19(null);
-  useEffect33(() => {
+  const msgTimeoutRef = useRef20(null);
+  useEffect34(() => {
     if (!route.loading) {
       setQuoteLoadingMsgIdx(0);
       setQuoteLoadingMsgVisible(true);
@@ -35601,7 +36045,7 @@ function SwapMode({
       if (msgTimeoutRef.current !== null) clearTimeout(msgTimeoutRef.current);
     };
   }, [route.loading]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (!route.data) return;
     const id = setInterval(() => {
       const ts = quoteTimestampRef.current;
@@ -35615,7 +36059,7 @@ function SwapMode({
     }, 1e3);
     return () => clearInterval(id);
   }, [route.data]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (stage !== "review") return;
     if (!route.data || !walletAddress) return;
     const fromTokenAddress = fromToken?.address;
@@ -35626,7 +36070,7 @@ function SwapMode({
       routeResult: route.data
     });
   }, [stage, route.data, walletAddress, fromToken]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (!showSettings) {
       setShowCurrencyDropdown(false);
       return;
@@ -35639,7 +36083,7 @@ function SwapMode({
     document.addEventListener("mousedown", handler);
     return () => document.removeEventListener("mousedown", handler);
   }, [showSettings]);
-  useEffect33(() => {
+  useEffect34(() => {
     if (!showCurrencyDropdown) return;
     const handler = (e2) => {
       if (currencyDropdownRef.current && !currencyDropdownRef.current.contains(e2.target)) {
@@ -36126,7 +36570,7 @@ function SwapMode({
                           padding: 0,
                           transition: "color 0.15s"
                         },
-                        children: isCopied ? "Copied!" : /* @__PURE__ */ jsxs47(Fragment12, { children: [
+                        children: isCopied ? "Copied!" : /* @__PURE__ */ jsxs47(Fragment13, { children: [
                           txHash.slice(0, 6),
                           "\u2026",
                           txHash.slice(-4),
@@ -37198,7 +37642,7 @@ function SwapMode({
                     walletAddress ? /* @__PURE__ */ jsxs47(
                       "button",
                       {
-                        onClick: () => void disconnectWallet(),
+                        onClick: handleConnectAndReview,
                         style: {
                           fontSize: fontSize.xs,
                           color: colors.mutedForeground,
@@ -37209,8 +37653,7 @@ function SwapMode({
                         children: [
                           walletAddress.slice(0, 6),
                           "...",
-                          walletAddress.slice(-4),
-                          " \xD7"
+                          walletAddress.slice(-4)
                         ]
                       }
                     ) : /* @__PURE__ */ jsx59(
@@ -38789,8 +39232,8 @@ function ReviewDetailRow({
   value,
   tooltip
 }) {
-  const iconRef = useRef19(null);
-  const [tipPos, setTipPos] = useState33(null);
+  const iconRef = useRef20(null);
+  const [tipPos, setTipPos] = useState34(null);
   const handleMouseEnter = () => {
     if (!tooltip || !iconRef.current) return;
     const r = iconRef.current.getBoundingClientRect();
@@ -39125,14 +39568,14 @@ var init_swap = __esm({
 
 // src/widget/TrustwareWidgetV2.tsx
 import {
-  useState as useState34,
-  useEffect as useEffect34,
-  useRef as useRef20,
+  useState as useState35,
+  useEffect as useEffect35,
+  useRef as useRef21,
   useCallback as useCallback23,
   useImperativeHandle,
   forwardRef
 } from "react";
-import { Fragment as Fragment13, jsx as jsx60, jsxs as jsxs48 } from "react/jsx-runtime";
+import { Fragment as Fragment14, jsx as jsx60, jsxs as jsxs48 } from "react/jsx-runtime";
 function WidgetContent({
   style,
   onStateChange,
@@ -39143,7 +39586,7 @@ function WidgetContent({
   const { transactionHash, transactionStatus } = useDepositTransaction();
   const { resolvedTheme, toggleTheme } = useDepositUi();
   useWalletExternalDisconnect(() => setCurrentStep("home"));
-  useEffect34(() => {
+  useEffect35(() => {
     const state = {
       currentStep,
       amount,
@@ -39186,7 +39629,7 @@ function WidgetInner({
   const { transactionStatus } = useDepositTransaction();
   const { resolvedTheme } = useDepositUi();
   const { status, revalidate, errors } = useTrustware();
-  const [showConfirmDialog, setShowConfirmDialog] = useState34(false);
+  const [showConfirmDialog, setShowConfirmDialog] = useState35(false);
   const handleCloseRequest = useCallback23(() => {
     if (ACTIVE_TRANSACTION_STATUSES.includes(transactionStatus)) {
       setShowConfirmDialog(true);
@@ -39198,7 +39641,7 @@ function WidgetInner({
       onClose?.();
     }
   }, [transactionStatus, onClose, resetState]);
-  useEffect34(() => {
+  useEffect35(() => {
     closeRequestRef.current = handleCloseRequest;
   }, [handleCloseRequest, closeRequestRef]);
   const handleConfirmClose = useCallback23(() => {
@@ -39214,7 +39657,7 @@ function WidgetInner({
   const handleRefresh = useCallback23(() => {
     revalidate?.();
   }, [revalidate]);
-  return /* @__PURE__ */ jsxs48(Fragment13, { children: [
+  return /* @__PURE__ */ jsxs48(Fragment14, { children: [
     /* @__PURE__ */ jsxs48(WidgetContainer, { theme: effectiveTheme, style, children: [
       /* @__PURE__ */ jsx60(
         WidgetContent,
@@ -39282,8 +39725,8 @@ var init_TrustwareWidgetV2 = __esm({
       onOpen,
       showThemeToggle = true
     }, ref) {
-      const [isOpen, setIsOpen] = useState34(defaultOpen);
-      const closeRequestRef = useRef20(null);
+      const [isOpen, setIsOpen] = useState35(defaultOpen);
+      const closeRequestRef = useRef21(null);
       const config = useTrustwareConfig();
       const effectiveInitialStep = initialStep;
       const open = useCallback23(() => {