@unifold/ui-react 0.1.77 → 0.1.79

package/dist/index.mjs

@@ -420,6 +420,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: "."
@@ -550,7 +553,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.",
@@ -1211,6 +1219,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"
@@ -1341,7 +1352,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",
@@ -2002,6 +2018,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"
@@ -2132,7 +2151,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",
@@ -3071,13 +3095,15 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-deposit-address.ts
-import { useEffect as useEffect3 } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   createDepositAddress,
   isDepositAddressValidationError
 } from "@unifold/core";
 
+// src/hooks/use-internal-user-id.ts
+import { useEffect as useEffect3 } from "react";
+
 // src/context/AnalyticsContext.tsx
 import * as React5 from "react";
 import { jsx as jsx5 } from "react/jsx-runtime";
@@ -3109,6 +3135,15 @@ function useAnalytics() {
   return { track, startSession, endSession, getSessionId, setUserId, subscribe };
 }
 
+// src/hooks/use-internal-user-id.ts
+function useStampInternalUserId({ internalUserId }) {
+  const { setUserId } = useAnalytics();
+  useEffect3(() => {
+    if (!internalUserId) return;
+    setUserId(internalUserId);
+  }, [internalUserId, setUserId]);
+}
+
 // src/hooks/use-deposit-address.ts
 function useDepositAddress(params) {
   const {
@@ -3122,7 +3157,6 @@ function useDepositAddress(params) {
     contractCalls,
     enabled = true
   } = params;
-  const { setUserId } = useAnalytics();
   const query = useQuery({
     queryKey: [
       "unifold",
@@ -3165,11 +3199,7 @@ function useDepositAddress(params) {
     retryDelay: (attempt) => Math.min(1e3 * 2 ** attempt, 1e4)
     // 1s, 2s, 4s (max 10s)
   });
-  useEffect3(() => {
-    if (query.data?.user_id) {
-      setUserId(query.data.user_id);
-    }
-  }, [query.data?.user_id, setUserId]);
+  useStampInternalUserId({ internalUserId: query.data?.user_id });
   return query;
 }
 
@@ -5475,7 +5505,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: generatePrefixedKSUID2("sevt"),
@@ -6987,6 +7021,8 @@ var BuyWithWalletPay = React8.forwardRef(
     const [limitUpgradeError, setLimitUpgradeError] = useState15(null);
     const [upgradeSubmitting, setUpgradeSubmitting] = useState15(false);
     const upgradeFlowAbortRef = useRef6(null);
+    const applyLimitRoutingRef = useRef6(() => {
+    });
     const [amount, setAmount] = useState15(amountUsd ?? "");
     const [preparedOrder, setPreparedOrder] = useState15(null);
     const sessionAbortRef = useRef6(null);
@@ -7121,6 +7157,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 = useCallback4(async () => {
       setView("submitting_session");
       setErrorMessage("");
@@ -7130,7 +7174,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
         );
@@ -7140,6 +7189,34 @@ var BuyWithWalletPay = React8.forwardRef(
         }
         setClientSecret(session.client_secret);
         storeWalletPaySession();
+        if (session.status === "verified") {
+          const tokenRes = await 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 sendOnrampVerificationOtp(session.id, "phone", session.client_secret, publishableKey);
         setResendCooldown(30);
         setView("phone_otp");
@@ -7148,19 +7225,19 @@ var BuyWithWalletPay = React8.forwardRef(
         setErrorMessage(prettifyVerificationError(raw));
         setView("phone_input");
       }
-    }, [email, normalizedPhone, publishableKey, storeWalletPaySession]);
+    }, [
+      email,
+      normalizedPhone,
+      publishableKey,
+      storeWalletPaySession,
+      userId,
+      amountUsd,
+      refetchWalletPayLimits
+    ]);
     const clearUpgradeFields = useCallback4(() => {
       setSsnLast4("");
       setDobInput("");
     }, []);
-    const { action: initialAction, refetchWalletPayLimits } = useWalletPayInitialScreen({
-      userId,
-      publishableKey,
-      normalizedPhone,
-      userEmail,
-      sessionPhoneVerified: verificationSession?.phone?.status === "verified",
-      isWaiting: defaultTokenLoading || legalAgreementsLoading || userIpInfoLoading
-    });
     const pollLimitUpgradeStatus = useCallback4(
       async (signal) => {
         const POLL_INTERVAL_MS5 = 1500;
@@ -7271,6 +7348,7 @@ var BuyWithWalletPay = React8.forwardRef(
       },
       [startUpgradePolling]
     );
+    applyLimitRoutingRef.current = applyLimitRouting;
     const hasInitializedRef = useRef6(false);
     useEffect12(() => {
       if (hasInitializedRef.current) return;
@@ -7500,7 +7578,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: generatePrefixedKSUID3("sevt"),
@@ -7550,6 +7631,7 @@ var BuyWithWalletPay = React8.forwardRef(
         defaultTokenLoading,
         defaultTokenError,
         depositWallet?.address,
+        depositWalletId,
         userEmail,
         publishableKey,
         onEvent,
@@ -8524,7 +8606,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",
@@ -8544,22 +8626,24 @@ function LegalDisclaimer({ legalAgreements, loading }) {
     return /* @__PURE__ */ jsxs14(
       "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__ */ jsx18("div", { className: "uf-h-2.5 uf-rounded uf-w-full", style: { backgroundColor: colors2.card } }),
-          /* @__PURE__ */ jsx18("div", { className: "uf-h-2.5 uf-rounded uf-w-11/12", style: { backgroundColor: colors2.card } }),
-          /* @__PURE__ */ jsx18("div", { className: "uf-h-2.5 uf-rounded uf-w-3/4", style: { backgroundColor: colors2.card } })
+          /* @__PURE__ */ jsx18("div", { className: "uf-h-2 uf-rounded uf-w-full", style: { backgroundColor: colors2.card } }),
+          /* @__PURE__ */ jsx18("div", { className: "uf-h-2 uf-rounded uf-w-11/12", style: { backgroundColor: colors2.card } }),
+          /* @__PURE__ */ jsx18("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__ */ jsxs14(
     "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,
@@ -8570,12 +8654,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
       ]
@@ -9231,22 +9315,6 @@ import {
   generatePrefixedKSUID as generatePrefixedKSUID5,
   DepositEventType as DepositEventType4
 } from "@unifold/core";
-
-// src/hooks/use-cashapp-limits.ts
-import { useQuery as useQuery9 } from "@tanstack/react-query";
-import { getCashAppLimits } from "@unifold/core";
-function useCashAppLimits({ publishableKey, currency = "usd" }) {
-  return useQuery9({
-    queryKey: ["unifold", "cashAppLimits", currency, publishableKey],
-    queryFn: () => getCashAppLimits(currency, publishableKey),
-    enabled: !!publishableKey,
-    staleTime: 2 * 60 * 6e4,
-    gcTime: 4 * 60 * 6e4,
-    retry: 2
-  });
-}
-
-// src/components/deposits/PayWithCashApp.tsx
 import { Fragment as Fragment6, jsx as jsx20, jsxs as jsxs16 } from "react/jsx-runtime";
 var POLL_INTERVAL_MS3 = 5e3;
 var FALLBACK_MIN_USD = 5;
@@ -9259,6 +9327,7 @@ function PayWithCashApp({
   destinationChainType,
   destinationChainId,
   destinationTokenAddress,
+  contractCalls,
   cashAppIconUrl,
   view: controlledView,
   onViewChange,
@@ -9282,9 +9351,11 @@ function PayWithCashApp({
     const b = parseInt(bg.slice(4, 6), 16);
     return (r * 299 + g * 587 + b * 114) / 1e3 < 128;
   })();
-  const { data: limits, isLoading: limitsLoading } = useCashAppLimits({ publishableKey });
-  const minUsd = limits?.minimum_amount ?? FALLBACK_MIN_USD;
-  const maxUsd = limits?.maximum_amount ?? null;
+  const { data: fiatCurrencies, isLoading: limitsLoading } = useFiatCurrencies({
+    publishableKey
+  });
+  const minUsd = fiatCurrencies?.data.find((entry) => entry.currency_code.toLowerCase() === "usd")?.minimum_amount ?? FALLBACK_MIN_USD;
+  const quickAmounts = SUGGESTED_AMOUNTS.filter((value) => value >= minUsd);
   const [amount, setAmount] = useState18(() => sanitizePrefilledUsd(prefilledAmountUsd));
   const [loading, setLoading] = useState18(false);
   const [session, setSession] = useState18(null);
@@ -9339,6 +9410,8 @@ function PayWithCashApp({
       setError(strings.depositModal.cashAppErrors.missingFields);
       return;
     }
+    const amountNum2 = parseFloat(amount);
+    if (isNaN(amountNum2) || amountNum2 < minUsd) return;
     setLoading(true);
     setError(null);
     try {
@@ -9351,7 +9424,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
       );
@@ -9364,7 +9438,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: generatePrefixedKSUID5("sevt"),
@@ -9383,12 +9460,15 @@ function PayWithCashApp({
     }
   }, [
     amount,
+    minUsd,
     userId,
     publishableKey,
     recipientAddress,
     destinationChainType,
     destinationChainId,
     destinationTokenAddress,
+    contractCalls,
+    depositWalletId,
     onEvent,
     onDepositError,
     track,
@@ -9484,8 +9564,7 @@ function PayWithCashApp({
   const amountNum = parseFloat(amount);
   const hasInput = !isNaN(amountNum) && amountNum > 0;
   const belowMin = hasInput && amountNum < minUsd;
-  const aboveMax = hasInput && maxUsd !== null && amountNum > maxUsd;
-  const isValidAmount = hasInput && !belowMin && !aboveMax;
+  const isValidAmount = hasInput && !belowMin;
   if (view === "amount") {
     return /* @__PURE__ */ jsxs16(
       "div",
@@ -9514,7 +9593,7 @@ function PayWithCashApp({
                 }
               }
             ) }) }),
-            /* @__PURE__ */ jsx20("div", { className: "uf-flex uf-gap-3 uf-justify-center", children: SUGGESTED_AMOUNTS.map((quickAmount) => {
+            /* @__PURE__ */ jsx20("div", { className: "uf-flex uf-gap-3 uf-justify-center", children: quickAmounts.map((quickAmount) => {
               const isSelected = parseFloat(amount) === quickAmount;
               return /* @__PURE__ */ jsxs16(
                 "button",
@@ -9540,23 +9619,17 @@ function PayWithCashApp({
                 quickAmount
               );
             }) }),
-            amount && amountNum < minUsd && !error ? /* @__PURE__ */ jsx20(
+            !limitsLoading && minUsd > 0 && /* @__PURE__ */ jsx20(
               "div",
               {
-                className: "uf-text-sm uf-text-center uf-mt-3 uf-px-2",
-                style: { color: colors2.error, fontFamily: fonts.regular },
-                children: interpolate(strings.common.minimumAmount, { amount: `$${minUsd}` })
-              }
-            ) : amount && maxUsd !== null && amountNum > maxUsd && !error ? /* @__PURE__ */ jsx20(
-              "div",
-              {
-                className: "uf-text-sm uf-text-center uf-mt-3 uf-px-2",
-                style: { color: colors2.error, fontFamily: fonts.regular },
-                children: interpolate(strings.common.maximumAmount, {
-                  amount: `$${maxUsd.toLocaleString()}`
+                className: "uf-text-center uf-text-xs uf-mt-4",
+                style: { color: colors2.warning, fontFamily: fonts.regular },
+                children: interpolate(strings.common.minimumDeposit, {
+                  amount: `$${minUsd.toFixed(2)}`
                 })
               }
-            ) : error ? /* @__PURE__ */ jsx20(
+            ),
+            error ? /* @__PURE__ */ jsx20(
               "div",
               {
                 className: "uf-text-sm uf-text-center uf-mt-3 uf-px-2",
@@ -9565,7 +9638,7 @@ function PayWithCashApp({
               }
             ) : null
           ] }),
-          /* @__PURE__ */ jsx20("div", { className: "uf-px-1", children: /* @__PURE__ */ jsx20(
+          /* @__PURE__ */ jsx20("div", { className: "uf-px-1 uf-mt-5", children: /* @__PURE__ */ jsx20(
             "button",
             {
               onClick: handleCreateSession,
@@ -9794,7 +9867,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-bank-transfer-providers.ts
-import { useQuery as useQuery10 } from "@tanstack/react-query";
+import { useQuery as useQuery9 } from "@tanstack/react-query";
 import { getBankTransferProviders } from "@unifold/core";
 function useBankTransferProviders({
   publishableKey,
@@ -9802,7 +9875,7 @@ function useBankTransferProviders({
   countryCode
 }) {
   const normalizedCountry = countryCode?.toUpperCase();
-  const { data: providers, isLoading } = useQuery10({
+  const { data: providers, isLoading } = useQuery9({
     queryKey: ["unifold", "bankTransferProviders", publishableKey, normalizedCountry ?? null],
     queryFn: () => getBankTransferProviders(publishableKey, { countryCode: normalizedCountry }),
     enabled,
@@ -10009,7 +10082,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: generatePrefixedKSUID6("sevt"),
@@ -16274,7 +16350,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();
@@ -17771,7 +17851,14 @@ function PayWithStripeLink({
               ]
             }
           ),
-          /* @__PURE__ */ jsx50("div", { ref: authMountRef, className: "uf-w-full uf-min-h-[200px]" })
+          /* @__PURE__ */ jsx50(
+            "div",
+            {
+              ref: authMountRef,
+              className: "uf-w-full uf-min-h-[200px]",
+              style: { colorScheme: "only light" }
+            }
+          )
         ]
       }
     );
@@ -18351,7 +18438,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-project-config.ts
-import { useQuery as useQuery11, keepPreviousData } from "@tanstack/react-query";
+import { useQuery as useQuery10, keepPreviousData } from "@tanstack/react-query";
 import { getProjectConfig } from "@unifold/core";
 function useProjectConfig({
   publishableKey,
@@ -18363,7 +18450,7 @@ function useProjectConfig({
     data: projectConfig,
     isLoading,
     error
-  } = useQuery11({
+  } = useQuery10({
     // Country is part of the key so a region change refetches the region-aware
     // config. Omitted when undefined so callers that don't pass a country keep
     // sharing the base cache entry.
@@ -18382,7 +18469,7 @@ function useProjectConfig({
 }
 
 // src/hooks/use-integration-transfer-default-token.ts
-import { useQuery as useQuery12 } from "@tanstack/react-query";
+import { useQuery as useQuery11 } from "@tanstack/react-query";
 import {
   getIntegrationTransferDefaultToken
 } from "@unifold/core";
@@ -18391,7 +18478,7 @@ function useIntegrationTransferDefaultToken({
   publishableKey,
   enabled = true
 }) {
-  return useQuery12({
+  return useQuery11({
     queryKey: [
       "unifold",
       "integrationTransferDefaultToken",
@@ -19079,6 +19166,9 @@ function CoinbaseConnect({
       flow_type: "deposit",
       method: "exchange_connect",
       provider: 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,
@@ -19086,6 +19176,34 @@ function CoinbaseConnect({
       network: sourceChain?.network
     });
   };
+  const applyConfirmResult = (result) => {
+    if (result.status === "mfa_required") {
+      track("verification_started", {
+        flow_type: "deposit",
+        method: "exchange_connect",
+        provider: 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);
@@ -19120,30 +19238,7 @@ function CoinbaseConnect({
         });
         throw err;
       });
-      if (result.status === "mfa_required") {
-        track("verification_started", {
-          flow_type: "deposit",
-          method: "exchange_connect",
-          provider: 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);
@@ -19300,6 +19395,9 @@ function CoinbaseConnect({
         setShowTransferDetails(false);
         transitionTo("enter_amount");
         break;
+      case "mfa_enrollment":
+        transitionTo("transfer_confirm");
+        break;
       case "mfa":
         transitionTo("transfer_confirm");
         break;
@@ -20856,6 +20954,55 @@ function CoinbaseConnect({
       ] })
     ] });
   }
+  if (view === "mfa_enrollment") {
+    return /* @__PURE__ */ jsxs46(Fragment9, { children: [
+      /* @__PURE__ */ jsx51(DepositHeader, { title: t.title, showBack: true, onBack: handleBack, onClose }),
+      /* @__PURE__ */ jsxs46(
+        "div",
+        {
+          className: "uf-flex uf-flex-col uf-items-center uf-px-4 uf-pb-4",
+          style: viewTransitionStyle,
+          children: [
+            /* @__PURE__ */ jsx51(
+              DepositErrorState,
+              {
+                title: t.transfer.mfaEnrollmentTitle,
+                message: t.transfer.mfaEnrollmentMessage
+              }
+            ),
+            /* @__PURE__ */ jsxs46(
+              "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__ */ jsx51(ExternalLink4, { className: "uf-w-3.5 uf-h-3.5" })
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsx51(
+              "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__ */ jsx51(Loader27, { className: "uf-w-4 uf-h-4 uf-animate-spin" }) : t.continue
+              }
+            )
+          ]
+        }
+      )
+    ] });
+  }
   if (view === "mfa") {
     return /* @__PURE__ */ jsxs46(Fragment9, { children: [
       /* @__PURE__ */ jsx51(DepositHeader, { title: t.title, showBack: true, onBack: handleBack, onClose }),
@@ -21141,13 +21288,13 @@ function resolveDepositMenuLayout(layout, displayMode) {
 }
 
 // src/hooks/use-exchanges.ts
-import { useQuery as useQuery13 } from "@tanstack/react-query";
+import { useQuery as useQuery12 } from "@tanstack/react-query";
 import { getExchanges } from "@unifold/core";
 function useExchanges({
   publishableKey,
   enabled = true
 }) {
-  const { data: exchanges = [], isLoading } = useQuery13({
+  const { data: exchanges = [], isLoading } = useQuery12({
     queryKey: ["unifold", "exchanges", publishableKey],
     queryFn: () => getExchanges(void 0, publishableKey).then((res) => res.data),
     enabled,
@@ -21159,7 +21306,7 @@ function useExchanges({
 }
 
 // src/hooks/use-public-incident.ts
-import { useQuery as useQuery14 } from "@tanstack/react-query";
+import { useQuery as useQuery13 } from "@tanstack/react-query";
 import { getPublicIncident } from "@unifold/core";
 function usePublicIncident({
   publishableKey,
@@ -21169,7 +21316,7 @@ function usePublicIncident({
     data: incident,
     isLoading,
     error
-  } = useQuery14({
+  } = useQuery13({
     queryKey: ["unifold", "publicIncident", publishableKey],
     queryFn: () => getPublicIncident(publishableKey),
     enabled,
@@ -21181,7 +21328,7 @@ function usePublicIncident({
 }
 
 // src/hooks/use-wallet-pay-providers.ts
-import { useQuery as useQuery15 } from "@tanstack/react-query";
+import { useQuery as useQuery14 } from "@tanstack/react-query";
 import {
   getWalletPayProviders
 } from "@unifold/core";
@@ -21190,7 +21337,7 @@ function useWalletPayProviders({
   publishableKey,
   enabled = true
 }) {
-  const { data: providers, isLoading } = useQuery15({
+  const { data: providers, isLoading } = useQuery14({
     queryKey: ["unifold", "walletPayProviders", method, publishableKey],
     queryFn: () => getWalletPayProviders(method, publishableKey),
     enabled,
@@ -21483,7 +21630,7 @@ function useAllowedCountry(publishableKey) {
 }
 
 // src/hooks/use-address-validation.ts
-import { useQuery as useQuery16 } from "@tanstack/react-query";
+import { useQuery as useQuery15 } from "@tanstack/react-query";
 import {
   verifyRecipientAddress
 } from "@unifold/core";
@@ -21497,7 +21644,7 @@ function useAddressValidation({
   refetchOnMount = false
 }) {
   const shouldValidate = enabled && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  const { data, isLoading, error } = useQuery16({
+  const { data, isLoading, error } = useQuery15({
     queryKey: [
       "unifold",
       "addressValidation",
@@ -22960,7 +23107,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-hypercore-activation.ts
-import { useQuery as useQuery17 } from "@tanstack/react-query";
+import { useQuery as useQuery16 } from "@tanstack/react-query";
 import { checkHypercoreActivation } from "@unifold/core";
 
 // src/lib/constants.ts
@@ -22979,7 +23126,7 @@ function useHypercoreActivation(params) {
   const recipient = recipientAddress?.trim() ?? "";
   const source = sourceAddress?.trim() ?? "";
   const hasAddresses = !!recipient && !!source;
-  const { data, isLoading } = useQuery17({
+  const { data, isLoading } = useQuery16({
     queryKey: ["unifold", "hypercoreActivation", source, recipient, publishableKey],
     queryFn: () => checkHypercoreActivation(
       {
@@ -24793,7 +24940,7 @@ async function sendHypercoreEvmTransfer(params) {
 }
 
 // src/hooks/use-deposit-quote.ts
-import { useQuery as useQuery18 } from "@tanstack/react-query";
+import { useQuery as useQuery17 } from "@tanstack/react-query";
 import { getDepositQuote } from "@unifold/core";
 function useDepositQuote(params) {
   const {
@@ -24820,7 +24967,7 @@ function useDepositQuote(params) {
     ...adjustForSlippage ? { adjust_for_slippage: true } : {},
     ...stablecoinParity ? { stablecoin_parity: true } : {}
   };
-  return useQuery18({
+  return useQuery17({
     queryKey: [
       "unifold",
       "depositQuote",
@@ -24848,13 +24995,13 @@ function useDepositQuote(params) {
 }
 
 // src/hooks/use-external-wallets.ts
-import { useQuery as useQuery19 } from "@tanstack/react-query";
+import { useQuery as useQuery18 } from "@tanstack/react-query";
 import { getExternalWallets } from "@unifold/core";
 function useExternalWallets({
   publishableKey,
   enabled = true
 }) {
-  const { data: wallets = [], isLoading } = useQuery19({
+  const { data: wallets = [], isLoading } = useQuery18({
     queryKey: ["unifold", "external-wallets", publishableKey],
     queryFn: () => getExternalWallets(publishableKey).then((res) => res.data),
     enabled: enabled && !!publishableKey,
@@ -27015,7 +27162,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);
@@ -27605,7 +27756,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 = useMemo17(
     () => normalizePrefilledUsdAmount(prefilledAmountUsd),
     [prefilledAmountUsd]
@@ -27613,6 +27764,7 @@ function DepositModal({
   const analyticsMethod = (method) => method === "transfer" ? "transfer_crypto" : method;
   const journeyActiveRef = useRef16(false);
   const journeySessionIdRef = useRef16(void 0);
+  const journeyExternalUserIdRef = useRef16(void 0);
   const externalUserId = userId || void 0;
   const emitEvent = useCallback14(
     (event) => onEvent?.({ ...event, externalUserId }),
@@ -27640,6 +27792,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).
@@ -27667,6 +27822,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,
@@ -28095,8 +28251,10 @@ function DepositModal({
   const beginJourney = useCallback14(() => {
     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);
@@ -28121,6 +28279,11 @@ function DepositModal({
     }
     beginJourney();
   }, [open]);
+  useLayoutEffect2(() => {
+    if (!open || journeyExternalUserIdRef.current === userId) return;
+    journeyExternalUserIdRef.current = userId;
+    setUserId(null);
+  }, [open, userId, setUserId]);
   useLayoutEffect2(() => {
     if (!open) return;
     if (resetViewTimeoutRef.current) {
@@ -29032,6 +29195,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,
@@ -29216,12 +29380,12 @@ function useForwardCheckoutEvents(onEvent, journeySessionId) {
 }
 
 // src/hooks/use-payment-intent.ts
-import { useQuery as useQuery20 } from "@tanstack/react-query";
+import { useQuery as useQuery19 } from "@tanstack/react-query";
 import { retrievePaymentIntent } from "@unifold/core";
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["succeeded", "expired", "refunded", "canceled"]);
 function usePaymentIntent(params) {
   const { clientSecret, publishableKey, enabled = true, pollingInterval = 3e3 } = params;
-  return useQuery20({
+  return useQuery19({
     queryKey: ["unifold", "paymentIntent", clientSecret, publishableKey],
     queryFn: () => retrievePaymentIntent(clientSecret, publishableKey),
     enabled: enabled && !!clientSecret && !!publishableKey,
@@ -29395,6 +29559,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 } : {}
         });
       }
@@ -29615,7 +29782,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);
@@ -30056,16 +30223,16 @@ function CheckoutModal({
 }
 
 // src/components/withdrawals/WithdrawModal.tsx
-import { useState as useState49, useEffect as useEffect48, useLayoutEffect as useLayoutEffect4, useCallback as useCallback17, useMemo as useMemo21, useRef as useRef20 } from "react";
+import { useState as useState49, useEffect as useEffect47, useLayoutEffect as useLayoutEffect4, useCallback as useCallback17, useMemo as useMemo21, useRef as useRef20 } from "react";
 import { AlertTriangle as AlertTriangle8, ChevronRight as ChevronRight22, Clock as Clock6 } from "lucide-react";
 
 // src/hooks/use-supported-destination-tokens.ts
-import { useQuery as useQuery21 } from "@tanstack/react-query";
+import { useQuery as useQuery20 } from "@tanstack/react-query";
 import {
   getSupportedDestinationTokens
 } from "@unifold/core";
 function useSupportedDestinationTokens(publishableKey, enabled = true) {
-  return useQuery21({
+  return useQuery20({
     queryKey: ["unifold", "supportedDestinationTokens", publishableKey],
     queryFn: () => getSupportedDestinationTokens(publishableKey),
     staleTime: 1e3 * 60 * 5,
@@ -30097,7 +30264,7 @@ function useDefaultDestinationToken({
 }
 
 // src/hooks/use-source-token-validation.ts
-import { useQuery as useQuery22 } from "@tanstack/react-query";
+import { useQuery as useQuery21 } from "@tanstack/react-query";
 import { getSupportedDepositTokens as getSupportedDepositTokens3 } from "@unifold/core";
 function useSourceTokenValidation(params) {
   const {
@@ -30109,7 +30276,7 @@ function useSourceTokenValidation(params) {
     enabled = true
   } = params;
   const hasParams = !!sourceChainType && !!sourceChainId && !!sourceTokenAddress;
-  return useQuery22({
+  return useQuery21({
     queryKey: [
       "unifold",
       "sourceTokenValidation",
@@ -30159,12 +30326,12 @@ function useSourceTokenValidation(params) {
 }
 
 // src/hooks/use-address-balance.ts
-import { useQuery as useQuery23 } from "@tanstack/react-query";
+import { useQuery as useQuery22 } from "@tanstack/react-query";
 import { getAddressBalance as getAddressBalance2 } from "@unifold/core";
 function useAddressBalance(params) {
   const { address, chainType, chainId, tokenAddress, publishableKey, enabled = true } = params;
   const hasParams = !!address && !!chainType && !!chainId && !!tokenAddress;
-  return useQuery23({
+  return useQuery22({
     queryKey: [
       "unifold",
       "addressBalance",
@@ -30220,11 +30387,11 @@ function useAddressBalance(params) {
 }
 
 // src/hooks/use-executions.ts
-import { useQuery as useQuery24 } from "@tanstack/react-query";
+import { useQuery as useQuery23 } from "@tanstack/react-query";
 import { queryExecutions as queryExecutions4, ActionType as ActionType4 } from "@unifold/core";
 function useExecutions(userId, publishableKey, options) {
   const actionType = options?.actionType ?? ActionType4.Deposit;
-  return useQuery24({
+  const query = useQuery23({
     queryKey: ["unifold", "executions", actionType, userId, publishableKey],
     queryFn: () => queryExecutions4(userId, publishableKey, actionType),
     enabled: (options?.enabled ?? true) && !!userId,
@@ -30233,6 +30400,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
@@ -30574,7 +30743,7 @@ function WithdrawDoubleInput({
 }
 
 // src/components/withdrawals/WithdrawForm.tsx
-import { useState as useState47, useCallback as useCallback16, useMemo as useMemo20, useEffect as useEffect46 } from "react";
+import { useState as useState47, useCallback as useCallback16, useMemo as useMemo20, useEffect as useEffect45 } from "react";
 import {
   AlertTriangle as AlertTriangle7,
   ArrowUpDown,
@@ -30592,7 +30761,7 @@ import {
 } from "@unifold/core";
 
 // src/hooks/use-verify-recipient-address.ts
-import { useQuery as useQuery25 } from "@tanstack/react-query";
+import { useQuery as useQuery24 } from "@tanstack/react-query";
 import { verifyRecipientAddress as verifyRecipientAddress2 } from "@unifold/core";
 function useVerifyRecipientAddress(params) {
   const {
@@ -30605,7 +30774,7 @@ function useVerifyRecipientAddress(params) {
   } = params;
   const trimmedAddress = recipientAddress?.trim() || "";
   const hasAllParams = !!chainType && !!chainId && !!tokenAddress && trimmedAddress.length > 0;
-  return useQuery25({
+  return useQuery24({
     queryKey: [
       "unifold",
       "verifyRecipientAddress",
@@ -30857,8 +31026,7 @@ import { useMemo as useMemo19 } from "react";
 import { ActionType as ActionType6 } from "@unifold/core";
 
 // src/hooks/use-get-deposit-address.ts
-import { useEffect as useEffect45 } from "react";
-import { useQuery as useQuery26 } from "@tanstack/react-query";
+import { useQuery as useQuery25 } from "@tanstack/react-query";
 import { getDepositAddress } from "@unifold/core";
 function useGetDepositAddress(params) {
   const {
@@ -30871,9 +31039,8 @@ function useGetDepositAddress(params) {
     actionType,
     enabled = true
   } = params;
-  const { setUserId } = useAnalytics();
   const canFire = !!userId && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  const query = useQuery26({
+  const query = useQuery25({
     queryKey: [
       "unifold",
       "getDepositAddress",
@@ -30903,11 +31070,7 @@ function useGetDepositAddress(params) {
     refetchOnWindowFocus: false,
     retry: 1
   });
-  useEffect45(() => {
-    if (query.data?.user_id) {
-      setUserId(query.data.user_id);
-    }
-  }, [query.data?.user_id, setUserId]);
+  useStampInternalUserId({ internalUserId: query.data?.user_id });
   return query;
 }
 
@@ -31047,14 +31210,14 @@ function WithdrawForm({
   const [detailsExpanded, setDetailsExpanded] = useState47(false);
   const [glossaryOpen, setGlossaryOpen] = useState47(false);
   const [isMaxed, setIsMaxed] = useState47(false);
-  useEffect46(() => {
+  useEffect45(() => {
     setRecipientAddress(recipientAddressProp || "");
     setAmount("");
     setInputUnit("fiat");
     setSubmitError(null);
     setIsMaxed(false);
   }, [recipientAddressProp]);
-  useEffect46(() => {
+  useEffect45(() => {
     setIsMaxed(false);
   }, [balanceData?.balanceBaseUnit]);
   const trimmedAddress = recipientAddress.trim();
@@ -31855,7 +32018,7 @@ function WithdrawExecutionItem({ execution, onClick }) {
 }
 
 // src/components/withdrawals/WithdrawConfirmingView.tsx
-import { useState as useState48, useEffect as useEffect47 } from "react";
+import { useState as useState48, useEffect as useEffect46 } from "react";
 import { Fragment as Fragment19, jsx as jsx76, jsxs as jsxs66 } from "react/jsx-runtime";
 function truncateAddress4(addr) {
   if (addr.length <= 12) return addr;
@@ -31873,7 +32036,7 @@ function WithdrawConfirmingView({
   const t = strings.withdrawModal.details;
   const [showButton, setShowButton] = useState48(false);
   const latestExecution = executions.length > 0 ? executions[executions.length - 1] : null;
-  useEffect47(() => {
+  useEffect46(() => {
     if (latestExecution) return;
     const timer = setTimeout(() => setShowButton(true), SHOW_BUTTON_DELAY_MS);
     return () => clearTimeout(timer);
@@ -32035,7 +32198,7 @@ function WithdrawModal({
   );
   const onEventRef = useRef20(emitEvent);
   onEventRef.current = emitEvent;
-  useEffect48(
+  useEffect47(
     () => subscribe((event) => {
       if (event.properties?.flow_type !== "withdraw") return;
       const selection = selectionPayload(event);
@@ -32052,12 +32215,16 @@ function WithdrawModal({
   );
   const journeyActiveRef = useRef20(false);
   const journeySessionIdRef = useRef20(void 0);
+  const journeyExternalUserIdRef = useRef20(void 0);
   const onWithdrawSuccessFor = useCallback17(
     (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,
@@ -32078,6 +32245,7 @@ function WithdrawModal({
       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,
@@ -32099,7 +32267,7 @@ function WithdrawModal({
   const [resolvedTheme, setResolvedTheme] = useState49(
     theme === "auto" ? "dark" : theme
   );
-  useEffect48(() => {
+  useEffect47(() => {
     if (theme === "auto") {
       const mq = window.matchMedia("(prefers-color-scheme: dark)");
       setResolvedTheme(mq.matches ? "dark" : "light");
@@ -32151,6 +32319,7 @@ function WithdrawModal({
   ) ?? null : null;
   const [view, setView] = useState49("form");
   const [withdrawDepositWalletId, setWithdrawDepositWalletId] = useState49();
+  const withdrawDepositWalletIdRef = useRef20(void 0);
   const [selectedExecution, setSelectedExecution] = useState49(null);
   const [submittedTxInfo, setSubmittedTxInfo] = useState49(null);
   const { executions: realtimeExecutions } = useWithdrawPolling({
@@ -32188,6 +32357,7 @@ function WithdrawModal({
       if (!depositWallet) {
         throw new Error(`No deposit wallet available for ${sourceChainType}`);
       }
+      withdrawDepositWalletIdRef.current = depositWallet.id;
       setWithdrawDepositWalletId(depositWallet.id);
       return depositWallet;
     },
@@ -32207,7 +32377,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: generatePrefixedKSUID12("sevt"),
@@ -32241,8 +32416,10 @@ function WithdrawModal({
   const beginJourney = useCallback17(() => {
     journeySessionIdRef.current = startSession();
     journeyActiveRef.current = true;
+    journeyExternalUserIdRef.current = externalUserId;
+    setUserId(null);
     track("widget_opened", { flow_type: "withdraw" });
-  }, [startSession, track]);
+  }, [startSession, track, setUserId, externalUserId]);
   const handleClose = useCallback17(() => {
     finalizeJourney();
     onOpenChange(false);
@@ -32251,6 +32428,7 @@ function WithdrawModal({
       setView("form");
       setSelectedExecution(null);
       setSubmittedTxInfo(null);
+      withdrawDepositWalletIdRef.current = void 0;
       setWithdrawDepositWalletId(void 0);
       resetViewTimeoutRef.current = null;
     }, 200);
@@ -32268,9 +32446,15 @@ function WithdrawModal({
     setView("form");
     setSelectedExecution(null);
     setSubmittedTxInfo(null);
+    withdrawDepositWalletIdRef.current = void 0;
     setWithdrawDepositWalletId(void 0);
   }, [open]);
-  useEffect48(
+  useLayoutEffect4(() => {
+    if (!open || journeyExternalUserIdRef.current === externalUserId) return;
+    journeyExternalUserIdRef.current = externalUserId;
+    setUserId(null);
+  }, [open, externalUserId, setUserId]);
+  useEffect47(
     () => () => {
       if (journeyActiveRef.current) {
         journeyActiveRef.current = false;
@@ -32279,12 +32463,12 @@ function WithdrawModal({
     },
     [endSession, getSessionId]
   );
-  useEffect48(() => {
+  useEffect47(() => {
     if (!open) return;
     const screen = view === "detail" ? "tracker_detail" : view;
     track("screen_viewed", { flow_type: "withdraw", screen });
   }, [open, view, track]);
-  useEffect48(
+  useEffect47(
     () => () => {
       if (resetViewTimeoutRef.current) clearTimeout(resetViewTimeoutRef.current);
     },