@rhinestone/deposit-modal 0.1.66 → 0.1.67

package/dist/{chunk-JDO7QPPH.mjs → chunk-NFE5ZLD3.mjs}

@@ -28,7 +28,7 @@ import {
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-FWGLRTWF.mjs";
+} from "./chunk-IUW3SJQT.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -38,6 +38,7 @@ import {
   getChainIcon,
   getChainId,
   getChainName,
+  getExplorerTxUrl,
   getExplorerUrl,
   getSupportedChainIds,
   getTargetTokenSymbolsForChain,
@@ -46,21 +47,22 @@ import {
   getTokenIcon,
   getTokenSymbol,
   isStablecoinSymbol
-} from "./chunk-CIXHTOO3.mjs";
+} from "./chunk-SDZKKUCJ.mjs";
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo8,
+  useMemo as useMemo7,
   useEffect as useEffect10,
-  useRef as useRef6,
+  useRef as useRef7,
   useState as useState11,
-  useCallback as useCallback5,
+  useCallback as useCallback6,
   lazy,
   Suspense
 } from "react";
 
 // src/DepositFlow.tsx
-import { useState as useState10, useCallback as useCallback3, useMemo as useMemo7, useEffect as useEffect9, useRef as useRef5 } from "react";
+import { useState as useState10, useCallback as useCallback4, useMemo as useMemo6, useEffect as useEffect9, useRef as useRef6 } from "react";
+import { formatUnits as formatUnits5 } from "viem";
 
 // src/components/steps/SetupStep.tsx
 import { useState, useEffect, useRef, useCallback } from "react";
@@ -89,6 +91,8 @@ function SetupStep({
   sessionChainIds,
   recipient,
   postBridgeActions,
+  outputTokenRules,
+  rejectUnmapped,
   forceRegister,
   enableSolana = true,
   service,
@@ -158,7 +162,9 @@ function SetupStep({
           chain: toEvmCaip2(targetChain),
           token: targetToken,
           ...recipient && { recipient },
-          ...postBridgeActions?.length && { postBridgeActions }
+          ...postBridgeActions?.length && { postBridgeActions },
+          ...outputTokenRules?.length && { outputTokenRules },
+          ...rejectUnmapped != null && { rejectUnmapped }
         }
       });
       setState({ type: "ready", smartAccount });
@@ -274,7 +280,8 @@ function AssetSelectStep({
   service,
   onContinue,
   onTotalBalanceComputed,
-  onAssetsLoaded
+  onAssetsLoaded,
+  onDisconnect
 }) {
   const [assets, setAssets] = useState2([]);
   const [selectedAssetId, setSelectedAssetId] = useState2(null);
@@ -422,7 +429,16 @@ function AssetSelectStep({
               address.slice(0, 6),
               "...",
               address.slice(-4)
-            ] })
+            ] }),
+            onDisconnect && /* @__PURE__ */ jsx2(
+              "button",
+              {
+                type: "button",
+                className: "rs-empty-disconnect",
+                onClick: onDisconnect,
+                children: "Disconnect wallet"
+              }
+            )
           ] }),
           !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx2("div", { className: "rs-asset-list", children: rows.map((asset) => {
             const isSelected = selectedAssetId === asset.id;
@@ -1182,96 +1198,378 @@ function ConfirmStep({
 }
 
 // src/components/steps/DepositAddressStep.tsx
-import { useState as useState6, useEffect as useEffect6, useCallback as useCallback2, useRef as useRef4, useMemo as useMemo4 } from "react";
+import { useState as useState6, useEffect as useEffect6, useCallback as useCallback3, useRef as useRef5, useMemo as useMemo3 } from "react";
 
 // src/components/ui/QRCode.tsx
-import { useEffect as useEffect5, useMemo as useMemo3, useState as useState5 } from "react";
-import { Fragment as Fragment2, jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+import { QRCode as QRCodeCanvas } from "react-qrcode-logo";
+import { jsx as jsx5 } from "react/jsx-runtime";
 function QRCode({ value, size = 200, iconSrc, className }) {
-  const [createQrCode, setCreateQrCode] = useState5(null);
-  useEffect5(() => {
-    let mounted = true;
-    void import("qrcode-generator").then((mod) => {
-      if (mounted) {
-        setCreateQrCode(() => mod.default);
+  return /* @__PURE__ */ jsx5("div", { className, role: "img", "aria-label": "QR Code", children: /* @__PURE__ */ jsx5(
+    QRCodeCanvas,
+    {
+      value,
+      size,
+      qrStyle: "dots",
+      eyeRadius: [10, 10, 10],
+      ecLevel: "H",
+      logoImage: iconSrc,
+      logoWidth: size * 0.22,
+      logoHeight: size * 0.22,
+      logoPaddingStyle: "circle",
+      logoPadding: 5,
+      removeQrCodeBehindLogo: true,
+      quietZone: 10,
+      bgColor: "#ffffff",
+      fgColor: "#000000"
+    }
+  ) });
+}
+QRCode.displayName = "QRCode";
+
+// src/components/ui/DepositNotification.tsx
+import { useState as useState5, useEffect as useEffect5, useRef as useRef4, useCallback as useCallback2 } from "react";
+import { jsx as jsx6, jsxs as jsxs5 } from "react/jsx-runtime";
+var INITIAL_POLL_INTERVAL = 3e3;
+var MAX_POLL_INTERVAL = 3e4;
+var BACKOFF_MULTIPLIER = 1.5;
+function isEventForTx(event, txHash) {
+  const eventTxHash = getEventTxHash(event);
+  if (!eventTxHash) return false;
+  return txRefsMatch(eventTxHash, txHash);
+}
+function truncateHash(hash) {
+  return `${hash.slice(0, 4)}\u2026${hash.slice(-4)}`;
+}
+function formatTimestamp(ms) {
+  const date = new Date(ms);
+  const months = [
+    "Jan",
+    "Feb",
+    "Mar",
+    "Apr",
+    "May",
+    "Jun",
+    "Jul",
+    "Aug",
+    "Sep",
+    "Oct",
+    "Nov",
+    "Dec"
+  ];
+  const month = months[date.getMonth()];
+  const day = date.getDate();
+  const suffix = day % 10 === 1 && day !== 11 ? "st" : day % 10 === 2 && day !== 12 ? "nd" : day % 10 === 3 && day !== 13 ? "rd" : "th";
+  const hours = String(date.getHours()).padStart(2, "0");
+  const minutes = String(date.getMinutes()).padStart(2, "0");
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  return `${month} ${day}${suffix} \xB7 ${hours}:${minutes}:${seconds}`;
+}
+function formatBridgeFailedMessage(event) {
+  const eventData = event?.data ?? {};
+  const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
+  if (backendMessage.length > 0) {
+    const lower = backendMessage.toLowerCase();
+    if (lower.includes("insufficient funds")) {
+      return "Deposit was received, but processing could not continue due to insufficient funds.";
+    }
+    if (lower.includes("no valid quote available")) {
+      return "No bridge route is currently available for this transfer.";
+    }
+    if (lower.includes("simulation failed")) {
+      return "Transfer processing failed during simulation.";
+    }
+    if (backendMessage.length > 220) {
+      return "Transfer processing failed.";
+    }
+    return backendMessage;
+  }
+  return "Bridge failed";
+}
+var txLinkIcon = /* @__PURE__ */ jsx6(
+  "svg",
+  {
+    viewBox: "0 0 24 24",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: "2.5",
+    className: "rs-deposit-notification-link-icon",
+    children: /* @__PURE__ */ jsx6(
+      "path",
+      {
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        d: "M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"
       }
-    }).catch(() => {
-      if (mounted) {
-        setCreateQrCode(null);
+    )
+  }
+);
+function DepositNotification({
+  deposit,
+  smartAccount,
+  targetChain,
+  targetToken,
+  waitForFinalTx,
+  hasPostBridgeActions,
+  service,
+  onComplete,
+  onFailed,
+  onDismiss
+}) {
+  const { txHash, sourceChain, amount, token, detectedAt, directTransfer } = deposit;
+  const [status, setStatus] = useState5(
+    directTransfer ? "complete" : "processing"
+  );
+  const [expanded, setExpanded] = useState5(false);
+  const [completedAt, setCompletedAt] = useState5(
+    directTransfer ? detectedAt : null
+  );
+  const [destinationTxHash, setDestinationTxHash] = useState5(
+    null
+  );
+  const pollIntervalRef = useRef4(INITIAL_POLL_INTERVAL);
+  const pollTimeoutRef = useRef4(null);
+  const completedRef = useRef4(directTransfer ?? false);
+  const depositContextRef = useLatestRef({
+    amount,
+    sourceChain,
+    sourceToken: token,
+    targetChain,
+    targetToken,
+    waitForFinalTx,
+    hasPostBridgeActions
+  });
+  const onCompleteRef = useLatestRef(onComplete);
+  const onFailedRef = useLatestRef(onFailed);
+  const handleComplete = useCallback2(
+    (destTxHash) => {
+      if (completedRef.current) return;
+      completedRef.current = true;
+      setDestinationTxHash(destTxHash ?? null);
+      setCompletedAt(Date.now());
+      setStatus("complete");
+      const context = depositContextRef.current;
+      onCompleteRef.current?.(txHash, destTxHash, {
+        amount: context.amount,
+        sourceChain: context.sourceChain,
+        sourceToken: context.sourceToken,
+        targetChain: context.targetChain,
+        targetToken: context.targetToken
+      });
+    },
+    [depositContextRef, onCompleteRef, txHash]
+  );
+  const handleFailed = useCallback2(
+    (error) => {
+      if (completedRef.current) return;
+      completedRef.current = true;
+      setStatus("failed");
+      onFailedRef.current?.(txHash, error);
+    },
+    [onFailedRef, txHash]
+  );
+  useEffect5(() => {
+    if (directTransfer) {
+      handleComplete(void 0);
+      return;
+    }
+    if (status !== "processing") return;
+    let isMounted = true;
+    async function pollStatus() {
+      try {
+        const data = await service.fetchStatus(smartAccount, txHash);
+        if (!isMounted) return;
+        const lastEvent = data.lastEvent;
+        const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
+        const awaitingPostBridgeSwap = depositContextRef.current.waitForFinalTx && depositContextRef.current.hasPostBridgeActions;
+        if (eventForTx?.type === "post-bridge-swap-complete") {
+          const swapTxHash = eventForTx.data?.swap?.transactionHash;
+          handleComplete(swapTxHash);
+          return;
+        }
+        if (eventForTx?.type === "post-bridge-swap-failed") {
+          handleFailed(formatBridgeFailedMessage(eventForTx));
+          return;
+        }
+        if (eventForTx?.type === "bridge-complete" && !awaitingPostBridgeSwap) {
+          const destTx = eventForTx.data?.destination?.transactionHash;
+          handleComplete(destTx);
+          return;
+        }
+        if (!waitForFinalTx && eventForTx?.type === "bridge-started") {
+          handleComplete(void 0);
+          return;
+        }
+        if (eventForTx?.type === "bridge-failed") {
+          handleFailed(formatBridgeFailedMessage(eventForTx));
+          return;
+        }
+        if (eventForTx?.type === "error") {
+          const errorMessage = eventForTx.data?.message ?? "Unknown error";
+          handleFailed(errorMessage);
+          return;
+        }
+        scheduleNextPoll();
+      } catch {
+        scheduleNextPoll();
       }
-    });
+    }
+    function scheduleNextPoll() {
+      if (!isMounted) return;
+      pollTimeoutRef.current = setTimeout(() => {
+        pollIntervalRef.current = Math.min(
+          pollIntervalRef.current * BACKOFF_MULTIPLIER,
+          MAX_POLL_INTERVAL
+        );
+        pollStatus();
+      }, pollIntervalRef.current);
+    }
+    pollStatus();
     return () => {
-      mounted = false;
+      isMounted = false;
+      if (pollTimeoutRef.current) {
+        clearTimeout(pollTimeoutRef.current);
+      }
     };
-  }, []);
-  const svgContent = useMemo3(() => {
-    if (!createQrCode) {
-      return null;
+  }, [
+    directTransfer,
+    depositContextRef,
+    handleComplete,
+    handleFailed,
+    service,
+    smartAccount,
+    status,
+    txHash
+  ]);
+  const sourceExplorerUrl = getExplorerTxUrl(sourceChain, txHash);
+  const destExplorerUrl = destinationTxHash ? getExplorerTxUrl(targetChain, destinationTxHash) : null;
+  const title = status === "complete" ? "Deposit completed" : status === "failed" ? "Deposit failed" : "Deposit received and processing\u2026";
+  const subtitle = status === "complete" ? "Your deposit has been credited to your account." : status === "failed" ? "Your deposit could not be processed." : "Your deposit will be credited to your account shortly.";
+  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx6(
+    "svg",
+    {
+      viewBox: "0 0 24 24",
+      fill: "none",
+      stroke: "currentColor",
+      strokeWidth: "3",
+      children: /* @__PURE__ */ jsx6(
+        "path",
+        {
+          strokeLinecap: "round",
+          strokeLinejoin: "round",
+          d: "M5 12l5 5L20 7"
+        }
+      )
     }
-    const qr = createQrCode(0, "M");
-    qr.addData(value);
-    qr.make();
-    const moduleCount = qr.getModuleCount();
-    const cellSize = size / moduleCount;
-    const paths = [];
-    const iconCenterSize = iconSrc ? moduleCount * 0.22 : 0;
-    const iconStart = (moduleCount - iconCenterSize) / 2;
-    const iconEnd = (moduleCount + iconCenterSize) / 2;
-    for (let row = 0; row < moduleCount; row++) {
-      for (let col = 0; col < moduleCount; col++) {
-        if (!qr.isDark(row, col)) continue;
-        if (iconSrc && row >= iconStart && row < iconEnd && col >= iconStart && col < iconEnd) {
-          continue;
+  ) }) : status === "failed" ? /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx6(
+    "svg",
+    {
+      viewBox: "0 0 24 24",
+      fill: "none",
+      stroke: "currentColor",
+      strokeWidth: "3",
+      children: /* @__PURE__ */ jsx6(
+        "path",
+        {
+          strokeLinecap: "round",
+          strokeLinejoin: "round",
+          d: "M6 18L18 6M6 6l12 12"
         }
-        const x = col * cellSize;
-        const y = row * cellSize;
-        paths.push(`M${x},${y}h${cellSize}v${cellSize}h${-cellSize}z`);
-      }
+      )
     }
-    return { paths: paths.join(""), moduleCount, cellSize };
-  }, [createQrCode, value, size, iconSrc]);
-  const iconSize = size * 0.22;
-  const iconOffset = (size - iconSize) / 2;
+  ) }) : /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsx6(Spinner, {}) });
   return /* @__PURE__ */ jsxs5(
-    "svg",
+    "div",
     {
-      viewBox: `0 0 ${size} ${size}`,
-      width: size,
-      height: size,
-      className,
-      role: "img",
-      "aria-label": "QR Code",
+      className: `rs-deposit-notification rs-deposit-notification--${status}`,
       children: [
-        /* @__PURE__ */ jsx5("rect", { width: size, height: size, fill: "white", rx: 4 }),
-        svgContent ? /* @__PURE__ */ jsx5("path", { d: svgContent.paths, fill: "black" }) : /* @__PURE__ */ jsx5("rect", { x: 8, y: 8, width: size - 16, height: size - 16, fill: "#f1f5f9" }),
-        iconSrc && /* @__PURE__ */ jsxs5(Fragment2, { children: [
-          /* @__PURE__ */ jsx5(
-            "rect",
-            {
-              x: iconOffset - 4,
-              y: iconOffset - 4,
-              width: iconSize + 8,
-              height: iconSize + 8,
-              fill: "white",
-              rx: 8
-            }
-          ),
-          /* @__PURE__ */ jsx5(
-            "image",
+        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-header", children: [
+          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-content", children: [
+            /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-title", children: title }),
+            /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
+          ] }),
+          /* @__PURE__ */ jsx6(
+            "button",
             {
-              href: iconSrc,
-              x: iconOffset,
-              y: iconOffset,
-              width: iconSize,
-              height: iconSize
+              type: "button",
+              className: "rs-deposit-notification-close",
+              onClick: () => onDismiss(deposit.id),
+              "aria-label": "Dismiss",
+              children: /* @__PURE__ */ jsx6(
+                "svg",
+                {
+                  viewBox: "0 0 24 24",
+                  fill: "none",
+                  stroke: "currentColor",
+                  strokeWidth: "2",
+                  children: /* @__PURE__ */ jsx6(
+                    "path",
+                    {
+                      strokeLinecap: "round",
+                      strokeLinejoin: "round",
+                      d: "M6 18L18 6M6 6l12 12"
+                    }
+                  )
+                }
+              )
             }
           )
-        ] })
+        ] }),
+        expanded && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-details", children: [
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs5(
+              "a",
+              {
+                href: sourceExplorerUrl,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "rs-deposit-notification-link",
+                children: [
+                  truncateHash(txHash),
+                  txLinkIcon
+                ]
+              }
+            ) : truncateHash(txHash) })
+          ] }),
+          destinationTxHash && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs5(
+              "a",
+              {
+                href: destExplorerUrl,
+                target: "_blank",
+                rel: "noopener noreferrer",
+                className: "rs-deposit-notification-link",
+                children: [
+                  truncateHash(destinationTxHash),
+                  txLinkIcon
+                ]
+              }
+            ) : truncateHash(destinationTxHash) })
+          ] }),
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
+          ] }),
+          completedAt && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
+            /* @__PURE__ */ jsx6("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx6(
+          "button",
+          {
+            type: "button",
+            className: "rs-deposit-notification-toggle",
+            onClick: () => setExpanded(!expanded),
+            children: expanded ? "See less" : "See more"
+          }
+        )
       ]
     }
   );
 }
