@unifold/connect-react 0.1.61 → 0.1.62

package/dist/index.js

@@ -7382,7 +7382,7 @@ var React102 = __toESM(require("react"), 1);
 var import_jsx_runtime38 = require("react/jsx-runtime");
 var React112 = __toESM(require("react"), 1);
 var import_jsx_runtime39 = require("react/jsx-runtime");
-var React242 = __toESM(require("react"), 1);
+var React252 = __toESM(require("react"), 1);
 
 // ../../node_modules/.pnpm/mipd@0.0.7_typescript@5.9.3/node_modules/mipd/dist/esm/utils.js
 function requestProviders(listener) {
@@ -7440,28 +7440,29 @@ function createStore() {
 
 // ../ui-react/dist/index.mjs
 var React122 = __toESM(require("react"), 1);
-var import_jsx_runtime40 = require("react/jsx-runtime");
 var React132 = __toESM(require("react"), 1);
-var import_jsx_runtime41 = require("react/jsx-runtime");
+var import_jsx_runtime40 = require("react/jsx-runtime");
 var React142 = __toESM(require("react"), 1);
-var import_jsx_runtime42 = require("react/jsx-runtime");
+var import_jsx_runtime41 = require("react/jsx-runtime");
 var React152 = __toESM(require("react"), 1);
-var import_jsx_runtime43 = require("react/jsx-runtime");
+var import_jsx_runtime42 = require("react/jsx-runtime");
 var React162 = __toESM(require("react"), 1);
-var import_jsx_runtime44 = require("react/jsx-runtime");
+var import_jsx_runtime43 = require("react/jsx-runtime");
 var React172 = __toESM(require("react"), 1);
-var import_jsx_runtime45 = require("react/jsx-runtime");
+var import_jsx_runtime44 = require("react/jsx-runtime");
 var React182 = __toESM(require("react"), 1);
-var import_jsx_runtime46 = require("react/jsx-runtime");
+var import_jsx_runtime45 = require("react/jsx-runtime");
 var React192 = __toESM(require("react"), 1);
-var import_jsx_runtime47 = require("react/jsx-runtime");
+var import_jsx_runtime46 = require("react/jsx-runtime");
 var React202 = __toESM(require("react"), 1);
-var import_jsx_runtime48 = require("react/jsx-runtime");
+var import_jsx_runtime47 = require("react/jsx-runtime");
 var React212 = __toESM(require("react"), 1);
-var import_jsx_runtime49 = require("react/jsx-runtime");
+var import_jsx_runtime48 = require("react/jsx-runtime");
 var React222 = __toESM(require("react"), 1);
-var import_jsx_runtime50 = require("react/jsx-runtime");
+var import_jsx_runtime49 = require("react/jsx-runtime");
 var React232 = __toESM(require("react"), 1);
+var import_jsx_runtime50 = require("react/jsx-runtime");
+var React242 = __toESM(require("react"), 1);
 var import_jsx_runtime51 = require("react/jsx-runtime");
 var import_jsx_runtime52 = require("react/jsx-runtime");
 var import_jsx_runtime53 = require("react/jsx-runtime");
@@ -7476,7 +7477,7 @@ var import_react_query11 = require("@tanstack/react-query");
 var import_react_query12 = require("@tanstack/react-query");
 var import_react21 = require("react");
 var import_react22 = require("react");
-var React262 = __toESM(require("react"), 1);
+var React272 = __toESM(require("react"), 1);
 var import_jsx_runtime55 = require("react/jsx-runtime");
 var import_jsx_runtime56 = require("react/jsx-runtime");
 var import_jsx_runtime57 = require("react/jsx-runtime");
@@ -9486,7 +9487,7 @@ var import_react24 = require("react");
 var import_jsx_runtime59 = require("react/jsx-runtime");
 var import_jsx_runtime60 = require("react/jsx-runtime");
 var import_react25 = require("react");
-var React272 = __toESM(require("react"), 1);
+var React282 = __toESM(require("react"), 1);
 
 // ../../node_modules/.pnpm/@radix-ui+react-tooltip@1.2.8_@types+react-dom@19.2.3_@types+react@19.2.9__@types+react@19.2._udyjcec5g7ve3mpsxbgla63vgi/node_modules/@radix-ui/react-tooltip/dist/index.mjs
 var React31 = __toESM(require("react"), 1);
@@ -12228,7 +12229,7 @@ var import_react_query13 = require("@tanstack/react-query");
 var import_jsx_runtime62 = require("react/jsx-runtime");
 var import_jsx_runtime63 = require("react/jsx-runtime");
 var import_react26 = require("react");
-var React282 = __toESM(require("react"), 1);
+var React292 = __toESM(require("react"), 1);
 
 // ../../node_modules/.pnpm/@radix-ui+react-select@2.2.6_@types+react-dom@19.2.3_@types+react@19.2.9__@types+react@19.2.9_cot3leusltbsophitaz3dgdqdm/node_modules/@radix-ui/react-select/dist/index.mjs
 var React35 = __toESM(require("react"), 1);
@@ -13465,7 +13466,7 @@ var Separator = SelectSeparator;
 // ../ui-react/dist/index.mjs
 var import_jsx_runtime64 = require("react/jsx-runtime");
 var import_jsx_runtime65 = require("react/jsx-runtime");
-var React292 = __toESM(require("react"), 1);
+var React302 = __toESM(require("react"), 1);
 var import_react_query14 = require("@tanstack/react-query");
 var import_jsx_runtime66 = require("react/jsx-runtime");
 var import_jsx_runtime67 = require("react/jsx-runtime");
@@ -18577,6 +18578,190 @@ function collectAllEip6963EthProviders() {
   if (!store) return [];
   return store.getProviders().map((d) => d.provider);
 }
+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;
+}
+function useDetectedBrowserWallet(opts = {}) {
+  const { chainType, enabled = true, onDisconnect } = opts;
+  const [wallet, setWallet] = React122.useState(null);
+  const [isLoading, setIsLoading] = React122.useState(enabled);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React122.useState(0);
+  const onDisconnectRef = React122.useRef(onDisconnect);
+  onDisconnectRef.current = onDisconnect;
+  React122.useEffect(() => {
+    const store = getEip6963Store();
+    if (!store) return;
+    setEip6963ProviderCount(store.getProviders().length);
+    return store.subscribe((providers) => setEip6963ProviderCount(providers.length));
+  }, []);
+  React122.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 };
+}
 var SOLANA_DISCONNECT_TYPES = [
   "phantom-solana",
   "solflare",
@@ -18664,7 +18849,7 @@ function MetamaskIcon({
   className,
   variant = "color"
 }) {
-  const id = React122.useId();
+  const id = React132.useId();
   if (variant === "light" || variant === "dark") {
     return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(
       "svg",
@@ -18789,7 +18974,7 @@ function PhantomIcon({
   className,
   variant = "color"
 }) {
-  const id = React132.useId();
+  const id = React142.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
       "svg",
@@ -18860,7 +19045,7 @@ function CoinbaseIcon({
   className,
   variant = "color"
 }) {
-  const id = React142.useId();
+  const id = React152.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(
       "svg",
@@ -18944,7 +19129,7 @@ function RabbyIcon({
   className,
   variant = "color"
 }) {
-  const id = React152.useId();
+  const id = React162.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(
       "svg",
@@ -19295,7 +19480,7 @@ function RainbowIcon({
   className,
   variant = "color"
 }) {
-  const id = React162.useId();
+  const id = React172.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(
       "svg",
@@ -19761,7 +19946,7 @@ function TrustIcon({
   className,
   variant = "color"
 }) {
-  const id = React172.useId();
+  const id = React182.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
       "svg",
@@ -19854,7 +20039,7 @@ function OkxIcon({
   className,
   variant = "color"
 }) {
-  const id = React182.useId();
+  const id = React192.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
       "svg",
@@ -19925,7 +20110,7 @@ function GlowIcon({
   className,
   variant = "color"
 }) {
-  const id = React192.useId();
+  const id = React202.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
       "svg",
@@ -20030,7 +20215,7 @@ function BackpackIcon({
   className,
   variant = "color"
 }) {
-  const id = React202.useId();
+  const id = React212.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
       "svg",
@@ -20107,7 +20292,7 @@ function SolflareIcon({
   className,
   variant = "color"
 }) {
-  const id = React212.useId();
+  const id = React222.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
       "svg",
@@ -20178,7 +20363,7 @@ function EthereumIcon({
   className,
   variant = "color"
 }) {
-  const id = React222.useId();
+  const id = React232.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
       "svg",
@@ -20312,7 +20497,7 @@ function SolanaIcon({
   className,
   variant = "color"
 }) {
-  const id = React232.useId();
+  const id = React242.useId();
   if (variant === "light") {
     return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
       "svg",
@@ -20561,44 +20746,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,
@@ -20609,30 +20756,19 @@ function BrowserWalletButton({
   subtitle = i18n2.depositModal.browserWallet.subtitle
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [isHovered, setIsHovered] = React242.useState(false);
-  const [isTouchDevice, setIsTouchDevice] = React242.useState(false);
-  const [wallet, setWallet] = React242.useState(null);
-  const [isLoading, setIsLoading] = React242.useState(true);
-  const [isConnecting, setIsConnecting] = React242.useState(false);
-  const [balanceText, setBalanceText] = React242.useState(null);
-  const [isLoadingBalance, setIsLoadingBalance] = React242.useState(false);
-  const [isDisconnecting, setIsDisconnecting] = React242.useState(false);
-  const onDisconnectRef = React242.useRef(onDisconnect);
+  const [isHovered, setIsHovered] = React252.useState(false);
+  const [isTouchDevice, setIsTouchDevice] = React252.useState(false);
+  const { wallet, isLoading, setWallet } = useDetectedBrowserWallet({ chainType, onDisconnect });
+  const [isConnecting, setIsConnecting] = React252.useState(false);
+  const [balanceText, setBalanceText] = React252.useState(null);
+  const [isLoadingBalance, setIsLoadingBalance] = React252.useState(false);
+  const [isDisconnecting, setIsDisconnecting] = React252.useState(false);
+  const onDisconnectRef = React252.useRef(onDisconnect);
   onDisconnectRef.current = onDisconnect;
-  React242.useEffect(() => {
+  React252.useEffect(() => {
     setIsTouchDevice("ontouchstart" in window || navigator.maxTouchPoints > 0);
   }, []);
-  const [eip6963ProviderCount, setEip6963ProviderCount] = React242.useState(0);
-  React242.useEffect(() => {
-    const store = getEip6963Store();
-    if (!store) return;
-    setEip6963ProviderCount(store.getProviders().length);
-    const unsubscribe = store.subscribe((providers) => {
-      setEip6963ProviderCount(providers.length);
-    });
-    return unsubscribe;
-  }, []);
-  React242.useEffect(() => {
+  React252.useEffect(() => {
     if (!wallet || !publishableKey) {
       setBalanceText(null);
       return;
@@ -20673,206 +20809,6 @@ function BrowserWalletButton({
       cancelled = true;
     };
   }, [wallet, publishableKey]);
-  React242.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);
@@ -20956,7 +20892,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] ? React242.createElement(WALLET_ICON_COMPONENTS[wallet.icon], {
+  const walletIconBlock = wallet ? WALLET_ICON_COMPONENTS[wallet.icon] ? React252.createElement(WALLET_ICON_COMPONENTS[wallet.icon], {
     size: 36,
     className: "uf-rounded-lg",
     variant: "color"
@@ -21218,6 +21154,7 @@ function CoinbaseConnect({
   onBack: parentOnBack,
   onDisconnect,
   skipToHoldings,
+  canGoBack = true,
   onExecutionsChange
 }) {
   const { colors: colors2, fonts, components } = useTheme();
@@ -21605,6 +21542,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":
@@ -21665,7 +21612,7 @@ function CoinbaseConnect({
           DepositHeader,
           {
             title: t12.title,
-            showBack: true,
+            showBack: canGoBack,
             onBack: handleBack,
             onClose
           }
@@ -21678,7 +21625,7 @@ function CoinbaseConnect({
         DepositHeader,
         {
           title: t12.title,
-          showBack: true,
+          showBack: canGoBack,
           onBack: handleBack,
           onClose
         }
@@ -22390,7 +22337,7 @@ function CoinbaseConnect({
                 borderRadius: components.button.borderRadius,
                 fontFamily: fonts.medium
               },
-              onClick: onDisconnect,
+              onClick: handleDisconnect,
               children: t12.disconnect
             }
           )
@@ -23177,7 +23124,7 @@ function ThemeStyleInjector({
   className
 }) {
   const { colors: colors2, fonts, mode } = useTheme();
-  const cssVars = React262.useMemo(() => {
+  const cssVars = React272.useMemo(() => {
     const hexToHSL = (hex) => {
       hex = hex.replace("#", "");
       const r2 = parseInt(hex.slice(0, 2), 16) / 255;
@@ -23237,7 +23184,7 @@ function ThemeStyleInjector({
       ...fonts.regular ? { "--uf-font-family": fonts.regular } : {}
     };
   }, [colors2, fonts.regular]);
-  React262.useEffect(() => {
+  React272.useEffect(() => {
     if (typeof document === "undefined") return;
     if (fonts.regular) {
       document.documentElement.style.setProperty(
@@ -24196,14 +24143,14 @@ function useCopyAddress() {
   return { copied, handleCopy };
 }
 var TooltipProvider2 = Provider;
-var TooltipContext = React272.createContext({
+var TooltipContext = React282.createContext({
   open: false,
   onOpenChange: () => {
   }
 });
-var TooltipTrigger2 = React272.forwardRef(({ onClick, ...props }, ref) => {
-  const { open, onOpenChange } = React272.useContext(TooltipContext);
-  const handleClick = React272.useCallback(
+var TooltipTrigger2 = React282.forwardRef(({ onClick, ...props }, ref) => {
+  const { open, onOpenChange } = React282.useContext(TooltipContext);
+  const handleClick = React282.useCallback(
     (e) => {
       onOpenChange(!open);
       onClick?.(e);
@@ -24213,7 +24160,7 @@ var TooltipTrigger2 = React272.forwardRef(({ onClick, ...props }, ref) => {
   return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(Trigger, { ref, onClick: handleClick, ...props });
 });
 TooltipTrigger2.displayName = Trigger.displayName;
-var TooltipContent2 = React272.forwardRef(({ className, sideOffset = 4, ...props }, ref) => {
+var TooltipContent2 = React282.forwardRef(({ className, sideOffset = 4, ...props }, ref) => {
   const { themeClass, colors: colors2 } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(Portal3, { children: /* @__PURE__ */ (0, import_jsx_runtime61.jsx)(
     Content22,
@@ -24818,7 +24765,7 @@ function TransferCryptoSingleInput({
 }
 var Select2 = Root23;
 var SelectValue2 = Value;
-var SelectTrigger2 = React282.forwardRef(({ className, style, children, ...props }, ref) => {
+var SelectTrigger2 = React292.forwardRef(({ className, style, children, ...props }, ref) => {
   const { components } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(
     Trigger2,
@@ -24842,7 +24789,7 @@ var SelectTrigger2 = React282.forwardRef(({ className, style, children, ...props
   );
 });
 SelectTrigger2.displayName = Trigger2.displayName;
-var SelectScrollUpButton2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+var SelectScrollUpButton2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
   ScrollUpButton,
   {
     ref,
@@ -24855,7 +24802,7 @@ var SelectScrollUpButton2 = React282.forwardRef(({ className, ...props }, ref) =
   }
 ));
 SelectScrollUpButton2.displayName = ScrollUpButton.displayName;
-var SelectScrollDownButton2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+var SelectScrollDownButton2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
   ScrollDownButton,
   {
     ref,
@@ -24868,7 +24815,7 @@ var SelectScrollDownButton2 = React282.forwardRef(({ className, ...props }, ref)
   }
 ));
 SelectScrollDownButton2.displayName = ScrollDownButton.displayName;
-var SelectContent2 = React282.forwardRef(({ className, style, children, position = "popper", ...props }, ref) => {
+var SelectContent2 = React292.forwardRef(({ className, style, children, position = "popper", ...props }, ref) => {
   const { themeClass, colors: colors2, components } = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(Portal4, { children: /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(
     Content23,
@@ -24906,7 +24853,7 @@ var SelectContent2 = React282.forwardRef(({ className, style, children, position
   ) });
 });
 SelectContent2.displayName = Content23.displayName;
-var SelectLabel2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+var SelectLabel2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
   Label,
   {
     ref,
@@ -24918,7 +24865,7 @@ var SelectLabel2 = React282.forwardRef(({ className, ...props }, ref) => /* @__P
   }
 ));
 SelectLabel2.displayName = Label.displayName;
-var SelectItem2 = React282.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(
+var SelectItem2 = React292.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsxs)(
   Item,
   {
     ref,
@@ -24934,7 +24881,7 @@ var SelectItem2 = React282.forwardRef(({ className, children, ...props }, ref) =
   }
 ));
 SelectItem2.displayName = Item.displayName;
-var SelectSeparator2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
+var SelectSeparator2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ (0, import_jsx_runtime64.jsx)(
   Separator,
   {
     ref,
@@ -26598,22 +26545,27 @@ function WalletConnect({
   productType,
   onBack: parentOnBack,
   onClose,
+  canGoBack = true,
+  depositWalletsLoading = false,
   onExecutionsChange
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const walletProvidedAtMount = React292.useRef(!!initialWalletInfo && !!initialDepositWallet);
-  const [activeWalletInfo, setActiveWalletInfo] = React292.useState(initialWalletInfo ?? null);
-  const [activeDepositWallet, setActiveDepositWallet] = React292.useState(initialDepositWallet ?? null);
+  const walletProvidedAtMount = React302.useRef(!!initialWalletInfo && !!initialDepositWallet);
+  const [activeWalletInfo, setActiveWalletInfo] = React302.useState(initialWalletInfo ?? null);
+  const [activeDepositWallet, setActiveDepositWallet] = React302.useState(initialDepositWallet ?? null);
   const initialView = initialWalletInfo && initialDepositWallet ? "select_token" : "select_wallet";
-  const [view, setView] = React292.useState(initialView);
-  const [isTransitioning, setIsTransitioning] = React292.useState(false);
-  const viewRef = React292.useRef(initialView);
-  const [selectedWalletDef, setSelectedWalletDef] = React292.useState(null);
-  const [connectingNetwork, setConnectingNetwork] = React292.useState(null);
-  const [walletError, setWalletError] = React292.useState(null);
-  const [isWalletConnecting, setIsWalletConnecting] = React292.useState(false);
-  const [eip6963ProviderCount, setEip6963ProviderCount] = React292.useState(0);
-  React292.useEffect(() => {
+  const [view, setView] = React302.useState(initialView);
+  const [isTransitioning, setIsTransitioning] = React302.useState(false);
+  const viewRef = React302.useRef(initialView);
+  const standalone = !canGoBack && !walletProvidedAtMount.current;
+  const { wallet: detectedWallet, isLoading: detectingWallet } = useDetectedBrowserWallet({ enabled: standalone });
+  const [autoResolved, setAutoResolved] = React302.useState(false);
+  const [selectedWalletDef, setSelectedWalletDef] = React302.useState(null);
+  const [connectingNetwork, setConnectingNetwork] = React302.useState(null);
+  const [walletError, setWalletError] = React302.useState(null);
+  const [isWalletConnecting, setIsWalletConnecting] = React302.useState(false);
+  const [eip6963ProviderCount, setEip6963ProviderCount] = React302.useState(0);
+  React302.useEffect(() => {
     const store = getEip6963Store();
     if (!store) return;
     setEip6963ProviderCount(store.getProviders().length);
@@ -26621,20 +26573,44 @@ function WalletConnect({
       setEip6963ProviderCount(providers.length);
     });
   }, []);
-  const availableWallets = React292.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
-  const [balances, setBalances] = React292.useState([]);
-  const [isLoading, setIsLoading] = React292.useState(false);
-  const [selectedBalance, setSelectedBalance] = React292.useState(null);
-  const [totalBalanceUsd, setTotalBalanceUsd] = React292.useState(null);
-  const [error, setError] = React292.useState(null);
-  const [isDisconnectingWallet, setIsDisconnectingWallet] = React292.useState(false);
-  const [amountUsd, setAmountUsd] = React292.useState(prefillAmountUsd ?? "");
-  const [isConfirming, setIsConfirming] = React292.useState(false);
-  const [hasSignedTransaction, setHasSignedTransaction] = React292.useState(false);
-  const [tokenChainDetails, setTokenChainDetails] = React292.useState(null);
-  const [loadingTokenDetails, setLoadingTokenDetails] = React292.useState(false);
-  const [showTransactionDetails, setShowTransactionDetails] = React292.useState(false);
-  const [receivedUsdAtSubmission, setReceivedUsdAtSubmission] = React292.useState(null);
+  const availableWallets = React302.useMemo(() => detectAvailableWallets(), [eip6963ProviderCount]);
+  React302.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]);
+  React302.useEffect(() => {
+    if (!standalone || autoResolved) return;
+    const t12 = setTimeout(() => setAutoResolved(true), 5e3);
+    return () => clearTimeout(t12);
+  }, [standalone, autoResolved]);
+  const [balances, setBalances] = React302.useState([]);
+  const [isLoading, setIsLoading] = React302.useState(false);
+  const [selectedBalance, setSelectedBalance] = React302.useState(null);
+  const [totalBalanceUsd, setTotalBalanceUsd] = React302.useState(null);
+  const [error, setError] = React302.useState(null);
+  const [isDisconnectingWallet, setIsDisconnectingWallet] = React302.useState(false);
+  const [amountUsd, setAmountUsd] = React302.useState(prefillAmountUsd ?? "");
+  const [isConfirming, setIsConfirming] = React302.useState(false);
+  const [hasSignedTransaction, setHasSignedTransaction] = React302.useState(false);
+  const [tokenChainDetails, setTokenChainDetails] = React302.useState(null);
+  const [loadingTokenDetails, setLoadingTokenDetails] = React302.useState(false);
+  const [showTransactionDetails, setShowTransactionDetails] = React302.useState(false);
+  const [receivedUsdAtSubmission, setReceivedUsdAtSubmission] = React302.useState(null);
   const walletInfo = activeWalletInfo;
   const depositWallet = activeDepositWallet;
   const hasWallet = !!activeWalletInfo && !!activeDepositWallet;
@@ -26642,7 +26618,7 @@ function WalletConnect({
   const recipientAddress = activeDepositWallet?.address ?? "";
   const isCheckoutMode = !!checkoutAmountUsd;
   const supportedChainType = chainType === "algorand" || chainType === "xrpl" ? "ethereum" : chainType;
-  const transitionTo = React292.useCallback((nextView) => {
+  const transitionTo = React302.useCallback((nextView) => {
     if (nextView === viewRef.current) return;
     setIsTransitioning(true);
     setTimeout(() => {
@@ -26779,7 +26755,7 @@ function WalletConnect({
     }
   };
   const selectedToken = selectedBalance ? getTokenFromBalance(selectedBalance) : null;
-  const effectiveDestinationAmount = React292.useMemo(() => {
+  const effectiveDestinationAmount = React302.useMemo(() => {
     if (!checkoutRemainingBaseUnits || checkoutRemainingBaseUnits === "0") return "0";
     if (!checkoutAmountUsd) return checkoutRemainingBaseUnits;
     const remaining = BigInt(checkoutRemainingBaseUnits);
@@ -26807,7 +26783,7 @@ function WalletConnect({
     stablecoinParity,
     enabled: isCheckoutMode && !!selectedToken && !!checkoutDestination && effectiveDestinationAmount !== "0"
   });
-  const activeCheckoutQuote = React292.useMemo(() => {
+  const activeCheckoutQuote = React302.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;
@@ -26821,19 +26797,19 @@ function WalletConnect({
     onDepositSuccess,
     onDepositError
   });
-  React292.useEffect(() => {
+  React302.useEffect(() => {
     onExecutionsChange?.(depositExecutions);
   }, [depositExecutions, onExecutionsChange]);
-  React292.useEffect(() => {
+  React302.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]);
-  React292.useEffect(() => {
+  React302.useEffect(() => {
     if (view === "review") setShowTransactionDetails(false);
   }, [view]);
-  React292.useEffect(() => {
+  React302.useEffect(() => {
     if (view !== "enter_amount" && view !== "review" || !selectedBalance || !activeDepositWallet) return;
     let cancelled = false;
     const fetchTokenDetails = async () => {
@@ -26860,7 +26836,7 @@ function WalletConnect({
       cancelled = true;
     };
   }, [view, selectedBalance, publishableKey, activeDepositWallet]);
-  React292.useEffect(() => {
+  React302.useEffect(() => {
     if (!activeWalletInfo || !activeDepositWallet) return;
     let cancelled = false;
     setIsLoading(true);
@@ -26893,20 +26869,20 @@ function WalletConnect({
       cancelled = true;
     };
   }, [activeWalletInfo?.address, activeDepositWallet?.chain_type, publishableKey]);
-  const usdToTokenRate = React292.useMemo(() => {
+  const usdToTokenRate = React302.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 = React292.useMemo(() => {
+  const tokenAmount = React302.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]);
-  React292.useEffect(() => {
+  React302.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;
@@ -26914,7 +26890,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 = React292.useMemo(() => {
+  const formattedTokenAmount = React302.useMemo(() => {
     if (tokenAmount === 0 || !selectedToken) return null;
     return `${tokenAmount.toFixed(6)} ${selectedToken.symbol}`.replace(/\.?0+$/, "");
   }, [tokenAmount, selectedToken]);
@@ -26962,16 +26938,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 = () => {
@@ -27097,9 +27082,15 @@ function WalletConnect({
       setIsConfirming(false);
     }
   };
+  if (standalone && !autoResolved) {
+    return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { style: viewTransitionStyle, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-16", children: /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(LoaderCircle, { className: "uf-w-8 uf-h-8 uf-animate-spin", style: { color: colors2.primary } }) })
+    ] });
+  }
   if (view === "select_wallet") {
     return /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { style: viewTransitionStyle, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(DepositHeader, { title: "Connect Wallet", showBack: true, onBack: handleBack, onClose }),
+      /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
       /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)("div", { className: "uf-pb-4", children: [
         /* @__PURE__ */ (0, import_jsx_runtime71.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_runtime71.jsx)("div", { className: "uf-space-y-2", style: { maxHeight: 330, overflowY: "auto" }, children: availableWallets.map((wallet) => /* @__PURE__ */ (0, import_jsx_runtime71.jsxs)(
@@ -27262,8 +27253,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_react8.useState)(null);
   const containerCallbackRef = (0, import_react8.useCallback)((el) => {
     setContainerEl(el);
@@ -27387,6 +27389,12 @@ function DepositModal({
       setCardView("amount");
     }
   }, [view, showFiatOnramp]);
+  (0, import_react8.useEffect)(() => {
+    if (view === "exchange" && !showPayWithExchange) {
+      setView("main");
+      setExchangeView("providers");
+    }
+  }, [view, showPayWithExchange]);
   const { exchanges, isLoading: exchangesLoading } = useExchanges({
     publishableKey,
     enabled: open && showPayWithExchange
@@ -27506,7 +27514,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(IntegrationProvider.COINBASE);
@@ -27515,7 +27523,7 @@ function DepositModal({
     }
     clearStoredIntegrationToken(IntegrationProvider.COINBASE);
     setConnectedExchange(null);
-    if (view === "coinbase_connect") setView("main");
+    if (view === "coinbase_connect" && sessionOpenedFromMenu) setView("main");
   };
   const handleClose = () => {
     onOpenChange(false);
@@ -27527,6 +27535,7 @@ function DepositModal({
       setCardView("amount");
       setExchangeView("providers");
       setBrowserWalletInfo(null);
+      setCoinbaseSkipToHoldings(false);
       resetViewTimeoutRef.current = null;
     }, 200);
   };
@@ -27541,6 +27550,7 @@ function DepositModal({
     setExchangeView("providers");
     setBrowserWalletInfo(null);
     setSelectedExecution(null);
+    setCoinbaseSkipToHoldings(false);
   }, [open, effectiveInitialScreen]);
   (0, import_react8.useEffect)(
     () => () => {
@@ -27900,7 +27910,7 @@ function DepositModal({
               DepositHeader,
               {
                 title: payWithExchangeTitle,
-                showBack: true,
+                showBack: exchangeView === "pending" || sessionOpenedFromMenu,
                 onBack: handleBack,
                 onClose: handleClose
               }
@@ -27954,6 +27964,7 @@ function DepositModal({
                 onClose: handleClose,
                 onDisconnect: handleExchangeDisconnect,
                 skipToHoldings: coinbaseSkipToHoldings,
+                canGoBack: sessionOpenedFromMenu,
                 onExecutionsChange: setDepositExecutions
               }
             ),
@@ -27991,7 +28002,9 @@ function DepositModal({
                   setBrowserWalletChainType(dw.chain_type === "solana" ? "solana" : "ethereum");
                 },
                 onBack: handleBack,
-                onClose: handleClose
+                onClose: handleClose,
+                canGoBack: sessionOpenedFromMenu,
+                depositWalletsLoading: walletsLoading
               }
             ),
             depositPoweredByFooter
@@ -28000,7 +28013,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
               }