@swype-org/react-sdk 0.1.271 → 0.1.272

package/dist/index.js

@@ -7339,7 +7339,8 @@ function useProviderHandlers(deps) {
     destination,
     guestSessionToken,
     guestTransferId,
-    selectedProviderId
+    selectedProviderId,
+    startGuestAccountPolling
   } = deps;
   const wagmiConfig2 = useConfig();
   const { connectAsync, connectors } = useConnect();
@@ -7779,6 +7780,7 @@ function useProviderHandlers(deps) {
         triggerDeeplink(created.sessionUri);
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: created.sessionUri });
       }
+      startGuestAccountPolling(guestSessionToken, session.id);
       dispatch({
         type: "GUEST_PREAUTH_DETECTED",
         accountId: created.accountId,
@@ -7806,7 +7808,8 @@ function useProviderHandlers(deps) {
     useWalletConnectorProp,
     mobileSetupFlowRef,
     handlingMobileReturnRef,
-    setupAccountIdRef
+    setupAccountIdRef,
+    startGuestAccountPolling
   ]);
   return {
     handlePrepareProvider,
@@ -8691,100 +8694,6 @@ function useMobilePollingEffect(deps) {
     handlingMobileReturnRef,
     mobileSetupFlowRef
   ]);
-  useEffect(() => {
-    if (!state.mobileFlow || !state.isGuestFlow || !state.guestPreauthSessionId || !state.guestPreauthAccountId) {
-      return;
-    }
-    const guestToken = state.guestSessionToken ?? loadMobileFlowState()?.guestSessionToken ?? null;
-    const preauthAccountId = state.guestPreauthAccountId;
-    const preauthSessionId = state.guestPreauthSessionId;
-    let cancelled = false;
-    let completedGuestPreauth = false;
-    const POLL_INTERVAL_MS = 3e3;
-    const finishMobileAndDispatch = async () => {
-      mobileSetupFlowRef.current = false;
-      setupAccountIdRef.current = null;
-      try {
-        await reloadAccounts();
-      } catch {
-      }
-    };
-    const completeGuestPreauthWithoutToken = async () => {
-      if (completedGuestPreauth) return;
-      completedGuestPreauth = true;
-      cancelled = true;
-      await finishMobileAndDispatch();
-      clearMobileFlowState();
-      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",
-          accountId: guestLookup.accountId,
-          sessionId: preauthSessionId ?? void 0
-        });
-      }
-      dispatch({ type: "REQUEST_LOGIN" });
-      dispatch({ type: "MOBILE_SETUP_COMPLETE" });
-    };
-    const pollGuestAccount = async () => {
-      try {
-        if (cancelled) return;
-        if (!guestToken) {
-          await completeGuestPreauthWithoutToken();
-          return;
-        }
-        const guestLookup = await fetchGuestAccount(apiBaseUrl, guestToken);
-        if (cancelled) return;
-        if (guestLookup != null) {
-          if (preauthSessionId) {
-            try {
-              const session = await fetchAuthorizationSession(
-                apiBaseUrl,
-                preauthSessionId
-              );
-              if (cancelled) return;
-              if (session.status !== "AUTHORIZED") return;
-            } catch {
-              return;
-            }
-          }
-          await completeGuestPreauthWithAccount(guestLookup);
-        }
-      } catch {
-      }
-    };
-    pollGuestAccount();
-    const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
-    const handleVisibility = () => {
-      if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
-    };
-    const handlePageShow = () => {
-      if (document.visibilityState === "visible" && !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);
-    };
-  }, [
-    state.mobileFlow,
-    state.guestPreauthSessionId,
-    state.isGuestFlow,
-    state.guestSessionToken,
-    state.guestPreauthAccountId,
-    apiBaseUrl,
-    reloadAccounts,
-    dispatch
-  ]);
   useEffect(() => {
     if (!state.mobileFlow || !mobileSetupFlowRef.current) return;
     if (state.isGuestFlow && state.guestPreauthSessionId != null) return;
@@ -8923,106 +8832,55 @@ function useMobilePollingEffect(deps) {
     pollingTransferIdRef
   ]);
 }
