@rhinestone/deposit-modal 0.13.0 → 0.14.0

package/dist/{chunk-DSIZNRWA.mjs → chunk-KTUVSKR4.mjs}

@@ -2,6 +2,7 @@ import {
   ProcessingStep,
   SetupError,
   Tooltip,
+  analyticsTargetProperties,
   computeCacheKey,
   computeIsCacheable,
   computeRequestKey,
@@ -18,12 +19,13 @@ import {
   runAccountSetupDeduped,
   txRefsMatch,
   warnRemovedProps
-} from "./chunk-COCBCQQC.mjs";
+} from "./chunk-7SR7ENVJ.mjs";
 import {
   ListRow
-} from "./chunk-XYJFEN5D.mjs";
+} from "./chunk-WUJIKCFU.mjs";
 import {
   AlertTriangleIcon,
+  AnalyticsSession,
   AppleIcon,
   ArrowUpRightIcon,
   BankIcon,
@@ -79,13 +81,14 @@ import {
   useCatalogChain,
   useChainCatalog,
   useChainName,
+  useDepositAnalyticsEmitter,
   useDepositChainIds,
   useExplorerTxUrl,
   useIsDepositChain,
   useLatestRef,
   useRpcUrls,
   useStableRpcUrls
-} from "./chunk-EOMT5LKX.mjs";
+} from "./chunk-IN77XSWO.mjs";
 import {
   MULTICALL3_ADDRESS,
   POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS,
@@ -103,6 +106,7 @@ import {
   HYPERCORE_MIN_DEPOSIT_USD,
   HYPERCORE_SPOT_CAIP2,
   NATIVE_TOKEN_ADDRESS,
+  SOLANA_MAINNET_CAIP2,
   SOLANA_TOKENS,
   SUPPORTED_CHAIN_IDS,
   cdnIconUrl,
@@ -125,12 +129,13 @@ import {
   isVirtualDestination,
   parseEvmChainId,
   publishShortlistTokens,
-  targetChainToChainId
+  targetChainToChainId,
+  toEvmCaip2
 } from "./chunk-VUATPOWJ.mjs";
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo9,
+  useMemo as useMemo10,
   useEffect as useEffect13,
   useRef as useRef9,
   useState as useState15,
@@ -143,7 +148,7 @@ import {
 import {
   useState as useState13,
   useCallback as useCallback7,
-  useMemo as useMemo7,
+  useMemo as useMemo8,
   useEffect as useEffect12,
   useLayoutEffect as useLayoutEffect2,
   useRef as useRef8
@@ -1882,7 +1887,8 @@ function ConfirmStep({
             targetChain,
             targetToken,
             directTransfer: false,
-            sourceTxHashPending: true
+            sourceTxHashPending: true,
+            depositId: submitted.depositId
           }
         );
       } catch (err) {
@@ -2290,7 +2296,7 @@ function DepositNotification({
   );
   const pollIntervalRef = useRef4(INITIAL_POLL_INTERVAL);
   const pollTimeoutRef = useRef4(null);
-  const completedRef = useRef4(directTransfer ?? false);
+  const completedRef = useRef4(false);
   const depositContextRef = useLatestRef({
     amount,
     sourceChain,
@@ -2513,6 +2519,30 @@ function DepositNotification({
   );
 }
 
+// src/core/deposit-source-identity.ts
+var SOLANA_NATIVE_MINT = "11111111111111111111111111111111";
+var EVM_ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
+function sourceChainToCaip2(chain) {
+  if (chain === "solana") return SOLANA_MAINNET_CAIP2;
+  if (chain === "hypercore") return HYPERCORE_SPOT_CAIP2;
+  return toEvmCaip2(chain);
+}
+function findAddress(tokens, symbol) {
+  return tokens?.find((t) => t.symbol.toLowerCase() === symbol.toLowerCase())?.address;
+}
+function resolveSourceTokenIdentity(input) {
+  const { chain, symbol, shortlist, catalogTokens } = input;
+  if (!symbol) return void 0;
+  const shortlistTokens = shortlist?.[String(chain)];
+  const raw = shortlistTokens !== void 0 ? findAddress(shortlistTokens, symbol) : chain === "hypercore" || !Array.isArray(catalogTokens) ? void 0 : findAddress(catalogTokens, symbol);
+  if (!raw) return void 0;
+  if (chain === "solana") {
+    const isNative = raw.toLowerCase() === "native" || raw.toLowerCase() === EVM_ZERO_ADDRESS;
+    return isNative ? SOLANA_NATIVE_MINT : raw;
+  }
+  return raw.toLowerCase();
+}
+
 // src/components/steps/DepositAddressStep.tsx
 import { jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
 var QRCode = lazy(
@@ -2647,18 +2677,22 @@ function DepositAddressStep({
   onDepositSubmitted,
   onDepositComplete,
   onDepositFailed,
+  onAddressShown,
   onCopyAddress,
   onReviewDeposit,
   onError
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
   const [topTokens, setTopTokens] = useState7(null);
+  const [topTokensSettled, setTopTokensSettled] = useState7(false);
   useEffect7(() => {
     let active = true;
     setTopTokens(null);
+    setTopTokensSettled(false);
     service.getTopTokens().then((t) => {
       if (!active) return;
       setTopTokens(t);
+      setTopTokensSettled(true);
       if (t) publishShortlistTokens(t);
     });
     return () => {
@@ -2693,11 +2727,11 @@ function DepositAddressStep({
   const pendingChainRef = useRef5(initialSource?.chainId);
   useEffect7(() => {
     if (chainOptions.length === 0) return;
-    const pendingChain = pendingChainRef.current;
-    if (pendingChain !== void 0) {
-      if (chainOptions.includes(pendingChain)) {
+    const pendingChain2 = pendingChainRef.current;
+    if (pendingChain2 !== void 0) {
+      if (chainOptions.includes(pendingChain2)) {
         pendingChainRef.current = void 0;
-        setSourceChainId(pendingChain);
+        setSourceChainId(pendingChain2);
         return;
       }
       if (catalogLoading || topTokens === null) return;
@@ -2744,6 +2778,32 @@ function DepositAddressStep({
   const baselineTxHashRef = useRef5(void 0);
   const notificationIdRef = useRef5(0);
   const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
+  const sourceTokenIdentity = useMemo3(
+    () => resolveSourceTokenIdentity({
+      chain: sourceChainId,
+      symbol: sourceTokenSymbol,
+      shortlist: topTokens,
+      catalogTokens: catalogFor(sourceChainId)?.supportedTokens
+    }),
+    [sourceChainId, sourceTokenSymbol, topTokens, catalogFor]
+  );
+  const pendingChain = pendingChainRef.current;
+  const sourceSelectionSettled = !catalogLoading && topTokensSettled && chainOptions.length > 0 && (pendingChain === void 0 || pendingChain === sourceChainId) && (chainChosenByUser.current ? chainOptions.includes(sourceChainId) : sourceChainId === preferredChainId(chainOptions));
+  useEffect7(() => {
+    if (!sourceTokenIdentity) return;
+    if (!sourceSelectionSettled) return;
+    onAddressShown?.({
+      address: displayAddress,
+      sourceChainCaip2: sourceChainToCaip2(sourceChainId),
+      sourceTokenIdentity
+    });
+  }, [
+    displayAddress,
+    onAddressShown,
+    sourceChainId,
+    sourceTokenIdentity,
+    sourceSelectionSettled
+  ]);
   useEffect7(() => {
     if (!chainDropdownOpen && !tokenDropdownOpen) return;
     function handlePointerDown(event) {
@@ -2763,10 +2823,10 @@ function DepositAddressStep({
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = useCallback2(async () => {
-    onCopyAddress?.();
     try {
       await navigator.clipboard.writeText(displayAddress);
       setCopied(true);
+      onCopyAddress?.(true);
       setTimeout(() => setCopied(false), 2e3);
     } catch {
       const textarea = document.createElement("textarea");
@@ -2775,10 +2835,13 @@ function DepositAddressStep({
       textarea.style.opacity = "0";
       document.body.appendChild(textarea);
       textarea.select();
-      document.execCommand("copy");
+      const copiedWithFallback = document.execCommand("copy");
       document.body.removeChild(textarea);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2e3);
+      if (copiedWithFallback) {
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2e3);
+      }
+      onCopyAddress?.(copiedWithFallback);
     }
   }, [displayAddress, onCopyAddress]);
   const handleSelectChain = useCallback2(
@@ -3329,6 +3392,10 @@ function SwappedProviderStep({
   onClose,
   onGoBack,
   onError,
+  onAttemptConsumed,
+  onProviderHandoff,
+  onRetry,
+  onCancelled,
   onImmersiveChange,
   openExternally
 }) {
@@ -3344,6 +3411,7 @@ function SwappedProviderStep({
   const [opening, setOpening] = useState8(false);
   const iframeRef = useRef6(null);
   const openedUrlRef = useRef6(null);
+  const assignedIframeUrlRef = useRef6(null);
   const completeFiredRef = useRef6(false);
   const failedFiredRef = useRef6(false);
   const completeTimeoutRef = useRef6(null);
@@ -3364,6 +3432,8 @@ function SwappedProviderStep({
   onSwappedFailedRef.current = onSwappedFailed;
   const onErrorRef = useRef6(onError);
   onErrorRef.current = onError;
+  const onProviderHandoffRef = useRef6(onProviderHandoff);
+  onProviderHandoffRef.current = onProviderHandoff;
   const onGoBackRef = useRef6(onGoBack);
   onGoBackRef.current = onGoBack;
   const onImmersiveChangeRef = useRef6(onImmersiveChange);
@@ -3382,6 +3452,7 @@ function SwappedProviderStep({
     setHandoffOpened(false);
     setOpening(false);
     openedUrlRef.current = null;
+    assignedIframeUrlRef.current = null;
     if (completeTimeoutRef.current !== null) {
       clearTimeout(completeTimeoutRef.current);
       completeTimeoutRef.current = null;
@@ -3402,6 +3473,7 @@ function SwappedProviderStep({
       }
       setWidgetUrl(res.url);
       expectedExternalCustomerIdRef.current = res.externalCustomerId;
+      onAttemptConsumed?.(res.externalCustomerId);
       const sep = res.externalCustomerId.indexOf(":");
       expectedOrderUuidRef.current = sep >= 0 ? res.externalCustomerId.slice(sep + 1) : null;
     }).catch((err) => {
@@ -3421,13 +3493,20 @@ function SwappedProviderStep({
   useEffect8(() => {
     if (openExternally || !widgetUrl || iframeLoaded || loadError) return;
     const timer = setTimeout(() => {
-      setLoadError("Iframe took too long to load.");
+      const message = "Iframe took too long to load.";
+      setLoadError(message);
+      onErrorRef.current?.(message, "SWAPPED_IFRAME_TIMEOUT");
     }, IFRAME_LOAD_TIMEOUT_MS);
     return () => clearTimeout(timer);
   }, [openExternally, widgetUrl, iframeLoaded, loadError]);
   useEffect8(() => {
     if (openExternally) return;
-    setIframeSrc(widgetUrl && !loadError ? widgetUrl : null);
+    const nextSrc = widgetUrl && !loadError ? widgetUrl : null;
+    setIframeSrc(nextSrc);
+    if (nextSrc && assignedIframeUrlRef.current !== nextSrc) {
+      assignedIframeUrlRef.current = nextSrc;
+      onProviderHandoffRef.current?.();
+    }
   }, [openExternally, widgetUrl, loadError, retryToken]);
   const openPaymentPage = async (url) => {
     if (!openExternally) return;
@@ -3436,6 +3515,7 @@ function SwappedProviderStep({
     try {
       await openExternally(url);
       setHandoffOpened(true);
+      onProviderHandoff?.();
     } catch (error) {
       openedUrlRef.current = null;
       setLoadError(OPEN_FAILED_MESSAGE);
@@ -3592,6 +3672,9 @@ function SwappedProviderStep({
     }
     return null;
   }, [latestEvent, orderState, bannerForStatus]);
+  useEffect8(() => {
+    if (orderState?.status === "order_cancelled") onCancelled?.();
+  }, [onCancelled, orderState?.status]);
   useEffect8(() => {
     if (completeFiredRef.current || failedFiredRef.current) return;
     const t = latestEvent?.type;
@@ -3633,6 +3716,7 @@ function SwappedProviderStep({
   }, [immersive]);
   useEffect8(() => () => onImmersiveChangeRef.current?.(false), []);
   const handleRetry = () => {
+    onRetry?.();
     setIframeSrc(null);
     setWidgetUrl(null);
     setIframeLoaded(false);
@@ -3802,6 +3886,10 @@ function FiatOnrampStep({
   onClose,
   onGoBack,
   onError,
+  onAttemptConsumed,
+  onProviderHandoff,
+  onRetry,
+  onCancelled,
   onImmersiveChange,
   openExternally
 }) {
@@ -3846,6 +3934,10 @@ function FiatOnrampStep({
       onClose,
       onGoBack,
       onError,
+      onAttemptConsumed,
+      onProviderHandoff,
+      onRetry,
+      onCancelled,
       onImmersiveChange,
       openExternally
     }
@@ -3895,6 +3987,10 @@ function ExchangeConnectStep({
   onClose,
   onGoBack,
   onError,
+  onAttemptConsumed,
+  onProviderHandoff,
+  onRetry,
+  onCancelled,
   onImmersiveChange,
   openExternally
 }) {
@@ -3922,6 +4018,10 @@ function ExchangeConnectStep({
       onClose,
       onGoBack,
       onError,
+      onAttemptConsumed,
+      onProviderHandoff,
+      onRetry,
+      onCancelled,
       onImmersiveChange,
       openExternally
     }
@@ -5659,8 +5759,297 @@ function bootRetryPlan(params) {
   };
 }
 
+// src/core/deposit-analytics.tsx
+import {
+  createContext,
+  useContext,
+  useMemo as useMemo7
+} from "react";
+import { jsx as jsx27 } from "react/jsx-runtime";
+function fundingMethodForFlowMode(mode) {
+  switch (mode) {
+    case "wallet":
+    case "solana-wallet":
+      return "wallet";
+    case "deposit-address":
+      return "transfer";
+    case "fiat-onramp":
+      return "fiat_onramp";
+    case "exchange-connect":
+      return "exchange_connect";
+    case "dapp-import":
+      return "asset_migration";
+    default:
+      return null;
+  }
+}
+function analyticsStepForFlowStep(method, step) {
+  if (!method) {
+    return step === "setup" ? "account_setup" : "funding_method_home";
+  }
+  switch (step) {
+    case "connect":
+      return method === "wallet" ? "wallet_connect" : "funding_method_home";
+    case "setup":
+      return "account_setup";
+    case "select-asset":
+      return "wallet_source_asset";
+    case "solana-token-select":
+      return "wallet_source_token";
+    case "amount":
+    case "solana-amount":
+      return method === "asset_migration" ? "migration_amount" : "wallet_amount";
+    case "confirm":
+    case "solana-confirm":
+      return method === "asset_migration" ? "migration_review" : "wallet_review";
+    case "processing":
+      return method === "asset_migration" ? "migration_processing" : method === "transfer" ? "transfer_tracking" : method === "fiat_onramp" ? "fiat_receipt" : method === "exchange_connect" ? "exchange_receipt" : "wallet_processing";
+    case "deposit-address":
+      return "transfer_address_shown";
+    case "qr-amount":
+      return "transfer_fee_amount";
+    case "qr-review":
+      return "transfer_fee_review";
+    case "fiat-onramp":
+      return "fiat_provider_handoff";
+    case "exchange-select":
+      return "exchange_selection";
+    case "exchange-connect":
+      return "exchange_provider_handoff";
+    case "dapp-import-resolving":
+      return "migration_boot_resolve";
+    case "dapp-import-select":
+      return "migration_provider_selection";
+    case "dapp-import-asset-select":
+      return "migration_asset_selection";
+    default:
+      return "funding_method_home";
+  }
+}
+function failureReasonForCode(code, cause) {
+  const normalized = `${code ?? ""} ${cause ?? ""}`.toLowerCase();
+  if (normalized.includes("uncertain")) return "submission_uncertain";
+  if (normalized.includes("reject") && (normalized.includes("sign") || normalized.includes("permit"))) {
+    return "wallet_signature_rejected";
+  }
+  if (normalized.includes("permit")) {
+    return "wallet_permit_preparation_unavailable";
+  }
+  if (normalized.includes("clipboard")) return "transfer_clipboard_failed";
+  if (normalized.includes("switch") && normalized.includes("reject")) {
+    return "wallet_chain_switch_rejected";
+  }
+  if (normalized.includes("reject")) return "submission_rejected";
+  if (normalized.includes("switch")) return "wallet_chain_switch_failed";
+  if (normalized.includes("quote")) return "quote_unavailable";
+  if (normalized.includes("price")) return "quote_source_price_unavailable";
+  if (normalized.includes("iframe_timeout")) return "swapped_iframe_timeout";
+  if (normalized.includes("connect_exchanges") || normalized.includes("exchange_list")) {
+    return "exchange_list_failed";
+  }
+  if (normalized.includes("browser")) return "swapped_browser_open_failed";
+  if (normalized.includes("swapped") || normalized.includes("onramp")) {
+    return "swapped_mint_failed";
+  }
+  if (normalized.includes("solana") || normalized.includes("transfer")) {
+    return "submission_failed";
+  }
+  return "submission_failed";
+}
+function correlatorKey(correlator) {
+  return `${correlator.type}:${correlator.value}`;
+}
+function createDepositAnalyticsController(emit) {
+  let method = null;
+  let step = null;
+  let afterHandoff = false;
+  let opened = false;
+  let closed = false;
+  const dedupe = /* @__PURE__ */ new Set();
+  const emitOnce = (key, ...args) => {
+    if (dedupe.has(key)) return;
+    dedupe.add(key);
+    emit(...args);
+  };
+  const controller = {
+    emit,
+    openSession() {
+      if (opened) return;
+      opened = true;
+      emit({ type: "deposit_modal_open" }, null);
+    },
+    selectMethod(...args) {
+      const [nextMethod, entrySource, identifiers] = args;
+      controller.openSession();
+      if (method && method !== nextMethod && !afterHandoff) {
+        controller.abandon("method_replacement");
+      }
+      method = nextMethod;
+      step = null;
+      afterHandoff = false;
+      emitOnce(
+        `method:${nextMethod}:${entrySource}:${JSON.stringify(identifiers ?? {})}`,
+        ...[
+          {
+            type: "deposit_modal_method_selected",
+            entry_source: entrySource,
+            ...identifiers ? { identifiers } : {}
+          },
+          nextMethod
+        ]
+      );
+    },
+    openStep(nextStep) {
+      controller.openSession();
+      if (step === nextStep) return;
+      step = nextStep;
+      emitOnce(
+        `step-open:${method ?? "none"}:${nextStep}`,
+        { type: "deposit_modal_step_open", step: nextStep },
+        method
+      );
+    },
+    completeStep(completedStep = step ?? void 0) {
+      if (!completedStep) return;
+      emitOnce(
+        `step-complete:${method ?? "none"}:${completedStep}`,
+        { type: "deposit_modal_step_complete", step: completedStep },
+        method
+      );
+    },
+    friction(reason, eventStep = step ?? void 0) {
+      if (!eventStep) return;
+      emitOnce(
+        `friction:${method}:${eventStep}:${reason}`,
+        {
+          type: "deposit_modal_friction",
+          step: eventStep,
+          reason
+        },
+        method
+      );
+    },
+    failure(reason, retryable, eventStep = step ?? void 0) {
+      if (!eventStep) return;
+      emitOnce(
+        `failure:${method}:${eventStep}:${reason}`,
+        {
+          type: "deposit_modal_failure",
+          step: eventStep,
+          reason,
+          retryable
+        },
+        method
+      );
+    },
+    retry(reason, eventStep = step ?? void 0) {
+      if (!eventStep) return;
+      emit({ type: "deposit_modal_retry", step: eventStep, reason }, method);
+      for (const key of [...dedupe]) {
+        if (key.includes(`:${method}:${eventStep}:`)) dedupe.delete(key);
+      }
+    },
+    handoff(...args) {
+      const [handoffMethod, correlator, eventStep = step ?? void 0, identifiers] = args;
+      if (!eventStep) return;
+      if (step !== eventStep) controller.openStep(eventStep);
+      afterHandoff = true;
+      emitOnce(
+        `handoff:${correlatorKey(correlator)}:${JSON.stringify(identifiers ?? {})}`,
+        ...[
+          {
+            type: "deposit_modal_handoff",
+            step: eventStep,
+            correlator,
+            ...identifiers ? { identifiers } : {}
+          },
+          handoffMethod
+        ]
+      );
+    },
+    observeCorrelator(correlator, eventStep = step ?? void 0) {
+      if (!eventStep) return;
+      const key = `correlator:${correlatorKey(correlator)}`;
+      if (dedupe.has(key)) return;
+      if (step !== eventStep) controller.openStep(eventStep);
+      emitOnce(
+        key,
+        {
+          type: "deposit_modal_correlator_observed",
+          step: eventStep,
+          correlator
+        },
+        method
+      );
+    },
+    outcome(outcome) {
+      if (!step) return;
+      emitOnce(
+        `outcome:${method}:${outcome}`,
+        { type: "deposit_modal_ui_outcome", step, outcome },
+        method
+      );
+    },
+    abandon(reason) {
+      if (!method || !step || afterHandoff) return;
+      emitOnce(
+        `abandon:${method}:${reason}`,
+        { type: "deposit_modal_method_abandoned", step, reason },
+        method
+      );
+    },
+    close(source) {
+      if (closed) return;
+      closed = true;
+      emit(
+        {
+          type: "deposit_modal_close",
+          source,
+          step,
+          after_handoff: afterHandoff
+        },
+        method
+      );
+    },
+    resetAttempt(nextMethod = null) {
+      method = nextMethod;
+      step = null;
+      afterHandoff = false;
+      dedupe.clear();
+    },
+    get method() {
+      return method;
+    },
+    get step() {
+      return step;
+    },
+    get afterHandoff() {
+      return afterHandoff;
+    }
+  };
+  return controller;
+}
+var DepositAnalyticsControllerContext = createContext(null);
+var noopController = createDepositAnalyticsController(() => {
+});
+function DepositAnalyticsControllerProvider({
+  children,
+  controllerRef
+}) {
+  const emit = useDepositAnalyticsEmitter();
+  const controller = useMemo7(
+    () => createDepositAnalyticsController(emit),
+    [emit]
+  );
+  if (controllerRef) controllerRef.current = controller;
+  return /* @__PURE__ */ jsx27(DepositAnalyticsControllerContext.Provider, { value: controller, children });
+}
+function useDepositAnalyticsController() {
+  return useContext(DepositAnalyticsControllerContext) ?? noopController;
+}
+
 // src/store/index.ts
-import { createContext, createElement, useContext } from "react";
+import { createContext as createContext2, createElement, useContext as useContext2 } from "react";
 import { useStore } from "zustand";
 import { createStore } from "zustand/vanilla";
 
@@ -6654,7 +7043,7 @@ function createDepositStore(overrides) {
     }
   };
 }
-var DepositStoreContext = createContext(null);
+var DepositStoreContext = createContext2(null);
 function DepositStoreProvider({
   store,
   children
@@ -6666,7 +7055,7 @@ function DepositStoreProvider({
   );
 }
 function useDepositStoreApi() {
-  const store = useContext(DepositStoreContext);
+  const store = useContext2(DepositStoreContext);
   if (!store) {
     throw new Error(
       "useDepositStore must be called inside <DepositStoreProvider>"
@@ -6680,7 +7069,7 @@ function useDepositStore(selector) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment6, jsx as jsx27, jsxs as jsxs23 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx28, jsxs as jsxs23 } from "react/jsx-runtime";
 function swappedWidgetPrefetchKey(method, methodSelectionSource) {
   return JSON.stringify([methodSelectionSource ?? null, method ?? null]);
 }
@@ -6689,17 +7078,17 @@ function AccountPreparingSkeleton({
   onRetry
 }) {
   return /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx27("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs23(Fragment6, { children: [
-      /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
+    /* @__PURE__ */ jsx28("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs23(Fragment6, { children: [
+      /* @__PURE__ */ jsx28("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx28("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx28("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx28("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx28(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx27("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx28("span", { children: "Try again" })
       }
     ) })
   ] });
@@ -6955,6 +7344,7 @@ function DepositFlow({
   fiatMethods,
   enableExchangeConnect = false,
   walletSession,
+  walletIntegration,
   onConnect,
   onDisconnect,
   onRequestConnect,
@@ -6967,13 +7357,12 @@ function DepositFlow({
   onSubmittingChange,
   onClose,
   onLifecycle,
-  onEvent,
   onError,
   debug
 }) {
   const rpcUrls = useRpcUrls();
   const onStepChangeRef = useLatestRef(onStepChange);
-  const onEventRef = useLatestRef(onEvent);
+  const analytics = useDepositAnalyticsController();
   const onLifecycleRef = useLatestRef(onLifecycle);
   const onErrorRef = useLatestRef(onError);
   const storeApi = useDepositStoreApi();
@@ -7021,14 +7410,14 @@ function DepositFlow({
       for (const link of links) link.remove();
     };
   }, [enableSwappedPreconnect]);
-  const dappSwitchChain = useMemo7(() => {
+  const dappSwitchChain = useMemo8(() => {
     if (!walletClientProp?.switchChain) return void 0;
     return async (chainId) => {
       await walletClientProp.switchChain?.({ id: chainId });
     };
   }, [walletClientProp]);
   const connectedWalletAddress = walletClientProp?.account?.address ?? null;
-  const walletOptions = useMemo7(() => {
+  const walletOptions = useMemo8(() => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
     if (connectedWalletAddress) {
@@ -7077,12 +7466,12 @@ function DepositFlow({
     walletSession?.solanaAddress,
     walletSession?.caipAddress
   ]);
-  const offeredFiatMethods = useMemo7(
+  const offeredFiatMethods = useMemo8(
     () => fiatMethods ? FIAT_ONRAMP_METHODS.filter((m) => fiatMethods[m.method]) : FIAT_ONRAMP_METHODS,
     [fiatMethods]
   );
   const fiatEnabled = enableFiatOnramp && offeredFiatMethods.length > 0;
-  const enabledAssetMigrationIds = useMemo7(
+  const enabledAssetMigrationIds = useMemo8(
     () => Object.entries(assetMigrations ?? {}).filter(([, on]) => on).map(([id]) => id),
     [assetMigrations]
   );
@@ -7105,7 +7494,7 @@ function DepositFlow({
     hasWalletClientProp && walletClientProp === void 0 || walletSession && !hasReownSession && !walletSession.isReady
   );
   const showConnectStep = flowMode === null && !isConnectSelectionConfirmed;
-  const walletSelectionKey = useMemo7(() => {
+  const walletSelectionKey = useMemo8(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") return null;
     if (canAutoLock) {
       return getAddressKey(connectedWalletAddress);
@@ -7142,7 +7531,7 @@ function DepositFlow({
       cancelled = true;
     };
   }, [service, targetSymbol, isTargetStablecoin, targetChain, targetToken]);
-  const walletSignerContext = useMemo7(() => {
+  const walletSignerContext = useMemo8(() => {
     if (flowMode === "deposit-address") {
       return null;
     }
@@ -7217,7 +7606,7 @@ function DepositFlow({
       stableWalletSignerRef.current = walletSignerContext;
     }
   }, [flowMode, walletSelectionKey, walletSignerContext]);
-  const signerContext = useMemo7(() => {
+  const signerContext = useMemo8(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") {
       return null;
     }
@@ -7235,7 +7624,7 @@ function DepositFlow({
     walletSignerContext,
     walletSelectionKey
   ]);
-  const selectedEvmWalletOwner = useMemo7(() => {
+  const selectedEvmWalletOwner = useMemo8(() => {
     if (!selectedWalletId) return null;
     const opt = walletOptions.find((o) => o.id === selectedWalletId);
     if (opt?.kind === "external" && opt.address) {
@@ -7246,7 +7635,7 @@ function DepositFlow({
     }
     return null;
   }, [selectedWalletId, walletOptions]);
-  const dappImportOwner = useMemo7(() => {
+  const dappImportOwner = useMemo8(() => {
     if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
     if (walletSession?.address && walletSession.isConnected) {
       return walletSession.address;
@@ -7259,7 +7648,7 @@ function DepositFlow({
     walletSession?.isConnected,
     connectedWalletAddress
   ]);
-  const activeOwner = useMemo7(
+  const activeOwner = useMemo8(
     () => resolveOwnerForMode(flowMode, {
       walletOwner: signerContext?.ownerAddress ?? (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner),
       dappImportOwner
@@ -7324,7 +7713,7 @@ function DepositFlow({
     activeEntry.smartAccount,
     onLifecycleRef
   ]);
-  const effectiveStep = useMemo7(
+  const effectiveStep = useMemo8(
     () => deriveStep(
       flowSlice,
       depositSlice,
@@ -7344,11 +7733,52 @@ function DepositFlow({
   );
   const step = effectiveStep;
   const handleBack = useCallback7(() => {
+    if ([
+      "deposit-address",
+      "select-asset",
+      "solana-token-select",
+      "fiat-onramp",
+      "exchange-select",
+      "exchange-connect",
+      "dapp-import-resolving",
+      "dapp-import-select",
+      "dapp-import-asset-select"
+    ].includes(effectiveStep.type)) {
+      analytics.abandon("back");
+      analytics.resetAttempt(
+        effectiveStep.type === "exchange-connect" ? "exchange_connect" : null
+      );
+    }
+    storeApi.dispatch({
+      type: "back/requested",
+      hasWalletOptions: hasWalletOptions || Boolean(walletSession)
+    });
+  }, [
+    analytics,
+    effectiveStep.type,
+    storeApi,
+    hasWalletOptions,
+    walletSession
+  ]);
+  const handleProviderBack = useCallback7(() => {
+    analytics.abandon("provider_back");
+    analytics.resetAttempt(
+      flowMode === "exchange-connect" ? "exchange_connect" : null
+    );
+    storeApi.dispatch({
+      type: "back/requested",
+      hasWalletOptions: hasWalletOptions || Boolean(walletSession)
+    });
+  }, [analytics, flowMode, storeApi, hasWalletOptions, walletSession]);
+  const handleWalletDisconnect = useCallback7(() => {
+    analytics.abandon("wallet_disconnect");
+    analytics.resetAttempt();
+    onDisconnect?.();
     storeApi.dispatch({
       type: "back/requested",
       hasWalletOptions: hasWalletOptions || Boolean(walletSession)
     });
-  }, [storeApi, hasWalletOptions, walletSession]);
+  }, [analytics, hasWalletOptions, onDisconnect, storeApi, walletSession]);
   const qrSourceAsset = effectiveStep.type === "qr-amount" ? effectiveStep.asset : null;
   const qrSourceKey = qrSourceAsset ? `${qrSourceAsset.chainId}:${qrSourceAsset.token}` : null;
   const [qrSourcePrice, setQrSourcePrice] = useState13({ resolved: false, usd: null });
@@ -7417,51 +7847,22 @@ function DepositFlow({
     });
     return () => cancelAnimationFrame(rafId);
   }, [stepPinKey]);
-  const stepSendToken = effectiveStep.type === "amount" ? effectiveStep.asset.symbol : null;
-  const stepOpenEventKey = effectiveStep.type === "select-asset" ? "select-asset" : effectiveStep.type === "deposit-address" ? "deposit-address" : effectiveStep.type === "amount" && stepSendToken ? `amount:${stepSendToken.toLowerCase()}` : null;
-  const lastStepOpenEventKeyRef = useRef8(null);
+  const analyticsMethod = fundingMethodForFlowMode(flowMode);
+  const analyticsStep = analyticsStepForFlowStep(
+    analyticsMethod,
+    showConnectStep ? "connect" : effectiveStep.type
+  );
   useEffect12(() => {
-    if (!stepOpenEventKey) {
-      lastStepOpenEventKeyRef.current = null;
-      return;
-    }
-    if (lastStepOpenEventKeyRef.current === stepOpenEventKey) {
-      return;
-    }
-    lastStepOpenEventKeyRef.current = stepOpenEventKey;
-    if (effectiveStep.type === "select-asset") {
-      onEventRef.current?.({
-        type: "deposit_modal_connected_wallet_select_source_open",
-        total_balance_in_external_wallet: totalBalanceUsd,
-        pred_balance: totalBalanceUsd
-      });
-    } else if (effectiveStep.type === "deposit-address") {
-      const chainName = getChainName(targetChainId);
-      const tokenSymbol = getTargetTokenSymbol(targetToken, targetChainId);
-      onEventRef.current?.({
-        type: "deposit_modal_transfer_crypto_open",
-        default_chain: chainName,
-        default_token: tokenSymbol,
-        pred_balance: totalBalanceUsd
-      });
-    } else if (effectiveStep.type === "amount" && stepSendToken) {
-      const receiveSymbol = getTargetTokenSymbol(targetToken, targetChainId);
-      onEventRef.current?.({
-        type: "deposit_modal_connected_wallet_enter_value_open",
-        send_token: stepSendToken,
-        receive_token: receiveSymbol,
-        pred_balance: totalBalanceUsd
-      });
+    analytics.openSession();
+    analytics.openStep(analyticsStep);
+  }, [analytics, analyticsStep]);
+  useEffect12(() => {
+    if (setupSlice.status === "loading") {
+      analytics.friction("account_setup_pending", "account_setup");
+    } else if (setupSlice.status === "error") {
+      analytics.failure("account_setup_failed", true, "account_setup");
     }
-  }, [
-    effectiveStep.type,
-    stepOpenEventKey,
-    stepSendToken,
-    targetChain,
-    targetToken,
-    totalBalanceUsd,
-    onEventRef
-  ]);
+  }, [analytics, setupSlice.status]);
   useEffect12(() => {
     logFlow("state:changed", {
       step: effectiveStep.type,
@@ -7490,30 +7891,35 @@ function DepositFlow({
   const isFiatOnrampMode = flowMode === "fiat-onramp";
   const isExchangeConnectMode = flowMode === "exchange-connect";
   const handleSelectTransferCrypto = useCallback7(() => {
+    analytics.selectMethod("transfer", "user");
     storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
-  }, [storeApi]);
+  }, [analytics, storeApi]);
   const handleConfirmWallet = useCallback7(
     (walletId) => {
       const selectedOption = walletOptions.find((o) => o.id === walletId);
       const mode = selectedOption?.kind === "solana" ? "solana-wallet" : "wallet";
+      analytics.selectMethod("wallet", "user", {
+        network: selectedOption?.kind === "solana" ? "solana" : "evm",
+        integration: walletIntegration ?? "none"
+      });
       storeApi.dispatch({
         type: "connect/wallet-confirmed",
         walletId,
         mode
       });
     },
-    [walletOptions, storeApi]
+    [analytics, walletIntegration, walletOptions, storeApi]
   );
   const isSolanaWalletConnected = Boolean(
     walletSession?.isConnected && walletSession?.isSolana
   );
   const assetMigrationsKey = assetMigrations ? Object.keys(assetMigrations).filter((k) => assetMigrations[k]).sort().join(",") : "";
-  const enabledDappImportProviders = useMemo7(
+  const enabledDappImportProviders = useMemo8(
     () => isSolanaWalletConnected ? [] : getEnabledProviders(assetMigrations),
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: keyed on assetMigrationsKey, not the assetMigrations object identity
     [assetMigrationsKey, isSolanaWalletConnected]
   );
-  const initialAssetMigrationProvider = useMemo7(
+  const initialAssetMigrationProvider = useMemo8(
     () => initialAssetMigration ? enabledDappImportProviders.find((p) => p.id === initialAssetMigration) ?? null : null,
     [initialAssetMigration, enabledDappImportProviders]
   );
@@ -7531,12 +7937,15 @@ function DepositFlow({
           });
         }
       }
+      analytics.selectMethod("asset_migration", "user", {
+        provider: providerId
+      });
       storeApi.dispatch({
         type: "dapp-import/provider-selected",
         providerId
       });
     },
-    [storeApi, walletOptions, dappImportOwner]
+    [analytics, storeApi, walletOptions, dappImportOwner]
   );
   const handleDappImportAssetSelected = useCallback7(
     (asset) => {
@@ -7582,6 +7991,12 @@ function DepositFlow({
         });
       }).catch(() => {
         if (controller.signal.aborted) return;
+        if (analytics.method === "asset_migration") {
+          analytics.friction(
+            "migration_availability_failed",
+            "migration_provider_selection"
+          );
+        }
         storeApi.dispatch({
           type: "dapp-import/availability-failed",
           providerId: provider.id,
@@ -7591,6 +8006,7 @@ function DepositFlow({
     }
     return () => controller.abort();
   }, [
+    analytics,
     dappImportOwner,
     enabledDappImportProviders,
     dappImportAttemptNonce,
@@ -7603,11 +8019,14 @@ function DepositFlow({
     if (flowSlice.step !== "connect" || flowSlice.mode !== null || flowSlice.isConnectSelectionConfirmed || flowSlice.hasNavigatedBack) {
       return;
     }
+    analytics.selectMethod("asset_migration", "initial_config", {
+      provider: initialAssetMigrationProvider.id
+    });
     storeApi.dispatch({
       type: "dapp-import/boot-requested",
       providerId: initialAssetMigrationProvider.id
     });
-  }, [initialAssetMigrationProvider, flowSlice, storeApi]);
+  }, [analytics, initialAssetMigrationProvider, flowSlice, storeApi]);
   const dappImportAvailability = useDepositStore((s) => s.dappImport.availability);
   const dappImportAvailabilityOwner = useDepositStore(
     (s) => s.dappImport.availabilityOwner
@@ -7616,7 +8035,7 @@ function DepositFlow({
     (s) => s.dappImport.activeProviderId
   );
   const dappImportBootError = useDepositStore((s) => s.dappImport.bootError);
-  const dappImportSelectRows = useMemo7(
+  const dappImportSelectRows = useMemo8(
     () => enabledDappImportProviders.map((provider) => ({
       id: provider.id,
       status: computeDappImportStatus(provider.id, {
@@ -7634,7 +8053,7 @@ function DepositFlow({
       dappImportOwner
     ]
   );
-  const dappImportTotal = useMemo7(() => {
+  const dappImportTotal = useMemo8(() => {
     let totalUsd = 0;
     let pending = false;
     for (const row of dappImportSelectRows) {
@@ -7648,13 +8067,13 @@ function DepositFlow({
     }
     return { status: pending ? "loading" : "ready", totalUsd };
   }, [dappImportSelectRows]);
-  const activeDappImportProvider = useMemo7(() => {
+  const activeDappImportProvider = useMemo8(() => {
     if (!activeDappImportProviderId) return null;
     return enabledDappImportProviders.find(
       (p) => p.id === activeDappImportProviderId
     ) ?? null;
   }, [activeDappImportProviderId, enabledDappImportProviders]);
-  const activeDappImportAvailability = useMemo7(() => {
+  const activeDappImportAvailability = useMemo8(() => {
     if (!activeDappImportProviderId) return null;
     if (!dappImportOwner || dappImportAvailabilityOwner?.toLowerCase() !== dappImportOwner.toLowerCase()) {
       return null;
@@ -7683,6 +8102,8 @@ function DepositFlow({
     const providerId = activeDappImportProviderId;
     if (!providerId) return;
     if (!enabledDappImportProviders.some((p) => p.id === providerId)) {
+      analytics.abandon("initial_migration_fallback");
+      analytics.resetAttempt();
       storeApi.dispatch({
         type: "dapp-import/boot-resolved",
         providerId,
@@ -7712,6 +8133,9 @@ function DepositFlow({
         type: "wallet/id-selected",
         walletId: pinnableWallet.id
       });
+    } else if (outcome === "unavailable") {
+      analytics.abandon("initial_migration_fallback");
+      analytics.resetAttempt();
     }
     storeApi.dispatch({
       type: "dapp-import/boot-resolved",
@@ -7730,9 +8154,14 @@ function DepositFlow({
     hasResolveDeadlinePassed,
     isDappImportWalletHydrating,
     walletOptions,
+    analytics,
     storeApi
   ]);
   const handleBootRetry = useCallback7(() => {
+    analytics.retry(
+      "migration_availability_failed",
+      "migration_boot_resolve"
+    );
     const snapshot = storeApi.getState();
     const providerId = snapshot.dappImport.activeProviderId;
     if (!providerId) return;
@@ -7754,20 +8183,45 @@ function DepositFlow({
       type: "dapp-import/boot-requested",
       providerId
     });
-  }, [storeApi, dappImportOwner]);
+  }, [analytics, storeApi, dappImportOwner]);
   const handleSelectFiatMethod = useCallback7(
     (paymentMethod, methodSelectionSource) => {
+      analytics.selectMethod("fiat_onramp", "user", {
+        payment_method: paymentMethod,
+        source: methodSelectionSource
+      });
       storeApi.dispatch({
         type: "connect/fiat-onramp-selected",
         paymentMethod,
         methodSelectionSource
       });
     },
-    [storeApi]
+    [analytics, storeApi]
   );
   const handleSelectExchange = useCallback7(() => {
+    analytics.selectMethod("exchange_connect", "user");
     storeApi.dispatch({ type: "connect/exchange-selected" });
-  }, [storeApi]);
+  }, [analytics, storeApi]);
+  const swappedAnalyticsCorrelatorRef = useRef8(null);
+  const handleSwappedAttemptConsumed = useCallback7((externalCustomerId) => {
+    swappedAnalyticsCorrelatorRef.current = externalCustomerId;
+  }, []);
+  const handleSwappedProviderHandoff = useCallback7(() => {
+    const externalCustomerId = swappedAnalyticsCorrelatorRef.current;
+    if (!externalCustomerId) return;
+    analytics.handoff(
+      flowMode === "exchange-connect" ? "exchange_connect" : "fiat_onramp",
+      { type: "swapped_external_customer_id", value: externalCustomerId },
+      flowMode === "exchange-connect" ? "exchange_provider_handoff" : "fiat_provider_handoff"
+    );
+  }, [analytics, flowMode]);
+  const handleSwappedRetry = useCallback7(() => {
+    analytics.retry(
+      "swapped_mint_failed",
+      flowMode === "exchange-connect" ? "exchange_provider_mint" : "fiat_provider_mint"
+    );
+    swappedAnalyticsCorrelatorRef.current = null;
+  }, [analytics, flowMode]);
   const swappedConnectUrlRef = useRef8(/* @__PURE__ */ new Map());
   const acknowledgedConnectFeeRef = useRef8(/* @__PURE__ */ new Map());
   const handleSelectExchangeConnection = useCallback7(
@@ -7808,13 +8262,16 @@ function DepositFlow({
       }
       swappedConnectUrlRef.current.set(key, entry);
       acknowledgedConnectFeeRef.current.set(key, actualFeeBps);
+      analytics.selectMethod("exchange_connect", "user", {
+        exchange: connection
+      });
       storeApi.dispatch({
         type: "exchange/connection-selected",
         connection
       });
       return actualFeeBps;
     },
-    [service, setupSlice.status, setupSlice.smartAccount, storeApi]
+    [analytics, service, setupSlice.status, setupSlice.smartAccount, storeApi]
   );
   const loadSwappedConnectUrl = useCallback7(
     async (smartAccount, connection) => {
@@ -7916,9 +8373,10 @@ function DepositFlow({
       recommendedMethod: null
     });
     let settled = false;
-    const showFallback = () => {
+    const showFallback = (reason) => {
       if (cancelled || settled) return;
       settled = true;
+      analytics.friction(reason, "fiat_regional_payment_method");
       setRegionalMethods({
         status: "error",
         country: null,
@@ -7926,7 +8384,10 @@ function DepositFlow({
         recommendedMethod: null
       });
     };
-    const timeoutTimer = setTimeout(showFallback, REGIONAL_METHODS_TIMEOUT_MS);
+    const timeoutTimer = setTimeout(
+      () => showFallback("regional_methods_timeout"),
+      REGIONAL_METHODS_TIMEOUT_MS
+    );
     service.getSwappedPaymentMethods().then((res) => {
       if (cancelled || settled) return;
       settled = true;
@@ -7935,14 +8396,14 @@ function DepositFlow({
     }).catch(() => {
       if (cancelled) return;
       clearTimeout(timeoutTimer);
-      showFallback();
+      showFallback("regional_methods_failed");
     });
     return () => {
       cancelled = true;
       clearTimeout(timeoutTimer);
     };
-  }, [fiatEnabled, hasConfiguredFiatMethods, service]);
-  const cashDisplay = useMemo7(() => {
+  }, [analytics, fiatEnabled, hasConfiguredFiatMethods, service]);
+  const cashDisplay = useMemo8(() => {
     if (!fiatEnabled) return { kind: "hidden" };
     if (hasConfiguredFiatMethods) {
       return {
@@ -7960,45 +8421,26 @@ function DepositFlow({
     offeredFiatMethods,
     regionalMethods
   ]);
-  const lastFiatMethodsRenderedEventRef = useRef8(null);
   useEffect12(() => {
-    if (cashDisplay.kind !== "list") return;
-    const emit = onEventRef.current;
-    if (!emit) return;
-    const paymentMethods = cashDisplay.methods.map(({ method }) => method);
-    const eventKey = [
-      cashDisplay.source,
-      cashDisplay.country ?? "none",
-      ...paymentMethods
-    ].join(":");
-    if (lastFiatMethodsRenderedEventRef.current === eventKey) return;
-    lastFiatMethodsRenderedEventRef.current = eventKey;
-    emit({
-      type: "deposit_modal_fiat_methods_rendered",
-      country: cashDisplay.country,
-      payment_methods: paymentMethods,
-      source: cashDisplay.source
-    });
-  }, [cashDisplay, onEvent, onEventRef]);
+    if (cashDisplay.kind === "hidden" && fiatEnabled) {
+      analytics.friction(
+        "regional_methods_empty",
+        "fiat_regional_payment_method"
+      );
+    } else if (cashDisplay.kind === "list" && cashDisplay.source === "fallback" && !hasConfiguredFiatMethods) {
+      analytics.friction(
+        "regional_methods_fallback",
+        "fiat_regional_payment_method"
+      );
+    }
+  }, [analytics, cashDisplay, fiatEnabled, hasConfiguredFiatMethods]);
   const displayedFiatSource = cashDisplay.kind === "list" ? cashDisplay.source : void 0;
-  const displayedFiatCountry = cashDisplay.kind === "list" ? cashDisplay.country : null;
   const handleSelectDisplayedFiatMethod = useCallback7(
     (method) => {
       if (!displayedFiatSource) return;
-      onEventRef.current?.({
-        type: "deposit_modal_fiat_method_click",
-        country: displayedFiatCountry,
-        payment_method: method,
-        source: displayedFiatSource
-      });
       handleSelectFiatMethod(method, displayedFiatSource);
     },
-    [
-      displayedFiatCountry,
-      displayedFiatSource,
-      handleSelectFiatMethod,
-      onEventRef
-    ]
+    [displayedFiatSource, handleSelectFiatMethod]
   );
   const handlePrefetchDisplayedFiatMethod = useCallback7(
     (method) => {
@@ -8008,6 +8450,8 @@ function DepositFlow({
     [displayedFiatSource, handlePrefetchFiatMethod]
   );
   const handleNewDeposit = useCallback7(() => {
+    analytics.completeStep();
+    analytics.resetAttempt();
     onLifecycleRef.current?.({
       type: "smart-account-changed",
       evm: null,
@@ -8020,8 +8464,8 @@ function DepositFlow({
     swappedConnectUrlRef.current.clear();
     acknowledgedConnectFeeRef.current.clear();
     lastSmartAccountLifecycleKeyRef.current = null;
-  }, [onLifecycleRef, storeApi]);
-  const setupInput = useMemo7(
+  }, [analytics, onLifecycleRef, storeApi]);
+  const setupInput = useMemo8(
     () => ({
       targetChain,
       targetToken,
@@ -8099,11 +8543,11 @@ function DepositFlow({
       }
     })();
   }, [setupInput, service, debug, storeApi, setupSlice]);
-  const walletOptionsKey = useMemo7(
+  const walletOptionsKey = useMemo8(
     () => walletOptions.map((option) => option.id).join(","),
     [walletOptions]
   );
-  const desiredPortfolios = useMemo7(
+  const desiredPortfolios = useMemo8(
     () => walletOptions.flatMap((option) => {
       const network = option.kind === "solana" ? "solana" : "evm";
       const address = option.kind === "solana" ? option.solanaAddress : option.address;
@@ -8159,9 +8603,13 @@ function DepositFlow({
         sourceChain: data.sourceChain,
         amount: data.amount
       });
+      analytics.observeCorrelator(
+        { type: "transaction_hash", value: data.txHash },
+        "transfer_tracking"
+      );
       onLifecycleRef.current?.({ type: "submitted", ...data });
     },
-    [logFlow, onLifecycleRef]
+    [analytics, logFlow, onLifecycleRef]
   );
   const handleSolanaTokenContinue = useCallback7(
     (token, balance, balanceUsd) => {
@@ -8209,6 +8657,11 @@ function DepositFlow({
         amountUnits,
         token: tokenAtSubmit.symbol
       });
+      analytics.handoff(
+        "wallet",
+        { type: "transaction_hash", value: txHash },
+        "wallet_submit"
+      );
       storeApi.dispatch({
         type: "deposit/submitted",
         txHash,
@@ -8232,25 +8685,18 @@ function DepositFlow({
         amountUsd
       });
     },
-    [logFlow, onLifecycleRef, storeApi]
+    [analytics, logFlow, onLifecycleRef, storeApi]
   );
   const handleAssetContinue = useCallback7(
     (asset) => {
-      onEventRef.current?.({
-        type: "deposit_modal_connected_wallet_select_source_cta_click",
-        total_balance_in_external_wallet: totalBalanceUsd,
-        pred_balance: totalBalanceUsd,
-        cta_name: "token_selected",
-        token_name: asset.symbol,
-        token_balance: asset.balance ?? "0"
-      });
+      analytics.completeStep("wallet_source_asset");
       storeApi.dispatch({
         type: "asset/selected",
         asset,
         seedAmount: defaultAmount
       });
     },
-    [defaultAmount, onEventRef, totalBalanceUsd, storeApi]
+    [analytics, defaultAmount, storeApi]
   );
   const handleAmountContinue = useCallback7(
     (amount, targetAmount, balance) => {
@@ -8298,6 +8744,21 @@ function DepositFlow({
       });
       const depositAtSubmit = storeApi.getState().deposit;
       const asset = depositAtSubmit.selectedAsset;
+      const handoffMethod = flowMode === "dapp-import" ? "asset_migration" : "wallet";
+      const handoffStep = flowMode === "dapp-import" ? "migration_submit" : "wallet_submit";
+      if (routed.depositId) {
+        analytics.handoff(
+          handoffMethod,
+          { type: "deposit_id", value: routed.depositId },
+          handoffStep
+        );
+      } else if (!routed.sourceTxHashPending) {
+        analytics.handoff(
+          handoffMethod,
+          { type: "transaction_hash", value: txHash },
+          handoffStep
+        );
+      }
       storeApi.dispatch({
         type: "deposit/submitted",
         txHash,
@@ -8317,7 +8778,7 @@ function DepositFlow({
         quote
       });
     },
-    [logFlow, storeApi]
+    [analytics, flowMode, logFlow, storeApi]
   );
   const handleSwappedComplete = useCallback7(
     (info) => {
@@ -8393,6 +8854,10 @@ function DepositFlow({
   const handleDepositComplete = useCallback7(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
+      analytics.openStep(
+        analyticsStepForFlowStep(analyticsMethod, "processing")
+      );
+      analytics.outcome("completed");
       onLifecycleRef.current?.({
         type: "complete",
         txHash,
@@ -8400,21 +8865,40 @@ function DepositFlow({
         ...context
       });
     },
-    [logFlow, onLifecycleRef]
+    [analytics, analyticsMethod, logFlow, onLifecycleRef]
   );
   const handleDepositFailed = useCallback7(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
+      analytics.openStep(
+        analyticsStepForFlowStep(analyticsMethod, "processing")
+      );
+      analytics.outcome("failed");
+      analytics.failure("processor_failed", false);
       onLifecycleRef.current?.({ type: "failed", txHash, error });
     },
-    [logFlowError, onLifecycleRef]
+    [analytics, analyticsMethod, logFlowError, onLifecycleRef]
   );
   const handleError = useCallback7(
     (message, code, cause) => {
       logFlowError("flow:error", cause ?? message, { code });
+      if (code === "PROCESS_TIMEOUT") {
+        analytics.friction("processor_status_poll_failed");
+      } else {
+        const reason = failureReasonForCode(
+          code,
+          `${message} ${cause ?? ""}`
+        );
+        const failureStep = code === "SWAPPED_URL_FAILED" ? "fiat_provider_mint" : code === "SWAPPED_CONNECT_URL_FAILED" ? "exchange_provider_mint" : void 0;
+        analytics.failure(
+          reason,
+          reason !== "submission_uncertain",
+          failureStep
+        );
+      }
       onErrorRef.current?.({ message, code, cause });
     },
-    [logFlowError, onErrorRef]
+    [analytics, logFlowError, onErrorRef]
   );
   const handleTotalBalanceComputed = useCallback7((total) => {
     setTotalBalanceUsd(total);
@@ -8441,7 +8925,7 @@ function DepositFlow({
     signerContext,
     storeApi
   ]);
-  const walletRows = useMemo7(() => {
+  const walletRows = useMemo8(() => {
     if (!enableWallet) return [];
     return walletOptions.map((option) => {
       const entry = setupSlice;
@@ -8470,10 +8954,11 @@ function DepositFlow({
   const transferCryptoEntry = setupSlice;
   const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
   const handleRetrySetup = useCallback7(() => {
+    analytics.retry("account_setup_failed", "account_setup");
     storeApi.dispatch({ type: "setup/retry-requested" });
-  }, [storeApi]);
+  }, [analytics, storeApi]);
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27(
+    return /* @__PURE__ */ jsx28("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx28(
       ConnectStep,
       {
         walletRows,
@@ -8518,7 +9003,10 @@ function DepositFlow({
           // hasn't landed must still surface the row and show it inside the
           // picker as "Coming soon" — keying this on implemented providers
           // hid the feature entirely for such a config.
-          enabledAssetMigrationIds.length > 0 ? () => storeApi.dispatch({ type: "dapp-import/picker-opened" }) : void 0
+          enabledAssetMigrationIds.length > 0 ? () => {
+            analytics.selectMethod("asset_migration", "user");
+            storeApi.dispatch({ type: "dapp-import/picker-opened" });
+          } : void 0
         ),
         migrateAssetsBalanceStatus: dappImportTotal.status,
         migrateAssetsBalanceUsd: dappImportTotal.totalUsd
@@ -8527,19 +9015,19 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx27(
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ jsx28(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.message ?? void 0,
           onRetry: () => handleRetrySetup()
         }
-      ) : /* @__PURE__ */ jsx27(
+      ) : /* @__PURE__ */ jsx28(
         DepositAddressSkeleton,
         {
           uiConfig
         }
       )),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx28(
         DepositAddressStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8552,23 +9040,38 @@ function DepositFlow({
           onDepositSubmitted: handleDepositAddressSubmitted,
           onDepositComplete: handleDepositComplete,
           onDepositFailed: handleDepositFailed,
-          onCopyAddress: () => {
-            const chainName = getChainName(targetChainId);
-            const tokenSymbol = getTargetTokenSymbol(targetToken, targetChainId);
-            onEvent?.({
-              type: "deposit_modal_transfer_crypto_cta_click",
-              default_chain: chainName,
-              default_token: tokenSymbol,
-              pred_balance: totalBalanceUsd,
-              cta_name: "copy"
-            });
+          onAddressShown: ({
+            address,
+            sourceChainCaip2,
+            sourceTokenIdentity
+          }) => {
+            analytics.handoff(
+              "transfer",
+              { type: "deposit_address", value: address },
+              "transfer_address_shown",
+              {
+                source_chain: sourceChainCaip2,
+                source_token: sourceTokenIdentity
+              }
+            );
+          },
+          onCopyAddress: (success) => {
+            if (success) {
+              analytics.completeStep("transfer_copy");
+            } else {
+              analytics.failure(
+                "transfer_clipboard_failed",
+                true,
+                "transfer_copy"
+              );
+            }
           },
           onReviewDeposit: handleQrReviewRequested,
           onError: handleError,
           debug
         }
       ),
-      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "qr-amount" && /* @__PURE__ */ jsx28(
         AmountStep,
         {
           asset: effectiveStep.asset,
@@ -8584,7 +9087,7 @@ function DepositFlow({
           onContinue: handleQrAmountContinue
         }
       ),
-      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "qr-review" && /* @__PURE__ */ jsx28(
         QrReviewStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8608,14 +9111,14 @@ function DepositFlow({
         "data-flow-mode": "fiat-onramp",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx27(
+          step.type === "setup" && /* @__PURE__ */ jsx28(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "fiat-onramp" && /* @__PURE__ */ jsx27(
+          step.type === "fiat-onramp" && /* @__PURE__ */ jsx28(
             FiatOnrampStep,
             {
               smartAccount: step.smartAccount,
@@ -8625,15 +9128,20 @@ function DepositFlow({
               consumePrefetchedUrl: consumeSwappedWidgetUrlPrefetch,
               onSwappedComplete: handleSwappedComplete,
               onSwappedFailed: handleDepositFailed,
-              onClose: onClose ?? (() => {
-              }),
-              onGoBack: handleBack,
+              onClose: () => onClose?.(
+                openExternally ? "native_dismiss_request" : "header_button"
+              ),
+              onGoBack: handleProviderBack,
               onError: handleError,
+              onAttemptConsumed: handleSwappedAttemptConsumed,
+              onProviderHandoff: handleSwappedProviderHandoff,
+              onRetry: handleSwappedRetry,
+              onCancelled: () => analytics.outcome("cancelled"),
               onImmersiveChange: onSwappedImmersiveChange,
               openExternally
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx27(
+          step.type === "processing" && /* @__PURE__ */ jsx28(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -8675,14 +9183,14 @@ function DepositFlow({
         "data-flow-mode": "exchange-connect",
         "data-step-type": step.type,
         children: [
-          step.type === "setup" && /* @__PURE__ */ jsx27(
+          step.type === "setup" && /* @__PURE__ */ jsx28(
             AccountPreparingSkeleton,
             {
               errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
               onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
             }
           ),
-          step.type === "exchange-select" && /* @__PURE__ */ jsx27(
+          step.type === "exchange-select" && /* @__PURE__ */ jsx28(
             ExchangeSelectStep,
             {
               service,
@@ -8690,7 +9198,7 @@ function DepositFlow({
               onError: handleError
             }
           ),
-          step.type === "exchange-connect" && /* @__PURE__ */ jsx27(
+          step.type === "exchange-connect" && /* @__PURE__ */ jsx28(
             ExchangeConnectStep,
             {
               smartAccount: step.smartAccount,
@@ -8699,15 +9207,20 @@ function DepositFlow({
               loadUrl: () => loadSwappedConnectUrl(step.smartAccount, step.connection),
               onSwappedComplete: handleSwappedComplete,
               onSwappedFailed: handleDepositFailed,
-              onClose: onClose ?? (() => {
-              }),
-              onGoBack: handleBack,
+              onClose: () => onClose?.(
+                openExternally ? "native_dismiss_request" : "header_button"
+              ),
+              onGoBack: handleProviderBack,
               onError: handleError,
+              onAttemptConsumed: handleSwappedAttemptConsumed,
+              onProviderHandoff: handleSwappedProviderHandoff,
+              onRetry: handleSwappedRetry,
+              onCancelled: () => analytics.outcome("cancelled"),
               onImmersiveChange: onSwappedImmersiveChange,
               openExternally
             }
           ),
-          step.type === "processing" && /* @__PURE__ */ jsx27(
+          step.type === "processing" && /* @__PURE__ */ jsx28(
             ProcessingStep,
             {
               smartAccount: step.smartAccount,
@@ -8745,28 +9258,25 @@ function DepositFlow({
     const solanaAddr = walletSession?.solanaAddress;
     const solanaProvider = walletSession?.solanaProvider;
     return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx28(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx28(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
           service,
           onContinue: handleSolanaTokenContinue,
           onTotalBalanceComputed: handleTotalBalanceComputed,
-          onDisconnect: onDisconnect ? () => {
-            onDisconnect();
-            handleBack();
-          } : void 0,
+          onDisconnect: onDisconnect ? handleWalletDisconnect : void 0,
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx28(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -8782,7 +9292,7 @@ function DepositFlow({
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx27(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx28(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8805,14 +9315,14 @@ function DepositFlow({
         }
       ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs23("div", { className: "rs-step", children: [
         /* @__PURE__ */ jsxs23("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx27("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx27(
+          /* @__PURE__ */ jsx28("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx28(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx27(
+              children: /* @__PURE__ */ jsx28(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -8823,21 +9333,21 @@ function DepositFlow({
             }
           ) }),
           /* @__PURE__ */ jsxs23("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx27("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx27("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+            /* @__PURE__ */ jsx28("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx28("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx27("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx27(
+        /* @__PURE__ */ jsx28("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx28(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBack,
-            children: /* @__PURE__ */ jsx27("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx28("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
         ProcessingStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -8867,13 +9377,13 @@ function DepositFlow({
     ] });
   }
   if (isDappImportMode && effectiveStep.type === "dapp-import-resolving") {
-    return /* @__PURE__ */ jsx27(
+    return /* @__PURE__ */ jsx28(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx27(
+        children: /* @__PURE__ */ jsx28(
           DappImportAssetSelectSkeleton,
           {
             sourceLabel: activeDappImportProvider?.sourceLabel ?? "",
@@ -8885,13 +9395,13 @@ function DepositFlow({
     );
   }
   if (effectiveStep.type === "dapp-import-select") {
-    return /* @__PURE__ */ jsx27(
+    return /* @__PURE__ */ jsx28(
       "div",
       {
         className: "rs-modal-body",
         "data-flow-mode": "dapp-import",
         "data-step-type": effectiveStep.type,
-        children: /* @__PURE__ */ jsx27(
+        children: /* @__PURE__ */ jsx28(
           DappImportSelectStep,
           {
             enabledIds: enabledAssetMigrationIds,
@@ -8918,7 +9428,7 @@ function DepositFlow({
     );
   }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx27("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx27("div", { className: "rs-step", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx27("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
+    return /* @__PURE__ */ jsx28("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx28("div", { className: "rs-step", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx28("div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
@@ -8929,14 +9439,14 @@ function DepositFlow({
     return getPublicClient(chainId, rpcUrls);
   };
   return /* @__PURE__ */ jsxs23("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx28(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup() : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx28(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -8946,13 +9456,10 @@ function DepositFlow({
         service,
         onContinue: handleAssetContinue,
         onTotalBalanceComputed: handleTotalBalanceComputed,
-        onDisconnect: onDisconnect ? () => {
-          onDisconnect();
-          handleBack();
-        } : void 0
+        onDisconnect: onDisconnect ? handleWalletDisconnect : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx28(
       DappImportAssetSelectStep,
       {
         sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.sourceLabel,
@@ -8961,7 +9468,7 @@ function DepositFlow({
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx28(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -8978,18 +9485,11 @@ function DepositFlow({
         service,
         onContinue: handleAmountContinue,
         onCtaClick: (ctaName) => {
-          const receiveSymbol = getTargetTokenSymbol(targetToken, targetChainId);
-          onEvent?.({
-            type: "deposit_modal_connected_wallet_enter_value_cta_click",
-            send_token: effectiveStep.asset.symbol,
-            receive_token: receiveSymbol,
-            pred_balance: totalBalanceUsd,
-            cta_name: ctaName
-          });
+          if (ctaName === "continue") analytics.completeStep();
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx28(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -9038,7 +9538,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx27(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx28(
       ProcessingStep,
       {
         smartAccount: effectiveStep.smartAccount,
@@ -9058,6 +9558,10 @@ function DepositFlow({
         initialEvent: effectiveStep.initialEvent,
         quote: effectiveStep.quote,
         uiConfig,
+        onSourceTransactionObserved: (txHash) => analytics.observeCorrelator(
+          { type: "transaction_hash", value: txHash },
+          flowMode === "dapp-import" ? "migration_processing" : "wallet_processing"
+        ),
         onClose,
         onNewDeposit: handleNewDeposit,
         onRetry: handleNewDeposit,
@@ -9071,8 +9575,8 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback8, useMemo as useMemo8, useState as useState14 } from "react";
-import { jsx as jsx28, jsxs as jsxs24 } from "react/jsx-runtime";
+import { useCallback as useCallback8, useMemo as useMemo9, useState as useState14 } from "react";
+import { jsx as jsx29, jsxs as jsxs24 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
@@ -9188,7 +9692,7 @@ function DepositHistoryPanel({
     },
     [onClose]
   );
-  const visibleDeposits = useMemo8(() => {
+  const visibleDeposits = useMemo9(() => {
     const sourceHashes = new Set(
       deposits.map((d) => d.sourceTxHash?.toLowerCase()).filter((h) => Boolean(h))
     );
@@ -9205,54 +9709,54 @@ function DepositHistoryPanel({
       onKeyDown: handleKeyDown,
       children: [
         /* @__PURE__ */ jsxs24("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx28("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx28(
+          /* @__PURE__ */ jsx29("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx29(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx28(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx29(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsx28("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx28(
+          /* @__PURE__ */ jsx29("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx29(
             "button",
             {
               type: "button",
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ jsx28(CloseIcon, {})
+              children: /* @__PURE__ */ jsx29(CloseIcon, {})
             }
           ) })
         ] }),
         /* @__PURE__ */ jsxs24("div", { className: "rs-history-screen", children: [
           /* @__PURE__ */ jsxs24("div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ jsx28(BodyHeader, { icon: /* @__PURE__ */ jsx28(HistoryIcon, {}), title: "History" }),
+            /* @__PURE__ */ jsx29(BodyHeader, { icon: /* @__PURE__ */ jsx29(HistoryIcon, {}), title: "History" }),
             isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx29(HistoryIcon, {}) }),
               /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx28(Spinner, { className: "rs-spinner--sm" }),
-                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
+                /* @__PURE__ */ jsx29(Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
             error && !isLoading && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx29(AlertTriangleIcon, {}) }),
               /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
-                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: error })
+                /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
+                /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
             !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx28(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx29(HistoryIcon, {}) }),
               /* @__PURE__ */ jsxs24("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
-                /* @__PURE__ */ jsx28("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
+                /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
+                /* @__PURE__ */ jsx29("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
               ] })
             ] }),
             visibleDeposits.length > 0 && /* @__PURE__ */ jsxs24("div", { className: "rs-history-list", children: [
-              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx28(HistoryCard, { deposit }, deposit.txHash || i)),
-              hasMore && /* @__PURE__ */ jsx28(
+              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx29(HistoryCard, { deposit }, deposit.txHash || i)),
+              hasMore && /* @__PURE__ */ jsx29(
                 "button",
                 {
                   type: "button",
@@ -9264,7 +9768,7 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsx28(PoweredBy, {})
+          /* @__PURE__ */ jsx29(PoweredBy, {})
         ] })
       ]
     }
@@ -9301,35 +9805,35 @@ function HistoryCard({ deposit }) {
       children: [
         /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-row", children: [
           /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-icons", children: [
-            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-token", children: /* @__PURE__ */ jsx28(TokenIcon, { symbol: sourceSymbol, fallback: sourceSymbol.slice(0, 2) }) }),
-            sourceChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx28(CdnIcon, { src: sourceChainIcon }) })
+            /* @__PURE__ */ jsx29("span", { className: "rs-history-card-token", children: /* @__PURE__ */ jsx29(TokenIcon, { symbol: sourceSymbol, fallback: sourceSymbol.slice(0, 2) }) }),
+            sourceChainIcon && /* @__PURE__ */ jsx29("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx29(CdnIcon, { src: sourceChainIcon }) })
           ] }),
           /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-text", children: [
-            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-title", children: txTypeLabel }),
-            date && /* @__PURE__ */ jsx28("span", { className: "rs-history-card-date", children: date })
+            /* @__PURE__ */ jsx29("span", { className: "rs-history-card-title", children: txTypeLabel }),
+            date && /* @__PURE__ */ jsx29("span", { className: "rs-history-card-date", children: date })
           ] }),
           /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-side", children: [
-            /* @__PURE__ */ jsx28("span", { className: "rs-history-card-amount", children: displayAmount }),
-            /* @__PURE__ */ jsx28("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
+            /* @__PURE__ */ jsx29("span", { className: "rs-history-card-amount", children: displayAmount }),
+            /* @__PURE__ */ jsx29("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx28("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx28("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-details", children: [
+        /* @__PURE__ */ jsx29("div", { className: "rs-history-card-panel", children: /* @__PURE__ */ jsx29("div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ jsxs24("div", { className: "rs-history-card-details", children: [
           sourceChainName && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx28("span", { children: "Source chain" }),
+            /* @__PURE__ */ jsx29("span", { children: "Source chain" }),
             /* @__PURE__ */ jsxs24("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx28("span", { children: sourceChainName }),
-              sourceChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx28(CdnIcon, { src: sourceChainIcon }) })
+              /* @__PURE__ */ jsx29("span", { children: sourceChainName }),
+              sourceChainIcon && /* @__PURE__ */ jsx29("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx29(CdnIcon, { src: sourceChainIcon }) })
             ] })
           ] }),
           targetChainName && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx28("span", { children: "Destination chain" }),
+            /* @__PURE__ */ jsx29("span", { children: "Destination chain" }),
             /* @__PURE__ */ jsxs24("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx28("span", { children: targetChainName }),
-              targetChainIcon && /* @__PURE__ */ jsx28("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx28(CdnIcon, { src: targetChainIcon }) })
+              /* @__PURE__ */ jsx29("span", { children: targetChainName }),
+              targetChainIcon && /* @__PURE__ */ jsx29("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx29(CdnIcon, { src: targetChainIcon }) })
             ] })
           ] }),
           srcTxUrl && srcTxHash && /* @__PURE__ */ jsxs24("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx28("span", { children: "Transaction details" }),
+            /* @__PURE__ */ jsx29("span", { children: "Transaction details" }),
             /* @__PURE__ */ jsxs24(
               "a",
               {
@@ -9339,8 +9843,8 @@ function HistoryCard({ deposit }) {
                 className: "rs-history-card-link",
                 onClick: (e) => e.stopPropagation(),
                 children: [
-                  /* @__PURE__ */ jsx28("span", { children: shortenHash(srcTxHash) }),
-                  /* @__PURE__ */ jsx28(ArrowUpRightIcon, {})
+                  /* @__PURE__ */ jsx29("span", { children: shortenHash(srcTxHash) }),
+                  /* @__PURE__ */ jsx29(ArrowUpRightIcon, {})
                 ]
               }
             )
@@ -9353,9 +9857,9 @@ function HistoryCard({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx29, jsxs as jsxs25 } from "react/jsx-runtime";
+import { jsx as jsx30, jsxs as jsxs25 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-3H75G3XQ.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-Q2JMLT47.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -9364,6 +9868,55 @@ function sortByCreatedAtDesc(items) {
     return bt - at;
   });
 }
+function buildDepositAnalyticsSessionProperties({
+  enableWallet = true,
+  enableFiatOnramp = false,
+  enableQrTransfer = true,
+  enableGaslessDeposit = false,
+  enableExchangeConnect = false,
+  fiatMethods,
+  assetMigrations,
+  initialAssetMigration,
+  inline = false,
+  closeOnOverlayClick = false,
+  sourceChain,
+  sourceToken,
+  defaultAmount,
+  walletIntegration,
+  targetChain,
+  targetToken
+}) {
+  const configuredFiatIdentifiers = fiatMethods ? Object.entries(fiatMethods).filter(([, enabled]) => enabled === true).map(([identifier]) => identifier).sort() : null;
+  const migrationProviders = Object.entries(assetMigrations ?? {}).filter(([, enabled]) => enabled === true).map(([identifier]) => identifier).sort();
+  const safeInitialMigration = initialAssetMigration && migrationProviders.includes(initialAssetMigration) ? initialAssetMigration : null;
+  const enabledFundingMethods = [];
+  if (enableWallet && walletIntegration !== "none") {
+    enabledFundingMethods.push("wallet");
+  }
+  if (enableQrTransfer) enabledFundingMethods.push("transfer");
+  if (enableFiatOnramp && configuredFiatIdentifiers?.length !== 0) {
+    enabledFundingMethods.push("fiat_onramp");
+  }
+  if (enableExchangeConnect) enabledFundingMethods.push("exchange_connect");
+  if (migrationProviders.length > 0) enabledFundingMethods.push("asset_migration");
+  return {
+    enabled_funding_methods: enabledFundingMethods,
+    wallet_integration: walletIntegration,
+    fiat_methods: configuredFiatIdentifiers === null ? { source: "backend_resolved" } : { source: "configured", identifiers: configuredFiatIdentifiers },
+    asset_migration_providers: migrationProviders,
+    initial_asset_migration: safeInitialMigration,
+    gasless_wallet_flow_enabled: enableGaslessDeposit,
+    presentation: inline ? "inline" : "overlay",
+    overlay_close_enabled: !inline && closeOnOverlayClick,
+    prefills: {
+      source_chain: sourceChain !== void 0,
+      source_token: sourceToken !== void 0,
+      amount: defaultAmount !== void 0,
+      initial_asset_migration: initialAssetMigration !== void 0
+    },
+    ...analyticsTargetProperties({ targetChain, targetToken })
+  };
+}
 var WALLET_CLIENT_PROP = "walletClient";
 function hasSuppliedWalletClient(props) {
   return Object.prototype.hasOwnProperty.call(props, WALLET_CLIENT_PROP);
@@ -9374,7 +9927,7 @@ function DepositModal(props) {
   const needsReown = !!props.reownAppId;
   const hasWalletClientProp = hasSuppliedWalletClient(props);
   if (needsReown) {
-    return /* @__PURE__ */ jsx29(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx29(
+    return /* @__PURE__ */ jsx30(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx30(
       ReownDepositInner,
       {
         ...props,
@@ -9382,7 +9935,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx30(
     DepositModalInner,
     {
       ...props,
@@ -9430,11 +9983,16 @@ function DepositModalInner({
   onLifecycle,
   onEvent,
   onError,
+  enableAnalyticsIngest,
+  analyticsIngestUrl,
   onUiState,
   openExternally,
+  walletIntegration: walletIntegrationProp,
   debug
 }) {
   const modalRef = useRef9(null);
+  const analyticsControllerRef = useRef9(null);
+  const previousOpenRef = useRef9(isOpen);
   const onReadyRef = useLatestRef(onReady);
   const onUiStateRef = useLatestRef(onUiState);
   const [currentScreen, setCurrentScreen] = useState15("connect");
@@ -9456,7 +10014,7 @@ function DepositModalInner({
   const targetChain = targetChainProp === "solana" || targetChainProp === HYPERCORE_SPOT_CAIP2 ? targetChainProp : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
   const rpcUrls = useStableRpcUrls(rpcUrlsProp);
-  const service = useMemo9(
+  const service = useMemo10(
     () => createDepositService(backendUrl, {
       debug,
       debugScope: "service:deposit"
@@ -9481,7 +10039,7 @@ function DepositModalInner({
       console.debug("[deposit] client setup config (not shown yet)", clientSetup);
     }
   }, [debug, clientSetup]);
-  const store = useMemo9(
+  const store = useMemo10(
     () => createDepositStore({ targetChain, targetToken }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
@@ -9591,6 +10149,31 @@ function DepositModalInner({
     },
     [onLifecycleRef, markHistoryStale]
   );
+  const closeWithSource = useCallback9(
+    (source) => {
+      const analytics = analyticsControllerRef.current;
+      analytics?.abandon(source === "provider_back" ? "provider_back" : "modal_close");
+      analytics?.close(source);
+      onClose();
+    },
+    [onClose]
+  );
+  const handleModalDismiss = useCallback9(
+    (reason) => {
+      closeWithSource(
+        reason === "escape" ? "escape" : reason === "overlay" ? "overlay" : "header_button"
+      );
+    },
+    [closeWithSource]
+  );
+  useEffect13(() => {
+    if (previousOpenRef.current && !isOpen) {
+      const analytics = analyticsControllerRef.current;
+      analytics?.abandon("modal_close");
+      analytics?.close("host_controlled");
+    }
+    previousOpenRef.current = isOpen;
+  }, [isOpen]);
   useEffect13(() => {
     if (!isOpen) {
       setHistoryOpen(false);
@@ -9611,111 +10194,147 @@ function DepositModalInner({
       store.dispatch({ type: "flow/reset" });
     }
   }, [isOpen, store]);
+  const walletIntegration = walletIntegrationProp ?? (hasWalletClientProp || walletSession || onRequestConnect ? "host_supplied" : "none");
+  const analyticsSessionProperties = buildDepositAnalyticsSessionProperties({
+    enableWallet,
+    enableFiatOnramp,
+    enableQrTransfer,
+    enableGaslessDeposit,
+    enableExchangeConnect,
+    fiatMethods,
+    assetMigrations,
+    initialAssetMigration,
+    inline,
+    closeOnOverlayClick,
+    sourceChain: sourceChainProp,
+    sourceToken,
+    defaultAmount,
+    walletIntegration,
+    targetChain,
+    targetToken
+  });
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
   const hideHeaderChrome = swappedImmersive;
   const modalClassName = `rs-modal${hideHeaderChrome ? " rs-modal--swapped-iframe" : ""}`;
-  return /* @__PURE__ */ jsx29(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx29(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx29(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx29(
+  return /* @__PURE__ */ jsx30(RpcUrlsProvider, { value: rpcUrls, children: /* @__PURE__ */ jsx30(ChainCatalogProvider, { service, rpcUrls, children: /* @__PURE__ */ jsx30(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx30(
     Modal,
     {
       isOpen,
-      onClose,
+      onClose: handleModalDismiss,
       className,
       inline,
       closeOnOverlayClick,
-      children: /* @__PURE__ */ jsxs25("div", { ref: modalRef, className: modalClassName, children: [
-        !hideHeaderChrome && /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx29("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx29(
-            "button",
+      children: /* @__PURE__ */ jsx30(
+        AnalyticsSession,
+        {
+          modal: "deposit",
+          sessionProperties: analyticsSessionProperties,
+          onEvent,
+          backendUrl,
+          enableIngest: enableAnalyticsIngest,
+          ingestUrl: analyticsIngestUrl,
+          children: /* @__PURE__ */ jsx30(
+            DepositAnalyticsControllerProvider,
             {
-              type: "button",
-              className: "rs-modal-header-back",
-              "aria-label": "Go back",
-              onClick: backHandler,
-              children: /* @__PURE__ */ jsx29(ChevronLeftIcon, {})
+              controllerRef: analyticsControllerRef,
+              children: /* @__PURE__ */ jsxs25("div", { ref: modalRef, className: modalClassName, children: [
+                !hideHeaderChrome && /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header--redesigned", children: [
+                  /* @__PURE__ */ jsx30("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx30(
+                    "button",
+                    {
+                      type: "button",
+                      className: "rs-modal-header-back",
+                      "aria-label": "Go back",
+                      onClick: backHandler,
+                      children: /* @__PURE__ */ jsx30(ChevronLeftIcon, {})
+                    }
+                  ) }),
+                  /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header-nav-right", children: [
+                    historyButtonVisible && /* @__PURE__ */ jsx30(
+                      "button",
+                      {
+                        type: "button",
+                        className: "rs-modal-header-history",
+                        "aria-label": "Deposit history",
+                        onClick: handleHistoryOpen,
+                        disabled: !recipient,
+                        children: /* @__PURE__ */ jsx30(HistoryIcon, {})
+                      }
+                    ),
+                    /* @__PURE__ */ jsx30(
+                      "button",
+                      {
+                        type: "button",
+                        onClick: () => closeWithSource("header_button"),
+                        className: "rs-modal-close",
+                        "aria-label": "Close",
+                        children: /* @__PURE__ */ jsx30(CloseIcon, {})
+                      }
+                    )
+                  ] })
+                ] }),
+                /* @__PURE__ */ jsx30(
+                  DepositFlow,
+                  {
+                    walletClientProp,
+                    publicClientProp,
+                    hasWalletClientProp,
+                    targetChain,
+                    targetToken,
+                    service,
+                    sourceChain,
+                    sourceToken,
+                    amount: defaultAmount,
+                    recipient,
+                    appBalanceUsd,
+                    outputTokenRules,
+                    rejectUnmapped,
+                    forceRegister,
+                    assetMigrations,
+                    initialAssetMigration,
+                    enableFiatOnramp,
+                    enableQrTransfer,
+                    enableGaslessDeposit,
+                    fiatMethods,
+                    enableWallet,
+                    enableExchangeConnect,
+                    walletSession,
+                    walletIntegration,
+                    onConnect,
+                    onDisconnect,
+                    onRequestConnect,
+                    uiConfig,
+                    appFees: clientSetup?.appFees,
+                    appFeesResolved: clientSetup !== null,
+                    onStepChange: handleStepChange,
+                    onSwappedImmersiveChange: setSwappedImmersive,
+                    openExternally,
+                    onSubmittingChange: setSubmitting,
+                    onClose: (source) => closeWithSource(source ?? "header_button"),
+                    onLifecycle: handleLifecycle,
+                    onError,
+                    debug
+                  }
+                ),
+                historyOpen && /* @__PURE__ */ jsx30(
+                  DepositHistoryPanel,
+                  {
+                    deposits: historyDeposits,
+                    isLoading: historyLoading,
+                    error: historyError,
+                    hasMore: hasMoreHistory,
+                    isLoadingMore: historyLoadingMore,
+                    onLoadMore: handleHistoryLoadMore,
+                    onClose: handleHistoryClose,
+                    onCloseModal: () => closeWithSource("header_button")
+                  }
+                )
+              ] })
             }
-          ) }),
-          /* @__PURE__ */ jsxs25("div", { className: "rs-modal-header-nav-right", children: [
-            historyButtonVisible && /* @__PURE__ */ jsx29(
-              "button",
-              {
-                type: "button",
-                className: "rs-modal-header-history",
-                "aria-label": "Deposit history",
-                onClick: handleHistoryOpen,
-                disabled: !recipient,
-                children: /* @__PURE__ */ jsx29(HistoryIcon, {})
-              }
-            ),
-            /* @__PURE__ */ jsx29(
-              "button",
-              {
-                type: "button",
-                onClick: onClose,
-                className: "rs-modal-close",
-                "aria-label": "Close",
-                children: /* @__PURE__ */ jsx29(CloseIcon, {})
-              }
-            )
-          ] })
-        ] }),
-        /* @__PURE__ */ jsx29(
-          DepositFlow,
-          {
-            walletClientProp,
-            publicClientProp,
-            hasWalletClientProp,
-            targetChain,
-            targetToken,
-            service,
-            sourceChain,
-            sourceToken,
-            amount: defaultAmount,
-            recipient,
-            appBalanceUsd,
-            outputTokenRules,
-            rejectUnmapped,
-            forceRegister,
-            assetMigrations,
-            initialAssetMigration,
-            enableFiatOnramp,
-            enableQrTransfer,
-            enableGaslessDeposit,
-            fiatMethods,
-            enableWallet,
-            enableExchangeConnect,
-            walletSession,
-            onConnect,
-            onDisconnect,
-            onRequestConnect,
-            uiConfig,
-            appFees: clientSetup?.appFees,
-            appFeesResolved: clientSetup !== null,
-            onStepChange: handleStepChange,
-            onSwappedImmersiveChange: setSwappedImmersive,
-            openExternally,
-            onSubmittingChange: setSubmitting,
-            onClose,
-            onLifecycle: handleLifecycle,
-            onEvent,
-            onError,
-            debug
-          }
-        ),
-        historyOpen && /* @__PURE__ */ jsx29(
-          DepositHistoryPanel,
-          {
-            deposits: historyDeposits,
-            isLoading: historyLoading,
-            error: historyError,
-            hasMore: hasMoreHistory,
-            isLoadingMore: historyLoadingMore,
-            onLoadMore: handleHistoryLoadMore,
-            onClose: handleHistoryClose,
-            onCloseModal: onClose
-          }
-        )
-      ] })
+          )
+        }
+      )
     }
   ) }) }) });
 }