-QRCode.displayName = "QRCode";
 
 // src/core/solana.ts
 import {
@@ -1391,7 +1689,7 @@ async function sendSolanaTransaction(provider, _connection, transaction) {
 }
 
 // src/components/steps/DepositAddressStep.tsx
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx7, jsxs as jsxs6 } from "react/jsx-runtime";
 var POLL_INTERVAL_MS = 4e3;
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -1463,37 +1761,48 @@ function getDepositEventDetails(event) {
   }
   return {};
 }
+function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
+  return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
+}
 function DepositAddressStep({
   smartAccount,
   solanaDepositAddress,
   service,
   allowedRoutes,
-  onDepositDetected,
+  targetChain,
+  targetToken,
+  waitForFinalTx,
+  hasPostBridgeActions,
+  onDepositSubmitted,
+  onDepositComplete,
+  onDepositFailed,
   onCopyAddress,
   onError
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
-  const allowedChainSet = useMemo4(
+  const allowedChainSet = useMemo3(
     () => allowedRoutes?.sourceChains ? new Set(allowedRoutes.sourceChains) : null,
     [allowedRoutes?.sourceChains]
   );
-  const allowedTokenSet = useMemo4(
+  const allowedTokenSet = useMemo3(
     () => allowedRoutes?.sourceTokens ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
     [allowedRoutes?.sourceTokens]
   );
-  const evmChainIds = useMemo4(() => {
+  const evmChainIds = useMemo3(() => {
     const all = getSupportedChainIds();
     return allowedChainSet ? all.filter((id) => allowedChainSet.has(id)) : all;
   }, [allowedChainSet]);
-  const chainOptions = useMemo4(
-    () => hasSolana ? [...evmChainIds, "solana"] : evmChainIds,
-    [evmChainIds, hasSolana]
-  );
+  const chainOptions = useMemo3(() => {
+    if (!hasSolana) return evmChainIds;
+    const options = [...evmChainIds];
+    options.splice(1, 0, "solana");
+    return options;
+  }, [evmChainIds, hasSolana]);
   const BASE_CHAIN_ID = 8453;
   const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
   const [sourceChainId, setSourceChainId] = useState6(defaultChainId);
   const isSolana = sourceChainId === "solana";
-  const tokensForChain = useMemo4(() => {
+  const tokensForChain = useMemo3(() => {
     const all = isSolana ? SOLANA_TOKENS.map((t) => t.symbol) : getTargetTokenSymbolsForChain(sourceChainId);
     return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
   }, [sourceChainId, isSolana, allowedTokenSet]);
@@ -1509,10 +1818,13 @@ function DepositAddressStep({
   const [pollingError, setPollingError] = useState6(null);
   const [chainDropdownOpen, setChainDropdownOpen] = useState6(false);
   const [tokenDropdownOpen, setTokenDropdownOpen] = useState6(false);
-  const chainDropdownRef = useRef4(null);
-  const tokenDropdownRef = useRef4(null);
-  const depositHandledRef = useRef4(false);
-  const sourceSelectionRef = useRef4({
+  const chainDropdownRef = useRef5(null);
+  const tokenDropdownRef = useRef5(null);
+  const [notifications, setNotifications] = useState6([]);
+  const isTrackingRef = useRef5(false);
+  const baselineTxHashRef = useRef5(void 0);
+  const notificationIdRef = useRef5(0);
+  const sourceSelectionRef = useRef5({
     chainId: defaultChainId,
     token: typeof defaultChainId === "number" ? getTokenAddress(defaultToken, defaultChainId) : void 0,
     sourceSymbol: defaultToken
@@ -1553,7 +1865,7 @@ function DepositAddressStep({
       document.removeEventListener("touchstart", handlePointerDown);
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
-  const handleCopy = useCallback2(async () => {
+  const handleCopy = useCallback3(async () => {
     onCopyAddress?.();
     try {
       await navigator.clipboard.writeText(displayAddress);
@@ -1577,22 +1889,46 @@ function DepositAddressStep({
     setChainDropdownOpen(false);
     setTokenDropdownOpen(false);
   }, [sourceChainId]);
+  const onDepositSubmittedRef = useRef5(onDepositSubmitted);
+  onDepositSubmittedRef.current = onDepositSubmitted;
+  const onDepositCompleteRef = useRef5(onDepositComplete);
+  onDepositCompleteRef.current = onDepositComplete;
+  const onDepositFailedRef = useRef5(onDepositFailed);
+  onDepositFailedRef.current = onDepositFailed;
+  const onErrorRef = useRef5(onError);
+  onErrorRef.current = onError;
+  const targetChainRef = useRef5(targetChain);
+  targetChainRef.current = targetChain;
+  const targetTokenRef = useRef5(targetToken);
+  targetTokenRef.current = targetToken;
   useEffect6(() => {
-    depositHandledRef.current = false;
+    baselineTxHashRef.current = void 0;
+    isTrackingRef.current = false;
     setPollingError(null);
     let timeoutId;
     let cancelled = false;
-    let baselineTxHash = void 0;
     async function poll() {
-      if (cancelled || depositHandledRef.current) return;
+      if (cancelled) return;
+      if (isTrackingRef.current) {
+        if (!cancelled) {
+          timeoutId = setTimeout(poll, POLL_INTERVAL_MS);
+        }
+        return;
+      }
       try {
         const status = await service.fetchLatestStatus(smartAccount);
-        if (cancelled || depositHandledRef.current) return;
+        if (cancelled) return;
+        if (isTrackingRef.current) {
+          if (!cancelled) {
+            timeoutId = setTimeout(poll, POLL_INTERVAL_MS);
+          }
+          return;
+        }
         const event = status.lastEvent;
         const eventTxHash = isDepositEvent(event) ? getEventTxHash(event) ?? null : null;
-        if (baselineTxHash === void 0) {
-          baselineTxHash = eventTxHash;
-        } else if (eventTxHash && (!baselineTxHash || !txRefsMatch(eventTxHash, baselineTxHash))) {
+        if (baselineTxHashRef.current === void 0) {
+          baselineTxHashRef.current = eventTxHash;
+        } else if (eventTxHash && (!baselineTxHashRef.current || !txRefsMatch(eventTxHash, baselineTxHashRef.current))) {
           const details = getDepositEventDetails(event);
           const fallback = sourceSelectionRef.current;
           const chainId = details.chainId ?? fallback.chainId;
@@ -1601,16 +1937,33 @@ function DepositAddressStep({
           const sourceSymbol = details.sourceSymbol ?? fallback.sourceSymbol;
           const sourceDecimals = details.sourceDecimals ?? fallback.sourceDecimals;
           if (token) {
-            depositHandledRef.current = true;
-            onDepositDetected(
-              eventTxHash,
+            baselineTxHashRef.current = eventTxHash;
+            isTrackingRef.current = true;
+            const isEvmToken = /^0x[a-fA-F0-9]{40}$/.test(token);
+            const directTransfer = typeof chainId === "number" && isEvmToken && isSameRoute(
               chainId,
+              token,
+              targetChainRef.current,
+              targetTokenRef.current
+            );
+            const id = String(++notificationIdRef.current);
+            const notification = {
+              id,
+              txHash: eventTxHash,
+              sourceChain: chainId,
               amount,
               token,
               sourceSymbol,
-              sourceDecimals
-            );
-            return;
+              sourceDecimals,
+              detectedAt: Date.now(),
+              directTransfer
+            };
+            setNotifications((prev) => [notification, ...prev]);
+            onDepositSubmittedRef.current?.({
+              txHash: eventTxHash,
+              sourceChain: chainId,
+              amount
+            });
           }
         }
         setPollingError(null);
@@ -1618,10 +1971,10 @@ function DepositAddressStep({
         if (!cancelled) {
           const msg = err instanceof Error ? err.message : "Failed to check status";
           setPollingError(msg);
-          onError?.(msg, "STATUS_POLL_ERROR");
+          onErrorRef.current?.(msg, "STATUS_POLL_ERROR");
         }
       }
-      if (!cancelled && !depositHandledRef.current) {
+      if (!cancelled) {
         timeoutId = setTimeout(poll, POLL_INTERVAL_MS);
       }
     }
@@ -1630,13 +1983,30 @@ function DepositAddressStep({
       cancelled = true;
       clearTimeout(timeoutId);
     };
-  }, [smartAccount, service, onDepositDetected, onError]);
+  }, [smartAccount, service]);
+  const handleNotificationComplete = useCallback3(
+    (txHash, destinationTxHash, context) => {
+      isTrackingRef.current = false;
+      onDepositCompleteRef.current?.(txHash, destinationTxHash, context);
+    },
+    []
+  );
+  const handleNotificationFailed = useCallback3(
+    (txHash, error) => {
+      isTrackingRef.current = false;
+      onDepositFailedRef.current?.(txHash, error);
+    },
+    []
+  );
+  const handleNotificationDismiss = useCallback3((id) => {
+    setNotifications((prev) => prev.filter((n) => n.id !== id));
+  }, []);
   const qrIconSrc = getChainIcon(sourceChainId);
-  return /* @__PURE__ */ jsxs6("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx6("div", { className: "rs-step-body", children: /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address", children: [
+  return /* @__PURE__ */ jsxs6("div", { className: "rs-step rs-step--with-notifications", children: [
+    /* @__PURE__ */ jsx7("div", { className: "rs-step-body", children: /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address", children: [
       /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-selectors", children: [
         /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
-          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Chain" }),
+          /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
           /* @__PURE__ */ jsxs6(
             "button",
             {
@@ -1647,7 +2017,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx6(
+                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx7(
                   "img",
                   {
                     src: getChainIcon(sourceChainId),
@@ -1655,8 +2025,8 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
-                /* @__PURE__ */ jsx6(
+                /* @__PURE__ */ jsx7("span", { children: getChainName(sourceChainId) }),
+                /* @__PURE__ */ jsx7(
                   "svg",
                   {
                     className: "rs-deposit-address-dropdown-chevron",
@@ -1664,7 +2034,7 @@ function DepositAddressStep({
                     fill: "none",
                     stroke: "currentColor",
                     strokeWidth: "2",
-                    children: /* @__PURE__ */ jsx6(
+                    children: /* @__PURE__ */ jsx7(
                       "path",
                       {
                         strokeLinecap: "round",
@@ -1677,7 +2047,7 @@ function DepositAddressStep({
               ]
             }
           ),
-          chainDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs6(
+          chainDropdownOpen && /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1687,7 +2057,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getChainIcon(chainId) && /* @__PURE__ */ jsx6(
+                getChainIcon(chainId) && /* @__PURE__ */ jsx7(
                   "img",
                   {
                     src: getChainIcon(chainId),
@@ -1695,14 +2065,14 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
+                /* @__PURE__ */ jsx7("span", { children: getChainName(chainId) })
               ]
             },
             String(chainId)
           )) })
         ] }),
         /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
-          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Token" }),
+          /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-dropdown-label", children: "Supported token" }),
           /* @__PURE__ */ jsxs6(
             "button",
             {
@@ -1713,7 +2083,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
+                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx7(
                   "img",
                   {
                     src: getTokenIcon(sourceTokenSymbol),
@@ -1721,8 +2091,8 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
-                /* @__PURE__ */ jsx6(
+                /* @__PURE__ */ jsx7("span", { children: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx7(
                   "svg",
                   {
                     className: "rs-deposit-address-dropdown-chevron",
@@ -1730,7 +2100,7 @@ function DepositAddressStep({
                     fill: "none",
                     stroke: "currentColor",
                     strokeWidth: "2",
-                    children: /* @__PURE__ */ jsx6(
+                    children: /* @__PURE__ */ jsx7(
                       "path",
                       {
                         strokeLinecap: "round",
@@ -1743,7 +2113,7 @@ function DepositAddressStep({
               ]
             }
           ),
-          tokenDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
+          tokenDropdownOpen && /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1753,7 +2123,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
+                getTokenIcon(symbol) && /* @__PURE__ */ jsx7(
                   "img",
                   {
                     src: getTokenIcon(symbol),
@@ -1761,21 +2131,21 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: symbol })
+                /* @__PURE__ */ jsx7("span", { children: symbol })
               ]
             },
             symbol
           )) })
         ] })
       ] }),
-      /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 200, iconSrc: qrIconSrc }) }),
+      /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx7(QRCode, { value: displayAddress, size: 150, iconSrc: qrIconSrc }) }),
       /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-info", children: [
         /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-label", children: [
           "Your ",
           isSolana ? "Solana" : "EVM",
           " deposit address"
         ] }),
-        /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress }),
+        /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-value", children: displayAddress }),
         /* @__PURE__ */ jsxs6(
           "button",
           {
@@ -1783,7 +2153,7 @@ function DepositAddressStep({
             className: "rs-deposit-address-copy",
             onClick: handleCopy,
             children: [
-              /* @__PURE__ */ jsx6(
+              /* @__PURE__ */ jsx7(
                 "svg",
                 {
                   viewBox: "0 0 24 24",
@@ -1791,14 +2161,14 @@ function DepositAddressStep({
                   stroke: "currentColor",
                   strokeWidth: "2",
                   style: { width: 14, height: 14 },
-                  children: copied ? /* @__PURE__ */ jsx6(
+                  children: copied ? /* @__PURE__ */ jsx7(
                     "path",
                     {
                       strokeLinecap: "round",
                       strokeLinejoin: "round",
                       d: "M5 12l5 5L20 7"
                     }
-                  ) : /* @__PURE__ */ jsx6(
+                  ) : /* @__PURE__ */ jsx7(
                     "path",
                     {
                       strokeLinecap: "round",
@@ -1813,17 +2183,33 @@ function DepositAddressStep({
           }
         )
       ] }),
-      pollingError && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-error", children: pollingError })
+      pollingError && /* @__PURE__ */ jsx7("div", { className: "rs-deposit-address-error", children: pollingError })
     ] }) }),
-    /* @__PURE__ */ jsx6(PoweredBy, {})
+    notifications.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx7(
+      DepositNotification,
+      {
+        deposit,
+        smartAccount,
+        targetChain,
+        targetToken,
+        waitForFinalTx,
+        hasPostBridgeActions,
+        service,
+        onComplete: handleNotificationComplete,
+        onFailed: handleNotificationFailed,
+        onDismiss: handleNotificationDismiss
+      },
+      deposit.id
+    )) }),
+    /* @__PURE__ */ jsx7(PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
 // src/components/steps/SolanaTokenSelectStep.tsx
-import { useState as useState7, useEffect as useEffect7, useMemo as useMemo5 } from "react";
+import { useState as useState7, useEffect as useEffect7, useMemo as useMemo4 } from "react";
 import { formatUnits as formatUnits3 } from "viem";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { jsx as jsx8, jsxs as jsxs7 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
@@ -1906,7 +2292,7 @@ function SolanaTokenSelectStep({
       active = false;
     };
   }, [debug, solanaAddress, service, onTotalBalanceComputed]);
-  const rows = useMemo5(
+  const rows = useMemo4(
     () => [...tokenBalances].sort((a, b) => {
       if (a.balanceUsd !== b.balanceUsd) return b.balanceUsd - a.balanceUsd;
       if (b.balance > a.balance) return 1;
@@ -1917,10 +2303,10 @@ function SolanaTokenSelectStep({
   );
   const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
   if (error) {
-    return /* @__PURE__ */ jsx7("div", { className: "rs-step", children: /* @__PURE__ */ jsx7("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx7("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx7("span", { className: "rs-alert-text", children: error }) }) }) });
+    return /* @__PURE__ */ jsx8("div", { className: "rs-step", children: /* @__PURE__ */ jsx8("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx8("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx8("span", { className: "rs-alert-text", children: error }) }) }) });
   }
   return /* @__PURE__ */ jsxs7("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx7("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx7("div", { className: "rs-step-title", children: "Select source asset" }) }),
+    /* @__PURE__ */ jsx8("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx8("div", { className: "rs-step-title", children: "Select source asset" }) }),
     /* @__PURE__ */ jsxs7(
       "div",
       {
@@ -1928,11 +2314,11 @@ function SolanaTokenSelectStep({
         style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
         children: [
           loading && /* @__PURE__ */ jsxs7("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-            /* @__PURE__ */ jsx7(Spinner, { className: "rs-text-tertiary" }),
-            /* @__PURE__ */ jsx7("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+            /* @__PURE__ */ jsx8(Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ jsx8("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
           ] }),
           !loading && rows.length === 0 && /* @__PURE__ */ jsxs7("div", { className: "rs-empty-state", children: [
-            /* @__PURE__ */ jsx7(
+            /* @__PURE__ */ jsx8(
               "svg",
               {
                 className: "rs-empty-icon",
@@ -1940,7 +2326,7 @@ function SolanaTokenSelectStep({
                 fill: "none",
                 stroke: "currentColor",
                 strokeWidth: "1.5",
-                children: /* @__PURE__ */ jsx7(
+                children: /* @__PURE__ */ jsx8(
                   "path",
                   {
                     strokeLinecap: "round",
@@ -1950,14 +2336,14 @@ function SolanaTokenSelectStep({
                 )
               }
             ),
-            /* @__PURE__ */ jsx7("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+            /* @__PURE__ */ jsx8("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
             /* @__PURE__ */ jsxs7("div", { className: "rs-empty-address", children: [
               solanaAddress.slice(0, 6),
               "...",
               solanaAddress.slice(-4)
             ] })
           ] }),
-          !loading && rows.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-asset-list", children: rows.map((entry) => {
+          !loading && rows.length > 0 && /* @__PURE__ */ jsx8("div", { className: "rs-asset-list", children: rows.map((entry) => {
             const isSelected = selectedSymbol === entry.token.symbol;
             const tokenIcon = getTokenIcon(entry.token.symbol);
             const chainIcon = getChainIcon("solana");
@@ -1979,7 +2365,7 @@ function SolanaTokenSelectStep({
                 children: [
                   /* @__PURE__ */ jsxs7("div", { className: "rs-asset-info", children: [
                     /* @__PURE__ */ jsxs7("div", { className: "rs-asset-icon-wrapper", children: [
-                      tokenIcon ? /* @__PURE__ */ jsx7(
+                      tokenIcon ? /* @__PURE__ */ jsx8(
                         "img",
                         {
                           src: tokenIcon,
@@ -1987,8 +2373,8 @@ function SolanaTokenSelectStep({
                           className: "rs-asset-icon",
                           style: { background: "transparent" }
                         }
-                      ) : /* @__PURE__ */ jsx7("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
-                      chainIcon && /* @__PURE__ */ jsx7(
+                      ) : /* @__PURE__ */ jsx8("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                      chainIcon && /* @__PURE__ */ jsx8(
                         "img",
                         {
                           src: chainIcon,
@@ -2000,7 +2386,7 @@ function SolanaTokenSelectStep({
                     /* @__PURE__ */ jsxs7("div", { children: [
                       /* @__PURE__ */ jsxs7("div", { className: "rs-asset-name", children: [
                         entry.token.symbol,
-                        /* @__PURE__ */ jsx7("span", { className: "rs-asset-chain", children: " on Solana" })
+                        /* @__PURE__ */ jsx8("span", { className: "rs-asset-chain", children: " on Solana" })
                       ] }),
                       /* @__PURE__ */ jsxs7("div", { className: "rs-asset-balance-small", children: [
                         formattedBalance,
@@ -2009,7 +2395,7 @@ function SolanaTokenSelectStep({
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsx7("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
+                  /* @__PURE__ */ jsx8("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
                 ]
               },
               entry.token.symbol
@@ -2018,7 +2404,7 @@ function SolanaTokenSelectStep({
         ]
       }
     ),
-    /* @__PURE__ */ jsx7("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx7(
+    /* @__PURE__ */ jsx8("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx8(
       Button,
       {
         onClick: () => selectedEntry && onContinue(
@@ -2031,14 +2417,14 @@ function SolanaTokenSelectStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ jsx7(PoweredBy, {})
+    /* @__PURE__ */ jsx8(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useEffect as useEffect8, useMemo as useMemo6, useState as useState8 } from "react";
+import { useEffect as useEffect8, useMemo as useMemo5, useState as useState8 } from "react";
 import { formatUnits as formatUnits4, parseUnits as parseUnits3 } from "viem";
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx9, jsxs as jsxs8 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 function SolanaAmountStep({
   token,
@@ -2052,7 +2438,7 @@ function SolanaAmountStep({
   const [amount, setAmount] = useState8("");
   const [error, setError] = useState8(null);
   const isSourceStablecoin = isStablecoinSymbol(token.symbol);
-  const tokenPriceUsd = useMemo6(() => {
+  const tokenPriceUsd = useMemo5(() => {
     if (isSourceStablecoin) return 1;
     try {
       const balanceUnits = Number(formatUnits4(balance, token.decimals));
@@ -2074,7 +2460,7 @@ function SolanaAmountStep({
       }
     }
   }, [defaultAmount, amount]);
-  const formattedBalance = useMemo6(() => {
+  const formattedBalance = useMemo5(() => {
     try {
       const raw = formatUnits4(balance, token.decimals);
       const numeric = Number(raw);
@@ -2084,7 +2470,7 @@ function SolanaAmountStep({
       return "...";
     }
   }, [balance, token.decimals]);
-  const computedBalanceUsd = useMemo6(() => {
+  const computedBalanceUsd = useMemo5(() => {
     try {
       const balanceUnits = Number(formatUnits4(balance, token.decimals));
       if (!Number.isFinite(balanceUnits) || balanceUnits < 0) return null;
@@ -2095,15 +2481,15 @@ function SolanaAmountStep({
       return null;
     }
   }, [balance, token.decimals, tokenPriceUsd, balanceUsd]);
-  const formattedBalanceUsd = useMemo6(() => {
+  const formattedBalanceUsd = useMemo5(() => {
     if (computedBalanceUsd === null || computedBalanceUsd <= 0) return null;
     return currencyFormatter.format(computedBalanceUsd);
   }, [computedBalanceUsd]);
-  const spendableBalance = useMemo6(() => {
+  const spendableBalance = useMemo5(() => {
     if (!isNativeSol(token)) return balance;
     return balance > SOL_FEE_RESERVE_LAMPORTS ? balance - SOL_FEE_RESERVE_LAMPORTS : 0n;
   }, [balance, token]);
-  const spendableBalanceUsd = useMemo6(() => {
+  const spendableBalanceUsd = useMemo5(() => {
     try {
       const spendableUnits = Number(formatUnits4(spendableBalance, token.decimals));
       if (!Number.isFinite(spendableUnits) || spendableUnits < 0) return null;
@@ -2195,10 +2581,10 @@ function SolanaAmountStep({
     onContinue(token, sourceAmountStr, amount);
   };
   return /* @__PURE__ */ jsxs8("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx8("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx8("div", { className: "rs-step-title", children: "Enter amount" }) }),
+    /* @__PURE__ */ jsx9("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx9("div", { className: "rs-step-title", children: "Enter amount" }) }),
     /* @__PURE__ */ jsxs8("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: [
       /* @__PURE__ */ jsxs8("div", { className: "rs-amount-display", children: [
-        /* @__PURE__ */ jsx8("div", { className: "rs-amount-input-wrapper", children: /* @__PURE__ */ jsx8(
+        /* @__PURE__ */ jsx9("div", { className: "rs-amount-input-wrapper", children: /* @__PURE__ */ jsx9(
           "input",
           {
             type: "text",
@@ -2216,7 +2602,7 @@ function SolanaAmountStep({
             autoFocus: true
           }
         ) }),
-        !isSourceStablecoin && /* @__PURE__ */ jsx8("div", { className: "rs-amount-available", children: /* @__PURE__ */ jsxs8("span", { className: "rs-amount-available-value", children: [
+        !isSourceStablecoin && /* @__PURE__ */ jsx9("div", { className: "rs-amount-available", children: /* @__PURE__ */ jsxs8("span", { className: "rs-amount-available-value", children: [
           formattedBalance,
           " ",
           token.symbol,
@@ -2243,7 +2629,7 @@ function SolanaAmountStep({
           },
           pct
         )),
-        /* @__PURE__ */ jsx8(
+        /* @__PURE__ */ jsx9(
           "button",
           {
             type: "button",
@@ -2258,7 +2644,7 @@ function SolanaAmountStep({
         " minimum deposit"
       ] }),
       error && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-error", children: [
-        /* @__PURE__ */ jsx8(
+        /* @__PURE__ */ jsx9(
           "svg",
           {
             viewBox: "0 0 24 24",
@@ -2266,7 +2652,7 @@ function SolanaAmountStep({
             stroke: "currentColor",
             strokeWidth: "2",
             style: { width: 16, height: 16, flexShrink: 0 },
-            children: /* @__PURE__ */ jsx8(
+            children: /* @__PURE__ */ jsx9(
               "path",
               {
                 strokeLinecap: "round",
@@ -2276,10 +2662,10 @@ function SolanaAmountStep({
             )
           }
         ),
-        /* @__PURE__ */ jsx8("span", { children: error })
+        /* @__PURE__ */ jsx9("span", { children: error })
       ] })
     ] }),
-    /* @__PURE__ */ jsx8("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx8(
+    /* @__PURE__ */ jsx9("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx9(
       Button,
       {
         onClick: handleContinue,
@@ -2288,14 +2674,14 @@ function SolanaAmountStep({
         children: uiConfig?.minDepositUsd && parseFloat(amount) > 0 && parseFloat(amount) < uiConfig.minDepositUsd ? "Update order" : "Continue"
       }
     ) }),
-    /* @__PURE__ */ jsx8(PoweredBy, {})
+    /* @__PURE__ */ jsx9(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
 import { useState as useState9 } from "react";
 import { parseUnits as parseUnits4 } from "viem";
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -2420,18 +2806,18 @@ function SolanaConfirmStep({
     }
   };
   return /* @__PURE__ */ jsxs9("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx9("div", { style: { padding: "12px 12px 10px" }, children: /* @__PURE__ */ jsx9("div", { className: "rs-step-title", children: "Review order" }) }),
+    /* @__PURE__ */ jsx10("div", { style: { padding: "12px 12px 10px" }, children: /* @__PURE__ */ jsx10("div", { className: "rs-step-title", children: "Review order" }) }),
     /* @__PURE__ */ jsxs9("div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
       /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
         /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Source" }),
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-label", children: "Source" }),
           /* @__PURE__ */ jsxs9(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                getChainIcon("solana") && /* @__PURE__ */ jsx9(
+                getChainIcon("solana") && /* @__PURE__ */ jsx10(
                   "img",
                   {
                     src: getChainIcon("solana"),
@@ -2445,14 +2831,14 @@ function SolanaConfirmStep({
           )
         ] }),
         /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Destination" }),
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-label", children: "Destination" }),
           /* @__PURE__ */ jsxs9(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 8 },
               children: [
-                getChainIcon(targetChain) && /* @__PURE__ */ jsx9(
+                getChainIcon(targetChain) && /* @__PURE__ */ jsx10(
                   "img",
                   {
                     src: getChainIcon(targetChain),
@@ -2466,20 +2852,20 @@ function SolanaConfirmStep({
           )
         ] }),
         /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Estimated time" }),
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-value", children: "< 1 min" })
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-label", children: "Estimated time" }),
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-value", children: "< 1 min" })
         ] })
       ] }),
       /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
         /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You send" }),
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-label", children: "You send" }),
           /* @__PURE__ */ jsxs9(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 6 },
               children: [
-                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx9(
+                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx10(
                   "img",
                   {
                     src: getTokenIcon(token.symbol),
@@ -2495,14 +2881,14 @@ function SolanaConfirmStep({
           )
         ] }),
         /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You receive" }),
+          /* @__PURE__ */ jsx10("span", { className: "rs-card-label", children: "You receive" }),
           /* @__PURE__ */ jsxs9(
             "span",
             {
               className: "rs-card-value",
               style: { display: "flex", alignItems: "center", gap: 6 },
               children: [
-                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx9(
+                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx10(
                   "img",
                   {
                     src: getTokenIcon(targetSymbol),
@@ -2519,7 +2905,7 @@ function SolanaConfirmStep({
         ] })
       ] }),
       error && /* @__PURE__ */ jsxs9("div", { className: "rs-alert rs-alert--error", children: [
-        /* @__PURE__ */ jsx9(
+        /* @__PURE__ */ jsx10(
           "svg",
           {
             className: "rs-alert-icon",
@@ -2527,7 +2913,7 @@ function SolanaConfirmStep({
             fill: "none",
             stroke: "currentColor",
             strokeWidth: "2",
-            children: /* @__PURE__ */ jsx9(
+            children: /* @__PURE__ */ jsx10(
               "path",
               {
                 strokeLinecap: "round",
@@ -2537,10 +2923,10 @@ function SolanaConfirmStep({
             )
           }
         ),
-        /* @__PURE__ */ jsx9("span", { className: "rs-alert-text", children: error })
+        /* @__PURE__ */ jsx10("span", { className: "rs-alert-text", children: error })
       ] })
     ] }),
-    /* @__PURE__ */ jsx9("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx9(
+    /* @__PURE__ */ jsx10("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx10(
       Button,
       {
         onClick: handleConfirm,
@@ -2550,14 +2936,14 @@ function SolanaConfirmStep({
         children: "Confirm Order"
       }
     ) }),
-    /* @__PURE__ */ jsx9(PoweredBy, {})
+    /* @__PURE__ */ jsx10(PoweredBy, {})
   ] });
 }
 
 // src/DepositFlow.tsx
-import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
 var QR_AUTO_ADVANCE_HYDRATION_GRACE_MS = 1e3;
-function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
+function isSameRoute2(sourceChain, sourceToken, targetChain, targetToken) {
   return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
 }
 function getAddressKey(address) {
@@ -2576,6 +2962,8 @@ function DepositFlow({
   amount: defaultAmount,
   recipient,
   postBridgeActions,
+  outputTokenRules,
+  rejectUnmapped,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
   sessionChainIds,
   forceRegister = false,
@@ -2604,6 +2992,10 @@ function DepositFlow({
   const onTotalBalanceChangeRef = useLatestRef(onTotalBalanceChange);
   const onSmartAccountChangeRef = useLatestRef(onSmartAccountChange);
   const onEventRef = useLatestRef(onEvent);
+  const onDepositSubmittedRef = useLatestRef(onDepositSubmitted);
+  const onDepositCompleteRef = useLatestRef(onDepositComplete);
+  const onDepositFailedRef = useLatestRef(onDepositFailed);
+  const onErrorRef = useLatestRef(onError);
   const hasInitialReownSession = Boolean(
     enableSolana ? reownWallet?.isConnected || reownWallet?.address : reownWallet?.address
   );
@@ -2616,32 +3008,34 @@ function DepositFlow({
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState10(false);
   const [selectedWalletId, setSelectedWalletId] = useState10(null);
   const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState10(() => !hasInitialWalletHydrationPending);
-  const flowModeRef = useRef5(null);
-  const portfolioAssetsRef = useRef5([]);
-  const stableWalletSignerRef = useRef5(null);
-  const stableWalletSelectionKeyRef = useRef5(null);
+  const flowModeRef = useRef6(null);
+  const portfolioAssetsRef = useRef6([]);
+  const stableWalletSignerRef = useRef6(null);
+  const stableWalletSelectionKeyRef = useRef6(null);
   flowModeRef.current = flowMode;
-  const logFlow = useCallback3(
+  const logFlow = useCallback4(
     (message, data) => {
       debugLog(debug, "deposit-flow", message, data);
     },
     [debug]
   );
-  const logFlowError = useCallback3(
+  const logFlowError = useCallback4(
     (message, error, data) => {
       debugError(debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
-  const handleAssetsLoaded = useCallback3((assets) => {
+  const handleAssetsLoaded = useCallback4((assets) => {
     portfolioAssetsRef.current = assets;
   }, []);
-  const getTokenPriceUsd = useCallback3((symbol) => {
+  const getTokenPriceUsd = useCallback4((symbol) => {
     const sym = symbol.toLowerCase();
     for (const asset of portfolioAssetsRef.current) {
       if (asset.symbol.toLowerCase() === sym && asset.balanceUsd && asset.balance) {
         try {
-          const balanceUnits = Number(asset.balance) / 10 ** asset.decimals;
+          const balanceUnits = Number(
+            formatUnits5(BigInt(asset.balance), asset.decimals)
+          );
           if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
         } catch {
         }
@@ -2649,14 +3043,14 @@ function DepositFlow({
     }
     return null;
   }, []);
-  const dappSwitchChain = useMemo7(() => {
+  const dappSwitchChain = useMemo6(() => {
     if (!dappWalletClient?.switchChain) return void 0;
     return async (chainId) => {
       await dappWalletClient.switchChain?.({ id: chainId });
     };
   }, [dappWalletClient]);
   const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
-  const walletOptions = useMemo7(() => {
+  const walletOptions = useMemo6(() => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
     if (connectedWalletAddress && dappAddress) {
@@ -2728,7 +3122,7 @@ function DepositFlow({
     }, QR_AUTO_ADVANCE_HYDRATION_GRACE_MS);
     return () => window.clearTimeout(timeout);
   }, [isWalletHydrationPending]);
-  const walletSelectionKey = useMemo7(() => {
+  const walletSelectionKey = useMemo6(() => {
     if (flowMode !== "wallet") return null;
     if (canAutoLock) {
       return getAddressKey(connectedWalletAddress);
@@ -2742,7 +3136,7 @@ function DepositFlow({
     isConnectSelectionConfirmed,
     selectedWalletId
   ]);
-  const walletSignerContext = useMemo7(() => {
+  const walletSignerContext = useMemo6(() => {
     if (flowMode === "deposit-address") {
       return null;
     }
@@ -2823,7 +3217,7 @@ function DepositFlow({
       stableWalletSignerRef.current = walletSignerContext;
     }
   }, [flowMode, walletSelectionKey, walletSignerContext]);
-  const signerContext = useMemo7(() => {
+  const signerContext = useMemo6(() => {
     if (flowMode === "deposit-address") {
       if (!dappAddress) return null;
       return {
@@ -2852,7 +3246,7 @@ function DepositFlow({
     walletSelectionKey
   ]);
   const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
-  const lastTargetRef = useRef5(null);
+  const lastTargetRef = useRef6(null);
   useEffect9(() => {
     const prev = lastTargetRef.current;
     if (prev && (prev.chain !== targetChain || prev.token.toLowerCase() !== targetToken.toLowerCase())) {
@@ -2862,20 +3256,20 @@ function DepositFlow({
     }
     lastTargetRef.current = { chain: targetChain, token: targetToken };
   }, [targetChain, targetToken, step.type]);
-  const handleBackFromAmount = useCallback3(() => {
+  const handleBackFromAmount = useCallback4(() => {
     setStep((prev) => {
       if (prev.type !== "amount") return prev;
       return { type: "select-asset", smartAccount: prev.smartAccount };
     });
   }, []);
-  const handleBackFromSelectAsset = useCallback3(() => {
+  const handleBackFromSelectAsset = useCallback4(() => {
     if (hasWalletOptions || reownWallet) {
       hasNavigatedBackRef.current = true;
       setFlowMode(null);
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
-  const handleBackFromDepositAddress = useCallback3(() => {
+  const handleBackFromDepositAddress = useCallback4(() => {
     setFlowMode(null);
     setStep({ type: "setup" });
     if (hasWalletOptions || reownWallet) {
@@ -2883,7 +3277,7 @@ function DepositFlow({
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
-  const handleBackFromSolanaTokenSelect = useCallback3(() => {
+  const handleBackFromSolanaTokenSelect = useCallback4(() => {
     setFlowMode(null);
     setStep({ type: "setup" });
     if (hasWalletOptions || reownWallet) {
@@ -2891,7 +3285,7 @@ function DepositFlow({
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
-  const handleBackFromSolanaAmount = useCallback3(() => {
+  const handleBackFromSolanaAmount = useCallback4(() => {
     setStep((prev) => {
       if (prev.type !== "solana-amount") return prev;
       return {
@@ -2901,7 +3295,7 @@ function DepositFlow({
       };
     });
   }, []);
-  const handleBackFromSolanaConfirm = useCallback3(() => {
+  const handleBackFromSolanaConfirm = useCallback4(() => {
     setStep((prev) => {
       if (prev.type !== "solana-confirm") return prev;
       return {
@@ -2915,7 +3309,7 @@ function DepositFlow({
       };
     });
   }, []);
-  const handleBackFromConfirm = useCallback3(() => {
+  const handleBackFromConfirm = useCallback4(() => {
     setStep((prev) => {
       if (prev.type !== "confirm") return prev;
       return {
@@ -2932,7 +3326,7 @@ function DepositFlow({
   }, [stepIndex, currentBackHandler, onStepChangeRef]);
   const stepSendToken = step.type === "amount" ? step.asset.symbol : null;
   const stepOpenEventKey = step.type === "select-asset" ? "select-asset" : step.type === "deposit-address" ? "deposit-address" : step.type === "amount" && stepSendToken ? `amount:${stepSendToken.toLowerCase()}` : null;
-  const lastStepOpenEventKeyRef = useRef5(null);
+  const lastStepOpenEventKeyRef = useRef6(null);
   useEffect9(() => {
     if (!stepOpenEventKey) {
       lastStepOpenEventKeyRef.current = null;
@@ -2996,17 +3390,17 @@ function DepositFlow({
   }, [totalBalanceUsd, onTotalBalanceChangeRef]);
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
-  const handleSelectProvider = useCallback3(() => {
+  const handleSelectProvider = useCallback4(() => {
     setFlowMode("wallet");
   }, []);
-  const handleSelectSolanaWallet = useCallback3(() => {
+  const handleSelectSolanaWallet = useCallback4(() => {
     setFlowMode("solana-wallet");
   }, []);
-  const handleSelectTransferCrypto = useCallback3(() => {
+  const handleSelectTransferCrypto = useCallback4(() => {
     setFlowMode("deposit-address");
     setStep({ type: "setup" });
   }, []);
-  const handleNewDeposit = useCallback3(() => {
+  const handleNewDeposit = useCallback4(() => {
     onSmartAccountChangeRef.current?.(null);
     setFlowMode(null);
     setStep({ type: "setup" });
@@ -3014,7 +3408,7 @@ function DepositFlow({
     setSelectedWalletId(null);
     hasNavigatedBackRef.current = false;
   }, [onSmartAccountChangeRef]);
-  const handleSetupComplete = useCallback3(
+  const handleSetupComplete = useCallback4(
     (smartAccount, solanaDepositAddress) => {
       logFlow("setup:complete", {
         smartAccount,
@@ -3047,35 +3441,18 @@ function DepositFlow({
     },
     [isDepositAddressMode, isSolanaWalletMode, logFlow, onSmartAccountChangeRef]
   );
-  const handleDepositAddressDetected = useCallback3(
-    (txHash, chainId, amount, token, sourceSymbol, sourceDecimals) => {
+  const handleDepositAddressSubmitted = useCallback4(
+    (data) => {
       logFlow("deposit-address:detected", {
-        txHash,
-        sourceChain: chainId,
-        sourceToken: token,
-        amount
-      });
-      setStep((prev) => {
-        if (prev.type !== "deposit-address") return prev;
-        const isEvmToken = /^0x[a-fA-F0-9]{40}$/.test(token);
-        const directTransfer = typeof chainId === "number" && isEvmToken && isSameRoute(chainId, token, targetChain, targetToken);
-        return {
-          type: "processing",
-          smartAccount: prev.smartAccount,
-          txHash,
-          sourceChain: chainId,
-          sourceToken: token,
-          amount,
-          sourceSymbol,
-          sourceDecimals,
-          directTransfer
-        };
+        txHash: data.txHash,
+        sourceChain: data.sourceChain,
+        amount: data.amount
       });
-      onDepositSubmitted?.({ txHash, sourceChain: chainId, amount });
+      onDepositSubmittedRef.current?.(data);
     },
-    [onDepositSubmitted, targetChain, targetToken]
+    [logFlow, onDepositSubmittedRef]
   );
-  const handleSolanaTokenContinue = useCallback3(
+  const handleSolanaTokenContinue = useCallback4(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       setStep((prev) => {
@@ -3093,7 +3470,7 @@ function DepositFlow({
     },
     [defaultAmount, logFlow]
   );
-  const handleSolanaAmountContinue = useCallback3(
+  const handleSolanaAmountContinue = useCallback4(
     (token, sourceAmount, inputAmountUsd) => {
       const targetSym = getTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
@@ -3123,7 +3500,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, logFlow]
   );
-  const handleSolanaConfirmed = useCallback3(
+  const handleSolanaConfirmed = useCallback4(
     (txHash, amountUnits) => {
       setStep((prev) => {
         if (prev.type !== "solana-confirm") return prev;
@@ -3151,13 +3528,13 @@ function DepositFlow({
     },
     [logFlow, onDepositSubmitted]
   );
-  const handleConnected = useCallback3(
+  const handleConnected = useCallback4(
     (addr, smartAccount) => {
       onConnected?.({ address: addr, smartAccount });
     },
     [onConnected]
   );
-  const handleAssetContinue = useCallback3(
+  const handleAssetContinue = useCallback4(
     (asset) => {
       onEvent?.({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
@@ -3179,7 +3556,7 @@ function DepositFlow({
     },
     [defaultAmount, onEvent, totalBalanceUsd]
   );
-  const handleAmountContinue = useCallback3(
+  const handleAmountContinue = useCallback4(
     (amount, targetAmount, balance) => {
       const targetSym = getTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
@@ -3199,7 +3576,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd]
   );
-  const handleDepositSubmitted = useCallback3(
+  const handleDepositSubmitted = useCallback4(
     (txHash, chainId, amount, token) => {
       logFlow("evm:submitted", {
         txHash,
@@ -3216,54 +3593,54 @@ function DepositFlow({
           sourceChain: chainId,
           sourceToken: token,
           amount,
-          directTransfer: isSameRoute(chainId, token, targetChain, targetToken)
+          directTransfer: isSameRoute2(chainId, token, targetChain, targetToken)
         };
       });
     },
     [targetChain, targetToken]
   );
-  const handleDepositSubmittedCallback = useCallback3(
+  const handleDepositSubmittedCallback = useCallback4(
     (txHash, sourceChain, amount) => {
-      onDepositSubmitted?.({ txHash, sourceChain, amount });
+      onDepositSubmittedRef.current?.({ txHash, sourceChain, amount });
     },
-    [onDepositSubmitted]
+    [onDepositSubmittedRef]
   );
-  const handleDepositComplete = useCallback3(
+  const handleDepositComplete = useCallback4(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
-      onDepositComplete?.({ txHash, destinationTxHash, ...context });
+      onDepositCompleteRef.current?.({ txHash, destinationTxHash, ...context });
     },
-    [logFlow, onDepositComplete]
+    [logFlow, onDepositCompleteRef]
   );
-  const handleDepositFailed = useCallback3(
+  const handleDepositFailed = useCallback4(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
-      onDepositFailed?.({ txHash, error });
+      onDepositFailedRef.current?.({ txHash, error });
     },
-    [logFlowError, onDepositFailed]
+    [logFlowError, onDepositFailedRef]
   );
-  const handleError = useCallback3(
+  const handleError = useCallback4(
     (message, code) => {
       logFlowError("flow:error", message, { code });
-      onError?.({ message, code });
+      onErrorRef.current?.({ message, code });
     },
-    [logFlowError, onError]
+    [logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback3((total) => {
+  const handleTotalBalanceComputed = useCallback4((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const selectedWalletIdEffective = useMemo7(() => {
+  const selectedWalletIdEffective = useMemo6(() => {
     if (selectedWalletId) return selectedWalletId;
     if (walletOptions.length === 1) {
       return walletOptions[0].id;
     }
     return null;
   }, [selectedWalletId, walletOptions]);
-  const walletOptionsKey = useMemo7(
+  const walletOptionsKey = useMemo6(
     () => walletOptions.map((option) => option.id).join(","),
     [walletOptions]
   );
-  const hasNavigatedBackRef = useRef5(false);
+  const hasNavigatedBackRef = useRef6(false);
   useEffect9(() => {
     if (flowModeRef.current) {
       return;
@@ -3331,7 +3708,7 @@ function DepositFlow({
     handleSelectTransferCrypto
   ]);
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx10("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx10(
+    return /* @__PURE__ */ jsx11("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx11(
       ConnectStep,
       {
         walletOptions,
@@ -3365,7 +3742,7 @@ function DepositFlow({
   if (isDepositAddressMode) {
     if (!dappAddress || !sessionKeyAddress) return null;
     return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && /* @__PURE__ */ jsx10(
+      step.type === "setup" && /* @__PURE__ */ jsx11(
         SetupStep,
         {
           address: sessionKeyAddress,
@@ -3375,6 +3752,8 @@ function DepositFlow({
           sessionChainIds,
           recipient,
           postBridgeActions,
+          outputTokenRules,
+          rejectUnmapped,
           forceRegister,
           enableSolana,
           service,
@@ -3383,14 +3762,20 @@ function DepositFlow({
           onError: handleError
         }
       ),
-      step.type === "deposit-address" && /* @__PURE__ */ jsx10(
+      step.type === "deposit-address" && /* @__PURE__ */ jsx11(
         DepositAddressStep,
         {
           smartAccount: step.smartAccount,
           solanaDepositAddress: enableSolana ? step.solanaDepositAddress : void 0,
           service,
           allowedRoutes,
-          onDepositDetected: handleDepositAddressDetected,
+          targetChain,
+          targetToken,
+          waitForFinalTx,
+          hasPostBridgeActions: Boolean(postBridgeActions?.length),
+          onDepositSubmitted: handleDepositAddressSubmitted,
+          onDepositComplete: handleDepositComplete,
+          onDepositFailed: handleDepositFailed,
           onCopyAddress: () => {
             const chainName = getChainName(targetChain);
             const tokenSymbol = getTokenSymbol(targetToken, targetChain);
@@ -3402,29 +3787,6 @@ function DepositFlow({
               cta_name: "copy"
             });
           },
-          onError: handleError
-        }
-      ),
-      step.type === "processing" && /* @__PURE__ */ jsx10(
-        ProcessingStep,
-        {
-          smartAccount: step.smartAccount,
-          txHash: step.txHash,
-          sourceChain: step.sourceChain,
-          sourceToken: step.sourceToken,
-          targetChain,
-          targetToken,
-          amount: step.amount,
-          sourceSymbol: step.sourceSymbol,
-          sourceDecimals: step.sourceDecimals,
-          waitForFinalTx,
-          hasPostBridgeActions: Boolean(postBridgeActions?.length),
-          service,
-          directTransfer: step.directTransfer,
-          onClose,
-          onNewDeposit: handleNewDeposit,
-          onDepositComplete: handleDepositComplete,
-          onDepositFailed: handleDepositFailed,
           onError: handleError,
           debug
         }
@@ -3436,7 +3798,7 @@ function DepositFlow({
     const solanaAddr = reownWallet?.solanaAddress;
     const solanaProvider = reownWallet?.solanaProvider;
     return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && /* @__PURE__ */ jsx10(
+      step.type === "setup" && /* @__PURE__ */ jsx11(
         SetupStep,
         {
           address: sessionKeyAddress,
@@ -3446,6 +3808,8 @@ function DepositFlow({
           sessionChainIds,
           recipient,
           postBridgeActions,
+          outputTokenRules,
+          rejectUnmapped,
           forceRegister,
           enableSolana,
           service,
@@ -3454,7 +3818,7 @@ function DepositFlow({
           onError: handleError
         }
       ),
-      step.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx10(
+      step.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx11(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
@@ -3464,7 +3828,7 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-amount" && /* @__PURE__ */ jsx10(
+      step.type === "solana-amount" && /* @__PURE__ */ jsx11(
         SolanaAmountStep,
         {
           token: step.token,
@@ -3476,7 +3840,7 @@ function DepositFlow({
           debug
         }
       ),
-      step.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx10(
+      step.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx11(
         SolanaConfirmStep,
         {
           smartAccount: step.smartAccount,
@@ -3497,14 +3861,14 @@ function DepositFlow({
         }
       ) : step.type === "solana-confirm" ? /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
         /* @__PURE__ */ jsxs10("div", { className: "rs-loading-state", children: [
-          /* @__PURE__ */ jsx10("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx10(
+          /* @__PURE__ */ jsx11("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx11(
             "svg",
             {
               viewBox: "0 0 24 24",
               fill: "none",
               stroke: "currentColor",
               strokeWidth: "2",
-              children: /* @__PURE__ */ jsx10(
+              children: /* @__PURE__ */ jsx11(
                 "path",
                 {
                   strokeLinecap: "round",
@@ -3515,21 +3879,21 @@ function DepositFlow({
             }
           ) }),
           /* @__PURE__ */ jsxs10("div", { className: "rs-loading-text", children: [
-            /* @__PURE__ */ jsx10("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
-            /* @__PURE__ */ jsx10("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+            /* @__PURE__ */ jsx11("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx11("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
           ] })
         ] }),
-        /* @__PURE__ */ jsx10("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx10(
+        /* @__PURE__ */ jsx11("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx11(
           "button",
           {
             type: "button",
             className: "rs-button rs-button--default rs-button--full-width",
             onClick: handleBackFromSolanaConfirm,
-            children: /* @__PURE__ */ jsx10("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx11("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      step.type === "processing" && /* @__PURE__ */ jsx10(
+      step.type === "processing" && /* @__PURE__ */ jsx11(
         ProcessingStep,
         {
           smartAccount: step.smartAccount,
@@ -3556,7 +3920,7 @@ function DepositFlow({
     ] });
   }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return /* @__PURE__ */ jsx10("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx10("div", { className: "rs-step", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-title", children: "Connecting wallet..." }) }) }) }) });
+    return /* @__PURE__ */ jsx11("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx11("div", { className: "rs-step", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-title", children: "Connecting wallet..." }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? targetChain;
@@ -3567,7 +3931,7 @@ function DepositFlow({
     return getPublicClient(chainId);
   };
   return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-    step.type === "setup" && /* @__PURE__ */ jsx10(
+    step.type === "setup" && /* @__PURE__ */ jsx11(
       SetupStep,
       {
         walletClient: signerContext.walletClient,
@@ -3578,6 +3942,8 @@ function DepositFlow({
         sessionChainIds,
         recipient,
         postBridgeActions,
+        outputTokenRules,
+        rejectUnmapped,
         forceRegister,
         enableSolana,
         service,
@@ -3586,7 +3952,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    step.type === "select-asset" && /* @__PURE__ */ jsx10(
+    step.type === "select-asset" && /* @__PURE__ */ jsx11(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -3597,10 +3963,14 @@ function DepositFlow({
         service,
         onContinue: handleAssetContinue,
         onTotalBalanceComputed: handleTotalBalanceComputed,
-        onAssetsLoaded: handleAssetsLoaded
+        onAssetsLoaded: handleAssetsLoaded,
+        onDisconnect: onDisconnect ? () => {
+          onDisconnect();
+          handleBackFromSelectAsset();
+        } : void 0
       }
     ),
-    step.type === "amount" && /* @__PURE__ */ jsx10(
+    step.type === "amount" && /* @__PURE__ */ jsx11(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -3625,7 +3995,7 @@ function DepositFlow({
         }
       }
     ),
-    step.type === "confirm" && /* @__PURE__ */ jsx10(
+    step.type === "confirm" && /* @__PURE__ */ jsx11(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -3645,7 +4015,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    step.type === "processing" && /* @__PURE__ */ jsx10(
+    step.type === "processing" && /* @__PURE__ */ jsx11(
       ProcessingStep,
       {
         smartAccount: step.smartAccount,
@@ -3673,13 +4043,13 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback4 } from "react";
-import { Fragment as Fragment3, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
+import { useCallback as useCallback5 } from "react";
+import { Fragment as Fragment2, jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
 }
-function formatTimestamp(iso) {
+function formatTimestamp2(iso) {
   try {
     const date = new Date(iso);
     if (Number.isNaN(date.getTime())) return iso;
@@ -3711,6 +4081,16 @@ function resolveChainId(value) {
 }
 function resolveTokenSymbol(token, chainId) {
   if (!token) return "";
+  if (chainId === "solana") {
+    const normalized = token.toLowerCase();
+    const matched = SOLANA_TOKENS.find(
+      (entry) => entry.mint.toLowerCase() === normalized
+    );
+    if (matched) return matched.symbol;
+    if (normalized === "native" || normalized === "11111111111111111111111111111111" || normalized === "so11111111111111111111111111111111111111112") {
+      return "SOL";
+    }
+  }
   if (chainId !== null && chainId !== void 0 && chainId !== "solana" && /^0x[a-fA-F0-9]{40}$/.test(token)) {
     const sym = getTokenSymbol(token, chainId);
     if (sym !== "Token") return sym;
@@ -3720,12 +4100,24 @@ function resolveTokenSymbol(token, chainId) {
 function formatAmount(rawAmount, token, chainId) {
   if (!rawAmount) return "";
   let decimals = 18;
-  if (token && chainId !== null && chainId !== void 0 && chainId !== "solana" && /^0x[a-fA-F0-9]{40}$/.test(token)) {
-    decimals = getTokenDecimalsByAddress(token, chainId);
+  if (token && chainId !== null && chainId !== void 0) {
+    if (chainId === "solana") {
+      const normalized = token.toLowerCase();
+      const matched = SOLANA_TOKENS.find(
+        (entry) => entry.mint.toLowerCase() === normalized
+      );
+      if (matched) {
+        decimals = matched.decimals;
+      } else if (normalized === "native" || normalized === "11111111111111111111111111111111" || normalized === "so11111111111111111111111111111111111111112") {
+        decimals = 9;
+      }
+    } else if (/^0x[a-fA-F0-9]{40}$/.test(token)) {
+      decimals = getTokenDecimalsByAddress(token, chainId);
+    }
   }
   try {
     const raw = BigInt(rawAmount);
-    const divisor = BigInt(10 ** decimals);
+    const divisor = 10n ** BigInt(decimals);
     const whole = raw / divisor;
     const remainder = raw % divisor;
     if (remainder === 0n) return whole.toString();
@@ -3757,7 +4149,7 @@ var STATUS_LABEL = {
   failed: "Failed"
 };
 function ExternalLinkIcon() {
-  return /* @__PURE__ */ jsx11("svg", { className: "rs-history-ext-icon", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx11("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M4.5 1.5H2.25A.75.75 0 0 0 1.5 2.25v7.5c0 .414.336.75.75.75h7.5a.75.75 0 0 0 .75-.75V7.5m-3-6h3m0 0v3m0-3L6 6" }) });
+  return /* @__PURE__ */ jsx12("svg", { className: "rs-history-ext-icon", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx12("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M4.5 1.5H2.25A.75.75 0 0 0 1.5 2.25v7.5c0 .414.336.75.75.75h7.5a.75.75 0 0 0 .75-.75V7.5m-3-6h3m0 0v3m0-3L6 6" }) });
 }
 function DepositHistoryPanel({
   deposits,
@@ -3768,7 +4160,7 @@ function DepositHistoryPanel({
   onLoadMore,
   onClose
 }) {
-  const handleKeyDown = useCallback4(
+  const handleKeyDown = useCallback5(
     (e) => {
       if (e.key === "Escape") {
         e.stopPropagation();
@@ -3786,39 +4178,39 @@ function DepositHistoryPanel({
       onKeyDown: handleKeyDown,
       children: [
         /* @__PURE__ */ jsxs11("div", { className: "rs-history-header", children: [
-          /* @__PURE__ */ jsx11(
+          /* @__PURE__ */ jsx12(
             "button",
             {
               type: "button",
               className: "rs-history-back",
               "aria-label": "Close history",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx11("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: /* @__PURE__ */ jsx11("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M15.75 19.5L8.25 12l7.5-7.5" }) })
+              children: /* @__PURE__ */ jsx12("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: /* @__PURE__ */ jsx12("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M15.75 19.5L8.25 12l7.5-7.5" }) })
             }
           ),
-          /* @__PURE__ */ jsx11("span", { className: "rs-history-header-title", children: "History" }),
-          /* @__PURE__ */ jsx11("div", { className: "rs-history-header-spacer" })
+          /* @__PURE__ */ jsx12("span", { className: "rs-history-header-title", children: "History" }),
+          /* @__PURE__ */ jsx12("div", { className: "rs-history-header-spacer" })
         ] }),
         /* @__PURE__ */ jsxs11("div", { className: "rs-history-body", children: [
           isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-history-state", children: [
-            /* @__PURE__ */ jsx11("div", { className: "rs-history-spinner", children: /* @__PURE__ */ jsx11("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: /* @__PURE__ */ jsx11("path", { d: "M12 2v4m0 12v4m-7.07-3.93l2.83-2.83m8.48-8.48l2.83-2.83M2 12h4m12 0h4M4.93 4.93l2.83 2.83m8.48 8.48l2.83 2.83", strokeLinecap: "round" }) }) }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-state-text", children: "Loading history..." })
+            /* @__PURE__ */ jsx12("div", { className: "rs-history-spinner", children: /* @__PURE__ */ jsx12("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: /* @__PURE__ */ jsx12("path", { d: "M12 2v4m0 12v4m-7.07-3.93l2.83-2.83m8.48-8.48l2.83-2.83M2 12h4m12 0h4M4.93 4.93l2.83 2.83m8.48 8.48l2.83 2.83", strokeLinecap: "round" }) }) }),
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-state-text", children: "Loading history..." })
           ] }),
           error && !isLoading && /* @__PURE__ */ jsxs11("div", { className: "rs-history-state", children: [
-            /* @__PURE__ */ jsx11("div", { className: "rs-history-state-icon rs-history-state-icon--error", children: /* @__PURE__ */ jsxs11("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: [
-              /* @__PURE__ */ jsx11("circle", { cx: "12", cy: "12", r: "10" }),
-              /* @__PURE__ */ jsx11("path", { strokeLinecap: "round", d: "M12 8v4m0 4h.01" })
+            /* @__PURE__ */ jsx12("div", { className: "rs-history-state-icon rs-history-state-icon--error", children: /* @__PURE__ */ jsxs11("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: [
+              /* @__PURE__ */ jsx12("circle", { cx: "12", cy: "12", r: "10" }),
+              /* @__PURE__ */ jsx12("path", { strokeLinecap: "round", d: "M12 8v4m0 4h.01" })
             ] }) }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-state-text", children: error })
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-state-text", children: error })
           ] }),
           !isLoading && !error && deposits.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-history-state", children: [
-            /* @__PURE__ */ jsx11("div", { className: "rs-history-state-icon", children: /* @__PURE__ */ jsx11("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx11("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" }) }) }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-state-text", children: "No deposits yet" }),
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-state-hint", children: "Your deposit history will appear here" })
+            /* @__PURE__ */ jsx12("div", { className: "rs-history-state-icon", children: /* @__PURE__ */ jsx12("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx12("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M12 6v6h4.5m4.5 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" }) }) }),
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-state-text", children: "No deposits yet" }),
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-state-hint", children: "Your deposit history will appear here" })
           ] }),
           deposits.length > 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-history-list", children: [
-            deposits.map((deposit, i) => /* @__PURE__ */ jsx11(HistoryRow, { deposit }, deposit.txHash || i)),
-            hasMore && /* @__PURE__ */ jsx11(
+            deposits.map((deposit, i) => /* @__PURE__ */ jsx12(HistoryRow, { deposit }, deposit.txHash || i)),
+            hasMore && /* @__PURE__ */ jsx12(
               "button",
               {
                 type: "button",
@@ -3846,38 +4238,38 @@ function HistoryRow({ deposit }) {
   const targetSymbol = resolveTokenSymbol(deposit.targetToken, targetChainId);
   const rawAmount = deposit.sourceAmount ?? deposit.amount;
   const formattedAmount = rawAmount ? formatAmount(rawAmount, deposit.token, sourceChainId) : null;
-  const timestamp = deposit.createdAt ? formatTimestamp(deposit.createdAt) : null;
+  const timestamp = deposit.createdAt ? formatTimestamp2(deposit.createdAt) : null;
   const srcTxUrl = deposit.sourceTxHash ? getTxExplorerUrl(deposit.sourceTxHash, sourceChainId) : null;
   const dstTxUrl = deposit.destinationTxHash ? getTxExplorerUrl(deposit.destinationTxHash, targetChainId) : null;
   return /* @__PURE__ */ jsxs11("div", { className: "rs-history-row", children: [
     /* @__PURE__ */ jsxs11("div", { className: "rs-history-row-primary", children: [
       /* @__PURE__ */ jsxs11("div", { className: "rs-history-route", children: [
         /* @__PURE__ */ jsxs11("span", { className: "rs-history-chain", children: [
-          sourceChainIcon && /* @__PURE__ */ jsx11("img", { src: sourceChainIcon, alt: "", className: "rs-history-chain-icon" }),
-          /* @__PURE__ */ jsx11("span", { className: "rs-history-chain-name", children: sourceChainName ?? "Unknown" })
+          sourceChainIcon && /* @__PURE__ */ jsx12("img", { src: sourceChainIcon, alt: "", className: "rs-history-chain-icon" }),
+          /* @__PURE__ */ jsx12("span", { className: "rs-history-chain-name", children: sourceChainName ?? "Unknown" })
         ] }),
-        /* @__PURE__ */ jsx11("svg", { className: "rs-history-route-arrow", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx11("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M2.5 6h7m0 0L7 3.5M9.5 6 7 8.5" }) }),
+        /* @__PURE__ */ jsx12("svg", { className: "rs-history-route-arrow", viewBox: "0 0 12 12", fill: "none", stroke: "currentColor", strokeWidth: "1.5", children: /* @__PURE__ */ jsx12("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M2.5 6h7m0 0L7 3.5M9.5 6 7 8.5" }) }),
         /* @__PURE__ */ jsxs11("span", { className: "rs-history-chain", children: [
-          targetChainIcon && /* @__PURE__ */ jsx11("img", { src: targetChainIcon, alt: "", className: "rs-history-chain-icon" }),
-          /* @__PURE__ */ jsx11("span", { className: "rs-history-chain-name", children: targetChainName ?? "Unknown" })
+          targetChainIcon && /* @__PURE__ */ jsx12("img", { src: targetChainIcon, alt: "", className: "rs-history-chain-icon" }),
+          /* @__PURE__ */ jsx12("span", { className: "rs-history-chain-name", children: targetChainName ?? "Unknown" })
         ] })
       ] }),
       /* @__PURE__ */ jsxs11("span", { className: `rs-history-status rs-history-status--${status}`, children: [
-        /* @__PURE__ */ jsx11("span", { className: `rs-history-dot rs-history-dot--${status}` }),
+        /* @__PURE__ */ jsx12("span", { className: `rs-history-dot rs-history-dot--${status}` }),
         STATUS_LABEL[status]
       ] })
     ] }),
     /* @__PURE__ */ jsxs11("div", { className: "rs-history-row-secondary", children: [
-      /* @__PURE__ */ jsx11("span", { className: "rs-history-amount", children: formattedAmount ? /* @__PURE__ */ jsxs11(Fragment3, { children: [
+      /* @__PURE__ */ jsx12("span", { className: "rs-history-amount", children: formattedAmount ? /* @__PURE__ */ jsxs11(Fragment2, { children: [
         formattedAmount,
         " ",
-        /* @__PURE__ */ jsx11("span", { className: "rs-history-token", children: sourceSymbol }),
+        /* @__PURE__ */ jsx12("span", { className: "rs-history-token", children: sourceSymbol }),
         targetSymbol && sourceSymbol !== targetSymbol && /* @__PURE__ */ jsxs11("span", { className: "rs-history-token-target", children: [
           " \u2192 ",
           targetSymbol
         ] })
-      ] }) : /* @__PURE__ */ jsx11("span", { className: "rs-history-no-amount", children: "\u2014" }) }),
-      timestamp && /* @__PURE__ */ jsx11("span", { className: "rs-history-time", children: timestamp })
+      ] }) : /* @__PURE__ */ jsx12("span", { className: "rs-history-no-amount", children: "\u2014" }) }),
+      timestamp && /* @__PURE__ */ jsx12("span", { className: "rs-history-time", children: timestamp })
     ] }),
     (srcTxUrl || dstTxUrl) && /* @__PURE__ */ jsxs11("div", { className: "rs-history-row-links", children: [
       srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs11(
@@ -3889,8 +4281,8 @@ function HistoryRow({ deposit }) {
           className: "rs-history-tx-link",
           title: deposit.sourceTxHash,
           children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-tx-hash", children: shortenHash(deposit.sourceTxHash) }),
-            /* @__PURE__ */ jsx11(ExternalLinkIcon, {})
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-tx-hash", children: shortenHash(deposit.sourceTxHash) }),
+            /* @__PURE__ */ jsx12(ExternalLinkIcon, {})
           ]
         }
       ),
@@ -3903,8 +4295,8 @@ function HistoryRow({ deposit }) {
           className: "rs-history-tx-link",
           title: deposit.destinationTxHash,
           children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-tx-hash", children: shortenHash(deposit.destinationTxHash) }),
-            /* @__PURE__ */ jsx11(ExternalLinkIcon, {})
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-tx-hash", children: shortenHash(deposit.destinationTxHash) }),
+            /* @__PURE__ */ jsx12(ExternalLinkIcon, {})
           ]
         }
       )
@@ -3914,9 +4306,9 @@ function HistoryRow({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-RXIVPSEE.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-EYIV6APK.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
@@ -3925,7 +4317,7 @@ function DepositModal(props) {
     "dappWalletClient"
   );
   if (needsReown) {
-    return /* @__PURE__ */ jsx12(Suspense, { fallback: null, children: /* @__PURE__ */ jsx12(
+    return /* @__PURE__ */ jsx13(Suspense, { fallback: null, children: /* @__PURE__ */ jsx13(
       ReownDepositInner,
       {
         ...props,
@@ -3933,7 +4325,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx13(
     DepositModalInner,
     {
       ...props,
@@ -3965,6 +4357,8 @@ function DepositModalInner({
   waitForFinalTx = true,
   enableSolana = true,
   postBridgeActions,
+  outputTokenRules,
+  rejectUnmapped,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -3984,11 +4378,11 @@ function DepositModalInner({
   onError,
   debug
 }) {
-  const modalRef = useRef6(null);
+  const modalRef = useRef7(null);
   const onReadyRef = useLatestRef(onReady);
   const [currentStepIndex, setCurrentStepIndex] = useState11(0);
   const [totalBalanceUsd, setTotalBalanceUsd] = useState11(null);
-  const backHandlerRef = useRef6(void 0);
+  const backHandlerRef = useRef7(void 0);
   const showHistoryButton = uiConfig?.showHistoryButton ?? false;
   const [activeSmartAccount, setActiveSmartAccount] = useState11(null);
   const [historyOpen, setHistoryOpen] = useState11(false);
@@ -3997,11 +4391,11 @@ function DepositModalInner({
   const [historyLoading, setHistoryLoading] = useState11(false);
   const [historyLoadingMore, setHistoryLoadingMore] = useState11(false);
   const [historyError, setHistoryError] = useState11(null);
-  const historyStaleRef = useRef6(false);
-  const historyLoadedRef = useRef6(false);
+  const historyStaleRef = useRef7(false);
+  const historyLoadedRef = useRef7(false);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
-  const service = useMemo8(
+  const service = useMemo7(
     () => createDepositService(backendUrl, {
       debug,
       debugScope: "service:deposit"
@@ -4016,10 +4410,8 @@ function DepositModalInner({
   useEffect10(() => {
     configureSolanaRpcUrl(solanaRpcUrl);
   }, [solanaRpcUrl]);
-  const hasCalledReady = useRef6(false);
   useEffect10(() => {
-    if (isOpen && !hasCalledReady.current) {
-      hasCalledReady.current = true;
+    if (isOpen) {
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
@@ -4028,20 +4420,20 @@ function DepositModalInner({
       setCurrentStepIndex(0);
     }
   }, [isOpen]);
-  const handleStepChange = useCallback5(
+  const handleStepChange = useCallback6(
     (stepIndex, onBack) => {
       setCurrentStepIndex(stepIndex);
       backHandlerRef.current = onBack;
     },
     []
   );
-  const handleTotalBalanceChange = useCallback5((balance2) => {
+  const handleTotalBalanceChange = useCallback6((balance2) => {
     setTotalBalanceUsd(balance2);
   }, []);
-  const handleBack = useCallback5(() => {
+  const handleBack = useCallback6(() => {
     backHandlerRef.current?.();
   }, []);
-  const handleSmartAccountChange = useCallback5(
+  const handleSmartAccountChange = useCallback6(
     (account) => {
       setActiveSmartAccount(account);
       if (!account) {
@@ -4050,7 +4442,7 @@ function DepositModalInner({
     },
     []
   );
-  const fetchHistory = useCallback5(
+  const fetchHistory = useCallback6(
     async (cursor) => {
       if (!activeSmartAccount) return;
       const isInitial = !cursor;
@@ -4088,21 +4480,21 @@ function DepositModalInner({
     },
     [activeSmartAccount, service]
   );
-  const handleHistoryOpen = useCallback5(() => {
+  const handleHistoryOpen = useCallback6(() => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
       fetchHistory();
     }
   }, [fetchHistory]);
-  const handleHistoryClose = useCallback5(() => {
+  const handleHistoryClose = useCallback6(() => {
     setHistoryOpen(false);
   }, []);
-  const handleHistoryLoadMore = useCallback5(() => {
+  const handleHistoryLoadMore = useCallback6(() => {
     if (historyNextCursor) {
       fetchHistory(historyNextCursor);
     }
   }, [fetchHistory, historyNextCursor]);
-  const markHistoryStale = useCallback5(() => {
+  const markHistoryStale = useCallback6(() => {
     historyStaleRef.current = true;
     if (historyOpen) {
       fetchHistory();
@@ -4111,21 +4503,21 @@ function DepositModalInner({
   const onDepositSubmittedRef = useLatestRef(onDepositSubmitted);
   const onDepositCompleteRef = useLatestRef(onDepositComplete);
   const onDepositFailedRef = useLatestRef(onDepositFailed);
-  const handleDepositSubmitted = useCallback5(
+  const handleDepositSubmitted = useCallback6(
     (data) => {
       onDepositSubmittedRef.current?.(data);
       if (showHistoryButton) markHistoryStale();
     },
     [onDepositSubmittedRef, showHistoryButton, markHistoryStale]
   );
-  const handleDepositComplete = useCallback5(
+  const handleDepositComplete = useCallback6(
     (data) => {
       onDepositCompleteRef.current?.(data);
       if (showHistoryButton) markHistoryStale();
     },
     [onDepositCompleteRef, showHistoryButton, markHistoryStale]
   );
-  const handleDepositFailed = useCallback5(
+  const handleDepositFailed = useCallback6(
     (data) => {
       onDepositFailedRef.current?.(data);
       if (showHistoryButton) markHistoryStale();
@@ -4150,7 +4542,7 @@ function DepositModalInner({
   const logoUrl = branding?.logoUrl ?? "https://github.com/rhinestonewtf.png";
   const title = branding?.title ?? "Deposit";
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 4 && backHandlerRef.current !== void 0;
-  return /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx13(
     Modal,
     {
       isOpen,
@@ -4160,21 +4552,21 @@ function DepositModalInner({
       closeOnOverlayClick,
       children: /* @__PURE__ */ jsxs12("div", { ref: modalRef, className: "rs-modal", children: [
         /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx12("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && /* @__PURE__ */ jsx12(
+          /* @__PURE__ */ jsx13("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && /* @__PURE__ */ jsx13(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: handleBack,
-              children: /* @__PURE__ */ jsx12(
+              children: /* @__PURE__ */ jsx13(
                 "svg",
                 {
                   viewBox: "0 0 24 24",
                   fill: "none",
                   stroke: "currentColor",
                   strokeWidth: "2",
-                  children: /* @__PURE__ */ jsx12(
+                  children: /* @__PURE__ */ jsx13(
                     "path",
                     {
                       strokeLinecap: "round",
@@ -4188,7 +4580,7 @@ function DepositModalInner({
           ) }),
           /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header-nav-center", children: [
             /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header-title-row", children: [
-              showLogo && logoUrl && /* @__PURE__ */ jsx12(
+              showLogo && logoUrl && /* @__PURE__ */ jsx13(
                 "img",
                 {
                   src: logoUrl,
@@ -4199,20 +4591,20 @@ function DepositModalInner({
                   }
                 }
               ),
-              /* @__PURE__ */ jsx12("span", { className: "rs-modal-header-title", children: title }),
+              /* @__PURE__ */ jsx13("span", { className: "rs-modal-header-title", children: title }),
               showStepper && currentStepIndex >= 2 && /* @__PURE__ */ jsxs12("div", { className: "rs-step-indicator", style: { marginLeft: 8 }, children: [
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsx13(
                   "div",
                   {
                     className: `rs-step-indicator-node ${currentStepIndex >= 4 ? "rs-step-indicator-node--complete" : "rs-step-indicator-node--active"}`,
-                    children: currentStepIndex >= 4 ? /* @__PURE__ */ jsx12(
+                    children: currentStepIndex >= 4 ? /* @__PURE__ */ jsx13(
                       "svg",
                       {
                         viewBox: "0 0 24 24",
                         fill: "none",
                         stroke: "currentColor",
                         strokeWidth: "3",
-                        children: /* @__PURE__ */ jsx12(
+                        children: /* @__PURE__ */ jsx13(
                           "path",
                           {
                             strokeLinecap: "round",
@@ -4224,13 +4616,13 @@ function DepositModalInner({
                     ) : "1"
                   }
                 ),
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsx13(
                   "div",
                   {
                     className: `rs-step-indicator-line ${currentStepIndex >= 4 ? "rs-step-indicator-line--active" : ""}`
                   }
                 ),
-                /* @__PURE__ */ jsx12(
+                /* @__PURE__ */ jsx13(
                   "div",
                   {
                     className: `rs-step-indicator-node ${currentStepIndex >= 4 ? "rs-step-indicator-node--active" : "rs-step-indicator-node--inactive"}`,
@@ -4244,11 +4636,11 @@ function DepositModalInner({
                 balance.title,
                 ":"
               ] }),
-              /* @__PURE__ */ jsx12("span", { className: "rs-modal-header-balance-value", children: balance.amount ?? (totalBalanceUsd !== null ? currencyFormatter.format(totalBalanceUsd) : null) })
+              /* @__PURE__ */ jsx13("span", { className: "rs-modal-header-balance-value", children: balance.amount ?? (totalBalanceUsd !== null ? currencyFormatter.format(totalBalanceUsd) : null) })
             ] })
           ] }),
           /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header-nav-right", children: [
-            showHistoryButton && /* @__PURE__ */ jsx12(
+            showHistoryButton && /* @__PURE__ */ jsx13(
               "button",
               {
                 type: "button",
@@ -4256,14 +4648,14 @@ function DepositModalInner({
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
                 disabled: !activeSmartAccount,
-                children: /* @__PURE__ */ jsx12(
+                children: /* @__PURE__ */ jsx13(
                   "svg",
                   {
                     viewBox: "0 0 24 24",
                     fill: "none",
                     stroke: "currentColor",
                     strokeWidth: "1.75",
-                    children: /* @__PURE__ */ jsx12(
+                    children: /* @__PURE__ */ jsx13(
                       "path",
                       {
                         strokeLinecap: "round",
@@ -4275,21 +4667,21 @@ function DepositModalInner({
                 )
               }
             ),
-            /* @__PURE__ */ jsx12(
+            /* @__PURE__ */ jsx13(
               "button",
               {
                 type: "button",
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ jsx12(
+                children: /* @__PURE__ */ jsx13(
                   "svg",
                   {
                     viewBox: "0 0 24 24",
                     fill: "none",
                     stroke: "currentColor",
                     strokeWidth: "2",
-                    children: /* @__PURE__ */ jsx12(
+                    children: /* @__PURE__ */ jsx13(
                       "path",
                       {
                         strokeLinecap: "round",
@@ -4303,7 +4695,7 @@ function DepositModalInner({
             )
           ] })
         ] }),
-        /* @__PURE__ */ jsx12(
+        /* @__PURE__ */ jsx13(
           DepositFlow,
           {
             dappWalletClient,
@@ -4318,6 +4710,8 @@ function DepositModalInner({
             amount: defaultAmount,
             recipient,
             postBridgeActions,
+            outputTokenRules,
+            rejectUnmapped,
             signerAddress,
             sessionChainIds,
             forceRegister,
@@ -4343,7 +4737,7 @@ function DepositModalInner({
             debug
           }
         ),
-        showHistoryButton && historyOpen && /* @__PURE__ */ jsx12(
+        showHistoryButton && historyOpen && /* @__PURE__ */ jsx13(
           DepositHistoryPanel,
           {
             deposits: historyDeposits,