-var guestPreauthRestoreAttemptedKeys = /* @__PURE__ */ new Set();
-function guestPreauthRestoreKey(guestToken) {
-  return guestToken;
-}
 function useGuestPreauthMobileRestoreEffect(deps) {
-  const { dispatch, apiBaseUrl, privyReady, mobileSetupFlowRef, setupAccountIdRef } = deps;
-  const completedRef = useRef(false);
-  const pollingCleanupRef = useRef(null);
+  const {
+    dispatch,
+    privyReady,
+    mobileSetupFlowRef,
+    setupAccountIdRef,
+    startGuestAccountPolling
+  } = deps;
+  const startedRef = useRef(false);
   useEffect(() => {
     if (!privyReady) return;
     const tryStart = () => {
-      if (completedRef.current) return;
+      if (startedRef.current) return;
       const persisted = loadMobileFlowState();
-      if (!persisted?.isGuestPreauth || !persisted.guestSessionToken) {
+      if (!persisted?.isGuestPreauth || !persisted.guestSessionToken || !persisted.sessionId) {
         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;
+      startedRef.current = true;
       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;
+      if (persisted.accountId) {
         dispatch({
           type: "GUEST_PREAUTH_DETECTED",
-          accountId: guestLookup.accountId,
-          sessionId: persisted.sessionId ?? void 0
+          accountId: persisted.accountId,
+          sessionId: persisted.sessionId
         });
-        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) {
-            if (persisted.sessionId) {
-              try {
-                const session = await fetchAuthorizationSession(
-                  apiBaseUrl,
-                  persisted.sessionId
-                );
-                if (cancelled) return;
-                if (session.status !== "AUTHORIZED") return;
-              } catch {
-                return;
-              }
-            }
-            await handleAccountFound(guestLookup);
-          }
-        } catch {
-        }
-      };
-      pollGuestAccount();
-      const intervalId = window.setInterval(pollGuestAccount, POLL_INTERVAL_MS);
-      const handlePollVisibility = () => {
-        if (document.visibilityState === "visible" && !cancelled) void pollGuestAccount();
-      };
-      const handlePollPageShow = () => {
-        if (document.visibilityState === "visible" && !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;
-      };
+      }
+      dispatch({
+        type: "MOBILE_DEEPLINK_READY",
+        deeplinkUri: persisted.deeplinkUri
+      });
+      startGuestAccountPolling(persisted.guestSessionToken, persisted.sessionId);
     };
-    const onOuterVisibility = () => {
+    const onVisibility = () => {
       if (document.visibilityState === "visible") tryStart();
     };
-    const onOuterPageShow = () => {
+    const onPageShow = () => {
       if (document.visibilityState === "visible") tryStart();
     };
     tryStart();
-    document.addEventListener("visibilitychange", onOuterVisibility);
-    window.addEventListener("pageshow", onOuterPageShow);
+    document.addEventListener("visibilitychange", onVisibility);
+    window.addEventListener("pageshow", onPageShow);
     return () => {
-      document.removeEventListener("visibilitychange", onOuterVisibility);
-      window.removeEventListener("pageshow", onOuterPageShow);
-      pollingCleanupRef.current?.();
+      document.removeEventListener("visibilitychange", onVisibility);
+      window.removeEventListener("pageshow", onPageShow);
     };
-  }, [privyReady, apiBaseUrl, dispatch, mobileSetupFlowRef, setupAccountIdRef]);
+  }, [privyReady, dispatch, mobileSetupFlowRef, setupAccountIdRef, startGuestAccountPolling]);
 }
 function useSelectSourceEffect(deps) {
   const {
@@ -9283,6 +9141,77 @@ function useGuestPreauthWalletSetupEffect(deps) {
     dispatch
   ]);
 }
