@swype-org/react-sdk 0.1.300 → 0.1.329

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createContext, useRef, useState, useCallback, useMemo, useContext, useEffect, useReducer, Component } from 'react';
 import { PrivyProvider, usePrivy, useLoginWithOAuth, useLoginWithEmail, useLoginWithSms } from '@privy-io/react-auth';
 import { createConfig, http, WagmiProvider, useConfig, useConnect, useSwitchChain } from 'wagmi';
-import { mainnet, arbitrum, base, polygon, bsc } from 'wagmi/chains';
+import { mainnet, arbitrum, base, polygon, bsc, baseSepolia } from 'wagmi/chains';
 import { injected } from 'wagmi/connectors';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -75,14 +75,16 @@ function getTheme(mode) {
 }
 var BLINK_PRIVY_APP_ID = "cmlil87uv004n0ck0blwumwek";
 var wagmiConfig = createConfig({
-  chains: [mainnet, arbitrum, base, polygon, bsc],
+  // baseSepolia: guest/testnet flows (e.g. smokebox e2e) call switchChain to the source chain from the API.
+  chains: [mainnet, arbitrum, base, polygon, bsc, baseSepolia],
   connectors: [injected({ shimDisconnect: true, unstable_shimAsyncInject: 2e3 })],
   transports: {
     [mainnet.id]: http(),
     [arbitrum.id]: http(),
     [base.id]: http(),
     [polygon.id]: http(),
-    [bsc.id]: http()
+    [bsc.id]: http(),
+    [baseSepolia.id]: http()
   }
 });
 var BlinkContext = createContext(null);
