@unifold/ui-react 0.1.76 → 0.1.78

package/dist/index.js

@@ -564,6 +564,9 @@ var en_default = {
       transactionBreakdown: "Transaction breakdown",
       networkFee: "Network fee",
       confirmOrder: "Confirm Order",
+      mfaEnrollmentTitle: "Enable SMS or Authy 2FA",
+      mfaEnrollmentMessage: "Please make sure you enable SMS or Authy 2FA in your Coinbase account. Press Continue after you enable it.",
+      mfaEnrollmentSettingsLink: "Open Coinbase security settings",
       termsNoticePrefix: "By clicking on Confirm Order, you agree to our ",
       termsNoticeLink: "terms",
       termsNoticeSuffix: "."
@@ -694,7 +697,12 @@ var en_default = {
       prefix: "By continuing, you agree to Coinbase's ",
       separator: ", ",
       lastSeparator: ", and ",
-      suffix: ". Coinbase is the regulated provider of this fiat-to-crypto onramp."
+      suffix: ".",
+      agreements: {
+        guest_checkout_terms: "Terms of Service",
+        user_agreement: "User Agreement",
+        privacy_policy: "Privacy Policy"
+      }
     },
     errors: {
       rateLimited: "Too many attempts. Please wait a few minutes and try again.",
@@ -1355,6 +1363,9 @@ var zh_default = {
       transactionBreakdown: "\u4EA4\u6613\u660E\u7EC6",
       networkFee: "\u7F51\u7EDC\u624B\u7EED\u8D39",
       confirmOrder: "\u786E\u8BA4\u8BA2\u5355",
+      mfaEnrollmentTitle: "\u8BF7\u542F\u7528\u77ED\u4FE1\u6216 Authy \u53CC\u91CD\u9A8C\u8BC1",
+      mfaEnrollmentMessage: "\u8BF7\u786E\u8BA4\u60A8\u5DF2\u5728 Coinbase \u8D26\u6237\u4E2D\u542F\u7528\u77ED\u4FE1\u6216 Authy \u53CC\u91CD\u9A8C\u8BC1\u3002\u542F\u7528\u540E\u8BF7\u6309\u7EE7\u7EED\u3002",
+      mfaEnrollmentSettingsLink: "\u6253\u5F00 Coinbase \u5B89\u5168\u8BBE\u7F6E",
       termsNoticePrefix: "\u70B9\u51FB\u201C\u786E\u8BA4\u8BA2\u5355\u201D\u5373\u8868\u793A\u60A8\u540C\u610F\u6211\u4EEC\u7684",
       termsNoticeLink: "\u6761\u6B3E",
       termsNoticeSuffix: "\u3002"
@@ -1485,7 +1496,12 @@ var zh_default = {
       prefix: "\u7EE7\u7EED\u5373\u8868\u793A\u60A8\u540C\u610F Coinbase \u7684",
       separator: "\u3001",
       lastSeparator: "\u548C",
-      suffix: "\u3002Coinbase \u662F\u672C\u6CD5\u5E01\u5151\u52A0\u5BC6\u8D27\u5E01\u5145\u503C\u670D\u52A1\u7684\u53D7\u76D1\u7BA1\u63D0\u4F9B\u65B9\u3002"
+      suffix: "\u3002",
+      agreements: {
+        guest_checkout_terms: "\u670D\u52A1\u6761\u6B3E",
+        user_agreement: "\u7528\u6237\u534F\u8BAE",
+        privacy_policy: "\u9690\u79C1\u653F\u7B56"
+      }
     },
     errors: {
       rateLimited: "\u5C1D\u8BD5\u6B21\u6570\u8FC7\u591A\u3002\u8BF7\u7A0D\u7B49\u51E0\u5206\u949F\u540E\u91CD\u8BD5\u3002",
@@ -2146,6 +2162,9 @@ var zh_TW_default = {
       transactionBreakdown: "\u4EA4\u6613\u660E\u7D30",
       networkFee: "\u7DB2\u8DEF\u624B\u7E8C\u8CBB",
       confirmOrder: "\u78BA\u8A8D\u8A02\u55AE",
+      mfaEnrollmentTitle: "\u8ACB\u555F\u7528\u7C21\u8A0A\u6216 Authy \u96D9\u91CD\u9A57\u8B49",
+      mfaEnrollmentMessage: "\u8ACB\u78BA\u8A8D\u60A8\u5DF2\u5728 Coinbase \u5E33\u6236\u4E2D\u555F\u7528\u7C21\u8A0A\u6216 Authy \u96D9\u91CD\u9A57\u8B49\u3002\u555F\u7528\u5F8C\u8ACB\u6309\u7E7C\u7E8C\u3002",
+      mfaEnrollmentSettingsLink: "\u958B\u555F Coinbase \u5B89\u5168\u8A2D\u5B9A",
       termsNoticePrefix: "\u9EDE\u64CA\u300C\u78BA\u8A8D\u8A02\u55AE\u300D\u5373\u8868\u793A\u60A8\u540C\u610F\u6211\u5011\u7684",
       termsNoticeLink: "\u689D\u6B3E",
       termsNoticeSuffix: "\u3002"
@@ -2276,7 +2295,12 @@ var zh_TW_default = {
       prefix: "\u7E7C\u7E8C\u5373\u8868\u793A\u60A8\u540C\u610F Coinbase \u7684",
       separator: "\u3001",
       lastSeparator: "\u548C",
-      suffix: "\u3002Coinbase \u662F\u672C\u6CD5\u5E63\u514C\u52A0\u5BC6\u8CA8\u5E63\u5132\u503C\u670D\u52D9\u7684\u53D7\u76E3\u7BA1\u63D0\u4F9B\u65B9\u3002"
+      suffix: "\u3002",
+      agreements: {
+        guest_checkout_terms: "\u670D\u52D9\u689D\u6B3E",
+        user_agreement: "\u4F7F\u7528\u8005\u5354\u8B70",
+        privacy_policy: "\u96B1\u79C1\u6B0A\u653F\u7B56"
+      }
     },
     errors: {
       rateLimited: "\u5617\u8A66\u6B21\u6578\u904E\u591A\u3002\u8ACB\u7A0D\u7B49\u5E7E\u5206\u9418\u5F8C\u91CD\u8A66\u3002",
@@ -3203,10 +3227,12 @@ var import_lucide_react9 = require("lucide-react");
 var import_core9 = require("@unifold/core");
 
 // src/hooks/use-deposit-address.ts
-var import_react = require("react");
 var import_react_query = require("@tanstack/react-query");
 var import_core = require("@unifold/core");
 
+// src/hooks/use-internal-user-id.ts
+var import_react = require("react");
+
 // src/context/AnalyticsContext.tsx
 var React5 = __toESM(require("react"));
 var import_jsx_runtime5 = require("react/jsx-runtime");
@@ -3238,6 +3264,15 @@ function useAnalytics() {
   return { track, startSession, endSession, getSessionId, setUserId, subscribe };
 }
 
+// src/hooks/use-internal-user-id.ts
+function useStampInternalUserId({ internalUserId }) {
+  const { setUserId } = useAnalytics();
+  (0, import_react.useEffect)(() => {
+    if (!internalUserId) return;
+    setUserId(internalUserId);
+  }, [internalUserId, setUserId]);
+}
+
 // src/hooks/use-deposit-address.ts
 function useDepositAddress(params) {
   const {
@@ -3251,7 +3286,6 @@ function useDepositAddress(params) {
     contractCalls,
     enabled = true
   } = params;
-  const { setUserId } = useAnalytics();
   const query = (0, import_react_query.useQuery)({
     queryKey: [
       "unifold",
@@ -3294,11 +3328,7 @@ function useDepositAddress(params) {
     retryDelay: (attempt) => Math.min(1e3 * 2 ** attempt, 1e4)
     // 1s, 2s, 4s (max 10s)
   });
-  (0, import_react.useEffect)(() => {
-    if (query.data?.user_id) {
-      setUserId(query.data.user_id);
-    }
-  }, [query.data?.user_id, setUserId]);
+  useStampInternalUserId({ internalUserId: query.data?.user_id });
   return query;
 }
 
@@ -5568,6 +5598,10 @@ function BuyWithCard({
       wallet_address: wallet.address,
       subdivision_code: userIpInfo?.subdivisionCode || void 0,
       external_id: externalId,
+      // The rail this quote was priced for, so the provider opens on it. Most
+      // are `card`, which is also the server default, but a local rail (e.g.
+      // `upi` in India) is the whole reason its provider was quoted.
+      payment_method_type: selectedProvider.payment_method_type,
       // Exactly one of source_amount / destination_amount (mutually exclusive):
       // destination mode starts the session by the fixed crypto amount (fees on
       // top); otherwise by the entered fiat amount.
@@ -5585,7 +5619,11 @@ function BuyWithCard({
       method: "card",
       flow_type: "deposit",
       provider: selectedProvider.service_provider,
-      amount_usd: amount
+      amount_usd: amount,
+      // The execution only exists once the provider's payout lands on this
+      // wallet, and it carries this id — so it's the join key for a purchase
+      // that starts here and never reaches flow_completed.
+      deposit_wallet_id: depositWalletId
     });
     onEvent?.({
       id: (0, import_core9.generatePrefixedKSUID)("sevt"),
@@ -7086,6 +7124,8 @@ var BuyWithWalletPay = React8.forwardRef(
     const [limitUpgradeError, setLimitUpgradeError] = (0, import_react15.useState)(null);
     const [upgradeSubmitting, setUpgradeSubmitting] = (0, import_react15.useState)(false);
     const upgradeFlowAbortRef = (0, import_react15.useRef)(null);
+    const applyLimitRoutingRef = (0, import_react15.useRef)(() => {
+    });
     const [amount, setAmount] = (0, import_react15.useState)(amountUsd ?? "");
     const [preparedOrder, setPreparedOrder] = (0, import_react15.useState)(null);
     const sessionAbortRef = (0, import_react15.useRef)(null);
@@ -7220,6 +7260,14 @@ var BuyWithWalletPay = React8.forwardRef(
       },
       [email, normalizedPhone, userId]
     );
+    const { action: initialAction, refetchWalletPayLimits } = useWalletPayInitialScreen({
+      userId,
+      publishableKey,
+      normalizedPhone,
+      userEmail,
+      sessionPhoneVerified: verificationSession?.phone?.status === "verified",
+      isWaiting: defaultTokenLoading || legalAgreementsLoading || userIpInfoLoading
+    });
     const createSessionAndSendOtp = (0, import_react15.useCallback)(async () => {
       setView("submitting_session");
       setErrorMessage("");
@@ -7229,7 +7277,12 @@ var BuyWithWalletPay = React8.forwardRef(
             email,
             phone: normalizedPhone,
             terms_accepted: true,
-            email_already_verified: true
+            // TODO: when the API honors `false`, this will trigger email OTP.
+            // Today `false` still skips email (we don't verify it) and JWT ev
+            // is null. Don't send `true` — that was a fake attest.
+            email_already_verified: false
+            // Coinbase stays Redis-only + JWT until bank-transfer identity
+            // is live. Do not persist from this path yet.
           },
           publishableKey
         );
@@ -7239,6 +7292,34 @@ var BuyWithWalletPay = React8.forwardRef(
         }
         setClientSecret(session.client_secret);
         storeWalletPaySession();
+        if (session.status === "verified") {
+          const tokenRes = await (0, import_core15.exchangeOnrampVerificationToken)(
+            session.id,
+            session.client_secret,
+            publishableKey
+          );
+          setOnrampToken(tokenRes);
+          storeWalletPaySession({
+            emailVerifiedAt: session.email.verified_at,
+            phoneVerifiedAt: session.phone.verified_at,
+            onrampToken: tokenRes.token,
+            onrampTokenExpiresAtMs: Date.now() + tokenRes.expires_in * 1e3
+          });
+          if (amountUsd) setAmount(amountUsd);
+          try {
+            const result = await refetchWalletPayLimits();
+            if (result.data) {
+              const nextView = getViewForLimitStatus(result.data);
+              if (nextView) {
+                applyLimitRoutingRef.current(nextView, result.data.upgrade_status);
+                return;
+              }
+            }
+          } catch {
+          }
+          setView("amount");
+          return;
+        }
         await (0, import_core15.sendOnrampVerificationOtp)(session.id, "phone", session.client_secret, publishableKey);
         setResendCooldown(30);
         setView("phone_otp");
@@ -7247,19 +7328,19 @@ var BuyWithWalletPay = React8.forwardRef(
         setErrorMessage(prettifyVerificationError(raw));
         setView("phone_input");
       }
-    }, [email, normalizedPhone, publishableKey, storeWalletPaySession]);
+    }, [
+      email,
+      normalizedPhone,
+      publishableKey,
+      storeWalletPaySession,
+      userId,
+      amountUsd,
+      refetchWalletPayLimits
+    ]);
     const clearUpgradeFields = (0, import_react15.useCallback)(() => {
       setSsnLast4("");
       setDobInput("");
     }, []);
-    const { action: initialAction, refetchWalletPayLimits } = useWalletPayInitialScreen({
-      userId,
-      publishableKey,
-      normalizedPhone,
-      userEmail,
-      sessionPhoneVerified: verificationSession?.phone?.status === "verified",
-      isWaiting: defaultTokenLoading || legalAgreementsLoading || userIpInfoLoading
-    });
     const pollLimitUpgradeStatus = (0, import_react15.useCallback)(
       async (signal) => {
         const POLL_INTERVAL_MS5 = 1500;
@@ -7370,6 +7451,7 @@ var BuyWithWalletPay = React8.forwardRef(
       },
       [startUpgradePolling]
     );
+    applyLimitRoutingRef.current = applyLimitRouting;
     const hasInitializedRef = (0, import_react15.useRef)(false);
     (0, import_react15.useEffect)(() => {
       if (hasInitializedRef.current) return;
@@ -7599,7 +7681,10 @@ var BuyWithWalletPay = React8.forwardRef(
           track("flow_started", {
             method,
             flow_type: "deposit",
-            amount_usd: walletPayAmountUsd
+            amount_usd: walletPayAmountUsd,
+            // No execution yet — one appears when the payout lands on this
+            // wallet, carrying the same id.
+            deposit_wallet_id: depositWalletId
           });
           onEvent?.({
             id: (0, import_core15.generatePrefixedKSUID)("sevt"),
@@ -7649,6 +7734,7 @@ var BuyWithWalletPay = React8.forwardRef(
         defaultTokenLoading,
         defaultTokenError,
         depositWallet?.address,
+        depositWalletId,
         userEmail,
         publishableKey,
         onEvent,
@@ -8623,7 +8709,7 @@ var FALLBACK_AGREEMENTS = [
   {
     key: "guest_checkout_terms",
     name: "Guest Checkout Terms of Service",
-    url: "https://www.coinbase.com/legal/cb-pay/onramp-guest-checkout-terms"
+    url: "https://www.coinbase.com/legal/guest-checkout/us"
   },
   {
     key: "user_agreement",
@@ -8643,22 +8729,24 @@ function LegalDisclaimer({ legalAgreements, loading }) {
     return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
       "div",
       {
-        className: "uf-mt-3 uf-mb-3 uf-px-1 uf-space-y-1.5 uf-animate-pulse",
+        className: "uf-mt-3 uf-mb-3 uf-px-1 uf-space-y-1.5 uf-animate-pulse uf-opacity-50",
         "aria-hidden": true,
         "aria-busy": "true",
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2.5 uf-rounded uf-w-full", style: { backgroundColor: colors2.card } }),
-          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2.5 uf-rounded uf-w-11/12", style: { backgroundColor: colors2.card } }),
-          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2.5 uf-rounded uf-w-3/4", style: { backgroundColor: colors2.card } })
+          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2 uf-rounded uf-w-full", style: { backgroundColor: colors2.card } }),
+          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2 uf-rounded uf-w-11/12", style: { backgroundColor: colors2.card } }),
+          /* @__PURE__ */ (0, import_jsx_runtime18.jsx)("div", { className: "uf-h-2 uf-rounded uf-w-3/4", style: { backgroundColor: colors2.card } })
         ]
       }
     );
   }
   const agreements = legalAgreements?.agreements ?? FALLBACK_AGREEMENTS;
+  const shortLabels = t.agreements;
+  const lastSeparator = t.lastSeparator.replace(/\s+$/, "\xA0");
   return /* @__PURE__ */ (0, import_jsx_runtime18.jsxs)(
     "p",
     {
-      className: "uf-text-[11px] uf-leading-relaxed uf-mt-3 uf-mb-3 uf-px-1",
+      className: "uf-text-[10px] uf-leading-relaxed uf-mt-3 uf-mb-3 uf-opacity-60 uf-text-center",
       style: { color: colors2.foregroundMuted, fontFamily: fonts.regular },
       children: [
         t.prefix,
@@ -8669,12 +8757,12 @@ function LegalDisclaimer({ legalAgreements, loading }) {
               href: a.url,
               target: "_blank",
               rel: "noopener noreferrer",
-              className: "uf-underline",
-              style: { color: colors2.foreground },
-              children: a.name
+              className: "uf-no-underline",
+              style: { color: "inherit", textDecoration: "none", whiteSpace: "nowrap" },
+              children: shortLabels[a.key] ?? a.name
             }
           ),
-          idx < arr.length - 2 ? t.separator : idx === arr.length - 2 ? t.lastSeparator : ""
+          idx < arr.length - 2 ? t.separator : idx === arr.length - 2 ? lastSeparator : ""
         ] }, a.key)),
         t.suffix
       ]
@@ -9346,6 +9434,7 @@ function PayWithCashApp({
   destinationChainType,
   destinationChainId,
   destinationTokenAddress,
+  contractCalls,
   cashAppIconUrl,
   view: controlledView,
   onViewChange,
@@ -9438,7 +9527,8 @@ function PayWithCashApp({
           destination_token_address: destinationTokenAddress,
           recipient_address: recipientAddress,
           source_amount: amount,
-          external_id: externalId
+          external_id: externalId,
+          ...contractCalls?.length ? { contract_calls: contractCalls } : {}
         },
         publishableKey
       );
@@ -9451,7 +9541,10 @@ function PayWithCashApp({
       track("flow_started", {
         method: "cashapp",
         flow_type: "deposit",
-        amount_usd: amount
+        amount_usd: amount,
+        // No execution yet — one appears when the payout lands on this
+        // wallet, carrying the same id.
+        deposit_wallet_id: depositWalletId
       });
       onEvent?.({
         id: (0, import_core19.generatePrefixedKSUID)("sevt"),
@@ -9476,6 +9569,8 @@ function PayWithCashApp({
     destinationChainType,
     destinationChainId,
     destinationTokenAddress,
+    contractCalls,
+    depositWalletId,
     onEvent,
     onDepositError,
     track,
@@ -10089,7 +10184,10 @@ function BankTransfer({
       method: "bank_transfer",
       flow_type: "deposit",
       provider: request.service_provider,
-      amount_usd: request.source_amount
+      amount_usd: request.source_amount,
+      // No execution yet — one appears when the provider's payout lands on
+      // this wallet, carrying the same id.
+      deposit_wallet_id: pollingWalletId
     });
     onEvent?.({
       id: (0, import_core21.generatePrefixedKSUID)("sevt"),
@@ -16329,7 +16427,11 @@ function PayWithStripeLink({
       if (checkoutResult.successful) {
         handledTerminalSessionRef.current = null;
         executionReconciledSessionRef.current = null;
-        track("flow_started", { method: "stripe_link", flow_type: "deposit" });
+        track("flow_started", {
+          method: "stripe_link",
+          flow_type: "deposit",
+          deposit_wallet_id: depositWalletId
+        });
         setConfirmedSessionId(activeSessionId);
         setSessionStatus(STRIPE_SESSION_STATUS.FULFILLMENT_PROCESSING);
         if (selectedTokenSingleUseRef.current) clearSelectedPaymentToken();
@@ -17826,7 +17928,14 @@ function PayWithStripeLink({
               ]
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)("div", { ref: authMountRef, className: "uf-w-full uf-min-h-[200px]" })
+          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+            "div",
+            {
+              ref: authMountRef,
+              className: "uf-w-full uf-min-h-[200px]",
+              style: { colorScheme: "only light" }
+            }
+          )
         ]
       }
     );
@@ -19107,6 +19216,9 @@ function CoinbaseConnect({
       flow_type: "deposit",
       method: "exchange_connect",
       provider: import_core27.IntegrationProvider.COINBASE,
+      // No execution yet — one appears when the exchange's transfer lands on
+      // this wallet, carrying the same id.
+      deposit_wallet_id: transferDepositWalletId,
       amount_usd: sendAmount || void 0,
       currency: selectedAsset?.currency.toLowerCase().replace(/[^a-z0-9]+/g, "_"),
       chain: sourceChain?.chain_id,
@@ -19114,6 +19226,34 @@ function CoinbaseConnect({
       network: sourceChain?.network
     });
   };
+  const applyConfirmResult = (result) => {
+    if (result.status === "mfa_required") {
+      track("verification_started", {
+        flow_type: "deposit",
+        method: "exchange_connect",
+        provider: import_core27.IntegrationProvider.COINBASE,
+        verification_type: "mfa",
+        verification_status: result.status
+      });
+      transitionTo("mfa");
+      setMfaCode("");
+      setMfaError(false);
+    } else if (result.status === "mfa_enrollment_required") {
+      transitionTo("mfa_enrollment");
+    } else if (result.status === "completed") {
+      trackTransferStarted();
+      setConfirmResult(result);
+      transitionTo("success");
+      onTransferSuccess?.(result);
+    } else {
+      setErrorMessage(result.message || t.errors.transferFailed);
+      transitionTo("error");
+      onTransferError?.({
+        message: result.message || t.errors.transferFailed,
+        code: result.status
+      });
+    }
+  };
   const handleConfirmTransfer = async () => {
     if (!transferIntent || !accessToken) return;
     setIsLoading(true);
@@ -19148,30 +19288,7 @@ function CoinbaseConnect({
         });
         throw err;
       });
-      if (result.status === "mfa_required") {
-        track("verification_started", {
-          flow_type: "deposit",
-          method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
-          verification_type: "mfa",
-          verification_status: result.status
-        });
-        transitionTo("mfa");
-        setMfaCode("");
-        setMfaError(false);
-      } else if (result.status === "completed") {
-        trackTransferStarted();
-        setConfirmResult(result);
-        transitionTo("success");
-        onTransferSuccess?.(result);
-      } else {
-        setErrorMessage(result.message || t.errors.transferFailed);
-        transitionTo("error");
-        onTransferError?.({
-          message: result.message || t.errors.transferFailed,
-          code: result.status
-        });
-      }
+      applyConfirmResult(result);
     } catch (err) {
       const message = err instanceof Error ? err.message : t.errors.transferFailed;
       setErrorMessage(message);
@@ -19328,6 +19445,9 @@ function CoinbaseConnect({
         setShowTransferDetails(false);
         transitionTo("enter_amount");
         break;
+      case "mfa_enrollment":
+        transitionTo("transfer_confirm");
+        break;
       case "mfa":
         transitionTo("transfer_confirm");
         break;
@@ -20884,6 +21004,55 @@ function CoinbaseConnect({
       ] })
     ] });
   }
+  if (view === "mfa_enrollment") {
+    return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(DepositHeader, { title: t.title, showBack: true, onBack: handleBack, onClose }),
+      /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(
+        "div",
+        {
+          className: "uf-flex uf-flex-col uf-items-center uf-px-4 uf-pb-4",
+          style: viewTransitionStyle,
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+              DepositErrorState,
+              {
+                title: t.transfer.mfaEnrollmentTitle,
+                message: t.transfer.mfaEnrollmentMessage
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(
+              "a",
+              {
+                href: "https://www.coinbase.com/settings/security",
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "uf-text-sm uf-underline uf-mb-8 uf-inline-flex uf-items-center uf-gap-1",
+                style: { color: colors2.primary, fontFamily: fonts.medium },
+                children: [
+                  t.transfer.mfaEnrollmentSettingsLink,
+                  /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(import_lucide_react29.ExternalLink, { className: "uf-w-3.5 uf-h-3.5" })
+                ]
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+              "button",
+              {
+                onClick: handleConfirmTransfer,
+                disabled: isLoading,
+                className: "uf-w-full uf-rounded-xl uf-py-3.5 uf-text-sm uf-font-medium uf-transition-all hover:uf-opacity-90 disabled:uf-opacity-50 uf-flex uf-items-center uf-justify-center uf-gap-2",
+                style: {
+                  backgroundColor: colors2.primary,
+                  color: "#fff",
+                  fontFamily: fonts.medium
+                },
+                children: isLoading ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(import_lucide_react29.Loader2, { className: "uf-w-4 uf-h-4 uf-animate-spin" }) : t.continue
+              }
+            )
+          ]
+        }
+      )
+    ] });
+  }
   if (view === "mfa") {
     return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(DepositHeader, { title: t.title, showBack: true, onBack: handleBack, onClose }),
@@ -26990,7 +27159,11 @@ function WalletConnect({
         chain: String(token.chain_id),
         network: token.network,
         token: token.symbol ?? token.token_address,
-        currency: token.currency
+        currency: token.currency,
+        // No execution exists yet — it's created when this send lands on the
+        // wallet. The wallet id is what that execution will carry, so it's
+        // how a send that never completes is matched to what followed.
+        deposit_wallet_id: activeDepositWallet?.id
       });
       setReceivedUsdAtSubmission(checkoutReceivedUsd ?? "0");
       setHasSignedTransaction(true);
@@ -27580,7 +27753,7 @@ function DepositModal({
   const applePaySubTitle = applePaySubTitleProp ?? t.applePayMenu.subtitle;
   const googlePayTitle = googlePayTitleProp ?? t.googlePayMenu.title;
   const googlePaySubTitle = googlePaySubTitleProp ?? t.googlePayMenu.subtitle;
-  const { track, startSession, endSession, getSessionId, subscribe } = useAnalytics();
+  const { track, startSession, endSession, getSessionId, setUserId, subscribe } = useAnalytics();
   const normalizedPrefilledAmountUsd = (0, import_react31.useMemo)(
     () => normalizePrefilledUsdAmount(prefilledAmountUsd),
     [prefilledAmountUsd]
@@ -27588,6 +27761,7 @@ function DepositModal({
   const analyticsMethod = (method) => method === "transfer" ? "transfer_crypto" : method;
   const journeyActiveRef = (0, import_react31.useRef)(false);
   const journeySessionIdRef = (0, import_react31.useRef)(void 0);
+  const journeyExternalUserIdRef = (0, import_react31.useRef)(void 0);
   const externalUserId = userId || void 0;
   const emitEvent = (0, import_react31.useCallback)(
     (event) => onEvent?.({ ...event, externalUserId }),
@@ -27615,6 +27789,9 @@ function DepositModal({
         method: analyticsMethod(method),
         flow_type: "deposit",
         amount_usd: execution?.destinationAmountUsd ?? execution?.sourceAmountUsd,
+        // The one high-cardinality field we do send: the join key from a
+        // funnel session back to the execution row it produced.
+        execution_id: data.executionId ?? execution?.id,
         // Flat, low-cardinality execution dimensions for PostHog breakdowns
         // (precise/opaque fields like base units, addresses, tx hashes live in
         // the onEvent DirectExecution instead).
@@ -27642,6 +27819,7 @@ function DepositModal({
         method: analyticsMethod(method),
         flow_type: "deposit",
         error_code: error.code,
+        execution_id: execution?.id,
         failure_reason: execution?.failureReason ?? void 0,
         status: execution?.status,
         source_chain_type: execution?.sourceChainType,
@@ -28070,8 +28248,10 @@ function DepositModal({
   const beginJourney = (0, import_react31.useCallback)(() => {
     journeySessionIdRef.current = startSession();
     journeyActiveRef.current = true;
+    journeyExternalUserIdRef.current = userId;
+    setUserId(null);
     track("widget_opened", { flow_type: "deposit" });
-  }, [startSession, track]);
+  }, [startSession, track, setUserId, userId]);
   const handleClose = () => {
     finalizeJourney();
     onOpenChange(false);
@@ -28096,6 +28276,11 @@ function DepositModal({
     }
     beginJourney();
   }, [open]);
+  (0, import_react31.useLayoutEffect)(() => {
+    if (!open || journeyExternalUserIdRef.current === userId) return;
+    journeyExternalUserIdRef.current = userId;
+    setUserId(null);
+  }, [open, userId, setUserId]);
   (0, import_react31.useLayoutEffect)(() => {
     if (!open) return;
     if (resetViewTimeoutRef.current) {
@@ -29007,6 +29192,7 @@ function DepositModal({
                         destinationChainType,
                         destinationChainId,
                         destinationTokenAddress,
+                        contractCalls,
                         cashAppIconUrl: projectConfig?.asset_cdn_url ? `${projectConfig.asset_cdn_url}/api/public/icons/onramps/svg/cashapp.svg` : void 0,
                         view: cashAppView,
                         onViewChange: setCashAppView,
@@ -29367,6 +29553,9 @@ function CheckoutModal({
         flowCompletedRef.current = true;
         track("flow_completed", {
           flow_type: "checkout",
+          // Checkout has no direct execution; the intent is what a funnel
+          // session joins back to.
+          payment_intent_id: data.paymentIntentId,
           ...method ? { method: method === "transfer" ? "transfer_crypto" : method } : {}
         });
       }
@@ -29587,7 +29776,7 @@ function CheckoutModal({
     journeySessionIdRef.current = startSession();
     journeyActiveRef.current = true;
     flowCompletedRef.current = false;
-    setUserId(null);
+    setUserId(paymentIntentUserId ?? null);
     track("widget_opened", { flow_type: "checkout" });
     if (resetViewTimeoutRef.current) {
       clearTimeout(resetViewTimeoutRef.current);
@@ -30028,7 +30217,7 @@ function CheckoutModal({
 }
 
 // src/components/withdrawals/WithdrawModal.tsx
-var import_react39 = require("react");
+var import_react38 = require("react");
 var import_lucide_react44 = require("lucide-react");
 
 // src/hooks/use-supported-destination-tokens.ts
@@ -30194,7 +30383,7 @@ var import_react_query24 = require("@tanstack/react-query");
 var import_core50 = require("@unifold/core");
 function useExecutions(userId, publishableKey, options) {
   const actionType = options?.actionType ?? import_core50.ActionType.Deposit;
-  return (0, import_react_query24.useQuery)({
+  const query = (0, import_react_query24.useQuery)({
     queryKey: ["unifold", "executions", actionType, userId, publishableKey],
     queryFn: () => (0, import_core50.queryExecutions)(userId, publishableKey, actionType),
     enabled: (options?.enabled ?? true) && !!userId,
@@ -30203,6 +30392,8 @@ function useExecutions(userId, publishableKey, options) {
     gcTime: 1e3 * 60 * 5,
     refetchOnWindowFocus: false
   });
+  useStampInternalUserId({ internalUserId: query.data?.data[0]?.user_id });
+  return query;
 }
 
 // src/hooks/use-withdraw-polling.ts
@@ -30537,7 +30728,7 @@ function WithdrawDoubleInput({
 }
 
 // src/components/withdrawals/WithdrawForm.tsx
-var import_react37 = require("react");
+var import_react36 = require("react");
 var import_lucide_react42 = require("lucide-react");
 var import_core56 = require("@unifold/core");
 
@@ -30800,11 +30991,10 @@ async function detectBrowserWallet(chainType, senderAddress) {
 }
 
 // src/hooks/use-hypercore-withdraw-activation.ts
-var import_react36 = require("react");
+var import_react35 = require("react");
 var import_core55 = require("@unifold/core");
 
 // src/hooks/use-get-deposit-address.ts
-var import_react35 = require("react");
 var import_react_query26 = require("@tanstack/react-query");
 var import_core54 = require("@unifold/core");
 function useGetDepositAddress(params) {
@@ -30818,7 +31008,6 @@ function useGetDepositAddress(params) {
     actionType,
     enabled = true
   } = params;
-  const { setUserId } = useAnalytics();
   const canFire = !!userId && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
   const query = (0, import_react_query26.useQuery)({
     queryKey: [
@@ -30850,11 +31039,7 @@ function useGetDepositAddress(params) {
     refetchOnWindowFocus: false,
     retry: 1
   });
-  (0, import_react35.useEffect)(() => {
-    if (query.data?.user_id) {
-      setUserId(query.data.user_id);
-    }
-  }, [query.data?.user_id, setUserId]);
+  useStampInternalUserId({ internalUserId: query.data?.user_id });
   return query;
 }
 
@@ -30895,7 +31080,7 @@ function useHypercoreWithdrawActivation(params) {
     actionType: import_core55.ActionType.Withdraw,
     enabled: enabled && isHypercore(sourceChainId)
   });
-  const depositWalletAddress = (0, import_react36.useMemo)(() => {
+  const depositWalletAddress = (0, import_react35.useMemo)(() => {
     const wallets = depositWalletLookup.data?.data ?? [];
     return wallets.find((w) => w.chain_type === sourceChainType)?.address;
   }, [depositWalletLookup.data, sourceChainType]);
@@ -30986,22 +31171,22 @@ function WithdrawForm({
   const strings = useI18n().t;
   const t = strings.withdrawModal;
   const tCrypto = strings.transferCrypto;
-  const [recipientAddress, setRecipientAddress] = (0, import_react37.useState)(recipientAddressProp || "");
-  const [amount, setAmount] = (0, import_react37.useState)("");
-  const [inputUnit, setInputUnit] = (0, import_react37.useState)("fiat");
-  const [isSubmitting, setIsSubmitting] = (0, import_react37.useState)(false);
-  const [submitError, setSubmitError] = (0, import_react37.useState)(null);
-  const [detailsExpanded, setDetailsExpanded] = (0, import_react37.useState)(false);
-  const [glossaryOpen, setGlossaryOpen] = (0, import_react37.useState)(false);
-  const [isMaxed, setIsMaxed] = (0, import_react37.useState)(false);
-  (0, import_react37.useEffect)(() => {
+  const [recipientAddress, setRecipientAddress] = (0, import_react36.useState)(recipientAddressProp || "");
+  const [amount, setAmount] = (0, import_react36.useState)("");
+  const [inputUnit, setInputUnit] = (0, import_react36.useState)("fiat");
+  const [isSubmitting, setIsSubmitting] = (0, import_react36.useState)(false);
+  const [submitError, setSubmitError] = (0, import_react36.useState)(null);
+  const [detailsExpanded, setDetailsExpanded] = (0, import_react36.useState)(false);
+  const [glossaryOpen, setGlossaryOpen] = (0, import_react36.useState)(false);
+  const [isMaxed, setIsMaxed] = (0, import_react36.useState)(false);
+  (0, import_react36.useEffect)(() => {
     setRecipientAddress(recipientAddressProp || "");
     setAmount("");
     setInputUnit("fiat");
     setSubmitError(null);
     setIsMaxed(false);
   }, [recipientAddressProp]);
-  (0, import_react37.useEffect)(() => {
+  (0, import_react36.useEffect)(() => {
     setIsMaxed(false);
   }, [balanceData?.balanceBaseUnit]);
   const trimmedAddress = recipientAddress.trim();
@@ -31019,7 +31204,7 @@ function WithdrawForm({
     enabled: debouncedAddress.length > 5 && !!selectedChain
   });
   const isDebouncing = trimmedAddress !== debouncedAddress;
-  const addressError = (0, import_react37.useMemo)(() => {
+  const addressError = (0, import_react36.useMemo)(() => {
     if (!trimmedAddress || trimmedAddress.length <= 5) return null;
     if (isDebouncing || isVerifyingAddress) return null;
     if (verifyError) return t.invalidAddress;
@@ -31063,33 +31248,33 @@ function WithdrawForm({
     destinationTokenAddress: selectedChain?.token_address,
     enabled: isAddressValid
   });
-  const exchangeRate = (0, import_react37.useMemo)(() => {
+  const exchangeRate = (0, import_react36.useMemo)(() => {
     if (!balanceData?.exchangeRate) return 0;
     return parseFloat(balanceData.exchangeRate);
   }, [balanceData]);
-  const balanceCrypto = (0, import_react37.useMemo)(() => {
+  const balanceCrypto = (0, import_react36.useMemo)(() => {
     if (!balanceData?.balanceHuman) return 0;
     return parseFloat(balanceData.balanceHuman);
   }, [balanceData]);
-  const balanceUsdNum = (0, import_react37.useMemo)(() => {
+  const balanceUsdNum = (0, import_react36.useMemo)(() => {
     if (!balanceData?.balanceUsd) return 0;
     return parseFloat(balanceData.balanceUsd);
   }, [balanceData]);
   const tokenSymbol = sourceTokenSymbol || balanceData?.symbol || "TOKEN";
   const sourceDecimals = balanceData?.decimals ?? 6;
-  const cryptoAmountFromInput = (0, import_react37.useMemo)(() => {
+  const cryptoAmountFromInput = (0, import_react36.useMemo)(() => {
     const val = parseFloat(amount);
     if (!val || val <= 0) return 0;
     if (inputUnit === "crypto") return val;
     return exchangeRate > 0 ? val / exchangeRate : 0;
   }, [amount, inputUnit, exchangeRate]);
-  const fiatAmountFromInput = (0, import_react37.useMemo)(() => {
+  const fiatAmountFromInput = (0, import_react36.useMemo)(() => {
     const val = parseFloat(amount);
     if (!val || val <= 0) return 0;
     if (inputUnit === "fiat") return val;
     return val * exchangeRate;
   }, [amount, inputUnit, exchangeRate]);
-  const convertedDisplay = (0, import_react37.useMemo)(() => {
+  const convertedDisplay = (0, import_react36.useMemo)(() => {
     if (!amount || parseFloat(amount) <= 0) return null;
     if (inputUnit === "crypto") {
       return `$${fiatAmountFromInput.toLocaleString(void 0, { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
@@ -31108,7 +31293,7 @@ function WithdrawForm({
     isMaxed,
     isStablecoin
   ]);
-  const balanceDisplay = (0, import_react37.useMemo)(() => {
+  const balanceDisplay = (0, import_react36.useMemo)(() => {
     if (isLoadingBalance || !balanceData) return null;
     if (inputUnit === "crypto") {
       const displayDecimals = isStablecoin ? 2 : 6;
@@ -31131,7 +31316,7 @@ function WithdrawForm({
     tokenSymbol,
     isStablecoin
   ]);
-  const handleSwitchUnit = (0, import_react37.useCallback)(() => {
+  const handleSwitchUnit = (0, import_react36.useCallback)(() => {
     if (isMaxed && balanceData) {
       if (inputUnit === "crypto") {
         setAmount((Math.round(balanceUsdNum * 100) / 100).toFixed(2));
@@ -31158,7 +31343,7 @@ function WithdrawForm({
       setInputUnit("crypto");
     }
   }, [amount, inputUnit, exchangeRate, sourceDecimals, isMaxed, balanceData, balanceUsdNum]);
-  const handleMaxClick = (0, import_react37.useCallback)(() => {
+  const handleMaxClick = (0, import_react36.useCallback)(() => {
     if (inputUnit === "crypto") {
       if (balanceCrypto <= 0) return;
       setAmount(balanceData?.balanceHuman ?? "0");
@@ -31172,7 +31357,7 @@ function WithdrawForm({
   const isBelowMinimum = minimumWithdrawAmountUsd !== null && fiatAmountFromInput > 0 && Math.round(fiatAmountFromInput * 100) / 100 < minimumWithdrawAmountUsd;
   const isOverBalance = inputUnit === "crypto" ? cryptoAmountFromInput > 0 && balanceCrypto > 0 && cryptoAmountFromInput > balanceCrypto : fiatAmountFromInput > 0 && balanceUsdNum > 0 && Math.round(fiatAmountFromInput * 100) / 100 > Math.round(balanceUsdNum * 100) / 100;
   const isFormValid = trimmedAddress.length > 0 && amount.trim().length > 0 && cryptoAmountFromInput > 0 && isAddressValid && !isBelowMinimum && !isOverBalance && !isBalanceBelowMinimum && !!balanceData;
-  const handleWithdraw = (0, import_react37.useCallback)(async () => {
+  const handleWithdraw = (0, import_react36.useCallback)(async () => {
     if (!selectedToken || !selectedChain) return;
     if (!isFormValid) return;
     setIsSubmitting(true);
@@ -31802,7 +31987,7 @@ function WithdrawExecutionItem({ execution, onClick }) {
 }
 
 // src/components/withdrawals/WithdrawConfirmingView.tsx
-var import_react38 = require("react");
+var import_react37 = require("react");
 var import_jsx_runtime76 = require("react/jsx-runtime");
 function truncateAddress4(addr) {
   if (addr.length <= 12) return addr;
@@ -31818,9 +32003,9 @@ function WithdrawConfirmingView({
   const { colors: colors2, fonts, components } = useTheme();
   const { t: strings } = useI18n();
   const t = strings.withdrawModal.details;
-  const [showButton, setShowButton] = (0, import_react38.useState)(false);
+  const [showButton, setShowButton] = (0, import_react37.useState)(false);
   const latestExecution = executions.length > 0 ? executions[executions.length - 1] : null;
-  (0, import_react38.useEffect)(() => {
+  (0, import_react37.useEffect)(() => {
     if (latestExecution) return;
     const timer = setTimeout(() => setShowButton(true), SHOW_BUTTON_DELAY_MS);
     return () => clearTimeout(timer);
@@ -31970,13 +32155,13 @@ function WithdrawModal({
   const { colors: colors2, fonts, components } = useTheme();
   const t = useI18n().t.withdrawModal;
   const { track, startSession, endSession, getSessionId, setUserId, subscribe } = useAnalytics();
-  const emitEvent = (0, import_react39.useCallback)(
+  const emitEvent = (0, import_react38.useCallback)(
     (event) => onEvent?.({ ...event, externalUserId }),
     [onEvent, externalUserId]
   );
-  const onEventRef = (0, import_react39.useRef)(emitEvent);
+  const onEventRef = (0, import_react38.useRef)(emitEvent);
   onEventRef.current = emitEvent;
-  (0, import_react39.useEffect)(
+  (0, import_react38.useEffect)(
     () => subscribe((event) => {
       if (event.properties?.flow_type !== "withdraw") return;
       const selection = selectionPayload(event);
@@ -31991,14 +32176,18 @@ function WithdrawModal({
     }),
     [subscribe, getSessionId]
   );
-  const journeyActiveRef = (0, import_react39.useRef)(false);
-  const journeySessionIdRef = (0, import_react39.useRef)(void 0);
-  const onWithdrawSuccessFor = (0, import_react39.useCallback)(
+  const journeyActiveRef = (0, import_react38.useRef)(false);
+  const journeySessionIdRef = (0, import_react38.useRef)(void 0);
+  const journeyExternalUserIdRef = (0, import_react38.useRef)(void 0);
+  const onWithdrawSuccessFor = (0, import_react38.useCallback)(
     (data) => {
       const execution = data.execution?.data.object;
       track("flow_completed", {
         flow_type: "withdraw",
         amount_usd: execution?.destinationAmountUsd ?? execution?.sourceAmountUsd,
+        // The one high-cardinality field we do send: the join key from a
+        // funnel session back to the execution row it produced.
+        execution_id: data.executionId ?? execution?.id,
         // Flat, low-cardinality execution dimensions for PostHog breakdowns.
         status: execution?.status,
         source_chain_type: execution?.sourceChainType,
@@ -32013,12 +32202,13 @@ function WithdrawModal({
     },
     [onWithdrawSuccess, emitEvent, track]
   );
-  const onWithdrawErrorFor = (0, import_react39.useCallback)(
+  const onWithdrawErrorFor = (0, import_react38.useCallback)(
     (error) => {
       const execution = error.execution?.data.object;
       track("flow_failed", {
         flow_type: "withdraw",
         error_code: error.code,
+        execution_id: execution?.id,
         failure_reason: execution?.failureReason ?? void 0,
         status: execution?.status,
         source_chain_type: execution?.sourceChainType,
@@ -32033,14 +32223,14 @@ function WithdrawModal({
     },
     [onWithdrawError, emitEvent, track]
   );
-  const [containerEl, setContainerEl] = (0, import_react39.useState)(null);
-  const containerCallbackRef = (0, import_react39.useCallback)((el) => {
+  const [containerEl, setContainerEl] = (0, import_react38.useState)(null);
+  const containerCallbackRef = (0, import_react38.useCallback)((el) => {
     setContainerEl(el);
   }, []);
-  const [resolvedTheme, setResolvedTheme] = (0, import_react39.useState)(
+  const [resolvedTheme, setResolvedTheme] = (0, import_react38.useState)(
     theme === "auto" ? "dark" : theme
   );
-  (0, import_react39.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     if (theme === "auto") {
       const mq = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mq.matches ? "dark" : "light");
@@ -32055,7 +32245,7 @@ function WithdrawModal({
     publishableKey,
     open
   );
-  const destinationTokens = (0, import_react39.useMemo)(() => tokensResponse?.data ?? [], [tokensResponse]);
+  const destinationTokens = (0, import_react38.useMemo)(() => tokensResponse?.data ?? [], [tokensResponse]);
   const { data: sourceValidation, isLoading: isCheckingSourceToken } = useSourceTokenValidation({
     sourceChainType,
     sourceChainId,
@@ -32090,10 +32280,11 @@ function WithdrawModal({
   const selectedChain = selectedToken && selectedChainKey ? selectedToken.chains.find(
     (c) => getChainKey5(c.chain_id, c.chain_type) === selectedChainKey
   ) ?? null : null;
-  const [view, setView] = (0, import_react39.useState)("form");
-  const [withdrawDepositWalletId, setWithdrawDepositWalletId] = (0, import_react39.useState)();
-  const [selectedExecution, setSelectedExecution] = (0, import_react39.useState)(null);
-  const [submittedTxInfo, setSubmittedTxInfo] = (0, import_react39.useState)(null);
+  const [view, setView] = (0, import_react38.useState)("form");
+  const [withdrawDepositWalletId, setWithdrawDepositWalletId] = (0, import_react38.useState)();
+  const withdrawDepositWalletIdRef = (0, import_react38.useRef)(void 0);
+  const [selectedExecution, setSelectedExecution] = (0, import_react38.useState)(null);
+  const [submittedTxInfo, setSubmittedTxInfo] = (0, import_react38.useState)(null);
   const { executions: realtimeExecutions } = useWithdrawPolling({
     userId: externalUserId,
     publishableKey,
@@ -32108,7 +32299,7 @@ function WithdrawModal({
     refetchInterval: view === "tracker" || view === "detail" ? 5e3 : 15e3
   });
   const allWithdrawals = allWithdrawalsData?.data ?? [];
-  const handleDepositWalletCreation = (0, import_react39.useCallback)(
+  const handleDepositWalletCreation = (0, import_react38.useCallback)(
     async (params) => {
       const response = await (0, import_core58.createDepositAddress)(
         {
@@ -32129,12 +32320,13 @@ function WithdrawModal({
       if (!depositWallet) {
         throw new Error(`No deposit wallet available for ${sourceChainType}`);
       }
+      withdrawDepositWalletIdRef.current = depositWallet.id;
       setWithdrawDepositWalletId(depositWallet.id);
       return depositWallet;
     },
     [externalUserId, publishableKey, sourceChainType, setUserId]
   );
-  const handleWithdrawStarted = (0, import_react39.useCallback)(
+  const handleWithdrawStarted = (0, import_react38.useCallback)(
     (txInfo) => {
       const tokenData = destinationTokens.find((t2) => t2.symbol === txInfo.destinationTokenSymbol);
       const chainData = tokenData?.chains.find(
@@ -32148,7 +32340,12 @@ function WithdrawModal({
         currency: tokenData?.currency,
         amount: txInfo.amount,
         amount_base_unit: txInfo.amountBaseUnit,
-        ...txInfo.amountUsd ? { amount_usd: txInfo.amountUsd } : {}
+        ...txInfo.amountUsd ? { amount_usd: txInfo.amountUsd } : {},
+        // The execution doesn't exist yet — it's created when the user's send
+        // lands on the withdraw deposit wallet, and carries this id. So a
+        // withdrawal confirmed but never completed still joins to whatever
+        // did (or didn't) follow on that wallet.
+        deposit_wallet_id: withdrawDepositWalletIdRef.current
       });
       emitEvent({
         id: (0, import_core58.generatePrefixedKSUID)("sevt"),
@@ -32168,23 +32365,25 @@ function WithdrawModal({
     },
     [track, emitEvent, getSessionId, destinationTokens]
   );
-  const handleWithdrawSubmitted = (0, import_react39.useCallback)((txInfo) => {
+  const handleWithdrawSubmitted = (0, import_react38.useCallback)((txInfo) => {
     setSubmittedTxInfo(txInfo);
     setView("confirming");
   }, []);
-  const resetViewTimeoutRef = (0, import_react39.useRef)(null);
-  const finalizeJourney = (0, import_react39.useCallback)(() => {
+  const resetViewTimeoutRef = (0, import_react38.useRef)(null);
+  const finalizeJourney = (0, import_react38.useCallback)(() => {
     if (!journeyActiveRef.current) return;
     journeyActiveRef.current = false;
     track("widget_closed", { flow_type: "withdraw" });
     if (getSessionId() === journeySessionIdRef.current) endSession();
   }, [track, getSessionId, endSession]);
-  const beginJourney = (0, import_react39.useCallback)(() => {
+  const beginJourney = (0, import_react38.useCallback)(() => {
     journeySessionIdRef.current = startSession();
     journeyActiveRef.current = true;
+    journeyExternalUserIdRef.current = externalUserId;
+    setUserId(null);
     track("widget_opened", { flow_type: "withdraw" });
-  }, [startSession, track]);
-  const handleClose = (0, import_react39.useCallback)(() => {
+  }, [startSession, track, setUserId, externalUserId]);
+  const handleClose = (0, import_react38.useCallback)(() => {
     finalizeJourney();
     onOpenChange(false);
     if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
@@ -32192,11 +32391,12 @@ function WithdrawModal({
       setView("form");
       setSelectedExecution(null);
       setSubmittedTxInfo(null);
+      withdrawDepositWalletIdRef.current = void 0;
       setWithdrawDepositWalletId(void 0);
       resetViewTimeoutRef.current = null;
     }, 200);
   }, [onOpenChange, finalizeJourney]);
-  (0, import_react39.useLayoutEffect)(() => {
+  (0, import_react38.useLayoutEffect)(() => {
     if (!open) {
       finalizeJourney();
       return;
@@ -32209,9 +32409,15 @@ function WithdrawModal({
     setView("form");
     setSelectedExecution(null);
     setSubmittedTxInfo(null);
+    withdrawDepositWalletIdRef.current = void 0;
     setWithdrawDepositWalletId(void 0);
   }, [open]);
-  (0, import_react39.useEffect)(
+  (0, import_react38.useLayoutEffect)(() => {
+    if (!open || journeyExternalUserIdRef.current === externalUserId) return;
+    journeyExternalUserIdRef.current = externalUserId;
+    setUserId(null);
+  }, [open, externalUserId, setUserId]);
+  (0, import_react38.useEffect)(
     () => () => {
       if (journeyActiveRef.current) {
         journeyActiveRef.current = false;
@@ -32220,18 +32426,18 @@ function WithdrawModal({
     },
     [endSession, getSessionId]
   );
-  (0, import_react39.useEffect)(() => {
+  (0, import_react38.useEffect)(() => {
     if (!open) return;
     const screen = view === "detail" ? "tracker_detail" : view;
     track("screen_viewed", { flow_type: "withdraw", screen });
   }, [open, view, track]);
-  (0, import_react39.useEffect)(
+  (0, import_react38.useEffect)(
     () => () => {
       if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
     },
     []
   );
-  const trackAssetSelected = (0, import_react39.useCallback)(
+  const trackAssetSelected = (0, import_react38.useCallback)(
     (symbol, chainKey) => {
       const [chainType, chainId] = (chainKey ?? "").split(":");
       const tokenData = destinationTokens.find((t2) => t2.symbol === symbol);
@@ -32249,14 +32455,14 @@ function WithdrawModal({
     },
     [destinationTokens, track]
   );
-  const handleTokenSymbolChange = (0, import_react39.useCallback)(
+  const handleTokenSymbolChange = (0, import_react38.useCallback)(
     (symbol) => {
       trackAssetSelected(symbol, selectedChainKey);
       setSelectedTokenSymbol(symbol);
     },
     [setSelectedTokenSymbol, selectedChainKey, trackAssetSelected]
   );
-  const handleChainKeyChange = (0, import_react39.useCallback)(
+  const handleChainKeyChange = (0, import_react38.useCallback)(
     (chainKey) => {
       trackAssetSelected(selectedTokenSymbol, chainKey);
       setSelectedChainKey(chainKey);
@@ -32445,16 +32651,16 @@ function WithdrawModal({
 }
 
 // src/components/withdrawals/WithdrawTokenSelector.tsx
-var import_react40 = require("react");
+var import_react39 = require("react");
 var import_lucide_react45 = require("lucide-react");
 var import_fuse2 = __toESM(require("fuse.js"));
 var import_jsx_runtime78 = require("react/jsx-runtime");
 function WithdrawTokenSelector({ tokens, onSelect, onBack }) {
   const { themeClass, colors: colors2, fonts, components } = useTheme();
   const t = useI18n().t.withdrawModal;
-  const [searchQuery, setSearchQuery] = (0, import_react40.useState)("");
-  const [hoveredKey, setHoveredKey] = (0, import_react40.useState)(null);
-  const allOptions = (0, import_react40.useMemo)(() => {
+  const [searchQuery, setSearchQuery] = (0, import_react39.useState)("");
+  const [hoveredKey, setHoveredKey] = (0, import_react39.useState)(null);
+  const allOptions = (0, import_react39.useMemo)(() => {
     const options = [];
     tokens.forEach((token) => {
       token.chains.forEach((chain) => {
@@ -32463,7 +32669,7 @@ function WithdrawTokenSelector({ tokens, onSelect, onBack }) {
     });
     return options;
   }, [tokens]);
-  const fuse = (0, import_react40.useMemo)(
+  const fuse = (0, import_react39.useMemo)(
     () => new import_fuse2.default(allOptions, {
       keys: [
         { name: "token.symbol", weight: 2 },
@@ -32476,7 +32682,7 @@ function WithdrawTokenSelector({ tokens, onSelect, onBack }) {
     }),
     [allOptions]
   );
-  const filteredOptions = (0, import_react40.useMemo)(() => {
+  const filteredOptions = (0, import_react39.useMemo)(() => {
     if (!searchQuery.trim()) return allOptions;
     const query = searchQuery.trim();
     const results = fuse.search(query);