@unifold/ui-react 0.1.77 → 0.1.79

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;
 }
 
@@ -5589,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"),
@@ -7090,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);
@@ -7224,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("");
@@ -7233,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
         );
@@ -7243,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");
@@ -7251,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;
@@ -7374,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;
@@ -7603,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"),
@@ -7653,6 +7734,7 @@ var BuyWithWalletPay = React8.forwardRef(
         defaultTokenLoading,
         defaultTokenError,
         depositWallet?.address,
+        depositWalletId,
         userEmail,
         publishableKey,
         onEvent,
@@ -8627,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",
@@ -8647,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,
@@ -8673,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
       ]
@@ -9321,23 +9405,7 @@ function PayWithExchange({
 // src/components/deposits/PayWithCashApp.tsx
 var import_react18 = require("react");
 var import_lucide_react13 = require("lucide-react");
-var import_core19 = require("@unifold/core");
-
-// src/hooks/use-cashapp-limits.ts
-var import_react_query9 = require("@tanstack/react-query");
 var import_core18 = require("@unifold/core");
-function useCashAppLimits({ publishableKey, currency = "usd" }) {
-  return (0, import_react_query9.useQuery)({
-    queryKey: ["unifold", "cashAppLimits", currency, publishableKey],
-    queryFn: () => (0, import_core18.getCashAppLimits)(currency, publishableKey),
-    enabled: !!publishableKey,
-    staleTime: 2 * 60 * 6e4,
-    gcTime: 4 * 60 * 6e4,
-    retry: 2
-  });
-}
-
-// src/components/deposits/PayWithCashApp.tsx
 var import_jsx_runtime20 = require("react/jsx-runtime");
 var POLL_INTERVAL_MS3 = 5e3;
 var FALLBACK_MIN_USD = 5;
@@ -9350,6 +9418,7 @@ function PayWithCashApp({
   destinationChainType,
   destinationChainId,
   destinationTokenAddress,
+  contractCalls,
   cashAppIconUrl,
   view: controlledView,
   onViewChange,
@@ -9373,9 +9442,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] = (0, import_react18.useState)(() => sanitizePrefilledUsd(prefilledAmountUsd));
   const [loading, setLoading] = (0, import_react18.useState)(false);
   const [session, setSession] = (0, import_react18.useState)(null);
@@ -9430,11 +9501,13 @@ function PayWithCashApp({
       setError(strings.depositModal.cashAppErrors.missingFields);
       return;
     }
+    const amountNum2 = parseFloat(amount);
+    if (isNaN(amountNum2) || amountNum2 < minUsd) return;
     setLoading(true);
     setError(null);
     try {
-      const externalId = (0, import_core19.generatePrefixedKSUID)("ca");
-      const result = await (0, import_core19.createCashAppSession)(
+      const externalId = (0, import_core18.generatePrefixedKSUID)("ca");
+      const result = await (0, import_core18.createCashAppSession)(
         {
           external_user_id: userId,
           destination_chain_type: destinationChainType,
@@ -9442,7 +9515,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
       );
@@ -9455,11 +9529,14 @@ 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"),
-        type: import_core19.DepositEventType.ONRAMP_SESSION_CREATED,
+        id: (0, import_core18.generatePrefixedKSUID)("sevt"),
+        type: import_core18.DepositEventType.ONRAMP_SESSION_CREATED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
         method: "cashapp",
@@ -9474,12 +9551,15 @@ function PayWithCashApp({
     }
   }, [
     amount,
+    minUsd,
     userId,
     publishableKey,
     recipientAddress,
     destinationChainType,
     destinationChainId,
     destinationTokenAddress,
+    contractCalls,
+    depositWalletId,
     onEvent,
     onDepositError,
     track,
@@ -9490,7 +9570,7 @@ function PayWithCashApp({
     if (status === "completed" || status === "failed") return;
     const poll = async () => {
       try {
-        const result = await (0, import_core19.getCashAppSessionStatus)(session.external_id, publishableKey);
+        const result = await (0, import_core18.getCashAppSessionStatus)(session.external_id, publishableKey);
         setStatus(result.status);
         if (result.status === "failed") {
           setError(strings.depositModal.cashAppErrors.paymentFailed);
@@ -9575,8 +9655,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__ */ (0, import_jsx_runtime20.jsxs)(
       "div",
@@ -9605,7 +9684,7 @@ function PayWithCashApp({
                 }
               }
             ) }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: "uf-flex uf-gap-3 uf-justify-center", children: SUGGESTED_AMOUNTS.map((quickAmount) => {
+            /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: "uf-flex uf-gap-3 uf-justify-center", children: quickAmounts.map((quickAmount) => {
               const isSelected = parseFloat(amount) === quickAmount;
               return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
                 "button",
@@ -9631,23 +9710,17 @@ function PayWithCashApp({
                 quickAmount
               );
             }) }),
-            amount && amountNum < minUsd && !error ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+            !limitsLoading && minUsd > 0 && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
               "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__ */ (0, import_jsx_runtime20.jsx)(
-              "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__ */ (0, import_jsx_runtime20.jsx)(
+            ),
+            error ? /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
               "div",
               {
                 className: "uf-text-sm uf-text-center uf-mt-3 uf-px-2",
@@ -9656,7 +9729,7 @@ function PayWithCashApp({
               }
             ) : null
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: "uf-px-1", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime20.jsx)("div", { className: "uf-px-1 uf-mt-5", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
             "button",
             {
               onClick: handleCreateSession,
@@ -9875,20 +9948,20 @@ function PayWithCashApp({
 // src/components/deposits/BankTransfer.tsx
 var import_react19 = require("react");
 var import_lucide_react14 = require("lucide-react");
-var import_core21 = require("@unifold/core");
+var import_core20 = require("@unifold/core");
 
 // src/hooks/use-bank-transfer-providers.ts
-var import_react_query10 = require("@tanstack/react-query");
-var import_core20 = require("@unifold/core");
+var import_react_query9 = require("@tanstack/react-query");
+var import_core19 = require("@unifold/core");
 function useBankTransferProviders({
   publishableKey,
   enabled = true,
   countryCode
 }) {
   const normalizedCountry = countryCode?.toUpperCase();
-  const { data: providers, isLoading } = (0, import_react_query10.useQuery)({
+  const { data: providers, isLoading } = (0, import_react_query9.useQuery)({
     queryKey: ["unifold", "bankTransferProviders", publishableKey, normalizedCountry ?? null],
-    queryFn: () => (0, import_core20.getBankTransferProviders)(publishableKey, { countryCode: normalizedCountry }),
+    queryFn: () => (0, import_core19.getBankTransferProviders)(publishableKey, { countryCode: normalizedCountry }),
     enabled,
     staleTime: 1e3 * 60 * 30,
     refetchOnMount: true,
@@ -9971,7 +10044,7 @@ function BankTransfer({
   const providers = providersResponse?.data ?? [];
   const pollingWalletId = (0, import_react19.useMemo)(() => {
     if (!defaultToken) return void 0;
-    return (0, import_core21.getWalletByChainType)(
+    return (0, import_core20.getWalletByChainType)(
       wallets,
       defaultToken.destination_token_metadata.chain_type
     )?.id;
@@ -10004,7 +10077,7 @@ function BankTransfer({
       let rate = sourceCurrency2 === "usd" ? 1 : fiatExchangeRates[sourceCurrency2];
       if ((!rate || rate <= 0) && sourceCurrency2 !== "usd") {
         try {
-          const response = await (0, import_core21.getFiatExchangeRates)({}, publishableKey);
+          const response = await (0, import_core20.getFiatExchangeRates)({}, publishableKey);
           if (response?.rates) {
             setFiatExchangeRates((prev) => ({
               ...prev,
@@ -10037,7 +10110,7 @@ function BankTransfer({
       setSessionError(strings.buyWithCard.errors.destinationTokenUnresolved);
       return;
     }
-    const wallet = (0, import_core21.getWalletByChainType)(
+    const wallet = (0, import_core20.getWalletByChainType)(
       wallets,
       defaultToken.destination_token_metadata.chain_type
     );
@@ -10086,18 +10159,21 @@ function BankTransfer({
     setView("pending");
   };
   const openSession = (request) => {
-    const externalId = (0, import_core21.generatePrefixedKSUID)("orsext");
+    const externalId = (0, import_core20.generatePrefixedKSUID)("orsext");
     const requestWithId = { ...request, external_id: externalId };
-    const sessionStartUrl = (0, import_core21.getOnrampSessionStartUrl)(requestWithId, publishableKey);
+    const sessionStartUrl = (0, import_core20.getOnrampSessionStartUrl)(requestWithId, publishableKey);
     track("flow_started", {
       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"),
-      type: import_core21.DepositEventType.ONRAMP_SESSION_CREATED,
+      id: (0, import_core20.generatePrefixedKSUID)("sevt"),
+      type: import_core20.DepositEventType.ONRAMP_SESSION_CREATED,
       created: Math.floor(Date.now() / 1e3),
       sessionId: getSessionId() ?? "",
       method: "bank_transfer",
@@ -10111,7 +10187,7 @@ function BankTransfer({
   };
   const offerable = providers.filter((provider) => provider.enabled);
   const noEnabledProviders = providers.length > 0 && offerable.length === 0;
-  const sourceCurrencyIcon = assetCdnUrl ? (0, import_core21.getIconUrlWithCdn)(`/icons/currencies/png/${sourceCurrency}.png`, assetCdnUrl) : void 0;
+  const sourceCurrencyIcon = assetCdnUrl ? (0, import_core20.getIconUrlWithCdn)(`/icons/currencies/png/${sourceCurrency}.png`, assetCdnUrl) : void 0;
   const onrampTokenIcon = defaultToken?.destination_token_metadata?.icon_url;
   const onrampChainIcon = defaultToken?.destination_token_metadata?.chain?.icon_url;
   const onrampTokenSymbol = defaultToken?.destination_token_metadata?.symbol?.toUpperCase() ?? "USDC";
@@ -10572,12 +10648,12 @@ function BankTransfer({
 
 // src/components/deposits/DepositExecutionItem.tsx
 var import_lucide_react15 = require("lucide-react");
-var import_core22 = require("@unifold/core");
+var import_core21 = require("@unifold/core");
 var import_jsx_runtime22 = require("react/jsx-runtime");
 function DepositExecutionItem({ execution, onClick }) {
   const { colors: colors2, fonts, components } = useTheme();
   const { t: strings, locale } = useI18n();
-  const isPending = execution.status === import_core22.ExecutionStatus.PENDING || execution.status === import_core22.ExecutionStatus.WAITING || execution.status === import_core22.ExecutionStatus.DELAYED;
+  const isPending = execution.status === import_core21.ExecutionStatus.PENDING || execution.status === import_core21.ExecutionStatus.WAITING || execution.status === import_core21.ExecutionStatus.DELAYED;
   const formatDateTime = (timestamp) => {
     try {
       const date = new Date(timestamp);
@@ -10624,7 +10700,7 @@ function DepositExecutionItem({ execution, onClick }) {
           /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
             "img",
             {
-              src: execution.destination_token_metadata?.icon_url || (0, import_core22.getIconUrl)("/icons/tokens/svg/usdc.svg"),
+              src: execution.destination_token_metadata?.icon_url || (0, import_core21.getIconUrl)("/icons/tokens/svg/usdc.svg"),
               alt: "Token",
               width: 36,
               height: 36,
@@ -11637,7 +11713,7 @@ function BankTransferButton({
 // src/components/deposits/buttons/BrowserWalletButton.tsx
 var React33 = __toESM(require("react"));
 var import_lucide_react25 = require("lucide-react");
-var import_core23 = require("@unifold/core");
+var import_core22 = require("@unifold/core");
 
 // src/lib/eip6963-store.ts
 var import_mipd = require("mipd");
@@ -14127,7 +14203,7 @@ function BrowserWalletButton({
     let cancelled = false;
     const walletChainType = wallet.type === "phantom-solana" || wallet.type === "solflare" || wallet.type === "backpack" || wallet.type === "glow" ? "solana" : "ethereum";
     setIsLoadingBalance(true);
-    (0, import_core23.getAddressBalances)(wallet.address, walletChainType, publishableKey).then((response) => {
+    (0, import_core22.getAddressBalances)(wallet.address, walletChainType, publishableKey).then((response) => {
       if (cancelled) return;
       if (response.balances && response.balances.length > 0) {
         const totalUsd = response.balances.reduce((sum, balance) => {
@@ -14693,7 +14769,7 @@ function capitalize(s) {
 }
 
 // src/components/deposits/stripe-link/PayWithStripeLink.tsx
-var import_core24 = require("@unifold/core");
+var import_core23 = require("@unifold/core");
 
 // src/components/deposits/stripe-link/use-stripe-onramp.ts
 var import_react20 = require("react");
@@ -14851,7 +14927,7 @@ var STRIPE_SESSION_STATUS = {
 var STRIPE_SESSION_POLL_INTERVAL_MS = 3e3;
 var STRIPE_CONSUMED_PAYMENT_METHOD_CODE = "payment_method_unexpected_state";
 function isConsumedPaymentMethodError(err) {
-  return err instanceof import_core24.StripeApiResponseError && (err.errorType === "stripe_onramp_payment_method_consumed" || err.stripeCode === STRIPE_CONSUMED_PAYMENT_METHOD_CODE);
+  return err instanceof import_core23.StripeApiResponseError && (err.errorType === "stripe_onramp_payment_method_consumed" || err.stripeCode === STRIPE_CONSUMED_PAYMENT_METHOD_CODE);
 }
 function describeStripePaymentFailure(reason) {
   if (!reason) return null;
@@ -15009,7 +15085,7 @@ function PayWithStripeLink({
     let active = true;
     const fetchConfig = async () => {
       try {
-        const cfg = await (0, import_core24.stripeGetConfig)(publishableKey);
+        const cfg = await (0, import_core23.stripeGetConfig)(publishableKey);
         if (active && cfg.publishable_key) setResolvedStripeKey(cfg.publishable_key);
         else if (active) {
           console.error("[PayWithStripeLink] Config response missing publishable_key");
@@ -15031,7 +15107,7 @@ function PayWithStripeLink({
     let active = true;
     const retryConfig = async () => {
       try {
-        const cfg = await (0, import_core24.stripeGetConfig)(publishableKey);
+        const cfg = await (0, import_core23.stripeGetConfig)(publishableKey);
         if (active && cfg.publishable_key) setResolvedStripeKey(cfg.publishable_key);
       } catch (err) {
         const msg = err instanceof Error ? err.message : t.formErrors.configLoadFailed;
@@ -15097,7 +15173,7 @@ function PayWithStripeLink({
     if (!rt) return null;
     const doRefresh = async () => {
       try {
-        const res = await (0, import_core24.stripeRefreshToken)(rt, publishableKey);
+        const res = await (0, import_core23.stripeRefreshToken)(rt, publishableKey);
         const newToken = res.access_token;
         const newRefresh = extractRefreshToken(res) || rt;
         setOauthToken(newToken);
@@ -15131,7 +15207,7 @@ function PayWithStripeLink({
       try {
         return await fn(token);
       } catch (err) {
-        const is403 = err instanceof import_core24.StripeApiResponseError && err.statusCode === 403 || err instanceof Error && (err.message.includes("403") || err.message.toLowerCase().includes("forbidden"));
+        const is403 = err instanceof import_core23.StripeApiResponseError && err.statusCode === 403 || err instanceof Error && (err.message.includes("403") || err.message.toLowerCase().includes("forbidden"));
         if (is403) {
           if (!refreshTokenRef.current) {
             setStep("email");
@@ -15166,7 +15242,7 @@ function PayWithStripeLink({
           return;
         }
         try {
-          const res = await (0, import_core24.stripeRefreshToken)(stored.refreshToken, publishableKey);
+          const res = await (0, import_core23.stripeRefreshToken)(stored.refreshToken, publishableKey);
           if (cancelled) return;
           token = res.access_token;
           refresh = extractRefreshToken(res) || stored.refreshToken;
@@ -15189,7 +15265,7 @@ function PayWithStripeLink({
       refreshTokenRef.current = refresh;
       if (stored.email) setEmail(stored.email);
       try {
-        const cust = await (0, import_core24.stripeGetCustomer)(stored.customerId, token, publishableKey);
+        const cust = await (0, import_core23.stripeGetCustomer)(stored.customerId, token, publishableKey);
         if (cancelled) return;
         setCustomer(cust);
         const tiers = cust.kyc_tiers ?? [];
@@ -15198,7 +15274,7 @@ function PayWithStripeLink({
         const hasPending = ["l0", "l1", "l2"].some((t2) => getTierStatus(t2) === "pending");
         if (l1Status === "verified" && !hasPending) {
           try {
-            const pmResult = await (0, import_core24.stripeListPaymentTokens)(
+            const pmResult = await (0, import_core23.stripeListPaymentTokens)(
               stored.customerId,
               token,
               publishableKey
@@ -15358,7 +15434,7 @@ function PayWithStripeLink({
   (0, import_react21.useEffect)(() => {
     if (!destinationTokenAddress || !destinationChainId || !destinationChainType) return;
     let cancelled = false;
-    (0, import_core24.stripeGetDefaultToken)(
+    (0, import_core23.stripeGetDefaultToken)(
       {
         tokenAddress: destinationTokenAddress,
         chainId: destinationChainId,
@@ -15428,7 +15504,7 @@ function PayWithStripeLink({
     enabled: !externalWallets?.length
   });
   const depositWallets = externalWallets?.length ? externalWallets : depositAddressResponse?.data ?? [];
-  const onrampWalletAddress = (0, import_core24.getWalletByChainType)(depositWallets, stripeDestChainType)?.address;
+  const onrampWalletAddress = (0, import_core23.getWalletByChainType)(depositWallets, stripeDestChainType)?.address;
   const [registeredWalletKey, setRegisteredWalletKey] = (0, import_react21.useState)(null);
   const walletKeyFor = (address) => `${stripeDestNetwork}:${stripeDestChainType === "ethereum" ? address.toLowerCase() : address}`;
   const isOnrampWalletRegistered = !!onrampWalletAddress && registeredWalletKey === walletKeyFor(onrampWalletAddress);
@@ -15441,7 +15517,7 @@ function PayWithStripeLink({
       );
     }
   }, [depositWallets, onrampWalletAddress, stripeDestChainType]);
-  const depositWalletId = (0, import_core24.getWalletByChainType)(depositWallets, stripeDestChainType)?.id;
+  const depositWalletId = (0, import_core23.getWalletByChainType)(depositWallets, stripeDestChainType)?.id;
   const depositPollingActive = step === "checkout" || step === "success";
   const { executions } = useDepositPolling({
     userId,
@@ -15468,7 +15544,7 @@ function PayWithStripeLink({
     executionReconciledSessionRef.current = confirmedSessionId;
     handledTerminalSessionRef.current = confirmedSessionId;
     let cancelled = false;
-    void withTokenRefresh((tok) => (0, import_core24.stripeGetSession)(confirmedSessionId, tok, publishableKey)).then((session) => {
+    void withTokenRefresh((tok) => (0, import_core23.stripeGetSession)(confirmedSessionId, tok, publishableKey)).then((session) => {
       if (cancelled) return;
       setSessionStatus(
         session.status === STRIPE_SESSION_STATUS.REJECTED || session.status === STRIPE_SESSION_STATUS.EXPIRED ? session.status : STRIPE_SESSION_STATUS.FULFILLMENT_COMPLETE
@@ -15494,7 +15570,7 @@ function PayWithStripeLink({
     const poll = async () => {
       try {
         const session = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeGetSession)(confirmedSessionId, tok, publishableKey)
+          (tok) => (0, import_core23.stripeGetSession)(confirmedSessionId, tok, publishableKey)
         );
         if (cancelled) return;
         setSessionStatus(session.status);
@@ -15533,7 +15609,7 @@ function PayWithStripeLink({
     setLoading(true);
     setError(null);
     try {
-      const result = await (0, import_core24.stripeCreateAuthIntent)(emailToUse.trim(), publishableKey);
+      const result = await (0, import_core23.stripeCreateAuthIntent)(emailToUse.trim(), publishableKey);
       setAuthIntentId(result.auth_intent_id);
       setStep("auth");
     } catch (err) {
@@ -15567,7 +15643,7 @@ function PayWithStripeLink({
       }
       const formattedPhone = `+1${digits}`;
       await sdk.registerLinkUser(email.trim(), formattedPhone, "US");
-      const result = await (0, import_core24.stripeCreateAuthIntent)(email.trim(), publishableKey);
+      const result = await (0, import_core23.stripeCreateAuthIntent)(email.trim(), publishableKey);
       setAuthIntentId(result.auth_intent_id);
       setStep("auth");
     } catch (err) {
@@ -15610,7 +15686,7 @@ function PayWithStripeLink({
       return;
     }
     try {
-      const authResult = await (0, import_core24.stripeCreateAuthIntent)(knownEmail, publishableKey);
+      const authResult = await (0, import_core23.stripeCreateAuthIntent)(knownEmail, publishableKey);
       setAuthIntentId(authResult.auth_intent_id);
       setStep("auth");
     } catch (err) {
@@ -15637,7 +15713,7 @@ function PayWithStripeLink({
             setCustomerId(result.crypto_customer_id);
             sdkAuthenticatedRef.current = true;
             everAuthenticatedRef.current = true;
-            const tokens = await (0, import_core24.stripeExchangeTokens)(
+            const tokens = await (0, import_core23.stripeExchangeTokens)(
               authIntentId,
               publishableKey,
               result.crypto_customer_id
@@ -15715,7 +15791,7 @@ function PayWithStripeLink({
       }
       try {
         const cust = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeGetCustomer)(customerId, tok, publishableKey)
+          (tok) => (0, import_core23.stripeGetCustomer)(customerId, tok, publishableKey)
         );
         if (!mounted) return;
         setCustomer(cust);
@@ -15914,7 +15990,7 @@ function PayWithStripeLink({
       try {
         if (!onrampWalletAddress) return;
         const existingWallets = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeListWallets)(customerId, tok, publishableKey)
+          (tok) => (0, import_core23.stripeListWallets)(customerId, tok, publishableKey)
         );
         if (!mounted) return;
         setWallets(existingWallets.data);
@@ -15974,7 +16050,7 @@ function PayWithStripeLink({
           return isEvm ? a.toLowerCase() === b.toLowerCase() : a === b;
         };
         const list = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeListWallets)(customerId, tok, publishableKey)
+          (tok) => (0, import_core23.stripeListWallets)(customerId, tok, publishableKey)
         );
         if (cancelled) return;
         setWallets(list.data);
@@ -16024,7 +16100,7 @@ function PayWithStripeLink({
       setLoading(true);
       try {
         const existing = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeListPaymentTokens)(customerId, tok, publishableKey)
+          (tok) => (0, import_core23.stripeListPaymentTokens)(customerId, tok, publishableKey)
         );
         if (!mounted) return;
         setPaymentTokens(existing.data);
@@ -16044,7 +16120,7 @@ function PayWithStripeLink({
               try {
                 const sdk = await initialize();
                 if (!sdk) throw new Error("SDK failed to load");
-                const authResult = await (0, import_core24.stripeCreateAuthIntent)(email, publishableKey);
+                const authResult = await (0, import_core23.stripeCreateAuthIntent)(email, publishableKey);
                 if (!mounted) return;
                 setAuthIntentId(authResult.auth_intent_id);
                 setStep("auth");
@@ -16095,7 +16171,7 @@ function PayWithStripeLink({
         if (!sdkAuthenticatedRef.current) {
           if (email) {
             pendingAddPaymentRef.current = true;
-            const authResult = await (0, import_core24.stripeCreateAuthIntent)(email, publishableKey);
+            const authResult = await (0, import_core23.stripeCreateAuthIntent)(email, publishableKey);
             if (!mounted) return;
             setAuthIntentId(authResult.auth_intent_id);
             setStep("auth");
@@ -16130,7 +16206,7 @@ function PayWithStripeLink({
             if (display) {
               applyAndAdvance();
               if (customerId && accessTokenRef.current) {
-                (0, import_core24.stripeListPaymentTokens)(customerId, accessTokenRef.current, publishableKey).then((tokens) => {
+                (0, import_core23.stripeListPaymentTokens)(customerId, accessTokenRef.current, publishableKey).then((tokens) => {
                   if (mounted) setPaymentTokens(tokens.data);
                 }).catch(() => {
                 });
@@ -16139,7 +16215,7 @@ function PayWithStripeLink({
             }
             try {
               if (customerId && accessTokenRef.current) {
-                const tokens = await (0, import_core24.stripeListPaymentTokens)(
+                const tokens = await (0, import_core23.stripeListPaymentTokens)(
                   customerId,
                   accessTokenRef.current,
                   publishableKey
@@ -16200,10 +16276,10 @@ function PayWithStripeLink({
       setRequiredStepUp(tier ?? null);
       setStep("amount");
       if (customerId && onrampWalletAddress) {
-        void withTokenRefresh((tok) => (0, import_core24.stripeGetCustomer)(customerId, tok, publishableKey)).then((cust) => setCustomer(cust)).catch(() => {
+        void withTokenRefresh((tok) => (0, import_core23.stripeGetCustomer)(customerId, tok, publishableKey)).then((cust) => setCustomer(cust)).catch(() => {
         });
         void withTokenRefresh(
-          (tok) => (0, import_core24.stripeGetTransactionLimits)(
+          (tok) => (0, import_core23.stripeGetTransactionLimits)(
             {
               cryptoCustomerId: customerId,
               destinationNetwork: getStripeNetwork(),
@@ -16264,13 +16340,13 @@ function PayWithStripeLink({
         return coordinator.performCheckout(sid, async (onrampSessionId) => {
           try {
             await withTokenRefresh(
-              (tok) => (0, import_core24.stripeRefreshQuote)(onrampSessionId, tok, publishableKey)
+              (tok) => (0, import_core23.stripeRefreshQuote)(onrampSessionId, tok, publishableKey)
             );
           } catch {
           }
           try {
             const confirmResponse = await withTokenRefresh(
-              (tok) => (0, import_core24.stripeConfirmSession)(onrampSessionId, tok, {}, publishableKey)
+              (tok) => (0, import_core23.stripeConfirmSession)(onrampSessionId, tok, {}, publishableKey)
             );
             lastConfirmError = null;
             return confirmResponse.client_secret ?? "";
@@ -16282,13 +16358,13 @@ function PayWithStripeLink({
       };
       const lastErrorFor = async (sid) => {
         const sessionState = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeGetSession)(sid, tok, publishableKey)
+          (tok) => (0, import_core23.stripeGetSession)(sid, tok, publishableKey)
         );
         return sessionState.transaction_details?.last_error ?? null;
       };
       const createFreshSession = async () => {
         const fresh = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeCreateSession)(
+          (tok) => (0, import_core23.stripeCreateSession)(
             {
               cryptoCustomerId: customerId,
               paymentToken: selectedPaymentToken,
@@ -16333,7 +16409,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();
@@ -16356,7 +16436,7 @@ function PayWithStripeLink({
       } else if (isConsumedPaymentMethodError(lastConfirmError)) {
         dropConsumedToken(CONSUMED_TOKEN_MESSAGE, lastConfirmError);
       } else {
-        const confirmErr = lastConfirmError instanceof import_core24.StripeApiResponseError ? lastConfirmError : void 0;
+        const confirmErr = lastConfirmError instanceof import_core23.StripeApiResponseError ? lastConfirmError : void 0;
         const reason = describeStripePaymentFailure(lastError) ?? describeStripePaymentFailure(confirmErr?.stripeCode) ?? unmappedPaymentFailureMessage(confirmErr?.stripeMessage);
         if (!isRetriablePaymentToken(selectedPaymentToken)) {
           dropConsumedToken(reason, lastConfirmError ?? void 0);
@@ -16374,7 +16454,7 @@ function PayWithStripeLink({
       }
     } catch (err) {
       if (isStale()) return;
-      const stripeErr = lastConfirmError instanceof import_core24.StripeApiResponseError ? lastConfirmError : err instanceof import_core24.StripeApiResponseError ? err : void 0;
+      const stripeErr = lastConfirmError instanceof import_core23.StripeApiResponseError ? lastConfirmError : err instanceof import_core23.StripeApiResponseError ? err : void 0;
       const effectiveError = stripeErr ?? err;
       const msg = stripeErr?.message ?? (err instanceof Error ? err.message : t.formErrors.checkoutFailed);
       const errorType = stripeErr?.errorType;
@@ -16422,7 +16502,7 @@ function PayWithStripeLink({
     if (!customerId) return;
     try {
       const existing = await withTokenRefresh(
-        (tok) => (0, import_core24.stripeListPaymentTokens)(customerId, tok, publishableKey)
+        (tok) => (0, import_core23.stripeListPaymentTokens)(customerId, tok, publishableKey)
       );
       setPaymentTokens(existing.data);
       const stored = getStoredSelectedToken(customerId);
@@ -16459,7 +16539,7 @@ function PayWithStripeLink({
     const fetchLimits = async () => {
       try {
         const result = await withTokenRefresh(
-          (tok) => (0, import_core24.stripeGetTransactionLimits)(
+          (tok) => (0, import_core23.stripeGetTransactionLimits)(
             {
               cryptoCustomerId: customerId,
               destinationNetwork: getStripeNetwork(),
@@ -16535,8 +16615,8 @@ function PayWithStripeLink({
           const canRefreshExisting = step === "review" && existing != null && existing.amount === amount && existing.paymentToken === selectedPaymentToken && // Never refresh (and thereby reuse) a session already checked out —
           // its PaymentIntent is spent. Build a fresh one instead.
           !spentSessionIdsRef.current.has(existing.id);
-          const session = canRefreshExisting ? await withTokenRefresh((tok) => (0, import_core24.stripeRefreshQuote)(existing.id, tok, publishableKey)) : await withTokenRefresh(
-            (tok) => (0, import_core24.stripeCreateSession)(
+          const session = canRefreshExisting ? await withTokenRefresh((tok) => (0, import_core23.stripeRefreshQuote)(existing.id, tok, publishableKey)) : await withTokenRefresh(
+            (tok) => (0, import_core23.stripeCreateSession)(
               {
                 cryptoCustomerId: customerId,
                 paymentToken: selectedPaymentToken,
@@ -16578,7 +16658,7 @@ function PayWithStripeLink({
           }
         } else {
           setSessionForCheckout(null);
-          const result = await (0, import_core24.stripeGetQuotes)(
+          const result = await (0, import_core23.stripeGetQuotes)(
             {
               sourceAmount: amount,
               sourceCurrency: "usd",
@@ -16606,7 +16686,7 @@ function PayWithStripeLink({
         if (!active) return;
         setQuote(null);
         setSessionForCheckout(null);
-        const qErrorType = err instanceof import_core24.StripeApiResponseError ? err.errorType : void 0;
+        const qErrorType = err instanceof import_core23.StripeApiResponseError ? err.errorType : void 0;
         if (qErrorType === "stripe_onramp_missing_document_verification") {
           setLimitReachedAmount(num);
           setRequiredStepUp("l2");
@@ -17830,7 +17910,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" }
+            }
+          )
         ]
       }
     );
@@ -18382,11 +18469,11 @@ function PayWithStripeLink({
 // src/components/deposits/CoinbaseConnect.tsx
 var import_react22 = require("react");
 var import_lucide_react29 = require("lucide-react");
-var import_core27 = require("@unifold/core");
+var import_core26 = require("@unifold/core");
 
 // src/hooks/use-project-config.ts
-var import_react_query11 = require("@tanstack/react-query");
-var import_core25 = require("@unifold/core");
+var import_react_query10 = require("@tanstack/react-query");
+var import_core24 = require("@unifold/core");
 function useProjectConfig({
   publishableKey,
   enabled = true,
@@ -18397,17 +18484,17 @@ function useProjectConfig({
     data: projectConfig,
     isLoading,
     error
-  } = (0, import_react_query11.useQuery)({
+  } = (0, import_react_query10.useQuery)({
     // 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.
     queryKey: countryCode ? ["unifold", "projectConfig", publishableKey, countryCode, subdivisionCode ?? null] : ["unifold", "projectConfig", publishableKey],
-    queryFn: () => (0, import_core25.getProjectConfig)(publishableKey, countryCode ? { countryCode, subdivisionCode } : void 0),
+    queryFn: () => (0, import_core24.getProjectConfig)(publishableKey, countryCode ? { countryCode, subdivisionCode } : void 0),
     enabled,
     // Keep the previous (e.g. no-country) config visible while the region-aware
     // config refetches after the country resolves, so unrelated config-driven
     // UI doesn't flash back to defaults.
-    placeholderData: import_react_query11.keepPreviousData,
+    placeholderData: import_react_query10.keepPreviousData,
     staleTime: 1e3 * 60 * 30,
     refetchOnMount: true,
     refetchOnWindowFocus: true
@@ -18416,14 +18503,14 @@ function useProjectConfig({
 }
 
 // src/hooks/use-integration-transfer-default-token.ts
-var import_react_query12 = require("@tanstack/react-query");
-var import_core26 = require("@unifold/core");
+var import_react_query11 = require("@tanstack/react-query");
+var import_core25 = require("@unifold/core");
 function useIntegrationTransferDefaultToken({
   params,
   publishableKey,
   enabled = true
 }) {
-  return (0, import_react_query12.useQuery)({
+  return (0, import_react_query11.useQuery)({
     queryKey: [
       "unifold",
       "integrationTransferDefaultToken",
@@ -18436,7 +18523,7 @@ function useIntegrationTransferDefaultToken({
       params?.country_code ?? null,
       params?.subdivision_code ?? null
     ],
-    queryFn: () => (0, import_core26.getIntegrationTransferDefaultToken)(params, publishableKey),
+    queryFn: () => (0, import_core25.getIntegrationTransferDefaultToken)(params, publishableKey),
     enabled: enabled && !!params,
     staleTime: 1e3 * 60 * 5,
     gcTime: 1e3 * 60 * 30,
@@ -18540,7 +18627,7 @@ function CoinbaseConnect({
   const appName = projectConfig?.project_name ?? "Unifold";
   const { t: strings } = useI18n();
   const t = strings.connectExchange;
-  const initialView = skipToHoldings && getStoredIntegrationToken(import_core27.IntegrationProvider.COINBASE) ? "holdings" : "select_exchange";
+  const initialView = skipToHoldings && getStoredIntegrationToken(import_core26.IntegrationProvider.COINBASE) ? "holdings" : "select_exchange";
   const [view, setView] = (0, import_react22.useState)(initialView);
   const [prevView, setPrevView] = (0, import_react22.useState)(initialView);
   const [isTransitioning, setIsTransitioning] = (0, import_react22.useState)(false);
@@ -18576,7 +18663,7 @@ function CoinbaseConnect({
   }, [selectedExchange]);
   const defaultTokenParams = (0, import_react22.useMemo)(
     () => selectedAsset ? {
-      integration_provider: import_core27.IntegrationProvider.COINBASE,
+      integration_provider: import_core26.IntegrationProvider.COINBASE,
       source_currency: selectedAsset.currency.toLowerCase(),
       destination_token_address: destinationTokenAddress,
       destination_chain_id: destinationChainId,
@@ -18697,16 +18784,16 @@ function CoinbaseConnect({
   const tryRefreshToken = (0, import_react22.useCallback)(
     async (currentToken) => {
       try {
-        const result = await (0, import_core27.refreshIntegrationToken)(currentToken, publishableKey);
+        const result = await (0, import_core26.refreshIntegrationToken)(currentToken, publishableKey);
         setStoredIntegrationToken({
-          integration_provider: import_core27.IntegrationProvider.COINBASE,
+          integration_provider: import_core26.IntegrationProvider.COINBASE,
           access_token: result.access_token,
           expires_at: result.expires_at
         });
         setAccessToken(result.access_token);
         return result.access_token;
       } catch {
-        clearStoredIntegrationToken(import_core27.IntegrationProvider.COINBASE);
+        clearStoredIntegrationToken(import_core26.IntegrationProvider.COINBASE);
         setAccessToken(null);
         return null;
       }
@@ -18714,7 +18801,7 @@ function CoinbaseConnect({
     [publishableKey]
   );
   (0, import_react22.useEffect)(() => {
-    const stored = getStoredIntegrationToken(import_core27.IntegrationProvider.COINBASE);
+    const stored = getStoredIntegrationToken(import_core26.IntegrationProvider.COINBASE);
     if (stored) {
       setAccessToken(stored.access_token);
       if (skipToHoldings) {
@@ -18726,7 +18813,7 @@ function CoinbaseConnect({
   const userSubdivisionCode = userIpInfo?.subdivisionCode ?? void 0;
   (0, import_react22.useEffect)(() => {
     let cancelled = false;
-    (0, import_core27.getIntegrationExchanges)(
+    (0, import_core26.getIntegrationExchanges)(
       publishableKey,
       userCountryCode ? {
         country_code: userCountryCode,
@@ -18739,7 +18826,7 @@ function CoinbaseConnect({
         if (prev) {
           return res.data.find((e) => e.service_provider === prev.service_provider) ?? prev;
         }
-        return res.data.find((e) => e.service_provider === import_core27.IntegrationProvider.COINBASE) ?? null;
+        return res.data.find((e) => e.service_provider === import_core26.IntegrationProvider.COINBASE) ?? null;
       });
     }).catch(() => {
     }).finally(() => {
@@ -18753,8 +18840,8 @@ function CoinbaseConnect({
     async (token) => {
       setIsLoading(true);
       try {
-        const result = await (0, import_core27.getIntegrationHoldings)(
-          import_core27.IntegrationProvider.COINBASE,
+        const result = await (0, import_core26.getIntegrationHoldings)(
+          import_core26.IntegrationProvider.COINBASE,
           token,
           publishableKey
         );
@@ -18771,8 +18858,8 @@ function CoinbaseConnect({
         const refreshed = await tryRefreshToken(token);
         if (refreshed) {
           try {
-            const retryResult = await (0, import_core27.getIntegrationHoldings)(
-              import_core27.IntegrationProvider.COINBASE,
+            const retryResult = await (0, import_core26.getIntegrationHoldings)(
+              import_core26.IntegrationProvider.COINBASE,
               refreshed,
               publishableKey
             );
@@ -18789,12 +18876,12 @@ function CoinbaseConnect({
             retryFailed = true;
           }
         }
-        clearStoredIntegrationToken(import_core27.IntegrationProvider.COINBASE);
+        clearStoredIntegrationToken(import_core26.IntegrationProvider.COINBASE);
         setAccessToken(null);
         track("account_connection_failed", {
           flow_type: "deposit",
           method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
+          provider: import_core26.IntegrationProvider.COINBASE,
           failure_reason: retryFailed ? "holdings_unavailable" : "token_refresh_failed"
         });
         transitionTo("select_exchange");
@@ -18870,7 +18957,7 @@ function CoinbaseConnect({
       ...userIpInfo?.subdivisionCode ? { subdivision_code: userIpInfo.subdivisionCode } : {}
     };
     setRedirectSession({ exchange, requestParams });
-    window.open((0, import_core27.getIntegrationExchangeSessionStartUrl)(requestParams, publishableKey), "_blank");
+    window.open((0, import_core26.getIntegrationExchangeSessionStartUrl)(requestParams, publishableKey), "_blank");
     transitionTo("redirect_pending");
   };
   const handleCreateRedirectTransferSession = async () => {
@@ -18881,7 +18968,7 @@ function CoinbaseConnect({
     if (redirectMinDepositUsd > 0 && amountNum < redirectMinDepositUsd) return;
     setIsLoading(true);
     try {
-      const result = await (0, import_core27.createIntegrationExchangeSession)(
+      const result = await (0, import_core26.createIntegrationExchangeSession)(
         {
           service_provider: exchange.service_provider,
           wallet_addresses: [{ address: wallet.address, chain_type: wallet.chain_type }],
@@ -18915,7 +19002,7 @@ function CoinbaseConnect({
   const handleReopenRedirectExchange = () => {
     if (!redirectSession?.requestParams) return;
     window.open(
-      (0, import_core27.getIntegrationExchangeSessionStartUrl)(redirectSession.requestParams, publishableKey),
+      (0, import_core26.getIntegrationExchangeSessionStartUrl)(redirectSession.requestParams, publishableKey),
       "_blank"
     );
   };
@@ -18932,7 +19019,7 @@ function CoinbaseConnect({
     const externalId = redirectSession.externalId;
     const poll = async () => {
       try {
-        const result = await (0, import_core27.getOnrampSessionStatus)(externalId, publishableKey);
+        const result = await (0, import_core26.getOnrampSessionStatus)(externalId, publishableKey);
         setRedirectStatus(result.status);
         if (result.status === "failed") {
           setErrorMessage("Payment failed");
@@ -18962,8 +19049,8 @@ function CoinbaseConnect({
       handleOpenRedirectExchange(exchange);
       return;
     }
-    if (exchange.service_provider === import_core27.IntegrationProvider.COINBASE) {
-      const stored = getStoredIntegrationToken(import_core27.IntegrationProvider.COINBASE);
+    if (exchange.service_provider === import_core26.IntegrationProvider.COINBASE) {
+      const stored = getStoredIntegrationToken(import_core26.IntegrationProvider.COINBASE);
       if (stored) {
         setAccessToken(stored.access_token);
         connectingReasonRef.current = "holdings";
@@ -18981,20 +19068,20 @@ function CoinbaseConnect({
     track("account_connection_started", {
       flow_type: "deposit",
       method: "exchange_connect",
-      provider: import_core27.IntegrationProvider.COINBASE
+      provider: import_core26.IntegrationProvider.COINBASE
     });
     try {
-      const { redirect_url, state } = await (0, import_core27.startIntegrationOAuth)(publishableKey);
+      const { redirect_url, state } = await (0, import_core26.startIntegrationOAuth)(publishableKey);
       popupRef.current = window.open(redirect_url, "_blank", "width=500,height=700");
       pollRef.current = setInterval(async () => {
         try {
-          const result = await (0, import_core27.authenticateIntegrationOAuth)({ state }, publishableKey);
+          const result = await (0, import_core26.authenticateIntegrationOAuth)({ state }, publishableKey);
           if (result.status === "completed") {
             if (pollRef.current) clearInterval(pollRef.current);
             pollRef.current = null;
             if (oauthAbandonedRef.current || viewRef.current !== "connecting") return;
             setStoredIntegrationToken({
-              integration_provider: import_core27.IntegrationProvider.COINBASE,
+              integration_provider: import_core26.IntegrationProvider.COINBASE,
               access_token: result.access_token,
               expires_at: result.expires_at
             });
@@ -19002,7 +19089,7 @@ function CoinbaseConnect({
             track("account_connected", {
               flow_type: "deposit",
               method: "exchange_connect",
-              provider: import_core27.IntegrationProvider.COINBASE
+              provider: import_core26.IntegrationProvider.COINBASE
             });
             transitionTo("connected");
           }
@@ -19014,7 +19101,7 @@ function CoinbaseConnect({
       track("account_connection_failed", {
         flow_type: "deposit",
         method: "exchange_connect",
-        provider: import_core27.IntegrationProvider.COINBASE,
+        provider: import_core26.IntegrationProvider.COINBASE,
         failure_reason: "oauth_start_failed",
         error_code: message
       });
@@ -19060,9 +19147,9 @@ function CoinbaseConnect({
       if (matchingWallet?.id) {
         setTransferDepositWalletId(matchingWallet.id);
       }
-      const createTransfer = async (token) => (0, import_core27.createIntegrationTransfer)(
+      const createTransfer = async (token) => (0, import_core26.createIntegrationTransfer)(
         {
-          integration_provider: import_core27.IntegrationProvider.COINBASE,
+          integration_provider: import_core26.IntegrationProvider.COINBASE,
           access_token: token,
           currency: selectedAsset.currency.toLowerCase(),
           amount: cryptoAmount,
@@ -19087,7 +19174,7 @@ function CoinbaseConnect({
           track("account_connection_failed", {
             flow_type: "deposit",
             method: "exchange_connect",
-            provider: import_core27.IntegrationProvider.COINBASE,
+            provider: import_core26.IntegrationProvider.COINBASE,
             failure_reason: "token_refresh_failed"
           });
           throw new Error("Session expired. Please reconnect your exchange.");
@@ -19105,12 +19192,15 @@ function CoinbaseConnect({
       setIsLoading(false);
     }
   };
-  const transferErrorType = (err) => err instanceof import_core27.IntegrationTransferError ? err.errorType : void 0;
+  const transferErrorType = (err) => err instanceof import_core26.IntegrationTransferError ? err.errorType : void 0;
   const trackTransferStarted = () => {
     track("flow_started", {
       flow_type: "deposit",
       method: "exchange_connect",
-      provider: import_core27.IntegrationProvider.COINBASE,
+      provider: import_core26.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,
@@ -19118,13 +19208,41 @@ function CoinbaseConnect({
       network: sourceChain?.network
     });
   };
+  const applyConfirmResult = (result) => {
+    if (result.status === "mfa_required") {
+      track("verification_started", {
+        flow_type: "deposit",
+        method: "exchange_connect",
+        provider: import_core26.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);
     let sessionExpired = false;
     try {
       let token = accessToken;
-      const result = await (0, import_core27.confirmIntegrationTransfer)(
+      const result = await (0, import_core26.confirmIntegrationTransfer)(
         transferIntent.id,
         token,
         void 0,
@@ -19136,7 +19254,7 @@ function CoinbaseConnect({
         const refreshed = await tryRefreshToken(token);
         if (refreshed) {
           token = refreshed;
-          return (0, import_core27.confirmIntegrationTransfer)(
+          return (0, import_core26.confirmIntegrationTransfer)(
             transferIntent.id,
             refreshed,
             void 0,
@@ -19147,35 +19265,12 @@ function CoinbaseConnect({
         track("account_connection_failed", {
           flow_type: "deposit",
           method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
+          provider: import_core26.IntegrationProvider.COINBASE,
           failure_reason: "token_refresh_failed"
         });
         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);
@@ -19195,11 +19290,11 @@ function CoinbaseConnect({
     track("verification_submitted", {
       flow_type: "deposit",
       method: "exchange_connect",
-      provider: import_core27.IntegrationProvider.COINBASE,
+      provider: import_core26.IntegrationProvider.COINBASE,
       verification_type: "mfa"
     });
     try {
-      const result = await (0, import_core27.confirmIntegrationTransfer)(
+      const result = await (0, import_core26.confirmIntegrationTransfer)(
         transferIntent.id,
         accessToken,
         mfaCode,
@@ -19209,7 +19304,7 @@ function CoinbaseConnect({
         track("verification_failed", {
           flow_type: "deposit",
           method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
+          provider: import_core26.IntegrationProvider.COINBASE,
           verification_type: "mfa",
           verification_status: result.status,
           failure_reason: "invalid_code"
@@ -19220,7 +19315,7 @@ function CoinbaseConnect({
         track("verification_completed", {
           flow_type: "deposit",
           method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
+          provider: import_core26.IntegrationProvider.COINBASE,
           verification_type: "mfa",
           verification_status: result.status
         });
@@ -19232,7 +19327,7 @@ function CoinbaseConnect({
         track("verification_failed", {
           flow_type: "deposit",
           method: "exchange_connect",
-          provider: import_core27.IntegrationProvider.COINBASE,
+          provider: import_core26.IntegrationProvider.COINBASE,
           verification_type: "mfa",
           verification_status: result.status,
           failure_reason: result.message || "transfer_failed"
@@ -19249,7 +19344,7 @@ function CoinbaseConnect({
       track("verification_failed", {
         flow_type: "deposit",
         method: "exchange_connect",
-        provider: import_core27.IntegrationProvider.COINBASE,
+        provider: import_core26.IntegrationProvider.COINBASE,
         verification_type: "mfa",
         failure_reason: errorType || (err instanceof Error ? err.message : "mfa_request_failed")
       });
@@ -19282,14 +19377,14 @@ function CoinbaseConnect({
       track("account_connection_failed", {
         flow_type: "deposit",
         method: "exchange_connect",
-        provider: import_core27.IntegrationProvider.COINBASE,
+        provider: import_core26.IntegrationProvider.COINBASE,
         failure_reason: "abandoned"
       });
     } else if (view === "mfa") {
       track("verification_failed", {
         flow_type: "deposit",
         method: "exchange_connect",
-        provider: import_core27.IntegrationProvider.COINBASE,
+        provider: import_core26.IntegrationProvider.COINBASE,
         verification_type: "mfa",
         failure_reason: "abandoned"
       });
@@ -19332,6 +19427,9 @@ function CoinbaseConnect({
         setShowTransferDetails(false);
         transitionTo("enter_amount");
         break;
+      case "mfa_enrollment":
+        transitionTo("transfer_confirm");
+        break;
       case "mfa":
         transitionTo("transfer_confirm");
         break;
@@ -19447,7 +19545,7 @@ function CoinbaseConnect({
                   },
                   children: t.comingSoon
                 }
-              ) : accessToken && exchange.service_provider === import_core27.IntegrationProvider.COINBASE ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+              ) : accessToken && exchange.service_provider === import_core26.IntegrationProvider.COINBASE ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
                 "span",
                 {
                   className: "uf-text-xs uf-px-2.5 uf-py-1 uf-rounded-full",
@@ -20888,6 +20986,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 }),
@@ -21173,15 +21320,15 @@ function resolveDepositMenuLayout(layout, displayMode) {
 }
 
 // src/hooks/use-exchanges.ts
-var import_react_query13 = require("@tanstack/react-query");
-var import_core28 = require("@unifold/core");
+var import_react_query12 = require("@tanstack/react-query");
+var import_core27 = require("@unifold/core");
 function useExchanges({
   publishableKey,
   enabled = true
 }) {
-  const { data: exchanges = [], isLoading } = (0, import_react_query13.useQuery)({
+  const { data: exchanges = [], isLoading } = (0, import_react_query12.useQuery)({
     queryKey: ["unifold", "exchanges", publishableKey],
-    queryFn: () => (0, import_core28.getExchanges)(void 0, publishableKey).then((res) => res.data),
+    queryFn: () => (0, import_core27.getExchanges)(void 0, publishableKey).then((res) => res.data),
     enabled,
     staleTime: 1e3 * 60 * 30,
     refetchOnMount: false,
@@ -21191,8 +21338,8 @@ function useExchanges({
 }
 
 // src/hooks/use-public-incident.ts
-var import_react_query14 = require("@tanstack/react-query");
-var import_core29 = require("@unifold/core");
+var import_react_query13 = require("@tanstack/react-query");
+var import_core28 = require("@unifold/core");
 function usePublicIncident({
   publishableKey,
   enabled = true
@@ -21201,9 +21348,9 @@ function usePublicIncident({
     data: incident,
     isLoading,
     error
-  } = (0, import_react_query14.useQuery)({
+  } = (0, import_react_query13.useQuery)({
     queryKey: ["unifold", "publicIncident", publishableKey],
-    queryFn: () => (0, import_core29.getPublicIncident)(publishableKey),
+    queryFn: () => (0, import_core28.getPublicIncident)(publishableKey),
     enabled,
     staleTime: 1e3 * 30,
     refetchInterval: 1e3 * 30,
@@ -21213,16 +21360,16 @@ function usePublicIncident({
 }
 
 // src/hooks/use-wallet-pay-providers.ts
-var import_react_query15 = require("@tanstack/react-query");
-var import_core30 = require("@unifold/core");
+var import_react_query14 = require("@tanstack/react-query");
+var import_core29 = require("@unifold/core");
 function useWalletPayProviders({
   method,
   publishableKey,
   enabled = true
 }) {
-  const { data: providers, isLoading } = (0, import_react_query15.useQuery)({
+  const { data: providers, isLoading } = (0, import_react_query14.useQuery)({
     queryKey: ["unifold", "walletPayProviders", method, publishableKey],
-    queryFn: () => (0, import_core30.getWalletPayProviders)(method, publishableKey),
+    queryFn: () => (0, import_core29.getWalletPayProviders)(method, publishableKey),
     enabled,
     staleTime: 1e3 * 60 * 30,
     refetchOnMount: true,
@@ -21238,11 +21385,11 @@ function platformSupportsWalletPay(method, platform) {
 }
 
 // src/components/deposits/DepositModal.tsx
-var import_core43 = require("@unifold/core");
+var import_core42 = require("@unifold/core");
 
 // src/hooks/use-forward-deposit-events.ts
 var import_react23 = require("react");
-var import_core33 = require("@unifold/core");
+var import_core32 = require("@unifold/core");
 var import_analytics = require("@unifold/analytics");
 
 // src/lib/selection-events.ts
@@ -21315,11 +21462,11 @@ function walletConnectionPayload(event) {
 }
 
 // src/lib/account-connection-events.ts
-var import_core31 = require("@unifold/core");
+var import_core30 = require("@unifold/core");
 var ACCOUNT_CONNECTION_EVENTS = {
-  account_connection_started: import_core31.DepositEventType.ACCOUNT_CONNECTION_STARTED,
-  account_connected: import_core31.DepositEventType.ACCOUNT_CONNECTED,
-  account_connection_failed: import_core31.DepositEventType.ACCOUNT_CONNECTION_FAILED
+  account_connection_started: import_core30.DepositEventType.ACCOUNT_CONNECTION_STARTED,
+  account_connected: import_core30.DepositEventType.ACCOUNT_CONNECTED,
+  account_connection_failed: import_core30.DepositEventType.ACCOUNT_CONNECTION_FAILED
 };
 var str3 = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
 function accountConnectionPayload(event) {
@@ -21339,11 +21486,11 @@ function accountConnectionPayload(event) {
 }
 
 // src/lib/verification-events.ts
-var import_core32 = require("@unifold/core");
+var import_core31 = require("@unifold/core");
 var VERIFICATION_EVENTS = {
-  verification_started: import_core32.DepositEventType.VERIFICATION_STARTED,
-  verification_completed: import_core32.DepositEventType.VERIFICATION_COMPLETED,
-  verification_failed: import_core32.DepositEventType.VERIFICATION_FAILED
+  verification_started: import_core31.DepositEventType.VERIFICATION_STARTED,
+  verification_completed: import_core31.DepositEventType.VERIFICATION_COMPLETED,
+  verification_failed: import_core31.DepositEventType.VERIFICATION_FAILED
 };
 function verificationPayload(event) {
   const type = VERIFICATION_EVENTS[event.event];
@@ -21357,9 +21504,9 @@ function verificationPayload(event) {
 
 // src/hooks/use-forward-deposit-events.ts
 var WALLET_CONNECTION_TYPES = {
-  started: import_core33.DepositEventType.WALLET_CONNECTION_STARTED,
-  connected: import_core33.DepositEventType.WALLET_CONNECTED,
-  failed: import_core33.DepositEventType.WALLET_CONNECTION_FAILED
+  started: import_core32.DepositEventType.WALLET_CONNECTION_STARTED,
+  connected: import_core32.DepositEventType.WALLET_CONNECTED,
+  failed: import_core32.DepositEventType.WALLET_CONNECTION_FAILED
 };
 function depositMethodFromAnalytics(method) {
   if (typeof method !== "string") return void 0;
@@ -21383,7 +21530,7 @@ function useForwardDepositEvents(onEvent) {
       if (event.event === "flow_started") {
         onEventRef.current?.({
           ...base,
-          type: import_core33.DepositEventType.FLOW_STARTED,
+          type: import_core32.DepositEventType.FLOW_STARTED,
           ...withMethod,
           data: {
             object: {
@@ -21432,7 +21579,7 @@ function useForwardDepositEvents(onEvent) {
         case "token":
           onEventRef.current?.({
             ...base,
-            type: import_core33.DepositEventType.TOKEN_SELECTED,
+            type: import_core32.DepositEventType.TOKEN_SELECTED,
             ...withMethod,
             data: { object: selection.data }
           });
@@ -21440,7 +21587,7 @@ function useForwardDepositEvents(onEvent) {
         case "wallet":
           onEventRef.current?.({
             ...base,
-            type: import_core33.DepositEventType.WALLET_SELECTED,
+            type: import_core32.DepositEventType.WALLET_SELECTED,
             ...withMethod,
             data: { object: selection.data }
           });
@@ -21448,7 +21595,7 @@ function useForwardDepositEvents(onEvent) {
         case "provider":
           onEventRef.current?.({
             ...base,
-            type: import_core33.DepositEventType.PROVIDER_SELECTED,
+            type: import_core32.DepositEventType.PROVIDER_SELECTED,
             ...withMethod,
             data: { object: selection.data }
           });
@@ -21502,8 +21649,8 @@ function useAllowedCountry(publishableKey) {
 }
 
 // src/hooks/use-address-validation.ts
-var import_react_query16 = require("@tanstack/react-query");
-var import_core34 = require("@unifold/core");
+var import_react_query15 = require("@tanstack/react-query");
+var import_core33 = require("@unifold/core");
 function useAddressValidation({
   recipientAddress,
   destinationChainType,
@@ -21514,7 +21661,7 @@ function useAddressValidation({
   refetchOnMount = false
 }) {
   const shouldValidate = enabled && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  const { data, isLoading, error } = (0, import_react_query16.useQuery)({
+  const { data, isLoading, error } = (0, import_react_query15.useQuery)({
     queryKey: [
       "unifold",
       "addressValidation",
@@ -21523,7 +21670,7 @@ function useAddressValidation({
       destinationChainId,
       destinationTokenAddress
     ],
-    queryFn: () => (0, import_core34.verifyRecipientAddress)(
+    queryFn: () => (0, import_core33.verifyRecipientAddress)(
       {
         chain_type: destinationChainType,
         chain_id: destinationChainId,
@@ -21806,7 +21953,7 @@ function PoweredByUnifold({
 }
 
 // src/components/deposits/DepositsModal.tsx
-var import_core35 = require("@unifold/core");
+var import_core34 = require("@unifold/core");
 var import_jsx_runtime54 = require("react/jsx-runtime");
 function DepositsModal({
   open,
@@ -21825,7 +21972,7 @@ function DepositsModal({
     if (!open || !userId) return;
     const fetchExecutions = async () => {
       try {
-        const response = await (0, import_core35.queryExecutions)(userId, publishableKey, import_core35.ActionType.Deposit);
+        const response = await (0, import_core34.queryExecutions)(userId, publishableKey, import_core34.ActionType.Deposit);
         const sorted = [...response.data].sort((a, b) => {
           const timeA = a.created_at ? new Date(a.created_at).getTime() : 0;
           const timeB = b.created_at ? new Date(b.created_at).getTime() : 0;
@@ -22960,11 +23107,11 @@ var TooltipContent = React37.forwardRef(({ className, sideOffset = 4, ...props }
 TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
 // src/components/deposits/TransferCryptoSingleInput.tsx
-var import_core37 = require("@unifold/core");
+var import_core36 = require("@unifold/core");
 
 // src/hooks/use-hypercore-activation.ts
-var import_react_query17 = require("@tanstack/react-query");
-var import_core36 = require("@unifold/core");
+var import_react_query16 = require("@tanstack/react-query");
+var import_core35 = require("@unifold/core");
 
 // src/lib/constants.ts
 var HYPERCORE_CHAIN_ID = "1337";
@@ -22982,9 +23129,9 @@ function useHypercoreActivation(params) {
   const recipient = recipientAddress?.trim() ?? "";
   const source = sourceAddress?.trim() ?? "";
   const hasAddresses = !!recipient && !!source;
-  const { data, isLoading } = (0, import_react_query17.useQuery)({
+  const { data, isLoading } = (0, import_react_query16.useQuery)({
     queryKey: ["unifold", "hypercoreActivation", source, recipient, publishableKey],
-    queryFn: () => (0, import_core36.checkHypercoreActivation)(
+    queryFn: () => (0, import_core35.checkHypercoreActivation)(
       {
         source_address: source,
         recipient_address: recipient
@@ -23137,7 +23284,7 @@ function TransferCryptoSingleInput({
     (c) => c.chain_type === currentChainCombo.chainType && c.chain_id === currentChainCombo.chainId
   ) : void 0;
   const currentChainType = currentChainData?.chain_type || "ethereum";
-  const currentWallet = (0, import_core37.getWalletByChainType)(wallets, currentChainType);
+  const currentWallet = (0, import_core36.getWalletByChainType)(wallets, currentChainType);
   const depositAddress = currentWallet?.address || "";
   const {
     executions: depositExecutions,
@@ -23379,7 +23526,7 @@ function TransferCryptoSingleInput({
                   className: "uf-text-sm uf-font-semibold",
                   style: { color: components.card.titleColor, fontFamily: fonts.semibold },
                   children: [
-                    checkoutQuote.isStablecoin ? (0, import_core37.formatStablecoinAmount)(
+                    checkoutQuote.isStablecoin ? (0, import_core36.formatStablecoinAmount)(
                       checkoutQuote.sourceAmount,
                       checkoutQuote.sourceTokenDecimals
                     ) : (Number(checkoutQuote.sourceAmount) / 10 ** checkoutQuote.sourceTokenDecimals).toFixed(Math.min(checkoutQuote.sourceTokenDecimals, 6)),
@@ -23879,7 +24026,7 @@ var SelectSeparator = React38.forwardRef(({ className, ...props }, ref) => /* @_
 SelectSeparator.displayName = SelectPrimitive.Separator.displayName;
 
 // src/components/deposits/TransferCryptoDoubleInput.tsx
-var import_core38 = require("@unifold/core");
+var import_core37 = require("@unifold/core");
 var import_jsx_runtime62 = require("react/jsx-runtime");
 var getChainKey3 = (chainId, chainType) => {
   return `${chainType}:${chainId}`;
@@ -23986,7 +24133,7 @@ function TransferCryptoDoubleInput({
     (c) => c.chain_type === currentChainCombo.chainType && c.chain_id === currentChainCombo.chainId
   ) : void 0;
   const currentChainType = currentChainData?.chain_type || "ethereum";
-  const currentWallet = (0, import_core38.getWalletByChainType)(wallets, currentChainType);
+  const currentWallet = (0, import_core37.getWalletByChainType)(wallets, currentChainType);
   const depositAddress = currentWallet?.address || "";
   const {
     executions: depositExecutions,
@@ -24556,7 +24703,7 @@ function TransferCryptoDoubleInput({
 // src/components/deposits/WalletConnect.tsx
 var React39 = __toESM(require("react"));
 var import_lucide_react39 = require("lucide-react");
-var import_core42 = require("@unifold/core");
+var import_core41 = require("@unifold/core");
 
 // src/lib/wallet-errors.ts
 function messageOf(err) {
@@ -24736,7 +24883,7 @@ function describeWalletError(err, action) {
 }
 
 // src/lib/send-hypercore.ts
-var import_core39 = require("@unifold/core");
+var import_core38 = require("@unifold/core");
 function isHypercoreChain(chainId) {
   return chainId === HYPERCORE_CHAIN_ID;
 }
@@ -24747,7 +24894,7 @@ async function sendHypercoreEvmTransfer(params) {
     params: []
   });
   const activeChainId = String(parseInt(currentChainHex, 16));
-  const buildResult = await (0, import_core39.buildHypercoreTransaction)(
+  const buildResult = await (0, import_core38.buildHypercoreTransaction)(
     {
       signature_chain_id: activeChainId,
       recipient_address: recipientAddress,
@@ -24760,7 +24907,7 @@ async function sendHypercoreEvmTransfer(params) {
     method: "eth_signTypedData_v4",
     params: [fromAddress, JSON.stringify(buildResult.typed_data)]
   });
-  await (0, import_core39.sendHypercoreTransaction)(
+  await (0, import_core38.sendHypercoreTransaction)(
     {
       action_payload: buildResult.action_payload,
       signature,
@@ -24772,8 +24919,8 @@ async function sendHypercoreEvmTransfer(params) {
 }
 
 // src/hooks/use-deposit-quote.ts
-var import_react_query18 = require("@tanstack/react-query");
-var import_core40 = require("@unifold/core");
+var import_react_query17 = require("@tanstack/react-query");
+var import_core39 = require("@unifold/core");
 function useDepositQuote(params) {
   const {
     publishableKey,
@@ -24799,7 +24946,7 @@ function useDepositQuote(params) {
     ...adjustForSlippage ? { adjust_for_slippage: true } : {},
     ...stablecoinParity ? { stablecoin_parity: true } : {}
   };
-  return (0, import_react_query18.useQuery)({
+  return (0, import_react_query17.useQuery)({
     queryKey: [
       "unifold",
       "depositQuote",
@@ -24814,7 +24961,7 @@ function useDepositQuote(params) {
       stablecoinParity,
       publishableKey
     ],
-    queryFn: () => (0, import_core40.getDepositQuote)(request, publishableKey),
+    queryFn: () => (0, import_core39.getDepositQuote)(request, publishableKey),
     enabled: enabled && !!publishableKey && !!sourceChainType && !!sourceChainId && !!sourceTokenAddress && !!destinationAmount && destinationAmount !== "0" && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress,
     staleTime: 3e4,
     gcTime: 5 * 6e4,
@@ -24827,15 +24974,15 @@ function useDepositQuote(params) {
 }
 
 // src/hooks/use-external-wallets.ts
-var import_react_query19 = require("@tanstack/react-query");
-var import_core41 = require("@unifold/core");
+var import_react_query18 = require("@tanstack/react-query");
+var import_core40 = require("@unifold/core");
 function useExternalWallets({
   publishableKey,
   enabled = true
 }) {
-  const { data: wallets = [], isLoading } = (0, import_react_query19.useQuery)({
+  const { data: wallets = [], isLoading } = (0, import_react_query18.useQuery)({
     queryKey: ["unifold", "external-wallets", publishableKey],
-    queryFn: () => (0, import_core41.getExternalWallets)(publishableKey).then((res) => res.data),
+    queryFn: () => (0, import_core40.getExternalWallets)(publishableKey).then((res) => res.data),
     enabled: enabled && !!publishableKey,
     staleTime: 1e3 * 60 * 30,
     refetchOnMount: false,
@@ -26246,7 +26393,7 @@ function WalletConnect({
     try {
       const cleanedAmountUsd = amountUsd?.replace(/[^0-9.]/g, "") ?? "";
       const forwardedAmountUsd = parseFloat(cleanedAmountUsd) > 0 ? cleanedAmountUsd : void 0;
-      const res = await (0, import_core42.getWalletMobileDeepLink)(
+      const res = await (0, import_core41.getWalletMobileDeepLink)(
         wallet.id,
         depositAddresses,
         publishableKey,
@@ -26578,7 +26725,7 @@ function WalletConnect({
           destination_chain_type: activeDepositWallet.destination_chain_type,
           ...productType ? { product_type: productType } : {}
         };
-        const response = await (0, import_core42.getSupportedDepositTokens)(publishableKey, options);
+        const response = await (0, import_core41.getSupportedDepositTokens)(publishableKey, options);
         if (cancelled) return;
         const supportedToken = response.data.find(
           (t2) => t2.symbol.toLowerCase() === token.symbol.toLowerCase()
@@ -26606,7 +26753,7 @@ function WalletConnect({
     setIsLoading(true);
     setError(null);
     const sct = activeDepositWallet.chain_type === "algorand" || activeDepositWallet.chain_type === "xrpl" || activeDepositWallet.chain_type === "cardano" || activeDepositWallet.chain_type === "n1" || activeDepositWallet.chain_type === "tron" ? "ethereum" : activeDepositWallet.chain_type;
-    (0, import_core42.getAddressBalances)(activeWalletInfo.address, sct, publishableKey).then((response) => {
+    (0, import_core41.getAddressBalances)(activeWalletInfo.address, sct, publishableKey).then((response) => {
       if (cancelled) return;
       const nonZero = response.balances.filter((b) => b.amount !== "0");
       const defaultSource = {
@@ -26899,7 +27046,7 @@ function WalletConnect({
     if (!provider.publicKey) await provider.connect();
     const isNative = token.token_address === "native" || token.token_address === "So11111111111111111111111111111111111111112" || token.token_address === "";
     const smallestUnit = isNative ? decimalToSmallestUnit(amountStr, 9) : decimalToSmallestUnit(amountStr, token.decimals);
-    const buildResp = await (0, import_core42.buildSolanaTransaction)(
+    const buildResp = await (0, import_core41.buildSolanaTransaction)(
       {
         chain_id: "mainnet",
         token_address: token.token_address === "" ? "native" : token.token_address,
@@ -26921,7 +27068,7 @@ function WalletConnect({
     const ser = signed.serialize();
     let bs = "";
     for (let i = 0; i < ser.length; i++) bs += String.fromCharCode(ser[i]);
-    const resp = await (0, import_core42.sendSolanaTransaction)(
+    const resp = await (0, import_core41.sendSolanaTransaction)(
       { chain_id: "mainnet", signed_transaction: btoa(bs) },
       publishableKey
     );
@@ -26967,7 +27114,7 @@ function WalletConnect({
       } else if (isHypercoreToken) {
         let sendAmount = tokenAmount;
         try {
-          const activation = await (0, import_core42.checkHypercoreActivation)(
+          const activation = await (0, import_core41.checkHypercoreActivation)(
             { source_address: walletInfo.address, recipient_address: recipientAddress },
             publishableKey
           );
@@ -26994,7 +27141,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);
@@ -27324,8 +27475,8 @@ function WalletConnect({
     ] }) });
   }
   if (view === "mobile_deposit_status" && latestDepositExecution) {
-    const isComplete = latestDepositExecution.status === import_core42.ExecutionStatus.SUCCEEDED;
-    const isFailed = latestDepositExecution.status === import_core42.ExecutionStatus.FAILED;
+    const isComplete = latestDepositExecution.status === import_core41.ExecutionStatus.SUCCEEDED;
+    const isFailed = latestDepositExecution.status === import_core41.ExecutionStatus.FAILED;
     const title = isComplete ? t.paymentComplete : isFailed ? t.paymentFailed : t.paymentProcessing;
     return /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(AccentColorOverride, { accentColor: preConnectAccent, accentForeground: preConnectFg, children: /* @__PURE__ */ (0, import_jsx_runtime68.jsxs)("div", { style: viewTransitionStyle, children: [
       /* @__PURE__ */ (0, import_jsx_runtime68.jsx)(
@@ -27584,7 +27735,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]
@@ -27592,6 +27743,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 }),
@@ -27602,8 +27754,8 @@ function DepositModal({
     (method) => {
       track("payment_method_selected", { method: analyticsMethod(method), flow_type: "deposit" });
       emitEvent({
-        id: (0, import_core43.generatePrefixedKSUID)("sevt"),
-        type: import_core43.DepositEventType.METHOD_SELECTED,
+        id: (0, import_core42.generatePrefixedKSUID)("sevt"),
+        type: import_core42.DepositEventType.METHOD_SELECTED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
         method,
@@ -27619,6 +27771,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).
@@ -27646,6 +27801,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,
@@ -27655,8 +27811,8 @@ function DepositModal({
       });
       onDepositError?.({ ...error, method });
       emitEvent({
-        id: (0, import_core43.generatePrefixedKSUID)("sevt"),
-        type: import_core43.DepositEventType.FLOW_FAILED,
+        id: (0, import_core42.generatePrefixedKSUID)("sevt"),
+        type: import_core42.DepositEventType.FLOW_FAILED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
         method,
@@ -27762,7 +27918,7 @@ function DepositModal({
   const [integrationExchanges, setIntegrationExchanges] = (0, import_react31.useState)([]);
   (0, import_react31.useEffect)(() => {
     if (!showConnectExchange || !open) return;
-    (0, import_core43.getIntegrationExchanges)(
+    (0, import_core42.getIntegrationExchanges)(
       publishableKey,
       userIpInfo?.alpha2 ? {
         country_code: userIpInfo.alpha2,
@@ -27773,13 +27929,13 @@ function DepositModal({
   }, [showConnectExchange, open, publishableKey, userIpInfo?.alpha2, userIpInfo?.subdivisionCode]);
   const [connectedExchange, setConnectedExchange] = (0, import_react31.useState)(() => {
     if (!showConnectExchange) return null;
-    const stored = getStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE);
+    const stored = getStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE);
     if (!stored) return null;
     return { name: "Coinbase", iconUrl: void 0, balanceUsd: null, isLoading: true };
   });
   (0, import_react31.useEffect)(() => {
     if (!showConnectExchange || !open || view !== "main") return;
-    const stored = getStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE);
+    const stored = getStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE);
     if (!stored) {
       setConnectedExchange(null);
       return;
@@ -27799,24 +27955,24 @@ function DepositModal({
       }) : null;
       setConnectedExchange((prev) => prev ? { ...prev, balanceUsd, isLoading: false } : null);
     };
-    (0, import_core43.getIntegrationHoldings)(import_core43.IntegrationProvider.COINBASE, stored.access_token, publishableKey).then(processHoldings).catch(async () => {
+    (0, import_core42.getIntegrationHoldings)(import_core42.IntegrationProvider.COINBASE, stored.access_token, publishableKey).then(processHoldings).catch(async () => {
       try {
-        const refreshResult = await (0, import_core43.refreshIntegrationToken)(stored.access_token, publishableKey);
-        if (!getStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE)) return;
+        const refreshResult = await (0, import_core42.refreshIntegrationToken)(stored.access_token, publishableKey);
+        if (!getStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE)) return;
         setStoredIntegrationToken({
-          integration_provider: import_core43.IntegrationProvider.COINBASE,
+          integration_provider: import_core42.IntegrationProvider.COINBASE,
           access_token: refreshResult.access_token,
           expires_at: refreshResult.expires_at
         });
-        const retryResult = await (0, import_core43.getIntegrationHoldings)(
-          import_core43.IntegrationProvider.COINBASE,
+        const retryResult = await (0, import_core42.getIntegrationHoldings)(
+          import_core42.IntegrationProvider.COINBASE,
           refreshResult.access_token,
           publishableKey
         );
         processHoldings(retryResult);
       } catch {
-        if (!getStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE)) return;
-        clearStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE);
+        if (!getStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE)) return;
+        clearStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE);
         setConnectedExchange(null);
       }
     });
@@ -27824,7 +27980,7 @@ function DepositModal({
   (0, import_react31.useEffect)(() => {
     if (!connectedExchange || integrationExchanges.length === 0) return;
     const cbExchange = integrationExchanges.find(
-      (e) => e.service_provider === import_core43.IntegrationProvider.COINBASE
+      (e) => e.service_provider === import_core42.IntegrationProvider.COINBASE
     );
     const iconUrl = cbExchange?.icon_urls?.find((u) => u.format === "svg")?.url || cbExchange?.icon_urls?.find((u) => u.format === "png")?.url || cbExchange?.icon_url;
     if (iconUrl && iconUrl !== connectedExchange.iconUrl) {
@@ -27943,7 +28099,7 @@ function DepositModal({
     if (view !== "tracker" || !userId) return;
     const fetchExecutions = async () => {
       try {
-        const response = await (0, import_core43.queryExecutions)(userId, publishableKey, import_core43.ActionType.Deposit);
+        const response = await (0, import_core42.queryExecutions)(userId, publishableKey, import_core42.ActionType.Deposit);
         const sorted = [...response.data].sort((a, b) => {
           const timeA = a.created_at ? new Date(a.created_at).getTime() : 0;
           const timeB = b.created_at ? new Date(b.created_at).getTime() : 0;
@@ -27999,7 +28155,7 @@ function DepositModal({
     const template = errors[code] ?? addressValidationMessages.defaultError;
     return interpolate(template, metadata);
   };
-  const walletsRecipientError = (0, import_core43.isDepositAddressValidationError)(walletsError) ? walletsError.message : null;
+  const walletsRecipientError = (0, import_core42.isDepositAddressValidationError)(walletsError) ? walletsError.message : null;
   const isRecipientAddressInvalid = isAddressValid === false || walletsRecipientError !== null;
   const recipientInvalidMessage = getAddressValidationErrorMessage(
     addressFailureMessage ?? walletsRecipientError,
@@ -28057,11 +28213,11 @@ function DepositModal({
     if (view === "wallet_connect" && sessionOpenedFromMenu) setView("main");
   };
   const handleExchangeDisconnect = () => {
-    const stored = getStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE);
+    const stored = getStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE);
     if (stored) {
-      (0, import_core43.revokeIntegrationToken)(stored.access_token, publishableKey);
+      (0, import_core42.revokeIntegrationToken)(stored.access_token, publishableKey);
     }
-    clearStoredIntegrationToken(import_core43.IntegrationProvider.COINBASE);
+    clearStoredIntegrationToken(import_core42.IntegrationProvider.COINBASE);
     setConnectedExchange(null);
     if (view === "coinbase_connect" && sessionOpenedFromMenu) setView("main");
   };
@@ -28074,8 +28230,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);
@@ -28100,6 +28258,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) {
@@ -29011,6 +29174,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,
@@ -29112,12 +29276,12 @@ var import_lucide_react41 = require("lucide-react");
 
 // src/hooks/use-forward-checkout-events.ts
 var import_react32 = require("react");
-var import_core44 = require("@unifold/core");
+var import_core43 = require("@unifold/core");
 var import_analytics2 = require("@unifold/analytics");
 var WALLET_CONNECTION_TYPES2 = {
-  started: import_core44.CheckoutEventType.WALLET_CONNECTION_STARTED,
-  connected: import_core44.CheckoutEventType.WALLET_CONNECTED,
-  failed: import_core44.CheckoutEventType.WALLET_CONNECTION_FAILED
+  started: import_core43.CheckoutEventType.WALLET_CONNECTION_STARTED,
+  connected: import_core43.CheckoutEventType.WALLET_CONNECTED,
+  failed: import_core43.CheckoutEventType.WALLET_CONNECTION_FAILED
 };
 function checkoutMethodFromAnalytics(method) {
   if (method !== "transfer_crypto" && method !== "transfer" && method !== "wallet_connect") {
@@ -29143,7 +29307,7 @@ function useForwardCheckoutEvents(onEvent, journeySessionId) {
       if (event.event === "flow_started") {
         onEventRef.current?.({
           ...base,
-          type: import_core44.CheckoutEventType.FLOW_STARTED,
+          type: import_core43.CheckoutEventType.FLOW_STARTED,
           ...withMethod,
           data: {
             object: {
@@ -29171,7 +29335,7 @@ function useForwardCheckoutEvents(onEvent, journeySessionId) {
         case "token":
           onEventRef.current?.({
             ...base,
-            type: import_core44.CheckoutEventType.TOKEN_SELECTED,
+            type: import_core43.CheckoutEventType.TOKEN_SELECTED,
             ...withMethod,
             data: { object: selection.data }
           });
@@ -29179,7 +29343,7 @@ function useForwardCheckoutEvents(onEvent, journeySessionId) {
         case "wallet":
           onEventRef.current?.({
             ...base,
-            type: import_core44.CheckoutEventType.WALLET_SELECTED,
+            type: import_core43.CheckoutEventType.WALLET_SELECTED,
             ...withMethod,
             data: { object: selection.data }
           });
@@ -29195,14 +29359,14 @@ function useForwardCheckoutEvents(onEvent, journeySessionId) {
 }
 
 // src/hooks/use-payment-intent.ts
-var import_react_query20 = require("@tanstack/react-query");
-var import_core45 = require("@unifold/core");
+var import_react_query19 = require("@tanstack/react-query");
+var import_core44 = require("@unifold/core");
 var TERMINAL_STATUSES = /* @__PURE__ */ new Set(["succeeded", "expired", "refunded", "canceled"]);
 function usePaymentIntent(params) {
   const { clientSecret, publishableKey, enabled = true, pollingInterval = 3e3 } = params;
-  return (0, import_react_query20.useQuery)({
+  return (0, import_react_query19.useQuery)({
     queryKey: ["unifold", "paymentIntent", clientSecret, publishableKey],
-    queryFn: () => (0, import_core45.retrievePaymentIntent)(clientSecret, publishableKey),
+    queryFn: () => (0, import_core44.retrievePaymentIntent)(clientSecret, publishableKey),
     enabled: enabled && !!clientSecret && !!publishableKey,
     staleTime: 0,
     refetchInterval: (query) => {
@@ -29218,7 +29382,7 @@ function usePaymentIntent(params) {
 }
 
 // src/components/checkout/CheckoutModal.tsx
-var import_core46 = require("@unifold/core");
+var import_core45 = require("@unifold/core");
 var import_jsx_runtime72 = require("react/jsx-runtime");
 function mapToCheckoutPaymentIntent(pi) {
   return {
@@ -29321,8 +29485,8 @@ function CheckoutModal({
         flow_type: "checkout"
       });
       emitEvent({
-        id: (0, import_core46.generatePrefixedKSUID)("sevt"),
-        type: import_core46.CheckoutEventType.METHOD_SELECTED,
+        id: (0, import_core45.generatePrefixedKSUID)("sevt"),
+        type: import_core45.CheckoutEventType.METHOD_SELECTED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
         method,
@@ -29340,8 +29504,8 @@ function CheckoutModal({
       });
       onCheckoutError?.(error);
       emitEvent({
-        id: (0, import_core46.generatePrefixedKSUID)("sevt"),
-        type: import_core46.CheckoutEventType.FLOW_FAILED,
+        id: (0, import_core45.generatePrefixedKSUID)("sevt"),
+        type: import_core45.CheckoutEventType.FLOW_FAILED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: journeySessionIdRef.current ?? getSessionId() ?? "",
         method: error.method,
@@ -29371,14 +29535,17 @@ 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 } : {}
         });
       }
       if (isSucceeded && richIntent) {
         const createdSec = data.paymentIntent?.updated_at ? Math.floor(new Date(data.paymentIntent.updated_at).getTime() / 1e3) : Math.floor(Date.now() / 1e3);
         emitEvent({
-          id: (0, import_core46.generatePrefixedKSUID)("sevt"),
-          type: import_core46.CheckoutEventType.PAYMENT_INTENT_SUCCEEDED,
+          id: (0, import_core45.generatePrefixedKSUID)("sevt"),
+          type: import_core45.CheckoutEventType.PAYMENT_INTENT_SUCCEEDED,
           // A poll can land after the journey ends, when getSessionId() is
           // either empty or already another flow's. The payment belongs to
           // the journey that started it.
@@ -29591,7 +29758,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);
@@ -30032,16 +30199,16 @@ 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
-var import_react_query21 = require("@tanstack/react-query");
-var import_core47 = require("@unifold/core");
+var import_react_query20 = require("@tanstack/react-query");
+var import_core46 = require("@unifold/core");
 function useSupportedDestinationTokens(publishableKey, enabled = true) {
-  return (0, import_react_query21.useQuery)({
+  return (0, import_react_query20.useQuery)({
     queryKey: ["unifold", "supportedDestinationTokens", publishableKey],
-    queryFn: () => (0, import_core47.getSupportedDestinationTokens)(publishableKey),
+    queryFn: () => (0, import_core46.getSupportedDestinationTokens)(publishableKey),
     staleTime: 1e3 * 60 * 5,
     gcTime: 1e3 * 60 * 30,
     refetchOnMount: false,
@@ -30071,8 +30238,8 @@ function useDefaultDestinationToken({
 }
 
 // src/hooks/use-source-token-validation.ts
-var import_react_query22 = require("@tanstack/react-query");
-var import_core48 = require("@unifold/core");
+var import_react_query21 = require("@tanstack/react-query");
+var import_core47 = require("@unifold/core");
 function useSourceTokenValidation(params) {
   const {
     sourceChainType,
@@ -30083,7 +30250,7 @@ function useSourceTokenValidation(params) {
     enabled = true
   } = params;
   const hasParams = !!sourceChainType && !!sourceChainId && !!sourceTokenAddress;
-  return (0, import_react_query22.useQuery)({
+  return (0, import_react_query21.useQuery)({
     queryKey: [
       "unifold",
       "sourceTokenValidation",
@@ -30093,7 +30260,7 @@ function useSourceTokenValidation(params) {
       publishableKey
     ],
     queryFn: async () => {
-      const res = await (0, import_core48.getSupportedDepositTokens)(publishableKey);
+      const res = await (0, import_core47.getSupportedDepositTokens)(publishableKey);
       let matchedMinUsd = null;
       let matchedProcessingTime = null;
       let matchedSlippage = null;
@@ -30133,12 +30300,12 @@ function useSourceTokenValidation(params) {
 }
 
 // src/hooks/use-address-balance.ts
-var import_react_query23 = require("@tanstack/react-query");
-var import_core49 = require("@unifold/core");
+var import_react_query22 = require("@tanstack/react-query");
+var import_core48 = require("@unifold/core");
 function useAddressBalance(params) {
   const { address, chainType, chainId, tokenAddress, publishableKey, enabled = true } = params;
   const hasParams = !!address && !!chainType && !!chainId && !!tokenAddress;
-  return (0, import_react_query23.useQuery)({
+  return (0, import_react_query22.useQuery)({
     queryKey: [
       "unifold",
       "addressBalance",
@@ -30149,7 +30316,7 @@ function useAddressBalance(params) {
       publishableKey
     ],
     queryFn: async () => {
-      const res = await (0, import_core49.getAddressBalance)(
+      const res = await (0, import_core48.getAddressBalance)(
         address,
         chainType,
         chainId,
@@ -30194,24 +30361,26 @@ function useAddressBalance(params) {
 }
 
 // src/hooks/use-executions.ts
-var import_react_query24 = require("@tanstack/react-query");
-var import_core50 = require("@unifold/core");
+var import_react_query23 = require("@tanstack/react-query");
+var import_core49 = require("@unifold/core");
 function useExecutions(userId, publishableKey, options) {
-  const actionType = options?.actionType ?? import_core50.ActionType.Deposit;
-  return (0, import_react_query24.useQuery)({
+  const actionType = options?.actionType ?? import_core49.ActionType.Deposit;
+  const query = (0, import_react_query23.useQuery)({
     queryKey: ["unifold", "executions", actionType, userId, publishableKey],
-    queryFn: () => (0, import_core50.queryExecutions)(userId, publishableKey, actionType),
+    queryFn: () => (0, import_core49.queryExecutions)(userId, publishableKey, actionType),
     enabled: (options?.enabled ?? true) && !!userId,
     refetchInterval: options?.refetchInterval ?? 3e3,
     staleTime: 0,
     gcTime: 1e3 * 60 * 5,
     refetchOnWindowFocus: false
   });
+  useStampInternalUserId({ internalUserId: query.data?.data[0]?.user_id });
+  return query;
 }
 
 // src/hooks/use-withdraw-polling.ts
 var import_react34 = require("react");
-var import_core51 = require("@unifold/core");
+var import_core50 = require("@unifold/core");
 var POLL_INTERVAL_MS4 = 2500;
 var POLL_ENDPOINT_INTERVAL_MS2 = 5e3;
 var CUTOFF_BUFFER_MS2 = 6e4;
@@ -30234,15 +30403,15 @@ function useWithdrawPolling({
   const journeySessionId = () => sessionIdRef.current || (getSessionId() ?? "");
   const executionCreatedSec = (execution) => execution.updated_at ? Math.floor(new Date(execution.updated_at).getTime() / 1e3) : execution.created_at ? Math.floor(new Date(execution.created_at).getTime() / 1e3) : Math.floor(Date.now() / 1e3);
   const createExecutionSuccessEvent = (execution) => ({
-    id: (0, import_core51.generatePrefixedKSUID)("sevt"),
-    type: import_core51.WithdrawEventType.DIRECT_EXECUTION_SUCCEEDED,
+    id: (0, import_core50.generatePrefixedKSUID)("sevt"),
+    type: import_core50.WithdrawEventType.DIRECT_EXECUTION_SUCCEEDED,
     created: executionCreatedSec(execution),
     sessionId: journeySessionId(),
     data: { object: mapToDirectExecution(execution) }
   });
   const createExecutionFailedEvent = (execution) => ({
-    id: (0, import_core51.generatePrefixedKSUID)("sevt"),
-    type: import_core51.WithdrawEventType.DIRECT_EXECUTION_FAILED,
+    id: (0, import_core50.generatePrefixedKSUID)("sevt"),
+    type: import_core50.WithdrawEventType.DIRECT_EXECUTION_FAILED,
     created: executionCreatedSec(execution),
     sessionId: journeySessionId(),
     data: { object: mapToDirectExecution(execution) }
@@ -30294,7 +30463,7 @@ function useWithdrawPolling({
     const enabledAt = enabledAtRef.current;
     const poll = async () => {
       try {
-        const response = await (0, import_core51.queryExecutions)(userId, publishableKey, import_core51.ActionType.Withdraw);
+        const response = await (0, import_core50.queryExecutions)(userId, publishableKey, import_core50.ActionType.Withdraw);
         const cutoff = new Date(enabledAt.getTime() - CUTOFF_BUFFER_MS2);
         const sorted = [...response.data].sort((a, b) => {
           const tA = a.created_at ? new Date(a.created_at).getTime() : 0;
@@ -30302,11 +30471,11 @@ function useWithdrawPolling({
           return tB - tA;
         });
         const inProgress = [
-          import_core51.ExecutionStatus.PENDING,
-          import_core51.ExecutionStatus.WAITING,
-          import_core51.ExecutionStatus.DELAYED
+          import_core50.ExecutionStatus.PENDING,
+          import_core50.ExecutionStatus.WAITING,
+          import_core50.ExecutionStatus.DELAYED
         ];
-        const terminal = [import_core51.ExecutionStatus.SUCCEEDED, import_core51.ExecutionStatus.FAILED];
+        const terminal = [import_core50.ExecutionStatus.SUCCEEDED, import_core50.ExecutionStatus.FAILED];
         let target = null;
         for (const ex of sorted) {
           const t = ex.created_at ? new Date(ex.created_at) : null;
@@ -30336,7 +30505,7 @@ function useWithdrawPolling({
             }
             return [...list, ex];
           });
-          if (ex.status === import_core51.ExecutionStatus.SUCCEEDED && (!prev || inProgress.includes(prev))) {
+          if (ex.status === import_core50.ExecutionStatus.SUCCEEDED && (!prev || inProgress.includes(prev))) {
             onSuccessRef.current?.({
               message: "Withdrawal completed successfully",
               executionId: ex.id,
@@ -30344,7 +30513,7 @@ function useWithdrawPolling({
               transaction: ex,
               execution: createExecutionSuccessEvent(ex)
             });
-          } else if (ex.status === import_core51.ExecutionStatus.FAILED && prev !== import_core51.ExecutionStatus.FAILED) {
+          } else if (ex.status === import_core50.ExecutionStatus.FAILED && prev !== import_core50.ExecutionStatus.FAILED) {
             onErrorRef.current?.({
               message: "Withdrawal failed",
               code: "WITHDRAW_FAILED",
@@ -30374,7 +30543,7 @@ function useWithdrawPolling({
     if (!enabled || !depositWalletId) return;
     const trigger = async () => {
       try {
-        await (0, import_core51.pollDirectExecutions)({ deposit_wallet_id: depositWalletId }, publishableKey);
+        await (0, import_core50.pollDirectExecutions)({ deposit_wallet_id: depositWalletId }, publishableKey);
       } catch {
       }
     };
@@ -30541,13 +30710,13 @@ 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");
+var import_core55 = require("@unifold/core");
 
 // src/hooks/use-verify-recipient-address.ts
-var import_react_query25 = require("@tanstack/react-query");
-var import_core52 = require("@unifold/core");
+var import_react_query24 = require("@tanstack/react-query");
+var import_core51 = require("@unifold/core");
 function useVerifyRecipientAddress(params) {
   const {
     chainType,
@@ -30559,7 +30728,7 @@ function useVerifyRecipientAddress(params) {
   } = params;
   const trimmedAddress = recipientAddress?.trim() || "";
   const hasAllParams = !!chainType && !!chainId && !!tokenAddress && trimmedAddress.length > 0;
-  return (0, import_react_query25.useQuery)({
+  return (0, import_react_query24.useQuery)({
     queryKey: [
       "unifold",
       "verifyRecipientAddress",
@@ -30569,7 +30738,7 @@ function useVerifyRecipientAddress(params) {
       trimmedAddress,
       publishableKey
     ],
-    queryFn: () => (0, import_core52.verifyRecipientAddress)(
+    queryFn: () => (0, import_core51.verifyRecipientAddress)(
       {
         chain_type: chainType,
         chain_id: chainId,
@@ -30588,7 +30757,7 @@ function useVerifyRecipientAddress(params) {
 }
 
 // src/components/withdrawals/send-withdraw.ts
-var import_core53 = require("@unifold/core");
+var import_core52 = require("@unifold/core");
 async function sendEvmWithdraw(params) {
   const {
     provider,
@@ -30677,7 +30846,7 @@ async function sendSolanaWithdraw(params) {
   if (!provider.publicKey) {
     await provider.connect();
   }
-  const buildResponse = await (0, import_core53.buildSolanaTransaction)(
+  const buildResponse = await (0, import_core52.buildSolanaTransaction)(
     {
       chain_id: "mainnet",
       token_address: sourceTokenAddress === "" ? "native" : sourceTokenAddress,
@@ -30703,7 +30872,7 @@ async function sendSolanaWithdraw(params) {
   for (let i = 0; i < serialized.length; i++) {
     binaryStr += String.fromCharCode(serialized[i]);
   }
-  const sendResponse = await (0, import_core53.sendSolanaTransaction)(
+  const sendResponse = await (0, import_core52.sendSolanaTransaction)(
     { chain_id: "mainnet", signed_transaction: btoa(binaryStr) },
     publishableKey
   );
@@ -30804,13 +30973,12 @@ async function detectBrowserWallet(chainType, senderAddress) {
 }
 
 // src/hooks/use-hypercore-withdraw-activation.ts
-var import_react36 = 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");
+
+// src/hooks/use-get-deposit-address.ts
+var import_react_query25 = require("@tanstack/react-query");
+var import_core53 = require("@unifold/core");
 function useGetDepositAddress(params) {
   const {
     userId,
@@ -30822,9 +30990,8 @@ function useGetDepositAddress(params) {
     actionType,
     enabled = true
   } = params;
-  const { setUserId } = useAnalytics();
   const canFire = !!userId && !!recipientAddress && !!destinationChainType && !!destinationChainId && !!destinationTokenAddress;
-  const query = (0, import_react_query26.useQuery)({
+  const query = (0, import_react_query25.useQuery)({
     queryKey: [
       "unifold",
       "getDepositAddress",
@@ -30836,7 +31003,7 @@ function useGetDepositAddress(params) {
       actionType ?? null,
       publishableKey
     ],
-    queryFn: () => (0, import_core54.getDepositAddress)(
+    queryFn: () => (0, import_core53.getDepositAddress)(
       {
         external_user_id: userId,
         recipient_address: recipientAddress,
@@ -30854,11 +31021,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;
 }
 
@@ -30896,10 +31059,10 @@ function useHypercoreWithdrawActivation(params) {
     destinationChainType,
     destinationChainId,
     destinationTokenAddress,
-    actionType: import_core55.ActionType.Withdraw,
+    actionType: import_core54.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]);
@@ -30990,22 +31153,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();
@@ -31023,7 +31186,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;
@@ -31067,33 +31230,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 })}`;
@@ -31112,7 +31275,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;
@@ -31135,7 +31298,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));
@@ -31162,7 +31325,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");
@@ -31176,7 +31339,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);
@@ -31199,7 +31362,7 @@ function WithdrawForm({
       let humanAmount = isMaxed ? balanceData.balanceHuman : toSafeDecimalString(cryptoAmountFromInput, sourceDecimals);
       if (isHypercoreChain(sourceChainId)) {
         try {
-          const check = await (0, import_core56.checkHypercoreActivation)(
+          const check = await (0, import_core55.checkHypercoreActivation)(
             {
               source_address: senderAddress,
               recipient_address: depositWallet.address
@@ -31655,12 +31818,12 @@ function WithdrawForm({
 
 // src/components/withdrawals/WithdrawExecutionItem.tsx
 var import_lucide_react43 = require("lucide-react");
-var import_core57 = require("@unifold/core");
+var import_core56 = require("@unifold/core");
 var import_jsx_runtime75 = require("react/jsx-runtime");
 function WithdrawExecutionItem({ execution, onClick }) {
   const { colors: colors2, fonts, components } = useTheme();
   const { t: strings, locale } = useI18n();
-  const isPending = execution.status === import_core57.ExecutionStatus.PENDING || execution.status === import_core57.ExecutionStatus.WAITING || execution.status === import_core57.ExecutionStatus.DELAYED;
+  const isPending = execution.status === import_core56.ExecutionStatus.PENDING || execution.status === import_core56.ExecutionStatus.WAITING || execution.status === import_core56.ExecutionStatus.DELAYED;
   const formatDateTime = (timestamp) => {
     try {
       const date = new Date(timestamp);
@@ -31707,7 +31870,7 @@ function WithdrawExecutionItem({ execution, onClick }) {
           /* @__PURE__ */ (0, import_jsx_runtime75.jsx)(
             "img",
             {
-              src: execution.destination_token_metadata?.icon_url || (0, import_core57.getIconUrl)("/icons/tokens/svg/usdc.svg"),
+              src: execution.destination_token_metadata?.icon_url || (0, import_core56.getIconUrl)("/icons/tokens/svg/usdc.svg"),
               alt: "Token",
               width: 36,
               height: 36,
@@ -31806,7 +31969,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;
@@ -31822,9 +31985,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);
@@ -31945,7 +32108,7 @@ function WithdrawConfirmingView({
 }
 
 // src/components/withdrawals/WithdrawModal.tsx
-var import_core58 = require("@unifold/core");
+var import_core57 = require("@unifold/core");
 var import_jsx_runtime77 = require("react/jsx-runtime");
 var getChainKey5 = (chainId, chainType) => `${chainType}:${chainId}`;
 function WithdrawModal({
@@ -31974,35 +32137,39 @@ 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);
       if (selection?.kind !== "token") return;
       onEventRef.current?.({
-        id: (0, import_core58.generatePrefixedKSUID)("sevt"),
+        id: (0, import_core57.generatePrefixedKSUID)("sevt"),
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
-        type: import_core58.WithdrawEventType.TOKEN_SELECTED,
+        type: import_core57.WithdrawEventType.TOKEN_SELECTED,
         data: { object: selection.data }
       });
     }),
     [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,
@@ -32017,12 +32184,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,
@@ -32037,14 +32205,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");
@@ -32059,7 +32227,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,
@@ -32094,10 +32262,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,
@@ -32107,21 +32276,21 @@ function WithdrawModal({
     onWithdrawError: onWithdrawErrorFor
   });
   const { data: allWithdrawalsData } = useExecutions(externalUserId, publishableKey, {
-    actionType: import_core58.ActionType.Withdraw,
+    actionType: import_core57.ActionType.Withdraw,
     enabled: open,
     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)(
+      const response = await (0, import_core57.createDepositAddress)(
         {
           external_user_id: externalUserId,
           destination_chain_type: params.destinationChainType,
           destination_chain_id: params.destinationChainId,
           destination_token_address: params.destinationTokenAddress,
           recipient_address: params.recipientAddress,
-          action_type: import_core58.ActionType.Withdraw,
+          action_type: import_core57.ActionType.Withdraw,
           source_chain_type: sourceChainType
         },
         publishableKey
@@ -32129,16 +32298,17 @@ function WithdrawModal({
       if (response.user_id) {
         setUserId(response.user_id);
       }
-      const depositWallet = (0, import_core58.getWalletByChainType)(response.data, sourceChainType);
+      const depositWallet = (0, import_core57.getWalletByChainType)(response.data, sourceChainType);
       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(
@@ -32152,11 +32322,16 @@ 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"),
-        type: import_core58.WithdrawEventType.FLOW_STARTED,
+        id: (0, import_core57.generatePrefixedKSUID)("sevt"),
+        type: import_core57.WithdrawEventType.FLOW_STARTED,
         created: Math.floor(Date.now() / 1e3),
         sessionId: getSessionId() ?? "",
         data: {
@@ -32172,23 +32347,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);
@@ -32196,11 +32373,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;
@@ -32213,9 +32391,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;
@@ -32224,18 +32408,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);
@@ -32253,14 +32437,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);
@@ -32449,16 +32633,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) => {
@@ -32467,7 +32651,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 },
@@ -32480,7 +32664,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);