@swype-org/react-sdk 0.1.70 → 0.1.71

package/dist/index.js

@@ -1641,6 +1641,23 @@ function resolveRestoredMobileFlow(transferStatus, isSetup) {
   }
   return { kind: "resume-open-wallet", step: "open-wallet", clearPersistedFlow: false };
 }
+
+// src/dataLoading.ts
+function resolveDataLoadAction({
+  authenticated,
+  step,
+  accountsCount,
+  hasActiveCredential,
+  loading
+}) {
+  if (!authenticated || step === "login" || step === "otp-verify" || accountsCount > 0 || !hasActiveCredential) {
+    return "reset";
+  }
+  if (loading) {
+    return "wait";
+  }
+  return "load";
+}
 var FOOTER_CSS = `
 .swype-screen-footer {
   padding-bottom: max(24px, env(safe-area-inset-bottom, 24px));
@@ -4483,6 +4500,7 @@ function SwypePaymentInner({
   const [oneTapLimit, setOneTapLimit] = useState(100);
   const [mobileFlow, setMobileFlow] = useState(false);
   const [deeplinkUri, setDeeplinkUri] = useState(null);
+  const loadingDataRef = useRef(false);
   const pollingTransferIdRef = useRef(null);
   const mobileSigningTransferIdRef = useRef(null);
   const mobileSetupFlowRef = useRef(false);
@@ -4513,6 +4531,10 @@ function SwypePaymentInner({
       setConnectingNewAccount(false);
     }
   }, [getAccessToken, activeCredentialId, apiBaseUrl, depositAmount]);
+  const resetDataLoadingState = useCallback(() => {
+    loadingDataRef.current = false;
+    setLoadingData(false);
+  }, []);
   const enterPersistedMobileFlow = useCallback((persisted, errorMessage) => {
     setMobileFlow(true);
     setDeeplinkUri(persisted.deeplinkUri);
@@ -4530,6 +4552,7 @@ function SwypePaymentInner({
       clearMobileFlowState();
       try {
         await reloadAccounts();
+        resetDataLoadingState();
         setTransfer(null);
         setError(null);
         setDeeplinkUri(null);
@@ -4550,7 +4573,7 @@ function SwypePaymentInner({
     setDeeplinkUri(null);
     setMobileFlow(false);
     setStep("confirm-sign");
-  }, [polling.stopPolling, reloadAccounts]);
+  }, [polling.stopPolling, reloadAccounts, resetDataLoadingState]);
   const handleRetryMobileStatus = useCallback(() => {
     setError(null);
     const currentTransfer = polling.transfer ?? transfer;
@@ -4778,12 +4801,26 @@ function SwypePaymentInner({
     handleAuthorizedMobileReturn,
     onComplete
   ]);
-  const loadingDataRef = useRef(false);
   useEffect(() => {
-    if (!authenticated) return;
-    if (step === "login" || step === "otp-verify") return;
-    if (accounts.length > 0 || loadingDataRef.current) return;
-    if (!activeCredentialId) return;
+    const loadAction = resolveDataLoadAction({
+      authenticated,
+      step,
+      accountsCount: accounts.length,
+      hasActiveCredential: !!activeCredentialId,
+      loading: loadingDataRef.current
+    });
+    if (loadAction === "reset") {
+      resetDataLoadingState();
+      return;
+    }
+    if (loadAction === "wait") {
+      return;
+    }
+    const credentialId = activeCredentialId;
+    if (!credentialId) {
+      resetDataLoadingState();
+      return;
+    }
     let cancelled = false;
     loadingDataRef.current = true;
     const load = async () => {
@@ -4794,7 +4831,7 @@ function SwypePaymentInner({
         if (!token) throw new Error("Not authenticated");
         const [prov, accts, chn] = await Promise.all([
           fetchProviders(apiBaseUrl, token),
-          fetchAccounts(apiBaseUrl, token, activeCredentialId),
+          fetchAccounts(apiBaseUrl, token, credentialId),
           fetchChains(apiBaseUrl, token)
         ]);
         if (cancelled) return;
@@ -4832,8 +4869,7 @@ function SwypePaymentInner({
         }
       } finally {
         if (!cancelled) {
-          setLoadingData(false);
-          loadingDataRef.current = false;
+          resetDataLoadingState();
         }
       }
     };
@@ -4842,7 +4878,7 @@ function SwypePaymentInner({
       cancelled = true;
       loadingDataRef.current = false;
     };
-  }, [authenticated, step, accounts.length, apiBaseUrl, getAccessToken, activeCredentialId, depositAmount, connectingNewAccount]);
+  }, [authenticated, step, accounts.length, apiBaseUrl, getAccessToken, activeCredentialId, depositAmount, connectingNewAccount, resetDataLoadingState]);
   useEffect(() => {
     if (!polling.transfer) return;
     if (polling.transfer.status === "COMPLETED") {