@unifold/connect-react 0.1.61 → 0.1.62

package/dist/index.mjs

@@ -1145,10 +1145,10 @@ ${new this._window.XMLSerializer().serializeToString(e3)}`;
 
 // src/provider.tsx
 import React38, {
-  useState as useState30,
+  useState as useState31,
   useCallback as useCallback13,
   useMemo as useMemo15,
-  useEffect as useEffect31
+  useEffect as useEffect33
 } from "react";
 
 // ../react-provider/dist/index.mjs
@@ -1225,11 +1225,11 @@ function useUnifold() {
 
 // ../ui-react/dist/index.mjs
 import {
-  useState as useState31,
-  useEffect as useEffect25,
+  useState as useState32,
+  useEffect as useEffect26,
   useLayoutEffect as useLayoutEffect22,
   useCallback as useCallback52,
-  useRef as useRef82,
+  useRef as useRef92,
   useMemo as useMemo10
 } from "react";
 
@@ -7355,7 +7355,7 @@ import * as React102 from "react";
 import { jsx as jsx21, jsxs as jsxs18 } from "react/jsx-runtime";
 import * as React112 from "react";
 import { jsx as jsx222, jsxs as jsxs19 } from "react/jsx-runtime";
-import * as React242 from "react";
+import * as React252 from "react";
 
 // ../../node_modules/.pnpm/mipd@0.0.7_typescript@5.9.3/node_modules/mipd/dist/esm/utils.js
 function requestProviders(listener) {
@@ -7413,32 +7413,33 @@ function createStore() {
 
 // ../ui-react/dist/index.mjs
 import * as React122 from "react";
-import { jsx as jsx232, jsxs as jsxs20 } from "react/jsx-runtime";
 import * as React132 from "react";
-import { jsx as jsx24, jsxs as jsxs21 } from "react/jsx-runtime";
+import { jsx as jsx232, jsxs as jsxs20 } from "react/jsx-runtime";
 import * as React142 from "react";
-import { jsx as jsx25, jsxs as jsxs222 } from "react/jsx-runtime";
+import { jsx as jsx24, jsxs as jsxs21 } from "react/jsx-runtime";
 import * as React152 from "react";
-import { jsx as jsx26, jsxs as jsxs23 } from "react/jsx-runtime";
+import { jsx as jsx25, jsxs as jsxs222 } from "react/jsx-runtime";
 import * as React162 from "react";
-import { jsx as jsx27, jsxs as jsxs24 } from "react/jsx-runtime";
+import { jsx as jsx26, jsxs as jsxs23 } from "react/jsx-runtime";
 import * as React172 from "react";
-import { jsx as jsx28, jsxs as jsxs25 } from "react/jsx-runtime";
+import { jsx as jsx27, jsxs as jsxs24 } from "react/jsx-runtime";
 import * as React182 from "react";
-import { jsx as jsx29, jsxs as jsxs26 } from "react/jsx-runtime";
+import { jsx as jsx28, jsxs as jsxs25 } from "react/jsx-runtime";
 import * as React192 from "react";
-import { jsx as jsx30, jsxs as jsxs27 } from "react/jsx-runtime";
+import { jsx as jsx29, jsxs as jsxs26 } from "react/jsx-runtime";
 import * as React202 from "react";
-import { jsx as jsx31, jsxs as jsxs28 } from "react/jsx-runtime";
+import { jsx as jsx30, jsxs as jsxs27 } from "react/jsx-runtime";
 import * as React212 from "react";
-import { jsx as jsx322, jsxs as jsxs29 } from "react/jsx-runtime";
+import { jsx as jsx31, jsxs as jsxs28 } from "react/jsx-runtime";
 import * as React222 from "react";
-import { jsx as jsx33, jsxs as jsxs30 } from "react/jsx-runtime";
+import { jsx as jsx322, jsxs as jsxs29 } from "react/jsx-runtime";
 import * as React232 from "react";
+import { jsx as jsx33, jsxs as jsxs30 } from "react/jsx-runtime";
+import * as React242 from "react";
 import { jsx as jsx34, jsxs as jsxs31 } from "react/jsx-runtime";
 import { jsx as jsx35, jsxs as jsxs322 } from "react/jsx-runtime";
 import { jsx as jsx36, jsxs as jsxs33 } from "react/jsx-runtime";
-import { useState as useState212, useEffect as useEffect162, useCallback as useCallback22, useMemo as useMemo42, useRef as useRef52 } from "react";
+import { useState as useState222, useEffect as useEffect172, useCallback as useCallback22, useMemo as useMemo42, useRef as useRef62 } from "react";
 import { useQuery as useQuery4 } from "@tanstack/react-query";
 import { useQuery as useQuery5 } from "@tanstack/react-query";
 import { useQuery as useQuery6 } from "@tanstack/react-query";
@@ -7447,13 +7448,13 @@ import { useQuery as useQuery7 } from "@tanstack/react-query";
 import { useQuery as useQuery8 } from "@tanstack/react-query";
 import { useQuery as useQuery9 } from "@tanstack/react-query";
 import { useQuery as useQuery10 } from "@tanstack/react-query";
-import { useState as useState27, useEffect as useEffect212, useMemo as useMemo72 } from "react";
-import { useEffect as useEffect182, useState as useState222 } from "react";
-import * as React262 from "react";
+import { useState as useState28, useEffect as useEffect222, useMemo as useMemo72 } from "react";
+import { useEffect as useEffect192, useState as useState232 } from "react";
+import * as React272 from "react";
 import { jsx as jsx38 } from "react/jsx-runtime";
 import { jsx as jsx39, jsxs as jsxs35 } from "react/jsx-runtime";
 import { Fragment as Fragment52, jsx as jsx40, jsxs as jsxs36 } from "react/jsx-runtime";
-import { useState as useState232, useMemo as useMemo62, useEffect as useEffect192 } from "react";
+import { useState as useState242, useMemo as useMemo62, useEffect as useEffect202 } from "react";
 
 // ../../node_modules/.pnpm/fuse.js@7.4.0/node_modules/fuse.js/dist/fuse.mjs
 function isArray(value) {
@@ -9455,11 +9456,11 @@ Fuse.use = function(...plugins) {
 
 // ../ui-react/dist/index.mjs
 import { jsx as jsx41, jsxs as jsxs37 } from "react/jsx-runtime";
-import { useState as useState242, useEffect as useEffect202, useRef as useRef62 } from "react";
+import { useState as useState252, useEffect as useEffect212, useRef as useRef72 } from "react";
 import { jsx as jsx422, jsxs as jsxs38 } from "react/jsx-runtime";
 import { Fragment as Fragment62, jsx as jsx43, jsxs as jsxs39 } from "react/jsx-runtime";
-import { useState as useState252 } from "react";
-import * as React272 from "react";
+import { useState as useState262 } from "react";
+import * as React282 from "react";
 
 // ../../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
 import * as React31 from "react";
@@ -12200,8 +12201,8 @@ import { jsx as jsx44 } from "react/jsx-runtime";
 import { useQuery as useQuery11 } from "@tanstack/react-query";
 import { jsx as jsx45, jsxs as jsxs40 } from "react/jsx-runtime";
 import { Fragment as Fragment72, jsx as jsx46, jsxs as jsxs41 } from "react/jsx-runtime";
-import { useState as useState28, useEffect as useEffect222, useMemo as useMemo82 } from "react";
-import * as React282 from "react";
+import { useState as useState29, useEffect as useEffect232, useMemo as useMemo82 } from "react";
+import * as React292 from "react";
 
 // ../../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
 import * as React35 from "react";
@@ -13438,49 +13439,49 @@ var Separator = SelectSeparator;
 // ../ui-react/dist/index.mjs
 import { jsx as jsx47, jsxs as jsxs422 } from "react/jsx-runtime";
 import { jsx as jsx48, jsxs as jsxs43 } from "react/jsx-runtime";
-import * as React292 from "react";
+import * as React302 from "react";
 import { useQuery as useQuery12 } from "@tanstack/react-query";
 import { jsx as jsx49 } from "react/jsx-runtime";
 import { jsx as jsx50, jsxs as jsxs44 } from "react/jsx-runtime";
 import { Fragment as Fragment82, jsx as jsx51, jsxs as jsxs45 } from "react/jsx-runtime";
 import { Fragment as Fragment9, jsx as jsx522, jsxs as jsxs46 } from "react/jsx-runtime";
-import { useEffect as useEffect232, useState as useState292 } from "react";
+import { useEffect as useEffect242, useState as useState302 } from "react";
 import { Fragment as Fragment10, jsx as jsx53, jsxs as jsxs47 } from "react/jsx-runtime";
 import { jsx as jsx54, jsxs as jsxs48 } from "react/jsx-runtime";
 import { Fragment as Fragment11, jsx as jsx55, jsxs as jsxs49 } from "react/jsx-runtime";
 import {
-  useState as useState32,
-  useEffect as useEffect262,
+  useState as useState33,
+  useEffect as useEffect272,
   useLayoutEffect as useLayoutEffect32,
   useCallback as useCallback62,
-  useRef as useRef92,
+  useRef as useRef102,
   useMemo as useMemo112
 } from "react";
 import { useQuery as useQuery13 } from "@tanstack/react-query";
 import { Fragment as Fragment12, jsx as jsx56, jsxs as jsxs50 } from "react/jsx-runtime";
 import {
-  useState as useState36,
-  useEffect as useEffect30,
+  useState as useState37,
+  useEffect as useEffect31,
   useLayoutEffect as useLayoutEffect42,
   useCallback as useCallback82,
-  useRef as useRef112
+  useRef as useRef122
 } from "react";
 import { useQuery as useQuery14 } from "@tanstack/react-query";
 import { useQuery as useQuery15 } from "@tanstack/react-query";
 import { useQuery as useQuery16 } from "@tanstack/react-query";
 import { useQuery as useQuery17 } from "@tanstack/react-query";
-import { useState as useState33, useEffect as useEffect272, useRef as useRef102 } from "react";
+import { useState as useState34, useEffect as useEffect282, useRef as useRef112 } from "react";
 import { jsx as jsx57, jsxs as jsxs51 } from "react/jsx-runtime";
-import { useState as useState34, useCallback as useCallback72, useMemo as useMemo132, useEffect as useEffect282 } from "react";
+import { useState as useState35, useCallback as useCallback72, useMemo as useMemo132, useEffect as useEffect292 } from "react";
 import { useQuery as useQuery18 } from "@tanstack/react-query";
 import { useMemo as useMemo122 } from "react";
 import { useQuery as useQuery19 } from "@tanstack/react-query";
 import { Fragment as Fragment13, jsx as jsx58, jsxs as jsxs52 } from "react/jsx-runtime";
 import { jsx as jsx59, jsxs as jsxs53 } from "react/jsx-runtime";
-import { useState as useState35, useEffect as useEffect292 } from "react";
+import { useState as useState36, useEffect as useEffect302 } from "react";
 import { Fragment as Fragment14, jsx as jsx60, jsxs as jsxs54 } from "react/jsx-runtime";
 import { Fragment as Fragment15, jsx as jsx61, jsxs as jsxs55 } from "react/jsx-runtime";
-import { useState as useState37, useMemo as useMemo142 } from "react";
+import { useState as useState38, useMemo as useMemo142 } from "react";
 import { jsx as jsx622, jsxs as jsxs56 } from "react/jsx-runtime";
 function cn(...inputs) {
   return twMerge(clsx(inputs));
@@ -18563,6 +18564,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",
@@ -18650,7 +18835,7 @@ function MetamaskIcon({
   className,
   variant = "color"
 }) {
-  const id = React122.useId();
+  const id = React132.useId();
   if (variant === "light" || variant === "dark") {
     return /* @__PURE__ */ jsxs20(
       "svg",
@@ -18775,7 +18960,7 @@ function PhantomIcon({
   className,
   variant = "color"
 }) {
-  const id = React132.useId();
+  const id = React142.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx24(
       "svg",
@@ -18846,7 +19031,7 @@ function CoinbaseIcon({
   className,
   variant = "color"
 }) {
-  const id = React142.useId();
+  const id = React152.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsxs222(
       "svg",
@@ -18930,7 +19115,7 @@ function RabbyIcon({
   className,
   variant = "color"
 }) {
-  const id = React152.useId();
+  const id = React162.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsxs23(
       "svg",
@@ -19281,7 +19466,7 @@ function RainbowIcon({
   className,
   variant = "color"
 }) {
-  const id = React162.useId();
+  const id = React172.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsxs24(
       "svg",
@@ -19747,7 +19932,7 @@ function TrustIcon({
   className,
   variant = "color"
 }) {
-  const id = React172.useId();
+  const id = React182.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx28(
       "svg",
@@ -19840,7 +20025,7 @@ function OkxIcon({
   className,
   variant = "color"
 }) {
-  const id = React182.useId();
+  const id = React192.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx29(
       "svg",
@@ -19911,7 +20096,7 @@ function GlowIcon({
   className,
   variant = "color"
 }) {
-  const id = React192.useId();
+  const id = React202.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx30(
       "svg",
@@ -20016,7 +20201,7 @@ function BackpackIcon({
   className,
   variant = "color"
 }) {
-  const id = React202.useId();
+  const id = React212.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx31(
       "svg",
@@ -20093,7 +20278,7 @@ function SolflareIcon({
   className,
   variant = "color"
 }) {
-  const id = React212.useId();
+  const id = React222.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx322(
       "svg",
@@ -20164,7 +20349,7 @@ function EthereumIcon({
   className,
   variant = "color"
 }) {
-  const id = React222.useId();
+  const id = React232.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsxs30(
       "svg",
@@ -20298,7 +20483,7 @@ function SolanaIcon({
   className,
   variant = "color"
 }) {
-  const id = React232.useId();
+  const id = React242.useId();
   if (variant === "light") {
     return /* @__PURE__ */ jsx34(
       "svg",
@@ -20547,44 +20732,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,
@@ -20595,30 +20742,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;
@@ -20659,206 +20795,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);
@@ -20942,7 +20878,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"
@@ -21204,6 +21140,7 @@ function CoinbaseConnect({
   onBack: parentOnBack,
   onDisconnect,
   skipToHoldings,
+  canGoBack = true,
   onExecutionsChange
 }) {
   const { colors: colors2, fonts, components } = useTheme();
@@ -21229,25 +21166,25 @@ function CoinbaseConnect({
   const appName = projectConfig?.project_name ?? "Unifold";
   const t12 = i18n2.connectExchange;
   const initialView = skipToHoldings && getStoredIntegrationToken(IntegrationProvider.COINBASE) ? "holdings" : "select_exchange";
-  const [view, setView] = useState212(initialView);
-  const [prevView, setPrevView] = useState212(initialView);
-  const [isTransitioning, setIsTransitioning] = useState212(false);
-  const [exchanges, setExchanges] = useState212([]);
-  const [exchangesLoading, setExchangesLoading] = useState212(true);
-  const [selectedExchange, setSelectedExchange] = useState212(null);
-  const [accessToken, setAccessToken] = useState212(null);
-  const [holdings, setHoldings] = useState212([]);
-  const [selectedHolding, setSelectedHolding] = useState212(null);
-  const [selectedAsset, setSelectedAsset] = useState212(null);
-  const [sendAmount, setSendAmount] = useState212("");
-  const [transferIntent, setTransferIntent] = useState212(null);
-  const [mfaCode, setMfaCode] = useState212("");
-  const [mfaError, setMfaError] = useState212(false);
-  const [errorMessage, setErrorMessage] = useState212("");
-  const [isLoading, setIsLoading] = useState212(initialView === "holdings");
-  const [confirmResult, setConfirmResult] = useState212(null);
-  const [showTransferDetails, setShowTransferDetails] = useState212(false);
-  const [transferDepositWalletId, setTransferDepositWalletId] = useState212(void 0);
+  const [view, setView] = useState222(initialView);
+  const [prevView, setPrevView] = useState222(initialView);
+  const [isTransitioning, setIsTransitioning] = useState222(false);
+  const [exchanges, setExchanges] = useState222([]);
+  const [exchangesLoading, setExchangesLoading] = useState222(true);
+  const [selectedExchange, setSelectedExchange] = useState222(null);
+  const [accessToken, setAccessToken] = useState222(null);
+  const [holdings, setHoldings] = useState222([]);
+  const [selectedHolding, setSelectedHolding] = useState222(null);
+  const [selectedAsset, setSelectedAsset] = useState222(null);
+  const [sendAmount, setSendAmount] = useState222("");
+  const [transferIntent, setTransferIntent] = useState222(null);
+  const [mfaCode, setMfaCode] = useState222("");
+  const [mfaError, setMfaError] = useState222(false);
+  const [errorMessage, setErrorMessage] = useState222("");
+  const [isLoading, setIsLoading] = useState222(initialView === "holdings");
+  const [confirmResult, setConfirmResult] = useState222(null);
+  const [showTransferDetails, setShowTransferDetails] = useState222(false);
+  const [transferDepositWalletId, setTransferDepositWalletId] = useState222(void 0);
   const exchangeSupportedCurrencies = useMemo42(() => {
     const set = /* @__PURE__ */ new Set();
     selectedExchange?.supported_currencies.forEach((c) => set.add(c.toLowerCase()));
@@ -21302,12 +21239,12 @@ function CoinbaseConnect({
     } : void 0,
     onDepositError: onTransferError
   });
-  useEffect162(() => {
+  useEffect172(() => {
     onExecutionsChange?.(depositExecutions);
   }, [depositExecutions, onExecutionsChange]);
-  const pollRef = useRef52(null);
-  const popupRef = useRef52(null);
-  const viewRef = useRef52(initialView);
+  const pollRef = useRef62(null);
+  const popupRef = useRef62(null);
+  const viewRef = useRef62(initialView);
   const transitionTo = useCallback22((nextView) => {
     if (nextView === viewRef.current) return;
     setIsTransitioning(true);
@@ -21337,7 +21274,7 @@ function CoinbaseConnect({
     },
     [publishableKey]
   );
-  useEffect162(() => {
+  useEffect172(() => {
     getIntegrationExchanges(publishableKey).then((res) => {
       setExchanges(res.data);
       if (!selectedExchange) {
@@ -21395,7 +21332,7 @@ function CoinbaseConnect({
     },
     [publishableKey, transitionTo, tryRefreshToken]
   );
-  useEffect162(() => {
+  useEffect172(() => {
     return () => {
       if (pollRef.current) clearInterval(pollRef.current);
     };
@@ -21591,6 +21528,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":
@@ -21651,7 +21598,7 @@ function CoinbaseConnect({
           DepositHeader,
           {
             title: t12.title,
-            showBack: true,
+            showBack: canGoBack,
             onBack: handleBack,
             onClose
           }
@@ -21664,7 +21611,7 @@ function CoinbaseConnect({
         DepositHeader,
         {
           title: t12.title,
-          showBack: true,
+          showBack: canGoBack,
           onBack: handleBack,
           onClose
         }
@@ -22376,7 +22323,7 @@ function CoinbaseConnect({
                 borderRadius: components.button.borderRadius,
                 fontFamily: fonts.medium
               },
-              onClick: onDisconnect,
+              onClick: handleDisconnect,
               children: t12.disconnect
             }
           )
@@ -23163,7 +23110,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;
@@ -23223,7 +23170,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(
@@ -23305,9 +23252,9 @@ function DepositsModal({
   themeClass = ""
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [allExecutions, setAllExecutions] = useState222(sessionExecutions);
-  const [selectedExecution, setSelectedExecution] = useState222(null);
-  useEffect182(() => {
+  const [allExecutions, setAllExecutions] = useState232(sessionExecutions);
+  const [selectedExecution, setSelectedExecution] = useState232(null);
+  useEffect192(() => {
     if (!open || !userId) return;
     const fetchExecutions = async () => {
       try {
@@ -23329,7 +23276,7 @@ function DepositsModal({
       clearInterval(pollInterval);
     };
   }, [open, userId, publishableKey, sessionExecutions]);
-  useEffect182(() => {
+  useEffect192(() => {
     if (!open) {
       setSelectedExecution(null);
     }
@@ -23460,10 +23407,10 @@ function TokenSelectorSheet({
 }) {
   const { themeClass, colors: colors2, fonts, components } = useTheme();
   const isDarkMode = themeClass.includes("uf-dark");
-  const [searchQuery, setSearchQuery] = useState232("");
-  const [recentTokens, setRecentTokens] = useState232([]);
-  const [hoveredTokenKey, setHoveredTokenKey] = useState232(null);
-  useEffect192(() => {
+  const [searchQuery, setSearchQuery] = useState242("");
+  const [recentTokens, setRecentTokens] = useState242([]);
+  const [hoveredTokenKey, setHoveredTokenKey] = useState242(null);
+  useEffect202(() => {
     setRecentTokens(getRecentTokens());
   }, []);
   const allOptions = useMemo62(() => {
@@ -23947,11 +23894,11 @@ function useDefaultToken({
   defaultTokenAddress,
   defaultSymbol
 }) {
-  const [token, setToken] = useState242(null);
-  const [chain, setChain] = useState242(null);
-  const [initialSelectionDone, setInitialSelectionDone] = useState242(false);
-  const appliedDefaultsRef = useRef62("");
-  useEffect202(() => {
+  const [token, setToken] = useState252(null);
+  const [chain, setChain] = useState252(null);
+  const [initialSelectionDone, setInitialSelectionDone] = useState252(false);
+  const appliedDefaultsRef = useRef72("");
+  useEffect212(() => {
     if (!tokens.length) return;
     const defaultsKey = `${defaultTokenAddress ?? ""}|${defaultSymbol ?? ""}|${defaultChainType ?? ""}|${defaultChainId ?? ""}`;
     const defaultsChanged = appliedDefaultsRef.current !== defaultsKey;
@@ -23977,7 +23924,7 @@ function useDefaultToken({
     defaultChainId,
     initialSelectionDone
   ]);
-  useEffect202(() => {
+  useEffect212(() => {
     if (!tokens.length || !token) return;
     const currentToken = tokens.find((t12) => t12.symbol === token);
     if (!currentToken || currentToken.chains.length === 0) return;
@@ -24172,7 +24119,7 @@ function GlossaryModal({
   ) });
 }
 function useCopyAddress() {
-  const [copied, setCopied] = useState252(false);
+  const [copied, setCopied] = useState262(false);
   const handleCopy = (address) => {
     if (!address) return;
     navigator.clipboard.writeText(address);
@@ -24182,14 +24129,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);
@@ -24199,7 +24146,7 @@ var TooltipTrigger2 = React272.forwardRef(({ onClick, ...props }, ref) => {
   return /* @__PURE__ */ jsx44(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__ */ jsx44(Portal3, { children: /* @__PURE__ */ jsx44(
     Content22,
@@ -24322,12 +24269,12 @@ function TransferCryptoSingleInput({
 }) {
   const { themeClass, colors: colors2, fonts, components } = useTheme();
   const isDarkMode = themeClass.includes("uf-dark");
-  const [copied, setCopied] = useState27(false);
+  const [copied, setCopied] = useState28(false);
   const { copied: copiedRecipient, handleCopy: handleCopyRecipientAddress } = useCopyAddress();
-  const [glossaryOpen, setGlossaryOpen] = useState27(false);
-  const [detailsExpanded, setDetailsExpanded] = useState27(false);
-  const [depositsModalOpen, setDepositsModalOpen] = useState27(false);
-  const [tokenSelectorOpen, setTokenSelectorOpen] = useState27(false);
+  const [glossaryOpen, setGlossaryOpen] = useState28(false);
+  const [detailsExpanded, setDetailsExpanded] = useState28(false);
+  const [depositsModalOpen, setDepositsModalOpen] = useState28(false);
+  const [tokenSelectorOpen, setTokenSelectorOpen] = useState28(false);
   const { data: tokensResponse, isLoading: tokensLoading } = useSupportedDepositTokens(publishableKey, {
     destination_token_address: destinationTokenAddress,
     destination_chain_id: destinationChainId,
@@ -24400,7 +24347,7 @@ function TransferCryptoSingleInput({
     publishableKey,
     enabled: !!depositAddress && !!recipientAddress
   });
-  useEffect212(() => {
+  useEffect222(() => {
     if (!onSourceTokenChange || !token || !chain || !initialSelectionDone) return;
     const { chainType, chainId } = parseChainKey(chain);
     const matchedToken = supportedTokens.find((t12) => t12.symbol === token);
@@ -24417,7 +24364,7 @@ function TransferCryptoSingleInput({
       isStablecoin: matchedToken?.is_stablecoin ?? false
     });
   }, [token, chain, initialSelectionDone, onSourceTokenChange, supportedTokens]);
-  useEffect212(() => {
+  useEffect222(() => {
     if (onExecutionsChange) {
       onExecutionsChange(depositExecutions);
     }
@@ -24804,7 +24751,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__ */ jsxs422(
     Trigger2,
@@ -24828,7 +24775,7 @@ var SelectTrigger2 = React282.forwardRef(({ className, style, children, ...props
   );
 });
 SelectTrigger2.displayName = Trigger2.displayName;
-var SelectScrollUpButton2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
+var SelectScrollUpButton2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
   ScrollUpButton,
   {
     ref,
@@ -24841,7 +24788,7 @@ var SelectScrollUpButton2 = React282.forwardRef(({ className, ...props }, ref) =
   }
 ));
 SelectScrollUpButton2.displayName = ScrollUpButton.displayName;
-var SelectScrollDownButton2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
+var SelectScrollDownButton2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
   ScrollDownButton,
   {
     ref,
@@ -24854,7 +24801,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__ */ jsx47(Portal4, { children: /* @__PURE__ */ jsxs422(
     Content23,
@@ -24892,7 +24839,7 @@ var SelectContent2 = React282.forwardRef(({ className, style, children, position
   ) });
 });
 SelectContent2.displayName = Content23.displayName;
-var SelectLabel2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
+var SelectLabel2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
   Label,
   {
     ref,
@@ -24904,7 +24851,7 @@ var SelectLabel2 = React282.forwardRef(({ className, ...props }, ref) => /* @__P
   }
 ));
 SelectLabel2.displayName = Label.displayName;
-var SelectItem2 = React282.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsxs422(
+var SelectItem2 = React292.forwardRef(({ className, children, ...props }, ref) => /* @__PURE__ */ jsxs422(
   Item,
   {
     ref,
@@ -24920,7 +24867,7 @@ var SelectItem2 = React282.forwardRef(({ className, children, ...props }, ref) =
   }
 ));
 SelectItem2.displayName = Item.displayName;
-var SelectSeparator2 = React282.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
+var SelectSeparator2 = React292.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsx47(
   Separator,
   {
     ref,
@@ -24956,11 +24903,11 @@ function TransferCryptoDoubleInput({
 }) {
   const { themeClass, colors: colors2, fonts, components } = useTheme();
   const isDarkMode = themeClass.includes("uf-dark");
-  const [copied, setCopied] = useState28(false);
+  const [copied, setCopied] = useState29(false);
   const { copied: copiedRecipient, handleCopy: handleCopyRecipientAddress } = useCopyAddress();
-  const [glossaryOpen, setGlossaryOpen] = useState28(false);
-  const [detailsExpanded, setDetailsExpanded] = useState28(false);
-  const [depositsModalOpen, setDepositsModalOpen] = useState28(false);
+  const [glossaryOpen, setGlossaryOpen] = useState29(false);
+  const [detailsExpanded, setDetailsExpanded] = useState29(false);
+  const [depositsModalOpen, setDepositsModalOpen] = useState29(false);
   const { data: tokensResponse, isLoading: tokensLoading } = useSupportedDepositTokens(publishableKey, {
     destination_token_address: destinationTokenAddress,
     destination_chain_id: destinationChainId,
@@ -25031,7 +24978,7 @@ function TransferCryptoDoubleInput({
     publishableKey,
     enabled: !!depositAddress && !!recipientAddress
   });
-  useEffect222(() => {
+  useEffect232(() => {
     if (onExecutionsChange) {
       onExecutionsChange(depositExecutions);
     }
@@ -26305,13 +26252,13 @@ function ConfirmingView({
   amountReceivedUsdAtSubmission
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [fallbackSettled, setFallbackSettled] = useState292(false);
+  const [fallbackSettled, setFallbackSettled] = useState302(false);
   const hasExecution = executions.length > 0;
   const isCheckoutMode = paymentIntentStatus != null;
   const isPaymentComplete = paymentIntentStatus === "succeeded";
   const amountChanged = amountReceivedUsdAtSubmission != null && amountReceivedUsd != null && amountReceivedUsd !== amountReceivedUsdAtSubmission;
   const piSettled = !isCheckoutMode || isPaymentComplete || amountChanged || fallbackSettled;
-  useEffect232(() => {
+  useEffect242(() => {
     if (!hasExecution || piSettled) return;
     const timeout = setTimeout(() => setFallbackSettled(true), SETTLE_FALLBACK_MS);
     return () => clearTimeout(timeout);
@@ -26584,22 +26531,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);
@@ -26607,20 +26559,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;
@@ -26628,7 +26604,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(() => {
@@ -26765,7 +26741,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);
@@ -26793,7 +26769,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;
@@ -26807,19 +26783,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 () => {
@@ -26846,7 +26822,7 @@ function WalletConnect({
       cancelled = true;
     };
   }, [view, selectedBalance, publishableKey, activeDepositWallet]);
-  React292.useEffect(() => {
+  React302.useEffect(() => {
     if (!activeWalletInfo || !activeDepositWallet) return;
     let cancelled = false;
     setIsLoading(true);
@@ -26879,20 +26855,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;
@@ -26900,7 +26876,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]);
@@ -26948,16 +26924,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 = () => {
@@ -27083,9 +27068,15 @@ function WalletConnect({
       setIsConfirming(false);
     }
   };
+  if (standalone && !autoResolved) {
+    return /* @__PURE__ */ jsxs48("div", { style: viewTransitionStyle, children: [
+      /* @__PURE__ */ jsx54(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
+      /* @__PURE__ */ jsx54("div", { className: "uf-flex uf-flex-col uf-items-center uf-justify-center uf-py-16", children: /* @__PURE__ */ jsx54(LoaderCircle, { className: "uf-w-8 uf-h-8 uf-animate-spin", style: { color: colors2.primary } }) })
+    ] });
+  }
   if (view === "select_wallet") {
     return /* @__PURE__ */ jsxs48("div", { style: viewTransitionStyle, children: [
-      /* @__PURE__ */ jsx54(DepositHeader, { title: "Connect Wallet", showBack: true, onBack: handleBack, onClose }),
+      /* @__PURE__ */ jsx54(DepositHeader, { title: "Connect Wallet", showBack: canGoBack, onBack: handleBack, onClose }),
       /* @__PURE__ */ jsxs48("div", { className: "uf-pb-4", children: [
         /* @__PURE__ */ jsx54("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__ */ jsx54("div", { className: "uf-space-y-2", style: { maxHeight: 330, overflowY: "auto" }, children: availableWallets.map((wallet) => /* @__PURE__ */ jsxs48(
@@ -27248,45 +27239,56 @@ 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]);
-  const [containerEl, setContainerEl] = useState31(null);
+  }, [
+    initialScreen,
+    hideDepositTracker,
+    enableCashApp,
+    enableFiatOnramp,
+    enablePayWithExchange,
+    enableConnectExchange,
+    enableConnectWallet
+  ]);
+  const [containerEl, setContainerEl] = useState32(null);
   const containerCallbackRef = useCallback52((el) => {
     setContainerEl(el);
   }, []);
-  const [view, setView] = useState31(
+  const [view, setView] = useState32(
     effectiveInitialScreen
   );
-  const [coinbaseSkipToHoldings, setCoinbaseSkipToHoldings] = useState31(false);
-  const resetViewTimeoutRef = useRef82(null);
-  const [cardView, setCardView] = useState31(
+  const [coinbaseSkipToHoldings, setCoinbaseSkipToHoldings] = useState32(false);
+  const resetViewTimeoutRef = useRef92(null);
+  const [cardView, setCardView] = useState32(
     "amount"
   );
-  const [exchangeView, setExchangeView] = useState31(
+  const [exchangeView, setExchangeView] = useState32(
     "providers"
   );
-  const [browserWalletModalOpen, setBrowserWalletModalOpen] = useState31(false);
-  const [browserWalletInfo, setBrowserWalletInfo] = useState31(null);
-  const [walletSelectionModalOpen, setWalletSelectionModalOpen] = useState31(false);
-  const [browserWalletChainType, setBrowserWalletChainType] = useState31(() => getStoredWalletChainType());
-  const [quotesCount, setQuotesCount] = useState31(0);
-  const [allExecutions, setAllExecutions] = useState31([]);
-  const [selectedExecution, setSelectedExecution] = useState31(null);
-  const [depositExecutions, setDepositExecutions] = useState31([]);
+  const [browserWalletModalOpen, setBrowserWalletModalOpen] = useState32(false);
+  const [browserWalletInfo, setBrowserWalletInfo] = useState32(null);
+  const [walletSelectionModalOpen, setWalletSelectionModalOpen] = useState32(false);
+  const [browserWalletChainType, setBrowserWalletChainType] = useState32(() => getStoredWalletChainType());
+  const [quotesCount, setQuotesCount] = useState32(0);
+  const [allExecutions, setAllExecutions] = useState32([]);
+  const [selectedExecution, setSelectedExecution] = useState32(null);
+  const [depositExecutions, setDepositExecutions] = useState32([]);
   const isMobileView = useIsMobileViewport();
-  const [integrationExchanges, setIntegrationExchanges] = useState31([]);
-  useEffect25(() => {
+  const [integrationExchanges, setIntegrationExchanges] = useState32([]);
+  useEffect26(() => {
     if (!enableConnectExchange || !open) return;
     getIntegrationExchanges(publishableKey).then((res) => setIntegrationExchanges(res.data)).catch(() => {
     });
   }, [enableConnectExchange, open, publishableKey]);
-  const [connectedExchange, setConnectedExchange] = useState31(() => {
+  const [connectedExchange, setConnectedExchange] = useState32(() => {
     if (!enableConnectExchange) return null;
     const stored = getStoredIntegrationToken(IntegrationProvider.COINBASE);
     if (!stored) return null;
     return { name: "Coinbase", iconUrl: void 0, balanceUsd: null, isLoading: true };
   });
-  useEffect25(() => {
+  useEffect26(() => {
     if (!enableConnectExchange || !open || view !== "main") return;
     const stored = getStoredIntegrationToken(IntegrationProvider.COINBASE);
     if (!stored) {
@@ -27323,7 +27325,7 @@ function DepositModal({
       }
     });
   }, [enableConnectExchange, open, view, publishableKey]);
-  useEffect25(() => {
+  useEffect26(() => {
     if (!connectedExchange || integrationExchanges.length === 0) return;
     const cbExchange = integrationExchanges.find(
       (e) => e.service_provider === IntegrationProvider.COINBASE
@@ -27345,10 +27347,10 @@ function DepositModal({
     // Only fetch when modal is open
   });
   const wallets = depositAddressResponse?.data ?? [];
-  const [resolvedTheme, setResolvedTheme] = useState31(
+  const [resolvedTheme, setResolvedTheme] = useState32(
     theme === "auto" ? "dark" : theme
   );
-  useEffect25(() => {
+  useEffect26(() => {
     if (theme === "auto") {
       const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mediaQuery.matches ? "dark" : "light");
@@ -27367,12 +27369,18 @@ function DepositModal({
   });
   const showPayWithExchange = enablePayWithExchange ?? projectConfig?.pay_with_exchange?.enabled ?? true;
   const showFiatOnramp = enableFiatOnramp ?? projectConfig?.fiat_onramp?.enabled ?? true;
-  useEffect25(() => {
+  useEffect26(() => {
     if (view === "card" && !showFiatOnramp) {
       setView("main");
       setCardView("amount");
     }
   }, [view, showFiatOnramp]);
+  useEffect26(() => {
+    if (view === "exchange" && !showPayWithExchange) {
+      setView("main");
+      setExchangeView("providers");
+    }
+  }, [view, showPayWithExchange]);
   const { exchanges, isLoading: exchangesLoading } = useExchanges({
     publishableKey,
     enabled: open && showPayWithExchange
@@ -27387,7 +27395,7 @@ function DepositModal({
     subdivisionCode: userIpInfo?.subdivisionCode ?? void 0,
     enabled: open && !isLoadingIp
   });
-  useEffect25(() => {
+  useEffect26(() => {
     if (view !== "tracker" || !userId) return;
     const fetchExecutions = async () => {
       try {
@@ -27408,7 +27416,7 @@ function DepositModal({
       clearInterval(pollInterval);
     };
   }, [view, userId, publishableKey]);
-  useEffect25(() => {
+  useEffect26(() => {
     if (view !== "tracker") {
       setSelectedExecution(null);
     }
@@ -27492,7 +27500,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);
@@ -27501,7 +27509,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);
@@ -27513,6 +27521,7 @@ function DepositModal({
       setCardView("amount");
       setExchangeView("providers");
       setBrowserWalletInfo(null);
+      setCoinbaseSkipToHoldings(false);
       resetViewTimeoutRef.current = null;
     }, 200);
   };
@@ -27527,8 +27536,9 @@ function DepositModal({
     setExchangeView("providers");
     setBrowserWalletInfo(null);
     setSelectedExecution(null);
+    setCoinbaseSkipToHoldings(false);
   }, [open, effectiveInitialScreen]);
-  useEffect25(
+  useEffect26(
     () => () => {
       if (resetViewTimeoutRef.current) {
         clearTimeout(resetViewTimeoutRef.current);
@@ -27536,8 +27546,8 @@ function DepositModal({
     },
     []
   );
-  const [cashAppView, setCashAppView] = useState31("amount");
-  const [cashAppAmount, setCashAppAmount] = useState31("");
+  const [cashAppView, setCashAppView] = useState32("amount");
+  const [cashAppAmount, setCashAppAmount] = useState32("");
   const handleBack = () => {
     if (view === "card" && cardView === "quotes") {
       setCardView("amount");
@@ -27886,7 +27896,7 @@ function DepositModal({
               DepositHeader,
               {
                 title: payWithExchangeTitle,
-                showBack: true,
+                showBack: exchangeView === "pending" || sessionOpenedFromMenu,
                 onBack: handleBack,
                 onClose: handleClose
               }
@@ -27940,6 +27950,7 @@ function DepositModal({
                 onClose: handleClose,
                 onDisconnect: handleExchangeDisconnect,
                 skipToHoldings: coinbaseSkipToHoldings,
+                canGoBack: sessionOpenedFromMenu,
                 onExecutionsChange: setDepositExecutions
               }
             ),
@@ -27977,7 +27988,9 @@ function DepositModal({
                   setBrowserWalletChainType(dw.chain_type === "solana" ? "solana" : "ethereum");
                 },
                 onBack: handleBack,
-                onClose: handleClose
+                onClose: handleClose,
+                canGoBack: sessionOpenedFromMenu,
+                depositWalletsLoading: walletsLoading
               }
             ),
             depositPoweredByFooter
@@ -27986,7 +27999,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
               }
@@ -28088,19 +28101,19 @@ function CheckoutModal({
   onCheckoutError
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [view, setView] = useState32("main");
-  const resetViewTimeoutRef = useRef92(
+  const [view, setView] = useState33("main");
+  const resetViewTimeoutRef = useRef102(
     null
   );
-  const [browserWalletModalOpen, setBrowserWalletModalOpen] = useState32(false);
-  const [browserWalletInfo, setBrowserWalletInfo] = useState32(null);
-  const [walletSelectionModalOpen, setWalletSelectionModalOpen] = useState32(false);
-  const [browserWalletChainType, setBrowserWalletChainType] = useState32(() => getStoredWalletChainType());
+  const [browserWalletModalOpen, setBrowserWalletModalOpen] = useState33(false);
+  const [browserWalletInfo, setBrowserWalletInfo] = useState33(null);
+  const [walletSelectionModalOpen, setWalletSelectionModalOpen] = useState33(false);
+  const [browserWalletChainType, setBrowserWalletChainType] = useState33(() => getStoredWalletChainType());
   const isMobileView = useIsMobileViewport();
-  const [resolvedTheme, setResolvedTheme] = useState32(
+  const [resolvedTheme, setResolvedTheme] = useState33(
     theme === "auto" ? "dark" : theme
   );
-  useEffect262(() => {
+  useEffect272(() => {
     if (theme === "auto") {
       const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mediaQuery.matches ? "dark" : "light");
@@ -28128,8 +28141,8 @@ function CheckoutModal({
     publishableKey,
     enabled: open
   });
-  const prevStatusRef = useRef92(null);
-  useEffect262(() => {
+  const prevStatusRef = useRef102(null);
+  useEffect272(() => {
     if (!paymentIntent) return;
     const prev = prevStatusRef.current;
     prevStatusRef.current = paymentIntent.status;
@@ -28175,7 +28188,7 @@ function CheckoutModal({
     const remaining = total - received;
     return remaining > 0n ? remaining.toString() : "0";
   }, [paymentIntent]);
-  const [selectedSource, setSelectedSource] = useState32(null);
+  const [selectedSource, setSelectedSource] = useState33(null);
   const remainingDestinationAmount = useMemo112(() => {
     if (!paymentIntent) return "0";
     const remaining = BigInt(paymentIntent.destination_amount) - BigInt(paymentIntent.destination_amount_received);
@@ -28295,7 +28308,7 @@ function CheckoutModal({
     setView("main");
     setBrowserWalletInfo(null);
   }, [open]);
-  useEffect262(
+  useEffect272(
     () => () => {
       if (resetViewTimeoutRef.current) {
         clearTimeout(resetViewTimeoutRef.current);
@@ -28831,20 +28844,20 @@ function useWithdrawPolling({
   onWithdrawSuccess,
   onWithdrawError
 }) {
-  const [executions, setExecutions] = useState33([]);
-  const [isPolling, setIsPolling] = useState33(false);
-  const enabledAtRef = useRef102(/* @__PURE__ */ new Date());
-  const trackedRef = useRef102(/* @__PURE__ */ new Map());
-  const prevEnabledRef = useRef102(false);
-  const onSuccessRef = useRef102(onWithdrawSuccess);
-  const onErrorRef = useRef102(onWithdrawError);
-  useEffect272(() => {
+  const [executions, setExecutions] = useState34([]);
+  const [isPolling, setIsPolling] = useState34(false);
+  const enabledAtRef = useRef112(/* @__PURE__ */ new Date());
+  const trackedRef = useRef112(/* @__PURE__ */ new Map());
+  const prevEnabledRef = useRef112(false);
+  const onSuccessRef = useRef112(onWithdrawSuccess);
+  const onErrorRef = useRef112(onWithdrawError);
+  useEffect282(() => {
     onSuccessRef.current = onWithdrawSuccess;
   }, [onWithdrawSuccess]);
-  useEffect272(() => {
+  useEffect282(() => {
     onErrorRef.current = onWithdrawError;
   }, [onWithdrawError]);
-  useEffect272(() => {
+  useEffect282(() => {
     if (enabled && !prevEnabledRef.current) {
       enabledAtRef.current = /* @__PURE__ */ new Date();
       trackedRef.current.clear();
@@ -28854,7 +28867,7 @@ function useWithdrawPolling({
     }
     prevEnabledRef.current = enabled;
   }, [enabled]);
-  useEffect272(() => {
+  useEffect282(() => {
     if (!userId || !enabled) return;
     const enabledAt = enabledAtRef.current;
     const poll = async () => {
@@ -28916,7 +28929,7 @@ function useWithdrawPolling({
       setIsPolling(false);
     };
   }, [userId, publishableKey, enabled]);
-  useEffect272(() => {
+  useEffect282(() => {
     if (!enabled || !depositWalletId) return;
     const trigger = async () => {
       try {
@@ -29288,27 +29301,27 @@ function WithdrawForm({
   footerLeft
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [recipientAddress, setRecipientAddress] = useState34(recipientAddressProp || "");
-  const [amount, setAmount] = useState34("");
-  const [inputUnit, setInputUnit] = useState34("fiat");
-  const [isSubmitting, setIsSubmitting] = useState34(false);
-  const [submitError, setSubmitError] = useState34(null);
-  const [detailsExpanded, setDetailsExpanded] = useState34(false);
-  const [glossaryOpen, setGlossaryOpen] = useState34(false);
-  const [isMaxed, setIsMaxed] = useState34(false);
-  useEffect282(() => {
+  const [recipientAddress, setRecipientAddress] = useState35(recipientAddressProp || "");
+  const [amount, setAmount] = useState35("");
+  const [inputUnit, setInputUnit] = useState35("fiat");
+  const [isSubmitting, setIsSubmitting] = useState35(false);
+  const [submitError, setSubmitError] = useState35(null);
+  const [detailsExpanded, setDetailsExpanded] = useState35(false);
+  const [glossaryOpen, setGlossaryOpen] = useState35(false);
+  const [isMaxed, setIsMaxed] = useState35(false);
+  useEffect292(() => {
     setRecipientAddress(recipientAddressProp || "");
     setAmount("");
     setInputUnit("fiat");
     setSubmitError(null);
     setIsMaxed(false);
   }, [recipientAddressProp]);
-  useEffect282(() => {
+  useEffect292(() => {
     setIsMaxed(false);
   }, [balanceData?.balanceBaseUnit]);
   const trimmedAddress = recipientAddress.trim();
-  const [debouncedAddress, setDebouncedAddress] = useState34(trimmedAddress);
-  useEffect282(() => {
+  const [debouncedAddress, setDebouncedAddress] = useState35(trimmedAddress);
+  useEffect292(() => {
     const id = setTimeout(() => setDebouncedAddress(trimmedAddress), 500);
     return () => clearTimeout(id);
   }, [trimmedAddress]);
@@ -29950,9 +29963,9 @@ function WithdrawConfirmingView({
   onViewTracker
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [showButton, setShowButton] = useState35(false);
+  const [showButton, setShowButton] = useState36(false);
   const latestExecution = executions.length > 0 ? executions[executions.length - 1] : null;
-  useEffect292(() => {
+  useEffect302(() => {
     if (latestExecution) return;
     const timer = setTimeout(() => setShowButton(true), SHOW_BUTTON_DELAY_MS);
     return () => clearTimeout(timer);
@@ -30109,14 +30122,14 @@ function WithdrawModal({
   hideOverlay = false
 }) {
   const { colors: colors2, fonts, components } = useTheme();
-  const [containerEl, setContainerEl] = useState36(null);
+  const [containerEl, setContainerEl] = useState37(null);
   const containerCallbackRef = useCallback82((el) => {
     setContainerEl(el);
   }, []);
-  const [resolvedTheme, setResolvedTheme] = useState36(
+  const [resolvedTheme, setResolvedTheme] = useState37(
     theme === "auto" ? "dark" : theme
   );
-  useEffect30(() => {
+  useEffect31(() => {
     if (theme === "auto") {
       const mq = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mq.matches ? "dark" : "light");
@@ -30160,10 +30173,10 @@ function WithdrawModal({
   });
   const selectedToken = selectedTokenSymbol ? destinationTokens.find((t12) => t12.symbol === selectedTokenSymbol) ?? null : null;
   const selectedChain = selectedToken && selectedChainKey ? selectedToken.chains.find((c) => getChainKey5(c.chain_id, c.chain_type) === selectedChainKey) ?? null : null;
-  const [view, setView] = useState36("form");
-  const [withdrawDepositWalletId, setWithdrawDepositWalletId] = useState36();
-  const [selectedExecution, setSelectedExecution] = useState36(null);
-  const [submittedTxInfo, setSubmittedTxInfo] = useState36(null);
+  const [view, setView] = useState37("form");
+  const [withdrawDepositWalletId, setWithdrawDepositWalletId] = useState37();
+  const [selectedExecution, setSelectedExecution] = useState37(null);
+  const [submittedTxInfo, setSubmittedTxInfo] = useState37(null);
   const { executions: realtimeExecutions } = useWithdrawPolling({
     userId: externalUserId,
     publishableKey,
@@ -30202,7 +30215,7 @@ function WithdrawModal({
     setSubmittedTxInfo(txInfo);
     setView("confirming");
   }, []);
-  const resetViewTimeoutRef = useRef112(null);
+  const resetViewTimeoutRef = useRef122(null);
   const handleClose = useCallback82(() => {
     onOpenChange(false);
     if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
@@ -30225,7 +30238,7 @@ function WithdrawModal({
     setSubmittedTxInfo(null);
     setWithdrawDepositWalletId(void 0);
   }, [open]);
-  useEffect30(() => () => {
+  useEffect31(() => () => {
     if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
   }, []);
   const handleTokenSymbolChange = useCallback82((symbol) => {
@@ -30356,20 +30369,20 @@ function UnifoldProvider2({
   queryClient,
   config
 }) {
-  const [isOpen, setIsOpen] = useState30(false);
-  const [depositConfig, setDepositConfig] = useState30(
+  const [isOpen, setIsOpen] = useState31(false);
+  const [depositConfig, setDepositConfig] = useState31(
     null
   );
-  const [isCheckoutOpen, setIsCheckoutOpen] = useState30(false);
-  const [checkoutConfig, setCheckoutConfig] = useState30(
+  const [isCheckoutOpen, setIsCheckoutOpen] = useState31(false);
+  const [checkoutConfig, setCheckoutConfig] = useState31(
     null
   );
-  const [isWithdrawOpen, setIsWithdrawOpen] = useState30(false);
-  const [withdrawConfig, setWithdrawConfig] = useState30(
+  const [isWithdrawOpen, setIsWithdrawOpen] = useState31(false);
+  const [withdrawConfig, setWithdrawConfig] = useState31(
     null
   );
   const [resolvedTheme, setResolvedTheme] = React38.useState("dark");
-  useEffect31(() => {
+  useEffect33(() => {
     if (publishableKey) {
       setApiConfig({ publishableKey });
     }