@@ -492,6 +494,7 @@ __export(api_exports, {
   getGuestTransfer: () => getGuestTransfer,
   getTransferByGuestToken: () => getTransferByGuestToken,
   postGuestTransferFeeQuote: () => postGuestTransferFeeQuote,
+  postTransferQuote: () => postTransferQuote,
   putGuestTransferSender: () => putGuestTransferSender,
   registerPasskey: () => registerPasskey,
   reportActionCompletion: () => reportActionCompletion,
@@ -607,7 +610,8 @@ async function createTransfer(apiBaseUrl, token, params) {
     amount: {
       amount: params.amount,
       currency: params.currency ?? "USD"
-    }
+    },
+    ...params.quoteId ? { quoteId: params.quoteId } : {}
   };
   const res = await fetch(`${apiBaseUrl}/v1/transfers`, {
     method: "POST",
@@ -620,6 +624,28 @@ async function createTransfer(apiBaseUrl, token, params) {
   if (!res.ok) await throwApiError(res);
   return await res.json();
 }
+async function postTransferQuote(apiBaseUrl, bearerToken, params) {
+  const body = {
+    walletId: params.walletId,
+    ...params.sourceTokenAddress ? { sourceTokenAddress: params.sourceTokenAddress } : {},
+    destination: {
+      chainId: params.destination.chainId,
+      token: { address: params.destination.token.address },
+      address: params.destination.address
+    },
+    amount: params.amount
+  };
+  const res = await fetch(`${apiBaseUrl}/v1/transfers/quotes`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${bearerToken}`
+    },
+    body: JSON.stringify(body)
+  });
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
+}
 async function fetchMerchantPublicKey(apiBaseUrl, merchantId) {
   const res = await fetch(
     `${apiBaseUrl}/v1/merchants/${encodeURIComponent(merchantId)}/public-key`
@@ -961,6 +987,23 @@ function normalizeSignature(sig) {
   );
 }
 
+// src/authorizationErrors.ts
+var AuthorizationSessionCancelledError = class extends Error {
+  constructor() {
+    super("Authorization session cancelled");
+    this.name = "AuthorizationSessionCancelledError";
+  }
+};
+function isAuthorizationSessionCancelled(err) {
+  if (err instanceof AuthorizationSessionCancelledError) return true;
+  return typeof err === "object" && err !== null && "name" in err && err.name === "AuthorizationSessionCancelledError";
+}
+function isUserDismissedAuthorizationError(err) {
+  if (!(err instanceof Error)) return false;
+  const m = err.message.toLowerCase();
+  return m.includes("authorization session aborted") || m.includes("aborted by user");
+}
+
 // src/hooks/authorizationExecutor.ts
 var WALLET_CLIENT_MAX_ATTEMPTS = 25;
 var WALLET_CLIENT_POLL_MS = 400;
@@ -1274,39 +1317,80 @@ function useAuthorizationExecutor(options) {
   const [error, setError] = useState(null);
   const [currentAction, setCurrentAction] = useState(null);
   const executingRef = useRef(false);
+  const oneTapPauseActiveRef = useRef(false);
+  const sessionStackRef = useRef([]);
+  const [authorizationSessionStackDepth, setAuthorizationSessionStackDepth] = useState(0);
   const [pendingSelectSource, setPendingSelectSource] = useState(null);
   const selectSourceResolverRef = useRef(null);
+  const selectSourceRejectRef = useRef(null);
   const sessionIdRef = useRef(null);
   const resolveSelectSource = useCallback((selection) => {
     if (selectSourceResolverRef.current) {
       selectSourceResolverRef.current(selection);
       selectSourceResolverRef.current = null;
+      selectSourceRejectRef.current = null;
       setPendingSelectSource(null);
     }
   }, []);
   const waitForSelection = useCallback(
-    (action) => new Promise((resolve) => {
-      selectSourceResolverRef.current = resolve;
+    (action) => new Promise((resolve, reject) => {
+      selectSourceResolverRef.current = (selection) => {
+        resolve(selection);
+        selectSourceResolverRef.current = null;
+        selectSourceRejectRef.current = null;
+      };
+      selectSourceRejectRef.current = reject;
       setPendingSelectSource(action);
     }),
     []
   );
   const [pendingOneTapSetup, setPendingOneTapSetup] = useState(null);
   const oneTapSetupResolverRef = useRef(null);
+  const oneTapSetupRejectRef = useRef(null);
   const resolveOneTapSetup = useCallback(() => {
     if (oneTapSetupResolverRef.current) {
       oneTapSetupResolverRef.current();
       oneTapSetupResolverRef.current = null;
+      oneTapSetupRejectRef.current = null;
       setPendingOneTapSetup(null);
     }
   }, []);
   const waitForOneTapSetup = useCallback(
-    (action) => new Promise((resolve) => {
-      oneTapSetupResolverRef.current = resolve;
+    (action) => new Promise((resolve, reject) => {
+      oneTapPauseActiveRef.current = true;
+      oneTapSetupResolverRef.current = () => {
+        oneTapPauseActiveRef.current = false;
+        resolve();
+        oneTapSetupResolverRef.current = null;
+        oneTapSetupRejectRef.current = null;
+      };
+      oneTapSetupRejectRef.current = (reason) => {
+        oneTapPauseActiveRef.current = false;
+        reject(reason);
+      };
       setPendingOneTapSetup(action);
     }),
     []
   );
+  const cancelPendingExecution = useCallback(() => {
+    if (selectSourceRejectRef.current) {
+      selectSourceRejectRef.current(new AuthorizationSessionCancelledError());
+      selectSourceRejectRef.current = null;
+      selectSourceResolverRef.current = null;
+      setPendingSelectSource(null);
+    }
+    if (oneTapSetupRejectRef.current) {
+      oneTapPauseActiveRef.current = false;
+      oneTapSetupRejectRef.current(new AuthorizationSessionCancelledError());
+      oneTapSetupRejectRef.current = null;
+      oneTapSetupResolverRef.current = null;
+      setPendingOneTapSetup(null);
+    }
+    setError(null);
+    setCurrentAction(null);
+    setExecuting(false);
+    executingRef.current = false;
+  }, []);
   const dispatchAction = useCallback(
     async (action) => {
       setCurrentAction(action);
@@ -1341,20 +1425,26 @@ function useAuthorizationExecutor(options) {
   );
   const executeSessionById = useCallback(
     async (sessionId) => {
-      if (executingRef.current) return;
-      executingRef.current = true;
       if (!sessionId) {
-        executingRef.current = false;
         throw new Error("No authorization session id provided.");
       }
       if (!apiBaseUrl) {
-        executingRef.current = false;
         throw new Error("Missing apiBaseUrl. Provide useAuthorizationExecutor({ apiBaseUrl }) or wrap in <BlinkProvider>.");
       }
-      sessionIdRef.current = sessionId;
-      setExecuting(true);
+      const allowNested = executingRef.current && oneTapPauseActiveRef.current;
+      if (executingRef.current && !allowNested) {
+        return;
+      }
+      const isNestedRun = allowNested;
+      if (!isNestedRun) {
+        executingRef.current = true;
+        setExecuting(true);
+        setResults([]);
+      }
       setError(null);
-      setResults([]);
+      sessionStackRef.current.push(sessionId);
+      setAuthorizationSessionStackDepth(sessionStackRef.current.length);
+      sessionIdRef.current = sessionId;
       try {
         let session = await fetchAuthorizationSession(apiBaseUrl, sessionId);
         const allResults = [];
@@ -1390,13 +1480,23 @@ function useAuthorizationExecutor(options) {
           pending = getPendingActions(session, completedIds);
         }
       } catch (err) {
-        const msg = err instanceof Error ? err.message : "Authorization failed";
-        setError(msg);
+        if (isAuthorizationSessionCancelled(err)) {
+          setError(null);
+        } else {
+          const msg = err instanceof Error ? err.message : "Authorization failed";
+          setError(msg);
+        }
         throw err;
       } finally {
+        sessionStackRef.current.pop();
+        const depth = sessionStackRef.current.length;
+        setAuthorizationSessionStackDepth(depth);
+        sessionIdRef.current = depth > 0 ? sessionStackRef.current[depth - 1] : null;
         setCurrentAction(null);
-        setExecuting(false);
-        executingRef.current = false;
+        if (depth === 0) {
+          setExecuting(false);
+          executingRef.current = false;
+        }
       }
     },
     [apiBaseUrl, dispatchAction]
@@ -1410,7 +1510,9 @@ function useAuthorizationExecutor(options) {
     resolveSelectSource,
     pendingOneTapSetup,
     resolveOneTapSetup,
-    executeSessionById
+    executeSessionById,
+    cancelPendingExecution,
+    authorizationSessionStackDepth
   };
 }
 var TRANSFER_SIGN_MAX_POLLS = 60;
@@ -1640,6 +1742,37 @@ function getPreferredDepositWallet(account, transferAmount) {
 function getDepositEligibleAccounts(accounts) {
   return accounts.filter((account) => getAddressableWallets(account).length > 0);
 }
+function resolveDepositSelectionAfterRefresh(accounts, transferAmount, prev) {
+  const { selectedAccountId, selectedWalletId, selectedTokenSymbol } = prev;
+  if (selectedAccountId && selectedWalletId) {
+    const acct = accounts.find((a) => a.id === selectedAccountId);
+    const wallet = acct?.wallets.find((w) => w.id === selectedWalletId);
+    if (wallet) {
+      if (selectedTokenSymbol) {
+        const hasToken = wallet.sources.some((s) => s.token.symbol === selectedTokenSymbol);
+        if (hasToken) {
+          return {
+            defaults: { accountId: selectedAccountId, walletId: selectedWalletId },
+            resetSelectedTokenSymbol: false
+          };
+        }
+        const fallback = resolveDepositSelection(accounts, transferAmount, selectedAccountId);
+        return {
+          defaults: fallback,
+          resetSelectedTokenSymbol: true
+        };
+      }
+      return {
+        defaults: { accountId: selectedAccountId, walletId: selectedWalletId },
+        resetSelectedTokenSymbol: false
+      };
+    }
+  }
+  return {
+    defaults: resolveDepositSelection(accounts, transferAmount, selectedAccountId),
+    resetSelectedTokenSymbol: false
+  };
+}
 function resolveDepositSelection(accounts, transferAmount, selectedAccountId) {
   const eligibleAccounts = getDepositEligibleAccounts(accounts);
   if (eligibleAccounts.length === 0) return null;
@@ -1706,6 +1839,32 @@ function buildSelectSourceChoices(options) {
     tokens: chain.tokens.filter((t) => t.balance > 0).sort((a, b) => b.balance - a.balance)
   })).filter((chain) => chain.tokens.length > 0).sort((a, b) => b.balance - a.balance);
 }
+function resolveSelectSourceAvailableBalance(choices, options, chainName, tokenSymbol, recommended) {
+  const chain = chainName.trim();
+  const token = tokenSymbol.trim();
+  if (chain && token) {
+    const chainChoice = choices.find((c) => c.chainName === chain);
+    const row = chainChoice?.tokens.find((t) => t.tokenSymbol === token);
+    if (row !== void 0) return row.balance;
+    const direct = options.find(
+      (opt) => opt.chainName === chain && opt.tokenSymbol === token
+    );
+    if (direct) return parseRawBalance(direct.rawBalance, direct.decimals);
+    return 0;
+  }
+  if (recommended) {
+    const match = options.find(
+      (opt) => opt.chainName === recommended.chainName && opt.tokenSymbol === recommended.tokenSymbol
+    );
+    if (match) return parseRawBalance(match.rawBalance, match.decimals);
+  }
+  let max = 0;
+  for (const opt of options) {
+    const bal = parseRawBalance(opt.rawBalance, opt.decimals);
+    if (bal > max) max = bal;
+  }
+  return max;
+}
 
 // src/walletFlow.ts
 var MOBILE_USER_AGENT_PATTERN = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i;
@@ -1790,10 +1949,11 @@ function resolvePhase(state) {
   const walletPickerSwitchEligible = currentPhase.step === "wallet-picker" && currentPhase.reason === "switch" && !state.creatingTransfer && !(state.mobileFlow && state.deeplinkUri);
   const missingActivePasskeyCredential = state.passkeyConfigLoaded && !state.activeCredentialId;
   const shouldPromptPasskeyVerification = missingActivePasskeyCredential && state.knownCredentialIds.length > 0 && state.passkeyPopupNeeded;
+  const guestPreauthClaimPending = state.guestPreauthAccountId != null && state.guestSessionToken != null && state.privyAuthenticated && state.activeCredentialId != null && !state.guestPreauthSetupCompletePending && !state.error;
   const branchGuestSetupComplete = state.guestPreauthSetupCompletePending && state.privyReady && state.privyAuthenticated;
   const branchKeepGuestPreauthPin = !branchGuestSetupComplete && guestPreauthPinsCurrentPhase;
   const branchGuestPostPayLogin = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && guestPostPayLogin;
-  const branchCompleted = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && transferCompleted && !state.verificationTarget && !needsPasskeyBootstrap;
+  const branchCompleted = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && transferCompleted && !state.verificationTarget && !needsPasskeyBootstrap && !guestPreauthClaimPending && !state.loginRequested;
   const branchFailed = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && state.transfer?.status === "FAILED";
   const branchProcessing = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && (state.creatingTransfer || isTransferAwaitingCompletion(state.transfer));
   const branchStandardDesktopInlineOpenWallet = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && state.standardDesktopInlineOpenWallet && state.privyAuthenticated && state.activeCredentialId != null && state.selectedAccountId != null && !state.loginRequested && !state.guestPreauthorizing;
@@ -1809,7 +1969,7 @@ function resolvePhase(state) {
   const branchLoginRequested = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && state.loginRequested;
   const branchPasskeyVerify = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && shouldPromptPasskeyVerification;
   const branchPasskeyCreate = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && missingActivePasskeyCredential;
-  const branchGuestPreauthClaiming = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && state.guestPreauthAccountId != null && state.guestSessionToken != null && state.privyAuthenticated && state.activeCredentialId != null && !state.guestPreauthSetupCompletePending && !state.error;
+  const branchGuestPreauthClaiming = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && guestPreauthClaimPending;
   const branchDataLoading = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchGuestPreauthClaiming && state.loadingData && state.activeCredentialId != null && hasActiveWallet(state.accounts);
   const branchWalletPickerLink = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchGuestPreauthClaiming && !branchDataLoading && state.activeCredentialId != null && !hasActiveWallet(state.accounts) && !state.mobileFlow;
   const branchDeposit = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchStandardDesktopInlineOpenWallet && !branchKeepGuestPreauthDesktopOpenWallet && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchGuestPreauthClaiming && !branchDataLoading && !branchWalletPickerLink && state.activeCredentialId != null && hasActiveWallet(state.accounts) && !state.loadingData;
@@ -1980,6 +2140,7 @@ function createInitialState(config) {
     selectedAccountId: null,
     selectedWalletId: null,
     selectedTokenSymbol: null,
+    savedSelection: null,
     amount: config.depositAmount != null ? config.depositAmount.toString() : "",
     transfer: null,
     creatingTransfer: false,
@@ -2006,7 +2167,8 @@ function createInitialState(config) {
     standardDesktopInlineOpenWallet: false,
     guestPreauthSetupCompletePending: false,
     privyReady: false,
-    privyAuthenticated: false
+    privyAuthenticated: false,
+    lastResumedAt: 0
   };
 }
 function paymentReducer(state, action) {
@@ -2104,6 +2266,9 @@ function applyAction(state, action) {
         next.mobileFlow = false;
         next.deeplinkUri = null;
       }
+      if (action.resetSelectedTokenSymbol) {
+        next.selectedTokenSymbol = null;
+      }
       return next;
     }
     case "DATA_LOAD_END":
@@ -2118,8 +2283,43 @@ function applyAction(state, action) {
         next.selectedAccountId = action.defaults.accountId;
         next.selectedWalletId = action.defaults.walletId;
       }
+      if (action.resetSelectedTokenSymbol) {
+        next.selectedTokenSymbol = null;
+      }
       return next;
     }
+    case "SAVE_SELECTION":
+      return {
+        ...state,
+        savedSelection: {
+          selectedProviderId: state.selectedProviderId,
+          selectedAccountId: state.selectedAccountId,
+          selectedWalletId: state.selectedWalletId,
+          selectedTokenSymbol: state.selectedTokenSymbol
+        }
+      };
+    case "RESTORE_SELECTION": {
+      const snap = state.savedSelection;
+      if (!snap) {
+        return {
+          ...state,
+          error: null,
+          increasingLimit: false
+        };
+      }
+      return {
+        ...state,
+        selectedProviderId: snap.selectedProviderId,
+        selectedAccountId: snap.selectedAccountId,
+        selectedWalletId: snap.selectedWalletId,
+        selectedTokenSymbol: snap.selectedTokenSymbol,
+        savedSelection: null,
+        error: null,
+        increasingLimit: false
+      };
+    }
+    case "DISCARD_SAVED_SELECTION":
+      return { ...state, savedSelection: null };
     // ── Source selection ──────────────────────────────────────────
     case "SELECT_PROVIDER":
       return {
@@ -2414,7 +2614,8 @@ function applyAction(state, action) {
         oneTapLimitSavedDuringSetup: false,
         guestPreauthorizing: false,
         guestPreauthSetupCompletePending: false,
-        standardDesktopInlineOpenWallet: false
+        standardDesktopInlineOpenWallet: false,
+        savedSelection: null
       };
     case "LOGOUT":
       return {
@@ -2437,6 +2638,8 @@ function applyAction(state, action) {
       };
     case "SYNC_AMOUNT":
       return { ...state, amount: action.amount };
+    case "PAGE_RESUMED":
+      return { ...state, lastResumedAt: Date.now() };
     default:
       return state;
   }
@@ -2526,6 +2729,41 @@ function screenForPhase(phase) {
       return "guest-preauth-linking";
   }
 }
+
+// src/depositTokenSelection.ts
+function tokenOptionsForLinkedAccount(selectedAccount, chains) {
+  if (!selectedAccount) return [];
+  return selectedAccount.wallets.flatMap((w) => {
+    const evmChainId = chains.find((c) => c.name === w.chain.name)?.commonId ?? void 0;
+    return w.sources.filter((s) => s.balance.total.amount > 0).map((s) => ({
+      symbol: s.token.symbol,
+      chainName: w.chain.name,
+      balance: s.balance.available.amount,
+      walletId: w.id,
+      status: s.token.status,
+      tokenAddress: s.address,
+      chainId: evmChainId
+    }));
+  });
+}
+function handleInlineTokenSelection(handlers, chains, selectedAccount, symbol, chainName, walletId) {
+  if (walletId && selectedAccount) {
+    const wallet = selectedAccount.wallets.find((w) => w.id === walletId);
+    if (wallet && wallet.chain.name === chainName) {
+      const source = wallet.sources.find((s) => s.token.symbol === symbol);
+      const evmChainId = chains.find((c) => c.name === chainName)?.commonId ?? void 0;
+      const authorized = !source?.token.status || source.token.status === "AUTHORIZED";
+      if (source && !authorized && source.address && evmChainId != null) {
+        void handlers.onAuthorizeToken(walletId, source.address, evmChainId, symbol);
+        return;
+      }
+    }
+    handlers.onSelectAuthorizedToken(walletId, symbol);
+    return;
+  }
+  handlers.onSelectSourceChainChange(chainName);
+  handlers.onSetSelectSourceTokenSymbol(symbol);
+}
 var MUTED = "#7fa4b0";
 var LOGO_SIZE = 48;
 function BlinkLoadingScreen() {
@@ -4078,6 +4316,22 @@ var loginButtonStyle = (accentColor) => ({
   fontFamily: "inherit",
   textDecoration: "underline"
 });
+
+// src/setupScreenSelection.ts
+function matchesSetupTokenSelection(opt, selectedTokenSymbol, selectedChainName, allOptions) {
+  if (!selectedTokenSymbol || opt.symbol !== selectedTokenSymbol) {
+    return false;
+  }
+  const chain = selectedChainName?.trim();
+  if (chain) {
+    return opt.chainName === chain;
+  }
+  const sameSymbol = allOptions.filter((o) => o.symbol === selectedTokenSymbol);
+  if (sameSymbol.length === 1) {
+    return opt.chainName === sameSymbol[0].chainName;
+  }
+  return false;
+}
 var DEFAULT_MAX = 1e7;
 var ABSOLUTE_MIN = 0.01;
 var PRESETS = [100, 250, 1e3];
@@ -4093,13 +4347,16 @@ function SetupScreen({
   loading,
   error,
   selectedTokenSymbol,
+  selectedChainName,
   tokenOptions,
   onSelectToken
 }) {
   const { tokens } = useBlinkConfig();
   const effectiveMax = DEFAULT_MAX;
   const effectiveMin = Math.min(ABSOLUTE_MIN, effectiveMax);
-  const [limit, setLimit] = useState(() => Math.min(availableBalance, effectiveMax));
+  const autoLimit = Math.min(Math.max(availableBalance, 0), effectiveMax);
+  const [userChosenLimit, setUserChosenLimit] = useState(null);
+  const limit = userChosenLimit ?? autoLimit;
   const [activePreset, setActivePreset] = useState(null);
   const [showAdvanced, setShowAdvanced] = useState(false);
   const [editing, setEditing] = useState(false);
@@ -4138,20 +4395,22 @@ function SetupScreen({
   const commitEdit = useCallback(() => {
     const parsed = parseFloat(inputValue);
     if (!isNaN(parsed)) {
-      setLimit(Math.min(effectiveMax, Math.max(effectiveMin, Math.round(parsed * 100) / 100)));
+      setUserChosenLimit(
+        Math.min(effectiveMax, Math.max(effectiveMin, Math.round(parsed * 100) / 100))
+      );
     }
     setActivePreset(null);
     setEditing(false);
   }, [inputValue, effectiveMax, effectiveMin]);
   const selectPreset = (value) => {
-    setLimit(Math.min(value, effectiveMax));
+    setUserChosenLimit(Math.min(value, effectiveMax));
     setActivePreset(value);
   };
   const selectMax = () => {
-    setLimit(Math.min(availableBalance, effectiveMax));
+    setUserChosenLimit(autoLimit);
     setActivePreset("max");
   };
-  const selectedOption = tokenOptions?.find((o) => o.symbol === selectedTokenSymbol);
+  const options = tokenOptions ?? [];
   return /* @__PURE__ */ jsxs(
     ScreenLayout,
     {
@@ -4184,12 +4443,7 @@ function SetupScreen({
               children: [
                 /* @__PURE__ */ jsx("span", { style: tokenRowLabelStyle(tokens.text), children: "Token for one tap" }),
                 /* @__PURE__ */ jsxs("div", { style: tokenRowRightStyle, children: [
-                  selectedOption && /* @__PURE__ */ jsxs("span", { style: tokenRowSymbolStyle(tokens.textSecondary), children: [
-                    selectedOption.symbol,
-                    " \xB7 ",
-                    selectedOption.chainName
-                  ] }),
-                  /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
+                  /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: "", width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
                     /* @__PURE__ */ jsx("circle", { cx: "18", cy: "18", r: "18", fill: "#2DB84B" }),
                     /* @__PURE__ */ jsx("text", { x: "18", y: "23", textAnchor: "middle", fontSize: "18", fill: "#fff", fontWeight: "700", children: "$" })
                   ] }) }),
@@ -4201,14 +4455,21 @@ function SetupScreen({
           tokenDropdownOpen && tokenOptions && tokenOptions.length > 0 && /* @__PURE__ */ jsxs("div", { style: dropdownOuterStyle(tokens), children: [
             /* @__PURE__ */ jsx("div", { style: dropdownLabelStyle(tokens.textMuted), children: "Choose token" }),
             /* @__PURE__ */ jsx("div", { style: dropdownInnerStyle(tokens), children: tokenOptions.map((opt, index) => {
-              const selected = opt.symbol === selectedTokenSymbol;
+              const selected = matchesSetupTokenSelection(
+                opt,
+                selectedTokenSymbol,
+                selectedChainName,
+                options
+              );
               const isLast = index === tokenOptions.length - 1;
+              const authorized = !opt.status || opt.status === "AUTHORIZED";
               return /* @__PURE__ */ jsxs(
                 "button",
                 {
                   type: "button",
                   onClick: () => handlePickToken(opt),
                   style: dropdownRowStyle(tokens, selected, isLast),
+                  "aria-label": opt.balance != null ? `${opt.symbol} on ${opt.chainName}, $${opt.balance.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })} balance${!authorized ? ", not authorized" : ""}` : `${opt.symbol} on ${opt.chainName}${!authorized ? ", not authorized" : ""}`,
                   children: [
                     /* @__PURE__ */ jsxs("div", { style: dropdownRowLeftStyle, children: [
                       /* @__PURE__ */ jsx("div", { style: dropdownTokenIconStyle(tokens, !!TOKEN_LOGOS[opt.symbol]), children: TOKEN_LOGOS[opt.symbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[opt.symbol], alt: opt.symbol, style: dropdownTokenLogoStyle }) : /* @__PURE__ */ jsx("span", { style: dropdownTokenFallbackStyle(tokens.textMuted), children: "$" }) }),
@@ -4218,9 +4479,12 @@ function SetupScreen({
                           /* @__PURE__ */ jsx("span", { style: dropdownTokenDotStyle(tokens.textMuted), children: "\xB7" }),
                           /* @__PURE__ */ jsx("span", { style: dropdownTokenChainStyle(tokens.textMuted), children: opt.chainName })
                         ] }),
-                        opt.balance != null && /* @__PURE__ */ jsxs("span", { style: dropdownTokenBalanceStyle(tokens.textMuted), children: [
-                          "$",
-                          opt.balance.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+                        /* @__PURE__ */ jsxs("div", { style: dropdownTokenBalanceRowStyle, children: [
+                          opt.balance != null && /* @__PURE__ */ jsxs("span", { style: dropdownTokenBalanceStyle(tokens.textMuted), children: [
+                            "$",
+                            opt.balance.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+                          ] }),
+                          !authorized && /* @__PURE__ */ jsx("span", { style: dropdownNotAuthorizedStyle(tokens.textMuted), children: "Not authorized" })
                         ] })
                       ] })
                     ] }),
@@ -4340,11 +4604,6 @@ var tokenRowRightStyle = {
   gap: 6,
   flexShrink: 0
 };
-var tokenRowSymbolStyle = (color) => ({
-  fontSize: "0.84rem",
-  fontWeight: 500,
-  color
-});
 var advancedToggleStyle = (accentColor) => ({
   display: "block",
   margin: "4px auto 24px",
@@ -4492,10 +4751,20 @@ var dropdownTokenChainStyle = (color) => ({
   fontWeight: 400,
   color
 });
+var dropdownTokenBalanceRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  gap: 8
+};
 var dropdownTokenBalanceStyle = (color) => ({
   fontSize: "0.78rem",
   color
 });
+var dropdownNotAuthorizedStyle = (color) => ({
+  fontSize: "0.7rem",
+  fontWeight: 500,
+  color
+});
 var dropdownRadioEmptyStyle = (borderColor) => ({
   width: 22,
   height: 22,
@@ -4610,6 +4879,38 @@ var waitHintStyle = (color) => ({
   color,
   margin: 0
 });
+
+// src/feeFormat.ts
+function isPreciseMoneyNonPositive(fee) {
+  const raw = fee.value.trim();
+  if (!/^-?\d+(\.\d*)?$/.test(raw)) return false;
+  const n = Number(raw);
+  return Number.isFinite(n) && n <= 0;
+}
+function formatNonPositiveFeeDisplay(fee) {
+  if (fee.currency === "USD") return "Under $0.01";
+  return `Less than 0.01 ${fee.currency}`;
+}
+function formatPreciseMoneyForDisplay(fee) {
+  const raw = fee.value.trim();
+  if (fee.currency === "USD") {
+    if (!/^\d+(\.\d*)?$/.test(raw)) {
+      return `$${raw}`;
+    }
+    const [whole, frac = ""] = raw.split(".");
+    const dec = `${frac}00`.slice(0, 2);
+    const intFmt = whole.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    return `$${intFmt}.${dec}`;
+  }
+  return `${raw} ${fee.currency}`;
+}
+function formatUsdTwoDecimals(value) {
+  const n = Number(value);
+  return (Number.isFinite(n) ? n : 0).toLocaleString("en-US", {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2
+  });
+}
 function DepositScreen({
   merchantName,
   availableBalance,
@@ -4617,6 +4918,8 @@ function DepositScreen({
   tokenCount,
   initialAmount,
   minDepositFloor,
+  quoteFee,
+  quoteLoading,
   processing,
   error,
   onDeposit,
@@ -4631,13 +4934,19 @@ function DepositScreen({
   onAuthorizeAccount,
   onAddProvider,
   onSelectToken,
+  tokenOptions,
+  onPickToken,
   selectedSourceLabel,
-  selectedTokenSymbol
+  selectedTokenSymbol,
+  selectedChainName
 }) {
   const { tokens } = useBlinkConfig();
   const amount = initialAmount;
   const [accountPickerOpen, setAccountPickerOpen] = useState(false);
+  const [tokenPickerOpen, setTokenPickerOpen] = useState(false);
   const pickerRef = useRef(null);
+  const tokenPickerRef = useRef(null);
+  const hasTokenDropdown = tokenOptions != null && tokenOptions.length > 0 && onPickToken != null;
   useEffect(() => {
     if (!accountPickerOpen) return;
     const handleClick = (e) => {
@@ -4648,6 +4957,28 @@ function DepositScreen({
     document.addEventListener("mousedown", handleClick);
     return () => document.removeEventListener("mousedown", handleClick);
   }, [accountPickerOpen]);
+  useEffect(() => {
+    if (!tokenPickerOpen) return;
+    const handleMouseDown = (e) => {
+      if (tokenPickerRef.current && !tokenPickerRef.current.contains(e.target)) {
+        setTokenPickerOpen(false);
+      }
+    };
+    document.addEventListener("mousedown", handleMouseDown);
+    return () => document.removeEventListener("mousedown", handleMouseDown);
+  }, [tokenPickerOpen]);
+  const handleTokenBadgeClick = useCallback(() => {
+    if (hasTokenDropdown) {
+      setTokenPickerOpen((v) => !v);
+      setAccountPickerOpen(false);
+    } else {
+      onSelectToken?.();
+    }
+  }, [hasTokenDropdown, onSelectToken]);
+  const handlePickToken = useCallback((opt) => {
+    onPickToken?.(opt.symbol, opt.chainName, opt.walletId);
+    setTokenPickerOpen(false);
+  }, [onPickToken]);
   const selectedAccount = accounts?.find((a) => a.id === selectedAccountId);
   const selectedProviderName = selectedAccount?.name ?? "Wallet";
   const selectedProviderLogo = KNOWN_LOGOS[selectedProviderName.toLowerCase()];
@@ -4659,36 +4990,95 @@ function DepositScreen({
     ScreenLayout,
     {
       footer: /* @__PURE__ */ jsxs(Fragment, { children: [
-        !accountPickerOpen && (exceedsLimit && onIncreaseLimit ? /* @__PURE__ */ jsx(PrimaryButton, { onClick: onIncreaseLimit, loading: increasingLimit, children: "Increase limit" }) : /* @__PURE__ */ jsx(PrimaryButton, { onClick: () => onDeposit(amount), disabled: !canDeposit, loading: processing, children: "Confirm" })),
+        !accountPickerOpen && !tokenPickerOpen && (exceedsLimit && onIncreaseLimit ? /* @__PURE__ */ jsx(PrimaryButton, { onClick: onIncreaseLimit, loading: increasingLimit, children: "Increase limit" }) : /* @__PURE__ */ jsx(PrimaryButton, { onClick: () => onDeposit(amount), disabled: !canDeposit, loading: processing, children: "Confirm" })),
         /* @__PURE__ */ jsx(PoweredByFooter, {})
       ] }),
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onBack, onLogout }),
         /* @__PURE__ */ jsxs("div", { ref: pickerRef, style: depositCardWrapStyle, children: [
-          /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsxs("div", { style: depositCardStyle(tokens), children: [
             /* @__PURE__ */ jsx("div", { style: depositLabelStyle(tokens.textMuted), children: "Depositing" }),
-            /* @__PURE__ */ jsxs("div", { style: amountRowStyle, children: [
-              /* @__PURE__ */ jsxs("div", { style: amountValueStyle(tokens.text), children: [
-                "$",
-                amount.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+            /* @__PURE__ */ jsxs("div", { ref: tokenPickerRef, children: [
+              /* @__PURE__ */ jsxs("div", { style: amountRowStyle, children: [
+                /* @__PURE__ */ jsxs("div", { style: amountValueStyle(tokens.text), children: [
+                  "$",
+                  formatUsdTwoDecimals(amount)
+                ] }),
+                /* @__PURE__ */ jsxs(
+                  "button",
+                  {
+                    type: "button",
+                    "data-testid": "deposit-token-badge",
+                    onClick: handleTokenBadgeClick,
+                    style: tokenIconButtonStyle(hasTokenDropdown || !!onSelectToken),
+                    "aria-expanded": hasTokenDropdown ? tokenPickerOpen : void 0,
+                    "aria-haspopup": hasTokenDropdown ? "listbox" : void 0,
+                    children: [
+                      /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle2, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
+                        /* @__PURE__ */ jsx("circle", { cx: "18", cy: "18", r: "18", fill: "#2DB84B" }),
+                        /* @__PURE__ */ jsx("text", { x: "18", y: "23", textAnchor: "middle", fontSize: "18", fill: "#fff", fontWeight: "700", children: "$" })
+                      ] }) }),
+                      /* @__PURE__ */ jsx("svg", { width: "12", height: "12", viewBox: "0 0 24 24", fill: "none", style: { opacity: 0.5 }, children: tokenPickerOpen ? /* @__PURE__ */ jsx("path", { d: "M18 15l-6-6-6 6", stroke: tokens.textMuted, strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round" }) : /* @__PURE__ */ jsx("path", { d: "M6 9l6 6 6-6", stroke: tokens.textMuted, strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round" }) })
+                    ]
+                  }
+                )
               ] }),
-              /* @__PURE__ */ jsxs(
-                "button",
-                {
-                  type: "button",
-                  onClick: onSelectToken,
-                  style: tokenIconButtonStyle(!!onSelectToken),
-                  children: [
-                    /* @__PURE__ */ jsx("div", { style: tokenIconWrapStyle2, children: selectedTokenSymbol && TOKEN_LOGOS[selectedTokenSymbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[selectedTokenSymbol], alt: selectedTokenSymbol, width: 36, height: 36, style: { borderRadius: "50%" } }) : /* @__PURE__ */ jsxs("svg", { width: "36", height: "36", viewBox: "0 0 36 36", fill: "none", children: [
-                      /* @__PURE__ */ jsx("circle", { cx: "18", cy: "18", r: "18", fill: "#2DB84B" }),
-                      /* @__PURE__ */ jsx("text", { x: "18", y: "23", textAnchor: "middle", fontSize: "18", fill: "#fff", fontWeight: "700", children: "$" })
-                    ] }) }),
-                    /* @__PURE__ */ jsx("svg", { width: "12", height: "12", viewBox: "0 0 24 24", fill: "none", style: { opacity: 0.5 }, children: /* @__PURE__ */ jsx("path", { d: "M6 9l6 6 6-6", stroke: tokens.textMuted, strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round" }) })
-                  ]
-                }
-              )
+              tokenPickerOpen && tokenOptions && tokenOptions.length > 0 && /* @__PURE__ */ jsxs("div", { style: tokenDropdownStyle(tokens), children: [
+                /* @__PURE__ */ jsx("div", { style: tokenDropdownLabelStyle(tokens.textMuted), children: "Choose token" }),
+                /* @__PURE__ */ jsx("div", { style: tokenDropdownInnerStyle(tokens), children: tokenOptions.map((opt, index) => {
+                  const selected = opt.symbol === selectedTokenSymbol && (!selectedChainName || opt.chainName === selectedChainName);
+                  const isLast = index === tokenOptions.length - 1;
+                  const authorized = !opt.status || opt.status === "AUTHORIZED";
+                  return /* @__PURE__ */ jsxs(
+                    "button",
+                    {
+                      type: "button",
+                      onClick: () => handlePickToken(opt),
+                      style: tokenDropdownRowStyle(tokens, selected, isLast),
+                      "aria-label": opt.balance != null ? `${opt.symbol} on ${opt.chainName}, $${formatUsdTwoDecimals(opt.balance)} balance${!authorized ? ", not authorized" : ""}` : `${opt.symbol} on ${opt.chainName}${!authorized ? ", not authorized" : ""}`,
+                      children: [
+                        /* @__PURE__ */ jsxs("div", { style: tokenDropdownRowLeftStyle, children: [
+                          /* @__PURE__ */ jsx("div", { style: tokenDropdownIconStyle(tokens, !!TOKEN_LOGOS[opt.symbol]), children: TOKEN_LOGOS[opt.symbol] ? /* @__PURE__ */ jsx("img", { src: TOKEN_LOGOS[opt.symbol], alt: opt.symbol, style: tokenDropdownLogoStyle }) : /* @__PURE__ */ jsx("span", { style: tokenDropdownFallbackStyle(tokens.textMuted), children: "$" }) }),
+                          /* @__PURE__ */ jsxs("div", { style: tokenDropdownInfoStyle, children: [
+                            /* @__PURE__ */ jsxs("div", { style: tokenDropdownNameRowStyle, children: [
+                              /* @__PURE__ */ jsx("span", { style: tokenDropdownSymbolStyle(tokens.text), children: opt.symbol }),
+                              /* @__PURE__ */ jsx("span", { style: tokenDropdownDotStyle(tokens.textMuted), children: "\xB7" }),
+                              /* @__PURE__ */ jsx("span", { style: tokenDropdownChainStyle(tokens.textMuted), children: opt.chainName })
+                            ] }),
+                            /* @__PURE__ */ jsxs("div", { style: tokenDropdownBalanceRowStyle, children: [
+                              opt.balance != null && /* @__PURE__ */ jsxs("span", { style: tokenDropdownBalanceStyle(tokens.textMuted), children: [
+                                "$",
+                                formatUsdTwoDecimals(opt.balance)
+                              ] }),
+                              !authorized && /* @__PURE__ */ jsx("span", { style: tokenDropdownNotAuthStyle(tokens.textMuted), children: "Not authorized" })
+                            ] })
+                          ] })
+                        ] }),
+                        selected ? /* @__PURE__ */ jsxs("svg", { width: "22", height: "22", viewBox: "0 0 22 22", fill: "none", children: [
+                          /* @__PURE__ */ jsx("circle", { cx: "11", cy: "11", r: "11", fill: tokens.success }),
+                          /* @__PURE__ */ jsx("path", { d: "M7 11l3 3 5-5", stroke: "#fff", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" })
+                        ] }) : /* @__PURE__ */ jsx("div", { style: tokenDropdownRadioStyle(tokens.border) })
+                      ]
+                    },
+                    `${opt.chainName}-${opt.symbol}`
+                  );
+                }) })
+              ] })
             ] }),
-            !accountPickerOpen && /* @__PURE__ */ jsxs(
+            !accountPickerOpen && !tokenPickerOpen && (() => {
+              if (quoteLoading) {
+                return /* @__PURE__ */ jsx("div", { style: feeRowContainerStyle, "aria-live": "polite", children: /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle(tokens.textMuted), children: "Getting fee estimate\u2026" }) });
+              }
+              if (quoteFee) {
+                const feeText = isPreciseMoneyNonPositive(quoteFee) ? formatNonPositiveFeeDisplay(quoteFee) : formatPreciseMoneyForDisplay(quoteFee);
+                return /* @__PURE__ */ jsxs("div", { style: feeRowContainerStyle, "aria-live": "polite", children: [
+                  /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle(tokens.textMuted), children: "Fee estimate: " }),
+                  /* @__PURE__ */ jsx("span", { style: feeRowAmountStyle(tokens.textSecondary), children: feeText })
+                ] });
+              }
+              return null;
+            })(),
+            !accountPickerOpen && !tokenPickerOpen && /* @__PURE__ */ jsxs(
               "button",
               {
                 type: "button",
@@ -4698,7 +5088,7 @@ function DepositScreen({
                   selectedProviderLogo ? /* @__PURE__ */ jsx("img", { src: selectedProviderLogo, alt: selectedProviderName, style: providerLogoStyle }) : /* @__PURE__ */ jsx("div", { style: providerFallbackStyle(tokens.textMuted), children: selectedProviderName.charAt(0) }),
                   /* @__PURE__ */ jsxs("span", { style: walletBalanceStyle(tokens.text), children: [
                     "$",
-                    totalAccountBalance.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+                    formatUsdTwoDecimals(totalAccountBalance)
                   ] }),
                   /* @__PURE__ */ jsx("svg", { width: "14", height: "14", viewBox: "0 0 24 24", fill: "none", style: { opacity: 0.4 }, children: /* @__PURE__ */ jsx("path", { d: "M7 10l5-5 5 5M7 14l5 5 5-5", stroke: tokens.textMuted, strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) })
                 ]
@@ -4739,7 +5129,7 @@ function DepositScreen({
                           /* @__PURE__ */ jsx("span", { style: accountAddressStyle(tokens.text), children: truncatedAddress ?? account.nickname ?? account.name }),
                           /* @__PURE__ */ jsxs("span", { style: accountBalanceTextStyle(tokens.textMuted), children: [
                             "$",
-                            accountBalance.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+                            formatUsdTwoDecimals(accountBalance)
                           ] })
                         ] })
                       ] }),
@@ -4775,21 +5165,21 @@ function DepositScreen({
           " ",
           /* @__PURE__ */ jsxs("strong", { style: { color: tokens.text }, children: [
             "$",
-            remainingLimit.toLocaleString("en-US", { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+            formatUsdTwoDecimals(remainingLimit)
           ] }),
           exceedsLimit && /* @__PURE__ */ jsxs("p", { style: limitExceededHintStyle(tokens.warning), children: [
             "Your deposit of $",
-            amount.toFixed(2),
+            formatUsdTwoDecimals(amount),
             " exceeds your One-Tap limit of $",
-            remainingLimit?.toFixed(2) ?? "0.00",
+            remainingLimit != null ? formatUsdTwoDecimals(remainingLimit) : "0.00",
             ". Increase your limit to continue."
           ] })
         ] }),
         !accountPickerOpen && isLowBalance && /* @__PURE__ */ jsxs(WarningBanner, { title: "Not enough funds", children: [
           "Your wallet balance is $",
-          availableBalance.toFixed(2),
+          formatUsdTwoDecimals(availableBalance),
           " \u2014 you need at least $",
-          minDepositFloor.toFixed(2),
+          formatUsdTwoDecimals(minDepositFloor),
           " to deposit via One-Tap."
         ] }),
         error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle6(tokens), children: error })
@@ -4801,6 +5191,11 @@ var depositCardWrapStyle = {
   position: "relative",
   marginBottom: 20
 };
+var depositCardStyle = (tokens) => ({
+  border: `1px solid ${tokens.border}`,
+  borderRadius: tokens.radiusLg,
+  padding: "16px 20px"
+});
 var depositLabelStyle = (color) => ({
   fontSize: "0.75rem",
   fontWeight: 500,
@@ -4834,6 +5229,116 @@ var tokenIconWrapStyle2 = {
   width: 36,
   height: 36
 };
+var tokenDropdownStyle = (t) => ({
+  marginTop: 4,
+  marginBottom: 12,
+  background: t.bgCard,
+  border: `1px solid ${t.border}`,
+  borderRadius: t.radiusLg,
+  boxShadow: t.shadowLg,
+  padding: "12px 14px 14px"
+});
+var tokenDropdownLabelStyle = (color) => ({
+  fontSize: "0.78rem",
+  fontWeight: 500,
+  color,
+  marginBottom: 8
+});
+var tokenDropdownInnerStyle = (t) => ({
+  background: t.bgInput,
+  border: `1px solid ${t.border}`,
+  borderRadius: t.radiusLg,
+  overflow: "hidden"
+});
+var tokenDropdownRowStyle = (t, isSelected, isLast) => ({
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  width: "100%",
+  padding: "14px 16px",
+  background: isSelected ? `${t.accent}18` : "transparent",
+  border: "none",
+  borderBottom: isLast ? "none" : `1px solid ${t.border}`,
+  cursor: "pointer",
+  fontFamily: "inherit",
+  textAlign: "left",
+  outline: "none"
+});
+var tokenDropdownRowLeftStyle = {
+  display: "flex",
+  alignItems: "center",
+  gap: 12,
+  minWidth: 0,
+  flex: 1
+};
+var tokenDropdownIconStyle = (t, hasLogo) => ({
+  width: 36,
+  height: 36,
+  borderRadius: "50%",
+  border: hasLogo ? "none" : `1.5px solid ${t.border}`,
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  flexShrink: 0,
+  overflow: "hidden"
+});
+var tokenDropdownLogoStyle = {
+  width: 36,
+  height: 36,
+  borderRadius: "50%",
+  objectFit: "cover"
+};
+var tokenDropdownFallbackStyle = (color) => ({
+  fontSize: "1rem",
+  fontWeight: 700,
+  color
+});
+var tokenDropdownInfoStyle = {
+  display: "flex",
+  flexDirection: "column",
+  gap: 2,
+  minWidth: 0
+};
+var tokenDropdownNameRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  gap: 4
+};
+var tokenDropdownSymbolStyle = (color) => ({
+  fontSize: "0.92rem",
+  fontWeight: 600,
+  color
+});
+var tokenDropdownDotStyle = (color) => ({
+  fontSize: "0.8rem",
+  color
+});
+var tokenDropdownChainStyle = (color) => ({
+  fontSize: "0.84rem",
+  fontWeight: 400,
+  color
+});
+var tokenDropdownBalanceRowStyle = {
+  display: "flex",
+  alignItems: "center",
+  gap: 8
+};
+var tokenDropdownBalanceStyle = (color) => ({
+  fontSize: "0.78rem",
+  color
+});
+var tokenDropdownNotAuthStyle = (color) => ({
+  fontSize: "0.7rem",
+  fontWeight: 500,
+  color
+});
+var tokenDropdownRadioStyle = (borderColor) => ({
+  width: 22,
+  height: 22,
+  borderRadius: "50%",
+  border: `2px solid ${borderColor}`,
+  flexShrink: 0
+});
 var walletBalanceRowStyle = {
   display: "flex",
   alignItems: "center",
@@ -4995,9 +5500,20 @@ var limitExceededHintStyle = (color) => ({
   margin: "12px 0 2px",
   lineHeight: 1.5
 });
+var feeRowContainerStyle = {
+  fontSize: "0.84rem",
+  fontWeight: 500,
+  marginTop: 6,
+  marginBottom: 4
+};
+var feeRowLabelStyle = (color) => ({ color });
+var feeRowAmountStyle = (color) => ({
+  color,
+  fontVariantNumeric: "tabular-nums"
+});
 function SuccessScreen({
   amount,
-  currency,
+  currency: _currency,
   succeeded,
   error,
   merchantName,
@@ -5010,22 +5526,30 @@ function SuccessScreen({
   onPreauthorize
 }) {
   const { tokens } = useBlinkConfig();
+  const isGuestDepositSuccess = succeeded && onPreauthorize != null;
   return /* @__PURE__ */ jsxs(
     ScreenLayout,
     {
       footer: /* @__PURE__ */ jsxs(Fragment, { children: [
-        succeeded && onPreauthorize ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          /* @__PURE__ */ jsx(PrimaryButton, { onClick: onPreauthorize, children: "Preauthorize future transfers" }),
-          /* @__PURE__ */ jsx("button", { type: "button", onClick: onDone, style: skipButtonStyle(tokens.textMuted), children: "Skip this time" })
+        isGuestDepositSuccess ? /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(PrimaryButton, { onClick: onPreauthorize, children: "Set up one tap" }),
+          /* @__PURE__ */ jsx("button", { type: "button", onClick: onDone, style: skipButtonStyle(tokens.textMuted), children: "Return to app" })
         ] }) : /* @__PURE__ */ jsx(PrimaryButton, { onClick: onDone, children: succeeded ? "Done" : "Try again" }),
         onManageAccount && /* @__PURE__ */ jsx("button", { type: "button", onClick: onManageAccount, style: manageStyle(tokens.textMuted), children: "Manage Blink account \u2192" }),
         /* @__PURE__ */ jsx(PoweredByFooter, {})
       ] }),
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-        /* @__PURE__ */ jsxs("div", { style: contentStyle6, children: [
-          succeeded ? /* @__PURE__ */ jsxs(Fragment, { children: [
-            /* @__PURE__ */ jsx(IconCircle, { variant: "success", size: 64, children: /* @__PURE__ */ jsx("svg", { width: "32", height: "32", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ jsx("path", { d: "M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41L9 16.17z", fill: tokens.success }) }) }),
+        /* @__PURE__ */ jsxs("div", { style: screenContentStyle, children: [
+          isGuestDepositSuccess ? /* @__PURE__ */ jsxs("div", { style: contentStyleCompact, children: [
+            /* @__PURE__ */ jsxs("h2", { style: headingStyle7(tokens.text), children: [
+              "$",
+              amount.toFixed(2),
+              " deposited"
+            ] }),
+            /* @__PURE__ */ jsx("p", { style: { ...subtitleStyle7(tokens.text), fontWeight: 600, margin: "0 0 8px" }, children: "Next time, do it in one tap" }),
+            /* @__PURE__ */ jsx("p", { style: subtitleStyle7(tokens.textSecondary), children: "Set up one tap for this wallet and skip the extra steps." })
+          ] }) : succeeded ? /* @__PURE__ */ jsxs("div", { style: contentStyleCompact, children: [
             /* @__PURE__ */ jsxs("h2", { style: headingStyle7(tokens.text), children: [
               "$",
               amount.toFixed(2),
@@ -5037,10 +5561,10 @@ function SuccessScreen({
             ] })
           ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsx(IconCircle, { variant: "error", size: 64, children: /* @__PURE__ */ jsx("svg", { width: "32", height: "32", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ jsx("path", { d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-2h2v2zm0-4h-2V7h2v6z", fill: tokens.error }) }) }),
-            /* @__PURE__ */ jsx("h2", { style: headingStyle7(tokens.text), children: "Transfer failed" }),
-            error && /* @__PURE__ */ jsx("p", { style: subtitleStyle7(tokens.error), children: error })
+            /* @__PURE__ */ jsx("h2", { style: failureHeadingStyle(tokens.text), children: "Transfer failed" }),
+            error && /* @__PURE__ */ jsx("p", { style: failureSubtitleStyle(tokens.error), children: error })
           ] }),
-          /* @__PURE__ */ jsxs("div", { style: summaryCardStyle(tokens), children: [
+          !isGuestDepositSuccess && /* @__PURE__ */ jsxs("div", { style: summaryCardStyle(tokens), children: [
             sourceName && /* @__PURE__ */ jsxs("div", { style: summaryRowStyle, children: [
               /* @__PURE__ */ jsx("span", { style: summaryLabelStyle(tokens.textMuted), children: "From" }),
               /* @__PURE__ */ jsx("span", { style: summaryValueStyle(tokens.text), children: sourceName })
@@ -5057,7 +5581,7 @@ function SuccessScreen({
               ] })
             ] })
           ] }),
-          succeeded && onIncreaseLimits && /* @__PURE__ */ jsxs("div", { style: upsellCardStyle(tokens), children: [
+          succeeded && onIncreaseLimits && !isGuestDepositSuccess && /* @__PURE__ */ jsxs("div", { style: upsellCardStyle(tokens), children: [
             /* @__PURE__ */ jsxs("div", { style: upsellHeaderStyle, children: [
               /* @__PURE__ */ jsx("svg", { width: "16", height: "16", viewBox: "0 0 24 24", fill: "none", style: { marginRight: 6 }, children: /* @__PURE__ */ jsx("path", { d: "M7 14l5-5 5 5", stroke: tokens.accent, strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) }),
               /* @__PURE__ */ jsx("strong", { children: "Want higher limits?" })
@@ -5070,21 +5594,42 @@ function SuccessScreen({
     }
   );
 }
-var contentStyle6 = {
+var screenContentStyle = {
   flex: 1,
   display: "flex",
   flexDirection: "column",
   alignItems: "center",
   paddingTop: 16
 };
+var contentStyleCompact = {
+  textAlign: "center",
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  width: "100%"
+};
 var headingStyle7 = (color) => ({
+  fontSize: "1.45rem",
+  fontWeight: 700,
+  letterSpacing: "-0.02em",
+  color,
+  margin: "20px 0 8px"
+});
+var subtitleStyle7 = (color) => ({
+  fontSize: "0.9rem",
+  color,
+  margin: "0 0 28px",
+  lineHeight: 1.5,
+  maxWidth: 280
+});
+var failureHeadingStyle = (color) => ({
   fontSize: "1.5rem",
   fontWeight: 700,
   letterSpacing: "-0.02em",
   color,
   margin: "20px 0 4px"
 });
-var subtitleStyle7 = (color) => ({
+var failureSubtitleStyle = (color) => ({
   fontSize: "0.9rem",
   color,
   margin: "0 0 20px"
@@ -5600,7 +6145,7 @@ function TransferStatusScreen({
   const steps = buildSteps(phase);
   return /* @__PURE__ */ jsxs(ScreenLayout, { footer: /* @__PURE__ */ jsx(PoweredByFooter, {}), children: [
     /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-    /* @__PURE__ */ jsxs("div", { style: contentStyle7, children: [
+    /* @__PURE__ */ jsxs("div", { style: contentStyle6, children: [
       /* @__PURE__ */ jsx(Spinner, { size: 64 }),
       /* @__PURE__ */ jsx("h2", { style: headingStyle9(tokens.text), children: "Depositing your money..." }),
       error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle7(tokens), children: error }),
@@ -5608,7 +6153,7 @@ function TransferStatusScreen({
     ] })
   ] });
 }
-var contentStyle7 = {
+var contentStyle6 = {
   flex: 1,
   display: "flex",
   flexDirection: "column",
@@ -5678,7 +6223,7 @@ function OpenWalletScreen({
         ] }),
         children: [
           /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-          /* @__PURE__ */ jsxs("div", { style: contentStyle8, children: [
+          /* @__PURE__ */ jsxs("div", { style: contentStyle7, children: [
             /* @__PURE__ */ jsx("div", { style: logoCircleStyle(tokens.bgInput), children: logoSrc ? /* @__PURE__ */ jsx("img", { src: logoSrc, alt: displayName, style: logoStyle2 }) : /* @__PURE__ */ jsx(Spinner, { size: 32 }) }),
             /* @__PURE__ */ jsxs("h2", { style: headingStyle10(tokens.text), children: [
               "Setting up ",
@@ -5711,7 +6256,7 @@ function OpenWalletScreen({
       ] }),
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onBack, onLogout }),
-        /* @__PURE__ */ jsxs("div", { style: contentStyle8, children: [
+        /* @__PURE__ */ jsxs("div", { style: contentStyle7, children: [
           /* @__PURE__ */ jsx("div", { style: logoCircleStyle(tokens.bgInput), children: logoSrc ? /* @__PURE__ */ jsx("img", { src: logoSrc, alt: displayName, style: logoStyle2 }) : /* @__PURE__ */ jsx(Spinner, { size: 32 }) }),
           /* @__PURE__ */ jsx("h2", { style: headingStyle10(tokens.text), children: loading ? "Connecting..." : `Open ${displayName}` }),
           /* @__PURE__ */ jsx("p", { style: subtitleStyle10(tokens.textSecondary), children: loading ? "Creating transfer and preparing your wallet link..." : `Continue in ${displayName} to authorize this connection.` }),
@@ -5724,7 +6269,7 @@ function OpenWalletScreen({
     }
   );
 }
-var contentStyle8 = {
+var contentStyle7 = {
   flex: 1,
   display: "flex",
   flexDirection: "column",
@@ -5810,7 +6355,7 @@ function ConfirmSignScreen({
       ] }),
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-        /* @__PURE__ */ jsxs("div", { style: contentStyle9, children: [
+        /* @__PURE__ */ jsxs("div", { style: contentStyle8, children: [
           logoSrc ? /* @__PURE__ */ jsx("img", { src: logoSrc, alt: displayName, style: logoStyle3 }) : /* @__PURE__ */ jsx(Spinner, { size: 48 }),
           /* @__PURE__ */ jsx("h2", { style: headingStyle11(tokens.text), children: "Wallet authorized" }),
           /* @__PURE__ */ jsxs("p", { style: subtitleStyle11(tokens.textSecondary), children: [
@@ -5826,7 +6371,7 @@ function ConfirmSignScreen({
     }
   );
 }
-var contentStyle9 = {
+var contentStyle8 = {
   flex: 1,
   display: "flex",
   flexDirection: "column",
@@ -6121,29 +6666,6 @@ var selectCircleSelectedStyle = (color) => ({
 function entryKey(entry) {
   return `${entry.sourceChainId}-${entry.tokenAddress.toLowerCase()}`;
 }
-function isPreciseMoneyNonPositive(fee) {
-  const raw = fee.value.trim();
-  if (!/^-?\d+(\.\d*)?$/.test(raw)) return false;
-  const n = Number(raw);
-  return Number.isFinite(n) && n <= 0;
-}
-function formatNonPositiveFeeDisplay(fee) {
-  if (fee.currency === "USD") return "Under $0.01";
-  return `Less than 0.01 ${fee.currency}`;
-}
-function formatPreciseMoneyForDisplay(fee) {
-  const raw = fee.value.trim();
-  if (fee.currency === "USD") {
-    if (!/^\d+(\.\d*)?$/.test(raw)) {
-      return `$${raw}`;
-    }
-    const [whole, frac = ""] = raw.split(".");
-    const dec = `${frac}00`.slice(0, 2);
-    const intFmt = whole.replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-    return `$${intFmt}.${dec}`;
-  }
-  return `${raw} ${fee.currency}`;
-}
 function GuestTokenPickerScreen({
   entries,
   loading,
@@ -6183,13 +6705,13 @@ function GuestTokenPickerScreen({
   const canConfirm = Boolean(quoteFee && pendingEntry && !quoteLoading);
   const feeLine = (() => {
     if (quoteLoading && pendingEntry) {
-      return /* @__PURE__ */ jsx("div", { style: feeRowContainerStyle, "aria-live": "polite", children: /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle(t.textMuted), children: "Getting fee estimate\u2026" }) });
+      return /* @__PURE__ */ jsx("div", { style: feeRowContainerStyle2, "aria-live": "polite", children: /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle2(t.textMuted), children: "Getting fee estimate\u2026" }) });
     }
     if (quoteFee) {
       const feeText = isPreciseMoneyNonPositive(quoteFee) ? formatNonPositiveFeeDisplay(quoteFee) : formatPreciseMoneyForDisplay(quoteFee);
-      return /* @__PURE__ */ jsxs("div", { style: feeRowContainerStyle, "aria-live": "polite", children: [
-        /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle(t.textMuted), children: "Fee estimate: " }),
-        /* @__PURE__ */ jsx("span", { style: feeRowAmountStyle(t.textSecondary), children: feeText })
+      return /* @__PURE__ */ jsxs("div", { style: feeRowContainerStyle2, "aria-live": "polite", children: [
+        /* @__PURE__ */ jsx("span", { style: feeRowLabelStyle2(t.textMuted), children: "Fee estimate: " }),
+        /* @__PURE__ */ jsx("span", { style: feeRowAmountStyle2(t.textSecondary), children: feeText })
       ] });
     }
     return null;
@@ -6211,7 +6733,7 @@ function GuestTokenPickerScreen({
                 depositAmount != null && /* @__PURE__ */ jsxs("div", { style: depositAmountStyle2(t.text), children: [
                   "$",
                   depositAmount.toLocaleString("en-US", {
-                    minimumFractionDigits: 0,
+                    minimumFractionDigits: 2,
                     maximumFractionDigits: 2
                   })
                 ] }),
@@ -6293,7 +6815,7 @@ function GuestTokenPickerScreen({
           ] }),
           tokenListOpen && entries.length > 0 && /* @__PURE__ */ jsxs("div", { style: tokenDropdownOuterStyle(t), children: [
             /* @__PURE__ */ jsx("div", { style: accountDropdownLabelStyle2(t.textMuted), children: "Choose token" }),
-            /* @__PURE__ */ jsx("div", { style: tokenDropdownInnerStyle(t), children: entries.map((entry, index) => {
+            /* @__PURE__ */ jsx("div", { style: tokenDropdownInnerStyle2(t), children: entries.map((entry, index) => {
               const selected = pendingKey === entryKey(entry);
               const isLast = index === entries.length - 1;
               return /* @__PURE__ */ jsxs(
@@ -6394,13 +6916,13 @@ var depositAmountStyle2 = (color) => ({
   color,
   lineHeight: 1.05
 });
-var feeRowContainerStyle = {
+var feeRowContainerStyle2 = {
   fontSize: "0.84rem",
   fontWeight: 500,
   marginTop: 6
 };
-var feeRowLabelStyle = (color) => ({ color });
-var feeRowAmountStyle = (color) => ({
+var feeRowLabelStyle2 = (color) => ({ color });
+var feeRowAmountStyle2 = (color) => ({
   color,
   fontVariantNumeric: "tabular-nums"
 });
@@ -6446,7 +6968,7 @@ var accountDropdownLabelStyle2 = (color) => ({
   color,
   marginBottom: 8
 });
-var tokenDropdownInnerStyle = (tokens) => ({
+var tokenDropdownInnerStyle2 = (tokens) => ({
   background: tokens.bgInput,
   border: `1px solid ${tokens.border}`,
   borderRadius: tokens.radiusLg,
@@ -6558,7 +7080,7 @@ function GuestPreauthSetupCompleteScreen({
       ] }),
       children: [
         /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-        /* @__PURE__ */ jsxs("div", { style: contentStyle10, children: [
+        /* @__PURE__ */ jsxs("div", { style: contentStyle9, children: [
           /* @__PURE__ */ jsx(IconCircle, { variant: "success", size: 64, children: /* @__PURE__ */ jsx("svg", { width: "32", height: "32", viewBox: "0 0 24 24", fill: "none", children: /* @__PURE__ */ jsx(
             "path",
             {
@@ -6567,13 +7089,13 @@ function GuestPreauthSetupCompleteScreen({
             }
           ) }) }),
           /* @__PURE__ */ jsx("h2", { style: headingStyle12(tokens.text), children: "Setup complete" }),
-          /* @__PURE__ */ jsx("p", { style: subtitleStyle12(tokens.textSecondary), children: "Your account is linked and ready. You can close this window or make another deposit." })
+          /* @__PURE__ */ jsx("p", { style: subtitleStyle12(tokens.textSecondary), children: "Your account is linked and ready. You can close this window." })
         ] })
       ]
     }
   );
 }
-var contentStyle10 = {
+var contentStyle9 = {
   display: "flex",
   flexDirection: "column",
   alignItems: "center",
@@ -6602,14 +7124,14 @@ function GuestPreauthLinkingScreen({ onLogout }) {
   const { tokens } = useBlinkConfig();
   return /* @__PURE__ */ jsxs(ScreenLayout, { children: [
     /* @__PURE__ */ jsx(ScreenHeader, { onLogout }),
-    /* @__PURE__ */ jsxs("div", { style: contentStyle11, children: [
+    /* @__PURE__ */ jsxs("div", { style: contentStyle10, children: [
       /* @__PURE__ */ jsx(Spinner, { size: 48 }),
       /* @__PURE__ */ jsx("h2", { style: headingStyle13(tokens.text), children: "Setting up your account..." }),
       /* @__PURE__ */ jsx("p", { style: subtitleStyle13(tokens.textSecondary), children: "Linking your wallet to your Blink account. This usually takes a few seconds." })
     ] })
   ] });
 }
-var contentStyle11 = {
+var contentStyle10 = {
   flex: 1,
   display: "flex",
   flexDirection: "column",
@@ -6666,6 +7188,10 @@ function resolveHeaderFlowPhase(screen, phase, authenticated) {
   return raw;
 }
 var DEFAULT_MIN_DEPOSIT_USD = 0.25;
+var GUEST_PREAUTH_LOGIN_HERO_TITLE = "Create an account to complete one tap setup";
+function isGuestPreauthLogin(state) {
+  return state.isGuestFlow && (state.guestPreauthSessionId != null || state.guestPreauthAccountId != null);
+}
 function StepRenderer(props) {
   const screen = screenForPhase(props.flow.state.phase);
   const flowPhase = resolveHeaderFlowPhase(
@@ -6745,7 +7271,8 @@ function StepRendererContent({
           sending: activeOtpStatus === "sending-code",
           error: state.error,
           onBack,
-          merchantInitials: merchantName ? merchantName.slice(0, 2).toUpperCase() : void 0
+          merchantInitials: merchantName ? merchantName.slice(0, 2).toUpperCase() : void 0,
+          heroTitle: isGuestPreauthLogin(state) ? GUEST_PREAUTH_LOGIN_HERO_TITLE : void 0
         }
       );
     case "otp-verify":
@@ -6844,15 +7371,11 @@ function StepRendererContent({
         0
       );
       const effectiveTokenCount = tokenCount > 0 ? tokenCount : selectSourceTokenCount;
-      const effectiveSourceLabel = selectedSourceLabel ?? (selectSourceChainName && selectSourceTokenSymbol ? `${selectSourceTokenSymbol} on ${selectSourceChainName}` : void 0);
-      const setupTokenOptions = selectedAccount ? selectedAccount.wallets.flatMap(
-        (w) => w.sources.filter((s) => s.balance.total.amount > 0).map((s) => ({
-          symbol: s.token.symbol,
-          chainName: w.chain.name,
-          balance: s.balance.available.amount,
-          walletId: w.id
-        }))
-      ) : selectSourceChoices.flatMap(
+      const setupFromPendingSelectSource = pendingSelectSource != null;
+      const setupSelectedTokenSymbol = setupFromPendingSelectSource ? selectSourceTokenSymbol || selectSourceRecommended?.tokenSymbol || "" : selectedSource?.token.symbol ?? selectSourceTokenSymbol;
+      const setupSelectedChainName = setupFromPendingSelectSource ? selectSourceChainName || selectSourceRecommended?.chainName || "" : selectedWallet?.chain.name ?? selectSourceChainName;
+      const effectiveSourceLabel = setupFromPendingSelectSource ? setupSelectedTokenSymbol && setupSelectedChainName ? `${setupSelectedTokenSymbol} on ${setupSelectedChainName}` : void 0 : selectedSourceLabel ?? (selectSourceChainName && selectSourceTokenSymbol ? `${selectSourceTokenSymbol} on ${selectSourceChainName}` : void 0);
+      const setupTokenOptions = selectedAccount ? tokenOptionsForLinkedAccount(selectedAccount, state.chains) : selectSourceChoices.flatMap(
         (chain) => chain.tokens.map((t) => ({
           symbol: t.tokenSymbol,
           chainName: chain.chainName,
@@ -6860,9 +7383,8 @@ function StepRendererContent({
         }))
       );
       const handleSetupSelectToken = (symbol, chainName, walletId) => {
-        if (walletId) {
-          handlers.onSelectAuthorizedToken(walletId, symbol);
-        } else {
+        handleInlineTokenSelection(handlers, state.chains, selectedAccount, symbol, chainName, walletId);
+        if (pendingSelectSource) {
           handlers.onSelectSourceChainChange(chainName);
           handlers.onSetSelectSourceTokenSymbol(symbol);
         }
@@ -6870,17 +7392,18 @@ function StepRendererContent({
       return /* @__PURE__ */ jsx(
         SetupScreen,
         {
-          availableBalance: selectedSource ? selectedSource.balance.available.amount : selectSourceAvailableBalance > 0 ? selectSourceAvailableBalance : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
+          availableBalance: selectedSource ? selectedSource.balance.available.amount : setupFromPendingSelectSource ? selectSourceAvailableBalance : selectSourceAvailableBalance > 0 ? selectSourceAvailableBalance : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
           tokenCount: effectiveTokenCount,
           sourceName,
           onSetupOneTap: handlers.onSetupOneTap,
-          onBack: () => handlers.onSetPhase({ step: "deposit" }),
+          onBack: handlers.onBackFromSubflow,
           onLogout: handlers.onLogout,
           onAdvanced: handlers.onSelectToken,
           selectedSourceLabel: effectiveSourceLabel,
           loading: savingOneTapLimit,
           error: state.error,
-          selectedTokenSymbol: selectedSource?.token.symbol ?? selectSourceTokenSymbol,
+          selectedTokenSymbol: setupSelectedTokenSymbol,
+          selectedChainName: setupSelectedChainName,
           tokenOptions: setupTokenOptions,
           onSelectToken: handleSetupSelectToken
         }
@@ -6902,6 +7425,7 @@ function StepRendererContent({
     case "deposit": {
       const parsedAmt = depositAmount != null ? depositAmount : 5;
       const minDepositFloor = depositAmount != null ? depositAmount : DEFAULT_MIN_DEPOSIT_USD;
+      const depositTokenOptions = tokenOptionsForLinkedAccount(selectedAccount, state.chains);
       return /* @__PURE__ */ jsx(
         DepositScreen,
         {
@@ -6910,6 +7434,8 @@ function StepRendererContent({
           remainingLimit: selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null,
           tokenCount,
           initialAmount: parsedAmt,
+          quoteFee: forms.depositQuoteFee,
+          quoteLoading: forms.depositQuoteLoading,
           processing: state.creatingTransfer,
           error: state.error,
           onDeposit: handlers.onPay,
@@ -6924,8 +7450,13 @@ function StepRendererContent({
           onAuthorizeAccount: handlers.onContinueConnection,
           onAddProvider: () => handlers.onSetPhase({ step: "wallet-picker", reason: "switch" }),
           onSelectToken: handlers.onSelectToken,
+          tokenOptions: depositTokenOptions,
+          onPickToken: (symbol, chainName, walletId) => {
+            handleInlineTokenSelection(handlers, state.chains, selectedAccount, symbol, chainName, walletId);
+          },
           selectedSourceLabel,
           selectedTokenSymbol: selectedSource?.token.symbol,
+          selectedChainName: selectedWallet?.chain.name,
           minDepositFloor
         }
       );
@@ -6966,7 +7497,7 @@ function StepRendererContent({
           chains: state.chains,
           onSelectAuthorized: handlers.onSelectAuthorizedToken,
           onAuthorizeToken: handlers.onAuthorizeToken,
-          onBack: () => handlers.onSetPhase({ step: "deposit" }),
+          onBack: handlers.onBackFromSubflow,
           onLogout: handlers.onLogout,
           depositAmount: depositAmount ?? void 0,
           selectedTokenSymbol: selectedSource?.token.symbol,
@@ -7045,7 +7576,7 @@ function StepRendererContent({
           })() : void 0,
           onDone: onDismiss ?? handlers.onNewPayment,
           onLogout: authenticated ? handlers.onLogout : void 0,
-          onPreauthorize: state.isGuestFlow ? handlers.onPreauthorize : void 0
+          onPreauthorize: state.isGuestFlow && isDesktop ? handlers.onPreauthorize : void 0
         }
       );
     }
@@ -7444,6 +7975,9 @@ function useTransferHandlers(deps) {
     sourceTokenAddress,
     activeCredentialId,
     selectedAccountId,
+    selectedWalletId,
+    selectedTokenSymbol,
+    quoteId,
     transfer,
     accounts
   } = deps;
@@ -7457,9 +7991,32 @@ function useTransferHandlers(deps) {
       fetchProviders(apiBaseUrl, token)
     ]);
     const parsedAmt = depositAmount != null ? depositAmount : 0;
-    const defaults = resolveDepositSelection(accts, parsedAmt, selectedAccountId);
-    dispatch({ type: "ACCOUNTS_RELOADED", accounts: accts, providers: prov, defaults });
-  }, [getAccessToken, activeCredentialId, selectedAccountId, apiBaseUrl, depositAmount, dispatch]);
+    const { defaults, resetSelectedTokenSymbol } = resolveDepositSelectionAfterRefresh(
+      accts,
+      parsedAmt,
+      {
+        selectedAccountId,
+        selectedWalletId,
+        selectedTokenSymbol
+      }
+    );
+    dispatch({
+      type: "ACCOUNTS_RELOADED",
+      accounts: accts,
+      providers: prov,
+      defaults,
+      resetSelectedTokenSymbol
+    });
+  }, [
+    getAccessToken,
+    activeCredentialId,
+    selectedAccountId,
+    selectedWalletId,
+    selectedTokenSymbol,
+    apiBaseUrl,
+    depositAmount,
+    dispatch
+  ]);
   const handlePay = useCallback(async (payAmount, sourceOverrides) => {
     const minUsd = effectiveMinTransferAmountUsd(depositAmount);
     if (isNaN(payAmount) || payAmount < minUsd) {
@@ -7503,7 +8060,8 @@ function useTransferHandlers(deps) {
         sourceId: effectiveSourceId,
         sourceTokenAddress,
         destination,
-        amount: payAmount
+        amount: payAmount,
+        ...quoteId ? { quoteId } : {}
       });
       dispatch({ type: "TRANSFER_CREATED", transfer: t });
       if (t.status === "COMPLETED") {
@@ -7535,6 +8093,7 @@ function useTransferHandlers(deps) {
     accounts,
     destination,
     apiBaseUrl,
+    quoteId,
     getAccessToken,
     transferSigning,
     polling,
@@ -7585,20 +8144,20 @@ function useSourceSelectionHandlers(dispatch, authExecutor, options) {
   const selectSourceAvailableBalance = useMemo(() => {
     if (!pendingSelectSourceAction) return 0;
     const options2 = pendingSelectSourceAction.metadata?.options ?? [];
-    const recommended = selectSourceRecommended;
-    if (recommended) {
-      const match = options2.find(
-        (opt) => opt.chainName === recommended.chainName && opt.tokenSymbol === recommended.tokenSymbol
-      );
-      if (match) return Number(match.rawBalance) / Math.pow(10, match.decimals);
-    }
-    let max = 0;
-    for (const opt of options2) {
-      const bal = Number(opt.rawBalance) / Math.pow(10, opt.decimals);
-      if (bal > max) max = bal;
-    }
-    return max;
-  }, [pendingSelectSourceAction, selectSourceRecommended]);
+    return resolveSelectSourceAvailableBalance(
+      selectSourceChoices,
+      options2,
+      selectSourceChainName,
+      selectSourceTokenSymbol,
+      selectSourceRecommended
+    );
+  }, [
+    pendingSelectSourceAction,
+    selectSourceChoices,
+    selectSourceChainName,
+    selectSourceTokenSymbol,
+    selectSourceRecommended
+  ]);
   const handleSelectSourceChainChange = useCallback(
     (chainName) => {
       setSelectSourceChainName(chainName);
@@ -7649,7 +8208,7 @@ function useSourceSelectionHandlers(dispatch, authExecutor, options) {
     initializedSelectSourceActionRef
   };
 }
-function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransferIdRef, stateTransfer, refs, guestCheckout, onComplete) {
+function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransferIdRef, stateTransfer, refs, guestCheckout, onComplete, lastResumedAt) {
   const {
     mobileSetupFlowRef,
     handlingMobileReturnRef,
@@ -7660,6 +8219,8 @@ function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransfe
   onCompleteRef.current = onComplete;
   const guestPollingActiveRef = useRef(false);
   const guestPollingCleanupRef = useRef(null);
+  const mobileFlowRef = useRef(guestCheckout.mobileFlow);
+  mobileFlowRef.current = guestCheckout.mobileFlow;
   const guestTransferIdRef = useRef(guestCheckout.guestTransferId);
   guestTransferIdRef.current = guestCheckout.guestTransferId;
   const guestSessionTokenRef = useRef(guestCheckout.guestSessionToken);
@@ -7715,27 +8276,15 @@ function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransfe
     startGuestPolling
   ]);
   useEffect(() => {
-    const tryStartPolling = () => {
-      if (guestPollingActiveRef.current) return;
-      const transferId = guestTransferIdRef.current;
-      const token = guestSessionTokenRef.current;
-      if (transferId && token) {
-        startGuestPolling(transferId, token);
-      }
-    };
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible") tryStartPolling();
-    };
-    const handlePageShow = (e) => {
-      if (e.persisted) tryStartPolling();
-    };
-    document.addEventListener("visibilitychange", handleVisibility);
-    window.addEventListener("pageshow", handlePageShow);
-    return () => {
-      document.removeEventListener("visibilitychange", handleVisibility);
-      window.removeEventListener("pageshow", handlePageShow);
-    };
-  }, [startGuestPolling]);
+    if (!lastResumedAt) return;
+    if (guestPollingActiveRef.current) return;
+    if (!mobileFlowRef.current) return;
+    const transferId = guestTransferIdRef.current;
+    const token = guestSessionTokenRef.current;
+    if (transferId && token) {
+      startGuestPolling(transferId, token);
+    }
+  }, [lastResumedAt, startGuestPolling]);
   const handleAuthorizedMobileReturn = useCallback(async (authorizedTransfer, isSetup) => {
     if (handlingMobileReturnRef.current) return;
     handlingMobileReturnRef.current = true;
@@ -7922,9 +8471,6 @@ function useProviderHandlers(deps) {
       useWalletConnector: useWalletConnectorProp,
       userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
     });
-    if (!isMobile) {
-      dispatch({ type: "PAY_STARTED" });
-    }
     try {
       let accountId;
       let sessionId;
@@ -7963,18 +8509,22 @@ function useProviderHandlers(deps) {
         triggerDeeplink(sessionUri);
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: sessionUri });
       } else {
+        dispatch({
+          type: "SELECT_ACCOUNT",
+          accountId,
+          walletId: null
+        });
         await authExecutor.executeSessionById(sessionId);
         await reloadAccounts();
       }
     } catch (err) {
+      if (isAuthorizationSessionCancelled(err) || isUserDismissedAuthorizationError(err)) {
+        return;
+      }
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to set up wallet";
       dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
-    } finally {
-      if (!isMobile) {
-        dispatch({ type: "PAY_ENDED" });
-      }
     }
   }, [
     authenticated,
@@ -8037,7 +8587,12 @@ function useProviderHandlers(deps) {
     }
     const acct = accounts.find((a) => a.id === selectedAccountId);
     const matchedProvider = acct ? providers.find((p) => p.name === acct.name) : void 0;
-    if (matchedProvider) {
+    const isMobile = !shouldUseWalletConnector({
+      useWalletConnector: useWalletConnectorProp,
+      userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
+    });
+    if (matchedProvider && isMobile) {
+      dispatch({ type: "SAVE_SELECTION" });
       dispatch({ type: "SELECT_PROVIDER", providerId: matchedProvider.id });
     }
     dispatch({ type: "SET_ERROR", error: null });
@@ -8057,10 +8612,6 @@ function useProviderHandlers(deps) {
         activeCredentialId,
         { tokenAddress: source?.address, chainId: evmChainId }
       );
-      const isMobile = !shouldUseWalletConnector({
-        useWalletConnector: useWalletConnectorProp,
-        userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-      });
       if (isMobile) {
         handlingMobileReturnRef.current = false;
         mobileSetupFlowRef.current = true;
@@ -8077,12 +8628,20 @@ function useProviderHandlers(deps) {
         });
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
         triggerDeeplink(session.uri);
+        dispatch({ type: "DISCARD_SAVED_SELECTION" });
       } else {
         await authExecutor.executeSessionById(session.id);
         await reloadAccounts();
+        dispatch({ type: "DISCARD_SAVED_SELECTION" });
       }
     } catch (err) {
+      if (isAuthorizationSessionCancelled(err) || isUserDismissedAuthorizationError(err)) {
+        return;
+      }
       captureException(err);
+      if (isMobile) {
+        dispatch({ type: "RESTORE_SELECTION" });
+      }
       const msg = err instanceof Error ? err.message : "Failed to increase limit";
       dispatch({ type: "SET_ERROR", error: msg });
       onError?.(msg);
@@ -8127,7 +8686,12 @@ function useProviderHandlers(deps) {
     }
     const acct = accounts.find((a) => a.id === selectedAccountId);
     const matchedProvider = acct ? providers.find((p) => p.name === acct.name) : void 0;
-    if (matchedProvider) {
+    const isMobile = !shouldUseWalletConnector({
+      useWalletConnector: useWalletConnectorProp,
+      userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
+    });
+    if (matchedProvider && isMobile) {
+      dispatch({ type: "SAVE_SELECTION" });
       dispatch({ type: "SELECT_PROVIDER", providerId: matchedProvider.id });
     }
     dispatch({ type: "SET_ERROR", error: null });
@@ -8142,10 +8706,6 @@ function useProviderHandlers(deps) {
         activeCredentialId,
         { tokenAddress, chainId }
       );
-      const isMobile = !shouldUseWalletConnector({
-        useWalletConnector: useWalletConnectorProp,
-        userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-      });
       if (isMobile) {
         handlingMobileReturnRef.current = false;
         mobileSetupFlowRef.current = true;
@@ -8163,13 +8723,21 @@ function useProviderHandlers(deps) {
         });
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
         triggerDeeplink(session.uri);
+        dispatch({ type: "DISCARD_SAVED_SELECTION" });
       } else {
         await authExecutor.executeSessionById(session.id);
         await reloadAccounts();
         dispatch({ type: "SELECT_TOKEN", walletId: _walletId, tokenSymbol });
+        dispatch({ type: "DISCARD_SAVED_SELECTION" });
       }
     } catch (err) {
+      if (isAuthorizationSessionCancelled(err) || isUserDismissedAuthorizationError(err)) {
+        return;
+      }
       captureException(err);
+      if (isMobile) {
+        dispatch({ type: "RESTORE_SELECTION" });
+      }
       const msg = err instanceof Error ? err.message : "Failed to authorize token";
       dispatch({ type: "SET_ERROR", error: msg });
       onError?.(msg);
@@ -9106,7 +9674,15 @@ function useDataLoadEffect(deps) {
         ]);
         if (cancelled) return;
         const parsedAmt = depositAmount != null ? depositAmount : 0;
-        const defaults = resolveDepositSelection(accts, parsedAmt, state.selectedAccountId);
+        const { defaults, resetSelectedTokenSymbol } = resolveDepositSelectionAfterRefresh(
+          accts,
+          parsedAmt,
+          {
+            selectedAccountId: state.selectedAccountId,
+            selectedWalletId: state.selectedWalletId,
+            selectedTokenSymbol: state.selectedTokenSymbol
+          }
+        );
         const persisted = loadMobileFlowState();
         const clearMobile = persisted?.isSetup && accts.some((a) => a.wallets.some((w) => w.status === "ACTIVE"));
         dispatch({
@@ -9115,7 +9691,8 @@ function useDataLoadEffect(deps) {
           accounts: accts,
           chains: chn,
           defaults,
-          clearMobileState: clearMobile
+          clearMobileState: clearMobile,
+          resetSelectedTokenSymbol
         });
         if (clearMobile) clearMobileFlowState();
       } catch (err) {
@@ -9144,6 +9721,8 @@ function useDataLoadEffect(deps) {
     apiBaseUrl,
     state.activeCredentialId,
     state.selectedAccountId,
+    state.selectedWalletId,
+    state.selectedTokenSymbol,
     depositAmount
   ]);
   useEffect(() => {
@@ -9372,25 +9951,16 @@ function useMobilePollingEffect(deps) {
     const poll = isReauth ? pollReauthorization : pollWalletActive;
     poll();
     const intervalId = window.setInterval(poll, POLL_INTERVAL_MS);
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !cancelled) poll();
-    };
-    const handlePageShow = (e) => {
-      if (e.persisted && !cancelled) poll();
-    };
-    document.addEventListener("visibilitychange", handleVisibility);
-    window.addEventListener("pageshow", handlePageShow);
     return () => {
       cancelled = true;
       window.clearInterval(intervalId);
-      document.removeEventListener("visibilitychange", handleVisibility);
-      window.removeEventListener("pageshow", handlePageShow);
     };
   }, [
     state.mobileFlow,
     state.isGuestFlow,
     state.guestPreauthSessionId,
     state.activeCredentialId,
+    state.lastResumedAt,
     apiBaseUrl,
     reloadAccounts,
     dispatch,
@@ -9407,28 +9977,13 @@ function useMobilePollingEffect(deps) {
     const transferIdToResume = pollingTransferIdRef.current ?? state.transfer?.id;
     if (!transferIdToResume) return;
     if (!polling.isPolling) polling.startPolling(transferIdToResume);
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !handlingMobileReturnRef.current) {
-        polling.startPolling(transferIdToResume);
-      }
-    };
-    const handlePageShow = (e) => {
-      if (e.persisted && !handlingMobileReturnRef.current) {
-        polling.startPolling(transferIdToResume);
-      }
-    };
-    document.addEventListener("visibilitychange", handleVisibility);
-    window.addEventListener("pageshow", handlePageShow);
-    return () => {
-      document.removeEventListener("visibilitychange", handleVisibility);
-      window.removeEventListener("pageshow", handlePageShow);
-    };
   }, [
     state.mobileFlow,
     state.transfer?.id,
     state.isGuestFlow,
     state.guestPreauthSessionId,
     state.guestPreauthAccountId,
+    state.lastResumedAt,
     polling.isPolling,
     polling.startPolling,
     handlingMobileReturnRef,
@@ -9439,6 +9994,7 @@ function useGuestPreauthMobileRestoreEffect(deps) {
   const {
     dispatch,
     privyReady,
+    lastResumedAt,
     mobileSetupFlowRef,
     setupAccountIdRef,
     startGuestAccountPolling
@@ -9449,68 +10005,43 @@ function useGuestPreauthMobileRestoreEffect(deps) {
       console.info("[blink-sdk] guestPreauthMobileRestore: skipping, privyReady=false");
       return;
     }
-    const tryStart = (trigger) => {
-      if (startedRef.current) {
-        console.info("[blink-sdk] guestPreauthMobileRestore.tryStart: already started", { trigger });
-        return;
-      }
-      const persisted = loadMobileFlowState();
-      console.info("[blink-sdk] guestPreauthMobileRestore.tryStart", {
-        trigger,
-        hasPersistedState: !!persisted,
-        isGuestPreauth: persisted?.isGuestPreauth ?? false,
-        hasGuestSessionToken: !!persisted?.guestSessionToken,
-        hasSessionId: !!persisted?.sessionId,
-        accountId: persisted?.accountId ?? null
-      });
-      if (!persisted?.isGuestPreauth || !persisted.guestSessionToken || !persisted.sessionId) {
-        return;
-      }
-      startedRef.current = true;
-      mobileSetupFlowRef.current = true;
-      if (persisted.accountId) {
-        setupAccountIdRef.current = persisted.accountId;
-      }
-      if (persisted.accountId) {
-        dispatch({
-          type: "GUEST_PREAUTH_DETECTED",
-          accountId: persisted.accountId,
-          sessionId: persisted.sessionId
-        });
-      }
+    if (startedRef.current) {
+      console.info("[blink-sdk] guestPreauthMobileRestore: already started");
+      return;
+    }
+    const persisted = loadMobileFlowState();
+    console.info("[blink-sdk] guestPreauthMobileRestore.tryStart", {
+      trigger: lastResumedAt ? "page-resume" : "initial",
+      hasPersistedState: !!persisted,
+      isGuestPreauth: persisted?.isGuestPreauth ?? false,
+      hasGuestSessionToken: !!persisted?.guestSessionToken,
+      hasSessionId: !!persisted?.sessionId,
+      accountId: persisted?.accountId ?? null
+    });
+    if (!persisted?.isGuestPreauth || !persisted.guestSessionToken || !persisted.sessionId) {
+      return;
+    }
+    startedRef.current = true;
+    mobileSetupFlowRef.current = true;
+    if (persisted.accountId) {
+      setupAccountIdRef.current = persisted.accountId;
+    }
+    if (persisted.accountId) {
       dispatch({
-        type: "MOBILE_DEEPLINK_READY",
-        deeplinkUri: persisted.deeplinkUri
-      });
-      console.info("[blink-sdk] guestPreauthMobileRestore: starting guest account polling", {
-        trigger,
+        type: "GUEST_PREAUTH_DETECTED",
+        accountId: persisted.accountId,
         sessionId: persisted.sessionId
       });
-      startGuestAccountPolling(persisted.guestSessionToken, persisted.sessionId);
-    };
-    const onVisibility = () => {
-      console.info("[blink-sdk] guestPreauthMobileRestore: visibilitychange fired", {
-        visibilityState: document.visibilityState,
-        startedRef: startedRef.current
-      });
-      if (document.visibilityState === "visible") tryStart("visibilitychange");
-    };
-    const onPageShow = (e) => {
-      console.info("[blink-sdk] guestPreauthMobileRestore: pageshow fired", {
-        persisted: e.persisted,
-        visibilityState: document.visibilityState,
-        startedRef: startedRef.current
-      });
-      if (document.visibilityState === "visible") tryStart("pageshow");
-    };
-    tryStart("initial");
-    document.addEventListener("visibilitychange", onVisibility);
-    window.addEventListener("pageshow", onPageShow);
-    return () => {
-      document.removeEventListener("visibilitychange", onVisibility);
-      window.removeEventListener("pageshow", onPageShow);
-    };
-  }, [privyReady, dispatch, mobileSetupFlowRef, setupAccountIdRef, startGuestAccountPolling]);
+    }
+    dispatch({
+      type: "MOBILE_DEEPLINK_READY",
+      deeplinkUri: persisted.deeplinkUri
+    });
+    console.info("[blink-sdk] guestPreauthMobileRestore: starting guest account polling", {
+      sessionId: persisted.sessionId
+    });
+    startGuestAccountPolling(persisted.guestSessionToken, persisted.sessionId);
+  }, [privyReady, lastResumedAt, dispatch, mobileSetupFlowRef, setupAccountIdRef, startGuestAccountPolling]);
 }
 function useSelectSourceEffect(deps) {
   const {
@@ -9711,7 +10242,9 @@ function useGuestDesktopPreauthSessionEffect(deps) {
 function useGuestPreauthPhaseSyncEffect(deps) {
   const { state, dispatch, authExecutor, isDesktop, privyAuthenticated } = deps;
   useEffect(() => {
-    if (!state.guestPreauthorizing || !isDesktop) return;
+    if (!isDesktop) return;
+    const standardDesktopAuth = privyAuthenticated && state.activeCredentialId != null && !state.guestPreauthorizing;
+    if (!state.guestPreauthorizing && !standardDesktopAuth) return;
     const pending = authExecutor.pendingSelectSource;
     if (pending) {
       if (state.phase.step === "token-picker") {
@@ -9735,7 +10268,7 @@ function useGuestPreauthPhaseSyncEffect(deps) {
       dispatch({ type: "SET_USER_INTENT", intent: { step: "one-tap-setup", action: null } });
       return;
     }
-    if (!privyAuthenticated && authExecutor.executing && state.guestPreauthAccountId) {
+    if (state.guestPreauthorizing && !privyAuthenticated && authExecutor.executing && state.guestPreauthAccountId) {
       const accountId = state.guestPreauthAccountId;
       const p = state.phase;
       if (p.step === "wallet-setup" && p.mobile == null && p.guestDesktopExtension && p.accountId === accountId) {
@@ -9763,6 +10296,7 @@ function useGuestPreauthPhaseSyncEffect(deps) {
     state.guestPreauthorizing,
     state.phase,
     state.guestPreauthAccountId,
+    state.activeCredentialId,
     isDesktop,
     privyAuthenticated,
     authExecutor.pendingSelectSource,
@@ -9811,7 +10345,7 @@ function useStandardDesktopInlineOpenWalletEffect(deps) {
   useEffect(() => {
     if (!isDesktop || state.guestPreauthorizing) return;
     if (!state.privyAuthenticated || !state.activeCredentialId || !state.selectedAccountId) return;
-    const shouldPin = authExecutor.executing && !authExecutor.pendingSelectSource && !authExecutor.pendingOneTapSetup;
+    const shouldPin = authExecutor.executing && !authExecutor.pendingSelectSource && (!authExecutor.pendingOneTapSetup || authExecutor.authorizationSessionStackDepth > 1);
     if (shouldPin && !state.standardDesktopInlineOpenWallet) {
       dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: true });
       return;
@@ -9829,6 +10363,7 @@ function useStandardDesktopInlineOpenWalletEffect(deps) {
     authExecutor.executing,
     authExecutor.pendingSelectSource,
     authExecutor.pendingOneTapSetup,
+    authExecutor.authorizationSessionStackDepth,
     dispatch
   ]);
 }
@@ -9847,7 +10382,84 @@ function useGuestAccountAutoPollingEffect(deps) {
     startPolling(guestSessionToken);
   }, [mobileFlow, isGuestFlow, guestSessionToken, isPolling, guestAccount, startPolling]);
 }
-function useGuestAccountPolling(intervalMs = 3e3) {
+var WATCHDOG_INTERVAL_MS = 1e3;
+var WATCHDOG_THRESHOLD_MS = 3e3;
+var DEDUP_COOLDOWN_MS = 500;
+function usePageResume(callback) {
+  const callbackRef = useRef(callback);
+  callbackRef.current = callback;
+  useEffect(() => {
+    let lastTickAt = Date.now();
+    let lastFiredAt = 0;
+    const fire = (source, frozenDurationMs) => {
+      const now = Date.now();
+      if (now - lastFiredAt < DEDUP_COOLDOWN_MS) return;
+      lastFiredAt = now;
+      callbackRef.current({ frozenDurationMs, source });
+    };
+    const watchdogId = window.setInterval(() => {
+      const now = Date.now();
+      const elapsed = now - lastTickAt;
+      lastTickAt = now;
+      if (elapsed > WATCHDOG_THRESHOLD_MS) {
+        fire("watchdog", elapsed);
+      }
+    }, WATCHDOG_INTERVAL_MS);
+    const handleVisibility = () => {
+      const now = Date.now();
+      if (document.visibilityState === "visible") {
+        fire("visibilitychange", now - lastTickAt);
+      }
+      lastTickAt = now;
+    };
+    const handlePageShow = (_e) => {
+      const now = Date.now();
+      if (document.visibilityState === "visible") {
+        fire("pageshow", now - lastTickAt);
+      }
+      lastTickAt = now;
+    };
+    const handleFocus = () => {
+      const now = Date.now();
+      const elapsed = now - lastTickAt;
+      lastTickAt = now;
+      if (elapsed > WATCHDOG_THRESHOLD_MS) {
+        fire("focus", elapsed);
+      }
+    };
+    document.addEventListener("visibilitychange", handleVisibility);
+    window.addEventListener("pageshow", handlePageShow);
+    window.addEventListener("focus", handleFocus);
+    return () => {
+      window.clearInterval(watchdogId);
+      document.removeEventListener("visibilitychange", handleVisibility);
+      window.removeEventListener("pageshow", handlePageShow);
+      window.removeEventListener("focus", handleFocus);
+    };
+  }, []);
+}
+var STUCK_REF_THRESHOLD_MS = 5e3;
+function usePageResumeEffect(deps) {
+  const { dispatch, handlingMobileReturnRef } = deps;
+  const dispatchRef = useRef(dispatch);
+  dispatchRef.current = dispatch;
+  usePageResume((info) => {
+    console.info("[blink-sdk] PAGE_RESUMED", {
+      source: info.source,
+      frozenDurationMs: info.frozenDurationMs
+    });
+    dispatchRef.current({ type: "PAGE_RESUMED", frozenDurationMs: info.frozenDurationMs });
+    if (info.frozenDurationMs > STUCK_REF_THRESHOLD_MS) {
+      if (handlingMobileReturnRef.current) {
+        console.info("[blink-sdk] PAGE_RESUMED: clearing stuck handlingMobileReturnRef", {
+          frozenDurationMs: info.frozenDurationMs
+        });
+        handlingMobileReturnRef.current = false;
+      }
+    }
+  });
+}
+function useGuestAccountPolling(intervalMs = 3e3, lastResumedAt = 0) {
   const { apiBaseUrl } = useBlinkConfig();
   const [guestAccount, setGuestAccount] = useState(null);
   const [isPolling, setIsPolling] = useState(false);
@@ -9945,36 +10557,71 @@ function useGuestAccountPolling(intervalMs = 3e3) {
     [poll, intervalMs, stopPolling]
   );
   useEffect(() => {
-    const handleVisibility = () => {
-      console.info("[blink-sdk] useGuestAccountPolling: visibilitychange fired", {
-        visibilityState: document.visibilityState,
-        hasToken: !!guestTokenRef.current,
-        hasSessionId: !!sessionIdRef.current
-      });
-      if (document.visibilityState === "visible" && guestTokenRef.current) {
-        void poll();
-      }
-    };
-    const handlePageShow = (e) => {
-      console.info("[blink-sdk] useGuestAccountPolling: pageshow fired", {
-        persisted: e.persisted,
-        visibilityState: document.visibilityState,
-        hasToken: !!guestTokenRef.current,
-        hasSessionId: !!sessionIdRef.current
+    if (!lastResumedAt || !guestTokenRef.current) return;
+    console.info("[blink-sdk] useGuestAccountPolling: page resumed, triggering poll", {
+      lastResumedAt,
+      hasToken: !!guestTokenRef.current,
+      hasSessionId: !!sessionIdRef.current
+    });
+    void poll();
+  }, [lastResumedAt, poll]);
+  useEffect(() => () => stopPolling(), [stopPolling]);
+  return { guestAccount, error, isPolling, startPolling, stopPolling };
+}
+function useDepositFeeEstimate({
+  apiBaseUrl,
+  getAccessToken,
+  walletId,
+  sourceTokenAddress,
+  destination,
+  amount,
+  enabled
+}) {
+  const [quoteId, setQuoteId] = useState(null);
+  const [quoteFee, setQuoteFee] = useState(null);
+  const [quoteLoading, setQuoteLoading] = useState(false);
+  const abortRef = useRef(null);
+  const fetchQuote = useCallback(async () => {
+    if (!enabled || !walletId || !sourceTokenAddress) {
+      setQuoteId(null);
+      setQuoteFee(null);
+      setQuoteLoading(false);
+      return;
+    }
+    abortRef.current?.abort();
+    const controller = new AbortController();
+    abortRef.current = controller;
+    setQuoteLoading(true);
+    try {
+      const token = await getAccessToken();
+      if (!token || controller.signal.aborted) return;
+      const quote = await postTransferQuote(apiBaseUrl, token, {
+        walletId,
+        sourceTokenAddress,
+        destination,
+        amount: { amount, currency: "USD" }
       });
-      if (document.visibilityState === "visible" && guestTokenRef.current) {
-        void poll();
+      if (controller.signal.aborted) return;
+      setQuoteId(quote.id);
+      setQuoteFee(quote.fee);
+    } catch (err) {
+      if (controller.signal.aborted) return;
+      console.warn("[blink-sdk] Fee quote failed:", err);
+      setQuoteId(null);
+      setQuoteFee(null);
+    } finally {
+      if (!controller.signal.aborted) {
+        setQuoteLoading(false);
       }
-    };
-    document.addEventListener("visibilitychange", handleVisibility);
-    window.addEventListener("pageshow", handlePageShow);
+    }
+  }, [enabled, walletId, sourceTokenAddress, destination, amount, apiBaseUrl, getAccessToken]);
+  useEffect(() => {
+    fetchQuote();
     return () => {
-      document.removeEventListener("visibilitychange", handleVisibility);
-      window.removeEventListener("pageshow", handlePageShow);
+      abortRef.current?.abort();
     };
-  }, [poll]);
-  useEffect(() => () => stopPolling(), [stopPolling]);
-  return { guestAccount, error, isPolling, startPolling, stopPolling };
+  }, [fetchQuote]);
+  return { quoteId, quoteFee, quoteLoading };
 }
 function BlinkPayment(props) {
   const resetKey = useRef(0);
@@ -10014,7 +10661,7 @@ function BlinkPaymentInner({
   );
   const authExecutor = useAuthorizationExecutor();
   const polling = useTransferPolling();
-  const guestAccountPolling = useGuestAccountPolling();
+  const guestAccountPolling = useGuestAccountPolling(3e3, state.lastResumedAt);
   const transferSigning = useTransferSigning();
   const mobileFlowRefs = {
     mobileSetupFlowRef: useRef(false),
@@ -10032,6 +10679,15 @@ function BlinkPaymentInner({
     state.accounts,
     state.knownCredentialIds
   );
+  const depositFee = useDepositFeeEstimate({
+    apiBaseUrl,
+    getAccessToken,
+    walletId: state.selectedWalletId,
+    sourceTokenAddress: derived.selectedSource?.address,
+    destination,
+    amount: depositAmount ?? 5,
+    enabled: state.phase.step === "deposit" && !state.isGuestFlow && authenticated
+  });
   const transfer = useTransferHandlers({
     dispatch,
     getAccessToken,
@@ -10049,6 +10705,9 @@ function BlinkPaymentInner({
     sourceTokenAddress: derived.selectedSource?.address,
     activeCredentialId: state.activeCredentialId,
     selectedAccountId: state.selectedAccountId,
+    selectedWalletId: state.selectedWalletId,
+    selectedTokenSymbol: state.selectedTokenSymbol,
+    quoteId: depositFee.quoteId,
     transfer: state.transfer,
     accounts: state.accounts
   });
@@ -10065,7 +10724,8 @@ function BlinkPaymentInner({
       guestTransferId: state.guestTransferId,
       guestSessionToken: state.guestSessionToken
     },
-    onComplete
+    onComplete,
+    state.lastResumedAt
   );
   const sourceSelection = useSourceSelectionHandlers(dispatch, authExecutor, {
     guestPreauthSessionId: state.guestPreauthSessionId,
@@ -10161,10 +10821,15 @@ function BlinkPaymentInner({
       dispatch({ type: "SYNC_AMOUNT", amount: depositAmount.toString() });
     }
   }, [depositAmount, dispatch]);
+  usePageResumeEffect({
+    dispatch,
+    handlingMobileReturnRef: mobileFlowRefs.handlingMobileReturnRef
+  });
   usePrivySessionSyncEffect({ dispatch, ready, authenticated });
   useGuestPreauthMobileRestoreEffect({
     dispatch,
     privyReady: state.privyReady,
+    lastResumedAt: state.lastResumedAt,
     mobileSetupFlowRef: mobileFlowRefs.mobileSetupFlowRef,
     setupAccountIdRef: mobileFlowRefs.setupAccountIdRef,
     startGuestAccountPolling: guestAccountPolling.startPolling
@@ -10177,25 +10842,24 @@ function BlinkPaymentInner({
     guestAccount: guestAccountPolling.guestAccount,
     startPolling: guestAccountPolling.startPolling
   });
-  const guestSessionTokenRef = useRef(state.guestSessionToken);
-  guestSessionTokenRef.current = state.guestSessionToken;
-  const guestPreauthSessionIdRef = useRef(state.guestPreauthSessionId);
-  guestPreauthSessionIdRef.current = state.guestPreauthSessionId;
   useEffect(() => {
-    const handleVisibility = () => {
-      if (document.visibilityState !== "visible") return;
-      const token = guestSessionTokenRef.current;
-      const sessionId = guestPreauthSessionIdRef.current;
-      if (!token) return;
-      if (guestAccountPolling.isPolling || guestAccountPolling.guestAccount) return;
-      console.info("[blink-sdk] warm-return: restarting guest account polling from React state", {
-        sessionId: sessionId ?? "(none \u2014 account-only mode)"
-      });
-      guestAccountPolling.startPolling(token, sessionId ?? void 0);
-    };
-    document.addEventListener("visibilitychange", handleVisibility);
-    return () => document.removeEventListener("visibilitychange", handleVisibility);
-  }, [guestAccountPolling.isPolling, guestAccountPolling.guestAccount, guestAccountPolling.startPolling]);
+    if (!state.lastResumedAt) return;
+    const token = state.guestSessionToken;
+    const sessionId = state.guestPreauthSessionId;
+    if (!token) return;
+    if (guestAccountPolling.isPolling || guestAccountPolling.guestAccount) return;
+    console.info("[blink-sdk] warm-return: restarting guest account polling from React state", {
+      sessionId: sessionId ?? "(none \u2014 account-only mode)"
+    });
+    guestAccountPolling.startPolling(token, sessionId ?? void 0);
+  }, [
+    state.lastResumedAt,
+    state.guestSessionToken,
+    state.guestPreauthSessionId,
+    guestAccountPolling.isPolling,
+    guestAccountPolling.guestAccount,
+    guestAccountPolling.startPolling
+  ]);
   useEffect(() => {
     console.info("[blink-sdk] guestPreauthCompletion effect", {
       hasGuestAccount: !!guestAccountPolling.guestAccount,
@@ -10360,6 +11024,11 @@ function BlinkPaymentInner({
     onLogout: handleLogout,
     onNewPayment: handleNewPayment,
     onSetPhase: (phase) => dispatch({ type: "SET_USER_INTENT", intent: phase }),
+    onBackFromSubflow: () => {
+      authExecutor.cancelPendingExecution();
+      dispatch({ type: "RESTORE_SELECTION" });
+      dispatch({ type: "SET_USER_INTENT", intent: { step: "deposit" } });
+    },
     onSetAuthInput: auth.setAuthInput,
     onSetOtpCode: (code) => {
       auth.setOtpCode(code);
@@ -10393,7 +11062,8 @@ function BlinkPaymentInner({
     handleLogout,
     handleNewPayment,
     onDismiss,
-    dispatch
+    dispatch,
+    authExecutor
   ]);
   return /* @__PURE__ */ jsx(
     StepRenderer,
@@ -10442,13 +11112,16 @@ function BlinkPaymentInner({
         guestSettingSender: guestTransfer.settingSender,
         guestPendingEntry: guestTransfer.pendingGuestEntry,
         guestQuoteFee: guestTransfer.guestFee?.quote ?? null,
-        guestQuoteLoading: guestTransfer.guestQuoteLoading
+        guestQuoteLoading: guestTransfer.guestQuoteLoading,
+        depositQuoteId: depositFee.quoteId,
+        depositQuoteFee: depositFee.quoteFee,
+        depositQuoteLoading: depositFee.quoteLoading
       },
       handlers
     }
   );
 }
 
-export { AdvancedSourceScreen, BLINK_LOGO, BLINK_MASCOT, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositScreen, FlowPhaseProvider, GuestPreauthLinkingScreen, GuestPreauthSetupCompleteScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LoginScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SelectSourceScreen, SettingsMenu, SetupScreen, SetupStatusScreen, Spinner, StepList, SuccessScreen, TokenPickerScreen, TransferStatusScreen, VerifyPasskeyScreen, WalletPickerScreen, api_exports as blinkApi, buildPasskeyPopupOptions, createPasskeyCredential, createPasskeyViaPopup, darkTheme, deviceHasPasskey, findDevicePasskey, findDevicePasskeyViaPopup, getTheme, guestEntryMatchingRecommended, lightTheme, mapGuestPickerEntries, resolvePasskeyRpId, screenForPhase, useAuthorizationExecutor, useBlinkConfig, useBlinkDepositAmount, useTransferPolling, useTransferSigning };
+export { AdvancedSourceScreen, AuthorizationSessionCancelledError, BLINK_LOGO, BLINK_MASCOT, BlinkLoadingScreen, BlinkPayment, BlinkProvider, ConfirmSignScreen, DepositScreen, FlowPhaseProvider, GuestPreauthLinkingScreen, GuestPreauthSetupCompleteScreen, GuestTokenPickerScreen, IconCircle, InfoBanner, LoginScreen, OpenWalletScreen, OtpVerifyScreen, OutlineButton, PasskeyIframeBlockedError, PasskeyScreen, PoweredByFooter, PrimaryButton, ScreenHeader, ScreenLayout, SelectSourceScreen, SettingsMenu, SetupScreen, SetupStatusScreen, Spinner, StepList, SuccessScreen, TokenPickerScreen, TransferStatusScreen, VerifyPasskeyScreen, WalletPickerScreen, api_exports as blinkApi, buildPasskeyPopupOptions, createPasskeyCredential, createPasskeyViaPopup, darkTheme, deviceHasPasskey, findDevicePasskey, findDevicePasskeyViaPopup, getTheme, guestEntryMatchingRecommended, isAuthorizationSessionCancelled, isUserDismissedAuthorizationError, lightTheme, mapGuestPickerEntries, resolvePasskeyRpId, screenForPhase, useAuthorizationExecutor, useBlinkConfig, useBlinkDepositAmount, useTransferPolling, useTransferSigning };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map