@swype-org/react-sdk 0.1.63 → 0.1.64

package/dist/index.js

@@ -4449,6 +4449,24 @@ function buildSelectSourceChoices(options) {
   }
   return chainChoices;
 }
+function resolvePostAuthStep(state) {
+  if (!state.hasPasskey) {
+    return { step: "create-passkey", clearPersistedFlow: false };
+  }
+  const hasActiveWallet = state.accounts.some(
+    (a) => a.wallets.some((w) => w.status === "ACTIVE")
+  );
+  if (state.persistedMobileFlow) {
+    if (hasActiveWallet && !state.mobileSetupInProgress) {
+      return { step: "deposit", clearPersistedFlow: true };
+    }
+    return { step: "open-wallet", clearPersistedFlow: false };
+  }
+  if ((state.accounts.length === 0 || !hasActiveWallet) && !state.connectingNewAccount) {
+    return { step: "wallet-picker", clearPersistedFlow: false };
+  }
+  return { step: "deposit", clearPersistedFlow: false };
+}
 function SwypePayment(props) {
   const resetKey = useRef(0);
   const handleBoundaryReset = useCallback(() => {
@@ -4623,19 +4641,47 @@ function SwypePaymentInner({
     let cancelled = false;
     setError(null);
     resetHeadlessLogin();
-    const restoreOrDeposit = () => {
+    const restoreOrDeposit = async (credId, token) => {
       const persisted = loadMobileFlowState();
-      if (persisted) {
+      let accts = [];
+      try {
+        accts = await fetchAccounts(apiBaseUrl, token, credId);
+        if (cancelled) return;
+      } catch {
+      }
+      const resolved = resolvePostAuthStep({
+        hasPasskey: true,
+        accounts: accts,
+        persistedMobileFlow: persisted,
+        mobileSetupInProgress: false,
+        connectingNewAccount: false
+      });
+      if (resolved.clearPersistedFlow) {
+        clearMobileFlowState();
+      }
+      if (resolved.step === "open-wallet" && persisted) {
+        try {
+          const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
+          if (cancelled) return;
+          const terminalStatuses = ["AUTHORIZED", "COMPLETED", "FAILED"];
+          if (terminalStatuses.includes(existingTransfer.status)) {
+            clearMobileFlowState();
+            setStep("deposit");
+            return;
+          }
+        } catch {
+          clearMobileFlowState();
+          setStep("deposit");
+          return;
+        }
         setMobileFlow(true);
         setDeeplinkUri(persisted.deeplinkUri);
         setSelectedProviderId(persisted.providerId);
         pollingTransferIdRef.current = persisted.transferId;
         mobileSetupFlowRef.current = persisted.isSetup;
-        setStep("open-wallet");
         polling.startPolling(persisted.transferId);
-      } else {
-        setStep("deposit");
       }
+      setStep(resolved.step);
     };
     const checkPasskey = async () => {
       try {
@@ -4652,7 +4698,7 @@ function SwypePaymentInner({
           return;
         }
         if (activeCredentialId && allPasskeys.some((p) => p.credentialId === activeCredentialId)) {
-          restoreOrDeposit();
+          await restoreOrDeposit(activeCredentialId, token);
           return;
         }
         if (cancelled) return;
@@ -4662,7 +4708,7 @@ function SwypePaymentInner({
         if (matched) {
           setActiveCredentialId(matched);
           window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, matched);
-          restoreOrDeposit();
+          await restoreOrDeposit(matched, token);
           return;
         }
         setStep("create-passkey");
@@ -4706,11 +4752,22 @@ function SwypePaymentInner({
         } else if (prov.length > 0 && !connectingNewAccount) {
           setSelectedProviderId(prov[0].id);
         }
-        const hasActiveWallet = accts.some(
-          (a) => a.wallets.some((w) => w.status === "ACTIVE")
-        );
-        if ((accts.length === 0 || !hasActiveWallet) && step === "deposit" && !connectingNewAccount) {
-          setStep("wallet-picker");
+        const persisted = loadMobileFlowState();
+        const resolved = resolvePostAuthStep({
+          hasPasskey: !!activeCredentialId,
+          accounts: accts,
+          persistedMobileFlow: persisted,
+          mobileSetupInProgress: mobileSetupFlowRef.current,
+          connectingNewAccount
+        });
+        if (resolved.clearPersistedFlow) {
+          clearMobileFlowState();
+          setMobileFlow(false);
+          setDeeplinkUri(null);
+        }
+        const correctableSteps = ["deposit", "wallet-picker", "open-wallet"];
+        if (correctableSteps.includes(step)) {
+          setStep(resolved.step);
         }
       } catch (err) {
         if (!cancelled) {
@@ -5021,15 +5078,18 @@ function SwypePaymentInner({
     setActiveCredentialId(credentialId);
     window.localStorage.setItem(ACTIVE_CREDENTIAL_STORAGE_KEY, credentialId);
     setPasskeyPopupNeeded(false);
-    const hasActiveWallet = accounts.some(
-      (a) => a.wallets.some((w) => w.status === "ACTIVE")
-    );
-    if (accounts.length === 0 || !hasActiveWallet) {
-      setStep("wallet-picker");
-    } else {
-      setStep("deposit");
+    const resolved = resolvePostAuthStep({
+      hasPasskey: true,
+      accounts,
+      persistedMobileFlow: loadMobileFlowState(),
+      mobileSetupInProgress: mobileSetupFlowRef.current,
+      connectingNewAccount
+    });
+    if (resolved.clearPersistedFlow) {
+      clearMobileFlowState();
     }
-  }, [getAccessToken, apiBaseUrl, accounts]);
+    setStep(resolved.step);
+  }, [getAccessToken, apiBaseUrl, accounts, connectingNewAccount]);
   const handleRegisterPasskey = useCallback(async () => {
     setRegisteringPasskey(true);
     setError(null);