@swype-org/react-sdk 0.1.97 → 0.1.100

package/dist/index.d.cts

@@ -121,7 +121,6 @@ interface Transfer {
     amount: Amount;
     createDate: string;
     updateDate: string;
-    authorizationSessions: AuthorizationSession[];
     signPayload?: TransferSignPayload | null;
 }
 /** Standard API error shape */
@@ -143,7 +142,7 @@ interface ActionExecutionResult {
     data?: unknown;
 }
 /** Source type discriminator for transfer creation */
-type SourceType = 'providerId' | 'accountId' | 'walletId' | 'tokenId';
+type SourceType = 'accountId' | 'walletId' | 'tokenId';
 /** A chain+token option from the SELECT_SOURCE action metadata. */
 interface SourceOption {
     chainName: string;
@@ -298,6 +297,12 @@ declare function useSwypeDepositAmount(): {
 declare function fetchProviders(apiBaseUrl: string, token: string): Promise<Provider[]>;
 declare function fetchChains(apiBaseUrl: string, token: string): Promise<Chain[]>;
 declare function fetchAccounts(apiBaseUrl: string, token: string, credentialId: string): Promise<Account[]>;
+interface CreateAccountParams {
+    name: string;
+    credentialId: string;
+    providerId: string;
+}
+declare function createAccount(apiBaseUrl: string, token: string, params: CreateAccountParams): Promise<Account>;
 interface CreateTransferParams {
     /** Caller-supplied UUID v4 for idempotency. If omitted, a random UUID is generated. */
     id?: string;
@@ -353,7 +358,9 @@ declare function updateUserConfigBySession(apiBaseUrl: string, sessionId: string
 }): Promise<void>;
 declare function reportActionCompletion(apiBaseUrl: string, actionId: string, result: Record<string, unknown>): Promise<AuthorizationSessionDetail>;
 
+type api_CreateAccountParams = CreateAccountParams;
 type api_CreateTransferParams = CreateTransferParams;
+declare const api_createAccount: typeof createAccount;
 declare const api_createTransfer: typeof createTransfer;
 declare const api_fetchAccounts: typeof fetchAccounts;
 declare const api_fetchAuthorizationSession: typeof fetchAuthorizationSession;
@@ -369,7 +376,7 @@ declare const api_signTransfer: typeof signTransfer;
 declare const api_updateUserConfig: typeof updateUserConfig;
 declare const api_updateUserConfigBySession: typeof updateUserConfigBySession;
 declare namespace api {
-  export { type api_CreateTransferParams as CreateTransferParams, api_createTransfer as createTransfer, api_fetchAccounts as fetchAccounts, api_fetchAuthorizationSession as fetchAuthorizationSession, api_fetchChains as fetchChains, api_fetchMerchantPublicKey as fetchMerchantPublicKey, api_fetchProviders as fetchProviders, api_fetchTransfer as fetchTransfer, api_fetchUserConfig as fetchUserConfig, api_registerPasskey as registerPasskey, api_reportActionCompletion as reportActionCompletion, api_reportPasskeyActivity as reportPasskeyActivity, api_signTransfer as signTransfer, api_updateUserConfig as updateUserConfig, api_updateUserConfigBySession as updateUserConfigBySession };
+  export { type api_CreateAccountParams as CreateAccountParams, type api_CreateTransferParams as CreateTransferParams, api_createAccount as createAccount, api_createTransfer as createTransfer, api_fetchAccounts as fetchAccounts, api_fetchAuthorizationSession as fetchAuthorizationSession, api_fetchChains as fetchChains, api_fetchMerchantPublicKey as fetchMerchantPublicKey, api_fetchProviders as fetchProviders, api_fetchTransfer as fetchTransfer, api_fetchUserConfig as fetchUserConfig, api_registerPasskey as registerPasskey, api_reportActionCompletion as reportActionCompletion, api_reportPasskeyActivity as reportPasskeyActivity, api_signTransfer as signTransfer, api_updateUserConfig as updateUserConfig, api_updateUserConfigBySession as updateUserConfigBySession };
 }
 
 interface SwypePaymentProps {
@@ -554,7 +561,6 @@ interface UseAuthorizationExecutorResult {
     resolveSelectSource: (selection: SourceSelection) => void;
     /** Execute authorization by session id. */
     executeSessionById: (sessionId: string) => Promise<void>;
-    executeSession: (transfer: Transfer) => Promise<void>;
 }
 interface UseAuthorizationExecutorOptions {
     /** Optional API base URL override when used outside SwypeProvider. */

package/dist/index.d.ts

@@ -121,7 +121,6 @@ interface Transfer {
     amount: Amount;
     createDate: string;
     updateDate: string;
-    authorizationSessions: AuthorizationSession[];
     signPayload?: TransferSignPayload | null;
 }
 /** Standard API error shape */
@@ -143,7 +142,7 @@ interface ActionExecutionResult {
     data?: unknown;
 }
 /** Source type discriminator for transfer creation */
-type SourceType = 'providerId' | 'accountId' | 'walletId' | 'tokenId';
+type SourceType = 'accountId' | 'walletId' | 'tokenId';
 /** A chain+token option from the SELECT_SOURCE action metadata. */
 interface SourceOption {
     chainName: string;
@@ -298,6 +297,12 @@ declare function useSwypeDepositAmount(): {
 declare function fetchProviders(apiBaseUrl: string, token: string): Promise<Provider[]>;
 declare function fetchChains(apiBaseUrl: string, token: string): Promise<Chain[]>;
 declare function fetchAccounts(apiBaseUrl: string, token: string, credentialId: string): Promise<Account[]>;
+interface CreateAccountParams {
+    name: string;
+    credentialId: string;
+    providerId: string;
+}
+declare function createAccount(apiBaseUrl: string, token: string, params: CreateAccountParams): Promise<Account>;
 interface CreateTransferParams {
     /** Caller-supplied UUID v4 for idempotency. If omitted, a random UUID is generated. */
     id?: string;
@@ -353,7 +358,9 @@ declare function updateUserConfigBySession(apiBaseUrl: string, sessionId: string
 }): Promise<void>;
 declare function reportActionCompletion(apiBaseUrl: string, actionId: string, result: Record<string, unknown>): Promise<AuthorizationSessionDetail>;
 
+type api_CreateAccountParams = CreateAccountParams;
 type api_CreateTransferParams = CreateTransferParams;
+declare const api_createAccount: typeof createAccount;
 declare const api_createTransfer: typeof createTransfer;
 declare const api_fetchAccounts: typeof fetchAccounts;
 declare const api_fetchAuthorizationSession: typeof fetchAuthorizationSession;
@@ -369,7 +376,7 @@ declare const api_signTransfer: typeof signTransfer;
 declare const api_updateUserConfig: typeof updateUserConfig;
 declare const api_updateUserConfigBySession: typeof updateUserConfigBySession;
 declare namespace api {
-  export { type api_CreateTransferParams as CreateTransferParams, api_createTransfer as createTransfer, api_fetchAccounts as fetchAccounts, api_fetchAuthorizationSession as fetchAuthorizationSession, api_fetchChains as fetchChains, api_fetchMerchantPublicKey as fetchMerchantPublicKey, api_fetchProviders as fetchProviders, api_fetchTransfer as fetchTransfer, api_fetchUserConfig as fetchUserConfig, api_registerPasskey as registerPasskey, api_reportActionCompletion as reportActionCompletion, api_reportPasskeyActivity as reportPasskeyActivity, api_signTransfer as signTransfer, api_updateUserConfig as updateUserConfig, api_updateUserConfigBySession as updateUserConfigBySession };
+  export { type api_CreateAccountParams as CreateAccountParams, type api_CreateTransferParams as CreateTransferParams, api_createAccount as createAccount, api_createTransfer as createTransfer, api_fetchAccounts as fetchAccounts, api_fetchAuthorizationSession as fetchAuthorizationSession, api_fetchChains as fetchChains, api_fetchMerchantPublicKey as fetchMerchantPublicKey, api_fetchProviders as fetchProviders, api_fetchTransfer as fetchTransfer, api_fetchUserConfig as fetchUserConfig, api_registerPasskey as registerPasskey, api_reportActionCompletion as reportActionCompletion, api_reportPasskeyActivity as reportPasskeyActivity, api_signTransfer as signTransfer, api_updateUserConfig as updateUserConfig, api_updateUserConfigBySession as updateUserConfigBySession };
 }
 
 interface SwypePaymentProps {
@@ -554,7 +561,6 @@ interface UseAuthorizationExecutorResult {
     resolveSelectSource: (selection: SourceSelection) => void;
     /** Execute authorization by session id. */
     executeSessionById: (sessionId: string) => Promise<void>;
-    executeSession: (transfer: Transfer) => Promise<void>;
 }
 interface UseAuthorizationExecutorOptions {
     /** Optional API base URL override when used outside SwypeProvider. */

package/dist/index.js

@@ -1,7 +1,7 @@
 import { createContext, useRef, useState, useCallback, useMemo, useContext, useEffect, useReducer, Component } from 'react';
 import { PrivyProvider, usePrivy, useLoginWithEmail, useLoginWithSms, useLoginWithOAuth } from '@privy-io/react-auth';
 import { createConfig, http, WagmiProvider, useConfig, useConnect, useSwitchChain } from 'wagmi';
-import { mainnet, arbitrum, base } from 'wagmi/chains';
+import { mainnet, arbitrum, base, polygon, bsc } from 'wagmi/chains';
 import { injected } from 'wagmi/connectors';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -74,12 +74,14 @@ function getTheme(mode) {
 }
 var SWYPE_PRIVY_APP_ID = "cmlil87uv004n0ck0blwumwek";
 var wagmiConfig = createConfig({
-  chains: [mainnet, arbitrum, base],
+  chains: [mainnet, arbitrum, base, polygon, bsc],
   connectors: [injected({ shimDisconnect: true, unstable_shimAsyncInject: 2e3 })],
   transports: {
     [mainnet.id]: http(),
     [arbitrum.id]: http(),
-    [base.id]: http()
+    [base.id]: http(),
+    [polygon.id]: http(),
+    [bsc.id]: http()
   }
 });
 var SwypeContext = createContext(null);
@@ -154,6 +156,7 @@ function useSwypeDepositAmount() {
 // src/api.ts
 var api_exports = {};
 __export(api_exports, {
+  createAccount: () => createAccount,
   createTransfer: () => createTransfer,
   fetchAccounts: () => fetchAccounts,
   fetchAuthorizationSession: () => fetchAuthorizationSession,
@@ -201,6 +204,18 @@ async function fetchAccounts(apiBaseUrl, token, credentialId) {
   const data = await res.json();
   return data.items;
 }
+async function createAccount(apiBaseUrl, token, params) {
+  const res = await fetch(`${apiBaseUrl}/v1/accounts`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify(params)
+  });
+  if (!res.ok) await throwApiError(res);
+  return await res.json();
+}
 async function createTransfer(apiBaseUrl, token, params) {
   if (!params.merchantAuthorization) {
     throw new Error("merchantAuthorization is required for transfer creation.");
@@ -1465,15 +1480,6 @@ function useAuthorizationExecutor(options) {
     },
     [apiBaseUrl, dispatchAction]
   );
-  const executeSession = useCallback(
-    async (transfer) => {
-      if (!transfer.authorizationSessions?.length) {
-        throw new Error("No authorization sessions available.");
-      }
-      await executeSessionById(transfer.authorizationSessions[0].id);
-    },
-    [executeSessionById]
-  );
   return {
     executing,
     results,
@@ -1481,8 +1487,7 @@ function useAuthorizationExecutor(options) {
     currentAction,
     pendingSelectSource,
     resolveSelectSource,
-    executeSessionById,
-    executeSession
+    executeSessionById
   };
 }
 function useTransferSigning(pollIntervalMs = 2e3, options) {
@@ -1840,16 +1845,13 @@ function buildSelectSourceChoices(options) {
 
 // src/paymentReducer.ts
 function deriveSourceTypeAndId(state) {
-  if (state.connectingNewAccount) {
-    return { sourceType: "providerId", sourceId: state.selectedProviderId ?? "" };
-  }
   if (state.selectedWalletId) {
     return { sourceType: "walletId", sourceId: state.selectedWalletId };
   }
   if (state.selectedAccountId) {
     return { sourceType: "accountId", sourceId: state.selectedAccountId };
   }
-  return { sourceType: "providerId", sourceId: state.selectedProviderId ?? "" };
+  return { sourceType: "accountId", sourceId: "" };
 }
 function createInitialState(config) {
   return {
@@ -1861,8 +1863,6 @@ function createInitialState(config) {
     loadingData: false,
     selectedAccountId: null,
     selectedWalletId: null,
-    selectedProviderId: null,
-    connectingNewAccount: false,
     amount: config.depositAmount != null ? config.depositAmount.toString() : "",
     transfer: null,
     creatingTransfer: false,
@@ -1927,8 +1927,6 @@ function paymentReducer(state, action) {
       if (action.defaults) {
         next.selectedAccountId = action.defaults.accountId;
         next.selectedWalletId = action.defaults.walletId;
-      } else if (action.fallbackProviderId && !state.connectingNewAccount) {
-        next.selectedProviderId = action.fallbackProviderId;
       }
       if (action.clearMobileState) {
         next.mobileFlow = false;
@@ -1950,7 +1948,6 @@ function paymentReducer(state, action) {
       if (action.defaults) {
         next.selectedAccountId = action.defaults.accountId;
         next.selectedWalletId = action.defaults.walletId;
-        next.connectingNewAccount = false;
       }
       return next;
     }
@@ -1958,16 +1955,13 @@ function paymentReducer(state, action) {
     case "SELECT_PROVIDER":
       return {
         ...state,
-        selectedProviderId: action.providerId,
-        selectedAccountId: null,
-        connectingNewAccount: true
+        selectedAccountId: null
       };
     case "SELECT_ACCOUNT":
       return {
         ...state,
         selectedAccountId: action.accountId,
         selectedWalletId: action.walletId,
-        connectingNewAccount: false,
         step: "deposit"
       };
     // ── Transfer lifecycle ───────────────────────────────────────
@@ -2052,7 +2046,6 @@ function paymentReducer(state, action) {
         ...state,
         mobileFlow: true,
         deeplinkUri: action.deeplinkUri,
-        selectedProviderId: action.providerId,
         error: action.error ?? null,
         step: "open-wallet"
       };
@@ -2108,7 +2101,6 @@ function paymentReducer(state, action) {
         amount: action.depositAmount != null ? action.depositAmount.toString() : "",
         mobileFlow: false,
         deeplinkUri: null,
-        connectingNewAccount: false,
         selectedWalletId: null,
         selectedAccountId: action.firstAccountId
       };
@@ -5258,11 +5250,11 @@ function SwypePaymentInner({
       accounts: state.accounts,
       persistedMobileFlow: loadMobileFlowState(),
       mobileSetupInProgress: mobileSetupFlowRef.current,
-      connectingNewAccount: state.connectingNewAccount
+      connectingNewAccount: false
     });
     if (resolved.clearPersistedFlow) clearMobileFlowState();
     dispatch({ type: "NAVIGATE", step: resolved.step });
-  }, [getAccessToken, apiBaseUrl, state.accounts, state.connectingNewAccount]);
+  }, [getAccessToken, apiBaseUrl, state.accounts]);
   const handleRegisterPasskey = useCallback(async () => {
     dispatch({ type: "SET_REGISTERING_PASSKEY", value: true });
     dispatch({ type: "SET_ERROR", error: null });
@@ -5307,7 +5299,7 @@ function SwypePaymentInner({
         accounts: state.accounts,
         persistedMobileFlow: loadMobileFlowState(),
         mobileSetupInProgress: mobileSetupFlowRef.current,
-        connectingNewAccount: state.connectingNewAccount
+        connectingNewAccount: false
       });
       if (resolved.clearPersistedFlow) clearMobileFlowState();
       dispatch({ type: "NAVIGATE", step: resolved.step });
@@ -5320,7 +5312,7 @@ function SwypePaymentInner({
     } finally {
       dispatch({ type: "SET_REGISTERING_PASSKEY", value: false });
     }
-  }, [user, getAccessToken, apiBaseUrl, state.accounts, state.connectingNewAccount]);
+  }, [user, getAccessToken, apiBaseUrl, state.accounts]);
   const handleVerifyPasskeyViaPopup = useCallback(async () => {
     dispatch({ type: "SET_VERIFYING_PASSKEY", value: true });
     dispatch({ type: "SET_ERROR", error: null });
@@ -5344,7 +5336,7 @@ function SwypePaymentInner({
           accounts: state.accounts,
           persistedMobileFlow: loadMobileFlowState(),
           mobileSetupInProgress: mobileSetupFlowRef.current,
-          connectingNewAccount: state.connectingNewAccount
+          connectingNewAccount: false
         });
         if (resolved.clearPersistedFlow) clearMobileFlowState();
         dispatch({ type: "NAVIGATE", step: resolved.step });
@@ -5363,7 +5355,7 @@ function SwypePaymentInner({
     } finally {
       dispatch({ type: "SET_VERIFYING_PASSKEY", value: false });
     }
-  }, [state.knownCredentialIds, getAccessToken, apiBaseUrl, state.accounts, state.connectingNewAccount]);
+  }, [state.knownCredentialIds, getAccessToken, apiBaseUrl, state.accounts]);
   const reloadAccounts = useCallback(async () => {
     const token = await getAccessToken();
     if (!token || !state.activeCredentialId) return;
@@ -5415,8 +5407,7 @@ function SwypePaymentInner({
       dispatch({ type: "NAVIGATE", step: "create-passkey" });
       return;
     }
-    const isSetupRedirect = mobileSetupFlowRef.current;
-    dispatch({ type: "PAY_STARTED", isSetupRedirect });
+    dispatch({ type: "PAY_STARTED", isSetupRedirect: false });
     processingStartedAtRef.current = Date.now();
     try {
       if (state.transfer?.status === "AUTHORIZED") {
@@ -5437,23 +5428,6 @@ function SwypePaymentInner({
           effectiveSourceId = activeWallet.id;
         }
       }
-      const isActiveWallet = effectiveSourceType === "walletId" && state.accounts.some(
-        (a) => a.wallets.some((w) => w.id === effectiveSourceId && w.status === "ACTIVE")
-      );
-      if (!isActiveWallet && !isSetupRedirect) {
-        let found = false;
-        for (const acct of state.accounts) {
-          for (const wallet of acct.wallets) {
-            if (wallet.status === "ACTIVE" && wallet.sources.some((s) => s.balance.available.amount >= payAmount)) {
-              effectiveSourceType = "walletId";
-              effectiveSourceId = wallet.id;
-              found = true;
-              break;
-            }
-          }
-          if (found) break;
-        }
-      }
       const t = await createTransfer(apiBaseUrl, token, {
         id: idempotencyKey,
         credentialId: state.activeCredentialId,
@@ -5464,28 +5438,6 @@ function SwypePaymentInner({
         amount: payAmount
       });
       dispatch({ type: "TRANSFER_CREATED", transfer: t });
-      if (t.authorizationSessions && t.authorizationSessions.length > 0) {
-        const useConnector = shouldUseWalletConnector({
-          useWalletConnector: useWalletConnectorProp,
-          userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-        });
-        if (!useConnector) {
-          const uri = t.authorizationSessions[0].uri;
-          pollingTransferIdRef.current = t.id;
-          polling.startPolling(t.id);
-          dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: uri });
-          persistMobileFlowState({
-            transferId: t.id,
-            deeplinkUri: uri,
-            providerId: sourceOverrides?.sourceType === "providerId" ? sourceOverrides.sourceId : state.selectedProviderId,
-            isSetup: mobileSetupFlowRef.current
-          });
-          triggerDeeplink(uri);
-          return;
-        } else {
-          await authExecutor.executeSession(t);
-        }
-      }
       const signedTransfer = await transferSigning.signTransfer(t.id);
       dispatch({ type: "TRANSFER_SIGNED", transfer: signedTransfer });
       polling.startPolling(t.id);
@@ -5495,7 +5447,7 @@ function SwypePaymentInner({
       dispatch({
         type: "PAY_ERROR",
         error: msg,
-        fallbackStep: isSetupRedirect ? "wallet-picker" : "deposit"
+        fallbackStep: "deposit"
       });
       onError?.(msg);
     } finally {
@@ -5507,15 +5459,12 @@ function SwypePaymentInner({
     state.activeCredentialId,
     state.transfer,
     state.accounts,
-    state.selectedProviderId,
     destination,
     apiBaseUrl,
     getAccessToken,
-    authExecutor,
     transferSigning,
     polling,
     onError,
-    useWalletConnectorProp,
     idempotencyKey,
     merchantAuthorization
   ]);
@@ -5554,23 +5503,7 @@ function SwypePaymentInner({
         destination,
         amount: parsedAmount
       });
-      if (t.authorizationSessions && t.authorizationSessions.length > 0) {
-        const uri = t.authorizationSessions[0].uri;
-        pollingTransferIdRef.current = t.id;
-        mobileSetupFlowRef.current = true;
-        handlingMobileReturnRef.current = false;
-        polling.startPolling(t.id);
-        dispatch({ type: "INCREASE_LIMIT_DEEPLINK", transfer: t, deeplinkUri: uri });
-        persistMobileFlowState({
-          transferId: t.id,
-          deeplinkUri: uri,
-          providerId: state.selectedProviderId,
-          isSetup: true
-        });
-        triggerDeeplink(uri);
-      } else {
-        dispatch({ type: "TRANSFER_CREATED", transfer: t });
-      }
+      dispatch({ type: "TRANSFER_CREATED", transfer: t });
     } catch (err) {
       captureException(err);
       const msg = err instanceof Error ? err.message : "Failed to increase limit";
@@ -5585,7 +5518,6 @@ function SwypePaymentInner({
     sourceType,
     state.activeCredentialId,
     state.accounts,
-    state.selectedProviderId,
     apiBaseUrl,
     getAccessToken,
     polling,
@@ -5622,21 +5554,65 @@ function SwypePaymentInner({
       polling.startPolling(transferIdToResume);
     }
   }, [handleAuthorizedMobileReturn, polling, state.transfer]);
-  const handleSelectProvider = useCallback((providerId) => {
+  const handleSelectProvider = useCallback(async (providerId) => {
     dispatch({ type: "SELECT_PROVIDER", providerId });
-    const isMobile = !shouldUseWalletConnector({
-      useWalletConnector: useWalletConnectorProp,
-      userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
-    });
-    if (isMobile) {
-      handlingMobileReturnRef.current = false;
-      mobileSetupFlowRef.current = true;
-      const amount = depositAmount ?? 5;
-      handlePay(amount, { sourceType: "providerId", sourceId: providerId });
-    } else {
-      dispatch({ type: "NAVIGATE", step: "deposit" });
+    if (!state.activeCredentialId) {
+      dispatch({ type: "SET_ERROR", error: "Create a passkey on this device before continuing." });
+      dispatch({ type: "NAVIGATE", step: "create-passkey" });
+      return;
+    }
+    const provider = state.providers.find((p) => p.id === providerId);
+    const providerName = provider?.name ?? "Wallet";
+    dispatch({ type: "PAY_STARTED", isSetupRedirect: true });
+    try {
+      const token = await getAccessToken();
+      if (!token) throw new Error("Not authenticated");
+      const account = await createAccount(apiBaseUrl, token, {
+        name: providerName,
+        credentialId: state.activeCredentialId,
+        providerId
+      });
+      const session = account.authorizationSessions?.[0];
+      if (!session) throw new Error("No authorization session returned.");
+      const isMobile = !shouldUseWalletConnector({
+        useWalletConnector: useWalletConnectorProp,
+        userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
+      });
+      if (isMobile) {
+        handlingMobileReturnRef.current = false;
+        mobileSetupFlowRef.current = true;
+        persistMobileFlowState({
+          accountId: account.id,
+          sessionId: session.id,
+          deeplinkUri: session.uri,
+          providerId,
+          isSetup: true
+        });
+        dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
+        triggerDeeplink(session.uri);
+      } else {
+        await authExecutor.executeSessionById(session.id);
+        await reloadAccounts();
+        dispatch({ type: "NAVIGATE", step: "deposit" });
+      }
+    } catch (err) {
+      captureException(err);
+      const msg = err instanceof Error ? err.message : "Failed to set up wallet";
+      dispatch({ type: "PAY_ERROR", error: msg, fallbackStep: "wallet-picker" });
+      onError?.(msg);
+    } finally {
+      dispatch({ type: "PAY_ENDED" });
     }
-  }, [useWalletConnectorProp, depositAmount, handlePay]);
+  }, [
+    state.activeCredentialId,
+    state.providers,
+    apiBaseUrl,
+    getAccessToken,
+    authExecutor,
+    useWalletConnectorProp,
+    reloadAccounts,
+    onError
+  ]);
   const handleContinueConnection = useCallback(
     (accountId) => {
       const acct = state.accounts.find((a) => a.id === accountId);
@@ -5746,7 +5722,7 @@ function SwypePaymentInner({
         connectingNewAccount: false
       });
       if (resolved.clearPersistedFlow) clearMobileFlowState();
-      if (resolved.step === "deposit" && persisted && persisted.isSetup) {
+      if (resolved.step === "deposit" && persisted && persisted.isSetup && persisted.transferId) {
         try {
           const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
           if (cancelled) return;
@@ -5757,7 +5733,12 @@ function SwypePaymentInner({
         } catch {
         }
       }
-      if (resolved.step === "open-wallet" && persisted) {
+      if (resolved.step === "open-wallet" && persisted && persisted.accountId && !persisted.transferId) {
+        clearMobileFlowState();
+        dispatch({ type: "NAVIGATE", step: "deposit" });
+        return;
+      }
+      if (resolved.step === "open-wallet" && persisted && persisted.transferId) {
         try {
           const existingTransfer = await fetchTransfer(apiBaseUrl, token, persisted.transferId);
           if (cancelled) return;
@@ -5803,9 +5784,9 @@ function SwypePaymentInner({
             providerId: persisted.providerId,
             error: err instanceof Error ? err.message : "Unable to refresh wallet authorization status."
           });
-          pollingTransferIdRef.current = persisted.transferId;
+          pollingTransferIdRef.current = persisted.transferId ?? null;
           mobileSetupFlowRef.current = persisted.isSetup;
-          pollingRef.current.startPolling(persisted.transferId);
+          if (persisted.transferId) pollingRef.current.startPolling(persisted.transferId);
           return;
         }
         dispatch({
@@ -5813,9 +5794,9 @@ function SwypePaymentInner({
           deeplinkUri: persisted.deeplinkUri,
           providerId: persisted.providerId
         });
-        pollingTransferIdRef.current = persisted.transferId;
+        pollingTransferIdRef.current = persisted.transferId ?? null;
         mobileSetupFlowRef.current = persisted.isSetup;
-        pollingRef.current.startPolling(persisted.transferId);
+        if (persisted.transferId) pollingRef.current.startPolling(persisted.transferId);
         return;
       }
       dispatch({ type: "NAVIGATE", step: resolved.step });
@@ -5922,7 +5903,7 @@ function SwypePaymentInner({
           accounts: accts,
           persistedMobileFlow: persisted,
           mobileSetupInProgress: mobileSetupFlowRef.current,
-          connectingNewAccount: state.connectingNewAccount
+          connectingNewAccount: false
         });
         const correctableSteps = ["deposit", "wallet-picker", "open-wallet"];
         dispatch({
@@ -5931,7 +5912,6 @@ function SwypePaymentInner({
           accounts: accts,
           chains: chn,
           defaults,
-          fallbackProviderId: !defaults && prov.length > 0 ? prov[0].id : null,
           resolvedStep: correctableSteps.includes(state.step) ? resolved.step : void 0,
           clearMobileState: resolved.clearPersistedFlow
         });
@@ -5963,8 +5943,7 @@ function SwypePaymentInner({
     apiBaseUrl,
     getAccessToken,
     state.activeCredentialId,
-    depositAmount,
-    state.connectingNewAccount
+    depositAmount
   ]);
   useEffect(() => {
     if (!polling.transfer) return;