@swype-org/react-sdk 0.1.225 → 0.1.227

package/dist/index.cjs

@@ -1935,9 +1935,7 @@ function deriveSourceTypeAndId(state) {
   return { sourceType: "accountId", sourceId: "" };
 }
 function createInitialState(config) {
-  const isReturningUser = config.activeCredentialId != null;
   return {
-    step: isReturningUser ? "login" : "wallet-picker",
     error: null,
     providers: [],
     accounts: [],
@@ -1953,6 +1951,7 @@ function createInitialState(config) {
     registeringPasskey: false,
     verifyingPasskeyPopup: false,
     passkeyPopupNeeded: config.passkeyPopupNeeded,
+    passkeyConfigLoaded: false,
     activeCredentialId: config.activeCredentialId,
     knownCredentialIds: [],
     verificationTarget: null,
@@ -1960,12 +1959,12 @@ function createInitialState(config) {
     mobileFlow: false,
     deeplinkUri: null,
     increasingLimit: false,
-    previousStep: null,
     isGuestFlow: false,
     guestTransferId: null,
     guestSessionToken: null,
     guestPreauthAccountId: null,
-    activePublicKey: null
+    activePublicKey: null,
+    userIntent: null
   };
 }
 function paymentReducer(state, action) {
@@ -1975,21 +1974,20 @@ function paymentReducer(state, action) {
       return {
         ...state,
         verificationTarget: action.target,
-        error: null,
-        step: "otp-verify"
+        error: null
       };
     case "BACK_TO_LOGIN":
       return {
         ...state,
         verificationTarget: null,
-        error: null,
-        step: "login"
+        error: null
       };
     // ── Passkey ──────────────────────────────────────────────────
     case "PASSKEY_CONFIG_LOADED":
       return {
         ...state,
         knownCredentialIds: action.knownIds,
+        passkeyConfigLoaded: true,
         oneTapLimit: action.oneTapLimit ?? state.oneTapLimit
       };
     case "PASSKEY_ACTIVATED":
@@ -2023,9 +2021,6 @@ function paymentReducer(state, action) {
         next.mobileFlow = false;
         next.deeplinkUri = null;
       }
-      if (action.resolvedStep !== void 0) {
-        next.step = action.resolvedStep;
-      }
       return next;
     }
     case "DATA_LOAD_END":
@@ -2049,7 +2044,8 @@ function paymentReducer(state, action) {
         selectedProviderId: action.providerId,
         selectedAccountId: null,
         selectedWalletId: null,
-        selectedTokenSymbol: null
+        selectedTokenSymbol: null,
+        userIntent: null
       };
     case "SELECT_ACCOUNT":
       return {
@@ -2057,24 +2053,24 @@ function paymentReducer(state, action) {
         selectedAccountId: action.accountId,
         selectedWalletId: action.walletId,
         selectedTokenSymbol: null,
-        step: "deposit"
+        userIntent: null
       };
     case "SELECT_TOKEN":
       return {
         ...state,
         selectedWalletId: action.walletId,
         selectedTokenSymbol: action.tokenSymbol,
-        step: "deposit"
+        userIntent: null
       };
     // ── Transfer lifecycle ───────────────────────────────────────
     case "PAY_STARTED":
       return {
         ...state,
-        step: action.isSetupRedirect ? "open-wallet" : "processing",
         error: null,
         creatingTransfer: true,
         deeplinkUri: null,
-        mobileFlow: false
+        mobileFlow: false,
+        userIntent: null
       };
     case "PAY_ENDED":
       return { ...state, creatingTransfer: false };
@@ -2082,7 +2078,7 @@ function paymentReducer(state, action) {
       return {
         ...state,
         error: action.error,
-        step: action.fallbackStep
+        creatingTransfer: false
       };
     case "TRANSFER_CREATED":
       return { ...state, transfer: action.transfer };
@@ -2092,7 +2088,6 @@ function paymentReducer(state, action) {
       return {
         ...state,
         transfer: action.transfer,
-        step: "success",
         mobileFlow: false,
         deeplinkUri: null
       };
@@ -2101,17 +2096,20 @@ function paymentReducer(state, action) {
         ...state,
         transfer: action.transfer,
         error: action.error,
-        step: "success",
         mobileFlow: false,
         deeplinkUri: null
       };
     case "PROCESSING_TIMEOUT":
-      return { ...state, error: action.error, step: "deposit" };
+      return {
+        ...state,
+        error: action.error,
+        transfer: null,
+        creatingTransfer: false
+      };
     case "CONFIRM_SIGN_SUCCESS":
       return {
         ...state,
         transfer: action.transfer,
-        step: "processing",
         mobileFlow: false,
         deeplinkUri: null
       };
@@ -2120,8 +2118,7 @@ function paymentReducer(state, action) {
       return {
         ...state,
         mobileFlow: true,
-        deeplinkUri: action.deeplinkUri,
-        step: "open-wallet"
+        deeplinkUri: action.deeplinkUri
       };
     case "MOBILE_SETUP_COMPLETE":
       return {
@@ -2129,8 +2126,7 @@ function paymentReducer(state, action) {
         transfer: action.transfer ?? state.transfer,
         error: null,
         mobileFlow: false,
-        deeplinkUri: null,
-        step: "deposit"
+        deeplinkUri: null
       };
     case "MOBILE_SIGN_READY":
       return {
@@ -2138,8 +2134,7 @@ function paymentReducer(state, action) {
         transfer: action.transfer,
         error: null,
         mobileFlow: false,
-        deeplinkUri: null,
-        step: "confirm-sign"
+        deeplinkUri: null
       };
     case "CLEAR_MOBILE_STATE":
       return { ...state, mobileFlow: false, deeplinkUri: null };
@@ -2149,8 +2144,7 @@ function paymentReducer(state, action) {
         mobileFlow: true,
         deeplinkUri: action.deeplinkUri,
         selectedProviderId: action.providerId ?? state.selectedProviderId,
-        error: action.error ?? null,
-        step: "open-wallet"
+        error: action.error ?? null
       };
     case "MOBILE_RESUME_SUCCESS":
       return {
@@ -2158,8 +2152,7 @@ function paymentReducer(state, action) {
         transfer: action.transfer,
         error: null,
         mobileFlow: false,
-        deeplinkUri: null,
-        step: "success"
+        deeplinkUri: null
       };
     case "MOBILE_RESUME_FAILED":
       return {
@@ -2167,8 +2160,7 @@ function paymentReducer(state, action) {
         transfer: action.transfer,
         error: "Transfer failed.",
         mobileFlow: false,
-        deeplinkUri: null,
-        step: "success"
+        deeplinkUri: null
       };
     case "MOBILE_RESUME_PROCESSING":
       return {
@@ -2176,8 +2168,7 @@ function paymentReducer(state, action) {
         transfer: action.transfer,
         error: null,
         mobileFlow: false,
-        deeplinkUri: null,
-        step: "processing"
+        deeplinkUri: null
       };
     // ── Increase limit ───────────────────────────────────────────
     case "SET_INCREASING_LIMIT":
@@ -2199,14 +2190,12 @@ function paymentReducer(state, action) {
         guestSessionToken: action.guestSessionToken,
         selectedAccountId: null,
         selectedWalletId: null,
-        selectedTokenSymbol: null,
-        step: "token-picker"
+        selectedTokenSymbol: null
       };
     case "GUEST_TRANSFER_COMPLETED":
       return {
         ...state,
         transfer: action.transfer,
-        step: "success",
         mobileFlow: false,
         deeplinkUri: null,
         isGuestFlow: true,
@@ -2215,27 +2204,24 @@ function paymentReducer(state, action) {
     case "GUEST_PREAUTH_DETECTED":
       return {
         ...state,
-        guestPreauthAccountId: action.accountId,
-        step: "login"
+        guestPreauthAccountId: action.accountId
       };
     case "ACCOUNT_OWNER_SET":
       return {
         ...state,
         guestPreauthAccountId: null,
         activePublicKey: null,
-        step: "deposit",
         error: null
       };
-    // ── Navigation & error ───────────────────────────────────────
-    case "NAVIGATE":
-      return { ...state, step: action.step, previousStep: state.step, error: null };
+    // ── User intent & error ──────────────────────────────────────
+    case "SET_USER_INTENT":
+      return { ...state, userIntent: action.intent };
     case "SET_ERROR":
       return { ...state, error: action.error };
     // ── Lifecycle ────────────────────────────────────────────────
     case "NEW_PAYMENT":
       return {
         ...state,
-        step: state.isGuestFlow ? "wallet-picker" : "deposit",
         transfer: null,
         error: null,
         amount: action.depositAmount != null ? action.depositAmount.toString() : "",
@@ -2248,7 +2234,8 @@ function paymentReducer(state, action) {
         guestTransferId: null,
         guestSessionToken: null,
         guestPreauthAccountId: null,
-        activePublicKey: null
+        activePublicKey: null,
+        userIntent: null
       };
     case "LOGOUT":
       return {
@@ -2316,6 +2303,87 @@ function isMobileUserAgent(userAgent) {
 function shouldUseWalletConnector(options) {
   return options.useWalletConnector ?? !isMobileUserAgent(options.userAgent);
 }
+
+// src/resolveScreen.ts
+function hasActiveWallet(accounts) {
+  return accounts.some((a) => a.wallets.some((w) => w.status === "ACTIVE"));
+}
+function isTransferTerminal(transfer) {
+  return transfer?.status === "COMPLETED" || transfer?.status === "FAILED";
+}
+function isTransferInFlight(transfer) {
+  if (!transfer) return false;
+  return ["CREATED", "SENDING", "SENT"].includes(transfer.status);
+}
+function isSetupTransfer(transfer) {
+  if (!transfer) return false;
+  return transfer.sources?.some(
+    (s) => s.wallets && Array.isArray(s.wallets) && s.wallets.length === 0
+  ) ?? false;
+}
+function resolveScreen(state) {
+  if (!state.privyReady) {
+    return "loading";
+  }
+  if (state.authenticated && !state.activeCredentialId && !state.passkeyConfigLoaded) {
+    return "loading";
+  }
+  if (!state.authenticated && !state.verificationTarget && !state.isGuestFlow && (state.isReturningUser || state.guestPreauthRedirect)) {
+    return "login";
+  }
+  if (!state.authenticated && state.verificationTarget != null) {
+    return "otp-verify";
+  }
+  if (state.authenticated && !state.activeCredentialId && state.passkeyConfigLoaded && (state.knownCredentialIds.length === 0 || !state.passkeyPopupNeeded)) {
+    return "create-passkey";
+  }
+  if (state.authenticated && !state.activeCredentialId && state.passkeyConfigLoaded && state.knownCredentialIds.length > 0 && state.passkeyPopupNeeded) {
+    return "verify-passkey";
+  }
+  if (isTransferTerminal(state.transfer)) {
+    return "success";
+  }
+  if (state.creatingTransfer || state.transfer != null && isTransferInFlight(state.transfer)) {
+    return "processing";
+  }
+  if (state.transfer?.status === "AUTHORIZED" && !state.isDesktop && !isSetupTransfer(state.transfer)) {
+    return "confirm-sign";
+  }
+  if (state.pendingSelectSource != null) {
+    return state.isDesktop ? "setup" : "select-source";
+  }
+  if (state.pendingOneTapSetup != null && !state.oneTapLimitAlreadySaved) {
+    return "setup";
+  }
+  if (state.mobileFlow || state.inlineAuthorizationExecuting) {
+    return state.isDesktop ? "setup-status" : "open-wallet";
+  }
+  if (state.isGuestFlow && state.selectedProviderId != null && !state.transfer && !state.guestSettingSender) {
+    return "guest-token-picker";
+  }
+  if (state.activeCredentialId && !hasActiveWallet(state.accounts) && !state.mobileFlow || !state.authenticated && !state.isReturningUser && !state.isGuestFlow) {
+    return "wallet-picker";
+  }
+  if (state.loadingData && state.activeCredentialId != null && hasActiveWallet(state.accounts)) {
+    return "loading";
+  }
+  if (state.userIntent === "pick-token" && state.selectedAccount != null) {
+    return "token-picker";
+  }
+  if (state.userIntent === "configure-one-tap") {
+    return "setup";
+  }
+  if (state.userIntent === "switch-wallet") {
+    return "wallet-picker";
+  }
+  if (state.activeCredentialId != null && hasActiveWallet(state.accounts) && !state.loadingData) {
+    return "deposit";
+  }
+  if (state.isGuestFlow) {
+    return "wallet-picker";
+  }
+  return "wallet-picker";
+}
 var MUTED = "#7fa4b0";
 var LOGO_SIZE = 48;
 function BlinkLoadingScreen() {
@@ -5783,7 +5851,7 @@ var emptyStyle = (color) => ({
   padding: "32px 0",
   lineHeight: 1.5
 });
-var LINK_STEPS = /* @__PURE__ */ new Set([
+var LINK_SCREENS = /* @__PURE__ */ new Set([
   "create-passkey",
   "verify-passkey",
   "wallet-picker",
@@ -5792,27 +5860,56 @@ var LINK_STEPS = /* @__PURE__ */ new Set([
   "setup",
   "confirm-sign"
 ]);
-var DEPOSIT_STEPS = /* @__PURE__ */ new Set([
+var DEPOSIT_SCREENS = /* @__PURE__ */ new Set([
   "deposit",
-  "low-balance",
   "processing",
   "success"
 ]);
-function getFlowPhase(step, previousStep) {
-  if (LINK_STEPS.has(step)) return "link";
-  if (DEPOSIT_STEPS.has(step)) return "deposit";
-  if (step === "token-picker" || step === "select-source") {
-    return previousStep === "setup" ? "link" : "deposit";
+function getFlowPhase(screen, userIntent) {
+  if (LINK_SCREENS.has(screen)) return "link";
+  if (DEPOSIT_SCREENS.has(screen)) return "deposit";
+  if (screen === "token-picker" || screen === "select-source" || screen === "guest-token-picker") {
+    return userIntent === "configure-one-tap" ? "link" : "deposit";
   }
   return null;
 }
 function StepRenderer(props) {
-  const phase = getFlowPhase(props.state.step, props.state.previousStep);
-  return /* @__PURE__ */ jsxRuntime.jsx(FlowPhaseProvider, { phase, children: /* @__PURE__ */ jsxRuntime.jsx(StepRendererContent, { ...props }) });
+  const isDesktop = shouldUseWalletConnector({
+    userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
+  });
+  const isReturningUser = props.state.activeCredentialId != null || typeof window !== "undefined" && window.localStorage.getItem("blink_active_credential") != null;
+  const screenState = {
+    privyReady: props.ready,
+    authenticated: props.authenticated,
+    verificationTarget: props.state.verificationTarget,
+    activeCredentialId: props.state.activeCredentialId,
+    knownCredentialIds: props.state.knownCredentialIds,
+    passkeyConfigLoaded: props.state.passkeyConfigLoaded,
+    passkeyPopupNeeded: props.state.passkeyPopupNeeded,
+    accounts: props.state.accounts,
+    isGuestFlow: props.state.isGuestFlow,
+    selectedProviderId: props.state.selectedProviderId,
+    mobileFlow: props.state.mobileFlow,
+    inlineAuthorizationExecuting: props.inlineAuthorizationExecuting,
+    creatingTransfer: props.state.creatingTransfer,
+    transfer: props.state.transfer,
+    pendingSelectSource: props.pendingSelectSource,
+    pendingOneTapSetup: props.pendingOneTapSetup,
+    oneTapLimitAlreadySaved: props.oneTapLimitAlreadySaved,
+    loadingData: props.state.loadingData,
+    isDesktop,
+    isReturningUser,
+    guestPreauthRedirect: props.state.guestPreauthAccountId != null,
+    userIntent: props.state.userIntent,
+    selectedAccount: props.selectedAccount,
+    guestSettingSender: props.guestSettingSender
+  };
+  const screen = resolveScreen(screenState);
+  const phase = getFlowPhase(screen, props.state.userIntent);
+  return /* @__PURE__ */ jsxRuntime.jsx(FlowPhaseProvider, { phase, children: /* @__PURE__ */ jsxRuntime.jsx(StepRendererContent, { ...props, screen, isDesktop }) });
 }
 function StepRendererContent({
   state,
-  ready,
   authenticated,
   activeOtpStatus,
   pollingTransfer,
@@ -5842,204 +5939,204 @@ function StepRendererContent({
   onBack,
   onDismiss,
   depositAmount,
-  handlers
+  handlers,
+  screen,
+  isDesktop
 }) {
-  const { step } = state;
   const selectedWallet = selectedAccount?.wallets.find((w) => w.id === state.selectedWalletId);
   const selectedSourceLabel = selectedSource && selectedWallet ? `${selectedSource.token.symbol} on ${selectedWallet.chain.name}` : void 0;
-  if (!ready) {
-    return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
-  }
-  if (step === "login") {
-    if (authenticated) {
+  switch (screen) {
+    case "loading":
       return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
+    case "login":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        LoginScreen,
+        {
+          authInput,
+          onAuthInputChange: handlers.onSetAuthInput,
+          onSubmit: handlers.onSendLoginCode,
+          sending: activeOtpStatus === "sending-code",
+          error: state.error,
+          onBack,
+          merchantInitials: merchantName ? merchantName.slice(0, 2).toUpperCase() : void 0
+        }
+      );
+    case "otp-verify":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        OtpVerifyScreen,
+        {
+          maskedIdentifier: state.verificationTarget ? maskAuthIdentifier(state.verificationTarget) : "",
+          otpCode,
+          onOtpChange: (code) => {
+            handlers.onSetOtpCode(code);
+          },
+          onVerify: handlers.onVerifyLoginCode,
+          onResend: handlers.onResendLoginCode,
+          onBack: handlers.onBackFromOtp,
+          verifying: activeOtpStatus === "submitting-code" || authenticated,
+          error: state.error
+        }
+      );
+    case "create-passkey":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        PasskeyScreen,
+        {
+          onCreatePasskey: handlers.onRegisterPasskey,
+          onBack: handlers.onLogout,
+          onLogout: handlers.onLogout,
+          creating: state.registeringPasskey,
+          error: state.error,
+          popupFallback: state.passkeyPopupNeeded,
+          onCreatePasskeyViaPopup: handlers.onCreatePasskeyViaPopup
+        }
+      );
+    case "verify-passkey":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        PasskeyScreen,
+        {
+          onCreatePasskey: handlers.onRegisterPasskey,
+          onBack: handlers.onLogout,
+          onLogout: handlers.onLogout,
+          creating: state.verifyingPasskeyPopup,
+          error: state.error,
+          popupFallback: true,
+          onCreatePasskeyViaPopup: handlers.onVerifyPasskeyViaPopup
+        }
+      );
+    case "wallet-picker": {
+      const isEntryPoint = !state.isGuestFlow && !authenticated;
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        WalletPickerScreen,
+        {
+          providers: state.providers,
+          pendingConnections,
+          loading: state.creatingTransfer,
+          useDeeplink: !isDesktop,
+          onPrepareProvider: handlers.onPrepareProvider,
+          onSelectProvider: handlers.onSelectProvider,
+          onContinueConnection: handlers.onContinueConnection,
+          onBack: isEntryPoint ? onBack : () => handlers.onSetUserIntent(null),
+          onLogout: authenticated ? handlers.onLogout : void 0,
+          onLogin: handlers.onLogin,
+          showLoginOption: isEntryPoint
+        }
+      );
     }
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      LoginScreen,
-      {
-        authInput,
-        onAuthInputChange: handlers.onSetAuthInput,
-        onSubmit: handlers.onSendLoginCode,
-        sending: activeOtpStatus === "sending-code",
-        error: state.error,
-        onBack,
-        merchantInitials: merchantName ? merchantName.slice(0, 2).toUpperCase() : void 0
-      }
-    );
-  }
-  if (step === "otp-verify") {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      OtpVerifyScreen,
-      {
-        maskedIdentifier: state.verificationTarget ? maskAuthIdentifier(state.verificationTarget) : "",
-        otpCode,
-        onOtpChange: (code) => {
-          handlers.onSetOtpCode(code);
-        },
-        onVerify: handlers.onVerifyLoginCode,
-        onResend: handlers.onResendLoginCode,
-        onBack: handlers.onBackFromOtp,
-        verifying: activeOtpStatus === "submitting-code" || authenticated,
-        error: state.error
-      }
-    );
-  }
-  if (step === "create-passkey") {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      PasskeyScreen,
-      {
-        onCreatePasskey: handlers.onRegisterPasskey,
-        onBack: handlers.onLogout,
-        onLogout: handlers.onLogout,
-        creating: state.registeringPasskey,
-        error: state.error,
-        popupFallback: state.passkeyPopupNeeded,
-        onCreatePasskeyViaPopup: handlers.onCreatePasskeyViaPopup
-      }
-    );
-  }
-  if (step === "verify-passkey") {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      PasskeyScreen,
-      {
-        onCreatePasskey: handlers.onRegisterPasskey,
-        onBack: handlers.onLogout,
-        onLogout: handlers.onLogout,
-        creating: state.verifyingPasskeyPopup,
-        error: state.error,
-        popupFallback: true,
-        onCreatePasskeyViaPopup: handlers.onVerifyPasskeyViaPopup
-      }
-    );
-  }
-  if (step === "wallet-picker") {
-    if (state.isGuestFlow && state.selectedProviderId && state.activeCredentialId) {
-      return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
+    case "open-wallet": {
+      const providerName = state.providers.find((p) => p.id === state.selectedProviderId)?.name ?? null;
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        OpenWalletScreen,
+        {
+          walletName: providerName,
+          deeplinkUri: state.deeplinkUri ?? "",
+          loading: !isDesktop ? state.creatingTransfer || !state.deeplinkUri : state.creatingTransfer,
+          useDeeplink: !isDesktop,
+          error: state.error || (!isDesktop ? pollingError : authExecutorError),
+          onRetryStatus: !isDesktop ? handlers.onRetryMobileStatus : void 0,
+          onBack: !isDesktop ? () => handlers.onSetUserIntent(null) : void 0,
+          onLogout: handlers.onLogout
+        }
+      );
     }
-    const isEntryPoint = !state.isGuestFlow && !authenticated;
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      WalletPickerScreen,
-      {
-        providers: state.providers,
-        pendingConnections,
-        loading: state.creatingTransfer,
-        useDeeplink: !shouldUseWalletConnector({
-          userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-        }),
-        onPrepareProvider: handlers.onPrepareProvider,
-        onSelectProvider: handlers.onSelectProvider,
-        onContinueConnection: handlers.onContinueConnection,
-        onBack: isEntryPoint ? onBack : () => handlers.onNavigate(state.activeCredentialId ? "deposit" : "create-passkey"),
-        onLogout: authenticated ? handlers.onLogout : void 0,
-        onLogin: handlers.onLogin,
-        showLoginOption: isEntryPoint
-      }
-    );
-  }
-  if (step === "open-wallet") {
-    const providerName = state.providers.find((p) => p.id === state.selectedProviderId)?.name ?? null;
-    const useDeeplink = !shouldUseWalletConnector({
-      userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-    });
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      OpenWalletScreen,
-      {
-        walletName: providerName,
-        deeplinkUri: state.deeplinkUri ?? "",
-        loading: useDeeplink ? state.creatingTransfer || !state.deeplinkUri : state.creatingTransfer,
-        useDeeplink,
-        error: state.error || (useDeeplink ? pollingError : authExecutorError),
-        onRetryStatus: useDeeplink ? handlers.onRetryMobileStatus : void 0,
-        onBack: useDeeplink ? () => handlers.onNavigate("wallet-picker") : void 0,
-        onLogout: handlers.onLogout
-      }
-    );
-  }
-  if (step === "setup-status") {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      SetupStatusScreen,
-      {
-        complete: false,
-        limit: state.oneTapLimit,
-        tokensApproved: 0,
-        merchantName,
-        onContinue: () => handlers.onNavigate("setup"),
-        onLogout: handlers.onLogout,
-        error: state.error || authExecutorError
-      }
-    );
-  }
-  if (step === "setup") {
-    const selectSourceTokenCount = selectSourceChoices.reduce(
-      (sum, chain) => sum + chain.tokens.length,
-      0
-    );
-    const effectiveTokenCount = tokenCount > 0 ? tokenCount : selectSourceTokenCount;
-    const effectiveSourceLabel = selectedSourceLabel ?? (selectSourceChainName && selectSourceTokenSymbol ? `${selectSourceTokenSymbol} on ${selectSourceChainName}` : void 0);
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      SetupScreen,
-      {
-        availableBalance: selectedSource ? selectedSource.balance.available.amount : selectSourceAvailableBalance > 0 ? selectSourceAvailableBalance : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
-        tokenCount: effectiveTokenCount,
-        sourceName,
-        onSetupOneTap: handlers.onSetupOneTap,
-        onBack: () => handlers.onNavigate("deposit"),
-        onLogout: handlers.onLogout,
-        onAdvanced: handlers.onSelectToken,
-        selectedSourceLabel: effectiveSourceLabel,
-        loading: savingOneTapLimit,
-        error: state.error,
-        selectedTokenSymbol: selectedSource?.token.symbol ?? selectSourceTokenSymbol
-      }
-    );
-  }
-  if (step === "confirm-sign") {
-    const providerName = state.providers.find((p) => p.id === state.selectedProviderId)?.name ?? null;
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      ConfirmSignScreen,
-      {
-        walletName: providerName,
-        signing: transferSigningSigning,
-        error: state.error || transferSigningError,
-        onSign: handlers.onConfirmSign,
-        onLogout: handlers.onLogout
-      }
-    );
-  }
-  if (step === "deposit") {
-    if (state.loadingData) {
-      return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
+    case "setup-status":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        SetupStatusScreen,
+        {
+          complete: false,
+          limit: state.oneTapLimit,
+          tokensApproved: 0,
+          merchantName,
+          onContinue: () => handlers.onSetUserIntent("configure-one-tap"),
+          onLogout: handlers.onLogout,
+          error: state.error || authExecutorError
+        }
+      );
+    case "setup": {
+      const selectSourceTokenCount = selectSourceChoices.reduce(
+        (sum, chain) => sum + chain.tokens.length,
+        0
+      );
+      const effectiveTokenCount = tokenCount > 0 ? tokenCount : selectSourceTokenCount;
+      const effectiveSourceLabel = selectedSourceLabel ?? (selectSourceChainName && selectSourceTokenSymbol ? `${selectSourceTokenSymbol} on ${selectSourceChainName}` : void 0);
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        SetupScreen,
+        {
+          availableBalance: selectedSource ? selectedSource.balance.available.amount : selectSourceAvailableBalance > 0 ? selectSourceAvailableBalance : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
+          tokenCount: effectiveTokenCount,
+          sourceName,
+          onSetupOneTap: handlers.onSetupOneTap,
+          onBack: () => handlers.onSetUserIntent(null),
+          onLogout: handlers.onLogout,
+          onAdvanced: handlers.onSelectToken,
+          selectedSourceLabel: effectiveSourceLabel,
+          loading: savingOneTapLimit,
+          error: state.error,
+          selectedTokenSymbol: selectedSource?.token.symbol ?? selectSourceTokenSymbol
+        }
+      );
     }
-    const parsedAmt = depositAmount != null ? depositAmount : 5;
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      DepositScreen,
-      {
-        merchantName,
-        availableBalance: selectedSource ? selectedSource.balance.available.amount : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
-        remainingLimit: selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null,
-        tokenCount,
-        initialAmount: parsedAmt,
-        processing: state.creatingTransfer,
-        error: state.error,
-        onDeposit: handlers.onPay,
-        onSwitchWallet: () => handlers.onNavigate("wallet-picker"),
-        onBack: onBack ?? (() => handlers.onLogout()),
-        onLogout: handlers.onLogout,
-        onIncreaseLimit: handlers.onIncreaseLimit,
-        increasingLimit: state.increasingLimit,
-        accounts: depositEligibleAccounts,
-        selectedAccountId: state.selectedAccountId,
-        onSelectAccount: handlers.onSelectAccount,
-        onAuthorizeAccount: handlers.onContinueConnection,
-        onAddProvider: () => handlers.onNavigate("wallet-picker"),
-        onSelectToken: handlers.onSelectToken,
-        selectedSourceLabel,
-        selectedTokenSymbol: selectedSource?.token.symbol
+    case "confirm-sign": {
+      const providerName = state.providers.find((p) => p.id === state.selectedProviderId)?.name ?? null;
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        ConfirmSignScreen,
+        {
+          walletName: providerName,
+          signing: transferSigningSigning,
+          error: state.error || transferSigningError,
+          onSign: handlers.onConfirmSign,
+          onLogout: handlers.onLogout
+        }
+      );
+    }
+    case "deposit": {
+      const parsedAmt = depositAmount != null ? depositAmount : 5;
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        DepositScreen,
+        {
+          merchantName,
+          availableBalance: selectedSource ? selectedSource.balance.available.amount : selectedAccount ? selectedAccount.wallets.reduce((sum, w) => sum + w.balance.available.amount, 0) : maxSourceBalance,
+          remainingLimit: selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null,
+          tokenCount,
+          initialAmount: parsedAmt,
+          processing: state.creatingTransfer,
+          error: state.error,
+          onDeposit: handlers.onPay,
+          onSwitchWallet: () => handlers.onSetUserIntent("switch-wallet"),
+          onBack: onBack ?? (() => handlers.onLogout()),
+          onLogout: handlers.onLogout,
+          onIncreaseLimit: handlers.onIncreaseLimit,
+          increasingLimit: state.increasingLimit,
+          accounts: depositEligibleAccounts,
+          selectedAccountId: state.selectedAccountId,
+          onSelectAccount: handlers.onSelectAccount,
+          onAuthorizeAccount: handlers.onContinueConnection,
+          onAddProvider: () => handlers.onSetUserIntent("switch-wallet"),
+          onSelectToken: handlers.onSelectToken,
+          selectedSourceLabel,
+          selectedTokenSymbol: selectedSource?.token.symbol
+        }
+      );
+    }
+    case "token-picker": {
+      if (!selectedAccount) {
+        return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
       }
-    );
-  }
-  if (step === "token-picker") {
-    if (state.isGuestFlow) {
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        TokenPickerScreen,
+        {
+          account: selectedAccount,
+          chains: state.chains,
+          onSelectAuthorized: handlers.onSelectAuthorizedToken,
+          onAuthorizeToken: handlers.onAuthorizeToken,
+          onBack: () => handlers.onSetUserIntent(null),
+          onLogout: handlers.onLogout,
+          depositAmount: depositAmount ?? void 0,
+          selectedTokenSymbol: selectedSource?.token.symbol,
+          selectedWalletId: state.selectedWalletId ?? void 0
+        }
+      );
+    }
+    case "guest-token-picker":
       return /* @__PURE__ */ jsxRuntime.jsx(
         GuestTokenPickerScreen,
         {
@@ -6049,107 +6146,60 @@ function StepRendererContent({
           depositAmount: depositAmount ?? void 0,
           error: state.error,
           onSelect: handlers.onSelectGuestToken,
-          onBack: () => handlers.onNavigate("wallet-picker")
+          onBack: () => handlers.onSetUserIntent(null)
+        }
+      );
+    case "processing": {
+      const polledStatus = pollingTransfer?.status;
+      const transferPhase = state.creatingTransfer ? "creating" : polledStatus === "SENDING" || polledStatus === "SENT" ? "sent" : "verifying";
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        TransferStatusScreen,
+        {
+          phase: transferPhase,
+          error: state.error || authExecutorError || transferSigningError || pollingError,
+          onLogout: handlers.onLogout
         }
       );
     }
-    if (!selectedAccount) {
-      return /* @__PURE__ */ jsxRuntime.jsx(BlinkLoadingScreen, {});
+    case "select-source":
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        SelectSourceScreen,
+        {
+          choices: selectSourceChoices,
+          selectedChainName: selectSourceChainName,
+          selectedTokenSymbol: selectSourceTokenSymbol,
+          recommended: selectSourceRecommended,
+          onChainChange: handlers.onSelectSourceChainChange,
+          onTokenChange: handlers.onSetSelectSourceTokenSymbol,
+          onConfirm: handlers.onConfirmSelectSource,
+          onLogout: handlers.onLogout
+        }
+      );
+    case "success": {
+      const succeeded = state.transfer?.status === "COMPLETED";
+      const displayAmount = state.transfer?.amount?.amount ?? 0;
+      const displayCurrency = state.transfer?.amount?.currency ?? "USD";
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        SuccessScreen,
+        {
+          amount: displayAmount,
+          currency: displayCurrency,
+          succeeded,
+          error: state.error,
+          merchantName,
+          sourceName,
+          remainingLimit: succeeded ? (() => {
+            const limit = selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null;
+            if (limit == null) return null;
+            return limit > displayAmount ? limit - displayAmount : 0;
+          })() : void 0,
+          onDone: onDismiss ?? handlers.onNewPayment,
+          onLogout: handlers.onLogout,
+          onPreauthorize: state.isGuestFlow ? handlers.onPreauthorize : void 0
+        }
+      );
     }
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      TokenPickerScreen,
-      {
-        account: selectedAccount,
-        chains: state.chains,
-        onSelectAuthorized: handlers.onSelectAuthorizedToken,
-        onAuthorizeToken: handlers.onAuthorizeToken,
-        onBack: () => handlers.onNavigate(state.previousStep === "setup" ? "setup" : "deposit"),
-        onLogout: handlers.onLogout,
-        depositAmount: depositAmount ?? void 0,
-        selectedTokenSymbol: selectedSource?.token.symbol,
-        selectedWalletId: state.selectedWalletId
-      }
-    );
-  }
-  if (step === "processing") {
-    const polledStatus = pollingTransfer?.status;
-    const transferPhase = state.creatingTransfer ? "creating" : polledStatus === "SENDING" || polledStatus === "SENT" ? "sent" : "verifying";
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      TransferStatusScreen,
-      {
-        phase: transferPhase,
-        error: state.error || authExecutorError || transferSigningError || pollingError,
-        onLogout: handlers.onLogout
-      }
-    );
-  }
-  if (step === "select-source") {
-    const cameFromSetup = state.previousStep === "setup";
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      SelectSourceScreen,
-      {
-        choices: selectSourceChoices,
-        selectedChainName: selectSourceChainName,
-        selectedTokenSymbol: selectSourceTokenSymbol,
-        recommended: selectSourceRecommended,
-        onChainChange: handlers.onSelectSourceChainChange,
-        onTokenChange: handlers.onSetSelectSourceTokenSymbol,
-        onConfirm: cameFromSetup ? () => handlers.onNavigate("setup") : handlers.onConfirmSelectSource,
-        onBack: cameFromSetup ? () => handlers.onNavigate("setup") : void 0,
-        onLogout: handlers.onLogout
-      }
-    );
   }
-  if (step === "success") {
-    const succeeded = state.transfer?.status === "COMPLETED";
-    const displayAmount = state.transfer?.amount?.amount ?? 0;
-    const displayCurrency = state.transfer?.amount?.currency ?? "USD";
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      SuccessScreen,
-      {
-        amount: displayAmount,
-        currency: displayCurrency,
-        succeeded,
-        error: state.error,
-        merchantName,
-        sourceName,
-        remainingLimit: succeeded ? (() => {
-          const limit = selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null;
-          if (limit == null) return null;
-          return limit > displayAmount ? limit - displayAmount : 0;
-        })() : void 0,
-        onDone: onDismiss ?? handlers.onNewPayment,
-        onLogout: handlers.onLogout,
-        onPreauthorize: state.isGuestFlow ? handlers.onPreauthorize : void 0
-      }
-    );
-  }
-  if (step === "low-balance") {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      DepositScreen,
-      {
-        merchantName,
-        availableBalance: 0,
-        remainingLimit: selectedSource != null ? selectedSource.remainingAllowance ?? null : selectedAccount?.remainingAllowance ?? null,
-        tokenCount,
-        initialAmount: depositAmount ?? 5,
-        processing: false,
-        error: state.error,
-        onDeposit: handlers.onPay,
-        onSwitchWallet: () => handlers.onNavigate("wallet-picker"),
-        onBack: onBack ?? (() => handlers.onLogout()),
-        onLogout: handlers.onLogout,
-        accounts: depositEligibleAccounts,
-        selectedAccountId: state.selectedAccountId,
-        onSelectAccount: handlers.onSelectAccount,
-        onAuthorizeAccount: handlers.onContinueConnection,
-        onAddProvider: () => handlers.onNavigate("wallet-picker"),
-        selectedSourceLabel,
-        selectedTokenSymbol: selectedSource?.token.symbol
-      }
-    );
-  }
-  return null;
 }
 
 // src/sentry.ts
@@ -6386,52 +6436,6 @@ function useAuthHandlers(dispatch, verificationTarget) {
     handleResendLoginCode
   };
 }
-
-// src/mobileFlow.ts
-function hasActiveWallet(accounts) {
-  return accounts.some((account) => account.wallets.some((wallet) => wallet.status === "ACTIVE"));
-}
-function resolvePostAuthStep(state) {
-  if (!state.hasPasskey) {
-    return { step: "create-passkey", clearPersistedFlow: false };
-  }
-  if (state.persistedMobileFlow) {
-    if (state.persistedMobileFlow.isReauthorization) {
-      return { step: "open-wallet", clearPersistedFlow: false };
-    }
-    if (state.persistedMobileFlow.isSetup && hasActiveWallet(state.accounts)) {
-      return { step: "deposit", clearPersistedFlow: true };
-    }
-    return { step: "open-wallet", clearPersistedFlow: false };
-  }
-  if (state.mobileSetupInProgress && !hasActiveWallet(state.accounts)) {
-    return { step: "open-wallet", clearPersistedFlow: false };
-  }
-  if ((state.accounts.length === 0 || !hasActiveWallet(state.accounts)) && !state.connectingNewAccount) {
-    return { step: "wallet-picker", clearPersistedFlow: false };
-  }
-  return { step: "deposit", clearPersistedFlow: false };
-}
-function resolveRestoredMobileFlow(transferStatus, isSetup) {
-  if (transferStatus === "AUTHORIZED") {
-    return isSetup ? { kind: "resume-setup-deposit", step: "deposit", clearPersistedFlow: true } : { kind: "resume-confirm-sign", step: "confirm-sign", clearPersistedFlow: true };
-  }
-  if (transferStatus === "COMPLETED") {
-    return { kind: "resume-success", step: "success", clearPersistedFlow: true };
-  }
-  if (transferStatus === "FAILED") {
-    return { kind: "resume-failed", step: "success", clearPersistedFlow: true };
-  }
-  if (transferStatus === "SENDING" || transferStatus === "SENT") {
-    return { kind: "resume-processing", step: "processing", clearPersistedFlow: true };
-  }
-  if (isSetup) {
-    return { kind: "resume-stale-setup", step: "wallet-picker", clearPersistedFlow: true };
-  }
-  return { kind: "resume-open-wallet", step: "open-wallet", clearPersistedFlow: false };
-}
-
-// src/hooks/usePasskeyHandlers.ts
 function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds, mobileSetupFlowRef, guestPreauthAccountId) {
   const { user, getAccessToken } = reactAuth.usePrivy();
   const checkingPasskeyRef = react.useRef(false);
@@ -6443,35 +6447,14 @@ function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds,
       reportPasskeyActivity(apiBaseUrl, token, credentialId).catch(() => {
       });
     }
-    const resolved = resolvePostAuthStep({
-      hasPasskey: true,
-      accounts,
-      persistedMobileFlow: loadMobileFlowState(),
-      mobileSetupInProgress: mobileSetupFlowRef.current,
-      connectingNewAccount: false
-    });
-    if (resolved.clearPersistedFlow) clearMobileFlowState();
-    dispatch({ type: "NAVIGATE", step: resolved.step });
-  }, [getAccessToken, apiBaseUrl, accounts, mobileSetupFlowRef, dispatch]);
+  }, [getAccessToken, apiBaseUrl, dispatch]);
   const completePasskeyRegistration = react.useCallback(async (credentialId, publicKey) => {
     const token = await getAccessToken();
     if (!token) throw new Error("Not authenticated");
     await registerPasskey(apiBaseUrl, token, credentialId, publicKey);
     dispatch({ type: "PASSKEY_ACTIVATED", credentialId, publicKey });
     window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, credentialId);
-    if (guestPreauthAccountId) {
-      return;
-    }
-    const resolved = resolvePostAuthStep({
-      hasPasskey: true,
-      accounts,
-      persistedMobileFlow: loadMobileFlowState(),
-      mobileSetupInProgress: mobileSetupFlowRef.current,
-      connectingNewAccount: false
-    });
-    if (resolved.clearPersistedFlow) clearMobileFlowState();
-    dispatch({ type: "NAVIGATE", step: resolved.step });
-  }, [getAccessToken, apiBaseUrl, accounts, mobileSetupFlowRef, guestPreauthAccountId, dispatch]);
+  }, [getAccessToken, apiBaseUrl, dispatch]);
   const handleRegisterPasskey = react.useCallback(async () => {
     dispatch({ type: "SET_REGISTERING_PASSKEY", value: true });
     dispatch({ type: "SET_ERROR", error: null });
@@ -6535,15 +6518,6 @@ function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds,
       const { credentialId } = await createPasskeyViaPopup(popupOptions);
       dispatch({ type: "PASSKEY_ACTIVATED", credentialId });
       localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, credentialId);
-      const resolved = resolvePostAuthStep({
-        hasPasskey: true,
-        accounts,
-        persistedMobileFlow: loadMobileFlowState(),
-        mobileSetupInProgress: mobileSetupFlowRef.current,
-        connectingNewAccount: false
-      });
-      if (resolved.clearPersistedFlow) clearMobileFlowState();
-      dispatch({ type: "NAVIGATE", step: resolved.step });
     } catch (err) {
       captureException(err);
       dispatch({
@@ -6553,7 +6527,7 @@ function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds,
     } finally {
       dispatch({ type: "SET_REGISTERING_PASSKEY", value: false });
     }
-  }, [user, knownCredentialIds, getAccessToken, apiBaseUrl, activateExistingCredential, accounts, mobileSetupFlowRef, dispatch]);
+  }, [user, knownCredentialIds, getAccessToken, apiBaseUrl, activateExistingCredential, dispatch]);
   const handleVerifyPasskeyViaPopup = react.useCallback(async () => {
     dispatch({ type: "SET_VERIFYING_PASSKEY", value: true });
     dispatch({ type: "SET_ERROR", error: null });
@@ -6572,15 +6546,6 @@ function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds,
           reportPasskeyActivity(apiBaseUrl, token, matched).catch(() => {
           });
         }
-        const resolved = resolvePostAuthStep({
-          hasPasskey: true,
-          accounts,
-          persistedMobileFlow: loadMobileFlowState(),
-          mobileSetupInProgress: mobileSetupFlowRef.current,
-          connectingNewAccount: false
-        });
-        if (resolved.clearPersistedFlow) clearMobileFlowState();
-        dispatch({ type: "NAVIGATE", step: resolved.step });
       } else {
         dispatch({
           type: "SET_ERROR",
@@ -6596,7 +6561,7 @@ function usePasskeyHandlers(dispatch, apiBaseUrl, accounts, knownCredentialIds,
     } finally {
       dispatch({ type: "SET_VERIFYING_PASSKEY", value: false });
     }
-  }, [knownCredentialIds, getAccessToken, apiBaseUrl, accounts, mobileSetupFlowRef, dispatch]);
+  }, [knownCredentialIds, getAccessToken, apiBaseUrl, dispatch]);
   return {
     handleRegisterPasskey,
     handleCreatePasskeyViaPopup,
@@ -6649,10 +6614,9 @@ function useTransferHandlers(deps) {
     }
     if (!activeCredentialId) {
       dispatch({ type: "SET_ERROR", error: "Create or verify a passkey on this device before continuing." });
-      dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return;
     }
-    dispatch({ type: "PAY_STARTED", isSetupRedirect: false });
+    dispatch({ type: "PAY_STARTED" });
     processingStartedAtRef.current = Date.now();
     try {
       if (transfer?.status === "AUTHORIZED") {
@@ -6699,7 +6663,7 @@ function useTransferHandlers(deps) {
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Transfer failed";
-      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "deposit" });
+      dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
     } finally {
       dispatch({ type: "PAY_ENDED" });
@@ -6749,7 +6713,6 @@ function useSourceSelectionHandlers(dispatch, authExecutor) {
   const [selectSourceChainName, setSelectSourceChainName] = react.useState("");
   const [selectSourceTokenSymbol, setSelectSourceTokenSymbol] = react.useState("");
   const initializedSelectSourceActionRef = react.useRef(null);
-  const preSelectSourceStepRef = react.useRef(null);
   const pendingSelectSourceAction = authExecutor.pendingSelectSource;
   const selectSourceChoices = react.useMemo(() => {
     if (!pendingSelectSourceAction) return [];
@@ -6807,8 +6770,7 @@ function useSourceSelectionHandlers(dispatch, authExecutor) {
     handleSelectSourceChainChange,
     handleConfirmSelectSource,
     pendingSelectSourceAction,
-    initializedSelectSourceActionRef,
-    preSelectSourceStepRef
+    initializedSelectSourceActionRef
   };
 }
 function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransferIdRef, stateTransfer, refs, onComplete) {
@@ -6821,16 +6783,13 @@ function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransfe
   const onCompleteRef = react.useRef(onComplete);
   onCompleteRef.current = onComplete;
   const guestPollingActiveRef = react.useRef(false);
-  react.useEffect(() => {
-    const persisted = loadMobileFlowState();
-    if (!persisted?.isGuestCheckout || !persisted.transferId || !persisted.guestSessionToken) return;
+  const guestPollingCleanupRef = react.useRef(null);
+  const startGuestPolling = react.useCallback((transferId, guestSessionToken) => {
     if (guestPollingActiveRef.current) return;
     guestPollingActiveRef.current = true;
-    const transferId = persisted.transferId;
-    const guestSessionToken = persisted.guestSessionToken;
     let cancelled = false;
     const POLL_INTERVAL_MS = 3e3;
-    dispatch({ type: "NAVIGATE", step: "processing" });
+    dispatch({ type: "SET_ERROR", error: null });
     const poll = async () => {
       if (cancelled) return;
       try {
@@ -6839,12 +6798,14 @@ function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransfe
         if (transfer.status === "COMPLETED") {
           cancelled = true;
           guestPollingActiveRef.current = false;
+          guestPollingCleanupRef.current = null;
           clearMobileFlowState();
           dispatch({ type: "GUEST_TRANSFER_COMPLETED", transfer, guestSessionToken });
           onCompleteRef.current?.(transfer);
         } else if (transfer.status === "FAILED") {
           cancelled = true;
           guestPollingActiveRef.current = false;
+          guestPollingCleanupRef.current = null;
           clearMobileFlowState();
           dispatch({ type: "TRANSFER_FAILED", transfer, error: "Transfer failed." });
         }
@@ -6853,26 +6814,44 @@ function useMobileFlowHandlers(dispatch, polling, reloadAccounts, pollingTransfe
     };
     poll();
     const intervalId = window.setInterval(poll, POLL_INTERVAL_MS);
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !cancelled) {
-        poll();
+    const cleanup = () => {
+      cancelled = true;
+      guestPollingActiveRef.current = false;
+      guestPollingCleanupRef.current = null;
+      window.clearInterval(intervalId);
+    };
+    guestPollingCleanupRef.current = cleanup;
+  }, [apiBaseUrl, dispatch]);
+  react.useEffect(() => {
+    const persisted = loadMobileFlowState();
+    if (persisted?.isGuestCheckout && persisted.transferId && persisted.guestSessionToken) {
+      startGuestPolling(persisted.transferId, persisted.guestSessionToken);
+    }
+    return () => {
+      guestPollingCleanupRef.current?.();
+    };
+  }, [startGuestPolling]);
+  react.useEffect(() => {
+    const tryStartPolling = () => {
+      if (guestPollingActiveRef.current) return;
+      const persisted = loadMobileFlowState();
+      if (persisted?.isGuestCheckout && persisted.transferId && persisted.guestSessionToken) {
+        startGuestPolling(persisted.transferId, persisted.guestSessionToken);
       }
     };
+    const handleVisibility = () => {
+      if (document.visibilityState === "visible") tryStartPolling();
+    };
     const handlePageShow = (e) => {
-      if (e.persisted && !cancelled) {
-        poll();
-      }
+      if (e.persisted) tryStartPolling();
     };
     document.addEventListener("visibilitychange", handleVisibility);
     window.addEventListener("pageshow", handlePageShow);
     return () => {
-      cancelled = true;
-      guestPollingActiveRef.current = false;
-      window.clearInterval(intervalId);
       document.removeEventListener("visibilitychange", handleVisibility);
       window.removeEventListener("pageshow", handlePageShow);
     };
-  }, [apiBaseUrl, dispatch]);
+  }, [startGuestPolling]);
   const handleAuthorizedMobileReturn = react.useCallback(async (authorizedTransfer, isSetup) => {
     if (handlingMobileReturnRef.current) return;
     handlingMobileReturnRef.current = true;
@@ -6944,7 +6923,6 @@ function useProviderHandlers(deps) {
     }
     if (!activeCredentialId) {
       dispatch({ type: "SET_ERROR", error: "Create or verify a passkey on this device before continuing." });
-      dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return null;
     }
     const provider = providers.find((p) => p.id === providerId);
@@ -6965,7 +6943,7 @@ function useProviderHandlers(deps) {
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to set up wallet";
-      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "wallet-picker" });
+      dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
       return null;
     }
@@ -6973,7 +6951,7 @@ function useProviderHandlers(deps) {
   const handleGuestSelectProvider = react.useCallback(async (providerId) => {
     if (!merchantAuthorization || !destination) {
       const msg = "Missing payment configuration for guest checkout.";
-      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "wallet-picker" });
+      dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
       return;
     }
@@ -6995,7 +6973,7 @@ function useProviderHandlers(deps) {
       });
       if (isMobile) {
         if (!result.uri) {
-          dispatch({ type: "PAY_ERROR", error: "This wallet is not available on mobile.", fallbackStep: "wallet-picker" });
+          dispatch({ type: "PAY_ERROR", error: "This wallet is not available on mobile." });
           return;
         }
         persistMobileFlowState({
@@ -7013,7 +6991,7 @@ function useProviderHandlers(deps) {
         if (!account.isConnected) {
           const connector = connectors.find((c) => c.type === "injected") ?? connectors[0];
           if (!connector) {
-            dispatch({ type: "PAY_ERROR", error: "No wallet extension found. Please install a supported wallet.", fallbackStep: "wallet-picker" });
+            dispatch({ type: "PAY_ERROR", error: "No wallet extension found. Please install a supported wallet." });
             return;
           }
           await connectAsync({ connector });
@@ -7028,7 +7006,7 @@ function useProviderHandlers(deps) {
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to start guest checkout";
-      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "wallet-picker" });
+      dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
     }
   }, [
@@ -7051,7 +7029,6 @@ function useProviderHandlers(deps) {
     dispatch({ type: "SELECT_PROVIDER", providerId });
     if (!activeCredentialId) {
       dispatch({ type: "SET_ERROR", error: "Create or verify a passkey on this device before continuing." });
-      dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return;
     }
     const provider = providers.find((p) => p.id === providerId);
@@ -7061,8 +7038,7 @@ function useProviderHandlers(deps) {
       userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
     });
     if (!isMobile) {
-      dispatch({ type: "PAY_STARTED", isSetupRedirect: false });
-      dispatch({ type: "NAVIGATE", step: "open-wallet" });
+      dispatch({ type: "PAY_STARTED" });
     }
     try {
       let accountId;
@@ -7104,12 +7080,11 @@ function useProviderHandlers(deps) {
       } else {
         await authExecutor.executeSessionById(sessionId);
         await reloadAccounts();
-        dispatch({ type: "NAVIGATE", step: "deposit" });
       }
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to set up wallet";
-      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "wallet-picker" });
+      dispatch({ type: "PAY_ERROR", error: msg });
       onError?.(msg);
     } finally {
       if (!isMobile) {
@@ -7173,7 +7148,6 @@ function useProviderHandlers(deps) {
     }
     if (!activeCredentialId) {
       dispatch({ type: "SET_ERROR", error: "Create or verify a passkey on this device before continuing." });
-      dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return;
     }
     const acct = accounts.find((a) => a.id === selectedAccountId);
@@ -7219,10 +7193,8 @@ function useProviderHandlers(deps) {
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
         triggerDeeplink(session.uri);
       } else {
-        dispatch({ type: "NAVIGATE", step: "open-wallet" });
         await authExecutor.executeSessionById(session.id);
         await reloadAccounts();
-        dispatch({ type: "NAVIGATE", step: "deposit" });
       }
     } catch (err) {
       captureException(err);
@@ -7254,12 +7226,8 @@ function useProviderHandlers(deps) {
     reauthTokenRef
   ]);
   const handleNavigateToTokenPicker = react.useCallback(() => {
-    if (authExecutor.pendingSelectSource) {
-      dispatch({ type: "NAVIGATE", step: "select-source" });
-    } else {
-      dispatch({ type: "NAVIGATE", step: "token-picker" });
-    }
-  }, [dispatch, authExecutor.pendingSelectSource]);
+    dispatch({ type: "SET_USER_INTENT", intent: "pick-token" });
+  }, [dispatch]);
   const handleSelectAuthorizedToken = react.useCallback((walletId, tokenSymbol) => {
     dispatch({ type: "SELECT_TOKEN", walletId, tokenSymbol });
   }, [dispatch]);
@@ -7270,7 +7238,6 @@ function useProviderHandlers(deps) {
     }
     if (!activeCredentialId) {
       dispatch({ type: "SET_ERROR", error: "Create or verify a passkey on this device before continuing." });
-      dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return;
     }
     const acct = accounts.find((a) => a.id === selectedAccountId);
@@ -7312,7 +7279,6 @@ function useProviderHandlers(deps) {
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
         triggerDeeplink(session.uri);
       } else {
-        dispatch({ type: "NAVIGATE", step: "open-wallet" });
         await authExecutor.executeSessionById(session.id);
         await reloadAccounts();
         dispatch({ type: "SELECT_TOKEN", walletId: _walletId, tokenSymbol });
@@ -7384,7 +7350,6 @@ function useGuestTransferHandlers(deps) {
     isGuestFlow,
     guestTransferId,
     guestSessionToken,
-    step,
     onComplete,
     onError
   } = deps;
@@ -7398,8 +7363,7 @@ function useGuestTransferHandlers(deps) {
   const fetchedRef = react.useRef(false);
   const selectedGuestTokenRef = react.useRef(null);
   react.useEffect(() => {
-    if (!isGuestFlow || step !== "token-picker" || fetchedRef.current) return;
-    if (!guestTransferId || !guestSessionToken) return;
+    if (!isGuestFlow || !guestTransferId || !guestSessionToken || fetchedRef.current) return;
     const account = getAccount(wagmiConfig2);
     if (!account.address) return;
     fetchedRef.current = true;
@@ -7413,7 +7377,7 @@ function useGuestTransferHandlers(deps) {
       captureException(err);
       dispatch({ type: "SET_ERROR", error: "Failed to fetch token balances." });
     }).finally(() => setLoadingBalances(false));
-  }, [isGuestFlow, step, guestTransferId, guestSessionToken, apiBaseUrl, wagmiConfig2, dispatch]);
+  }, [isGuestFlow, guestTransferId, guestSessionToken, apiBaseUrl, wagmiConfig2, dispatch]);
   react.useEffect(() => {
     if (!isGuestFlow) {
       fetchedRef.current = false;
@@ -7442,7 +7406,6 @@ function useGuestTransferHandlers(deps) {
         entry.tokenAddress
       );
       selectedGuestTokenRef.current = entry;
-      dispatch({ type: "NAVIGATE", step: "processing" });
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to set transfer sender";
@@ -7453,7 +7416,7 @@ function useGuestTransferHandlers(deps) {
     }
   }, [guestTransferId, guestSessionToken, wagmiConfig2, apiBaseUrl, dispatch, onError]);
   react.useEffect(() => {
-    if (!isGuestFlow || step !== "processing" || !guestTransferId || !guestSessionToken) return;
+    if (!isGuestFlow || !guestTransferId || !guestSessionToken || !selectedGuestTokenRef.current) return;
     if (executingBridgeRef.current) return;
     executingBridgeRef.current = true;
     const execute = async () => {
@@ -7467,7 +7430,7 @@ function useGuestTransferHandlers(deps) {
             break;
           }
           if (transfer.status === "FAILED") {
-            dispatch({ type: "PAY_ERROR", error: "Transfer failed.", fallbackStep: "wallet-picker" });
+            dispatch({ type: "PAY_ERROR", error: "Transfer failed." });
             return;
           }
           await new Promise((r) => setTimeout(r, GUEST_SIGN_POLL_MS));
@@ -7475,8 +7438,7 @@ function useGuestTransferHandlers(deps) {
         if (!signPayload) {
           dispatch({
             type: "PAY_ERROR",
-            error: "Timed out waiting for bridge quote. Please try again.",
-            fallbackStep: "wallet-picker"
+            error: "Timed out waiting for bridge quote. Please try again."
           });
           return;
         }
@@ -7496,7 +7458,7 @@ function useGuestTransferHandlers(deps) {
         const walletClient = await getWalletClient(wagmiConfig2);
         const sender = account.address;
         if (!sender) {
-          dispatch({ type: "PAY_ERROR", error: "Wallet not connected.", fallbackStep: "wallet-picker" });
+          dispatch({ type: "PAY_ERROR", error: "Wallet not connected." });
           return;
         }
         let lastTxHash = null;
@@ -7521,7 +7483,7 @@ function useGuestTransferHandlers(deps) {
           lastTxHash = txHash;
         }
         if (!lastTxHash) {
-          dispatch({ type: "PAY_ERROR", error: "No bridge transactions were executed.", fallbackStep: "wallet-picker" });
+          dispatch({ type: "PAY_ERROR", error: "No bridge transactions were executed." });
           return;
         }
         console.info(`[blink-sdk] type=guest Submitting originTxHash: ${lastTxHash}`);
@@ -7542,22 +7504,21 @@ function useGuestTransferHandlers(deps) {
         }
         dispatch({
           type: "PAY_ERROR",
-          error: "Transfer is taking longer than expected. It may still complete.",
-          fallbackStep: "wallet-picker"
+          error: "Transfer is taking longer than expected. It may still complete."
         });
       } catch (err) {
         captureException(err);
         const msg = err instanceof Error ? err.message : "Bridge execution failed";
         console.error("[blink-sdk] type=guest Bridge execution error:", err);
         const displayMsg = isUserRejection2(msg) ? "You rejected the transaction. Please approve in your wallet to continue." : msg;
-        dispatch({ type: "PAY_ERROR", error: displayMsg, fallbackStep: "wallet-picker" });
+        dispatch({ type: "PAY_ERROR", error: displayMsg });
         onError?.(displayMsg);
       } finally {
         executingBridgeRef.current = false;
       }
     };
     execute();
-  }, [isGuestFlow, step, guestTransferId, guestSessionToken, apiBaseUrl, wagmiConfig2, switchChainAsync, dispatch, onComplete, onError]);
+  }, [isGuestFlow, guestTransferId, guestSessionToken, settingSender, apiBaseUrl, wagmiConfig2, switchChainAsync, dispatch, onComplete, onError]);
   return {
     guestTokenEntries,
     loadingBalances,
@@ -7598,12 +7559,10 @@ function useOneTapSetupHandlers(deps) {
         }
         oneTapLimitSavedDuringSetupRef.current = true;
         authExecutor.resolveSelectSource({ chainName, tokenSymbol });
-        dispatch({ type: "NAVIGATE", step: "open-wallet" });
       } else if (authExecutor.pendingOneTapSetup) {
         authExecutor.resolveOneTapSetup();
-      } else {
-        dispatch({ type: "NAVIGATE", step: "deposit" });
       }
+      dispatch({ type: "SET_USER_INTENT", intent: null });
     } catch (err) {
       captureException(err);
       dispatch({
@@ -7624,12 +7583,11 @@ function useOneTapSetupHandlers(deps) {
 // src/dataLoading.ts
 function resolveDataLoadAction({
   authenticated,
-  step,
   accountsCount,
   hasActiveCredential,
   loading
 }) {
-  if (!authenticated || step === "login" || step === "otp-verify" || accountsCount > 0 || !hasActiveCredential) {
+  if (!authenticated || accountsCount > 0 || !hasActiveCredential) {
     return "reset";
   }
   if (loading) {
@@ -7676,7 +7634,6 @@ function usePaymentEffects(deps) {
     authenticated,
     apiBaseUrl,
     depositAmount,
-    useWalletConnectorProp,
     onComplete,
     onError,
     polling,
@@ -7703,7 +7660,6 @@ function usePaymentEffects(deps) {
     setSelectSourceChainName,
     setSelectSourceTokenSymbol,
     initializedSelectSourceActionRef,
-    preSelectSourceStepRef,
     oneTapLimitSavedDuringSetupRef,
     handleAuthorizedMobileReturn
   } = deps;
@@ -7723,27 +7679,27 @@ function usePaymentEffects(deps) {
     }
   }, [depositAmount, dispatch]);
   react.useEffect(() => {
-    if (authenticated || state.step !== "otp-verify") return;
+    if (authenticated || !state.verificationTarget) return;
     if (activeOtpErrorMessage) dispatch({ type: "SET_ERROR", error: activeOtpErrorMessage });
-  }, [activeOtpErrorMessage, authenticated, state.step, dispatch]);
+  }, [activeOtpErrorMessage, authenticated, state.verificationTarget, dispatch]);
   react.useEffect(() => {
-    if (state.step === "otp-verify" && /^\d{6}$/.test(otpCode.trim()) && activeOtpStatus === "awaiting-code-input") {
+    if (state.verificationTarget && !authenticated && /^\d{6}$/.test(otpCode.trim()) && activeOtpStatus === "awaiting-code-input") {
       handleVerifyLoginCode();
     }
-  }, [otpCode, state.step, activeOtpStatus, handleVerifyLoginCode]);
+  }, [otpCode, state.verificationTarget, authenticated, activeOtpStatus, handleVerifyLoginCode]);
   react.useEffect(() => {
     if (!ready || !authenticated) {
       checkingPasskeyRef.current = false;
       return;
     }
-    if (state.step !== "login" && state.step !== "otp-verify") return;
+    if (state.passkeyConfigLoaded || state.activeCredentialId) return;
     if (checkingPasskeyRef.current) return;
     checkingPasskeyRef.current = true;
     let cancelled = false;
     dispatch({ type: "SET_ERROR", error: null });
     setAuthInput("");
     setOtpCode("");
-    const restoreOrDeposit = async (credId, token) => {
+    const restoreState = async (credId, token) => {
       const persisted = loadMobileFlowState();
       let accts = [];
       try {
@@ -7751,117 +7707,118 @@ function usePaymentEffects(deps) {
         if (cancelled) return;
       } catch {
       }
-      const resolved = resolvePostAuthStep({
-        hasPasskey: true,
-        accounts: accts,
-        persistedMobileFlow: persisted,
-        mobileSetupInProgress: false,
-        connectingNewAccount: false
-      });
-      if (resolved.clearPersistedFlow) clearMobileFlowState();
-      if (resolved.step === "deposit" && persisted && persisted.isSetup && persisted.transferId) {
-        try {
-          const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
-          if (cancelled) return;
-          if (existingTransfer.status === "AUTHORIZED") {
-            await handleAuthorizedMobileReturnRef.current(existingTransfer, true);
-            return;
-          }
-        } catch {
-        }
-      }
-      if (resolved.step === "open-wallet" && persisted && persisted.isReauthorization && persisted.sessionId) {
-        try {
-          const session = await fetchAuthorizationSession(apiBaseUrl, persisted.sessionId);
-          if (cancelled) return;
-          if (session.status === "AUTHORIZED") {
-            clearMobileFlowState();
-            dispatch({ type: "NAVIGATE", step: "deposit" });
-            if (persisted.reauthorizationToken) {
-              dispatch({ type: "SELECT_TOKEN", walletId: persisted.reauthorizationToken.walletId, tokenSymbol: persisted.reauthorizationToken.tokenSymbol });
-            }
-            return;
-          }
-        } catch {
-        }
-        reauthSessionIdRef.current = persisted.sessionId;
-        reauthTokenRef.current = persisted.reauthorizationToken ?? null;
-        mobileSetupFlowRef.current = true;
-        setupAccountIdRef.current = persisted.accountId ?? null;
-        dispatch({
-          type: "ENTER_MOBILE_FLOW",
-          deeplinkUri: persisted.deeplinkUri,
-          providerId: persisted.providerId
-        });
-        return;
-      }
-      if (resolved.step === "open-wallet" && persisted && persisted.accountId && !persisted.transferId) {
-        if (persisted.sessionId) {
+      if (persisted) {
+        if (persisted.isReauthorization && persisted.sessionId) {
           try {
             const session = await fetchAuthorizationSession(apiBaseUrl, persisted.sessionId);
             if (cancelled) return;
             if (session.status === "AUTHORIZED") {
               clearMobileFlowState();
-              dispatch({ type: "NAVIGATE", step: "deposit" });
+              if (persisted.reauthorizationToken) {
+                dispatch({ type: "SELECT_TOKEN", walletId: persisted.reauthorizationToken.walletId, tokenSymbol: persisted.reauthorizationToken.tokenSymbol });
+              }
               return;
             }
           } catch {
           }
+          reauthSessionIdRef.current = persisted.sessionId;
+          reauthTokenRef.current = persisted.reauthorizationToken ?? null;
+          mobileSetupFlowRef.current = true;
+          setupAccountIdRef.current = persisted.accountId ?? null;
+          dispatch({
+            type: "ENTER_MOBILE_FLOW",
+            deeplinkUri: persisted.deeplinkUri,
+            providerId: persisted.providerId
+          });
+          return;
         }
-        mobileSetupFlowRef.current = true;
-        setupAccountIdRef.current = persisted.accountId;
-        dispatch({
-          type: "ENTER_MOBILE_FLOW",
-          deeplinkUri: persisted.deeplinkUri,
-          providerId: persisted.providerId
-        });
-        return;
-      }
-      if (resolved.step === "open-wallet" && persisted && persisted.transferId) {
-        try {
-          const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
-          if (cancelled) return;
-          const mobileResolution = resolveRestoredMobileFlow(
-            existingTransfer.status,
-            persisted.isSetup
-          );
-          if (mobileResolution.kind === "resume-setup-deposit") {
-            await handleAuthorizedMobileReturnRef.current(existingTransfer, true);
-            return;
-          }
-          if (mobileResolution.kind === "resume-confirm-sign") {
-            await handleAuthorizedMobileReturnRef.current(existingTransfer, false);
-            return;
-          }
-          if (mobileResolution.kind === "resume-success") {
-            clearMobileFlowState();
-            dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
-            onCompleteRef.current?.(existingTransfer);
-            return;
-          }
-          if (mobileResolution.kind === "resume-failed") {
-            clearMobileFlowState();
-            dispatch({ type: "MOBILE_RESUME_FAILED", transfer: existingTransfer });
-            return;
+        if (persisted.isSetup && persisted.transferId) {
+          try {
+            const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
+            if (cancelled) return;
+            if (existingTransfer.status === "AUTHORIZED") {
+              await handleAuthorizedMobileReturnRef.current(existingTransfer, true);
+              return;
+            }
+          } catch {
           }
-          if (mobileResolution.kind === "resume-processing") {
-            clearMobileFlowState();
-            dispatch({ type: "MOBILE_RESUME_PROCESSING", transfer: existingTransfer });
-            pollingRef.current.startPolling(existingTransfer.id);
-            return;
+        }
+        if (persisted.isSetup && accts.some((a) => a.wallets.some((w) => w.status === "ACTIVE"))) {
+          clearMobileFlowState();
+          return;
+        }
+        if (persisted.accountId && !persisted.transferId) {
+          if (persisted.sessionId) {
+            try {
+              const session = await fetchAuthorizationSession(apiBaseUrl, persisted.sessionId);
+              if (cancelled) return;
+              if (session.status === "AUTHORIZED") {
+                clearMobileFlowState();
+                return;
+              }
+            } catch {
+            }
           }
-          if (mobileResolution.kind === "resume-stale-setup") {
-            clearMobileFlowState();
-            if (!cancelled) dispatch({ type: "NAVIGATE", step: "wallet-picker" });
+          mobileSetupFlowRef.current = true;
+          setupAccountIdRef.current = persisted.accountId;
+          dispatch({
+            type: "ENTER_MOBILE_FLOW",
+            deeplinkUri: persisted.deeplinkUri,
+            providerId: persisted.providerId
+          });
+          return;
+        }
+        if (persisted.transferId) {
+          try {
+            const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
+            if (cancelled) return;
+            if (existingTransfer.status === "COMPLETED") {
+              clearMobileFlowState();
+              dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
+              onCompleteRef.current?.(existingTransfer);
+              return;
+            }
+            if (existingTransfer.status === "FAILED") {
+              clearMobileFlowState();
+              dispatch({ type: "MOBILE_RESUME_FAILED", transfer: existingTransfer });
+              return;
+            }
+            if (existingTransfer.status === "SENDING" || existingTransfer.status === "SENT") {
+              clearMobileFlowState();
+              dispatch({ type: "MOBILE_RESUME_PROCESSING", transfer: existingTransfer });
+              pollingRef.current.startPolling(existingTransfer.id);
+              return;
+            }
+            if (existingTransfer.status === "AUTHORIZED") {
+              if (persisted.isSetup) {
+                await handleAuthorizedMobileReturnRef.current(existingTransfer, true);
+              } else {
+                await handleAuthorizedMobileReturnRef.current(existingTransfer, false);
+              }
+              return;
+            }
+            if (persisted.isSetup) {
+              clearMobileFlowState();
+              return;
+            }
+          } catch (err) {
+            if (cancelled) return;
+            dispatch({
+              type: "ENTER_MOBILE_FLOW",
+              deeplinkUri: persisted.deeplinkUri,
+              providerId: persisted.providerId,
+              error: err instanceof Error ? err.message : "Unable to refresh wallet authorization status."
+            });
+            pollingTransferIdRef.current = persisted.transferId ?? null;
+            mobileSetupFlowRef.current = persisted.isSetup;
+            setupAccountIdRef.current = persisted.accountId ?? null;
+            if (persisted.transferId) pollingRef.current.startPolling(persisted.transferId);
             return;
           }
-        } catch (err) {
-          if (cancelled) return;
           dispatch({
             type: "ENTER_MOBILE_FLOW",
             deeplinkUri: persisted.deeplinkUri,
-            providerId: persisted.providerId,
-            error: err instanceof Error ? err.message : "Unable to refresh wallet authorization status."
+            providerId: persisted.providerId
           });
           pollingTransferIdRef.current = persisted.transferId ?? null;
           mobileSetupFlowRef.current = persisted.isSetup;
@@ -7869,18 +7826,7 @@ function usePaymentEffects(deps) {
           if (persisted.transferId) pollingRef.current.startPolling(persisted.transferId);
           return;
         }
-        dispatch({
-          type: "ENTER_MOBILE_FLOW",
-          deeplinkUri: persisted.deeplinkUri,
-          providerId: persisted.providerId
-        });
-        pollingTransferIdRef.current = persisted.transferId ?? null;
-        mobileSetupFlowRef.current = persisted.isSetup;
-        setupAccountIdRef.current = persisted.accountId ?? null;
-        if (persisted.transferId) pollingRef.current.startPolling(persisted.transferId);
-        return;
       }
-      dispatch({ type: "NAVIGATE", step: resolved.step });
     };
     const checkPasskey = async () => {
       try {
@@ -7890,11 +7836,7 @@ function usePaymentEffects(deps) {
           if (token || cancelled) break;
           await new Promise((r) => setTimeout(r, 1e3));
         }
-        if (!token) {
-          if (!cancelled) dispatch({ type: "NAVIGATE", step: "create-passkey" });
-          return;
-        }
-        if (cancelled) return;
+        if (!token || cancelled) return;
         const { config } = await fetchUserConfig(apiBaseUrl, token);
         if (cancelled) return;
         const allPasskeys = config.passkeys ?? (config.passkey ? [config.passkey] : []);
@@ -7904,11 +7846,10 @@ function usePaymentEffects(deps) {
           oneTapLimit: config.defaultAllowance ?? void 0
         });
         if (allPasskeys.length === 0) {
-          dispatch({ type: "NAVIGATE", step: "create-passkey" });
           return;
         }
         if (state.activeCredentialId && allPasskeys.some((p) => p.credentialId === state.activeCredentialId)) {
-          await restoreOrDeposit(state.activeCredentialId, token);
+          await restoreState(state.activeCredentialId, token);
           return;
         }
         if (cancelled) return;
@@ -7930,12 +7871,9 @@ function usePaymentEffects(deps) {
           window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, matched);
           reportPasskeyActivity(apiBaseUrl, token, matched).catch(() => {
           });
-          await restoreOrDeposit(matched, token);
-          return;
+          await restoreState(matched, token);
         }
-        dispatch({ type: "NAVIGATE", step: "create-passkey" });
       } catch {
-        if (!cancelled) dispatch({ type: "NAVIGATE", step: "create-passkey" });
       }
     };
     checkPasskey();
@@ -7943,11 +7881,10 @@ function usePaymentEffects(deps) {
       cancelled = true;
       checkingPasskeyRef.current = false;
     };
-  }, [ready, authenticated, state.step, apiBaseUrl, state.activeCredentialId]);
+  }, [ready, authenticated, apiBaseUrl, state.activeCredentialId, state.passkeyConfigLoaded]);
   react.useEffect(() => {
     const loadAction = resolveDataLoadAction({
       authenticated,
-      step: state.step,
       accountsCount: state.accounts.length,
       hasActiveCredential: !!state.activeCredentialId,
       loading: loadingDataRef.current
@@ -7980,24 +7917,16 @@ function usePaymentEffects(deps) {
         const parsedAmt = depositAmount != null ? depositAmount : 0;
         const defaults = resolveDepositSelection(accts, parsedAmt, state.selectedAccountId);
         const persisted = loadMobileFlowState();
-        const resolved = resolvePostAuthStep({
-          hasPasskey: !!state.activeCredentialId,
-          accounts: accts,
-          persistedMobileFlow: persisted,
-          mobileSetupInProgress: mobileSetupFlowRef.current,
-          connectingNewAccount: false
-        });
-        const correctableSteps = ["deposit", "wallet-picker", "open-wallet"];
+        const clearMobile = persisted?.isSetup && accts.some((a) => a.wallets.some((w) => w.status === "ACTIVE"));
         dispatch({
           type: "DATA_LOADED",
           providers: prov,
           accounts: accts,
           chains: chn,
           defaults,
-          resolvedStep: correctableSteps.includes(state.step) && !state.creatingTransfer ? resolved.step : void 0,
-          clearMobileState: resolved.clearPersistedFlow
+          clearMobileState: clearMobile
         });
-        if (resolved.clearPersistedFlow) clearMobileFlowState();
+        if (clearMobile) clearMobileFlowState();
       } catch (err) {
         if (!cancelled) {
           captureException(err);
@@ -8020,7 +7949,6 @@ function usePaymentEffects(deps) {
     };
   }, [
     authenticated,
-    state.step,
     state.accounts.length,
     apiBaseUrl,
     state.activeCredentialId,
@@ -8029,7 +7957,7 @@ function usePaymentEffects(deps) {
   ]);
   react.useEffect(() => {
     if (authenticated || state.providers.length > 0) return;
-    if (state.step !== "wallet-picker") return;
+    if (state.activeCredentialId) return;
     let cancelled = false;
     const loadProviders = async () => {
       try {
@@ -8052,7 +7980,7 @@ function usePaymentEffects(deps) {
     return () => {
       cancelled = true;
     };
-  }, [authenticated, state.step, state.providers.length, apiBaseUrl]);
+  }, [authenticated, state.providers.length, state.activeCredentialId, apiBaseUrl]);
   react.useEffect(() => {
     if (!polling.transfer) return;
     if (polling.transfer.status === "COMPLETED") {
@@ -8066,13 +7994,21 @@ function usePaymentEffects(deps) {
     }
   }, [polling.transfer, onComplete, dispatch, reloadAccounts]);
   react.useEffect(() => {
-    if (state.step === "deposit" && state.accounts.length > 0 && authenticated && Date.now() - lastAccountFetchRef.current > 15e3) {
+    if (state.accounts.length > 0 && state.activeCredentialId && !state.loadingData && !state.transfer && authenticated && Date.now() - lastAccountFetchRef.current > 15e3) {
       lastAccountFetchRef.current = Date.now();
       reloadAccounts();
     }
-  }, [state.step, state.accounts.length, authenticated, reloadAccounts]);
+  }, [
+    state.accounts.length,
+    state.activeCredentialId,
+    state.loadingData,
+    state.transfer,
+    authenticated,
+    reloadAccounts
+  ]);
   react.useEffect(() => {
-    if (state.step !== "processing") {
+    const isProcessing = state.creatingTransfer || state.transfer != null && ["CREATED", "SENDING", "SENT"].includes(state.transfer.status);
+    if (!isProcessing) {
       processingStartedAtRef.current = null;
       return;
     }
@@ -8096,7 +8032,15 @@ function usePaymentEffects(deps) {
     }
     const timeoutId = window.setTimeout(handleTimeout, remainingMs);
     return () => window.clearTimeout(timeoutId);
-  }, [state.step, polling.transfer, state.transfer, polling.stopPolling, onError, dispatch, processingStartedAtRef]);
+  }, [
+    state.creatingTransfer,
+    state.transfer,
+    polling.transfer,
+    polling.stopPolling,
+    onError,
+    dispatch,
+    processingStartedAtRef
+  ]);
   react.useEffect(() => {
     if (!state.mobileFlow) {
       handlingMobileReturnRef.current = false;
@@ -8109,7 +8053,6 @@ function usePaymentEffects(deps) {
   }, [state.mobileFlow, polling.transfer, handleAuthorizedMobileReturn, handlingMobileReturnRef, mobileSetupFlowRef]);
   react.useEffect(() => {
     if (!state.mobileFlow || !mobileSetupFlowRef.current) return;
-    if (state.step !== "open-wallet") return;
     if (!state.activeCredentialId || !setupAccountIdRef.current) return;
     const accountId = setupAccountIdRef.current;
     const credentialId = state.activeCredentialId;
@@ -8202,7 +8145,6 @@ function usePaymentEffects(deps) {
     };
   }, [
     state.mobileFlow,
-    state.step,
     state.activeCredentialId,
     apiBaseUrl,
     reloadAccounts,
@@ -8272,46 +8214,22 @@ function usePaymentEffects(deps) {
     setSelectSourceTokenSymbol,
     initializedSelectSourceActionRef
   ]);
+  const pendingOneTapSetupAction = authExecutor.pendingOneTapSetup;
   react.useEffect(() => {
-    if (pendingSelectSourceAction && (state.step === "processing" || state.step === "open-wallet" || state.step === "setup-status")) {
-      const isDesktop = shouldUseWalletConnector({
-        useWalletConnector: useWalletConnectorProp,
-        userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-      });
-      if (isDesktop && (state.step === "setup-status" || state.step === "open-wallet")) {
-        preSelectSourceStepRef.current = state.step;
-        dispatch({ type: "NAVIGATE", step: "setup" });
-        return;
-      }
-      preSelectSourceStepRef.current = state.step;
-      dispatch({ type: "NAVIGATE", step: "select-source" });
-    } else if (!pendingSelectSourceAction && state.step === "select-source") {
-      dispatch({ type: "NAVIGATE", step: preSelectSourceStepRef.current ?? "processing" });
-      preSelectSourceStepRef.current = null;
+    if (pendingOneTapSetupAction && oneTapLimitSavedDuringSetupRef.current) {
+      oneTapLimitSavedDuringSetupRef.current = false;
+      authExecutor.resolveOneTapSetup();
     }
-  }, [pendingSelectSourceAction, state.step, useWalletConnectorProp, dispatch, preSelectSourceStepRef, authExecutor]);
-  const pendingOneTapSetupAction = authExecutor.pendingOneTapSetup;
-  const preOneTapSetupStepRef = react.useRef(null);
+  }, [pendingOneTapSetupAction, authExecutor, oneTapLimitSavedDuringSetupRef]);
   react.useEffect(() => {
-    if (pendingOneTapSetupAction && (state.step === "setup-status" || state.step === "open-wallet")) {
-      if (oneTapLimitSavedDuringSetupRef.current) {
-        oneTapLimitSavedDuringSetupRef.current = false;
-        authExecutor.resolveOneTapSetup();
-      } else {
-        preOneTapSetupStepRef.current = state.step;
-        reloadAccounts().then(() => {
-          dispatch({ type: "NAVIGATE", step: "setup" });
-        });
-      }
-    } else if (!pendingOneTapSetupAction && state.step === "setup" && preOneTapSetupStepRef.current) {
-      dispatch({ type: "NAVIGATE", step: preOneTapSetupStepRef.current });
-      preOneTapSetupStepRef.current = null;
+    if (pendingOneTapSetupAction && !oneTapLimitSavedDuringSetupRef.current) {
+      reloadAccounts();
     }
-  }, [pendingOneTapSetupAction, state.step, reloadAccounts, authExecutor, dispatch, oneTapLimitSavedDuringSetupRef]);
+  }, [pendingOneTapSetupAction, reloadAccounts, oneTapLimitSavedDuringSetupRef]);
   react.useEffect(() => {
-    if (state.step !== "success") return;
     if (!state.guestSessionToken) return;
     if (state.guestPreauthAccountId) return;
+    if (!state.transfer || state.transfer.status !== "COMPLETED") return;
     let cancelled = false;
     const checkPreauth = async () => {
       try {
@@ -8327,7 +8245,7 @@ function usePaymentEffects(deps) {
     return () => {
       cancelled = true;
     };
-  }, [state.step, state.guestSessionToken, state.guestPreauthAccountId, apiBaseUrl, dispatch]);
+  }, [state.transfer, state.guestSessionToken, state.guestPreauthAccountId, apiBaseUrl, dispatch]);
   const settingOwnerRef = react.useRef(false);
   react.useEffect(() => {
     if (!state.guestPreauthAccountId) return;
@@ -8498,7 +8416,6 @@ function BlinkPaymentInner({
     isGuestFlow: state.isGuestFlow,
     guestTransferId: state.guestTransferId,
     guestSessionToken: state.guestSessionToken,
-    step: state.step,
     onComplete,
     onError
   });
@@ -8506,14 +8423,13 @@ function BlinkPaymentInner({
     clearMobileFlowState();
     transfer.processingStartedAtRef.current = null;
     transfer.pollingTransferIdRef.current = null;
-    sourceSelection.preSelectSourceStepRef.current = null;
     oneTapSetup.oneTapLimitSavedDuringSetupRef.current = false;
     dispatch({
       type: "NEW_PAYMENT",
       depositAmount,
       firstAccountId: state.accounts.length > 0 ? state.accounts[0].id : null
     });
-  }, [depositAmount, state.accounts, transfer, sourceSelection, provider, oneTapSetup]);
+  }, [depositAmount, state.accounts, transfer, oneTapSetup]);
   const handleLogout = react.useCallback(async () => {
     try {
       await logout();
@@ -8524,13 +8440,12 @@ function BlinkPaymentInner({
       window.localStorage.removeItem(ACTIVE_CREDENTIAL_STORAGE_KEY);
     }
     polling.stopPolling();
-    sourceSelection.preSelectSourceStepRef.current = null;
     passkey.checkingPasskeyRef.current = false;
     oneTapSetup.oneTapLimitSavedDuringSetupRef.current = false;
     auth.setAuthInput("");
     auth.setOtpCode("");
     dispatch({ type: "LOGOUT", depositAmount });
-  }, [logout, polling, depositAmount, auth, sourceSelection, provider, passkey, oneTapSetup]);
+  }, [logout, polling, depositAmount, auth, passkey, oneTapSetup]);
   usePaymentEffects({
     state,
     dispatch,
@@ -8538,7 +8453,6 @@ function BlinkPaymentInner({
     authenticated,
     apiBaseUrl,
     depositAmount,
-    useWalletConnectorProp,
     onComplete,
     onError,
     polling,
@@ -8565,22 +8479,24 @@ function BlinkPaymentInner({
     setSelectSourceChainName: sourceSelection.setSelectSourceChainName,
     setSelectSourceTokenSymbol: sourceSelection.setSelectSourceTokenSymbol,
     initializedSelectSourceActionRef: sourceSelection.initializedSelectSourceActionRef,
-    preSelectSourceStepRef: sourceSelection.preSelectSourceStepRef,
     oneTapLimitSavedDuringSetupRef: oneTapSetup.oneTapLimitSavedDuringSetupRef,
     handleAuthorizedMobileReturn: mobileFlow.handleAuthorizedMobileReturn
   });
   const autoSelectingRef = react.useRef(false);
   react.useEffect(() => {
-    if (state.step !== "wallet-picker" || !state.isGuestFlow || !state.selectedProviderId || !state.activeCredentialId || !authenticated || autoSelectingRef.current) return;
+    if (!state.isGuestFlow || !state.selectedProviderId || !state.activeCredentialId || !authenticated || autoSelectingRef.current || state.transfer != null) return;
+    const hasActive = state.accounts.some((a) => a.wallets.some((w) => w.status === "ACTIVE"));
+    if (hasActive) return;
     autoSelectingRef.current = true;
     provider.handleSelectProvider(state.selectedProviderId).finally(() => {
       autoSelectingRef.current = false;
     });
   }, [
-    state.step,
     state.isGuestFlow,
     state.selectedProviderId,
     state.activeCredentialId,
+    state.transfer,
+    state.accounts,
     authenticated,
     provider
   ]);
@@ -8605,7 +8521,7 @@ function BlinkPaymentInner({
     onRetryMobileStatus: mobileFlow.handleRetryMobileStatus,
     onLogout: handleLogout,
     onNewPayment: handleNewPayment,
-    onNavigate: (step) => dispatch({ type: "NAVIGATE", step }),
+    onSetUserIntent: (intent) => dispatch({ type: "SET_USER_INTENT", intent }),
     onSetAuthInput: auth.setAuthInput,
     onSetOtpCode: (code) => {
       auth.setOtpCode(code);
@@ -8619,8 +8535,8 @@ function BlinkPaymentInner({
     onSelectAuthorizedToken: provider.handleSelectAuthorizedToken,
     onAuthorizeToken: provider.handleAuthorizeToken,
     onSelectGuestToken: guestTransfer.handleSelectGuestToken,
-    onLogin: () => dispatch({ type: "NAVIGATE", step: "login" }),
-    onPreauthorize: () => dispatch({ type: "NAVIGATE", step: "login" })
+    onLogin: () => dispatch({ type: "SET_USER_INTENT", intent: null }),
+    onPreauthorize: () => dispatch({ type: "SET_USER_INTENT", intent: null })
   }), [
     auth,
     passkey,
@@ -8643,8 +8559,12 @@ function BlinkPaymentInner({
       pollingTransfer: polling.transfer,
       pollingError: polling.error,
       authExecutorError: authExecutor.error,
+      inlineAuthorizationExecuting: authExecutor.executing,
       transferSigningSigning: transferSigning.signing,
       transferSigningError: transferSigning.error,
+      pendingSelectSource: authExecutor.pendingSelectSource,
+      pendingOneTapSetup: authExecutor.pendingOneTapSetup,
+      oneTapLimitAlreadySaved: oneTapSetup.oneTapLimitSavedDuringSetupRef.current,
       pendingConnections: derived.pendingConnections,
       depositEligibleAccounts: derived.depositEligibleAccounts,
       sourceName: derived.sourceName,
@@ -8705,6 +8625,7 @@ exports.findDevicePasskeyViaPopup = findDevicePasskeyViaPopup;
 exports.getTheme = getTheme;
 exports.lightTheme = lightTheme;
 exports.resolvePasskeyRpId = resolvePasskeyRpId;
+exports.resolveScreen = resolveScreen;
 exports.useAuthorizationExecutor = useAuthorizationExecutor;
 exports.useBlinkConfig = useBlinkConfig;
 exports.useBlinkDepositAmount = useBlinkDepositAmount;