@swype-org/react-sdk 0.1.264 → 0.1.267

package/dist/index.js

@@ -2415,7 +2415,8 @@ function applyAction(state, action) {
     case "MOBILE_SETUP_COMPLETE":
       return {
         ...state,
-        transfer: action.transfer ?? state.transfer,
+        // Do not use `??`: explicit `null` must clear the transfer (guest preauth → login / claim).
+        transfer: action.transfer !== void 0 ? action.transfer : state.transfer,
         error: null,
         mobileFlow: false,
         deeplinkUri: null
@@ -8262,7 +8263,6 @@ function usePasskeyCheckEffect(deps) {
             const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
             if (cancelled) return;
             if (existingTransfer.status === "COMPLETED") {
-              clearMobileFlowState();
               if (persisted.isGuestPreauth && persisted.guestSessionToken) {
                 let guestLookup = null;
                 try {
@@ -8271,19 +8271,32 @@ function usePasskeyCheckEffect(deps) {
                     persisted.guestSessionToken
                   );
                 } catch {
-                  dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
-                  onCompleteRef.current?.(existingTransfer);
+                  persistMobileFlowState({
+                    deeplinkUri: persisted.deeplinkUri,
+                    providerId: persisted.providerId ?? null,
+                    isSetup: persisted.isSetup ?? true,
+                    guestSessionToken: persisted.guestSessionToken,
+                    transferId: persisted.transferId,
+                    isGuestPreauth: true,
+                    accountId: persisted.accountId,
+                    sessionId: persisted.sessionId
+                  });
                   return;
                 }
                 if (guestLookup == null) {
-                  dispatch({
-                    type: "MOBILE_RESUME_SUCCESS",
-                    transfer: existingTransfer,
-                    guestCheckoutResume: { guestSessionToken: persisted.guestSessionToken }
+                  persistMobileFlowState({
+                    deeplinkUri: persisted.deeplinkUri,
+                    providerId: persisted.providerId ?? null,
+                    isSetup: persisted.isSetup ?? true,
+                    guestSessionToken: persisted.guestSessionToken,
+                    transferId: persisted.transferId,
+                    isGuestPreauth: true,
+                    accountId: persisted.accountId,
+                    sessionId: persisted.sessionId
                   });
-                  onCompleteRef.current?.(existingTransfer);
                   return;
                 }
+                clearMobileFlowState();
                 dispatch({
                   type: "GUEST_PREAUTH_RESUME_WITH_TRANSFER",
                   transfer: existingTransfer,
@@ -8295,6 +8308,7 @@ function usePasskeyCheckEffect(deps) {
                 onCompleteRef.current?.(existingTransfer);
                 return;
               }
+              clearMobileFlowState();
               dispatch({ type: "MOBILE_RESUME_SUCCESS", transfer: existingTransfer });
               onCompleteRef.current?.(existingTransfer);
               return;
@@ -8582,6 +8596,7 @@ function useProcessingEffect(deps) {
     if (!state.transfer && (polling.transfer.status === "COMPLETED" || polling.transfer.status === "FAILED")) {
       return;
     }
+    if (state.isGuestFlow) return;
     if (polling.transfer.status === "COMPLETED") {
       clearMobileFlowState();
       dispatch({ type: "TRANSFER_COMPLETED", transfer: polling.transfer });
@@ -8596,6 +8611,7 @@ function useProcessingEffect(deps) {
     state.transfer,
     state.loginRequested,
     state.verificationTarget,
+    state.isGuestFlow,
     onComplete,
     dispatch,
     reloadAccounts
@@ -8650,11 +8666,9 @@ function useMobilePollingEffect(deps) {
     reloadAccounts,
     apiBaseUrl
   } = deps;
-  const { getAccessToken, authenticated: privyAuthenticated } = usePrivy();
+  const { getAccessToken } = usePrivy();
   const getAccessTokenRef = useRef(getAccessToken);
   getAccessTokenRef.current = getAccessToken;
-  const privyAuthenticatedRef = useRef(privyAuthenticated);
-  privyAuthenticatedRef.current = privyAuthenticated;
   const handleAuthorizedMobileReturnRef = useRef(deps.handleAuthorizedMobileReturn);
   handleAuthorizedMobileReturnRef.current = deps.handleAuthorizedMobileReturn;
   useEffect(() => {
@@ -8681,7 +8695,7 @@ function useMobilePollingEffect(deps) {
     if (!state.mobileFlow || !mobileSetupFlowRef.current) return;
     if (!setupAccountIdRef.current) return;
     if (!state.guestPreauthSessionId || !state.isGuestFlow) return;
-    const guestToken = state.guestSessionToken;
+    const guestToken = state.guestSessionToken ?? loadMobileFlowState()?.guestSessionToken ?? null;
     const preauthAccountId = state.guestPreauthAccountId;
     const preauthSessionId = state.guestPreauthSessionId;
     let cancelled = false;
@@ -8715,9 +8729,7 @@ function useMobilePollingEffect(deps) {
           sessionId: preauthSessionId ?? void 0
         });
       }
-      if (!privyAuthenticatedRef.current) {
-        dispatch({ type: "REQUEST_LOGIN" });
-      }
+      dispatch({ type: "REQUEST_LOGIN" });
       dispatch({ type: "MOBILE_SETUP_COMPLETE" });
     };
     const pollGuestAccount = async () => {
@@ -8897,88 +8909,93 @@ function useMobilePollingEffect(deps) {
   ]);
 }
 var guestPreauthRestoreAttemptedKeys = /* @__PURE__ */ new Set();
-function guestPreauthRestoreKey(sessionId, transferId) {
-  return `${sessionId}:${transferId}`;
+function guestPreauthRestoreKey(guestToken) {
+  return guestToken;
 }
 function useGuestPreauthMobileRestoreEffect(deps) {
-  const {
-    dispatch,
-    apiBaseUrl,
-    privyReady,
-    authenticated,
-    mobileSetupFlowRef,
-    setupAccountIdRef
-  } = deps;
+  const { dispatch, apiBaseUrl, privyReady, mobileSetupFlowRef, setupAccountIdRef } = deps;
+  const completedRef = useRef(false);
+  const pollingCleanupRef = useRef(null);
   useEffect(() => {
-    if (!privyReady || authenticated) return;
-    const persisted = loadMobileFlowState();
-    if (!persisted?.isGuestPreauth || !persisted.transferId || !persisted.guestSessionToken || !persisted.sessionId || !persisted.deeplinkUri || persisted.accountId == null) {
-      return;
-    }
-    const key = guestPreauthRestoreKey(persisted.sessionId, persisted.transferId);
-    if (guestPreauthRestoreAttemptedKeys.has(key)) return;
-    guestPreauthRestoreAttemptedKeys.add(key);
-    let cancelled = false;
-    void (async () => {
-      try {
-        const [transfer, session] = await Promise.all([
-          getGuestTransfer(apiBaseUrl, persisted.transferId, persisted.guestSessionToken),
-          fetchAuthorizationSession(apiBaseUrl, persisted.sessionId)
-        ]);
-        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;
+    if (!privyReady) return;
+    const tryStart = () => {
+      if (completedRef.current) return;
+      const persisted = loadMobileFlowState();
+      if (!persisted?.isGuestPreauth || !persisted.guestSessionToken) {
+        return;
+      }
+      const guestToken = persisted.guestSessionToken;
+      const key = guestPreauthRestoreKey(guestToken);
+      if (guestPreauthRestoreAttemptedKeys.has(key)) return;
+      guestPreauthRestoreAttemptedKeys.add(key);
+      let cancelled = false;
+      const POLL_INTERVAL_MS = 3e3;
+      mobileSetupFlowRef.current = true;
+      if (persisted.accountId) {
+        setupAccountIdRef.current = persisted.accountId;
+      }
+      const handleAccountFound = async (guestLookup) => {
+        if (completedRef.current) return;
+        completedRef.current = true;
+        cancelled = true;
+        clearMobileFlowState();
+        mobileSetupFlowRef.current = false;
+        setupAccountIdRef.current = null;
         dispatch({
-          type: "RESTORE_GUEST_PREAUTH_MOBILE",
-          transfer,
-          guestSessionToken: persisted.guestSessionToken,
-          guestPreauthAccountId,
-          guestPreauthSessionId: persisted.sessionId,
-          selectedProviderId: persisted.providerId,
-          deeplinkUri: persisted.deeplinkUri,
-          mobileOpen
+          type: "GUEST_PREAUTH_DETECTED",
+          accountId: guestLookup.accountId,
+          sessionId: persisted.sessionId ?? void 0
         });
-        if (mobileOpen) {
-          mobileSetupFlowRef.current = true;
-          setupAccountIdRef.current = persisted.accountId ?? null;
-        } else {
-          clearMobileFlowState();
+        dispatch({ type: "REQUEST_LOGIN" });
+        dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+      };
+      const pollGuestAccount = async () => {
+        try {
+          if (cancelled) return;
+          const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
+          if (cancelled) return;
+          if (guestLookup != null) {
+            await handleAccountFound(guestLookup);
+          }
+        } catch {
         }
-      } catch (err) {
-        guestPreauthRestoreAttemptedKeys.delete(key);
-        captureException(err);
-      }
-    })();
+      };
+      pollGuestAccount();
+      const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
+      const handlePollVisibility = () => {
+        if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
+      };
+      const handlePollPageShow = (e) => {
+        if (e.persisted && !cancelled) void pollGuestAccount();
+      };
+      document.addEventListener("visibilitychange", handlePollVisibility);
+      window.addEventListener("pageshow", handlePollPageShow);
+      pollingCleanupRef.current = () => {
+        cancelled = true;
+        window.clearInterval(intervalId);
+        document.removeEventListener("visibilitychange", handlePollVisibility);
+        window.removeEventListener("pageshow", handlePollPageShow);
+        if (!completedRef.current) {
+          guestPreauthRestoreAttemptedKeys.delete(key);
+        }
+        pollingCleanupRef.current = null;
+      };
+    };
+    const onOuterVisibility = () => {
+      if (document.visibilityState === "visible") tryStart();
+    };
+    const onOuterPageShow = (e) => {
+      if (e.persisted) tryStart();
+    };
+    tryStart();
+    document.addEventListener("visibilitychange", onOuterVisibility);
+    window.addEventListener("pageshow", onOuterPageShow);
     return () => {
-      cancelled = true;
+      document.removeEventListener("visibilitychange", onOuterVisibility);
+      window.removeEventListener("pageshow", onOuterPageShow);
+      pollingCleanupRef.current?.();
     };
-  }, [privyReady, authenticated, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
+  }, [privyReady, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
 }
 function useSelectSourceEffect(deps) {
   const {
@@ -9421,7 +9438,6 @@ function BlinkPaymentInner({
     dispatch,
     apiBaseUrl,
     privyReady: state.privyReady,
-    authenticated,
     mobileSetupFlowRef: mobileFlowRefs.mobileSetupFlowRef,
     setupAccountIdRef: mobileFlowRefs.setupAccountIdRef
   });