+function useGuestAccountPolling(intervalMs = 3e3) {
+  const { apiBaseUrl } = useBlinkConfig();
+  const [guestAccount, setGuestAccount] = useState(null);
+  const [isPolling, setIsPolling] = useState(false);
+  const intervalRef = useRef(null);
+  const guestTokenRef = useRef(null);
+  const sessionIdRef = useRef(null);
+  const apiBaseUrlRef = useRef(apiBaseUrl);
+  apiBaseUrlRef.current = apiBaseUrl;
+  const stopPolling = useCallback(() => {
+    if (intervalRef.current) {
+      clearInterval(intervalRef.current);
+      intervalRef.current = null;
+    }
+    guestTokenRef.current = null;
+    sessionIdRef.current = null;
+    setIsPolling(false);
+  }, []);
+  const poll = useCallback(async () => {
+    const token = guestTokenRef.current;
+    const sessionId = sessionIdRef.current;
+    if (!token || !sessionId) return;
+    try {
+      const lookup = await fetchGuestAccount(apiBaseUrlRef.current, token);
+      if (!guestTokenRef.current) return;
+      if (lookup == null) return;
+      try {
+        const session = await fetchAuthorizationSession(apiBaseUrlRef.current, sessionId);
+        if (!guestTokenRef.current) return;
+        if (session.status !== "AUTHORIZED") return;
+      } catch {
+        return;
+      }
+      setGuestAccount(lookup);
+      stopPolling();
+    } catch {
+    }
+  }, [stopPolling]);
+  const startPolling = useCallback(
+    (guestToken, sessionId) => {
+      stopPolling();
+      guestTokenRef.current = guestToken;
+      sessionIdRef.current = sessionId;
+      setGuestAccount(null);
+      setIsPolling(true);
+      poll();
+      intervalRef.current = setInterval(poll, intervalMs);
+    },
+    [poll, intervalMs, stopPolling]
+  );
+  useEffect(() => {
+    const handleVisibility = () => {
+      if (document.visibilityState === "visible" && guestTokenRef.current) {
+        void poll();
+      }
+    };
+    const handlePageShow = () => {
+      if (document.visibilityState === "visible" && guestTokenRef.current) {
+        void poll();
+      }
+    };
+    document.addEventListener("visibilitychange", handleVisibility);
+    window.addEventListener("pageshow", handlePageShow);
+    return () => {
+      document.removeEventListener("visibilitychange", handleVisibility);
+      window.removeEventListener("pageshow", handlePageShow);
+    };
+  }, [poll]);
+  useEffect(() => () => stopPolling(), [stopPolling]);
+  return { guestAccount, isPolling, startPolling, stopPolling };
+}
 function BlinkPayment(props) {
   const resetKey = useRef(0);
   const handleBoundaryReset = useCallback(() => {
@@ -9319,6 +9248,7 @@ function BlinkPaymentInner({
   );
   const authExecutor = useAuthorizationExecutor();
   const polling = useTransferPolling();
+  const guestAccountPolling = useGuestAccountPolling();
   const transferSigning = useTransferSigning();
   const mobileFlowRefs = {
     mobileSetupFlowRef: useRef(false),
@@ -9398,7 +9328,8 @@ function BlinkPaymentInner({
     destination,
     guestSessionToken: state.guestSessionToken,
     guestTransferId: state.guestTransferId,
-    selectedProviderId: state.selectedProviderId
+    selectedProviderId: state.selectedProviderId,
+    startGuestAccountPolling: guestAccountPolling.startPolling
   });
   const guestPostPayPreauth = useMemo(
     () => !!state.guestPreauthSessionId && state.isGuestFlow || state.guestPreauthorizing && isDesktop,
@@ -9461,11 +9392,27 @@ function BlinkPaymentInner({
   usePrivySessionSyncEffect({ dispatch, ready, authenticated });
   useGuestPreauthMobileRestoreEffect({
     dispatch,
-    apiBaseUrl,
     privyReady: state.privyReady,
     mobileSetupFlowRef: mobileFlowRefs.mobileSetupFlowRef,
-    setupAccountIdRef: mobileFlowRefs.setupAccountIdRef
+    setupAccountIdRef: mobileFlowRefs.setupAccountIdRef,
+    startGuestAccountPolling: guestAccountPolling.startPolling
   });
+  useEffect(() => {
+    if (!guestAccountPolling.guestAccount) return;
+    const acct = guestAccountPolling.guestAccount;
+    if (acct.accountId !== state.guestPreauthAccountId) {
+      dispatch({
+        type: "GUEST_PREAUTH_DETECTED",
+        accountId: acct.accountId,
+        sessionId: state.guestPreauthSessionId ?? void 0
+      });
+    }
+    mobileFlowRefs.mobileSetupFlowRef.current = false;
+    mobileFlowRefs.setupAccountIdRef.current = null;
+    clearMobileFlowState();
+    dispatch({ type: "REQUEST_LOGIN" });
+    dispatch({ type: "MOBILE_SETUP_COMPLETE" });
+  }, [guestAccountPolling.guestAccount]);
   useOtpEffects({
     state,
     dispatch,