@swype-org/react-sdk 0.1.262 → 0.1.266

package/dist/index.cjs

@@ -2418,7 +2418,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
@@ -8653,11 +8654,9 @@ function useMobilePollingEffect(deps) {
     reloadAccounts,
     apiBaseUrl
   } = deps;
-  const { getAccessToken, authenticated: privyAuthenticated } = reactAuth.usePrivy();
+  const { getAccessToken } = 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(() => {
@@ -8684,14 +8683,13 @@ function useMobilePollingEffect(deps) {
     if (!state.mobileFlow || !mobileSetupFlowRef.current) return;
     if (!setupAccountIdRef.current) return;
     if (!state.guestPreauthSessionId || !state.isGuestFlow) return;
-    const sessionId = state.guestPreauthSessionId;
+    const guestToken = state.guestSessionToken;
+    const preauthAccountId = state.guestPreauthAccountId;
+    const preauthSessionId = state.guestPreauthSessionId;
     let cancelled = false;
     let completedGuestPreauth = false;
     const POLL_INTERVAL_MS = 3e3;
-    const completeGuestPreauthSetup = async () => {
-      if (completedGuestPreauth) return;
-      completedGuestPreauth = true;
-      cancelled = true;
+    const finishMobileAndDispatch = async () => {
       mobileSetupFlowRef.current = false;
       setupAccountIdRef.current = null;
       clearMobileFlowState();
@@ -8699,24 +8697,19 @@ 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;
-      }
+    };
+    const completeGuestPreauthWithoutToken = async () => {
+      if (completedGuestPreauth) return;
+      completedGuestPreauth = true;
+      cancelled = true;
+      await finishMobileAndDispatch();
+      dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+    };
+    const completeGuestPreauthWithAccount = async (guestLookup) => {
+      if (completedGuestPreauth) return;
+      completedGuestPreauth = true;
+      cancelled = true;
+      await finishMobileAndDispatch();
       if (guestLookup.accountId !== preauthAccountId) {
         dispatch({
           type: "GUEST_PREAUTH_DETECTED",
@@ -8724,29 +8717,31 @@ function useMobilePollingEffect(deps) {
           sessionId: preauthSessionId ?? void 0
         });
       }
-      if (!privyAuthenticatedRef.current) {
-        dispatch({ type: "REQUEST_LOGIN" });
-      }
+      dispatch({ type: "REQUEST_LOGIN" });
       dispatch({ type: "MOBILE_SETUP_COMPLETE" });
     };
-    const pollGuestPreauthSession = async () => {
+    const pollGuestAccount = async () => {
       try {
         if (cancelled) return;
-        const session = await fetchAuthorizationSession(apiBaseUrl, sessionId);
+        if (!guestToken) {
+          await completeGuestPreauthWithoutToken();
+          return;
+        }
+        const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
         if (cancelled) return;
-        if (session.status === "AUTHORIZED") {
-          await completeGuestPreauthSetup();
+        if (guestLookup != null) {
+          await completeGuestPreauthWithAccount(guestLookup);
         }
       } catch {
       }
     };
-    pollGuestPreauthSession();
-    const intervalId = window.setInterval(pollGuestPreauthSession, POLL_INTERVAL_MS);
+    pollGuestAccount();
+    const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
     const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !cancelled) void pollGuestPreauthSession();
+      if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
     };
     const handlePageShow = (e) => {
-      if (e.persisted && !cancelled) void pollGuestPreauthSession();
+      if (e.persisted && !cancelled) void pollGuestAccount();
     };
     document.addEventListener("visibilitychange", handleVisibility);
     window.addEventListener("pageshow", handlePageShow);
@@ -8902,88 +8897,71 @@ 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 = react.useRef(false);
   react.useEffect(() => {
-    if (!privyReady || authenticated) return;
+    if (!privyReady) return;
     const persisted = loadMobileFlowState();
-    if (!persisted?.isGuestPreauth || !persisted.transferId || !persisted.guestSessionToken || !persisted.sessionId || !persisted.deeplinkUri || persisted.accountId == null) {
+    if (!persisted?.isGuestPreauth || !persisted.guestSessionToken) {
       return;
     }
-    const key = guestPreauthRestoreKey(persisted.sessionId, persisted.transferId);
+    const guestToken = persisted.guestSessionToken;
+    const key = guestPreauthRestoreKey(guestToken);
     if (guestPreauthRestoreAttemptedKeys.has(key)) return;
     guestPreauthRestoreAttemptedKeys.add(key);
+    if (completedRef.current) return;
     let cancelled = false;
-    void (async () => {
+    const POLL_INTERVAL_MS = 3e3;
+    const handleAccountFound = async (guestLookup) => {
+      if (completedRef.current) return;
+      completedRef.current = true;
+      cancelled = true;
+      clearMobileFlowState();
+      mobileSetupFlowRef.current = false;
+      setupAccountIdRef.current = null;
+      dispatch({
+        type: "GUEST_PREAUTH_DETECTED",
+        accountId: guestLookup.accountId,
+        sessionId: persisted.sessionId ?? void 0
+      });
+      dispatch({ type: "REQUEST_LOGIN" });
+      dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+    };
+    const pollGuestAccount = 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;
-        dispatch({
-          type: "RESTORE_GUEST_PREAUTH_MOBILE",
-          transfer,
-          guestSessionToken: persisted.guestSessionToken,
-          guestPreauthAccountId,
-          guestPreauthSessionId: persisted.sessionId,
-          selectedProviderId: persisted.providerId,
-          deeplinkUri: persisted.deeplinkUri,
-          mobileOpen
-        });
-        if (mobileOpen) {
-          mobileSetupFlowRef.current = true;
-          setupAccountIdRef.current = persisted.accountId ?? null;
-        } else {
-          clearMobileFlowState();
+        const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
+        if (cancelled) return;
+        if (guestLookup != null) {
+          await handleAccountFound(guestLookup);
         }
-      } catch (err) {
-        guestPreauthRestoreAttemptedKeys.delete(key);
-        captureException(err);
+      } catch {
       }
-    })();
+    };
+    pollGuestAccount();
+    const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
+    const handleVisibility = () => {
+      if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
+    };
+    const handlePageShow = (e) => {
+      if (e.persisted && !cancelled) void pollGuestAccount();
+    };
+    document.addEventListener("visibilitychange", handleVisibility);
+    window.addEventListener("pageshow", handlePageShow);
     return () => {
       cancelled = true;
+      window.clearInterval(intervalId);
+      document.removeEventListener("visibilitychange", handleVisibility);
+      window.removeEventListener("pageshow", handlePageShow);
+      if (!completedRef.current) {
+        guestPreauthRestoreAttemptedKeys.delete(key);
+      }
     };
-  }, [privyReady, authenticated, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
+  }, [privyReady, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
 }
 function useSelectSourceEffect(deps) {
   const {
@@ -9426,7 +9404,6 @@ function BlinkPaymentInner({
     dispatch,
     apiBaseUrl,
     privyReady: state.privyReady,
-    authenticated,
     mobileSetupFlowRef: mobileFlowRefs.mobileSetupFlowRef,
     setupAccountIdRef: mobileFlowRefs.setupAccountIdRef
   });