@unifold/ui-react 0.1.61 → 0.1.62

package/dist/index.js

@@ -5323,7 +5323,7 @@ function CashAppButton({
 }
 
 // src/components/deposits/buttons/BrowserWalletButton.tsx
-var React24 = __toESM(require("react"));
+var React25 = __toESM(require("react"));
 var import_lucide_react17 = require("lucide-react");
 var import_core14 = require("@unifold/core");
 
@@ -5377,6 +5377,197 @@ function collectAllEip6963EthProviders() {
   return store.getProviders().map((d) => d.provider);
 }
 
+// src/components/deposits/browser-wallets/useDetectedBrowserWallet.ts
+var React12 = __toESM(require("react"));
+
+// src/components/deposits/browser-wallets/detectConnectedWallet.ts
+function identifyEthWallet(provider, hint) {
+  switch (hint) {
+    case "metamask":
+      return { type: "metamask", name: "MetaMask", icon: "metamask" };
+    case "phantom":
+      return { type: "phantom-ethereum", name: "Phantom", icon: "phantom" };
+    case "coinbase":
+      return { type: "coinbase", name: "Coinbase Wallet", icon: "coinbase" };
+    case "okx":
+      return { type: "okx", name: "OKX Wallet", icon: "okx" };
+    case "rabby":
+      return { type: "rabby", name: "Rabby", icon: "rabby" };
+    case "trust":
+      return { type: "trust", name: "Trust Wallet", icon: "trust" };
+    case "rainbow":
+      return { type: "rainbow", name: "Rainbow", icon: "rainbow" };
+  }
+  const anyProvider = provider;
+  if (provider.isPhantom) {
+    return { type: "phantom-ethereum", name: "Phantom", icon: "phantom" };
+  }
+  if (anyProvider.isCoinbaseWallet) {
+    return { type: "coinbase", name: "Coinbase Wallet", icon: "coinbase" };
+  }
+  if (anyProvider.isRabby) {
+    return { type: "rabby", name: "Rabby", icon: "rabby" };
+  }
+  if (anyProvider.isTrust) {
+    return { type: "trust", name: "Trust Wallet", icon: "trust" };
+  }
+  if (anyProvider.isRainbow) {
+    return { type: "rainbow", name: "Rainbow", icon: "rainbow" };
+  }
+  if (provider.isMetaMask && !provider.isPhantom) {
+    return { type: "metamask", name: "MetaMask", icon: "metamask" };
+  }
+  return { type: "metamask", name: "Wallet", icon: "metamask" };
+}
+async function detectConnectedBrowserWallet(chainType) {
+  if (typeof window === "undefined") return null;
+  if (getUserDisconnectedWallet()) return null;
+  try {
+    const win = window;
+    if (!chainType || chainType === "solana") {
+      const trySilentSolana = async (provider, type, name, icon) => {
+        if (!provider) return null;
+        if (provider.isConnected && provider.publicKey) {
+          return { type, name, address: provider.publicKey.toString(), icon };
+        }
+        try {
+          const resp = await provider.connect({ onlyIfTrusted: true });
+          if (resp.publicKey) {
+            return { type, name, address: resp.publicKey.toString(), icon };
+          }
+        } catch {
+        }
+        return null;
+      };
+      const solanaCandidates = [
+        [win.phantom?.solana, "phantom-solana", "Phantom", "phantom"],
+        [win.solflare, "solflare", "Solflare", "solflare"],
+        [win.backpack, "backpack", "Backpack", "backpack"],
+        [win.glow, "glow", "Glow", "glow"]
+      ];
+      for (const [provider, type, name, icon] of solanaCandidates) {
+        const found = await trySilentSolana(provider, type, name, icon);
+        if (found) return found;
+      }
+    }
+    if (!chainType || chainType === "ethereum") {
+      const allProviders = [];
+      const eip6963 = getEip6963Providers();
+      for (const { provider, walletId } of eip6963) {
+        allProviders.push({
+          provider,
+          walletId: walletId === "unknown" ? "default" : walletId
+        });
+      }
+      if (allProviders.length === 0) {
+        if (win.phantom?.ethereum) {
+          allProviders.push({ provider: win.phantom.ethereum, walletId: "phantom" });
+        }
+        if (win.okxwallet) {
+          allProviders.push({ provider: win.okxwallet, walletId: "okx" });
+        }
+        if (win.coinbaseWalletExtension) {
+          allProviders.push({ provider: win.coinbaseWalletExtension, walletId: "coinbase" });
+        }
+        if (win.ethereum && !allProviders.some((p) => p.provider === win.ethereum)) {
+          allProviders.push({ provider: win.ethereum, walletId: "default" });
+        }
+      }
+      for (const { provider, walletId } of allProviders) {
+        if (!provider) continue;
+        try {
+          const accounts = await provider.request({ method: "eth_accounts" });
+          if (!accounts || accounts.length === 0) continue;
+          const resolved = identifyEthWallet(provider, walletId);
+          return { ...resolved, address: accounts[0] };
+        } catch {
+        }
+      }
+    }
+  } catch (error) {
+    console.error("[detectConnectedBrowserWallet] detection error:", error);
+  }
+  return null;
+}
+
+// src/components/deposits/browser-wallets/useDetectedBrowserWallet.ts
+function useDetectedBrowserWallet(opts = {}) {
+  const { chainType, enabled = true, onDisconnect } = opts;
+  const [wallet, setWallet] = React12.useState(null);
+  const [isLoading, setIsLoading] = React12.useState(enabled);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React12.useState(0);
+  const onDisconnectRef = React12.useRef(onDisconnect);
+  onDisconnectRef.current = onDisconnect;
+  React12.useEffect(() => {
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    return store.subscribe((providers) => setEip6963ProviderCount(providers.length));
+  }, []);
+  React12.useEffect(() => {
+    if (!enabled) {
+      setWallet(null);
+      setIsLoading(false);
+      return;
+    }
+    let mounted = true;
+    const detect = async () => {
+      if (!mounted) return;
+      setIsLoading(true);
+      const detected = await detectConnectedBrowserWallet(chainType);
+      if (!mounted) return;
+      setWallet(detected);
+      setIsLoading(false);
+    };
+    detect();
+    const onChange = () => detect();
+    const onDisc = () => {
+      onDisconnectRef.current?.();
+      detect();
+    };
+    const onEthAccounts = (accounts) => {
+      if (Array.isArray(accounts) && accounts.length === 0) onDisconnectRef.current?.();
+      detect();
+    };
+    const win = typeof window !== "undefined" ? window : void 0;
+    const solanaProvider = win?.phantom?.solana || win?.solana;
+    if (solanaProvider) {
+      solanaProvider.on("connect", onChange);
+      solanaProvider.on("disconnect", onDisc);
+      solanaProvider.on("accountChanged", onChange);
+    }
+    const ethProviders = [];
+    for (const { provider } of getEip6963Providers()) {
+      const p = provider;
+      if (p && !ethProviders.includes(p)) ethProviders.push(p);
+    }
+    if (win?.ethereum && !ethProviders.includes(win.ethereum)) ethProviders.push(win.ethereum);
+    if (win?.phantom?.ethereum && !ethProviders.includes(win.phantom.ethereum)) {
+      ethProviders.push(win.phantom.ethereum);
+    }
+    for (const p of ethProviders) {
+      p.on("accountsChanged", onEthAccounts);
+      p.on("chainChanged", onChange);
+    }
+    return () => {
+      mounted = false;
+      if (solanaProvider) {
+        solanaProvider.off?.("connect", onChange);
+        solanaProvider.off?.("disconnect", onDisc);
+        solanaProvider.off?.("accountChanged", onChange);
+      }
+      for (const p of ethProviders) {
+        const off = p.off?.bind(p) ?? p.removeListener?.bind(p);
+        if (off) {
+          off("accountsChanged", onEthAccounts);
+          off("chainChanged", onChange);
+        }
+      }
+    };
+  }, [chainType, eip6963ProviderCount, enabled]);
+  return { wallet, isLoading, setWallet };
+}
+
 // src/components/deposits/browser-wallets/disconnectInjectedBrowserWallet.ts
 var SOLANA_DISCONNECT_TYPES = [
   "phantom-solana",
@@ -5462,14 +5653,14 @@ async function disconnectInjectedBrowserWallet(wallet) {
 }
 
 // src/resources/icons/MetamaskIcon.tsx
-var React12 = __toESM(require("react"));
+var React13 = __toESM(require("react"));
 var import_jsx_runtime23 = require("react/jsx-runtime");
 function MetamaskIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React12.useId();
+  const id = React13.useId();
   if (variant === "light" || variant === "dark") {
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(
       "svg",
@@ -5591,14 +5782,14 @@ function MetamaskIcon({
 }
 
 // src/resources/icons/PhantomIcon.tsx
-var React13 = __toESM(require("react"));
+var React14 = __toESM(require("react"));
 var import_jsx_runtime24 = require("react/jsx-runtime");
 function PhantomIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React13.useId();
+  const id = React14.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       "svg",
@@ -5666,14 +5857,14 @@ function PhantomIcon({
 }
 
 // src/resources/icons/CoinbaseIcon.tsx
-var React14 = __toESM(require("react"));
+var React15 = __toESM(require("react"));
 var import_jsx_runtime25 = require("react/jsx-runtime");
 function CoinbaseIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React14.useId();
+  const id = React15.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(
       "svg",
@@ -5754,14 +5945,14 @@ function CoinbaseIcon({
 }
 
 // src/resources/icons/RabbyIcon.tsx
-var React15 = __toESM(require("react"));
+var React16 = __toESM(require("react"));
 var import_jsx_runtime26 = require("react/jsx-runtime");
 function RabbyIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React15.useId();
+  const id = React16.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(
       "svg",
@@ -6109,14 +6300,14 @@ function RabbyIcon({
 }
 
 // src/resources/icons/RainbowIcon.tsx
-var React16 = __toESM(require("react"));
+var React17 = __toESM(require("react"));
 var import_jsx_runtime27 = require("react/jsx-runtime");
 function RainbowIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React16.useId();
+  const id = React17.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime27.jsxs)(
       "svg",
@@ -6579,14 +6770,14 @@ function RainbowIcon({
 }
 
 // src/resources/icons/TrustIcon.tsx
-var React17 = __toESM(require("react"));
+var React18 = __toESM(require("react"));
 var import_jsx_runtime28 = require("react/jsx-runtime");
 function TrustIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React17.useId();
+  const id = React18.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime28.jsx)(
       "svg",
@@ -6676,14 +6867,14 @@ function TrustIcon({
 }
 
 // src/resources/icons/OkxIcon.tsx
-var React18 = __toESM(require("react"));
+var React19 = __toESM(require("react"));
 var import_jsx_runtime29 = require("react/jsx-runtime");
 function OkxIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React18.useId();
+  const id = React19.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(
       "svg",
@@ -6751,14 +6942,14 @@ function OkxIcon({
 }
 
 // src/resources/icons/GlowIcon.tsx
-var React19 = __toESM(require("react"));
+var React20 = __toESM(require("react"));
 var import_jsx_runtime30 = require("react/jsx-runtime");
 function GlowIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React19.useId();
+  const id = React20.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime30.jsx)(
       "svg",
@@ -6860,14 +7051,14 @@ function GlowIcon({
 }
 
 // src/resources/icons/BackpackIcon.tsx
-var React20 = __toESM(require("react"));
+var React21 = __toESM(require("react"));
 var import_jsx_runtime31 = require("react/jsx-runtime");
 function BackpackIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React20.useId();
+  const id = React21.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
       "svg",
@@ -6941,14 +7132,14 @@ function BackpackIcon({
 }
 
 // src/resources/icons/SolflareIcon.tsx
-var React21 = __toESM(require("react"));
+var React22 = __toESM(require("react"));
 var import_jsx_runtime32 = require("react/jsx-runtime");
 function SolflareIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React21.useId();
+  const id = React22.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       "svg",
@@ -7016,14 +7207,14 @@ function SolflareIcon({
 }
 
 // src/resources/icons/EthereumIcon.tsx
-var React22 = __toESM(require("react"));
+var React23 = __toESM(require("react"));
 var import_jsx_runtime33 = require("react/jsx-runtime");
 function EthereumIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React22.useId();
+  const id = React23.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(
       "svg",
@@ -7154,14 +7345,14 @@ function EthereumIcon({
 }
 
 // src/resources/icons/SolanaIcon.tsx
-var React23 = __toESM(require("react"));
+var React24 = __toESM(require("react"));
 var import_jsx_runtime34 = require("react/jsx-runtime");
 function SolanaIcon({
   size = 24,
   className,
   variant = "color"
 }) {
-  const id = React23.useId();
+  const id = React24.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(
       "svg",
@@ -7416,44 +7607,6 @@ function truncateAddress3(address) {
   if (address.length <= 10) return address;
   return `${address.slice(0, 4)}...${address.slice(-4)}`;
 }
-function identifyEthWallet(provider, _win, hint) {
-  switch (hint) {
-    case "metamask":
-      return { type: "metamask", name: "MetaMask", icon: "metamask" };
-    case "phantom":
-      return { type: "phantom-ethereum", name: "Phantom", icon: "phantom" };
-    case "coinbase":
-      return { type: "coinbase", name: "Coinbase Wallet", icon: "coinbase" };
-    case "okx":
-      return { type: "okx", name: "OKX Wallet", icon: "okx" };
-    case "rabby":
-      return { type: "rabby", name: "Rabby", icon: "rabby" };
-    case "trust":
-      return { type: "trust", name: "Trust Wallet", icon: "trust" };
-    case "rainbow":
-      return { type: "rainbow", name: "Rainbow", icon: "rainbow" };
-  }
-  const anyProvider = provider;
-  if (provider.isPhantom) {
-    return { type: "phantom-ethereum", name: "Phantom", icon: "phantom" };
-  }
-  if (anyProvider.isCoinbaseWallet) {
-    return { type: "coinbase", name: "Coinbase Wallet", icon: "coinbase" };
-  }
-  if (anyProvider.isRabby) {
-    return { type: "rabby", name: "Rabby", icon: "rabby" };
-  }
-  if (anyProvider.isTrust) {
-    return { type: "trust", name: "Trust Wallet", icon: "trust" };
-  }
-  if (anyProvider.isRainbow) {
-    return { type: "rainbow", name: "Rainbow", icon: "rainbow" };
-  }
-  if (provider.isMetaMask && !provider.isPhantom) {
-    return { type: "metamask", name: "MetaMask", icon: "metamask" };
-  }
-  return { type: "metamask", name: "Wallet", icon: "metamask" };
-}
 function BrowserWalletButton({
   onClick,
   onConnectClick,
@@ -7464,30 +7617,19 @@ function BrowserWalletButton({
   subtitle = i18n.depositModal.browserWallet.subtitle
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [isHovered, setIsHovered] = React24.useState(false);
-  const [isTouchDevice, setIsTouchDevice] = React24.useState(false);
-  const [wallet, setWallet] = React24.useState(null);
-  const [isLoading, setIsLoading] = React24.useState(true);
-  const [isConnecting, setIsConnecting] = React24.useState(false);
-  const [balanceText, setBalanceText] = React24.useState(null);
-  const [isLoadingBalance, setIsLoadingBalance] = React24.useState(false);
-  const [isDisconnecting, setIsDisconnecting] = React24.useState(false);
-  const onDisconnectRef = React24.useRef(onDisconnect);
+  const [isHovered, setIsHovered] = React25.useState(false);
+  const [isTouchDevice, setIsTouchDevice] = React25.useState(false);
+  const { wallet, isLoading, setWallet } = useDetectedBrowserWallet({ chainType, onDisconnect });
+  const [isConnecting, setIsConnecting] = React25.useState(false);
+  const [balanceText, setBalanceText] = React25.useState(null);
+  const [isLoadingBalance, setIsLoadingBalance] = React25.useState(false);
+  const [isDisconnecting, setIsDisconnecting] = React25.useState(false);
+  const onDisconnectRef = React25.useRef(onDisconnect);
   onDisconnectRef.current = onDisconnect;
-  React24.useEffect(() => {
+  React25.useEffect(() => {
     setIsTouchDevice("ontouchstart" in window || navigator.maxTouchPoints > 0);
   }, []);
-  const [eip6963ProviderCount, setEip6963ProviderCount] = React24.useState(0);
-  React24.useEffect(() => {
-    const store = getEip6963Store();
-    if (!store) return;
-    setEip6963ProviderCount(store.getProviders().length);
-    const unsubscribe = store.subscribe((providers) => {
-      setEip6963ProviderCount(providers.length);
-    });
-    return unsubscribe;
-  }, []);
-  React24.useEffect(() => {
+  React25.useEffect(() => {
     if (!wallet || !publishableKey) {
       setBalanceText(null);
       return;
@@ -7528,206 +7670,6 @@ function BrowserWalletButton({
       cancelled = true;
     };
   }, [wallet, publishableKey]);
-  React24.useEffect(() => {
-    let mounted = true;
-    const detectWallet = async () => {
-      if (!mounted) return;
-      setIsLoading(true);
-      try {
-        const win = typeof window !== "undefined" ? window : null;
-        if (!win) return;
-        if (getUserDisconnectedWallet()) {
-          if (mounted) {
-            setWallet(null);
-            setIsLoading(false);
-          }
-          return;
-        }
-        if (!chainType || chainType === "solana") {
-          const anyWin = win;
-          const trySilentSolana = async (provider, type, name, icon) => {
-            if (!provider) return false;
-            if (provider.isConnected && provider.publicKey) {
-              if (mounted) {
-                setWallet({
-                  type,
-                  name,
-                  address: provider.publicKey.toString(),
-                  icon
-                });
-                setIsLoading(false);
-              }
-              return true;
-            }
-            try {
-              const resp = await provider.connect({ onlyIfTrusted: true });
-              if (mounted && resp.publicKey) {
-                setWallet({
-                  type,
-                  name,
-                  address: resp.publicKey.toString(),
-                  icon
-                });
-                setIsLoading(false);
-                return true;
-              }
-            } catch {
-            }
-            return false;
-          };
-          if (await trySilentSolana(
-            win.phantom?.solana,
-            "phantom-solana",
-            "Phantom",
-            "phantom"
-          ))
-            return;
-          if (await trySilentSolana(
-            anyWin.solflare,
-            "solflare",
-            "Solflare",
-            "solflare"
-          ))
-            return;
-          if (await trySilentSolana(
-            anyWin.backpack,
-            "backpack",
-            "Backpack",
-            "backpack"
-          ))
-            return;
-          if (await trySilentSolana(
-            anyWin.glow,
-            "glow",
-            "Glow",
-            "glow"
-          ))
-            return;
-        }
-        if (!chainType || chainType === "ethereum") {
-          const anyWin = win;
-          const allProviders = [];
-          const eip6963 = getEip6963Providers();
-          for (const { provider, walletId } of eip6963) {
-            allProviders.push({
-              provider,
-              walletId: walletId === "unknown" ? "default" : walletId
-            });
-          }
-          if (allProviders.length === 0) {
-            if (win.phantom?.ethereum) {
-              allProviders.push({
-                provider: win.phantom.ethereum,
-                walletId: "phantom"
-              });
-            }
-            if (anyWin.okxwallet) {
-              allProviders.push({
-                provider: anyWin.okxwallet,
-                walletId: "okx"
-              });
-            }
-            if (anyWin.coinbaseWalletExtension) {
-              allProviders.push({
-                provider: anyWin.coinbaseWalletExtension,
-                walletId: "coinbase"
-              });
-            }
-            if (win.ethereum) {
-              const isDuplicate = allProviders.some(
-                (p) => p.provider === win.ethereum
-              );
-              if (!isDuplicate) {
-                allProviders.push({
-                  provider: win.ethereum,
-                  walletId: "default"
-                });
-              }
-            }
-          }
-          for (const { provider, walletId } of allProviders) {
-            if (!provider) continue;
-            try {
-              const accounts = await provider.request({
-                method: "eth_accounts"
-              });
-              if (!accounts || accounts.length === 0) continue;
-              const address = accounts[0];
-              const resolved = identifyEthWallet(provider, anyWin, walletId);
-              if (mounted) {
-                setWallet({ ...resolved, address });
-                setIsLoading(false);
-              }
-              return;
-            } catch {
-            }
-          }
-        }
-        if (mounted) {
-          setWallet(null);
-          setIsLoading(false);
-        }
-      } catch (error) {
-        console.error("[BrowserWalletButton] Error detecting wallet:", error);
-        if (mounted) {
-          setWallet(null);
-          setIsLoading(false);
-        }
-      }
-    };
-    detectWallet();
-    const handleAccountsChanged = () => {
-      detectWallet();
-    };
-    const handleDisconnect = () => {
-      onDisconnectRef.current?.();
-      detectWallet();
-    };
-    const handleEthAccountsChanged = (accounts) => {
-      if (Array.isArray(accounts) && accounts.length === 0) {
-        onDisconnectRef.current?.();
-      }
-      detectWallet();
-    };
-    const solanaProvider = window.phantom?.solana || window.solana;
-    if (solanaProvider) {
-      solanaProvider.on("connect", handleAccountsChanged);
-      solanaProvider.on("disconnect", handleDisconnect);
-      solanaProvider.on("accountChanged", handleAccountsChanged);
-    }
-    const ethProviders = [];
-    for (const { provider } of getEip6963Providers()) {
-      const p = provider;
-      if (p && !ethProviders.includes(p)) {
-        ethProviders.push(p);
-      }
-    }
-    if (window.ethereum && !ethProviders.includes(window.ethereum)) {
-      ethProviders.push(window.ethereum);
-    }
-    if (window.phantom?.ethereum && !ethProviders.includes(window.phantom.ethereum)) {
-      ethProviders.push(window.phantom.ethereum);
-    }
-    for (const provider of ethProviders) {
-      provider.on("accountsChanged", handleEthAccountsChanged);
-      provider.on("chainChanged", handleAccountsChanged);
-    }
-    return () => {
-      mounted = false;
-      if (solanaProvider) {
-        solanaProvider.off("connect", handleAccountsChanged);
-        solanaProvider.off("disconnect", handleDisconnect);
-        solanaProvider.off("accountChanged", handleAccountsChanged);
-      }
-      for (const provider of ethProviders) {
-        const off = provider.off?.bind(provider) ?? provider.removeListener?.bind(provider);
-        if (off) {
-          off("accountsChanged", handleEthAccountsChanged);
-          off("chainChanged", handleAccountsChanged);
-        }
-      }
-    };
-  }, [chainType, eip6963ProviderCount]);
   const handleConnect = async () => {
     if (wallet) {
       onClick(wallet);
@@ -7811,7 +7753,7 @@ function BrowserWalletButton({
     border: `${components.card.borderWidth}px solid ${components.card.borderColor}`
   };
   const sortedWallets = featuredWallets ? [...featuredWallets].sort((a, b) => a.position - b.position) : [];
-  const walletIconBlock = wallet ? WALLET_ICON_COMPONENTS[wallet.icon] ? React24.createElement(WALLET_ICON_COMPONENTS[wallet.icon], {
+  const walletIconBlock = wallet ? WALLET_ICON_COMPONENTS[wallet.icon] ? React25.createElement(WALLET_ICON_COMPONENTS[wallet.icon], {
     size: 36,
     className: "uf-rounded-lg",
     variant: "color"
@@ -8095,6 +8037,7 @@ function CoinbaseConnect({
   onBack: parentOnBack,
   onDisconnect,
   skipToHoldings,
+  canGoBack = true,
   onExecutionsChange
 }) {
   const { colors: colors2, fonts, components } = useTheme();
@@ -8482,6 +8425,16 @@ function CoinbaseConnect({
       setIsLoading(false);
     }
   };
+  const handleDisconnect = () => {
+    onDisconnect?.();
+    if (!canGoBack) {
+      setAccessToken(null);
+      setHoldings([]);
+      setSelectedHolding(null);
+      setSelectedAsset(null);
+      transitionTo("select_exchange");
+    }
+  };
   const handleBack = () => {
     switch (view) {
       case "select_exchange":
@@ -8542,7 +8495,7 @@ function CoinbaseConnect({
           DepositHeader,
           {
             title: t12.title,
-            showBack: true,
+            showBack: canGoBack,
             onBack: handleBack,
             onClose
           }
@@ -8555,7 +8508,7 @@ function CoinbaseConnect({
         DepositHeader,
         {
           title: t12.title,
-          showBack: true,
+          showBack: canGoBack,
           onBack: handleBack,
           onClose
         }
@@ -9267,7 +9220,7 @@ function CoinbaseConnect({
                 borderRadius: components.button.borderRadius,
                 fontFamily: fonts.medium
               },
-              onClick: onDisconnect,
+              onClick: handleDisconnect,
               children: t12.disconnect
             }
           )
@@ -10077,14 +10030,14 @@ var import_lucide_react22 = require("lucide-react");
 var import_react13 = require("react");
 
 // src/components/shared/ThemeStyleInjector.tsx
-var React26 = __toESM(require("react"));
+var React27 = __toESM(require("react"));
 var import_jsx_runtime38 = require("react/jsx-runtime");
 function ThemeStyleInjector({
   children,
   className
 }) {
   const { colors: colors2, fonts, mode } = useTheme();
-  const cssVars = React26.useMemo(() => {
+  const cssVars = React27.useMemo(() => {
     const hexToHSL = (hex) => {
       hex = hex.replace("#", "");
       const r = parseInt(hex.slice(0, 2), 16) / 255;
@@ -10144,7 +10097,7 @@ function ThemeStyleInjector({
       ...fonts.regular ? { "--uf-font-family": fonts.regular } : {}
     };
   }, [colors2, fonts.regular]);
-  React26.useEffect(() => {
+  React27.useEffect(() => {
     if (typeof document === "undefined") return;
     if (fonts.regular) {
       document.documentElement.style.setProperty(
@@ -11132,7 +11085,7 @@ function useCopyAddress() {
 }
 
 // src/components/shared/tooltip.tsx
-var React27 = __toESM(require("react"));
+var React28 = __toESM(require("react"));
 var TooltipPrimitive = __toESM(require("@radix-ui/react-tooltip"));
 var import_jsx_runtime44 = require("react/jsx-runtime");
 var TooltipProvider = TooltipPrimitive.Provider;
@@ -11140,7 +11093,7 @@ function Tooltip({
   children,
   ...props
 }) {
-  const [open, setOpen] = React27.useState(props.defaultOpen ?? false);
+  const [open, setOpen] = React28.useState(props.defaultOpen ?? false);
   const isControlled = props.open !== void 0;
   const isOpen = isControlled ? props.open : open;
   const onOpenChange = isControlled ? props.onOpenChange : (nextOpen) => setOpen(nextOpen);
@@ -11160,14 +11113,14 @@ function Tooltip({
     }
   );
 }
-var TooltipContext = React27.createContext({
+var TooltipContext = React28.createContext({
   open: false,
   onOpenChange: () => {
   }
 });
-var TooltipTrigger = React27.forwardRef(({ onClick, ...props }, ref) => {
-  const { open, onOpenChange } = React27.useContext(TooltipContext);
-  const handleClick = React27.useCallback(
+var TooltipTrigger = React28.forwardRef(({ onClick, ...props }, ref) => {
+  const { open, onOpenChange } = React28.useContext(TooltipContext);
+  const handleClick = React28.useCallback(
     (e) => {
       onOpenChange(!open);
       onClick?.(e);
@@ -11177,7 +11130,7 @@ var TooltipTrigger = React27.forwardRef(({ onClick, ...props }, ref) => {
   return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(TooltipPrimitive.Trigger, { ref, onClick: handleClick, ...props });
 });
 TooltipTrigger.displayName = TooltipPrimitive.Trigger.displayName;
-var TooltipContent = React27.forwardRef(({ className, sideOffset = 4, ...props }, ref) => {
+var TooltipContent = React28.forwardRef(({ className, sideOffset = 4, ...props }, ref) => {
   const { themeClass, colors: colors2 } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(TooltipPrimitive.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
     TooltipPrimitive.Content,
@@ -11804,14 +11757,14 @@ var import_react18 = require("react");
 var import_lucide_react24 = require("lucide-react");
 
 // src/components/shared/select.tsx
-var React28 = __toESM(require("react"));
+var React29 = __toESM(require("react"));
 var SelectPrimitive = __toESM(require("@radix-ui/react-select"));
 var import_lucide_react23 = require("lucide-react");
 var import_jsx_runtime47 = require("react/jsx-runtime");
 var Select = SelectPrimitive.Root;
 var SelectGroup = SelectPrimitive.Group;
 var SelectValue = SelectPrimitive.Value;
-var SelectTrigger = React28.forwardRef(({ className, style, children, ...props }, ref) => {
+var SelectTrigger = React29.forwardRef(({ className, style, children, ...props }, ref) => {
   const { components } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
     SelectPrimitive.Trigger,
@@ -11835,7 +11788,7 @@ var SelectTrigger = React28.forwardRef(({ className, style, children, ...props }
   );
 });
 SelectTrigger.displayName = SelectPrimitive.Trigger.displayName;
-var SelectScrollUpButton = React28.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+var SelectScrollUpButton = React29.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
   SelectPrimitive.ScrollUpButton,
   {
     ref,
@@ -11848,7 +11801,7 @@ var SelectScrollUpButton = React28.forwardRef(({ className, ...props }, ref) =>
   }
 ));
 SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName;
-var SelectScrollDownButton = React28.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+var SelectScrollDownButton = React29.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
   SelectPrimitive.ScrollDownButton,
   {
     ref,
@@ -11861,7 +11814,7 @@ var SelectScrollDownButton = React28.forwardRef(({ className, ...props }, ref) =
   }
 ));
 SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
-var SelectContent = React28.forwardRef(({ className, style, children, position = "popper", ...props }, ref) => {
+var SelectContent = React29.forwardRef(({ className, style, children, position = "popper", ...props }, ref) => {
   const { themeClass, colors: colors2, components } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(SelectPrimitive.Portal, { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
     SelectPrimitive.Content,
@@ -11899,7 +11852,7 @@ var SelectContent = React28.forwardRef(({ className, style, children, position =
   ) });
 });
 SelectContent.displayName = SelectPrimitive.Content.displayName;
-var SelectLabel = React28.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+var SelectLabel = React29.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
   SelectPrimitive.Label,
   {
     ref,
@@ -11911,7 +11864,7 @@ var SelectLabel = React28.forwardRef(({ className, ...props }, ref) => /* @__PUR
   }
 ));
 SelectLabel.displayName = SelectPrimitive.Label.displayName;
-var SelectItem = React28.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
+var SelectItem = React29.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(
   SelectPrimitive.Item,
   {
     ref,
@@ -11927,7 +11880,7 @@ var SelectItem = React28.forwardRef(({ className, children, ...props }, ref) =>
   }
 ));
 SelectItem.displayName = SelectPrimitive.Item.displayName;
-var SelectSeparator = React28.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+var SelectSeparator = React29.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
   SelectPrimitive.Separator,
   {
     ref,
@@ -12385,7 +12338,7 @@ function TransferCryptoDoubleInput({
 }
 
 // src/components/deposits/WalletConnect.tsx
-var React29 = __toESM(require("react"));
+var React30 = __toESM(require("react"));
 var import_lucide_react28 = require("lucide-react");
 var import_core28 = require("@unifold/core");
 
@@ -13628,22 +13581,27 @@ function WalletConnect({
   productType,
   onBack: parentOnBack,
   onClose,
+  canGoBack = true,
+  depositWalletsLoading = false,
   onExecutionsChange
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const walletProvidedAtMount = React29.useRef(!!initialWalletInfo && !!initialDepositWallet);
-  const [activeWalletInfo, setActiveWalletInfo] = React29.useState(initialWalletInfo ?? null);
-  const [activeDepositWallet, setActiveDepositWallet] = React29.useState(initialDepositWallet ?? null);
+  const walletProvidedAtMount = React30.useRef(!!initialWalletInfo && !!initialDepositWallet);
+  const [activeWalletInfo, setActiveWalletInfo] = React30.useState(initialWalletInfo ?? null);
+  const [activeDepositWallet, setActiveDepositWallet] = React30.useState(initialDepositWallet ?? null);
   const initialView = initialWalletInfo && initialDepositWallet ? "select_token" : "select_wallet";
-  const [view, setView] = React29.useState(initialView);
-  const [isTransitioning, setIsTransitioning] = React29.useState(false);
-  const viewRef = React29.useRef(initialView);
-  const [selectedWalletDef, setSelectedWalletDef] = React29.useState(null);
-  const [connectingNetwork, setConnectingNetwork] = React29.useState(null);
-  const [walletError, setWalletError] = React29.useState(null);
-  const [isWalletConnecting, setIsWalletConnecting] = React29.useState(false);
-  const [eip6963ProviderCount, setEip6963ProviderCount] = React29.useState(0);
-  React29.useEffect(() => {
+  const [view, setView] = React30.useState(initialView);
+  const [isTransitioning, setIsTransitioning] = React30.useState(false);
+  const viewRef = React30.useRef(initialView);
+  const standalone = !canGoBack && !walletProvidedAtMount.current;
+  const { wallet: detectedWallet, isLoading: detectingWallet } = useDetectedBrowserWallet({ enabled: standalone });
+  const [autoResolved, setAutoResolved] = React30.useState(false);
+  const [selectedWalletDef, setSelectedWalletDef] = React30.useState(null);
+  const [connectingNetwork, setConnectingNetwork] = React30.useState(null);
+  const [walletError, setWalletError] = React30.useState(null);
+  const [isWalletConnecting, setIsWalletConnecting] = React30.useState(false);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React30.useState(0);
+  React30.useEffect(() => {
     const store = getEip6963Store();
     if (!store) return;
     setEip6963ProviderCount(store.getProviders().length);
@@ -13651,20 +13609,44 @@ function WalletConnect({
       setEip6963ProviderCount(providers.length);
     });
   }, []);
-  const availableWallets = React29.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
-  const [balances, setBalances] = React29.useState([]);
-  const [isLoading, setIsLoading] = React29.useState(false);
-  const [selectedBalance, setSelectedBalance] = React29.useState(null);
-  const [totalBalanceUsd, setTotalBalanceUsd] = React29.useState(null);
-  const [error, setError] = React29.useState(null);
-  const [isDisconnectingWallet, setIsDisconnectingWallet] = React29.useState(false);
-  const [amountUsd, setAmountUsd] = React29.useState(prefillAmountUsd ?? "");
-  const [isConfirming, setIsConfirming] = React29.useState(false);
-  const [hasSignedTransaction, setHasSignedTransaction] = React29.useState(false);
-  const [tokenChainDetails, setTokenChainDetails] = React29.useState(null);
-  const [loadingTokenDetails, setLoadingTokenDetails] = React29.useState(false);
-  const [showTransactionDetails, setShowTransactionDetails] = React29.useState(false);
-  const [receivedUsdAtSubmission, setReceivedUsdAtSubmission] = React29.useState(null);
+  const availableWallets = React30.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
+  React30.useEffect(() => {
+    if (!standalone || autoResolved || detectingWallet) return;
+    if (!detectedWallet) {
+      setAutoResolved(true);
+      return;
+    }
+    const wct = detectedWallet.type === "phantom-solana" || detectedWallet.type === "solflare" || detectedWallet.type === "backpack" || detectedWallet.type === "glow" ? "solana" : "ethereum";
+    const matching = depositWallets?.find((w) => w.chain_type === wct);
+    if (!matching) {
+      if (!depositWalletsLoading) setAutoResolved(true);
+      return;
+    }
+    setActiveWalletInfo(detectedWallet);
+    setActiveDepositWallet(matching);
+    onWalletConnected?.(detectedWallet, matching);
+    setView("select_token");
+    viewRef.current = "select_token";
+    setAutoResolved(true);
+  }, [standalone, autoResolved, detectingWallet, detectedWallet, depositWallets, depositWalletsLoading]);
+  React30.useEffect(() => {
+    if (!standalone || autoResolved) return;
+    const t12 = setTimeout(() => setAutoResolved(true), 5e3);
+    return () => clearTimeout(t12);
+  }, [standalone, autoResolved]);
+  const [balances, setBalances] = React30.useState([]);
+  const [isLoading, setIsLoading] = React30.useState(false);
+  const [selectedBalance, setSelectedBalance] = React30.useState(null);
+  const [totalBalanceUsd, setTotalBalanceUsd] = React30.useState(null);
+  const [error, setError] = React30.useState(null);
+  const [isDisconnectingWallet, setIsDisconnectingWallet] = React30.useState(false);
+  const [amountUsd, setAmountUsd] = React30.useState(prefillAmountUsd ?? "");
+  const [isConfirming, setIsConfirming] = React30.useState(false);
+  const [hasSignedTransaction, setHasSignedTransaction] = React30.useState(false);
+  const [tokenChainDetails, setTokenChainDetails] = React30.useState(null);
+  const [loadingTokenDetails, setLoadingTokenDetails] = React30.useState(false);
+  const [showTransactionDetails, setShowTransactionDetails] = React30.useState(false);
+  const [receivedUsdAtSubmission, setReceivedUsdAtSubmission] = React30.useState(null);
   const walletInfo = activeWalletInfo;
   const depositWallet = activeDepositWallet;
   const hasWallet = !!activeWalletInfo && !!activeDepositWallet;
@@ -13672,7 +13654,7 @@ function WalletConnect({
   const recipientAddress = activeDepositWallet?.address ?? "";
   const isCheckoutMode = !!checkoutAmountUsd;
   const supportedChainType = chainType === "algorand" || chainType === "xrpl" ? "ethereum" : chainType;
-  const transitionTo = React29.useCallback((nextView) => {
+  const transitionTo = React30.useCallback((nextView) => {
     if (nextView === viewRef.current) return;
     setIsTransitioning(true);
     setTimeout(() => {
@@ -13809,7 +13791,7 @@ function WalletConnect({
     }
   };
   const selectedToken = selectedBalance ? getTokenFromBalance(selectedBalance) : null;
-  const effectiveDestinationAmount = React29.useMemo(() => {
+  const effectiveDestinationAmount = React30.useMemo(() => {
     if (!checkoutRemainingBaseUnits || checkoutRemainingBaseUnits === "0") return "0";
     if (!checkoutAmountUsd) return checkoutRemainingBaseUnits;
     const remaining = BigInt(checkoutRemainingBaseUnits);
@@ -13837,7 +13819,7 @@ function WalletConnect({
     stablecoinParity,
     enabled: isCheckoutMode && !!selectedToken && !!checkoutDestination && effectiveDestinationAmount !== "0"
   });
-  const activeCheckoutQuote = React29.useMemo(() => {
+  const activeCheckoutQuote = React30.useMemo(() => {
     if (!isCheckoutMode) return null;
     if (walletCheckoutQuote) return { sourceAmount: walletCheckoutQuote.source_amount, sourceTokenDecimals: walletCheckoutQuote.source_token_decimals, sourceTokenSymbol: walletCheckoutQuote.source_token_symbol, sourceAmountUsd: walletCheckoutQuote.source_amount_usd, slippageBufferPercent: walletCheckoutQuote.slippage_buffer_percent ?? null };
     return checkoutQuote ?? null;
@@ -13851,19 +13833,19 @@ function WalletConnect({
     onDepositSuccess,
     onDepositError
   });
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     onExecutionsChange?.(depositExecutions);
   }, [depositExecutions, onExecutionsChange]);
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     if (!prefillAmountUsd || !tokenChainDetails || view !== "enter_amount") return;
     const minDeposit = tokenChainDetails.minimum_deposit_amount_usd || 0;
     const currentAmount = parseFloat(amountUsd) || 0;
     if (currentAmount > 0 && currentAmount < minDeposit) setAmountUsd(minDeposit.toFixed(2));
   }, [tokenChainDetails, view, prefillAmountUsd]);
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     if (view === "review") setShowTransactionDetails(false);
   }, [view]);
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     if (view !== "enter_amount" && view !== "review" || !selectedBalance || !activeDepositWallet) return;
     let cancelled = false;
     const fetchTokenDetails = async () => {
@@ -13890,7 +13872,7 @@ function WalletConnect({
       cancelled = true;
     };
   }, [view, selectedBalance, publishableKey, activeDepositWallet]);
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     if (!activeWalletInfo || !activeDepositWallet) return;
     let cancelled = false;
     setIsLoading(true);
@@ -13923,20 +13905,20 @@ function WalletConnect({
       cancelled = true;
     };
   }, [activeWalletInfo?.address, activeDepositWallet?.chain_type, publishableKey]);
-  const usdToTokenRate = React29.useMemo(() => {
+  const usdToTokenRate = React30.useMemo(() => {
     if (!selectedBalance || !selectedBalance.amount_usd || !selectedToken) return 0;
     const balanceAmount = Number(selectedBalance.amount) / 10 ** selectedToken.decimals;
     const balanceUsd = parseFloat(selectedBalance.amount_usd);
     if (balanceAmount === 0 || balanceUsd === 0) return 0;
     return balanceAmount / balanceUsd;
   }, [selectedBalance, selectedToken]);
-  const tokenAmount = React29.useMemo(() => {
+  const tokenAmount = React30.useMemo(() => {
     if (isCheckoutMode && activeCheckoutQuote && selectedToken) return Number(activeCheckoutQuote.sourceAmount) / 10 ** activeCheckoutQuote.sourceTokenDecimals;
     const usdNum = parseFloat(amountUsd) || 0;
     if (usdNum === 0 || usdToTokenRate === 0) return 0;
     return usdNum * usdToTokenRate;
   }, [amountUsd, usdToTokenRate, isCheckoutMode, activeCheckoutQuote, selectedToken]);
-  React29.useEffect(() => {
+  React30.useEffect(() => {
     if (isCheckoutMode && activeCheckoutQuote?.sourceAmountUsd && view === "enter_amount") setAmountUsd(activeCheckoutQuote.sourceAmountUsd);
   }, [isCheckoutMode, activeCheckoutQuote, view]);
   const maxTokenAmount = selectedBalance && selectedToken ? Number(selectedBalance.amount) / 10 ** selectedToken.decimals : 0;
@@ -13944,7 +13926,7 @@ function WalletConnect({
   const inputUsdNum = parseFloat(amountUsd) || 0;
   const minDepositUsd = tokenChainDetails?.minimum_deposit_amount_usd || 0;
   const isValidAmount = isCheckoutMode && activeCheckoutQuote ? tokenAmount > 0 && tokenAmount <= maxTokenAmount : inputUsdNum > 0 && inputUsdNum <= maxUsdAmount && inputUsdNum >= minDepositUsd;
-  const formattedTokenAmount = React29.useMemo(() => {
+  const formattedTokenAmount = React30.useMemo(() => {
     if (tokenAmount === 0 || !selectedToken) return null;
     return `${tokenAmount.toFixed(6)} ${selectedToken.symbol}`.replace(/\.?0+$/, "");
   }, [tokenAmount, selectedToken]);
@@ -13992,16 +13974,25 @@ function WalletConnect({
     } catch (err) {
       console.warn("[WalletConnect] disconnect error:", err);
     } finally {
-      setActiveWalletInfo(null);
-      setActiveDepositWallet(null);
-      setSelectedBalance(null);
-      setBalances([]);
-      setTotalBalanceUsd(null);
-      setAmountUsd(prefillAmountUsd ?? "");
-      setError(null);
       setIsDisconnectingWallet(false);
-      if (onWalletDisconnect) onWalletDisconnect();
-      else parentOnBack?.();
+      const clearWalletState = () => {
+        setActiveWalletInfo(null);
+        setActiveDepositWallet(null);
+        setSelectedBalance(null);
+        setBalances([]);
+        setTotalBalanceUsd(null);
+        setAmountUsd(prefillAmountUsd ?? "");
+        setError(null);
+      };
+      if (standalone) {
+        onWalletDisconnect?.();
+        transitionTo("select_wallet");
+        setTimeout(clearWalletState, 160);
+      } else {
+        clearWalletState();
+        if (onWalletDisconnect) onWalletDisconnect();
+        else parentOnBack?.();
+      }
     }
   };
   const handleReview = () => {
@@ -14127,9 +14118,15 @@ function WalletConnect({
       setIsConfirming(false);
     }
   };
+  if (standalone && !autoResolved) {
+    return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("div", { style: viewTransitionStyle, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
+      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-16", children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_lucide_react28.Loader2, { className: "uf-w-8 uf-h-8 uf-animate-spin", style: { color: colors2.primary } }) })
+    ] });
+  }
   if (view === "select_wallet") {
     return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("div", { style: viewTransitionStyle, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(DepositHeader, { title: "Connect Wallet", showBack: true, onBack: handleBack, onClose }),
+      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
       /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)("div", { className: "uf-pb-4", children: [
         /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("p", { className: "uf-text-sm uf-text-center uf-pb-4", style: { color: colors2.foregroundMuted, fontFamily: fonts.regular }, children: "Select a wallet to connect" }),
         /* @__PURE__ */ (0, import_jsx_runtime54.jsx)("div", { className: "uf-space-y-2", style: { maxHeight: 330, overflowY: "auto" }, children: availableWallets.map((wallet) => /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
@@ -14295,8 +14292,19 @@ function DepositModal({
     if (s === "tracker" && hideDepositTracker) return "main";
     if (s === "cashapp" && !enableCashApp) return "main";
     if (s === "card" && enableFiatOnramp === false) return "main";
+    if (s === "pay_with_exchange") return enablePayWithExchange === false ? "main" : "exchange";
+    if (s === "exchange_connect") return enableConnectExchange ? "coinbase_connect" : "main";
+    if (s === "wallet_connect") return enableConnectWallet ? "wallet_connect" : "main";
     return s;
-  }, [initialScreen, hideDepositTracker, enableCashApp, enableFiatOnramp]);
+  }, [
+    initialScreen,
+    hideDepositTracker,
+    enableCashApp,
+    enableFiatOnramp,
+    enablePayWithExchange,
+    enableConnectExchange,
+    enableConnectWallet
+  ]);
   const [containerEl, setContainerEl] = (0, import_react20.useState)(null);
   const containerCallbackRef = (0, import_react20.useCallback)((el) => {
     setContainerEl(el);
@@ -14420,6 +14428,12 @@ function DepositModal({
       setCardView("amount");
     }
   }, [view, showFiatOnramp]);
+  (0, import_react20.useEffect)(() => {
+    if (view === "exchange" && !showPayWithExchange) {
+      setView("main");
+      setExchangeView("providers");
+    }
+  }, [view, showPayWithExchange]);
   const { exchanges, isLoading: exchangesLoading } = useExchanges({
     publishableKey,
     enabled: open && showPayWithExchange
@@ -14539,7 +14553,7 @@ function DepositModal({
     setBrowserWalletChainType(void 0);
     setBrowserWalletInfo(null);
     setBrowserWalletModalOpen(false);
-    if (view === "wallet_connect") setView("main");
+    if (view === "wallet_connect" && sessionOpenedFromMenu) setView("main");
   };
   const handleExchangeDisconnect = () => {
     const stored = getStoredIntegrationToken(import_core29.IntegrationProvider.COINBASE);
@@ -14548,7 +14562,7 @@ function DepositModal({
     }
     clearStoredIntegrationToken(import_core29.IntegrationProvider.COINBASE);
     setConnectedExchange(null);
-    if (view === "coinbase_connect") setView("main");
+    if (view === "coinbase_connect" && sessionOpenedFromMenu) setView("main");
   };
   const handleClose = () => {
     onOpenChange(false);
@@ -14560,6 +14574,7 @@ function DepositModal({
       setCardView("amount");
       setExchangeView("providers");
       setBrowserWalletInfo(null);
+      setCoinbaseSkipToHoldings(false);
       resetViewTimeoutRef.current = null;
     }, 200);
   };
@@ -14574,6 +14589,7 @@ function DepositModal({
     setExchangeView("providers");
     setBrowserWalletInfo(null);
     setSelectedExecution(null);
+    setCoinbaseSkipToHoldings(false);
   }, [open, effectiveInitialScreen]);
   (0, import_react20.useEffect)(
     () => () => {
@@ -14933,7 +14949,7 @@ function DepositModal({
               DepositHeader,
               {
                 title: payWithExchangeTitle,
-                showBack: true,
+                showBack: exchangeView === "pending" || sessionOpenedFromMenu,
                 onBack: handleBack,
                 onClose: handleClose
               }
@@ -14987,6 +15003,7 @@ function DepositModal({
                 onClose: handleClose,
                 onDisconnect: handleExchangeDisconnect,
                 skipToHoldings: coinbaseSkipToHoldings,
+                canGoBack: sessionOpenedFromMenu,
                 onExecutionsChange: setDepositExecutions
               }
             ),
@@ -15024,7 +15041,9 @@ function DepositModal({
                   setBrowserWalletChainType(dw.chain_type === "solana" ? "solana" : "ethereum");
                 },
                 onBack: handleBack,
-                onClose: handleClose
+                onClose: handleClose,
+                canGoBack: sessionOpenedFromMenu,
+                depositWalletsLoading: walletsLoading
               }
             ),
             depositPoweredByFooter
@@ -15033,7 +15052,7 @@ function DepositModal({
               DepositHeader,
               {
                 title: cashAppView !== "amount" && cashAppAmount ? `Pay $${cashAppAmount} via Cash App` : "Pay with Cash App",
-                showBack: true,
+                showBack: cashAppView !== "amount" || sessionOpenedFromMenu,
                 onBack: handleBack,
                 onClose: handleClose
               }