@swype-org/react-sdk 0.1.131 → 0.1.133

package/dist/index.d.cts

@@ -767,9 +767,10 @@ interface SelectSourceScreenProps {
     onChainChange: (chainName: string) => void;
     onTokenChange: (tokenSymbol: string) => void;
     onConfirm: () => void;
+    onBack?: () => void;
     onLogout: () => void;
 }
-declare function SelectSourceScreen({ choices, selectedChainName, selectedTokenSymbol, recommended, onChainChange, onTokenChange, onConfirm, onLogout, }: SelectSourceScreenProps): react_jsx_runtime.JSX.Element;
+declare function SelectSourceScreen({ choices, selectedChainName, selectedTokenSymbol, recommended, onChainChange, onTokenChange, onConfirm, onBack, onLogout, }: SelectSourceScreenProps): react_jsx_runtime.JSX.Element;
 
 interface ChainChoice {
     chainName: string;

package/dist/index.d.ts

@@ -767,9 +767,10 @@ interface SelectSourceScreenProps {
     onChainChange: (chainName: string) => void;
     onTokenChange: (tokenSymbol: string) => void;
     onConfirm: () => void;
+    onBack?: () => void;
     onLogout: () => void;
 }
-declare function SelectSourceScreen({ choices, selectedChainName, selectedTokenSymbol, recommended, onChainChange, onTokenChange, onConfirm, onLogout, }: SelectSourceScreenProps): react_jsx_runtime.JSX.Element;
+declare function SelectSourceScreen({ choices, selectedChainName, selectedTokenSymbol, recommended, onChainChange, onTokenChange, onConfirm, onBack, onLogout, }: SelectSourceScreenProps): react_jsx_runtime.JSX.Element;
 
 interface ChainChoice {
     chainName: string;

package/dist/index.js

@@ -4248,7 +4248,9 @@ function DepositScreen({
   onSelectAccount,
   onAuthorizeAccount,
   onAddProvider,
-  onSelectToken
+  onSelectToken,
+  pendingSetup,
+  onStartSetup
 }) {
   const { tokens } = useSwypeConfig();
   const amount = initialAmount;
@@ -4256,6 +4258,29 @@ function DepositScreen({
   const exceedsLimit = amount > remainingLimit && !isLowBalance;
   const canDeposit = amount >= MIN_DEPOSIT && !exceedsLimit && !isLowBalance && !processing;
   const headerTitle = merchantName ? `Deposit to ${merchantName}` : "Deposit";
+  if (pendingSetup) {
+    return /* @__PURE__ */ jsxs(
+      ScreenLayout,
+      {
+        footer: /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(PrimaryButton, { onClick: onStartSetup, children: "Set up One-Tap" }),
+          /* @__PURE__ */ jsx("p", { style: setupHintStyle(tokens.textSecondary), children: "Choose your source and set your One-Tap limit to deposit instantly." }),
+          /* @__PURE__ */ jsx(PoweredByFooter, {})
+        ] }),
+        children: [
+          /* @__PURE__ */ jsx(ScreenHeader, { title: headerTitle, right: /* @__PURE__ */ jsx(SettingsMenu, { onLogout }) }),
+          /* @__PURE__ */ jsxs("div", { style: setupContentStyle, children: [
+            /* @__PURE__ */ jsx("div", { style: amountDisplayStyle, children: /* @__PURE__ */ jsxs("span", { style: amountStyle(tokens), children: [
+              "$",
+              amount.toFixed(2)
+            ] }) }),
+            /* @__PURE__ */ jsx("p", { style: setupDescStyle(tokens.textSecondary), children: "Set up your payment source to deposit with One-Tap \u2014 no approvals needed after setup." })
+          ] }),
+          error && /* @__PURE__ */ jsx("div", { style: errorBannerStyle5(tokens), children: error })
+        ]
+      }
+    );
+  }
   if (isLowBalance) {
     return /* @__PURE__ */ jsxs(
       ScreenLayout,
@@ -4518,6 +4543,29 @@ var switchHintStyle = (color) => ({
 var outlineBtnWrapStyle = {
   marginBottom: 8
 };
+var setupContentStyle = {
+  flex: 1,
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  justifyContent: "center",
+  textAlign: "center",
+  padding: "0 24px"
+};
+var setupDescStyle = (color) => ({
+  fontSize: "0.88rem",
+  color,
+  margin: "8px 0 0",
+  lineHeight: 1.6,
+  maxWidth: 300
+});
+var setupHintStyle = (color) => ({
+  textAlign: "center",
+  fontSize: "0.78rem",
+  color,
+  margin: "12px 0 2px",
+  lineHeight: 1.5
+});
 function SuccessScreen({
   amount,
   currency,
@@ -4725,6 +4773,7 @@ function SelectSourceScreen({
   onChainChange,
   onTokenChange,
   onConfirm,
+  onBack,
   onLogout
 }) {
   const { tokens } = useSwypeConfig();
@@ -4743,6 +4792,7 @@ function SelectSourceScreen({
           ScreenHeader,
           {
             title: "Select Source",
+            onBack,
             right: /* @__PURE__ */ jsx(SettingsMenu, { onLogout })
           }
         ),
@@ -5615,6 +5665,7 @@ function StepRenderer({
   selectSourceChainName,
   selectSourceTokenSymbol,
   savingOneTapLimit,
+  pendingSetup,
   merchantName,
   onBack,
   onDismiss,
@@ -5731,6 +5782,8 @@ function StepRenderer({
     );
   }
   if (step === "setup") {
+    const hasPendingSelectSource = selectSourceChoices.length > 0;
+    const setupSourceLabel = hasPendingSelectSource && selectSourceChainName && selectSourceTokenSymbol ? `${selectSourceTokenSymbol} on ${selectSourceChainName}` : selectedSourceLabel;
     return /* @__PURE__ */ jsx(
       SetupScreen,
       {
@@ -5740,8 +5793,8 @@ function StepRenderer({
         onSetupOneTap: handlers.onSetupOneTap,
         onBack: () => handlers.onNavigate("deposit"),
         onLogout: handlers.onLogout,
-        onAdvanced: handlers.onSelectToken,
-        selectedSourceLabel,
+        onAdvanced: hasPendingSelectSource ? () => handlers.onNavigate("select-source") : handlers.onSelectToken,
+        selectedSourceLabel: setupSourceLabel,
         loading: savingOneTapLimit,
         error: state.error
       }
@@ -5789,7 +5842,9 @@ function StepRenderer({
         onSelectAccount: handlers.onSelectAccount,
         onAuthorizeAccount: handlers.onContinueConnection,
         onAddProvider: () => handlers.onNavigate("wallet-picker"),
-        onSelectToken: handlers.onSelectToken
+        onSelectToken: handlers.onSelectToken,
+        pendingSetup,
+        onStartSetup: () => handlers.onNavigate("setup")
       }
     );
   }
@@ -5821,6 +5876,7 @@ function StepRenderer({
     );
   }
   if (step === "select-source") {
+    const enteredFromSetup = state.previousStep === "setup";
     return /* @__PURE__ */ jsx(
       SelectSourceScreen,
       {
@@ -5830,7 +5886,8 @@ function StepRenderer({
         recommended: selectSourceRecommended,
         onChainChange: handlers.onSelectSourceChainChange,
         onTokenChange: handlers.onSetSelectSourceTokenSymbol,
-        onConfirm: handlers.onConfirmSelectSource,
+        onConfirm: enteredFromSetup ? () => handlers.onNavigate("setup") : handlers.onConfirmSelectSource,
+        onBack: enteredFromSetup ? () => handlers.onNavigate("setup") : void 0,
         onLogout: handlers.onLogout
       }
     );
@@ -6005,6 +6062,7 @@ function SwypePaymentInner({
   const preSelectSourceStepRef = useRef(null);
   const pendingTokenAuthRef = useRef(null);
   const pendingTokenSelectionRef = useRef(null);
+  const pendingTokenAuthSessionRef = useRef(null);
   const reauthSessionIdRef = useRef(null);
   const reauthTokenRef = useRef(null);
   const checkingPasskeyRef = useRef(false);
@@ -6503,10 +6561,14 @@ function SwypePaymentInner({
         dispatch({ type: "MOBILE_DEEPLINK_READY", deeplinkUri: session.uri });
         triggerDeeplink(session.uri);
       } else {
-        dispatch({ type: "NAVIGATE", step: "setup-status" });
-        await authExecutor.executeSessionById(session.id);
-        await reloadAccounts();
-        pendingTokenSelectionRef.current = { walletId: _walletId, tokenSymbol };
+        pendingTokenAuthSessionRef.current = {
+          sessionId: session.id,
+          walletId: _walletId,
+          tokenSymbol,
+          tokenAddress,
+          chainId
+        };
+        dispatch({ type: "SELECT_TOKEN", walletId: _walletId, tokenSymbol });
         dispatch({ type: "NAVIGATE", step: "setup" });
       }
     } catch (err) {
@@ -6655,12 +6717,40 @@ function SwypePaymentInner({
       const token = await getAccessToken();
       if (!token) throw new Error("Not authenticated");
       await updateUserConfig(apiBaseUrl, token, { defaultAllowance: limit });
-      if (authExecutor.pendingOneTapSetup) {
+      if (authExecutor.pendingSelectSource) {
+        authExecutor.resolveSelectSource({
+          chainName: selectSourceChainName,
+          tokenSymbol: selectSourceTokenSymbol
+        });
+        dispatch({ type: "NAVIGATE", step: "setup-status" });
+      } else if (authExecutor.pendingOneTapSetup) {
         authExecutor.resolveOneTapSetup();
-      } else if (pendingTokenSelectionRef.current) {
-        const sel = pendingTokenSelectionRef.current;
-        pendingTokenSelectionRef.current = null;
-        dispatch({ type: "SELECT_TOKEN", walletId: sel.walletId, tokenSymbol: sel.tokenSymbol });
+      } else if (pendingTokenAuthSessionRef.current) {
+        const pending = pendingTokenAuthSessionRef.current;
+        pendingTokenAuthSessionRef.current = null;
+        pendingTokenAuthRef.current = {
+          tokenAddress: pending.tokenAddress,
+          chainId: pending.chainId,
+          tokenSymbol: pending.tokenSymbol,
+          walletId: pending.walletId
+        };
+        dispatch({ type: "SET_INCREASING_LIMIT", value: true });
+        dispatch({ type: "NAVIGATE", step: "setup-status" });
+        try {
+          await authExecutor.executeSessionById(pending.sessionId);
+          await reloadAccounts();
+          dispatch({ type: "SELECT_TOKEN", walletId: pending.walletId, tokenSymbol: pending.tokenSymbol });
+        } catch (authErr) {
+          captureException(authErr);
+          dispatch({
+            type: "SET_ERROR",
+            error: authErr instanceof Error ? authErr.message : "Failed to authorize token"
+          });
+          dispatch({ type: "NAVIGATE", step: "deposit" });
+        } finally {
+          pendingTokenAuthRef.current = null;
+          dispatch({ type: "SET_INCREASING_LIMIT", value: false });
+        }
       } else {
         dispatch({ type: "NAVIGATE", step: "deposit" });
       }
@@ -6673,13 +6763,14 @@ function SwypePaymentInner({
     } finally {
       setSavingOneTapLimit(false);
     }
-  }, [getAccessToken, apiBaseUrl, authExecutor]);
+  }, [getAccessToken, apiBaseUrl, authExecutor, reloadAccounts, onError, selectSourceChainName, selectSourceTokenSymbol]);
   const handleNewPayment = useCallback(() => {
     clearMobileFlowState();
     processingStartedAtRef.current = null;
     pollingTransferIdRef.current = null;
     preSelectSourceStepRef.current = null;
     pendingTokenSelectionRef.current = null;
+    pendingTokenAuthSessionRef.current = null;
     dispatch({
       type: "NEW_PAYMENT",
       depositAmount,
@@ -6698,6 +6789,7 @@ function SwypePaymentInner({
     polling.stopPolling();
     preSelectSourceStepRef.current = null;
     pendingTokenSelectionRef.current = null;
+    pendingTokenAuthSessionRef.current = null;
     checkingPasskeyRef.current = false;
     setAuthInput("");
     setOtpCode("");
@@ -7202,24 +7294,9 @@ function SwypePaymentInner({
         userAgent: typeof navigator === "undefined" ? void 0 : navigator.userAgent
       });
       if (isDesktop && state.step === "setup-status") {
-        const recommended = pendingSelectSourceAction.metadata?.recommended;
-        const options = pendingSelectSourceAction.metadata?.options ?? [];
-        let chainName;
-        let tokenSymbol;
-        if (pendingTokenAuthRef.current) {
-          const { tokenAddress, chainId } = pendingTokenAuthRef.current;
-          const chainIdHex = `0x${chainId.toString(16)}`;
-          const match = options.find(
-            (opt) => opt.tokenAddress.toLowerCase() === tokenAddress.toLowerCase() && opt.chainId.toLowerCase() === chainIdHex.toLowerCase()
-          );
-          chainName = match?.chainName ?? recommended?.chainName ?? "Base";
-          tokenSymbol = match?.tokenSymbol ?? recommended?.tokenSymbol ?? "USDC";
-        } else {
-          const choices = buildSelectSourceChoices(options);
-          chainName = recommended?.chainName ?? choices[0]?.chainName ?? "Base";
-          tokenSymbol = recommended?.tokenSymbol ?? choices[0]?.tokens[0]?.tokenSymbol ?? "USDC";
-        }
-        authExecutor.resolveSelectSource({ chainName, tokenSymbol });
+        reloadAccounts().then(() => {
+          dispatch({ type: "NAVIGATE", step: "deposit" });
+        });
         return;
       }
       preSelectSourceStepRef.current = state.step;
@@ -7228,7 +7305,7 @@ function SwypePaymentInner({
       dispatch({ type: "NAVIGATE", step: preSelectSourceStepRef.current ?? "processing" });
       preSelectSourceStepRef.current = null;
     }
-  }, [pendingSelectSourceAction, state.step, authExecutor, useWalletConnectorProp]);
+  }, [pendingSelectSourceAction, state.step, authExecutor, useWalletConnectorProp, reloadAccounts]);
   const pendingOneTapSetupAction = authExecutor.pendingOneTapSetup;
   const preOneTapSetupStepRef = useRef(null);
   useEffect(() => {
@@ -7326,6 +7403,7 @@ function SwypePaymentInner({
       selectSourceChainName,
       selectSourceTokenSymbol,
       savingOneTapLimit,
+      pendingSetup: !!pendingSelectSourceAction || !!pendingOneTapSetupAction,
       merchantName,
       onBack,
       onDismiss,