@swype-org/react-sdk 0.2.215 → 0.2.221

package/dist/index.js

@@ -962,7 +962,8 @@ function sanitizeAdvertisedWallets(value) {
 }
 var STATIC_BRIDGE_DEDUPE_RDNS = /* @__PURE__ */ new Set([
   "com.coinbase.wallet",
-  "io.metamask"
+  "io.metamask",
+  "app.phantom"
 ]);
 function buildBridgedConnector(wallet) {
   return injected({
@@ -1040,6 +1041,7 @@ function BlinkProvider({
   privyAppId,
   minTransferAmountUsd,
   enableFullWidget = false,
+  isMobileApp = false,
   children
 }) {
   const queryClientRef = useRef(null);
@@ -1078,9 +1080,10 @@ function BlinkProvider({
       minTransferAmountUsd: resolvedMinTransferAmountUsd,
       depositAmount,
       setDepositAmount,
-      enableFullWidget
+      enableFullWidget,
+      isMobileApp
     }),
-    [apiBaseUrl, theme, resolvedMinTransferAmountUsd, depositAmount, setDepositAmount, enableFullWidget]
+    [apiBaseUrl, theme, resolvedMinTransferAmountUsd, depositAmount, setDepositAmount, enableFullWidget, isMobileApp]
   );
   return /* @__PURE__ */ jsx(QueryClientProvider, { client: queryClientRef.current, children: /* @__PURE__ */ jsx(WagmiProvider, { config: wagmiConfig, reconnectOnMount: false, children: /* @__PURE__ */ jsx(
     PrivyProvider,
@@ -2137,7 +2140,19 @@ async function getWalletCapabilities(walletClient, address, chainId) {
       params: chainScopedParams ?? legacyParams
     });
     if (result && typeof result === "object" && !Array.isArray(result)) {
-      return result;
+      const caps = result;
+      const hexKey = chainId != null ? `0x${chainId.toString(16)}` : null;
+      const chainMissing = chainScopedParams && hexKey && !caps[hexKey] && !caps[String(chainId)];
+      if (chainMissing) {
+        const legacyResult = await walletClient.request({
+          method: "wallet_getCapabilities",
+          params: legacyParams
+        });
+        if (legacyResult && typeof legacyResult === "object" && !Array.isArray(legacyResult)) {
+          return legacyResult;
+        }
+      }
+      return caps;
     }
     return {};
   } catch (err) {
@@ -3458,8 +3473,54 @@ function isUserRejection(msg) {
   const lower = msg.toLowerCase();
   return lower.includes("rejected") || lower.includes("denied");
 }
-function isTrustWalletAccount(account) {
-  return connectorMatchesWallet(account?.connector, { providerName: "trust" });
+function requiresExplicitEvmNonce(account) {
+  return connectorMatchesWallet(account?.connector, { providerName: "trust" }) || connectorMatchesWallet(account?.connector, { providerName: "phantom" });
+}
+function getEvmNonceTrackerKey(sender, chainId) {
+  return `${chainId ?? "unknown"}:${sender.toLowerCase()}`;
+}
+async function snapshotExplicitEvmNonce(params) {
+  const {
+    walletClient,
+    sender,
+    chainId,
+    nonceTracker,
+    logContext,
+    actionId,
+    extraDebug
+  } = params;
+  const trackerKey = getEvmNonceTrackerKey(sender, chainId);
+  const trackedNonce = nonceTracker?.get(trackerKey) ?? null;
+  try {
+    const providerPendingNonce = await fetchLatestNonce(walletClient, sender, "pending");
+    const nonce = trackedNonce == null ? providerPendingNonce : Math.max(providerPendingNonce, trackedNonce);
+    appendDebug("info", `${logContext}: explicit nonce snapshot`, {
+      actionId,
+      sender,
+      chainId: chainId ?? null,
+      providerPendingNonce,
+      trackedNonce,
+      selectedNonce: nonce,
+      ...extraDebug ?? {}
+    });
+    return { nonce, trackerKey };
+  } catch (err) {
+    appendDebug(trackedNonce == null ? "warn" : "info", `${logContext}: pre-send nonce snapshot failed`, {
+      actionId,
+      sender,
+      chainId: chainId ?? null,
+      trackedNonce,
+      selectedNonce: trackedNonce,
+      error: err instanceof Error ? err.message : String(err),
+      ...extraDebug ?? {}
+    });
+    return { nonce: trackedNonce, trackerKey: trackedNonce == null ? null : trackerKey };
+  }
+}
+function advanceTrackedEvmNonce(nonceTracker, trackerKey, nextNonce) {
+  if (!nonceTracker || !trackerKey) return;
+  const current = nonceTracker.get(trackerKey);
+  nonceTracker.set(trackerKey, current == null ? nextNonce : Math.max(current, nextNonce));
 }
 async function waitForWalletClient(wagmiConfig, params = {}) {
   for (let i = 0; i < WALLET_CLIENT_MAX_ATTEMPTS; i++) {
@@ -4211,10 +4272,11 @@ function failBothActions(approveAction, bridgeAction, message) {
     ]
   };
 }
-async function executeApprovePermit2(action, wagmiConfig) {
+async function executeApprovePermit2(action, wagmiConfig, options = {}) {
   let walletClient = null;
   let sender = null;
   let preSendNonce = null;
+  let nonceTrackerKey = null;
   try {
     walletClient = await waitForWalletClient(wagmiConfig);
     const account = getAccount(wagmiConfig);
@@ -4238,19 +4300,20 @@ async function executeApprovePermit2(action, wagmiConfig) {
         "APPROVE_PERMIT2 metadata is missing transaction parameters (to, data)."
       );
     }
-    const shouldSnapshotPreSendNonce = isTrustWalletAccount(account);
-    if (shouldSnapshotPreSendNonce) {
-      try {
-        preSendNonce = await fetchLatestNonce(walletClient, sender, "pending");
-      } catch (err) {
-        appendDebug("warn", "APPROVE_PERMIT2: pre-send nonce snapshot failed", {
-          actionId: action.id,
-          sender,
-          error: err instanceof Error ? err.message : String(err)
-        });
-      }
+    const shouldUseExplicitNonce = requiresExplicitEvmNonce(account);
+    if (shouldUseExplicitNonce) {
+      const snapshot = await snapshotExplicitEvmNonce({
+        walletClient,
+        sender,
+        chainId: account.chainId,
+        nonceTracker: options.nonceTracker,
+        logContext: "APPROVE_PERMIT2",
+        actionId: action.id
+      });
+      preSendNonce = snapshot.nonce;
+      nonceTrackerKey = snapshot.trackerKey;
     }
-    const useExplicitNonce = shouldSnapshotPreSendNonce && preSendNonce != null;
+    const useExplicitNonce = shouldUseExplicitNonce && preSendNonce != null;
     const txParams = {
       from: sender,
       to,
@@ -4280,6 +4343,9 @@ async function executeApprovePermit2(action, wagmiConfig) {
       ),
       approveLabel
     );
+    if (preSendNonce != null) {
+      advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, preSendNonce + 1);
+    }
     appendDebug("info", "APPROVE_PERMIT2: tx sent, awaiting settlement", {
       actionId: action.id,
       txHash,
@@ -4370,6 +4436,7 @@ async function executeApprovePermit2(action, wagmiConfig) {
         actionId: action.id
       });
       if (recovery) {
+        advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, recovery.latestNonce);
         return actionRecovery(
           action,
           "Approval transaction was submitted but the wallet did not return a confirmation. Verifying on-chain\u2026",
@@ -4556,10 +4623,11 @@ async function executeSignPermit2(action, wagmiConfig, apiBaseUrl, sessionId) {
     );
   }
 }
-async function executeExecuteBridge(action, wagmiConfig) {
+async function executeExecuteBridge(action, wagmiConfig, options = {}) {
   let walletClient = null;
   let sender = null;
   let lastPreSendNonce = null;
+  let lastNonceTrackerKey = null;
   try {
     walletClient = await waitForWalletClient(wagmiConfig);
     const account = getAccount(wagmiConfig);
@@ -4580,22 +4648,25 @@ async function executeExecuteBridge(action, wagmiConfig) {
     for (let i = 0; i < calls.length; i++) {
       const call = calls[i];
       const isIntermediateCall = i < calls.length - 1;
-      const shouldSnapshotPreSendNonce = isTrustWalletAccount(account);
+      const shouldUseExplicitNonce = requiresExplicitEvmNonce(account);
       let preSendNonce = null;
-      if (shouldSnapshotPreSendNonce) {
-        try {
-          preSendNonce = await fetchLatestNonce(walletClient, sender, "pending");
-          lastPreSendNonce = preSendNonce;
-        } catch (err) {
-          appendDebug("warn", "EXECUTE_BRIDGE: pre-send nonce snapshot failed", {
-            actionId: action.id,
-            callIndex: i,
-            sender,
-            error: err instanceof Error ? err.message : String(err)
-          });
-        }
+      let nonceTrackerKey = null;
+      if (shouldUseExplicitNonce) {
+        const snapshot = await snapshotExplicitEvmNonce({
+          walletClient,
+          sender,
+          chainId: account.chainId,
+          nonceTracker: options.nonceTracker,
+          logContext: "EXECUTE_BRIDGE",
+          actionId: action.id,
+          extraDebug: { callIndex: i }
+        });
+        preSendNonce = snapshot.nonce;
+        nonceTrackerKey = snapshot.trackerKey;
+        lastPreSendNonce = preSendNonce;
+        lastNonceTrackerKey = nonceTrackerKey;
       }
-      const useExplicitNonce = shouldSnapshotPreSendNonce && preSendNonce != null;
+      const useExplicitNonce = shouldUseExplicitNonce && preSendNonce != null;
       const txParams = {
         from: sender,
         to: call.to,
@@ -4624,6 +4695,9 @@ async function executeExecuteBridge(action, wagmiConfig) {
         ),
         watchdogLabel
       );
+      if (preSendNonce != null) {
+        advanceTrackedEvmNonce(options.nonceTracker, nonceTrackerKey, preSendNonce + 1);
+      }
       appendDebug("info", "EXECUTE_BRIDGE: tx sent", {
         actionId: action.id,
         callIndex: i,
@@ -4709,6 +4783,7 @@ async function executeExecuteBridge(action, wagmiConfig) {
         actionId: action.id
       });
       if (recovery) {
+        advanceTrackedEvmNonce(options.nonceTracker, lastNonceTrackerKey, recovery.latestNonce);
         return actionRecovery(
           action,
           "Bridge transaction was submitted but the wallet did not return a confirmation. Verifying on-chain\u2026",
@@ -5253,6 +5328,7 @@ function useAuthorizationExecutor(options) {
   const walletConnectRuntimeRef = useRef(/* @__PURE__ */ new Map());
   const activeWalletConnectRuntimeKeyRef = useRef(void 0);
   const activeEvmTransportRef = useRef("wagmi");
+  const evmNonceTrackerRef = useRef(/* @__PURE__ */ new Map());
   const [batchTxHash, setBatchTxHash] = useState(null);
   const externalAuthorizationAvailableRef = useRef(false);
   const setExternalAuthorizationAvailable = useCallback((available) => {
@@ -5308,6 +5384,7 @@ function useAuthorizationExecutor(options) {
     setApproveSplConfirming(null);
     activeEvmTransportRef.current = "wagmi";
     activeWalletConnectRuntimeKeyRef.current = void 0;
+    evmNonceTrackerRef.current.clear();
     setExecuting(false);
     executingRef.current = false;
   }, []);
@@ -5333,6 +5410,7 @@ function useAuthorizationExecutor(options) {
             if (result2.status === "success" && result2.data?.transport === "wagmi") {
               activeEvmTransportRef.current = "wagmi";
               activeWalletConnectRuntimeKeyRef.current = void 0;
+              evmNonceTrackerRef.current.clear();
               if (action.metadata?.chainFamily !== "svm") {
                 walletCapabilitiesRef.current = await refreshWalletCapabilities(
                   wagmiConfig,
@@ -5345,6 +5423,7 @@ function useAuthorizationExecutor(options) {
               walletCapabilitiesRef.current = {};
               walletCapabilitiesRefreshedRef.current = true;
               batchCapabilityDecisionRef.current = null;
+              evmNonceTrackerRef.current.clear();
             }
             return result2;
           }
@@ -5354,6 +5433,7 @@ function useAuthorizationExecutor(options) {
             externalAuthorizationAvailable: externalAuthorizationAvailableRef.current
           });
           if (result.status === "success" && action.metadata?.chainFamily !== "svm") {
+            evmNonceTrackerRef.current.clear();
             walletCapabilitiesRef.current = await refreshWalletCapabilities(
               wagmiConfig,
               "open-provider"
@@ -5377,11 +5457,13 @@ function useAuthorizationExecutor(options) {
               walletCapabilitiesRef.current = {};
               walletCapabilitiesRefreshedRef.current = true;
               batchCapabilityDecisionRef.current = null;
+              evmNonceTrackerRef.current.clear();
             }
             return result2;
           }
           const result = await executeSwitchChain(action, wagmiConfig, switchChainAsync);
           if (result.status === "success" && action.metadata?.chainFamily !== "svm") {
+            evmNonceTrackerRef.current.clear();
             walletCapabilitiesRef.current = await refreshWalletCapabilities(
               wagmiConfig,
               "switch-chain"
@@ -5399,7 +5481,9 @@ function useAuthorizationExecutor(options) {
               dispatchOptions?.onWalletConnectDisplayUri
             );
           }
-          return executeApprovePermit2(action, wagmiConfig);
+          return executeApprovePermit2(action, wagmiConfig, {
+            nonceTracker: evmNonceTrackerRef.current
+          });
         case "DEPLOY_SMART_ACCOUNT":
           return actionSuccess(action, "Smart account deployment acknowledged.");
         case "SIGN_PERMIT2": {
@@ -5458,7 +5542,9 @@ function useAuthorizationExecutor(options) {
               dispatchOptions?.onWalletConnectDisplayUri
             );
           }
-          return executeExecuteBridge(action, wagmiConfig);
+          return executeExecuteBridge(action, wagmiConfig, {
+            nonceTracker: evmNonceTrackerRef.current
+          });
         default:
           return actionError(action, `Unsupported action type: ${action.type}`);
       }
@@ -5611,6 +5697,7 @@ function useAuthorizationExecutor(options) {
     setError(null);
     setBatchTxHash(null);
     setApproveSplConfirming(null);
+    evmNonceTrackerRef.current.clear();
     return true;
   }, []);
   const endExecution = useCallback(() => {
@@ -5619,6 +5706,7 @@ function useAuthorizationExecutor(options) {
     setApproveSplConfirming(null);
     activeEvmTransportRef.current = "wagmi";
     activeWalletConnectRuntimeKeyRef.current = void 0;
+    evmNonceTrackerRef.current.clear();
     setExecuting(false);
     executingRef.current = false;
   }, []);
@@ -6041,6 +6129,8 @@ var ACTION_POLL_INTERVAL_MS2 = 500;
 var ACTION_POLL_MAX_RETRIES2 = 20;
 var REPORT_COMPLETION_TIMEOUT_MS = 9e4;
 var REPORT_COMPLETION_TIMEOUT_MESSAGE = "REPORT_COMPLETION_TIMEOUT";
+var APPROVE_PERMIT2_CONFIRMING_MESSAGE = "Your Permit2 approval transaction was submitted and is still confirming on-chain. Please wait a moment and retry. Do not approve again in your wallet.";
+var SIGN_PERMIT2_CONFIRMING_MESSAGE = "Your Permit2 signature was submitted and is still confirming on-chain. Please wait a moment and retry. Do not sign again in your wallet.";
 function useAuthorizationOrchestrator(deps) {
   const blinkConfig = useOptionalBlinkConfig();
   const resolvedApiBaseUrl = deps.apiBaseUrl ?? blinkConfig?.apiBaseUrl;
@@ -6054,6 +6144,8 @@ function useAuthorizationOrchestrator(deps) {
   const selectSourceRejectRef = useRef(null);
   const oneTapResolverRef = useRef(null);
   const oneTapRejectRef = useRef(null);
+  const submittedApprovePermit2ActionIdsRef = useRef(/* @__PURE__ */ new Set());
+  const submittedSignPermit2ActionIdsRef = useRef(/* @__PURE__ */ new Set());
   const oneTapPauseRequestedRef = useRef(false);
   const addSession = useCallback((sessionId) => {
     pendingSessionIdsRef.current.push(sessionId);
@@ -6476,6 +6568,12 @@ function useAuthorizationOrchestrator(deps) {
                 completedIds.add(batchedAction.id);
                 oneTapCompletedActionIds.delete(batchedAction.id);
                 authExecutor.addResult(result2);
+                if (isSubmittedApprovePermit2Result(batchedAction, result2)) {
+                  submittedApprovePermit2ActionIdsRef.current.add(batchedAction.id);
+                }
+                if (isSubmittedSignPermit2Result(batchedAction, result2)) {
+                  submittedSignPermit2ActionIdsRef.current.add(batchedAction.id);
+                }
                 const batchedOwnerSessionId = actionSessionMap.get(batchedAction.id) ?? ownerSessionId;
                 const reportedSession2 = await reportActionCompletionWithLogging(
                   apiBaseUrl,
@@ -6503,7 +6601,9 @@ function useAuthorizationOrchestrator(deps) {
               continue;
             }
           }
-          const isPrePromptProbableActionType = action.type === "SIGN_PERMIT2" || action.type === "APPROVE_PERMIT2" || action.type === "APPROVE_SPL";
+          const approvePermit2WasSubmitted = action.type === "APPROVE_PERMIT2" && submittedApprovePermit2ActionIdsRef.current.has(action.id);
+          const signPermit2WasSubmitted = action.type === "SIGN_PERMIT2" && submittedSignPermit2ActionIdsRef.current.has(action.id);
+          const isPrePromptProbableActionType = action.type === "SIGN_PERMIT2" || action.type === "APPROVE_SPL" || approvePermit2WasSubmitted;
           if (isPrePromptProbableActionType && probeBeforePrompt && !preProbedIds.has(action.id)) {
             preProbedIds.add(action.id);
             appendDebug("info", `${action.type}: pre-prompt probe start`, {
@@ -6536,13 +6636,19 @@ function useAuthorizationOrchestrator(deps) {
               });
               continue;
             }
-            appendDebug("info", `${action.type}: pre-prompt probe did not detect; presenting wallet`, {
+            appendDebug("info", approvePermit2WasSubmitted || signPermit2WasSubmitted ? `${action.type}: submitted action not detected yet; waiting for confirmation` : `${action.type}: pre-prompt probe did not detect; presenting wallet`, {
               actionId: action.id,
               ownerSessionId,
               reason: probe.reason,
               status: probe.status,
               code: probe.code
             });
+            if (approvePermit2WasSubmitted) {
+              throw new Error(APPROVE_PERMIT2_CONFIRMING_MESSAGE);
+            }
+            if (signPermit2WasSubmitted) {
+              throw new Error(SIGN_PERMIT2_CONFIRMING_MESSAGE);
+            }
           }
           appendDebug("info", `orchestrator:executeAction start ${action.type}`, {
             actionId: action.id,
@@ -6576,6 +6682,9 @@ function useAuthorizationOrchestrator(deps) {
             const probedIds = action.type === "APPROVE_PERMIT2" ? approvePermit2ProbedIds : action.type === "EXECUTE_BRIDGE" ? executeBridgeProbedIds : null;
             if (probedIds && !probedIds.has(action.id)) {
               probedIds.add(action.id);
+              if (action.type === "APPROVE_PERMIT2") {
+                submittedApprovePermit2ActionIdsRef.current.add(action.id);
+              }
               appendDebug("warn", `${action.type}: client error with nonce advancement, probing on-chain`, {
                 actionId: action.id,
                 ownerSessionId,
@@ -6616,6 +6725,9 @@ function useAuthorizationOrchestrator(deps) {
                 status: probe.status,
                 code: probe.code
               });
+              if (action.type === "APPROVE_PERMIT2" && probe.reason === "not-found") {
+                throw new Error(APPROVE_PERMIT2_CONFIRMING_MESSAGE);
+              }
             }
           }
           if (result.status === "error" && action.type === "EXECUTE_BRIDGE" && result.message === EXECUTE_BRIDGE_TX_TIMEOUT_MESSAGE && !executeBridgeProbedIds.has(action.id)) {
@@ -6677,6 +6789,12 @@ function useAuthorizationOrchestrator(deps) {
           completedIds.add(action.id);
           oneTapCompletedActionIds.delete(action.id);
           authExecutor.addResult(result);
+          if (isSubmittedApprovePermit2Result(action, result)) {
+            submittedApprovePermit2ActionIdsRef.current.add(action.id);
+          }
+          if (isSubmittedSignPermit2Result(action, result)) {
+            submittedSignPermit2ActionIdsRef.current.add(action.id);
+          }
           const reportedSession = await reportActionCompletionWithLogging(
             apiBaseUrl,
             action,
@@ -6764,6 +6882,25 @@ function createSelectSourceResult(action, selection) {
     }
   };
 }
+function isSubmittedApprovePermit2Result(action, result) {
+  if (action.type !== "APPROVE_PERMIT2" || result.status !== "success") {
+    return false;
+  }
+  if (!result.data || typeof result.data !== "object") {
+    return false;
+  }
+  return typeof result.data.txHash === "string";
+}
+function isSubmittedSignPermit2Result(action, result) {
+  if (action.type !== "SIGN_PERMIT2" || result.status !== "success") {
+    return false;
+  }
+  if (!result.data || typeof result.data !== "object") {
+    return false;
+  }
+  const data = result.data;
+  return typeof data.signature === "string" || data.batchApprove === true;
+}
 function getLeadingBatchableActions(mergedPending) {
   const firstAction = mergedPending[0];
   if (!firstAction || !isBatchableAction(firstAction)) {
@@ -7131,6 +7268,9 @@ function resolveStickyPhase(state) {
   if (currentPhase.step === "manual-transfer" && !state.loginRequested) {
     return currentPhase;
   }
+  if (currentPhase.step === "deposit-options" && !state.loginRequested) {
+    return currentPhase;
+  }
   if (!state.loginRequested && state.setupFlowScreen === "one-tap-setup") {
     return { step: "one-tap-setup", action: null };
   }
@@ -7648,6 +7788,8 @@ function applyAction(state, action) {
         pendingTransferId: null,
         creatingTransfer: false
       };
+    case "CANCEL_LOGIN_REQUEST":
+      return { ...state, loginRequested: false, error: null };
     case "SET_ERROR":
       return { ...state, error: action.error };
     case "AMOUNT_TOO_LOW":
@@ -7829,10 +7971,10 @@ function planConfirmSetupDeposit(input) {
   };
 }
 function ScreenLayout({ children, footer }) {
-  const { tokens, theme } = useBlinkConfig();
+  const { tokens, theme, isMobileApp } = useBlinkConfig();
   const isRedesign = theme.endsWith("New");
   const useAccentWash = !isRedesign;
-  const sheetRadius = isRedesign ? tokens.radiusLg : void 0;
+  const sheetRadius = isRedesign && !isMobileApp ? tokens.radiusLg : void 0;
   const sheetClass = sheetRadius ? "blink-screen-sheet blink-screen-sheet--responsive-radius" : "blink-screen-sheet";
   return /* @__PURE__ */ jsxs("div", { className: sheetClass, style: containerStyle(tokens.bgCard, useAccentWash, sheetRadius, tokens.fontFamily), children: [
     sheetRadius && /* @__PURE__ */ jsx("style", { children: responsiveRadiusCss }),
@@ -9236,7 +9378,7 @@ var labelStyle4 = (color, disabled) => ({
 var rightSlotStyle2 = {
   display: "inline-flex",
   alignItems: "center",
-  justifyContent: "center",
+  justifyContent: "flex-end",
   minWidth: 40,
   minHeight: 40,
   flexShrink: 0,
@@ -9536,9 +9678,9 @@ function LoginScreen({
   const { tokens } = useBlinkConfig();
   const heading = heroTitle ?? "Deposit instantly\nwith Blink";
   const primaryAction = preferSignup ? onLoginWithPasskey : onSignupWithPasskey;
-  const primaryLabel = preferSignup ? "I already have a Blink Passkey" : "Create a Passkey";
+  const primaryLabel = preferSignup ? "Sign in with Blink" : "Create a Passkey";
   const secondaryAction = preferSignup ? onSignupWithPasskey : onLoginWithPasskey;
-  const secondaryLabel = preferSignup ? " Create a Passkey" : "I already have a Blink Passkey";
+  const secondaryLabel = preferSignup ? " Create a Passkey" : "Sign in with Blink";
   const headerRight = onClose ? /* @__PURE__ */ jsx(
     "button",
     {
@@ -9578,7 +9720,7 @@ function LoginScreen({
         /* @__PURE__ */ jsx(
           ScreenHeader,
           {
-            onBack: onClose ? void 0 : onBack,
+            onBack,
             right: headerRight,
             left: /* @__PURE__ */ jsx(
               "img",
@@ -9734,9 +9876,13 @@ function DepositOptionsScreen({
             /* @__PURE__ */ jsx(
               SourceRow,
               {
-                name: "Wallet",
+                name: "Connect Wallet",
                 icon: /* @__PURE__ */ jsx(WalletIcon, { color: tokens.text }),
-                onClick: onFromWallet
+                onClick: onFromWallet,
+                right: /* @__PURE__ */ jsxs("span", { style: badgeWithArrowStyle, children: [
+                  /* @__PURE__ */ jsx(RecommendedBadge, { tokens }),
+                  /* @__PURE__ */ jsx("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ jsx("path", { d: "M9 6l6 6-6 6", stroke: tokens.textMuted, strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" }) })
+                ] })
               }
             ),
             /* @__PURE__ */ jsx(
@@ -9764,38 +9910,14 @@ function DepositOptionsScreen({
   );
 }
 function DepositTypeToggle({ tokens }) {
-  return /* @__PURE__ */ jsxs(
-    "div",
-    {
-      role: "tablist",
-      "aria-label": "Deposit type",
-      "aria-disabled": "true",
-      style: toggleContainerStyle(tokens.bgRecessed),
-      children: [
-        /* @__PURE__ */ jsx(ToggleSegment, { selected: true, label: "Crypto", tokens }),
-        /* @__PURE__ */ jsx(ToggleSegment, { selected: false, label: "Cash", subLabel: "Coming soon", tokens })
-      ]
-    }
-  );
-}
-function ToggleSegment({ selected, label, subLabel, tokens }) {
-  return /* @__PURE__ */ jsxs(
-    "div",
-    {
-      role: "tab",
-      "aria-selected": selected,
-      "aria-disabled": "true",
-      style: toggleSegmentStyle(selected, tokens),
-      children: [
-        /* @__PURE__ */ jsx("span", { children: label }),
-        subLabel ? /* @__PURE__ */ jsx("span", { style: toggleSubLabelStyle, children: subLabel }) : null
-      ]
-    }
-  );
+  return /* @__PURE__ */ jsx(Fragment, {});
 }
 function ComingSoonBadge({ tokens }) {
   return /* @__PURE__ */ jsx("span", { style: comingSoonBadgeStyle(tokens.bgRecessed, tokens.textMuted), children: "Coming soon" });
 }
+function RecommendedBadge({ tokens }) {
+  return /* @__PURE__ */ jsx("span", { style: recommendedBadgeStyle(tokens.successBg, tokens.success), children: "Recommended" });
+}
 function WalletIcon({ color }) {
   return /* @__PURE__ */ jsxs("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
     /* @__PURE__ */ jsx(
@@ -9932,39 +10054,25 @@ var cardStyle = (bg) => ({
   borderRadius: 28,
   padding: "8px 8px 8px 20px"
 });
-var toggleContainerStyle = (bg) => ({
-  display: "flex",
-  width: "100%",
-  background: bg,
-  borderRadius: 999,
-  padding: 4,
-  boxSizing: "border-box"
-});
-var toggleSegmentStyle = (selected, tokens) => ({
-  flex: 1,
-  display: "flex",
-  flexDirection: "column",
+var comingSoonBadgeStyle = (bg, color) => ({
+  display: "inline-flex",
   alignItems: "center",
   justifyContent: "center",
-  textAlign: "center",
-  padding: "10px 16px",
-  borderRadius: 999,
-  fontSize: "0.95rem",
-  fontWeight: 600,
-  lineHeight: 1.15,
-  color: selected ? tokens.text : tokens.textMuted,
-  background: selected ? tokens.bg : "transparent",
-  boxShadow: selected ? tokens.shadow : "none",
-  cursor: "default",
-  userSelect: "none"
-});
-var toggleSubLabelStyle = {
-  fontSize: "0.7rem",
+  background: bg,
+  color,
+  fontSize: 10,
   fontWeight: 500,
-  marginTop: 2,
-  opacity: 0.85
+  lineHeight: 1,
+  padding: "4px 8px",
+  borderRadius: 8,
+  marginRight: 8,
+  whiteSpace: "nowrap"
+});
+var badgeWithArrowStyle = {
+  display: "flex",
+  alignItems: "center"
 };
-var comingSoonBadgeStyle = (bg, color) => ({
+var recommendedBadgeStyle = (bg, color) => ({
   display: "inline-flex",
   alignItems: "center",
   justifyContent: "center",
@@ -9975,7 +10083,6 @@ var comingSoonBadgeStyle = (bg, color) => ({
   lineHeight: 1,
   padding: "4px 8px",
   borderRadius: 8,
-  marginRight: 8,
   whiteSpace: "nowrap"
 });
 var linkIconImageStyle = (color) => ({
@@ -10901,70 +11008,59 @@ function WalletPickerScreen({
     ),
     /* @__PURE__ */ jsx("h1", { style: titleStyle3(tokens.text), children: "Link wallet" }),
     error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle5(tokens), children: error }),
-    /* @__PURE__ */ jsxs("div", { style: sheetStackStyle, children: [
-      /* @__PURE__ */ jsx("div", { style: cardStyle2(tokens.bgCardTranslucent), children: showOtherWallets ? /* @__PURE__ */ jsx(
-        OtherWalletsPanel,
-        {
-          wallets: filteredReownWallets,
-          loading: reownLoading,
-          error: reownError,
-          search: reownSearch,
-          onSearchChange: setReownSearch,
-          onRetry: () => {
-            setReownWallets([]);
-            setReownFetchAttempt((attempt) => attempt + 1);
-          },
-          onSelectWallet: (wallet) => {
-            void onSelectWalletConnectWallet(wallet);
-          }
+    /* @__PURE__ */ jsx("div", { style: sheetStackStyle, children: /* @__PURE__ */ jsx("div", { style: cardStyle2(tokens.bgCardTranslucent), children: showOtherWallets ? /* @__PURE__ */ jsx(
+      OtherWalletsPanel,
+      {
+        wallets: filteredReownWallets,
+        loading: reownLoading,
+        error: reownError,
+        search: reownSearch,
+        onSearchChange: setReownSearch,
+        onRetry: () => {
+          setReownWallets([]);
+          setReownFetchAttempt((attempt) => attempt + 1);
+        },
+        onSelectWallet: (wallet) => {
+          void onSelectWalletConnectWallet(wallet);
         }
-      ) : showWalletListSpinner ? /* @__PURE__ */ jsx("div", { style: spinnerRowStyle, children: /* @__PURE__ */ jsx(Spinner, { label: providersLoading ? "Loading wallets..." : "Preparing wallet links..." }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-        visibleProviders.map((provider) => {
-          const logoSrc = "logoURI" in provider && provider.logoURI || KNOWN_LOGOS[provider.name.toLowerCase()];
-          const directPreparedSession = directPreparedSessions[provider.id];
-          const isRowPreparing = preparing && selectedProviderId === provider.id;
-          const rowLoader = isRowPreparing ? /* @__PURE__ */ jsx(Spinner, { size: 20 }) : void 0;
-          if (usesDirectLinkCards) {
-            if (directPreparedSession?.uri) {
-              const navigation = classifyWalletDeeplinkNavigation(directPreparedSession.uri);
-              const openWithJavaScript = shouldOpenWithJavaScript(navigation);
-              return /* @__PURE__ */ jsx(
-                SourceRow,
-                {
-                  logo: logoSrc,
-                  name: provider.name,
-                  href: directPreparedSession.uri,
-                  target: navigation.anchorTarget,
-                  rel: navigation.anchorRel,
-                  onClick: (e) => {
-                    if (openWithJavaScript) {
-                      e.preventDefault();
-                    }
-                    setSelectedProviderId(provider.id);
-                    if (directPreparedSession.sessionId) {
-                      void setAuthorizationSessionProvider(
-                        apiBaseUrl,
-                        directPreparedSession.sessionId,
-                        provider.id
-                      ).catch((err) => {
-                        captureException(err);
-                      });
-                    }
-                    if (openWithJavaScript) {
-                      openDeeplink(directPreparedSession.uri);
-                    }
-                    void onSelectProvider(provider.id, directPreparedSession);
-                  }
-                },
-                provider.id
-              );
-            }
+      }
+    ) : showWalletListSpinner ? /* @__PURE__ */ jsx("div", { style: spinnerRowStyle, children: /* @__PURE__ */ jsx(Spinner, { label: providersLoading ? "Loading wallets..." : "Preparing wallet links..." }) }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+      visibleProviders.map((provider) => {
+        const logoSrc = "logoURI" in provider && provider.logoURI || KNOWN_LOGOS[provider.name.toLowerCase()];
+        const directPreparedSession = directPreparedSessions[provider.id];
+        const isRowPreparing = preparing && selectedProviderId === provider.id;
+        const rowLoader = isRowPreparing ? /* @__PURE__ */ jsx(Spinner, { size: 20 }) : void 0;
+        if (usesDirectLinkCards) {
+          if (directPreparedSession?.uri) {
+            const navigation = classifyWalletDeeplinkNavigation(directPreparedSession.uri);
+            const openWithJavaScript = shouldOpenWithJavaScript(navigation);
             return /* @__PURE__ */ jsx(
               SourceRow,
               {
                 logo: logoSrc,
                 name: provider.name,
-                disabled: true
+                href: directPreparedSession.uri,
+                target: navigation.anchorTarget,
+                rel: navigation.anchorRel,
+                onClick: (e) => {
+                  if (openWithJavaScript) {
+                    e.preventDefault();
+                  }
+                  setSelectedProviderId(provider.id);
+                  if (directPreparedSession.sessionId) {
+                    void setAuthorizationSessionProvider(
+                      apiBaseUrl,
+                      directPreparedSession.sessionId,
+                      provider.id
+                    ).catch((err) => {
+                      captureException(err);
+                    });
+                  }
+                  if (openWithJavaScript) {
+                    openDeeplink(directPreparedSession.uri);
+                  }
+                  void onSelectProvider(provider.id, directPreparedSession);
+                }
               },
               provider.id
             );
@@ -10974,36 +11070,35 @@ function WalletPickerScreen({
             {
               logo: logoSrc,
               name: provider.name,
-              right: rowLoader,
-              onClick: () => {
-                void handleRowSelect(provider.id);
-              }
+              disabled: true
             },
             provider.id
           );
-        }),
-        /* @__PURE__ */ jsx(
+        }
+        return /* @__PURE__ */ jsx(
           SourceRow,
           {
-            name: "Other",
-            icon: /* @__PURE__ */ jsx(OtherWalletsIcon, { color: tokens.textMuted }),
+            logo: logoSrc,
+            name: provider.name,
+            right: rowLoader,
             onClick: () => {
-              setShowOtherWallets(true);
+              void handleRowSelect(provider.id);
             }
-          }
-        )
-      ] }) }),
-      /* @__PURE__ */ jsx("div", { style: disabledCardStyle(tokens.bgRecessed), children: /* @__PURE__ */ jsx(
+          },
+          provider.id
+        );
+      }),
+      /* @__PURE__ */ jsx(
         SourceRow,
         {
-          disabled: true,
-          disabledColor: tokens.textTertiary,
-          name: "Bank account",
-          icon: /* @__PURE__ */ jsx(BankIcon, { color: tokens.textTertiary }),
-          right: /* @__PURE__ */ jsx("span", { style: comingSoonStyle(tokens.textTertiary), children: "Coming soon" })
+          name: "Other",
+          icon: /* @__PURE__ */ jsx(OtherWalletsIcon, {}),
+          onClick: () => {
+            setShowOtherWallets(true);
+          }
         }
-      ) })
-    ] })
+      )
+    ] }) }) })
   ] });
 }
 function OtherWalletsPanel({
@@ -11072,77 +11167,29 @@ function ReownWalletLogo({ wallet }) {
     }
   );
 }
-function OtherWalletsIcon({ color }) {
-  return /* @__PURE__ */ jsxs("svg", { width: "28", height: "28", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M7.5 9.5C10 7.2 14 7.2 16.5 9.5",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M4.5 6.5C8.7 2.9 15.3 2.9 19.5 6.5",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M10 12.5C11.1 11.7 12.9 11.7 14 12.5",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M12 16H12.01",
-        stroke: color,
-        strokeWidth: "2.4",
-        strokeLinecap: "round"
-      }
-    )
-  ] });
-}
-function BankIcon({ color }) {
-  return /* @__PURE__ */ jsxs("svg", { width: "28", height: "28", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: [
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M3 10L12 4L21 10",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round",
-        strokeLinejoin: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M5 10V18M9 10V18M15 10V18M19 10V18",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round"
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      "path",
-      {
-        d: "M3 20H21",
-        stroke: color,
-        strokeWidth: "1.8",
-        strokeLinecap: "round"
-      }
-    )
-  ] });
+function OtherWalletsIcon() {
+  return /* @__PURE__ */ jsxs(
+    "svg",
+    {
+      width: "34",
+      height: "34",
+      viewBox: "0 0 400 400",
+      fill: "none",
+      xmlns: "http://www.w3.org/2000/svg",
+      "aria-hidden": "true",
+      style: { borderRadius: "50%" },
+      children: [
+        /* @__PURE__ */ jsx("circle", { cx: "200", cy: "200", fill: "#3396ff", r: "199.5", stroke: "#66b1ff" }),
+        /* @__PURE__ */ jsx(
+          "path",
+          {
+            d: "m122.519 148.965c42.791-41.729 112.171-41.729 154.962 0l5.15 5.022c2.14 2.086 2.14 5.469 0 7.555l-17.617 17.18c-1.07 1.043-2.804 1.043-3.874 0l-7.087-6.911c-29.853-29.111-78.253-29.111-108.106 0l-7.59 7.401c-1.07 1.043-2.804 1.043-3.874 0l-17.617-17.18c-2.14-2.086-2.14-5.469 0-7.555zm191.397 35.529 15.679 15.29c2.14 2.086 2.14 5.469 0 7.555l-70.7 68.944c-2.139 2.087-5.608 2.087-7.748 0l-50.178-48.931c-.535-.522-1.402-.522-1.937 0l-50.178 48.931c-2.139 2.087-5.608 2.087-7.748 0l-70.7015-68.945c-2.1396-2.086-2.1396-5.469 0-7.555l15.6795-15.29c2.1396-2.086 5.6085-2.086 7.7481 0l50.1789 48.932c.535.522 1.402.522 1.937 0l50.177-48.932c2.139-2.087 5.608-2.087 7.748 0l50.179 48.932c.535.522 1.402.522 1.937 0l50.179-48.931c2.139-2.087 5.608-2.087 7.748 0z",
+            fill: "#fff"
+          }
+        )
+      ]
+    }
+  );
 }
 function isAbortError(err) {
   return err instanceof DOMException && err.name === "AbortError";
@@ -11191,19 +11238,6 @@ var cardStyle2 = (bg) => ({
   borderRadius: 28,
   padding: "8px 8px 8px 20px"
 });
-var disabledCardStyle = (bg) => ({
-  display: "flex",
-  flexDirection: "column",
-  background: bg,
-  borderRadius: 28,
-  padding: "8px 8px 8px 20px"
-});
-var comingSoonStyle = (color) => ({
-  fontSize: "1rem",
-  color,
-  paddingRight: 8,
-  whiteSpace: "nowrap"
-});
 var spinnerRowStyle = {
   display: "flex",
   alignItems: "center",
@@ -12324,13 +12358,14 @@ function DepositScreen({
     (opt) => opt.balance == null || isSelectableDepositSourceAmountUsd(opt.balance, minDepositFloor)
   ) ?? [];
   const hasTokenDropdown = selectableTokenOptions.length > 0 && onPickToken != null;
+  const canOpenInlineSheet = onPickToken != null && (hasTokenDropdown || (accounts?.length ?? 0) > 0);
   const handleOpenSourceSheet = useCallback(() => {
-    if (hasTokenDropdown) {
+    if (canOpenInlineSheet) {
       setTokenPickerOpen((v) => !v);
     } else {
       onSelectToken?.();
     }
-  }, [hasTokenDropdown, onSelectToken]);
+  }, [canOpenInlineSheet, onSelectToken]);
   const handleCloseSourceSheet = useCallback(() => {
     setTokenPickerOpen(false);
   }, []);
@@ -12342,9 +12377,9 @@ function DepositScreen({
   const exceedsLimit = remainingLimit != null && amount > remainingLimit && !isLowBalance && !needsAuthorization;
   const canDeposit = amount >= minDepositFloor && !exceedsLimit && !isLowBalance && !insufficientFunds && !needsAuthorization && !processing;
   const hasAccountPill = !!accounts && accounts.length > 0;
-  const pillClickable = hasTokenDropdown || !!onSelectToken;
+  const pillClickable = canOpenInlineSheet || !!onSelectToken;
   const tokenAriaLabel = selectedTokenSymbol && selectedChainName ? `Selected token: ${selectedTokenSymbol} on ${selectedChainName}` : selectedTokenSymbol ? `Selected token: ${selectedTokenSymbol}` : "Select token";
-  if (tokenPickerOpen && hasTokenDropdown) {
+  if (tokenPickerOpen && canOpenInlineSheet) {
     const depositSourceAccounts = (accounts ?? []).map((a) => {
       const preferred = getPreferredDepositWallet(a, amount);
       return {
@@ -12405,8 +12440,8 @@ function DepositScreen({
           onClick: handleOpenSourceSheet,
           style: redesignPillButtonStyle(pillClickable),
           "aria-label": tokenAriaLabel,
-          "aria-expanded": hasTokenDropdown ? tokenPickerOpen : void 0,
-          "aria-haspopup": hasTokenDropdown ? "listbox" : void 0,
+          "aria-expanded": canOpenInlineSheet ? tokenPickerOpen : void 0,
+          "aria-haspopup": canOpenInlineSheet ? "listbox" : void 0,
           children: /* @__PURE__ */ jsx(
             SourcePill,
             {
@@ -12519,8 +12554,8 @@ function SuccessScreen({
   onLogout,
   returnMessage
 }) {
-  const { tokens } = useBlinkConfig();
-  const headerRight = succeeded && onDone ? /* @__PURE__ */ jsx(
+  const { tokens, isMobileApp } = useBlinkConfig();
+  const headerRight = succeeded && onDone && !isMobileApp ? /* @__PURE__ */ jsx(
     "button",
     {
       type: "button",
@@ -12721,7 +12756,7 @@ function SelectSourceScreen({
                 /* @__PURE__ */ jsxs("div", { style: optionContentStyle, children: [
                   /* @__PURE__ */ jsxs("span", { style: optionNameStyle(tokens.text), children: [
                     chain.chainName,
-                    isRecommended && /* @__PURE__ */ jsx("span", { style: recommendedBadgeStyle(tokens.textMuted), children: " recommended" })
+                    isRecommended && /* @__PURE__ */ jsx("span", { style: recommendedBadgeStyle2(tokens.textMuted), children: " recommended" })
                   ] }),
                   /* @__PURE__ */ jsxs("span", { style: optionBalanceStyle(tokens.textMuted), children: [
                     "$",
@@ -12817,7 +12852,7 @@ var optionNameStyle = (color) => ({
   fontWeight: 600,
   color
 });
-var recommendedBadgeStyle = (color) => ({
+var recommendedBadgeStyle2 = (color) => ({
   fontSize: "0.7rem",
   fontWeight: 500,
   color,
@@ -15327,10 +15362,10 @@ function buildLoginScreenProps({ flow, handlers }) {
     onSignupWithPasskey: handlers.onSignupWithPasskey,
     loading: flow.passkeyLoading,
     error: flow.state.error,
-    // Login is the root screen, so "back" and "close" both dismiss the widget.
-    // Exposing onClose lets LoginScreen render the Figma-redesign top-right
-    // (X) button instead of the legacy back arrow.
-    onClose: flow.onBack,
+    // Inside a native mobile in-app browser the host's chrome handles
+    // dismissal, so suppress the in-screen (X) close button.
+    onClose: flow.isMobileApp ? void 0 : flow.onBack,
+    onBack: flow.state.enableFullWidget ? handlers.onCancelLogin : void 0,
     merchantInitials: flow.merchantName ? flow.merchantName.slice(0, 2).toUpperCase() : void 0
   };
 }
@@ -15345,8 +15380,9 @@ function buildDepositOptionsScreenProps({ flow, handlers }) {
     // Deposit-options is the root screen for the full-widget flow, so the
     // top-right (X) closes the widget through the same `onBack` the host
     // provides. Falling back to `undefined` hides the close button when the
-    // host did not pass an onBack (matches LoginScreen behavior).
-    onClose: flow.onBack
+    // host did not pass an onBack (matches LoginScreen behavior). Inside a
+    // native mobile in-app browser the host chrome handles dismissal.
+    onClose: flow.isMobileApp ? void 0 : flow.onBack
   };
 }
 function buildPasskeyReadyScreenProps({ handlers }) {
@@ -15584,7 +15620,7 @@ function buildDepositScreenProps({
     error: state.error,
     onDeposit: handlers.onPay,
     onSwitchWallet: () => handlers.onSetPhase({ step: "wallet-picker", reason: "switch" }),
-    onBack: onBack ?? (() => handlers.onLogout()),
+    onBack: state.enableFullWidget ? () => handlers.onSetPhase({ step: "deposit-options" }) : onBack ?? (() => handlers.onLogout()),
     onLogout: handlers.onLogout,
     onIncreaseLimit: handlers.onIncreaseLimit,
     increasingLimit: state.increasingLimit,
@@ -15597,7 +15633,7 @@ function buildDepositScreenProps({
     // the inline sheet can't render). Hosts with sources get the inline
     // SelectDepositSourceScreen via onPickToken below.
     onSelectToken: handlers.onSelectToken,
-    tokenOptions: depositTokenOptions.length > 0 ? depositTokenOptions : void 0,
+    tokenOptions: depositTokenOptions,
     useDeeplink: !flow.isDesktop,
     onPickToken: (symbol, chainName, walletId) => {
       const match = depositTokenOptions.find(
@@ -15751,13 +15787,15 @@ function buildAmountTooLowScreenProps({
   flow,
   handlers
 }) {
-  const { state, onDismiss } = flow;
+  const { state, onDismiss, isMobileApp } = flow;
   const minAmountUsd = state.phase.step === "amount-too-low" ? state.phase.minAmountUsd : state.amountTooLow?.minAmountUsd ?? flow.minTransferAmountUsd;
   const canRetry = flow.depositAmount == null;
   return {
     minAmountUsd,
     onRetry: canRetry ? handlers.onNewPayment : void 0,
-    onClose: onDismiss
+    // Inside a native mobile in-app browser the host's chrome handles
+    // dismissal, so suppress the in-screen (X) close button.
+    onClose: isMobileApp ? void 0 : onDismiss
   };
 }
 function StepRenderer(props) {
@@ -18924,7 +18962,7 @@ function BlinkPaymentInner({
   onBack,
   onDismiss
 }) {
-  const { apiBaseUrl, depositAmount, minTransferAmountUsd, enableFullWidget } = useBlinkConfig();
+  const { apiBaseUrl, depositAmount, minTransferAmountUsd, enableFullWidget, isMobileApp } = useBlinkConfig();
   const { ready, authenticated, logout, getAccessToken } = usePrivy();
   const popupAuthRef = useRef(loadPopupAuth());
   const popupAuthValid = (() => {
@@ -19436,6 +19474,11 @@ function BlinkPaymentInner({
     onNewPayment: handleNewPayment,
     onSetPhase: (phase) => {
       clearScreenErrors();
+      if (phase.step === "deposit") {
+        dispatch({ type: "SET_SETUP_DEPOSIT_AMOUNT", amount: null });
+        dispatch({ type: "CLEAR_SETUP_DEPOSIT_TOKEN" });
+        dispatch({ type: "SET_SETUP_FLOW_SCREEN", screen: null });
+      }
       dispatch({ type: "SET_USER_INTENT", intent: phase });
     },
     onAddProviderFromDeposit: (amount) => {
@@ -19449,6 +19492,11 @@ function BlinkPaymentInner({
       authExecutor.cancelPendingExecution();
       clearScreenErrors();
       dispatch({ type: "RESTORE_SELECTION" });
+      dispatch({ type: "SET_SETUP_DEPOSIT_AMOUNT", amount: null });
+      dispatch({ type: "CLEAR_SETUP_DEPOSIT_TOKEN" });
+      dispatch({ type: "SET_SETUP_FLOW_SCREEN", screen: null });
+      dispatch({ type: "DESKTOP_WAIT_CLEARED" });
+      dispatch({ type: "SET_STANDARD_DESKTOP_INLINE_OPEN_WALLET", value: false });
       dispatch({ type: "SET_USER_INTENT", intent: { step: "deposit" } });
     },
     onSelectSourceChainChange: sourceSelection.handleSelectSourceChainChange,
@@ -19461,6 +19509,7 @@ function BlinkPaymentInner({
     onPrepareTokenAuthorization: provider.handlePrepareTokenAuthorization,
     onCommitTokenAuthorization: provider.handleCommitTokenAuthorization,
     onLogin: () => dispatch({ type: "REQUEST_LOGIN" }),
+    onCancelLogin: () => dispatch({ type: "CANCEL_LOGIN_REQUEST" }),
     onSetDepositAmount: handleSetDepositAmount,
     onSetDepositToken: handleSetDepositToken,
     onConfirmSetupDeposit: handleConfirmSetupDeposit
@@ -19492,6 +19541,7 @@ function BlinkPaymentInner({
         authenticated: effectiveAuthenticated,
         passkeyLoading: auth.passkeyLoginStatus !== "initial" && auth.passkeyLoginStatus !== "done" && auth.passkeyLoginStatus !== "error" || auth.passkeySignupStatus !== "initial" && auth.passkeySignupStatus !== "done" && auth.passkeySignupStatus !== "error" || auth.passkeySignupPopupActive,
         isDesktop,
+        isMobileApp: isMobileApp ?? false,
         merchantName,
         onBack,
         onDismiss,