@swype-org/react-sdk 0.1.259 → 0.1.261

package/dist/index.cjs

@@ -2060,143 +2060,143 @@ function isGuestPreauthCompletedTransferPinPhase(phase) {
   }
 }
 function resolvePhase(state) {
-  const p = state.phase;
+  const currentPhase = state.phase;
   const transferCompleted = state.transfer?.status === "COMPLETED";
   const needsPasskeyBootstrap = state.privyAuthenticated && !state.activeCredentialId;
-  const guestPreauthPin = transferCompleted && state.guestPreauthorizing && !state.verificationTarget && isGuestPreauthCompletedTransferPinPhase(p);
+  const guestPreauthPinsCurrentPhase = transferCompleted && state.guestPreauthorizing && !state.verificationTarget && isGuestPreauthCompletedTransferPinPhase(currentPhase);
   const guestPostPayLogin = transferCompleted && state.isGuestFlow && state.guestPreauthSessionId != null && !state.guestPreauthorizing && !state.verificationTarget && !state.privyAuthenticated;
-  const pinSubflow = !state.loginRequested && (p.step === "token-picker" || p.step === "one-tap-setup" || p.step === "select-source" || p.step === "confirm-sign" || p.step === "guest-token-picker");
-  const guestTokenPicker = state.isGuestFlow && state.selectedProviderId != null && !state.transfer && !state.guestPreauthAccountId;
-  const walletPickerSwitch = p.step === "wallet-picker" && p.reason === "switch" && !state.creatingTransfer && !(state.mobileFlow && state.deeplinkUri);
-  const passkeyBlock = state.passkeyConfigLoaded && !state.activeCredentialId;
-  const passkeyVerify = passkeyBlock && state.knownCredentialIds.length > 0 && state.passkeyPopupNeeded;
-  const c1 = state.guestPreauthSetupCompletePending && state.privyReady && state.privyAuthenticated;
-  const c2 = !c1 && guestPreauthPin;
-  const c3 = !c1 && !c2 && guestPostPayLogin;
-  const c4 = !c1 && !c2 && !c3 && transferCompleted && !state.verificationTarget && !needsPasskeyBootstrap;
-  const c5 = !c1 && !c2 && !c3 && !c4 && state.transfer?.status === "FAILED";
-  const c6 = !c1 && !c2 && !c3 && !c4 && !c5 && (state.creatingTransfer || isTransferAwaitingCompletion(state.transfer));
-  const c7 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && pinSubflow;
-  const c8 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && state.mobileFlow && state.deeplinkUri != null;
-  const c9 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && p.step === "wallet-setup" && p.mobile == null && state.guestPreauthorizing;
-  const c10 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && guestTokenPicker;
-  const c11 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && walletPickerSwitch;
-  const c12 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !state.privyReady;
-  const c13 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && state.privyAuthenticated && !state.activeCredentialId && !state.passkeyConfigLoaded;
-  const c14 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && state.verificationTarget != null && !state.privyAuthenticated;
-  const c15 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && state.loginRequested;
-  const c16 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && passkeyVerify;
-  const c17 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && !c16 && passkeyBlock;
-  const c18 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && !c16 && !c17 && state.loadingData && state.activeCredentialId != null && hasActiveWallet(state.accounts);
-  const c19 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && !c16 && !c17 && !c18 && state.activeCredentialId != null && !hasActiveWallet(state.accounts) && !state.mobileFlow;
-  const c20 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && !c16 && !c17 && !c18 && !c19 && state.activeCredentialId != null && hasActiveWallet(state.accounts) && !state.loadingData;
-  const c21 = !c1 && !c2 && !c3 && !c4 && !c5 && !c6 && !c7 && !c8 && !c9 && !c10 && !c11 && !c12 && !c13 && !c14 && !c15 && !c16 && !c17 && !c18 && !c19 && !c20 && state.isGuestFlow;
-  const flags = [
-    c1,
-    c2,
-    c3,
-    c4,
-    c5,
-    c6,
-    c7,
-    c8,
-    c9,
-    c10,
-    c11,
-    c12,
-    c13,
-    c14,
-    c15,
-    c16,
-    c17,
-    c18,
-    c19,
-    c20,
-    c21
+  const isFundingSourceSubflow = !state.loginRequested && (currentPhase.step === "token-picker" || currentPhase.step === "one-tap-setup" || currentPhase.step === "select-source" || currentPhase.step === "confirm-sign" || currentPhase.step === "guest-token-picker");
+  const guestTokenPickerEligible = state.isGuestFlow && state.selectedProviderId != null && !state.transfer && !state.guestPreauthAccountId;
+  const walletPickerSwitchEligible = currentPhase.step === "wallet-picker" && currentPhase.reason === "switch" && !state.creatingTransfer && !(state.mobileFlow && state.deeplinkUri);
+  const missingActivePasskeyCredential = state.passkeyConfigLoaded && !state.activeCredentialId;
+  const shouldPromptPasskeyVerification = missingActivePasskeyCredential && state.knownCredentialIds.length > 0 && state.passkeyPopupNeeded;
+  const branchGuestSetupComplete = state.guestPreauthSetupCompletePending && state.privyReady && state.privyAuthenticated;
+  const branchKeepGuestPreauthPin = !branchGuestSetupComplete && guestPreauthPinsCurrentPhase;
+  const branchGuestPostPayLogin = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && guestPostPayLogin;
+  const branchCompleted = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && transferCompleted && !state.verificationTarget && !needsPasskeyBootstrap;
+  const branchFailed = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && state.transfer?.status === "FAILED";
+  const branchProcessing = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && (state.creatingTransfer || isTransferAwaitingCompletion(state.transfer));
+  const branchKeepFundingSubflow = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && isFundingSourceSubflow;
+  const branchMobileWalletSetup = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && state.mobileFlow && state.deeplinkUri != null;
+  const branchKeepGuestWalletSetup = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && currentPhase.step === "wallet-setup" && currentPhase.mobile == null && state.guestPreauthorizing;
+  const branchGuestTokenPicker = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && guestTokenPickerEligible;
+  const branchKeepWalletPickerSwitch = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && walletPickerSwitchEligible;
+  const branchInitializingPrivy = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !state.privyReady;
+  const branchInitializingPasskeyConfig = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && state.privyAuthenticated && !state.activeCredentialId && !state.passkeyConfigLoaded;
+  const branchOtpVerify = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && state.verificationTarget != null && !state.privyAuthenticated;
+  const branchLoginRequested = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && state.loginRequested;
+  const branchPasskeyVerify = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && shouldPromptPasskeyVerification;
+  const branchPasskeyCreate = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && missingActivePasskeyCredential;
+  const branchDataLoading = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && state.loadingData && state.activeCredentialId != null && hasActiveWallet(state.accounts);
+  const branchWalletPickerLink = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchDataLoading && state.activeCredentialId != null && !hasActiveWallet(state.accounts) && !state.mobileFlow;
+  const branchDeposit = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchDataLoading && !branchWalletPickerLink && state.activeCredentialId != null && hasActiveWallet(state.accounts) && !state.loadingData;
+  const branchWalletPickerGuestEntry = !branchGuestSetupComplete && !branchKeepGuestPreauthPin && !branchGuestPostPayLogin && !branchCompleted && !branchFailed && !branchProcessing && !branchKeepFundingSubflow && !branchMobileWalletSetup && !branchKeepGuestWalletSetup && !branchGuestTokenPicker && !branchKeepWalletPickerSwitch && !branchInitializingPrivy && !branchInitializingPasskeyConfig && !branchOtpVerify && !branchLoginRequested && !branchPasskeyVerify && !branchPasskeyCreate && !branchDataLoading && !branchWalletPickerLink && !branchDeposit && state.isGuestFlow;
+  const exclusiveBranchFlags = [
+    branchGuestSetupComplete,
+    branchKeepGuestPreauthPin,
+    branchGuestPostPayLogin,
+    branchCompleted,
+    branchFailed,
+    branchProcessing,
+    branchKeepFundingSubflow,
+    branchMobileWalletSetup,
+    branchKeepGuestWalletSetup,
+    branchGuestTokenPicker,
+    branchKeepWalletPickerSwitch,
+    branchInitializingPrivy,
+    branchInitializingPasskeyConfig,
+    branchOtpVerify,
+    branchLoginRequested,
+    branchPasskeyVerify,
+    branchPasskeyCreate,
+    branchDataLoading,
+    branchWalletPickerLink,
+    branchDeposit,
+    branchWalletPickerGuestEntry
   ];
-  const matchCount = flags.filter(Boolean).length;
+  const matchCount = exclusiveBranchFlags.filter(Boolean).length;
   if (matchCount > 1) {
     console.error("resolvePhase: multiple exclusive branches matched", {
-      flags: {
-        c1,
-        c2,
-        c3,
-        c4,
-        c5,
-        c6,
-        c7,
-        c8,
-        c9,
-        c10,
-        c11,
-        c12,
-        c13,
-        c14,
-        c15,
-        c16,
-        c17,
-        c18,
-        c19,
-        c20,
-        c21
+      branches: {
+        branchGuestSetupComplete,
+        branchKeepGuestPreauthPin,
+        branchGuestPostPayLogin,
+        branchCompleted,
+        branchFailed,
+        branchProcessing,
+        branchKeepFundingSubflow,
+        branchMobileWalletSetup,
+        branchKeepGuestWalletSetup,
+        branchGuestTokenPicker,
+        branchKeepWalletPickerSwitch,
+        branchInitializingPrivy,
+        branchInitializingPasskeyConfig,
+        branchOtpVerify,
+        branchLoginRequested,
+        branchPasskeyVerify,
+        branchPasskeyCreate,
+        branchDataLoading,
+        branchWalletPickerLink,
+        branchDeposit,
+        branchWalletPickerGuestEntry
       }
     });
   }
-  let resolved;
-  if (c1) {
-    resolved = { step: "guest-setup-complete" };
-  } else if (c2) {
-    resolved = p;
-  } else if (c3) {
-    resolved = { step: "login" };
-  } else if (c4) {
-    resolved = { step: "completed", transfer: state.transfer };
-  } else if (c5) {
-    resolved = {
+  let nextPhase;
+  if (branchGuestSetupComplete) {
+    nextPhase = { step: "guest-setup-complete" };
+  } else if (branchKeepGuestPreauthPin) {
+    nextPhase = currentPhase;
+  } else if (branchGuestPostPayLogin) {
+    nextPhase = { step: "login" };
+  } else if (branchCompleted) {
+    nextPhase = { step: "completed", transfer: state.transfer };
+  } else if (branchFailed) {
+    nextPhase = {
       step: "failed",
       transfer: state.transfer,
       error: state.error ?? "Transfer failed."
     };
-  } else if (c6) {
-    resolved = { step: "processing", transfer: state.transfer };
-  } else if (c7) {
-    resolved = p;
-  } else if (c8) {
-    resolved = {
+  } else if (branchProcessing) {
+    nextPhase = { step: "processing", transfer: state.transfer };
+  } else if (branchKeepFundingSubflow) {
+    nextPhase = currentPhase;
+  } else if (branchMobileWalletSetup) {
+    nextPhase = {
       step: "wallet-setup",
       mobile: { deeplinkUri: state.deeplinkUri, providerId: state.selectedProviderId },
       accountId: null
     };
-  } else if (c9) {
-    resolved = p;
-  } else if (c10) {
-    resolved = { step: "guest-token-picker" };
-  } else if (c11) {
-    resolved = p;
-  } else if (c12) {
-    resolved = { step: "initializing" };
-  } else if (c13) {
-    resolved = { step: "initializing" };
-  } else if (c14) {
-    resolved = { step: "otp-verify", target: state.verificationTarget };
-  } else if (c15) {
-    resolved = { step: "login" };
-  } else if (c16) {
-    resolved = { step: "passkey-verify" };
-  } else if (c17) {
-    resolved = { step: "passkey-create", popupFallback: state.passkeyPopupNeeded };
-  } else if (c18) {
-    resolved = { step: "data-loading" };
-  } else if (c19) {
-    resolved = { step: "wallet-picker", reason: "link" };
-  } else if (c20) {
-    resolved = { step: "deposit" };
-  } else if (c21) {
-    resolved = { step: "wallet-picker", reason: "guest-entry" };
+  } else if (branchKeepGuestWalletSetup) {
+    nextPhase = currentPhase;
+  } else if (branchGuestTokenPicker) {
+    nextPhase = { step: "guest-token-picker" };
+  } else if (branchKeepWalletPickerSwitch) {
+    nextPhase = currentPhase;
+  } else if (branchInitializingPrivy) {
+    nextPhase = { step: "initializing" };
+  } else if (branchInitializingPasskeyConfig) {
+    nextPhase = { step: "initializing" };
+  } else if (branchOtpVerify) {
+    nextPhase = { step: "otp-verify", target: state.verificationTarget };
+  } else if (branchLoginRequested) {
+    nextPhase = { step: "login" };
+  } else if (branchPasskeyVerify) {
+    nextPhase = { step: "passkey-verify" };
+  } else if (branchPasskeyCreate) {
+    nextPhase = { step: "passkey-create", popupFallback: state.passkeyPopupNeeded };
+  } else if (branchDataLoading) {
+    nextPhase = { step: "data-loading" };
+  } else if (branchWalletPickerLink) {
+    nextPhase = { step: "wallet-picker", reason: "link" };
+  } else if (branchDeposit) {
+    nextPhase = { step: "deposit" };
+  } else if (branchWalletPickerGuestEntry) {
+    nextPhase = { step: "wallet-picker", reason: "guest-entry" };
   } else {
-    resolved = { step: "wallet-picker", reason: "entry" };
+    nextPhase = { step: "wallet-picker", reason: "entry" };
   }
-  return resolved;
+  return nextPhase;
 }
 
 // src/paymentReducer.ts
@@ -2442,13 +2442,37 @@ function applyAction(state, action) {
         selectedProviderId: action.providerId ?? state.selectedProviderId,
         error: action.error ?? null
       };
-    case "MOBILE_RESUME_SUCCESS":
+    case "MOBILE_RESUME_SUCCESS": {
+      const guestResume = action.guestCheckoutResume;
       return {
         ...state,
         transfer: action.transfer,
         error: null,
         mobileFlow: false,
-        deeplinkUri: null
+        deeplinkUri: null,
+        ...guestResume ? {
+          isGuestFlow: true,
+          guestSessionToken: guestResume.guestSessionToken,
+          guestTransferId: action.transfer.id
+        } : {}
+      };
+    }
+    case "GUEST_PREAUTH_RESUME_WITH_TRANSFER":
+      return {
+        ...state,
+        transfer: action.transfer,
+        error: null,
+        mobileFlow: false,
+        deeplinkUri: null,
+        isGuestFlow: true,
+        guestSessionToken: action.guestSessionToken,
+        guestTransferId: action.transfer.id,
+        guestPreauthAccountId: action.guestPreauthAccountId,
+        guestPreauthSessionId: action.guestPreauthSessionId ?? state.guestPreauthSessionId,
+        selectedProviderId: action.selectedProviderId,
+        selectedAccountId: action.guestPreauthAccountId,
+        selectedWalletId: null,
+        selectedTokenSymbol: null
       };
     case "MOBILE_RESUME_FAILED":
       return {
@@ -8242,6 +8266,38 @@ function usePasskeyCheckEffect(deps) {
             if (cancelled) return;
             if (existingTransfer.status === "COMPLETED") {
               clearMobileFlowState();
+              if (persisted.isGuestPreauth && persisted.guestSessionToken) {
+                let guestLookup = null;
+                try {
+                  guestLookup = await fetchGuestAccount(
+                    apiBaseUrl,
+                    persisted.guestSessionToken
+                  );
+                } catch {
+                  dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
+                  onCompleteRef.current?.(existingTransfer);
+                  return;
+                }
+                if (guestLookup == null) {
+                  dispatch({
+                    type: "MOBILE_RESUME_SUCCESS",
+                    transfer: existingTransfer,
+                    guestCheckoutResume: { guestSessionToken: persisted.guestSessionToken }
+                  });
+                  onCompleteRef.current?.(existingTransfer);
+                  return;
+                }
+                dispatch({
+                  type: "GUEST_PREAUTH_RESUME_WITH_TRANSFER",
+                  transfer: existingTransfer,
+                  guestSessionToken: persisted.guestSessionToken,
+                  guestPreauthAccountId: guestLookup.accountId,
+                  guestPreauthSessionId: persisted.sessionId ?? null,
+                  selectedProviderId: persisted.providerId
+                });
+                onCompleteRef.current?.(existingTransfer);
+                return;
+              }
               dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
               onCompleteRef.current?.(existingTransfer);
               return;
@@ -8597,9 +8653,11 @@ function useMobilePollingEffect(deps) {
     reloadAccounts,
     apiBaseUrl
   } = deps;
-  const { getAccessToken } = reactAuth.usePrivy();
+  const { getAccessToken, authenticated: privyAuthenticated } = reactAuth.usePrivy();
   const getAccessTokenRef = react.useRef(getAccessToken);
   getAccessTokenRef.current = getAccessToken;
+  const privyAuthenticatedRef = react.useRef(privyAuthenticated);
+  privyAuthenticatedRef.current = privyAuthenticated;
   const handleAuthorizedMobileReturnRef = react.useRef(deps.handleAuthorizedMobileReturn);
   handleAuthorizedMobileReturnRef.current = deps.handleAuthorizedMobileReturn;
   react.useEffect(() => {
@@ -8632,6 +8690,34 @@ function useMobilePollingEffect(deps) {
         await reloadAccounts();
       } catch {
       }
+      const guestToken = state.guestSessionToken;
+      const preauthAccountId = state.guestPreauthAccountId;
+      const preauthSessionId = state.guestPreauthSessionId;
+      if (!guestToken) {
+        dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+        return;
+      }
+      let guestLookup = null;
+      try {
+        guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
+      } catch {
+        dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+        return;
+      }
+      if (guestLookup == null) {
+        dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+        return;
+      }
+      if (guestLookup.accountId !== preauthAccountId) {
+        dispatch({
+          type: "GUEST_PREAUTH_DETECTED",
+          accountId: guestLookup.accountId,
+          sessionId: preauthSessionId ?? void 0
+        });
+      }
+      if (!privyAuthenticatedRef.current) {
+        dispatch({ type: "REQUEST_LOGIN" });
+      }
       dispatch({ type: "MOBILE_SETUP_COMPLETE" });
     };
     const pollGuestPreauthSession = async () => {
@@ -8666,6 +8752,8 @@ function useMobilePollingEffect(deps) {
     state.activeCredentialId,
     state.guestPreauthSessionId,
     state.isGuestFlow,
+    state.guestSessionToken,
+    state.guestPreauthAccountId,
     apiBaseUrl,
     reloadAccounts,
     dispatch,
@@ -8833,11 +8921,38 @@ function useGuestPreauthMobileRestoreEffect(deps) {
         ]);
         if (cancelled) return;
         const mobileOpen = session.status !== "AUTHORIZED";
+        let guestLookup = null;
+        if (!mobileOpen) {
+          try {
+            guestLookup = await fetchGuestAccount(
+              apiBaseUrl,
+              persisted.guestSessionToken
+            );
+          } catch {
+            dispatch({
+              type: "MOBILE_RESUME_SUCCESS",
+              transfer,
+              guestCheckoutResume: { guestSessionToken: persisted.guestSessionToken }
+            });
+            clearMobileFlowState();
+            return;
+          }
+          if (guestLookup == null) {
+            dispatch({
+              type: "MOBILE_RESUME_SUCCESS",
+              transfer,
+              guestCheckoutResume: { guestSessionToken: persisted.guestSessionToken }
+            });
+            clearMobileFlowState();
+            return;
+          }
+        }
+        const guestPreauthAccountId = !mobileOpen && guestLookup != null ? guestLookup.accountId : persisted.accountId;
         dispatch({
           type: "RESTORE_GUEST_PREAUTH_MOBILE",
           transfer,
           guestSessionToken: persisted.guestSessionToken,
-          guestPreauthAccountId: persisted.accountId,
+          guestPreauthAccountId,
           guestPreauthSessionId: persisted.sessionId,
           selectedProviderId: persisted.providerId,
           deeplinkUri: persisted.deeplinkUri,
@@ -8845,7 +8960,7 @@ function useGuestPreauthMobileRestoreEffect(deps) {
         });
         if (mobileOpen) {
           mobileSetupFlowRef.current = true;
-          setupAccountIdRef.current = persisted.accountId;
+          setupAccountIdRef.current = persisted.accountId ?? null;
         } else {
           clearMobileFlowState();
         }