@rhinestone/deposit-modal 0.3.0-alpha.5 → 0.3.0-alpha.7

package/dist/{chunk-ZUWAIMMH.mjs → chunk-44IFH7DZ.mjs}

@@ -3,19 +3,17 @@ import {
   ArrowUpRightIcon,
   BodyHeader,
   Button,
+  Callout,
   CheckIcon,
   ChevronDownIcon,
   ChevronLeftIcon,
   ClockIcon,
   CloseIcon,
-  CoinsIcon,
   ConnectStep,
   CopyIcon,
   ExternalLinkIcon,
-  HandCoinsIcon,
   HistoryIcon,
   InfoIcon,
-  ListRow,
   Modal,
   PercentIcon,
   PlusCircleIcon,
@@ -24,6 +22,7 @@ import {
   SAFE_ABI,
   Spinner,
   Tooltip,
+  TransferCryptoIcon,
   WalletIcon,
   accountFromPrivateKey,
   applyTheme,
@@ -44,15 +43,16 @@ import {
   parseEvmChainId,
   portfolioToAssets,
   saveSessionOwnerToStorage,
-  toEvmCaip2,
+  targetChainToCaip2,
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-CTYKQ4B4.mjs";
+} from "./chunk-7VKAUBZ7.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
   NATIVE_TOKEN_ADDRESS,
+  SOLANA_TOKENS,
   SOURCE_CHAINS,
   getChainBadge,
   getChainIcon,
@@ -61,27 +61,29 @@ import {
   getExplorerTxUrl,
   getExplorerUrl,
   getSupportedChainIds,
+  getTargetTokenSymbol,
   getTargetTokenSymbolsForChain,
   getTokenAddress,
   getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol,
+  isNativeSol,
   isStablecoinSymbol
-} from "./chunk-VA3ANS7D.mjs";
+} from "./chunk-UCZXBHLH.mjs";
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo7,
+  useMemo as useMemo8,
   useEffect as useEffect9,
-  useRef as useRef6,
+  useRef as useRef8,
   useState as useState11,
-  useCallback as useCallback5,
+  useCallback as useCallback6,
   lazy as lazy2,
   Suspense as Suspense2
 } from "react";
 
 // src/DepositFlow.tsx
-import { useState as useState9, useCallback as useCallback3, useMemo as useMemo6, useEffect as useEffect8, useRef as useRef5 } from "react";
+import { useState as useState9, useCallback as useCallback4, useMemo as useMemo6, useEffect as useEffect8, useRef as useRef7 } from "react";
 import { formatUnits as formatUnits7 } from "viem";
 
 // src/components/steps/AssetSelectStep.tsx
@@ -223,7 +225,7 @@ function AssetSelectStep({
         /* @__PURE__ */ jsx(Spinner, { className: "rs-text-tertiary" }),
         /* @__PURE__ */ jsx("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
       ] }),
-      error && /* @__PURE__ */ jsx("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx("span", { className: "rs-alert-text", children: error }) }),
+      error && /* @__PURE__ */ jsx(Callout, { variant: "error", children: error }),
       !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs("div", { className: "rs-empty-state", children: [
         /* @__PURE__ */ jsx(WalletIcon, { className: "rs-empty-icon" }),
         /* @__PURE__ */ jsx("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
@@ -351,9 +353,101 @@ function mergeAssets(existing, incoming) {
 }
 
 // src/components/steps/AmountStep.tsx
-import { useEffect as useEffect2, useMemo as useMemo2, useRef, useState as useState2 } from "react";
+import { useEffect as useEffect2, useMemo as useMemo2, useRef as useRef2, useState as useState2 } from "react";
 import { erc20Abi, formatUnits as formatUnits2, parseUnits } from "viem";
-import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+
+// src/components/ui/AnimatedAmountInput.tsx
+import { useLayoutEffect, useRef } from "react";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var ENTER_TRANSITION = "transform 0.18s cubic-bezier(0.34, 1.2, 0.64, 1), opacity 0.18s ease";
+function prefersReducedMotion() {
+  return typeof window !== "undefined" && typeof window.matchMedia === "function" && window.matchMedia("(prefers-reduced-motion: reduce)").matches;
+}
+function AnimatedAmountInput({
+  value,
+  onChange,
+  prefix = "$",
+  placeholder = "0",
+  ariaLabel,
+  autoFocus
+}) {
+  const prevValueRef = useRef("");
+  const isFirstRenderRef = useRef(true);
+  const slotRefs = useRef([]);
+  const isEmpty = value.length === 0;
+  const chars = isEmpty ? [placeholder] : value.split("");
+  useLayoutEffect(() => {
+    const prev = prevValueRef.current;
+    const animate = !isFirstRenderRef.current && !prefersReducedMotion();
+    const oldChars = prev ? prev.split("") : [placeholder];
+    const newChars = value ? value.split("") : [placeholder];
+    const goingUp = (parseFloat(value) || 0) >= (parseFloat(prev) || 0);
+    const isIncrementalEdit = value.startsWith(prev) && value.length === prev.length + 1 || prev.startsWith(value) && prev.length === value.length + 1;
+    if (animate) {
+      newChars.forEach((char, i) => {
+        const inner = slotRefs.current[i];
+        if (!inner) return;
+        const isChanged = i >= oldChars.length || char !== oldChars[i];
+        if (isIncrementalEdit && !isChanged) return;
+        const startY = goingUp ? "100%" : "-100%";
+        inner.style.transition = "none";
+        inner.style.transform = `translateY(${startY})`;
+        inner.style.opacity = "0";
+        requestAnimationFrame(() => {
+          requestAnimationFrame(() => {
+            inner.style.transition = ENTER_TRANSITION;
+            inner.style.transform = "translateY(0)";
+            inner.style.opacity = "1";
+          });
+        });
+      });
+    }
+    prevValueRef.current = value;
+    isFirstRenderRef.current = false;
+  }, [value, placeholder]);
+  const handleChange = (e) => {
+    onChange(e.target.value);
+  };
+  slotRefs.current = [];
+  return /* @__PURE__ */ jsxs2("div", { className: "rs-amount-input-row", children: [
+    /* @__PURE__ */ jsx2("span", { className: "rs-amount-prefix", "aria-hidden": "true", children: prefix }),
+    /* @__PURE__ */ jsxs2("span", { className: "rs-amount-number-wrap", children: [
+      /* @__PURE__ */ jsx2(
+        "input",
+        {
+          type: "text",
+          inputMode: "decimal",
+          placeholder,
+          value,
+          onChange: handleChange,
+          "aria-label": ariaLabel,
+          autoComplete: "off",
+          autoFocus
+        }
+      ),
+      /* @__PURE__ */ jsx2(
+        "span",
+        {
+          className: isEmpty ? "rs-amount-visual rs-amount-visual--placeholder" : "rs-amount-visual",
+          "aria-hidden": "true",
+          children: chars.map((char, i) => /* @__PURE__ */ jsx2("span", { className: "rs-amount-char-slot", children: /* @__PURE__ */ jsx2(
+            "span",
+            {
+              className: "rs-amount-char-inner",
+              ref: (el) => {
+                slotRefs.current[i] = el;
+              },
+              children: char
+            }
+          ) }, i))
+        }
+      )
+    ] })
+  ] });
+}
+
+// src/components/steps/AmountStep.tsx
+import { Fragment, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var PRESETS = [
   { value: 25, label: "25%" },
   { value: 50, label: "50%" },
@@ -381,7 +475,7 @@ function AmountStep({
   targetToken,
   uiConfig,
   tokenPriceUsdOverride,
-  targetBalanceUsd,
+  appBalanceUsd,
   onBalanceUsdChange,
   onContinue,
   onCtaClick,
@@ -391,11 +485,13 @@ function AmountStep({
   const [balance, setBalance] = useState2(null);
   const [error, setError] = useState2(null);
   const [isCheckingLiquidity, setIsCheckingLiquidity] = useState2(false);
-  const hasAttemptedSwitch = useRef(false);
+  const hasAttemptedSwitch = useRef2(false);
+  const hasAppliedDefaultRef = useRef2(false);
+  const isMaxDefault = defaultAmount?.trim().toLowerCase() === "max";
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
-  const targetSymbol = getTokenSymbol(targetToken, targetChain);
+  const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
   const isSourceStablecoin = isStablecoinSymbol(asset.symbol);
   const tokenPriceUsd = useMemo2(() => {
     if (tokenPriceUsdOverride !== void 0 && tokenPriceUsdOverride > 0)
@@ -448,14 +544,6 @@ function AmountStep({
   useEffect2(() => {
     hasAttemptedSwitch.current = false;
   }, [asset.chainId]);
-  useEffect2(() => {
-    if (defaultAmount && !amount) {
-      const parsed = Number(defaultAmount);
-      if (Number.isFinite(parsed) && parsed > 0) {
-        setAmount(parsed.toString());
-      }
-    }
-  }, [defaultAmount, amount]);
   const balanceUsd = useMemo2(() => {
     if (balance === null || tokenPriceUsd === null) return null;
     try {
@@ -469,6 +557,36 @@ function AmountStep({
   useEffect2(() => {
     onBalanceUsdChange?.(balanceUsd ?? 0);
   }, [balanceUsd, onBalanceUsdChange]);
+  useEffect2(() => {
+    if (hasAppliedDefaultRef.current || !defaultAmount) return;
+    if (isMaxDefault) {
+      if (balance === null) return;
+      const next = formatAmountFromBalance(
+        balance,
+        asset.decimals,
+        100,
+        balanceUsd,
+        isSourceStablecoin
+      );
+      if (next) {
+        setAmount(next);
+        hasAppliedDefaultRef.current = true;
+      }
+      return;
+    }
+    const parsed = Number(defaultAmount);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      setAmount(parsed.toString());
+      hasAppliedDefaultRef.current = true;
+    }
+  }, [
+    defaultAmount,
+    isMaxDefault,
+    balance,
+    balanceUsd,
+    asset.decimals,
+    isSourceStablecoin
+  ]);
   const formattedBalance = useMemo2(() => {
     if (balance === null) return "\u2026";
     try {
@@ -501,7 +619,7 @@ function AmountStep({
   const exceedsBalance = Boolean(
     sourceAmountUnits !== null && balance !== null && sourceAmountUnits > balance
   );
-  const balanceAfterUsd = targetBalanceUsd !== void 0 ? targetBalanceUsd + numericAmount : null;
+  const balanceAfterUsd = appBalanceUsd !== void 0 ? appBalanceUsd + numericAmount : null;
   const handlePresetClick = (percentage) => {
     if (balance === null) return;
     onCtaClick?.(percentage === 100 ? "Max" : `${percentage}%`);
@@ -592,45 +710,39 @@ function AmountStep({
   const targetChainName = getChainName(targetChain);
   const sourceTokenIcon = getTokenIcon(asset.symbol);
   const targetTokenIcon = getTokenIcon(targetSymbol);
-  return /* @__PURE__ */ jsxs2("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs2("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx2(BodyHeader, { icon: /* @__PURE__ */ jsx2(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs2("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsxs2("div", { className: "rs-amount-input-row", children: [
-            /* @__PURE__ */ jsx2("span", { "aria-hidden": "true", children: "$" }),
-            /* @__PURE__ */ jsx2(
-              "input",
-              {
-                type: "text",
-                inputMode: "decimal",
-                placeholder: "0",
-                value: amount,
-                onChange: (e) => handleAmountChange(e.target.value),
-                "aria-label": "Deposit amount",
-                autoFocus: true
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxs2("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs2("span", { className: "rs-amount-meta-balance", children: [
+  return /* @__PURE__ */ jsxs3("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs3("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx3(BodyHeader, { icon: /* @__PURE__ */ jsx3(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs3("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsx3(
+            AnimatedAmountInput,
+            {
+              value: amount,
+              onChange: handleAmountChange,
+              ariaLabel: "Deposit amount",
+              autoFocus: true
+            }
+          ),
+          /* @__PURE__ */ jsxs3("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs3("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               asset.symbol,
               " available",
-              balanceUsd !== null && /* @__PURE__ */ jsxs2(Fragment, { children: [
+              balanceUsd !== null && /* @__PURE__ */ jsxs3(Fragment, { children: [
                 " (~",
                 currencyFormatter.format(balanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs2("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs3("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx2("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx2(
+        /* @__PURE__ */ jsx3("div", { className: "rs-amount-presets", children: PRESETS.map((preset) => /* @__PURE__ */ jsx3(
           "button",
           {
             type: "button",
@@ -642,65 +754,55 @@ function AmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs2("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx2("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs2("span", { children: [
+      /* @__PURE__ */ jsxs3("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs3("span", { children: [
               sourceChainName,
               " ",
               asset.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx2("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs2("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs2("span", { children: [
+        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs3("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs3("span", { children: [
               targetChainName,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx2("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx2("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx2("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs3("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx3("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx3("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs2("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx2(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx2("span", { children: error })
-      ] }),
-      /* @__PURE__ */ jsx2(
+      error && /* @__PURE__ */ jsx3(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx3(
         Button,
         {
           onClick: handleContinue,
           fullWidth: true,
           loading: isCheckingLiquidity,
-          loadingText: "Checking liquidity\u2026",
+          loadingText: "Fetching route",
           disabled: continueDisabled,
           children: continueLabel
         }
       )
     ] }),
-    /* @__PURE__ */ jsx2(PoweredBy, {})
+    /* @__PURE__ */ jsx3(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/ConfirmStep.tsx
-import { useEffect as useEffect3, useRef as useRef2, useState as useState3 } from "react";
+import { useEffect as useEffect3, useRef as useRef3, useState as useState3 } from "react";
 import { erc20Abi as erc20Abi2, parseUnits as parseUnits2 } from "viem";
-
-// src/core/dapp-imports/types.ts
-function isDappImportAsset(asset) {
-  return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
-}
-
-// src/components/steps/ConfirmStep.tsx
-import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 function ConfirmStep({
   walletClient,
   address,
@@ -726,12 +828,12 @@ function ConfirmStep({
 }) {
   const [isSubmitting, setIsSubmitting] = useState3(false);
   const [error, setError] = useState3(null);
-  const hasAttemptedSwitch = useRef2(false);
+  const hasAttemptedSwitch = useRef3(false);
   const chainMismatch = Boolean(
     walletClient?.chain?.id && walletClient.chain.id !== asset.chainId
   );
   const sameRoute = targetChain === asset.chainId && targetToken.toLowerCase() === asset.token.toLowerCase();
-  const targetSymbol = sameRoute ? asset.symbol : getTokenSymbol(targetToken, targetChain);
+  const targetSymbol = sameRoute ? asset.symbol : getTargetTokenSymbol(targetToken, targetChain);
   const sourceChainName = getChainName(asset.chainId);
   const targetChainName = getChainName(targetChain);
   const sourceChainIcon = getChainIcon(asset.chainId);
@@ -833,83 +935,66 @@ function ConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs3("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs3("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx3(BodyHeader, { icon: /* @__PURE__ */ jsx3(WalletIcon, {}), title: "Review deposit" }),
-      /* @__PURE__ */ jsxs3("div", { className: "rs-review-details", children: [
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Source chain" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx3("span", { children: sourceChainName }),
-            sourceChainIcon && /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceChainIcon, alt: "" }) })
+  return /* @__PURE__ */ jsxs4("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs4("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx4(BodyHeader, { icon: /* @__PURE__ */ jsx4(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsxs4("div", { className: "rs-review-details", children: [
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "Source chain" }),
+          /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx4("span", { children: sourceChainName }),
+            sourceChainIcon && /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: sourceChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Destination chain" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx3("span", { children: targetChainName }),
-            targetChainIcon && /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "Destination chain" }),
+          /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx4("span", { children: targetChainName }),
+            targetChainIcon && /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: targetChainIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Estimated time" }),
-          /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-value", children: estimatedTime })
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "Estimated time" }),
+          /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-value", children: estimatedTime })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs3("span", { children: [
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs4("span", { children: [
               formattedSendAmount,
               " ",
               asset.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsxs3("span", { children: [
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs4("span", { children: [
               receiveAmount,
               " ",
               targetSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx3("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx4("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs3("div", { className: "rs-review-detail-row", children: [
-          /* @__PURE__ */ jsx3("span", { children: "Fees" }),
-          /* @__PURE__ */ jsxs3("span", { className: "rs-review-detail-value", children: [
-            /* @__PURE__ */ jsx3(
+        /* @__PURE__ */ jsxs4("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx4("span", { children: "Fees" }),
+          /* @__PURE__ */ jsxs4("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx4(
               "span",
               {
                 style: feeSponsored ? { textDecoration: "line-through" } : void 0,
-                children: "$0.05"
+                children: "$0.04"
               }
             ),
-            /* @__PURE__ */ jsx3(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx3("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx3(InfoIcon, {}) }) })
+            /* @__PURE__ */ jsx4(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx4("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx4(InfoIcon, {}) }) })
           ] })
         ] })
       ] }),
-      liquidityWarning && (liquidityWarning.kind === "unavailable" || liquidityWarning.kind === "check-failed") && (isDappImportAsset(asset) ? (
-        // Dapp-import sources route through an unwrap before the
-        // orchestrator sees funds; the upstream route check often
-        // returns "unavailable" for the source token even though the
-        // post-unwrap route works. Surface as a soft warning rather
-        // than a red blocker until the orchestrator handles it.
-        /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error rs-amount-error--warning", role: "status", children: [
-          /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-          /* @__PURE__ */ jsx3("span", { children: "Low liquidity detected \u2014 deposit may take longer" })
-        ] })
-      ) : /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error", role: "status", children: [
-        /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx3("span", { children: liquidityWarning.kind === "unavailable" ? "Route may be unavailable" : "Liquidity check failed" })
-      ] })),
-      error && /* @__PURE__ */ jsxs3("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx3(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx3("span", { children: error })
-      ] }),
-      /* @__PURE__ */ jsx3(
+      error && /* @__PURE__ */ jsx4(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx4(
         Button,
         {
           onClick: handleConfirm,
@@ -921,7 +1006,7 @@ function ConfirmStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx3(PoweredBy, {})
+    /* @__PURE__ */ jsx4(PoweredBy, {})
   ] });
 }
 
@@ -930,7 +1015,7 @@ import {
   useState as useState5,
   useEffect as useEffect5,
   useCallback as useCallback2,
-  useRef as useRef4,
+  useRef as useRef5,
   useMemo as useMemo3,
   lazy,
   Suspense
@@ -938,8 +1023,8 @@ import {
 import { formatUnits as formatUnits3 } from "viem";
 
 // src/components/ui/DepositNotification.tsx
-import { useState as useState4, useEffect as useEffect4, useRef as useRef3, useCallback } from "react";
-import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+import { useState as useState4, useEffect as useEffect4, useRef as useRef4, useCallback } from "react";
+import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
 var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
@@ -996,7 +1081,7 @@ function formatBridgeFailedMessage(event) {
   }
   return "Bridge failed";
 }
-var txLinkIcon = /* @__PURE__ */ jsx4(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
+var txLinkIcon = /* @__PURE__ */ jsx5(ExternalLinkIcon, { className: "rs-deposit-notification-link-icon" });
 function DepositNotification({
   deposit,
   smartAccount,
@@ -1021,9 +1106,9 @@ function DepositNotification({
   const [destinationTxHash, setDestinationTxHash] = useState4(
     null
   );
-  const pollIntervalRef = useRef3(INITIAL_POLL_INTERVAL);
-  const pollTimeoutRef = useRef3(null);
-  const completedRef = useRef3(directTransfer ?? false);
+  const pollIntervalRef = useRef4(INITIAL_POLL_INTERVAL);
+  const pollTimeoutRef = useRef4(null);
+  const completedRef = useRef4(directTransfer ?? false);
   const depositContextRef = useLatestRef({
     amount,
     sourceChain,
@@ -1142,33 +1227,33 @@ function DepositNotification({
   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__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx4(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx4(CloseIcon, {}) }) : /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsx4(Spinner, {}) });
+  const statusIcon = status === "complete" ? /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--complete", children: /* @__PURE__ */ jsx5(CheckIcon, {}) }) : status === "failed" ? /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--failed", children: /* @__PURE__ */ jsx5(CloseIcon, {}) }) : /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ jsx5(Spinner, {}) });
   const showClose = status !== "processing";
-  return /* @__PURE__ */ jsxs4(
+  return /* @__PURE__ */ jsxs5(
     "div",
     {
       className: `rs-deposit-notification rs-deposit-notification--${status} ${expanded ? "rs-deposit-notification--expanded" : ""}`,
       children: [
-        /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-header", children: [
-          /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
-          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-content", children: [
-            /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-title-row", children: [
-              /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-title", children: title }),
-              showClose && /* @__PURE__ */ jsx4(
+        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-header", children: [
+          /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-icon", children: statusIcon }),
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-content", children: [
+            /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-title-row", children: [
+              /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-title", children: title }),
+              showClose && /* @__PURE__ */ jsx5(
                 "button",
                 {
                   type: "button",
                   className: "rs-deposit-notification-close",
                   onClick: () => onDismiss(deposit.id),
                   "aria-label": "Dismiss",
-                  children: /* @__PURE__ */ jsx4(CloseIcon, {})
+                  children: /* @__PURE__ */ jsx5(CloseIcon, {})
                 }
               )
             ] }),
-            /* @__PURE__ */ jsx4("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
+            /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notification-subtitle", children: subtitle })
           ] })
         ] }),
-        /* @__PURE__ */ jsxs4(
+        /* @__PURE__ */ jsxs5(
           "button",
           {
             type: "button",
@@ -1176,15 +1261,15 @@ function DepositNotification({
             onClick: () => setExpanded(!expanded),
             "aria-expanded": expanded,
             children: [
-              /* @__PURE__ */ jsx4("span", { children: expanded ? "See less details" : "See more details" }),
-              /* @__PURE__ */ jsx4(ChevronDownIcon, { className: "rs-deposit-notification-toggle-chevron" })
+              /* @__PURE__ */ jsx5("span", { children: expanded ? "See less details" : "See more details" }),
+              /* @__PURE__ */ jsx5(ChevronDownIcon, { className: "rs-deposit-notification-toggle-chevron" })
             ]
           }
         ),
-        expanded && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-details", children: [
-          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs4(
+        expanded && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-details", children: [
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Deposit tx" }),
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: sourceExplorerUrl ? /* @__PURE__ */ jsxs5(
               "a",
               {
                 href: sourceExplorerUrl,
@@ -1198,9 +1283,9 @@ function DepositNotification({
               }
             ) : truncateHash(txHash) })
           ] }),
-          destinationTxHash && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs4(
+          destinationTxHash && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Completion tx" }),
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: destExplorerUrl ? /* @__PURE__ */ jsxs5(
               "a",
               {
                 href: destExplorerUrl,
@@ -1214,13 +1299,13 @@ function DepositNotification({
               }
             ) : truncateHash(destinationTxHash) })
           ] }),
-          /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
+          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Order submitted" }),
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: formatTimestamp(detectedAt) })
           ] }),
-          completedAt && /* @__PURE__ */ jsxs4("div", { className: "rs-deposit-notification-row", children: [
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
-            /* @__PURE__ */ jsx4("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
+          completedAt && /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-notification-row", children: [
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-label", children: "Order filled" }),
+            /* @__PURE__ */ jsx5("span", { className: "rs-deposit-notification-value", children: formatTimestamp(completedAt) })
           ] })
         ] })
       ]
@@ -1228,125 +1313,8 @@ function DepositNotification({
   );
 }
 
-// src/core/solana.ts
-import {
-  Connection,
-  PublicKey,
-  SystemProgram,
-  Transaction
-} from "@solana/web3.js";
-import {
-  getAssociatedTokenAddress,
-  createAssociatedTokenAccountInstruction,
-  createTransferInstruction
-} from "@solana/spl-token";
-var SOLANA_TOKENS = [
-  { symbol: "SOL", mint: "native", decimals: 9 },
-  {
-    symbol: "USDC",
-    mint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-    decimals: 6
-  },
-  {
-    symbol: "USDT",
-    mint: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
-    decimals: 6
-  }
-];
-var DEFAULT_SOLANA_RPC_URL = "https://api.mainnet.solana.com";
-var configuredSolanaRpcUrl = null;
-var cachedConnections = /* @__PURE__ */ new Map();
-function configureSolanaRpcUrl(rpcUrl) {
-  const normalized = rpcUrl?.trim();
-  configuredSolanaRpcUrl = normalized ? normalized : null;
-  cachedConnections.clear();
-}
-function getSolanaRpcUrl() {
-  return configuredSolanaRpcUrl ?? DEFAULT_SOLANA_RPC_URL;
-}
-function getSolanaConnection() {
-  const rpcUrl = getSolanaRpcUrl();
-  const cached = cachedConnections.get(rpcUrl);
-  if (cached) {
-    return cached;
-  }
-  const next = new Connection(rpcUrl, "confirmed");
-  cachedConnections.set(rpcUrl, next);
-  return next;
-}
-function isNativeSol(token) {
-  return token.mint === "native";
-}
-async function buildSolTransferTransaction(connection, from, to, lamports) {
-  const fromPubkey = new PublicKey(from);
-  const toPubkey = new PublicKey(to);
-  const tx = new Transaction().add(
-    SystemProgram.transfer({
-      fromPubkey,
-      toPubkey,
-      lamports
-    })
-  );
-  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-  tx.recentBlockhash = blockhash;
-  tx.lastValidBlockHeight = lastValidBlockHeight;
-  tx.feePayer = fromPubkey;
-  return tx;
-}
-async function buildSplTransferTransaction(connection, from, to, mint, amount) {
-  const fromPubkey = new PublicKey(from);
-  const toPubkey = new PublicKey(to);
-  const mintPubkey = new PublicKey(mint);
-  const fromAta = await getAssociatedTokenAddress(mintPubkey, fromPubkey);
-  const toAta = await getAssociatedTokenAddress(mintPubkey, toPubkey, true);
-  const tx = new Transaction();
-  const toAtaInfo = await connection.getAccountInfo(toAta);
-  if (!toAtaInfo) {
-    tx.add(
-      createAssociatedTokenAccountInstruction(
-        fromPubkey,
-        toAta,
-        toPubkey,
-        mintPubkey
-      )
-    );
-  }
-  tx.add(createTransferInstruction(fromAta, toAta, fromPubkey, amount));
-  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
-  tx.recentBlockhash = blockhash;
-  tx.lastValidBlockHeight = lastValidBlockHeight;
-  tx.feePayer = fromPubkey;
-  return tx;
-}
-function extractSignature(value) {
-  if (typeof value === "string") {
-    return value.length > 0 ? value : null;
-  }
-  if (typeof value.signature === "string" && value.signature.length > 0) {
-    return value.signature;
-  }
-  if (typeof value.hash === "string" && value.hash.length > 0) {
-    return value.hash;
-  }
-  if (typeof value.txid === "string" && value.txid.length > 0) {
-    return value.txid;
-  }
-  if (typeof value.transactionId === "string" && value.transactionId.length > 0) {
-    return value.transactionId;
-  }
-  return null;
-}
-async function sendSolanaTransaction(provider, _connection, transaction) {
-  const result = await provider.signAndSendTransaction(transaction);
-  const signature = extractSignature(result);
-  if (!signature) {
-    throw new Error("Transaction sent but wallet did not return a signature");
-  }
-  return signature;
-}
-
 // src/components/steps/DepositAddressStep.tsx
-import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var QRCode = lazy(
   () => import("./QRCode-YMQTKSSK.mjs").then((m) => ({ default: m.QRCode }))
 );
@@ -1427,6 +1395,7 @@ function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
 function DepositAddressStep({
   smartAccount,
   solanaDepositAddress,
+  isUpdating = false,
   service,
   allowedRoutes,
   targetChain,
@@ -1480,13 +1449,13 @@ function DepositAddressStep({
   const [chainDropdownOpen, setChainDropdownOpen] = useState5(false);
   const [tokenDropdownOpen, setTokenDropdownOpen] = useState5(false);
   const [priceImpactExpanded, setPriceImpactExpanded] = useState5(false);
-  const chainDropdownRef = useRef4(null);
-  const tokenDropdownRef = useRef4(null);
+  const chainDropdownRef = useRef5(null);
+  const tokenDropdownRef = useRef5(null);
   const [notifications, setNotifications] = useState5([]);
-  const isTrackingRef = useRef4(false);
-  const baselineTxHashRef = useRef4(void 0);
-  const notificationIdRef = useRef4(0);
-  const sourceSelectionRef = useRef4({
+  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
@@ -1581,6 +1550,7 @@ function DepositAddressStep({
     };
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = useCallback2(async () => {
+    if (isUpdating) return;
     onCopyAddress?.();
     try {
       await navigator.clipboard.writeText(displayAddress);
@@ -1598,23 +1568,23 @@ function DepositAddressStep({
       setCopied(true);
       setTimeout(() => setCopied(false), 2e3);
     }
-  }, [displayAddress, onCopyAddress]);
+  }, [displayAddress, onCopyAddress, isUpdating]);
   useEffect5(() => {
     setCopied(false);
     setChainDropdownOpen(false);
     setTokenDropdownOpen(false);
   }, [sourceChainId]);
-  const onDepositSubmittedRef = useRef4(onDepositSubmitted);
+  const onDepositSubmittedRef = useRef5(onDepositSubmitted);
   onDepositSubmittedRef.current = onDepositSubmitted;
-  const onDepositCompleteRef = useRef4(onDepositComplete);
+  const onDepositCompleteRef = useRef5(onDepositComplete);
   onDepositCompleteRef.current = onDepositComplete;
-  const onDepositFailedRef = useRef4(onDepositFailed);
+  const onDepositFailedRef = useRef5(onDepositFailed);
   onDepositFailedRef.current = onDepositFailed;
-  const onErrorRef = useRef4(onError);
+  const onErrorRef = useRef5(onError);
   onErrorRef.current = onError;
-  const targetChainRef = useRef4(targetChain);
+  const targetChainRef = useRef5(targetChain);
   targetChainRef.current = targetChain;
-  const targetTokenRef = useRef4(targetToken);
+  const targetTokenRef = useRef5(targetToken);
   targetTokenRef.current = targetToken;
   useEffect5(() => {
     baselineTxHashRef.current = void 0;
@@ -1729,13 +1699,13 @@ function DepositAddressStep({
     setNotifications((prev) => prev.filter((n) => n.id !== id));
   }, []);
   const qrIconSrc = getChainIcon(sourceChainId);
-  return /* @__PURE__ */ jsxs5("div", { className: "rs-screen rs-step--with-notifications", children: [
-    /* @__PURE__ */ jsxs5("div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ jsx5(BodyHeader, { icon: /* @__PURE__ */ jsx5(HandCoinsIcon, {}), title: "Transfer crypto" }),
-      /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-selectors", children: [
-        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
-          /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
-          /* @__PURE__ */ jsxs5(
+  return /* @__PURE__ */ jsxs6("div", { className: "rs-screen rs-step--with-notifications", children: [
+    /* @__PURE__ */ jsxs6("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx6(BodyHeader, { icon: /* @__PURE__ */ jsx6(TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__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: "Supported chain" }),
+          /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1746,7 +1716,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx5(
+                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx6(
                   "img",
                   {
                     src: getChainIcon(sourceChainId),
@@ -1754,12 +1724,12 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx5("span", { children: getChainName(sourceChainId) }),
-                /* @__PURE__ */ jsx5(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
+                /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          chainDropdownOpen && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs5(
+          chainDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1769,7 +1739,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getChainIcon(chainId) && /* @__PURE__ */ jsx5(
+                getChainIcon(chainId) && /* @__PURE__ */ jsx6(
                   "img",
                   {
                     src: getChainIcon(chainId),
@@ -1777,19 +1747,19 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx5("span", { children: getChainName(chainId) })
+                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
               ]
             },
             String(chainId)
           )) })
         ] }),
-        /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
-          /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
-            /* @__PURE__ */ jsx5("span", { children: "Supported token" }),
-            /* @__PURE__ */ jsxs5("span", { className: "rs-deposit-address-min", children: [
+        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
+          /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ jsx6("span", { children: "Supported token" }),
+            /* @__PURE__ */ jsxs6("span", { className: "rs-deposit-address-min", children: [
               "Min.$",
               (uiConfig?.minDepositUsd ?? 0.1).toFixed(2),
-              /* @__PURE__ */ jsx5(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx5(
+              /* @__PURE__ */ jsx6(Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ jsx6(
                 InfoIcon,
                 {
                   className: "rs-deposit-address-min-icon",
@@ -1798,7 +1768,7 @@ function DepositAddressStep({
               ) })
             ] })
           ] }),
-          /* @__PURE__ */ jsxs5(
+          /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1809,7 +1779,7 @@ function DepositAddressStep({
                 setChainDropdownOpen(false);
               },
               children: [
-                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx5(
+                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
                   "img",
                   {
                     src: getTokenIcon(sourceTokenSymbol),
@@ -1817,12 +1787,12 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx5("span", { children: sourceTokenSymbol }),
-                /* @__PURE__ */ jsx5(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+                /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx6(ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
               ]
             }
           ),
-          tokenDropdownOpen && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs5(
+          tokenDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
@@ -1832,7 +1802,7 @@ function DepositAddressStep({
                 setTokenDropdownOpen(false);
               },
               children: [
-                getTokenIcon(symbol) && /* @__PURE__ */ jsx5(
+                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
                   "img",
                   {
                     src: getTokenIcon(symbol),
@@ -1840,48 +1810,57 @@ function DepositAddressStep({
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx5("span", { children: symbol })
+                /* @__PURE__ */ jsx6("span", { children: symbol })
               ]
             },
             symbol
           )) })
         ] })
       ] }),
-      /* @__PURE__ */ jsxs5(
+      /* @__PURE__ */ jsxs6(
         "div",
         {
           style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
           children: [
-            /* @__PURE__ */ jsxs5("div", { className: "rs-deposit-address-well", children: [
-              /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx5(
-                Suspense,
-                {
-                  fallback: /* @__PURE__ */ jsx5(
-                    "div",
+            /* @__PURE__ */ jsxs6(
+              "div",
+              {
+                className: `rs-deposit-address-well ${isUpdating ? "rs-deposit-address-well--updating" : ""}`,
+                children: [
+                  /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(
+                    Suspense,
                     {
-                      style: {
-                        width: 200,
-                        height: 200,
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "center"
-                      },
-                      children: /* @__PURE__ */ jsx5(Spinner, {})
+                      fallback: /* @__PURE__ */ jsx6(
+                        "div",
+                        {
+                          style: {
+                            width: 200,
+                            height: 200,
+                            display: "flex",
+                            alignItems: "center",
+                            justifyContent: "center"
+                          },
+                          children: /* @__PURE__ */ jsx6(Spinner, {})
+                        }
+                      ),
+                      children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 200, iconSrc: qrIconSrc })
                     }
-                  ),
-                  children: /* @__PURE__ */ jsx5(QRCode, { value: displayAddress, size: 200, iconSrc: qrIconSrc })
-                }
-              ) }),
-              /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-value", children: displayAddress })
-            ] }),
-            /* @__PURE__ */ jsxs5(
+                  ) }),
+                  /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress })
+                ]
+              }
+            ),
+            isUpdating ? /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-updating", role: "status", children: [
+              /* @__PURE__ */ jsx6(Spinner, { className: "rs-spinner--sm" }),
+              "Updating deposit details\u2026"
+            ] }) : /* @__PURE__ */ jsxs6(
               "button",
               {
                 type: "button",
                 className: "rs-deposit-address-copy",
                 onClick: handleCopy,
                 children: [
-                  copied ? /* @__PURE__ */ jsx5(CheckIcon, {}) : /* @__PURE__ */ jsx5(CopyIcon, {}),
+                  copied ? /* @__PURE__ */ jsx6(CheckIcon, {}) : /* @__PURE__ */ jsx6(CopyIcon, {}),
                   copied ? "Copied!" : "Copy address"
                 ]
               }
@@ -1889,12 +1868,12 @@ function DepositAddressStep({
           ]
         }
       ),
-      /* @__PURE__ */ jsxs5(
+      /* @__PURE__ */ jsxs6(
         "div",
         {
           className: `rs-price-impact ${priceImpactExpanded ? "rs-price-impact--open" : ""}`,
           children: [
-            /* @__PURE__ */ jsxs5(
+            /* @__PURE__ */ jsxs6(
               "button",
               {
                 type: "button",
@@ -1902,19 +1881,19 @@ function DepositAddressStep({
                 onClick: () => setPriceImpactExpanded((v) => !v),
                 "aria-expanded": priceImpactExpanded,
                 children: [
-                  /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-header-left", children: [
-                    /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-label", children: "Price impact" }),
-                    /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx5("strong", { children: "0.00%" }) }),
-                    /* @__PURE__ */ jsx5(
+                  /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-header-left", children: [
+                    /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-label", children: "Price impact" }),
+                    /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-label", children: /* @__PURE__ */ jsx6("strong", { children: "0.00%" }) }),
+                    /* @__PURE__ */ jsx6(
                       Tooltip,
                       {
                         className: "rs-price-impact-info",
                         content: "Price impact is the difference between expected and execution price, due to trade size and liquidity.",
-                        children: /* @__PURE__ */ jsx5(InfoIcon, { "aria-hidden": "true" })
+                        children: /* @__PURE__ */ jsx6(InfoIcon, { "aria-hidden": "true" })
                       }
                     )
                   ] }),
-                  /* @__PURE__ */ jsx5(
+                  /* @__PURE__ */ jsx6(
                     ChevronDownIcon,
                     {
                       className: "rs-price-impact-chevron",
@@ -1924,35 +1903,35 @@ function DepositAddressStep({
                 ]
               }
             ),
-            /* @__PURE__ */ jsx5("div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-panel-inner", children: [
-              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(PercentIcon, {}) }),
-                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
+            /* @__PURE__ */ jsx6("div", { className: "rs-price-impact-panel", children: /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-panel-inner", children: [
+              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(PercentIcon, {}) }),
+                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
                   "Max slippage: ",
-                  /* @__PURE__ */ jsx5("strong", { children: "0.2%" })
+                  /* @__PURE__ */ jsx6("strong", { children: "0.2%" })
                 ] }),
-                /* @__PURE__ */ jsx5(
+                /* @__PURE__ */ jsx6(
                   Tooltip,
                   {
                     className: "rs-price-impact-info",
                     content: "Slippage accounts for price changes during execution. Slippage is adjusted per pair to ensure reliable execution.",
-                    children: /* @__PURE__ */ jsx5(InfoIcon, { "aria-hidden": "true" })
+                    children: /* @__PURE__ */ jsx6(InfoIcon, { "aria-hidden": "true" })
                   }
                 )
               ] }),
-              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(ClockIcon, {}) }),
-                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
+              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(ClockIcon, {}) }),
+                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
                   "Processing time: ",
-                  /* @__PURE__ */ jsx5("strong", { children: "< 1 min" })
+                  /* @__PURE__ */ jsx6("strong", { children: "< 1 min" })
                 ] })
               ] }),
-              /* @__PURE__ */ jsxs5("div", { className: "rs-price-impact-row", children: [
-                /* @__PURE__ */ jsx5("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx5(PlusCircleIcon, {}) }),
-                /* @__PURE__ */ jsxs5("span", { className: "rs-price-impact-label", children: [
+              /* @__PURE__ */ jsxs6("div", { className: "rs-price-impact-row", children: [
+                /* @__PURE__ */ jsx6("span", { className: "rs-price-impact-row-icon", "aria-hidden": "true", children: /* @__PURE__ */ jsx6(PlusCircleIcon, {}) }),
+                /* @__PURE__ */ jsxs6("span", { className: "rs-price-impact-label", children: [
                   "Max deposit:",
                   " ",
-                  /* @__PURE__ */ jsx5("strong", { children: liquidityHelper.kind === "max" ? `${formatUnits3(
+                  /* @__PURE__ */ jsx6("strong", { children: liquidityHelper.kind === "max" ? `${formatUnits3(
                     BigInt(liquidityHelper.maxAmount),
                     liquidityHelper.decimals
                   )} ${liquidityHelper.symbol}` : liquidityHelper.kind === "unlimited" ? "Unlimited" : liquidityHelper.kind === "unavailable" ? "Unavailable" : liquidityHelper.kind === "error" ? "\u2014" : "\u2026" })
@@ -1962,9 +1941,9 @@ function DepositAddressStep({
           ]
         }
       ),
-      pollingError && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-address-error", children: pollingError })
+      pollingError && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-error", children: pollingError })
     ] }),
-    notifications.length > 0 && /* @__PURE__ */ jsx5("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx5(
+    notifications.length > 0 && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-notifications", children: notifications.map((deposit) => /* @__PURE__ */ jsx6(
       DepositNotification,
       {
         deposit,
@@ -1981,7 +1960,7 @@ function DepositAddressStep({
       },
       deposit.id
     )) }),
-    /* @__PURE__ */ jsx5(PoweredBy, {})
+    /* @__PURE__ */ jsx6(PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
@@ -1989,12 +1968,13 @@ DepositAddressStep.displayName = "DepositAddressStep";
 // src/components/steps/SolanaTokenSelectStep.tsx
 import { useState as useState6, useEffect as useEffect6, useMemo as useMemo4 } from "react";
 import { formatUnits as formatUnits4 } from "viem";
-import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function SolanaTokenSelectStep({
   solanaAddress,
   service,
   onContinue,
   onTotalBalanceComputed,
+  onDisconnect,
   debug
 }) {
   const [tokenBalances, setTokenBalances] = useState6([]);
@@ -2082,119 +2062,111 @@ function SolanaTokenSelectStep({
     [tokenBalances]
   );
   const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
-  if (error) {
-    return /* @__PURE__ */ jsx6("div", { className: "rs-step", children: /* @__PURE__ */ jsx6("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx6("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx6("span", { className: "rs-alert-text", children: error }) }) }) });
-  }
-  return /* @__PURE__ */ jsxs6("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx6("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx6(
-      BodyHeader,
-      {
-        icon: /* @__PURE__ */ jsx6(CoinsIcon, {}),
-        title: "Select asset",
-        subtitle: "Pick a Solana token to deposit"
-      }
-    ) }),
-    /* @__PURE__ */ jsxs6(
-      "div",
-      {
-        className: "rs-step-body",
-        style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
-        children: [
-          loading && /* @__PURE__ */ jsxs6("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-            /* @__PURE__ */ jsx6(Spinner, { className: "rs-text-tertiary" }),
-            /* @__PURE__ */ jsx6("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
-          ] }),
-          !loading && rows.length === 0 && /* @__PURE__ */ jsxs6("div", { className: "rs-empty-state", children: [
-            /* @__PURE__ */ jsx6(WalletIcon, { className: "rs-empty-icon" }),
-            /* @__PURE__ */ jsx6("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
-            /* @__PURE__ */ jsxs6("div", { className: "rs-empty-address", children: [
-              solanaAddress.slice(0, 6),
-              "...",
-              solanaAddress.slice(-4)
-            ] })
-          ] }),
-          !loading && rows.length > 0 && /* @__PURE__ */ jsx6("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");
-            let formattedBalance;
-            try {
-              const raw = formatUnits4(entry.balance, entry.token.decimals);
-              const numeric = Number(raw);
-              formattedBalance = Number.isFinite(numeric) ? tokenFormatter.format(numeric) : raw;
-            } catch {
-              formattedBalance = "...";
-            }
-            return /* @__PURE__ */ jsxs6(
-              "button",
-              {
-                type: "button",
-                onClick: () => setSelectedSymbol(entry.token.symbol),
-                className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
-                style: { textAlign: "left" },
-                children: [
-                  /* @__PURE__ */ jsxs6("div", { className: "rs-asset-info", children: [
-                    /* @__PURE__ */ jsxs6("div", { className: "rs-asset-icon-wrapper", children: [
-                      tokenIcon ? /* @__PURE__ */ jsx6(
-                        "img",
-                        {
-                          src: tokenIcon,
-                          alt: entry.token.symbol,
-                          className: "rs-asset-icon",
-                          style: { background: "transparent" }
-                        }
-                      ) : /* @__PURE__ */ jsx6("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
-                      chainIcon && /* @__PURE__ */ jsx6(
-                        "img",
-                        {
-                          src: chainIcon,
-                          alt: "Solana",
-                          className: "rs-asset-chain-badge"
-                        }
-                      )
-                    ] }),
-                    /* @__PURE__ */ jsxs6("div", { children: [
-                      /* @__PURE__ */ jsxs6("div", { className: "rs-asset-name", children: [
-                        entry.token.symbol,
-                        /* @__PURE__ */ jsx6("span", { className: "rs-asset-chain", children: " on Solana" })
-                      ] }),
-                      /* @__PURE__ */ jsxs6("div", { className: "rs-asset-balance-small", children: [
-                        formattedBalance,
-                        " ",
-                        entry.token.symbol
-                      ] })
+  const formatBalance = (entry) => {
+    try {
+      const raw = formatUnits4(entry.balance, entry.token.decimals);
+      const numeric = Number(raw);
+      if (!Number.isFinite(numeric)) return raw;
+      return tokenFormatter.format(numeric);
+    } catch {
+      return "--";
+    }
+  };
+  const chainIcon = getChainIcon("solana");
+  const chainName = getChainName("solana");
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ jsx7(
+        BodyHeader,
+        {
+          icon: /* @__PURE__ */ jsx7(WalletIcon, {}),
+          title: "Your assets",
+          subtitle: "Select source assets to transfer"
+        }
+      ),
+      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" })
+      ] }),
+      error && /* @__PURE__ */ jsx7(Callout, { variant: "error", children: error }),
+      !loading && !error && rows.length === 0 && /* @__PURE__ */ jsxs7("div", { className: "rs-empty-state", children: [
+        /* @__PURE__ */ jsx7(WalletIcon, { className: "rs-empty-icon" }),
+        /* @__PURE__ */ jsx7("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)
+        ] }),
+        onDisconnect && /* @__PURE__ */ jsx7(
+          "button",
+          {
+            type: "button",
+            className: "rs-empty-disconnect",
+            onClick: onDisconnect,
+            children: "Disconnect wallet"
+          }
+        )
+      ] }),
+      !loading && !error && rows.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-asset-list", children: rows.map((entry) => {
+        const isSelected = selectedSymbol === entry.token.symbol;
+        const tokenAmount = formatBalance(entry);
+        const tokenIcon = getTokenIcon(entry.token.symbol);
+        return /* @__PURE__ */ jsxs7(
+          "button",
+          {
+            type: "button",
+            onClick: () => setSelectedSymbol(entry.token.symbol),
+            className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
+            "aria-pressed": isSelected,
+            children: [
+              /* @__PURE__ */ jsxs7("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs7("div", { className: "rs-asset-icon-wrapper", children: [
+                  tokenIcon ? /* @__PURE__ */ jsx7("span", { className: "rs-asset-icon", children: /* @__PURE__ */ jsx7("img", { src: tokenIcon, alt: entry.token.symbol }) }) : /* @__PURE__ */ jsx7("span", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                  chainIcon && /* @__PURE__ */ jsx7("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx7("img", { src: chainIcon, alt: chainName }) })
+                ] }),
+                /* @__PURE__ */ jsxs7("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx7("span", { className: "rs-asset-name", children: entry.token.symbol }),
+                    /* @__PURE__ */ jsxs7("span", { className: "rs-asset-chain", children: [
+                      "on ",
+                      chainName
                     ] })
                   ] }),
-                  /* @__PURE__ */ jsx6("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
-                ]
-              },
-              entry.token.symbol
-            );
-          }) })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsx6("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx6(
-      Button,
-      {
-        onClick: () => selectedEntry && onContinue(
-          selectedEntry.token,
-          selectedEntry.balance,
-          selectedEntry.balanceUsd
-        ),
-        disabled: !selectedEntry,
-        fullWidth: true,
-        children: "Continue"
-      }
-    ) }),
-    /* @__PURE__ */ jsx6(PoweredBy, {})
+                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-balance-small", children: [
+                    tokenAmount,
+                    " ",
+                    entry.token.symbol
+                  ] })
+                ] })
+              ] }),
+              /* @__PURE__ */ jsx7("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${entry.token.symbol}` : "--" })
+            ]
+          },
+          entry.token.symbol
+        );
+      }) }),
+      /* @__PURE__ */ jsx7(
+        Button,
+        {
+          onClick: () => selectedEntry && onContinue(
+            selectedEntry.token,
+            selectedEntry.balance,
+            selectedEntry.balanceUsd
+          ),
+          disabled: !selectedEntry,
+          fullWidth: true,
+          children: "Continue"
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx7(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaAmountStep.tsx
-import { useEffect as useEffect7, useMemo as useMemo5, useState as useState7 } from "react";
+import { useCallback as useCallback3, useEffect as useEffect7, useMemo as useMemo5, useRef as useRef6, useState as useState7 } from "react";
 import { formatUnits as formatUnits5, parseUnits as parseUnits3 } from "viem";
-import { Fragment as Fragment2, jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
 var PRESETS2 = [
   { value: 25, label: "25%" },
@@ -2211,13 +2183,15 @@ function SolanaAmountStep({
   targetChainName,
   targetTokenSymbol,
   targetTokenIcon,
-  targetBalanceUsd,
+  appBalanceUsd,
   onContinue,
   debug
 }) {
   const [amount, setAmount] = useState7("");
   const [error, setError] = useState7(null);
+  const hasAppliedDefaultRef = useRef6(false);
   const isSourceStablecoin = isStablecoinSymbol(token.symbol);
+  const isMaxDefault = defaultAmount?.trim().toLowerCase() === "max";
   const tokenPriceUsd = useMemo5(() => {
     if (isSourceStablecoin) return 1;
     try {
@@ -2232,14 +2206,6 @@ function SolanaAmountStep({
     }
   }, [isSourceStablecoin, balance, token.decimals, balanceUsd]);
   const hasPricing = tokenPriceUsd !== null;
-  useEffect7(() => {
-    if (defaultAmount && !amount) {
-      const parsed = Number(defaultAmount);
-      if (Number.isFinite(parsed) && parsed > 0) {
-        setAmount(parsed.toString());
-      }
-    }
-  }, [defaultAmount, amount]);
   const formattedBalance = useMemo5(() => {
     try {
       const raw = formatUnits5(balance, token.decimals);
@@ -2275,6 +2241,45 @@ function SolanaAmountStep({
       return null;
     }
   }, [spendableBalance, token.decimals, tokenPriceUsd]);
+  const computePresetAmount = useCallback3(
+    (percentage) => {
+      try {
+        const spendableUnits = Number(
+          formatUnits5(spendableBalance, token.decimals)
+        );
+        if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return "";
+        const value = isSourceStablecoin || !hasPricing ? spendableUnits * percentage / 100 : (spendableBalanceUsd ?? 0) * percentage / 100;
+        const factor = 1e3;
+        const truncated = Math.floor(value * factor) / factor;
+        return truncated.toFixed(3).replace(/\.?0+$/, "");
+      } catch {
+        return "";
+      }
+    },
+    [
+      spendableBalance,
+      token.decimals,
+      isSourceStablecoin,
+      hasPricing,
+      spendableBalanceUsd
+    ]
+  );
+  useEffect7(() => {
+    if (hasAppliedDefaultRef.current || !defaultAmount) return;
+    if (isMaxDefault) {
+      const next = computePresetAmount(100);
+      if (next) {
+        setAmount(next);
+        hasAppliedDefaultRef.current = true;
+      }
+      return;
+    }
+    const parsed = Number(defaultAmount);
+    if (Number.isFinite(parsed) && parsed > 0) {
+      setAmount(parsed.toString());
+      hasAppliedDefaultRef.current = true;
+    }
+  }, [defaultAmount, isMaxDefault, computePresetAmount]);
   const numericAmount = useMemo5(() => {
     const parsed = parseFloat(amount);
     return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
@@ -2295,24 +2300,16 @@ function SolanaAmountStep({
   const exceedsBalance = Boolean(
     sourceAmountUnits !== null && sourceAmountUnits > spendableBalance
   );
-  const balanceAfterUsd = targetBalanceUsd !== void 0 ? targetBalanceUsd + numericAmount : null;
+  const balanceAfterUsd = appBalanceUsd !== void 0 ? appBalanceUsd + numericAmount : null;
   const handlePresetClick = (percentage) => {
-    try {
-      const spendableUnits = Number(formatUnits5(spendableBalance, token.decimals));
-      if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return;
-      const value = isSourceStablecoin || !hasPricing ? spendableUnits * percentage / 100 : (spendableBalanceUsd ?? 0) * percentage / 100;
-      const factor = 1e3;
-      const truncated = Math.floor(value * factor) / factor;
-      const formatted = truncated.toFixed(3).replace(/\.?0+$/, "");
-      debugLog(debug, "solana-amount", "amount:preset", {
-        percentage,
-        symbol: token.symbol,
-        formatted
-      });
-      setAmount(formatted);
-    } catch {
-      return;
-    }
+    const formatted = computePresetAmount(percentage);
+    if (!formatted) return;
+    debugLog(debug, "solana-amount", "amount:preset", {
+      percentage,
+      symbol: token.symbol,
+      formatted
+    });
+    setAmount(formatted);
     if (error) setError(null);
   };
   const handleAmountChange = (raw) => {
@@ -2369,45 +2366,39 @@ function SolanaAmountStep({
   const continueLabel = exceedsBalance ? "Insufficient balance" : isAboveMax ? "Continue with max allowed deposit" : isBelowMin ? "Continue with minimum deposit" : "Continue";
   const continueDisabled = exceedsBalance || numericAmount === 0 && !isBelowMin;
   const sourceTokenIcon = getTokenIcon(token.symbol);
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs7("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx7(BodyHeader, { icon: /* @__PURE__ */ jsx7(WalletIcon, {}), title: "Wallet deposit" }),
-      /* @__PURE__ */ jsxs7("div", { className: "rs-amount-section", children: [
-        /* @__PURE__ */ jsxs7("div", { className: "rs-amount-display", children: [
-          /* @__PURE__ */ jsxs7("div", { className: "rs-amount-input-row", children: [
-            /* @__PURE__ */ jsx7("span", { "aria-hidden": "true", children: "$" }),
-            /* @__PURE__ */ jsx7(
-              "input",
-              {
-                type: "text",
-                inputMode: "decimal",
-                placeholder: "0",
-                value: amount,
-                onChange: (e) => handleAmountChange(e.target.value),
-                "aria-label": "Deposit amount",
-                autoFocus: true
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxs7("div", { className: "rs-amount-meta", children: [
-            /* @__PURE__ */ jsxs7("span", { className: "rs-amount-meta-balance", children: [
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs8("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title: "Wallet deposit" }),
+      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-section", children: [
+        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-display", children: [
+          /* @__PURE__ */ jsx8(
+            AnimatedAmountInput,
+            {
+              value: amount,
+              onChange: handleAmountChange,
+              ariaLabel: "Deposit amount",
+              autoFocus: true
+            }
+          ),
+          /* @__PURE__ */ jsxs8("div", { className: "rs-amount-meta", children: [
+            /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-balance", children: [
               formattedBalance,
               " ",
               token.symbol,
               " available",
-              computedBalanceUsd !== null && /* @__PURE__ */ jsxs7(Fragment2, { children: [
+              computedBalanceUsd !== null && /* @__PURE__ */ jsxs8(Fragment2, { children: [
                 " (~",
                 currencyFormatter.format(computedBalanceUsd),
                 ")"
               ] })
             ] }),
-            minDepositUsd !== null && /* @__PURE__ */ jsxs7("span", { className: "rs-amount-meta-minimum", children: [
+            minDepositUsd !== null && /* @__PURE__ */ jsxs8("span", { className: "rs-amount-meta-minimum", children: [
               "Min. deposit ",
               currencyFormatter.format(minDepositUsd)
             ] })
           ] })
         ] }),
-        /* @__PURE__ */ jsx7("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx7(
+        /* @__PURE__ */ jsx8("div", { className: "rs-amount-presets", children: PRESETS2.map((preset) => /* @__PURE__ */ jsx8(
           "button",
           {
             type: "button",
@@ -2418,38 +2409,35 @@ function SolanaAmountStep({
           preset.value
         )) })
       ] }),
-      /* @__PURE__ */ jsxs7("div", { className: "rs-amount-details", children: [
-        /* @__PURE__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx7("span", { children: "You send" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs7("span", { children: [
+      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-details", children: [
+        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx8("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs8("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs8("span", { children: [
               "Solana ",
               token.symbol
             ] }),
-            sourceTokenIcon && /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx7("img", { src: sourceTokenIcon, alt: "" }) })
+            sourceTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: sourceTokenIcon, alt: "" }) })
           ] })
         ] }),
-        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx7("span", { children: "Receive" }),
-          /* @__PURE__ */ jsxs7("span", { className: "rs-amount-detail-value", children: [
-            /* @__PURE__ */ jsxs7("span", { children: [
+        targetChainName && targetTokenSymbol && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx8("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs8("span", { className: "rs-amount-detail-value", children: [
+            /* @__PURE__ */ jsxs8("span", { children: [
               targetChainName,
               " ",
               targetTokenSymbol
             ] }),
-            targetTokenIcon && /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx7("img", { src: targetTokenIcon, alt: "" }) })
+            targetTokenIcon && /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx8("img", { src: targetTokenIcon, alt: "" }) })
           ] })
         ] }),
-        balanceAfterUsd !== null && /* @__PURE__ */ jsxs7("div", { className: "rs-amount-detail-row", children: [
-          /* @__PURE__ */ jsx7("span", { children: "Balance after deposit" }),
-          /* @__PURE__ */ jsx7("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
+        balanceAfterUsd !== null && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-detail-row", children: [
+          /* @__PURE__ */ jsx8("span", { children: "Balance after deposit" }),
+          /* @__PURE__ */ jsx8("span", { className: "rs-amount-detail-value", children: currencyFormatter.format(balanceAfterUsd) })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs7("div", { className: "rs-amount-error", role: "alert", children: [
-        /* @__PURE__ */ jsx7(AlertTriangleIcon, { style: { width: 16, height: 16, flexShrink: 0 } }),
-        /* @__PURE__ */ jsx7("span", { children: error })
-      ] }),
-      /* @__PURE__ */ jsx7(
+      error && /* @__PURE__ */ jsx8(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx8(
         Button,
         {
           onClick: handleContinue,
@@ -2459,14 +2447,120 @@ function SolanaAmountStep({
         }
       )
     ] }),
-    /* @__PURE__ */ jsx7(PoweredBy, {})
+    /* @__PURE__ */ jsx8(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/SolanaConfirmStep.tsx
-import { useState as useState8 } from "react";
-import { parseUnits as parseUnits4 } from "viem";
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { useState as useState8 } from "react";
+import { parseUnits as parseUnits4 } from "viem";
+
+// src/core/solana.ts
+import {
+  Connection,
+  PublicKey,
+  SystemProgram,
+  Transaction
+} from "@solana/web3.js";
+import {
+  getAssociatedTokenAddress,
+  createAssociatedTokenAccountInstruction,
+  createTransferInstruction
+} from "@solana/spl-token";
+var DEFAULT_SOLANA_RPC_URL = "https://api.mainnet.solana.com";
+var configuredSolanaRpcUrl = null;
+var cachedConnections = /* @__PURE__ */ new Map();
+function configureSolanaRpcUrl(rpcUrl) {
+  const normalized = rpcUrl?.trim();
+  configuredSolanaRpcUrl = normalized ? normalized : null;
+  cachedConnections.clear();
+}
+function getSolanaRpcUrl() {
+  return configuredSolanaRpcUrl ?? DEFAULT_SOLANA_RPC_URL;
+}
+function hasConfiguredSolanaRpcUrl() {
+  return configuredSolanaRpcUrl !== null;
+}
+function getSolanaConnection() {
+  const rpcUrl = getSolanaRpcUrl();
+  const cached = cachedConnections.get(rpcUrl);
+  if (cached) {
+    return cached;
+  }
+  const next = new Connection(rpcUrl, "confirmed");
+  cachedConnections.set(rpcUrl, next);
+  return next;
+}
+async function buildSolTransferTransaction(connection, from, to, lamports) {
+  const fromPubkey = new PublicKey(from);
+  const toPubkey = new PublicKey(to);
+  const tx = new Transaction().add(
+    SystemProgram.transfer({
+      fromPubkey,
+      toPubkey,
+      lamports
+    })
+  );
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
+  tx.recentBlockhash = blockhash;
+  tx.lastValidBlockHeight = lastValidBlockHeight;
+  tx.feePayer = fromPubkey;
+  return tx;
+}
+async function buildSplTransferTransaction(connection, from, to, mint, amount) {
+  const fromPubkey = new PublicKey(from);
+  const toPubkey = new PublicKey(to);
+  const mintPubkey = new PublicKey(mint);
+  const fromAta = await getAssociatedTokenAddress(mintPubkey, fromPubkey);
+  const toAta = await getAssociatedTokenAddress(mintPubkey, toPubkey, true);
+  const tx = new Transaction();
+  const toAtaInfo = await connection.getAccountInfo(toAta);
+  if (!toAtaInfo) {
+    tx.add(
+      createAssociatedTokenAccountInstruction(
+        fromPubkey,
+        toAta,
+        toPubkey,
+        mintPubkey
+      )
+    );
+  }
+  tx.add(createTransferInstruction(fromAta, toAta, fromPubkey, amount));
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
+  tx.recentBlockhash = blockhash;
+  tx.lastValidBlockHeight = lastValidBlockHeight;
+  tx.feePayer = fromPubkey;
+  return tx;
+}
+function extractSignature(value) {
+  if (typeof value === "string") {
+    return value.length > 0 ? value : null;
+  }
+  if (typeof value.signature === "string" && value.signature.length > 0) {
+    return value.signature;
+  }
+  if (typeof value.hash === "string" && value.hash.length > 0) {
+    return value.hash;
+  }
+  if (typeof value.txid === "string" && value.txid.length > 0) {
+    return value.txid;
+  }
+  if (typeof value.transactionId === "string" && value.transactionId.length > 0) {
+    return value.transactionId;
+  }
+  return null;
+}
+async function sendSolanaTransaction(provider, _connection, transaction) {
+  const result = await provider.signAndSendTransaction(transaction);
+  const signature = extractSignature(result);
+  if (!signature) {
+    throw new Error("Transaction sent but wallet did not return a signature");
+  }
+  return signature;
+}
+
+// src/components/steps/SolanaConfirmStep.tsx
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 function SolanaConfirmStep({
   smartAccount,
   solanaAddress,
@@ -2480,14 +2574,25 @@ function SolanaConfirmStep({
   targetToken,
   service,
   solanaProvider,
+  solanaConnection,
+  uiConfig,
+  estimatedTime = "< 1 min",
   onConfirm,
   onError,
   debug
 }) {
   const [isSubmitting, setIsSubmitting] = useState8(false);
   const [error, setError] = useState8(null);
-  const targetSymbol = getTokenSymbol(targetToken, targetChain);
+  const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
   const isSameToken = token.symbol.toUpperCase() === targetSymbol.toUpperCase();
+  const sourceChainName = getChainName("solana");
+  const targetChainName = getChainName(targetChain);
+  const sourceChainIcon = getChainIcon("solana");
+  const targetChainIcon = getChainIcon(targetChain);
+  const sourceTokenIcon = getTokenIcon(token.symbol);
+  const targetTokenIcon = getTokenIcon(targetSymbol);
+  const feeSponsored = uiConfig?.feeSponsored ?? false;
+  const feeTooltip = uiConfig?.feeTooltip ?? (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.");
   const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
   const formattedReceiveAmount = (() => {
     if (isSameToken) return formattedAmount;
@@ -2500,7 +2605,7 @@ function SolanaConfirmStep({
     }
     return formattedAmount;
   })();
-  const receiveAmount = isSameToken ? formattedReceiveAmount : `~ ${formattedReceiveAmount}`;
+  const receiveAmount = isSameToken ? formattedReceiveAmount : `~${formattedReceiveAmount}`;
   const handleConfirm = async () => {
     if (!solanaProvider) {
       debugLog(debug, "solana-confirm", "submit:blocked", {
@@ -2541,7 +2646,7 @@ function SolanaConfirmStep({
           "Deposit account is not registered yet. Please restart setup and try again."
         );
       }
-      const connection = getSolanaConnection();
+      const connection = hasConfiguredSolanaRpcUrl() ? getSolanaConnection() : solanaConnection ?? getSolanaConnection();
       const amountUnits = parseUnits4(sourceAmount, token.decimals);
       debugLog(debug, "solana-confirm", "tx:build:start", {
         token: token.symbol,
@@ -2590,162 +2695,154 @@ function SolanaConfirmStep({
       setIsSubmitting(false);
     }
   };
-  return /* @__PURE__ */ jsxs8("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx8("div", { style: { padding: "0 12px 12px" }, children: /* @__PURE__ */ jsx8(BodyHeader, { icon: /* @__PURE__ */ jsx8(WalletIcon, {}), title: "Review deposit" }) }),
-    /* @__PURE__ */ jsxs8("div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
-      /* @__PURE__ */ jsxs8("div", { className: "rs-card", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Source" }),
-          /* @__PURE__ */ jsxs8(
-            "span",
-            {
-              className: "rs-card-value",
-              style: { display: "flex", alignItems: "center", gap: 8 },
-              children: [
-                getChainIcon("solana") && /* @__PURE__ */ jsx8(
-                  "img",
-                  {
-                    src: getChainIcon("solana"),
-                    alt: "",
-                    style: { width: 16, height: 16, borderRadius: 3 }
-                  }
-                ),
-                getChainName("solana")
-              ]
-            }
-          )
+  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx9(BodyHeader, { icon: /* @__PURE__ */ jsx9(WalletIcon, {}), title: "Review deposit" }),
+      /* @__PURE__ */ jsxs9("div", { className: "rs-review-details", children: [
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "Source chain" }),
+          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx9("span", { children: sourceChainName }),
+            sourceChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: sourceChainIcon, alt: "" }) })
+          ] })
         ] }),
-        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Destination" }),
-          /* @__PURE__ */ jsxs8(
-            "span",
-            {
-              className: "rs-card-value",
-              style: { display: "flex", alignItems: "center", gap: 8 },
-              children: [
-                getChainIcon(targetChain) && /* @__PURE__ */ jsx8(
-                  "img",
-                  {
-                    src: getChainIcon(targetChain),
-                    alt: "",
-                    style: { width: 16, height: 16, borderRadius: 3 }
-                  }
-                ),
-                getChainName(targetChain)
-              ]
-            }
-          )
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "Destination chain" }),
+          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx9("span", { children: targetChainName }),
+            targetChainIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: targetChainIcon, alt: "" }) })
+          ] })
         ] }),
-        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "Estimated time" }),
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-value", children: "< 1 min" })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsxs8("div", { className: "rs-card", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "You send" }),
-          /* @__PURE__ */ jsxs8(
-            "span",
-            {
-              className: "rs-card-value",
-              style: { display: "flex", alignItems: "center", gap: 6 },
-              children: [
-                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx8(
-                  "img",
-                  {
-                    src: getTokenIcon(token.symbol),
-                    alt: "",
-                    style: { width: 16, height: 16, borderRadius: "50%" }
-                  }
-                ),
-                formattedAmount,
-                " ",
-                token.symbol
-              ]
-            }
-          )
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "Estimated time" }),
+          /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-value", children: estimatedTime })
         ] }),
-        /* @__PURE__ */ jsxs8("div", { className: "rs-card-row", children: [
-          /* @__PURE__ */ jsx8("span", { className: "rs-card-label", children: "You receive" }),
-          /* @__PURE__ */ jsxs8(
-            "span",
-            {
-              className: "rs-card-value",
-              style: { display: "flex", alignItems: "center", gap: 6 },
-              children: [
-                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx8(
-                  "img",
-                  {
-                    src: getTokenIcon(targetSymbol),
-                    alt: "",
-                    style: { width: 16, height: 16, borderRadius: "50%" }
-                  }
-                ),
-                receiveAmount,
-                " ",
-                targetSymbol
-              ]
-            }
-          )
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "You send" }),
+          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs9("span", { children: [
+              formattedAmount,
+              " ",
+              token.symbol
+            ] }),
+            sourceTokenIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: sourceTokenIcon, alt: "" }) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "Receive" }),
+          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsxs9("span", { children: [
+              receiveAmount,
+              " ",
+              targetSymbol
+            ] }),
+            targetTokenIcon && /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-icon", children: /* @__PURE__ */ jsx9("img", { src: targetTokenIcon, alt: "" }) })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "rs-review-detail-row", children: [
+          /* @__PURE__ */ jsx9("span", { children: "Fees" }),
+          /* @__PURE__ */ jsxs9("span", { className: "rs-review-detail-value", children: [
+            /* @__PURE__ */ jsx9(
+              "span",
+              {
+                style: feeSponsored ? { textDecoration: "line-through" } : void 0,
+                children: "$0.04"
+              }
+            ),
+            /* @__PURE__ */ jsx9(Tooltip, { content: feeTooltip, children: /* @__PURE__ */ jsx9("span", { className: "rs-review-detail-info", "aria-label": "Fee info", children: /* @__PURE__ */ jsx9(InfoIcon, {}) }) })
+          ] })
         ] })
       ] }),
-      error && /* @__PURE__ */ jsxs8("div", { className: "rs-alert rs-alert--error", children: [
-        /* @__PURE__ */ jsx8(AlertTriangleIcon, { className: "rs-alert-icon" }),
-        /* @__PURE__ */ jsx8("span", { className: "rs-alert-text", children: error })
-      ] })
+      error && /* @__PURE__ */ jsx9(Callout, { variant: "error", children: error }),
+      /* @__PURE__ */ jsx9(
+        Button,
+        {
+          onClick: handleConfirm,
+          loading: isSubmitting,
+          loadingText: "Submitting transaction...",
+          disabled: !sourceAmount || Number(sourceAmount) <= 0,
+          fullWidth: true,
+          children: "Continue"
+        }
+      )
     ] }),
-    /* @__PURE__ */ jsx8("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx8(
-      Button,
-      {
-        onClick: handleConfirm,
-        loading: isSubmitting,
-        disabled: !sourceAmount || Number(sourceAmount) <= 0,
-        fullWidth: true,
-        children: "Continue"
-      }
-    ) }),
-    /* @__PURE__ */ jsx8(PoweredBy, {})
+    /* @__PURE__ */ jsx9(PoweredBy, {})
   ] });
 }
 
 // src/components/steps/DappImportAssetSelectStep.tsx
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 function DappImportAssetSelectStep({
   sourceLabel,
   assets,
   onSelect
 }) {
-  return /* @__PURE__ */ jsxs9("div", { className: "rs-screen", children: [
-    /* @__PURE__ */ jsxs9("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
-      /* @__PURE__ */ jsx9(
+  return /* @__PURE__ */ jsxs10("div", { className: "rs-screen", children: [
+    /* @__PURE__ */ jsxs10("div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
+      /* @__PURE__ */ jsx10(
         BodyHeader,
         {
-          icon: /* @__PURE__ */ jsx9(HandCoinsIcon, {}),
+          icon: /* @__PURE__ */ jsx10(WalletIcon, {}),
           title: `Transfer from ${sourceLabel}`,
           subtitle: "Pick the balance to import"
         }
       ),
-      /* @__PURE__ */ jsx9("div", { className: "rs-list", children: assets.map((asset) => {
-        const balanceTokens = asset.balance ? tokenFormatter.format(
+      /* @__PURE__ */ jsx10("div", { className: "rs-asset-list", children: assets.map((asset) => {
+        const tokenAmount = asset.balance ? tokenFormatter.format(
           Number(asset.balance) / 10 ** asset.decimals
         ) : "0";
-        const balanceUsd = asset.balanceUsd && asset.balanceUsd > 0 ? currencyFormatter.format(asset.balanceUsd) : `${balanceTokens} ${asset.symbol}`;
-        const iconSrc = getTokenIcon(asset.symbol);
-        return /* @__PURE__ */ jsx9(
-          ListRow,
+        const balanceUsd = asset.balanceUsd && asset.balanceUsd > 0 ? currencyFormatter.format(asset.balanceUsd) : `${tokenAmount} ${asset.symbol}`;
+        const tokenIcon = asset.icon ?? getTokenIcon(asset.symbol);
+        const chainIcon = getChainIcon(asset.chainId);
+        const badge = getChainBadge(asset.chainId);
+        return /* @__PURE__ */ jsxs10(
+          "button",
           {
-            leadingMedia: iconSrc || void 0,
-            leading: iconSrc ? void 0 : /* @__PURE__ */ jsx9(HandCoinsIcon, {}),
-            title: asset.symbol,
-            subtitle: `${balanceTokens} on ${getChainName(asset.chainId)}`,
-            meta: balanceUsd,
-            onClick: () => onSelect(asset)
+            type: "button",
+            className: "rs-asset-row",
+            onClick: () => onSelect(asset),
+            children: [
+              /* @__PURE__ */ jsxs10("div", { className: "rs-asset-info", children: [
+                /* @__PURE__ */ jsxs10("div", { className: "rs-asset-icon-wrapper", children: [
+                  /* @__PURE__ */ jsx10("span", { className: "rs-asset-icon", children: tokenIcon ? /* @__PURE__ */ jsx10("img", { src: tokenIcon, alt: asset.symbol }) : asset.symbol.slice(0, 4) }),
+                  chainIcon ? /* @__PURE__ */ jsx10("span", { className: "rs-asset-chain-badge", children: /* @__PURE__ */ jsx10(
+                    "img",
+                    {
+                      src: chainIcon,
+                      alt: getChainName(asset.chainId)
+                    }
+                  ) }) : /* @__PURE__ */ jsx10(
+                    "span",
+                    {
+                      className: "rs-asset-chain-badge",
+                      style: { backgroundColor: badge.bg, color: badge.color },
+                      children: badge.shortLabel.charAt(0)
+                    }
+                  )
+                ] }),
+                /* @__PURE__ */ jsxs10("div", { className: "rs-asset-text", children: [
+                  /* @__PURE__ */ jsxs10("div", { className: "rs-asset-name-row", children: [
+                    /* @__PURE__ */ jsx10("span", { className: "rs-asset-name", children: asset.symbol }),
+                    /* @__PURE__ */ jsxs10("span", { className: "rs-asset-chain", children: [
+                      "on ",
+                      asset.sourceLabel
+                    ] })
+                  ] }),
+                  /* @__PURE__ */ jsxs10("div", { className: "rs-asset-balance-small", children: [
+                    tokenAmount,
+                    " ",
+                    asset.symbol
+                  ] })
+                ] })
+              ] }),
+              /* @__PURE__ */ jsx10("div", { className: "rs-asset-balance", children: balanceUsd })
+            ]
           },
           asset.id
         );
       }) })
     ] }),
-    /* @__PURE__ */ jsx9(PoweredBy, {})
+    /* @__PURE__ */ jsx10(PoweredBy, {})
   ] });
 }
 DappImportAssetSelectStep.displayName = "DappImportAssetSelectStep";
@@ -2763,6 +2860,172 @@ var SAFE_MULTI_SEND_CALL_ONLY_ADDRESS = "0x40A2aCCbd92BCA938b02010E17A5b8929b491
 var GAMMA_API_PUBLIC_PROFILE = "https://gamma-api.polymarket.com/public-profile";
 var POLYMARKET_ICON_URL = "data:image/svg+xml,%3Csvg width='512' height='512' viewBox='0 0 512 512' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='512' height='512' fill='%232E5CFF'/%3E%3Cpath d='M375.84 389.422C375.84 403.572 375.84 410.647 371.212 414.154C366.585 417.662 359.773 415.75 346.15 411.927L127.22 350.493C119.012 348.19 114.907 347.038 112.534 343.907C110.161 340.776 110.161 336.513 110.161 327.988V184.012C110.161 175.487 110.161 171.224 112.534 168.093C114.907 164.962 119.012 163.81 127.22 161.507L346.15 100.072C359.773 96.2495 366.585 94.338 371.212 97.8455C375.84 101.353 375.84 108.428 375.84 122.578V389.422ZM164.761 330.463L346.035 381.337V279.595L164.761 330.463ZM139.963 306.862L321.201 256L139.963 205.138V306.862ZM164.759 181.537L346.035 232.406V130.663L164.759 181.537Z' fill='white'/%3E%3C/svg%3E";
 
+// src/core/dapp-imports/polymarket/deposit-wallet.ts
+import {
+  encodeFunctionData,
+  erc20Abi as erc20Abi3,
+  parseAbi
+} from "viem";
+var COLLATERAL_OFFRAMP_ABI = parseAbi([
+  "function unwrap(address _asset, address _to, uint256 _amount)"
+]);
+var POLYMARKET_DEPOSIT_WALLET_ABI = [
+  {
+    type: "function",
+    name: "owner",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "result", type: "address" }]
+  },
+  {
+    type: "function",
+    name: "nonce",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ name: "", type: "uint256" }]
+  }
+];
+var DEPOSIT_WALLET_EXECUTE_TYPES = {
+  Batch: [
+    { name: "wallet", type: "address" },
+    { name: "nonce", type: "uint256" },
+    { name: "deadline", type: "uint256" },
+    { name: "calls", type: "Call[]" }
+  ],
+  Call: [
+    { name: "target", type: "address" },
+    { name: "value", type: "uint256" },
+    { name: "data", type: "bytes" }
+  ]
+};
+var DEPOSIT_WALLET_DOMAIN_NAME = "DepositWallet";
+var DEPOSIT_WALLET_DOMAIN_VERSION = "1";
+var EXECUTE_DEADLINE_SECONDS = 300;
+async function detectPolymarketWalletKind(params) {
+  const { publicClient, proxyWallet, eoa } = params;
+  const results = await publicClient.multicall({
+    allowFailure: true,
+    contracts: [
+      {
+        address: proxyWallet,
+        abi: SAFE_ABI,
+        functionName: "isOwner",
+        args: [eoa]
+      },
+      {
+        address: proxyWallet,
+        abi: POLYMARKET_DEPOSIT_WALLET_ABI,
+        functionName: "owner"
+      }
+    ]
+  });
+  const isSafeOwner = results[0].status === "success" && results[0].result === true;
+  if (isSafeOwner) return "safe";
+  if (results[1].status === "success") {
+    const owner = results[1].result;
+    if (owner.toLowerCase() === eoa.toLowerCase()) return "deposit-wallet";
+  }
+  return null;
+}
+async function buildSignedDepositWalletBatch(params) {
+  const {
+    walletClient,
+    publicClient,
+    walletAddress,
+    recipient,
+    amount,
+    tokenKind
+  } = params;
+  const account = walletClient.account;
+  const chain = walletClient.chain;
+  if (!account || !chain) {
+    throw new Error("Wallet not connected");
+  }
+  if (chain.id !== POLYMARKET_POLYGON_CHAIN_ID) {
+    throw new Error("Switch to Polygon to sign");
+  }
+  const owner = await publicClient.readContract({
+    address: walletAddress,
+    abi: POLYMARKET_DEPOSIT_WALLET_ABI,
+    functionName: "owner"
+  });
+  if (owner.toLowerCase() !== account.address.toLowerCase()) {
+    throw new Error("Connected wallet is not the Polymarket wallet owner");
+  }
+  const nonce = await publicClient.readContract({
+    address: walletAddress,
+    abi: POLYMARKET_DEPOSIT_WALLET_ABI,
+    functionName: "nonce"
+  });
+  const calls = tokenKind === "usdce" ? buildUsdceTransferCalls(recipient, amount) : buildPusdUnwrapCalls(recipient, amount);
+  const deadline = BigInt(
+    Math.floor(Date.now() / 1e3) + EXECUTE_DEADLINE_SECONDS
+  );
+  const signature = await walletClient.signTypedData({
+    account,
+    domain: {
+      name: DEPOSIT_WALLET_DOMAIN_NAME,
+      version: DEPOSIT_WALLET_DOMAIN_VERSION,
+      chainId: chain.id,
+      verifyingContract: walletAddress
+    },
+    types: DEPOSIT_WALLET_EXECUTE_TYPES,
+    primaryType: "Batch",
+    message: { wallet: walletAddress, nonce, deadline, calls }
+  });
+  return {
+    payload: {
+      depositWallet: walletAddress,
+      owner: account.address,
+      nonce: nonce.toString(),
+      deadline: deadline.toString(),
+      calls: calls.map((call) => ({
+        target: call.target,
+        value: call.value.toString(),
+        data: call.data
+      })),
+      signature
+    },
+    sourceToken: POLYMARKET_USDCE_ADDRESS,
+    sourceSymbol: tokenKind === "pusd" ? "pUSD" : "USDC.e"
+  };
+}
+function buildUsdceTransferCalls(recipient, amount) {
+  return [
+    {
+      target: POLYMARKET_USDCE_ADDRESS,
+      value: 0n,
+      data: encodeFunctionData({
+        abi: erc20Abi3,
+        functionName: "transfer",
+        args: [recipient, amount]
+      })
+    }
+  ];
+}
+function buildPusdUnwrapCalls(recipient, amount) {
+  return [
+    {
+      target: POLYMARKET_PUSD_ADDRESS,
+      value: 0n,
+      data: encodeFunctionData({
+        abi: erc20Abi3,
+        functionName: "approve",
+        args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
+      })
+    },
+    {
+      target: POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS,
+      value: 0n,
+      data: encodeFunctionData({
+        abi: COLLATERAL_OFFRAMP_ABI,
+        functionName: "unwrap",
+        args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
+      })
+    }
+  ];
+}
+
 // src/core/dapp-imports/polymarket/gamma-api.ts
 import { getAddress, isAddress, zeroAddress } from "viem";
 async function fetchPolymarketProxyWallet(eoa, signal) {
@@ -2796,19 +3059,19 @@ async function fetchPolymarketProxyWallet(eoa, signal) {
 // src/core/dapp-imports/polymarket/safe.ts
 import {
   concat,
-  encodeFunctionData,
+  encodeFunctionData as encodeFunctionData2,
   encodePacked,
-  erc20Abi as erc20Abi3,
+  erc20Abi as erc20Abi4,
   pad,
-  parseAbi,
+  parseAbi as parseAbi2,
   parseEventLogs,
   toHex,
   zeroAddress as zeroAddress2
 } from "viem";
-var COLLATERAL_OFFRAMP_ABI = parseAbi([
+var COLLATERAL_OFFRAMP_ABI2 = parseAbi2([
   "function unwrap(address _asset, address _to, uint256 _amount)"
 ]);
-var MULTI_SEND_ABI = parseAbi(["function multiSend(bytes transactions)"]);
+var MULTI_SEND_ABI = parseAbi2(["function multiSend(bytes transactions)"]);
 async function readPolymarketBalances(params) {
   const { publicClient, proxyWallet } = params;
   try {
@@ -2817,13 +3080,13 @@ async function readPolymarketBalances(params) {
       contracts: [
         {
           address: POLYMARKET_PUSD_ADDRESS,
-          abi: erc20Abi3,
+          abi: erc20Abi4,
           functionName: "balanceOf",
           args: [proxyWallet]
         },
         {
           address: POLYMARKET_USDCE_ADDRESS,
-          abi: erc20Abi3,
+          abi: erc20Abi4,
           functionName: "balanceOf",
           args: [proxyWallet]
         }
@@ -2915,8 +3178,8 @@ async function executePolymarketSafeTransfer(params) {
 function buildUsdceTransferSafeTx(recipient, amount) {
   return {
     to: POLYMARKET_USDCE_ADDRESS,
-    data: encodeFunctionData({
-      abi: erc20Abi3,
+    data: encodeFunctionData2({
+      abi: erc20Abi4,
       functionName: "transfer",
       args: [recipient, amount]
     }),
@@ -2924,19 +3187,19 @@ function buildUsdceTransferSafeTx(recipient, amount) {
   };
 }
 function buildPusdUnwrapSafeTx(recipient, amount) {
-  const approveData = encodeFunctionData({
-    abi: erc20Abi3,
+  const approveData = encodeFunctionData2({
+    abi: erc20Abi4,
     functionName: "approve",
     args: [POLYMARKET_COLLATERAL_OFFRAMP_ADDRESS, amount]
   });
-  const unwrapData = encodeFunctionData({
-    abi: COLLATERAL_OFFRAMP_ABI,
+  const unwrapData = encodeFunctionData2({
+    abi: COLLATERAL_OFFRAMP_ABI2,
     functionName: "unwrap",
     args: [POLYMARKET_USDCE_ADDRESS, recipient, amount]
   });
   return {
     to: SAFE_MULTI_SEND_CALL_ONLY_ADDRESS,
-    data: encodeFunctionData({
+    data: encodeFunctionData2({
       abi: MULTI_SEND_ABI,
       functionName: "multiSend",
       args: [
@@ -2979,12 +3242,23 @@ var polymarketProvider = {
     });
     if (signal?.aborted) return null;
     if (balances.pusd === 0n && balances.usdce === 0n) return null;
+    const walletKind = await detectPolymarketWalletKind({
+      publicClient: polygonClient,
+      proxyWallet,
+      eoa
+    });
+    if (signal?.aborted) return null;
+    if (!walletKind) return null;
     const assets = [];
     if (balances.pusd > 0n) {
-      assets.push(buildAsset({ tokenKind: "pusd", proxyWallet, balance: balances.pusd }));
+      assets.push(
+        buildAsset({ tokenKind: "pusd", proxyWallet, walletKind, balance: balances.pusd })
+      );
     }
     if (balances.usdce > 0n) {
-      assets.push(buildAsset({ tokenKind: "usdce", proxyWallet, balance: balances.usdce }));
+      assets.push(
+        buildAsset({ tokenKind: "usdce", proxyWallet, walletKind, balance: balances.usdce })
+      );
     }
     const totalUsd = assets.reduce((sum, a) => sum + (a.balanceUsd ?? 0), 0);
     const availability = {
@@ -2994,8 +3268,32 @@ var polymarketProvider = {
     };
     return availability;
   },
-  async executeTransfer({ walletClient, publicClient, recipient, asset, amount }) {
+  async executeTransfer({
+    walletClient,
+    publicClient,
+    recipient,
+    asset,
+    amount,
+    backend
+  }) {
     const metadata = asset.providerMetadata;
+    if (metadata.walletKind === "deposit-wallet") {
+      if (!backend) {
+        throw new Error(
+          "Polymarket deposit-wallet transfers require a backend connection"
+        );
+      }
+      const { payload, sourceToken, sourceSymbol } = await buildSignedDepositWalletBatch({
+        walletClient,
+        publicClient,
+        walletAddress: metadata.proxyWallet,
+        recipient,
+        amount,
+        tokenKind: metadata.tokenKind
+      });
+      const { txHash } = await backend.submitPolymarketWithdraw(payload);
+      return { txHash, sourceToken, sourceSymbol, sourceDecimals: 6 };
+    }
     const result = await executePolymarketSafeTransfer({
       walletClient,
       publicClient,
@@ -3013,18 +3311,19 @@ var polymarketProvider = {
   }
 };
 function buildAsset(params) {
-  const { tokenKind, proxyWallet, balance } = params;
+  const { tokenKind, proxyWallet, walletKind, balance } = params;
   const isPusd = tokenKind === "pusd";
   const tokenAddress = isPusd ? POLYMARKET_PUSD_ADDRESS : POLYMARKET_USDCE_ADDRESS;
   const symbol = isPusd ? "pUSD" : "USDC.e";
   const balanceUsd = Number(formatUnits6(balance, 6));
-  const metadata = { proxyWallet, tokenKind };
+  const metadata = { proxyWallet, tokenKind, walletKind };
   return {
     id: `polymarket:${tokenKind}`,
     chainId: POLYMARKET_POLYGON_CHAIN_ID,
     token: tokenAddress,
     symbol,
     name: isPusd ? "Polymarket USD" : "Polygon USDC.e",
+    icon: isPusd ? POLYMARKET_ICON_URL : void 0,
     decimals: 6,
     balance: balance.toString(),
     balanceUsd: Number.isFinite(balanceUsd) ? balanceUsd : 0,
@@ -3049,6 +3348,14 @@ function getEnabledProviders(config) {
   );
 }
 
+// src/core/dapp-imports/types.ts
+function isDappImportAsset(asset) {
+  return typeof asset.source === "string" && typeof asset.sourceLabel === "string" && "providerMetadata" in asset;
+}
+
+// src/DepositFlow.tsx
+import { base } from "viem/chains";
+
 // src/store/index.ts
 import { createContext, createElement as createElement2, useContext } from "react";
 import { useStore } from "zustand";
@@ -3685,13 +3992,17 @@ function stableStringify(value) {
   const entries = keys.filter((k) => obj[k] !== void 0).map((k) => `${JSON.stringify(k)}:${stableStringify(obj[k])}`);
   return `{${entries.join(",")}}`;
 }
+function normalizeKeyToken(value) {
+  if (value === void 0) return void 0;
+  return value.startsWith("0x") ? value.toLowerCase() : value;
+}
 function computeRequestKey(input, sessionOwnerAddress) {
   return stableStringify({
     ownerAddress: input.ownerAddress.toLowerCase(),
     sessionOwnerAddress: sessionOwnerAddress.toLowerCase(),
     targetChain: input.targetChain,
-    targetToken: input.targetToken.toLowerCase(),
-    recipient: input.recipient?.toLowerCase(),
+    targetToken: normalizeKeyToken(input.targetToken),
+    recipient: normalizeKeyToken(input.recipient),
     outputTokenRules: input.outputTokenRules ?? null,
     rejectUnmapped: input.rejectUnmapped ?? null,
     signerAddress: input.signerAddress.toLowerCase(),
@@ -3706,8 +4017,8 @@ function computeCacheKey(input, sessionOwnerAddress) {
     ownerAddress: input.ownerAddress.toLowerCase(),
     sessionOwnerAddress: sessionOwnerAddress.toLowerCase(),
     targetChain: input.targetChain,
-    targetToken: input.targetToken.toLowerCase(),
-    recipient: input.recipient?.toLowerCase(),
+    targetToken: normalizeKeyToken(input.targetToken),
+    recipient: normalizeKeyToken(input.recipient),
     outputTokenRules: input.outputTokenRules ?? null,
     rejectUnmapped: input.rejectUnmapped ?? null,
     signerAddress: input.signerAddress.toLowerCase(),
@@ -3743,7 +4054,7 @@ async function runAccountSetup(input, deps) {
     const setup = await service.setupAccount({
       ownerAddress: input.ownerAddress,
       sessionOwnerAddress: sessionOwner.address,
-      targetChain: toEvmCaip2(input.targetChain),
+      targetChain: targetChainToCaip2(input.targetChain),
       targetToken: input.targetToken,
       recipient: input.recipient,
       postBridgeActions: input.postBridgeActions,
@@ -3796,7 +4107,7 @@ async function runAccountSetup(input, deps) {
       eoaAddress: input.ownerAddress,
       sessionOwner: sessionOwner.address,
       target: {
-        chain: toEvmCaip2(input.targetChain),
+        chain: targetChainToCaip2(input.targetChain),
         token: input.targetToken,
         ...input.recipient && { recipient: input.recipient },
         ...input.postBridgeActions?.length && {
@@ -3878,7 +4189,7 @@ function mapError(error) {
           "server"
         );
       }
-      return new SetupError("Couldn't prepare account.", "client");
+      return new SetupError(error.message, "client");
     }
     return new SetupError(
       "Deposit service is temporarily unavailable. Please try again shortly.",
@@ -3892,23 +4203,23 @@ function mapError(error) {
 }
 
 // src/DepositFlow.tsx
-import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Fragment as Fragment3, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 function AccountPreparingSkeleton({
   errorMessage,
   onRetry
 }) {
-  return /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
-    /* @__PURE__ */ jsx10("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs10(Fragment3, { children: [
-      /* @__PURE__ */ jsx10("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
-      /* @__PURE__ */ jsx10("div", { className: "rs-loading-subtitle", children: errorMessage })
-    ] }) : /* @__PURE__ */ jsx10("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
-    errorMessage && onRetry && /* @__PURE__ */ jsx10("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsxs11("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx11("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx11("div", { className: "rs-loading-text", children: errorMessage ? /* @__PURE__ */ jsxs11(Fragment3, { children: [
+      /* @__PURE__ */ jsx11("div", { className: "rs-loading-title rs-text-error", children: "Couldn\u2019t prepare account" }),
+      /* @__PURE__ */ jsx11("div", { className: "rs-loading-subtitle", children: errorMessage })
+    ] }) : /* @__PURE__ */ jsx11("div", { className: "rs-loading-title", children: "Preparing\u2026" }) }) }) }),
+    errorMessage && onRetry && /* @__PURE__ */ jsx11("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx11(
       "button",
       {
         type: "button",
         className: "rs-button rs-button--default rs-button--full-width",
         onClick: onRetry,
-        children: /* @__PURE__ */ jsx10("span", { children: "Try again" })
+        children: /* @__PURE__ */ jsx11("span", { children: "Try again" })
       }
     ) })
   ] });
@@ -4042,6 +4353,7 @@ function DepositFlow({
   sourceToken: defaultSourceToken,
   amount: defaultAmount,
   recipient,
+  appBalanceUsd,
   postBridgeActions,
   outputTokenRules,
   rejectUnmapped,
@@ -4084,29 +4396,26 @@ function DepositFlow({
   const hasNavigatedBack = flowSlice.hasNavigatedBack;
   const selectedWalletId = useDepositStore(selectedWalletIdSelector);
   const [totalBalanceUsd, setTotalBalanceUsd] = useState9(0);
-  const [targetBalanceUsd, setTargetBalanceUsd] = useState9(
-    void 0
-  );
   const [hasQrAutoAdvanceGraceElapsed, setHasQrAutoAdvanceGraceElapsed] = useState9(() => !hasInitialWalletHydrationPending);
-  const portfolioAssetsRef = useRef5([]);
-  const stableWalletSignerRef = useRef5(null);
-  const stableWalletSelectionKeyRef = useRef5(null);
-  const logFlow = useCallback3(
+  const portfolioAssetsRef = useRef7([]);
+  const stableWalletSignerRef = useRef7(null);
+  const stableWalletSelectionKeyRef = useRef7(null);
+  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) {
@@ -4214,6 +4523,25 @@ function DepositFlow({
     isConnectSelectionConfirmed,
     selectedWalletId
   ]);
+  const setupChainId = typeof targetChain === "number" ? targetChain : typeof defaultSourceChain === "number" ? defaultSourceChain : base.id;
+  const targetSymbol = getTargetTokenSymbol(targetToken, targetChain);
+  const isTargetStablecoin = isStablecoinSymbol(targetSymbol);
+  const targetMarketPriceRef = useRef7(null);
+  useEffect8(() => {
+    targetMarketPriceRef.current = null;
+    if (isTargetStablecoin || targetSymbol === "Token") {
+      return;
+    }
+    let cancelled = false;
+    service.fetchPrices([targetSymbol]).then((prices) => {
+      if (cancelled) return;
+      const price = prices[targetSymbol.toUpperCase()];
+      targetMarketPriceRef.current = typeof price === "number" && price > 0 ? price : null;
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [service, targetSymbol, isTargetStablecoin]);
   const walletSignerContext = useMemo6(() => {
     if (flowMode === "deposit-address") {
       return null;
@@ -4223,12 +4551,12 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        publicClient: dappPublicClient ?? getPublicClient(setupChainId),
         switchChain: void 0
       };
     }
     if (canAutoLock) {
-      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      const fallbackChainId = dappWalletClient?.chain?.id ?? setupChainId;
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -4246,12 +4574,12 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        publicClient: dappPublicClient ?? getPublicClient(setupChainId),
         switchChain: void 0
       };
     }
     if (selectedOption.kind === "connected" && dappWalletClient?.account && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
-      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      const fallbackChainId = dappWalletClient?.chain?.id ?? setupChainId;
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -4263,7 +4591,7 @@ function DepositFlow({
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
-        publicClient: reownWallet.publicClient ?? getPublicClient(targetChain),
+        publicClient: reownWallet.publicClient ?? getPublicClient(setupChainId),
         switchChain: reownWallet.switchChain
       };
     }
@@ -4278,7 +4606,7 @@ function DepositFlow({
     dappSwitchChain,
     dappAddress,
     reownWallet,
-    targetChain
+    setupChainId
   ]);
   useEffect8(() => {
     if (flowMode !== "wallet" && flowMode !== "dapp-import") {
@@ -4301,7 +4629,7 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        publicClient: dappPublicClient ?? getPublicClient(setupChainId),
         switchChain: void 0
       };
     }
@@ -4319,7 +4647,7 @@ function DepositFlow({
     flowMode,
     dappAddress,
     dappPublicClient,
-    targetChain,
+    setupChainId,
     walletSignerContext,
     walletSelectionKey
   ]);
@@ -4367,27 +4695,7 @@ function DepositFlow({
     () => readSetupForOwner(setupSlice, activeOwner),
     [setupSlice, activeOwner]
   );
-  const activeSmartAccount = activeEntry.smartAccount;
-  useEffect8(() => {
-    if (!activeSmartAccount) {
-      setTargetBalanceUsd(void 0);
-      return;
-    }
-    let active = true;
-    service.fetchPortfolio(activeSmartAccount).then((portfolio) => {
-      if (!active) return;
-      const target = portfolio.tokens.find(
-        (t) => t.chainId === targetChain && typeof t.address === "string" && t.address.toLowerCase() === targetToken.toLowerCase()
-      );
-      setTargetBalanceUsd(target?.balanceUsd ?? 0);
-    }).catch(() => {
-      if (active) setTargetBalanceUsd(0);
-    });
-    return () => {
-      active = false;
-    };
-  }, [activeSmartAccount, targetChain, targetToken, service]);
-  const lastActiveSetupLifecycleKeyRef = useRef5(null);
+  const lastActiveSetupLifecycleKeyRef = useRef7(null);
   useEffect8(() => {
     if (!flowMode || !isConnectSelectionConfirmed) {
       lastActiveSetupLifecycleKeyRef.current = null;
@@ -4429,7 +4737,7 @@ function DepositFlow({
     [flowSlice, depositSlice, processingSlice, activeEntry]
   );
   const step = effectiveStep;
-  const handleBack = useCallback3(() => {
+  const handleBack = useCallback4(() => {
     const stepBeforeBack = storeApi.getState().flow.step;
     storeApi.dispatch({
       type: "back/requested",
@@ -4447,7 +4755,7 @@ function DepositFlow({
   }, [currentBackHandler, currentScreen, onStepChangeRef]);
   const stepSendToken = effectiveStep.type === "amount" ? effectiveStep.asset.symbol : null;
   const stepOpenEventKey = effectiveStep.type === "select-asset" ? "select-asset" : effectiveStep.type === "deposit-address" ? "deposit-address" : effectiveStep.type === "amount" && stepSendToken ? `amount:${stepSendToken.toLowerCase()}` : null;
-  const lastStepOpenEventKeyRef = useRef5(null);
+  const lastStepOpenEventKeyRef = useRef7(null);
   useEffect8(() => {
     if (!stepOpenEventKey) {
       lastStepOpenEventKeyRef.current = null;
@@ -4465,7 +4773,7 @@ function DepositFlow({
       });
     } else if (effectiveStep.type === "deposit-address") {
       const chainName = getChainName(targetChain);
-      const tokenSymbol = getTokenSymbol(targetToken, targetChain);
+      const tokenSymbol = getTargetTokenSymbol(targetToken, targetChain);
       onEventRef.current?.({
         type: "deposit_modal_transfer_crypto_open",
         default_chain: chainName,
@@ -4473,7 +4781,7 @@ function DepositFlow({
         pred_balance: totalBalanceUsd
       });
     } else if (effectiveStep.type === "amount" && stepSendToken) {
-      const receiveSymbol = getTokenSymbol(targetToken, targetChain);
+      const receiveSymbol = getTargetTokenSymbol(targetToken, targetChain);
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_enter_value_open",
         send_token: stepSendToken,
@@ -4515,10 +4823,10 @@ function DepositFlow({
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
   const isDappImportMode = flowMode === "dapp-import";
-  const handleSelectTransferCrypto = useCallback3(() => {
+  const handleSelectTransferCrypto = useCallback4(() => {
     storeApi.dispatch({ type: "connect/transfer-crypto-selected" });
   }, [storeApi]);
-  const handleConfirmWallet = useCallback3(
+  const handleConfirmWallet = useCallback4(
     (walletId) => {
       const selectedOption = walletOptions.find((o) => o.id === walletId);
       const mode = enableSolana && selectedOption?.kind === "solana" ? "solana-wallet" : "wallet";
@@ -4530,11 +4838,16 @@ function DepositFlow({
     },
     [walletOptions, enableSolana, storeApi]
   );
+  const isSolanaWalletConnected = Boolean(
+    enableSolana && reownWallet?.isConnected && reownWallet?.isSolana
+  );
+  const dappImportsKey = dappImports ? Object.keys(dappImports).filter((k) => dappImports[k]).sort().join(",") : "";
   const enabledDappImportProviders = useMemo6(
-    () => getEnabledProviders(dappImports),
-    [dappImports]
+    () => isSolanaWalletConnected ? [] : getEnabledProviders(dappImports),
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: keyed on dappImportsKey, not the dappImports object identity
+    [dappImportsKey, isSolanaWalletConnected]
   );
-  const handleSelectDappImport = useCallback3(
+  const handleSelectDappImport = useCallback4(
     (providerId) => {
       const owner = dappImportOwner;
       if (owner) {
@@ -4555,7 +4868,7 @@ function DepositFlow({
     },
     [storeApi, walletOptions, dappImportOwner]
   );
-  const handleDappImportAssetSelected = useCallback3(
+  const handleDappImportAssetSelected = useCallback4(
     (asset) => {
       storeApi.dispatch({ type: "dapp-import/asset-selected", asset });
     },
@@ -4677,7 +4990,7 @@ function DepositFlow({
     dappImportAvailabilityOwner,
     dappImportOwner
   ]);
-  const handleNewDeposit = useCallback3(() => {
+  const handleNewDeposit = useCallback4(() => {
     onLifecycleRef.current?.({
       type: "smart-account-changed",
       evm: null,
@@ -4830,7 +5143,7 @@ function DepositFlow({
     storeApi,
     setupSlice.byOwner
   ]);
-  const handleDepositAddressSubmitted = useCallback3(
+  const handleDepositAddressSubmitted = useCallback4(
     (data) => {
       logFlow("deposit-address:detected", {
         txHash: data.txHash,
@@ -4841,7 +5154,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleSolanaTokenContinue = useCallback3(
+  const handleSolanaTokenContinue = useCallback4(
     (token, balance, balanceUsd) => {
       logFlow("solana:token:continue", { token: token.symbol });
       storeApi.dispatch({
@@ -4854,11 +5167,11 @@ function DepositFlow({
     },
     [defaultAmount, logFlow, storeApi]
   );
-  const handleSolanaAmountContinue = useCallback3(
+  const handleSolanaAmountContinue = useCallback4(
     (token, sourceAmount, inputAmountUsd) => {
-      const targetSym = getTokenSymbol(targetToken, targetChain);
+      const targetSym = getTargetTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
-      const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym);
+      const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym) ?? targetMarketPriceRef.current;
       logFlow("solana:amount:continue", {
         token: token.symbol,
         sourceAmount,
@@ -4876,7 +5189,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, logFlow, storeApi]
   );
-  const handleSolanaConfirmed = useCallback3(
+  const handleSolanaConfirmed = useCallback4(
     (txHash, amountUnits) => {
       const tokenAtSubmit = storeApi.getState().deposit.selectedSolanaToken;
       if (!tokenAtSubmit) return;
@@ -4903,7 +5216,7 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef, storeApi]
   );
-  const handleAssetContinue = useCallback3(
+  const handleAssetContinue = useCallback4(
     (asset) => {
       onEventRef.current?.({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
@@ -4921,16 +5234,16 @@ function DepositFlow({
     },
     [defaultAmount, onEventRef, totalBalanceUsd, storeApi]
   );
-  const handleAmountContinue = useCallback3(
+  const handleAmountContinue = useCallback4(
     (amount, targetAmount, balance, liquidityWarning) => {
       const entry = readSetupForOwner(
         storeApi.getState().setup,
         activeOwner
       );
       if (entry.status !== "ready") return;
-      const targetSym = getTokenSymbol(targetToken, targetChain);
+      const targetSym = getTargetTokenSymbol(targetToken, targetChain);
       const isTargetStable = isStablecoinSymbol(targetSym);
-      const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym);
+      const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym) ?? targetMarketPriceRef.current;
       storeApi.dispatch({
         type: "amount/entered",
         amount,
@@ -4942,7 +5255,7 @@ function DepositFlow({
     },
     [targetToken, targetChain, getTokenPriceUsd, storeApi, activeOwner]
   );
-  const handleDepositSubmitted = useCallback3(
+  const handleDepositSubmitted = useCallback4(
     (txHash, chainId, amount, token) => {
       logFlow("evm:submitted", {
         txHash,
@@ -4965,7 +5278,7 @@ function DepositFlow({
     },
     [logFlow, storeApi, targetChain, targetToken]
   );
-  const handleDepositSubmittedCallback = useCallback3(
+  const handleDepositSubmittedCallback = useCallback4(
     (txHash, sourceChain, amount) => {
       onLifecycleRef.current?.({
         type: "submitted",
@@ -4976,7 +5289,7 @@ function DepositFlow({
     },
     [onLifecycleRef]
   );
-  const handleDepositComplete = useCallback3(
+  const handleDepositComplete = useCallback4(
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
       onLifecycleRef.current?.({
@@ -4988,21 +5301,21 @@ function DepositFlow({
     },
     [logFlow, onLifecycleRef]
   );
-  const handleDepositFailed = useCallback3(
+  const handleDepositFailed = useCallback4(
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
       onLifecycleRef.current?.({ type: "failed", txHash, error });
     },
     [logFlowError, onLifecycleRef]
   );
-  const handleError = useCallback3(
+  const handleError = useCallback4(
     (message, code) => {
       logFlowError("flow:error", message, { code });
       onErrorRef.current?.({ message, code });
     },
     [logFlowError, onErrorRef]
   );
-  const handleTotalBalanceComputed = useCallback3((total) => {
+  const handleTotalBalanceComputed = useCallback4((total) => {
     setTotalBalanceUsd(total);
   }, []);
   const walletOptionsKey = useMemo6(
@@ -5072,14 +5385,14 @@ function DepositFlow({
     [setupSlice, dappAddress]
   );
   const transferCryptoState = transferCryptoEntry.status === "ready" ? "ready" : transferCryptoEntry.status === "error" ? "error" : "loading";
-  const handleRetrySetup = useCallback3(
+  const handleRetrySetup = useCallback4(
     (owner) => {
       storeApi.dispatch({ type: "setup/retry-requested", owner });
     },
     [storeApi]
   );
   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,
       {
         walletRows,
@@ -5126,19 +5439,20 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     if (!dappAddress) return null;
-    return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+    return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
         }
       ),
-      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "deposit-address" && /* @__PURE__ */ jsx11(
         DepositAddressStep,
         {
           smartAccount: effectiveStep.smartAccount,
           solanaDepositAddress: enableSolana ? effectiveStep.solanaDepositAddress : void 0,
+          isUpdating: activeEntry.status !== "ready",
           service,
           allowedRoutes,
           targetChain,
@@ -5151,7 +5465,7 @@ function DepositFlow({
           onDepositFailed: handleDepositFailed,
           onCopyAddress: () => {
             const chainName = getChainName(targetChain);
-            const tokenSymbol = getTokenSymbol(targetToken, targetChain);
+            const tokenSymbol = getTargetTokenSymbol(targetToken, targetChain);
             onEvent?.({
               type: "deposit_modal_transfer_crypto_cta_click",
               default_chain: chainName,
@@ -5170,25 +5484,29 @@ function DepositFlow({
     if (!dappAddress) return null;
     const solanaAddr = reownWallet?.solanaAddress;
     const solanaProvider = reownWallet?.solanaProvider;
-    return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+    return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
+      effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
         AccountPreparingSkeleton,
         {
           errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
           onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
         }
       ),
-      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx11(
         SolanaTokenSelectStep,
         {
           solanaAddress: solanaAddr,
           service,
           onContinue: handleSolanaTokenContinue,
           onTotalBalanceComputed: handleTotalBalanceComputed,
+          onDisconnect: onDisconnect ? () => {
+            onDisconnect();
+            handleBack();
+          } : void 0,
           debug
         }
       ),
-      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-amount" && /* @__PURE__ */ jsx11(
         SolanaAmountStep,
         {
           token: effectiveStep.token,
@@ -5197,16 +5515,16 @@ function DepositFlow({
           defaultAmount: effectiveStep.inputAmountUsd,
           uiConfig,
           targetChainName: getChainName(targetChain),
-          targetTokenSymbol: getTokenSymbol(targetToken, targetChain),
+          targetTokenSymbol: getTargetTokenSymbol(targetToken, targetChain),
           targetTokenIcon: getTokenIcon(
-            getTokenSymbol(targetToken, targetChain)
+            getTargetTokenSymbol(targetToken, targetChain)
           ),
-          targetBalanceUsd,
+          appBalanceUsd,
           onContinue: handleSolanaAmountContinue,
           debug
         }
       ),
-      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx10(
+      effectiveStep.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx11(
         SolanaConfirmStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -5221,20 +5539,22 @@ function DepositFlow({
           targetToken,
           service,
           solanaProvider,
+          solanaConnection: reownWallet?.solanaConnection,
+          uiConfig,
           onConfirm: handleSolanaConfirmed,
           onError: handleError,
           debug
         }
-      ) : effectiveStep.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(
+      ) : effectiveStep.type === "solana-confirm" ? /* @__PURE__ */ jsxs11("div", { className: "rs-step", children: [
+        /* @__PURE__ */ jsxs11("div", { className: "rs-loading-state", children: [
+          /* @__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",
@@ -5244,22 +5564,22 @@ 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__ */ jsxs11("div", { className: "rs-loading-text", children: [
+            /* @__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: handleBack,
-            children: /* @__PURE__ */ jsx10("span", { children: "Go Back" })
+            children: /* @__PURE__ */ jsx11("span", { children: "Go Back" })
           }
         ) })
       ] }) : null,
-      effectiveStep.type === "processing" && /* @__PURE__ */ jsx10(
+      effectiveStep.type === "processing" && /* @__PURE__ */ jsx11(
         ProcessingStep,
         {
           smartAccount: effectiveStep.smartAccount,
@@ -5287,25 +5607,25 @@ 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;
+  const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? setupChainId;
   const getReadClientForChain = (chainId) => {
     if (signerContext.publicClient.chain?.id === chainId) {
       return signerContext.publicClient;
     }
     return getPublicClient(chainId);
   };
-  return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
-    effectiveStep.type === "setup" && /* @__PURE__ */ jsx10(
+  return /* @__PURE__ */ jsxs11("div", { className: "rs-modal-body", children: [
+    effectiveStep.type === "setup" && /* @__PURE__ */ jsx11(
       AccountPreparingSkeleton,
       {
         errorMessage: activeEntry.status === "error" ? activeEntry.message ?? void 0 : void 0,
         onRetry: activeEntry.status === "error" ? () => handleRetrySetup(ownerAddress) : void 0
       }
     ),
-    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "select-asset" && /* @__PURE__ */ jsx11(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -5323,7 +5643,7 @@ function DepositFlow({
         } : void 0
       }
     ),
-    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ jsx11(
       DappImportAssetSelectStep,
       {
         sourceLabel: activeDappImportAvailability.assets[0]?.sourceLabel ?? activeDappImportProvider.label,
@@ -5331,7 +5651,7 @@ function DepositFlow({
         onSelect: handleDappImportAssetSelected
       }
     ),
-    effectiveStep.type === "amount" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "amount" && /* @__PURE__ */ jsx11(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -5348,11 +5668,11 @@ function DepositFlow({
         targetChain,
         targetToken,
         uiConfig,
-        targetBalanceUsd,
+        appBalanceUsd,
         service,
         onContinue: handleAmountContinue,
         onCtaClick: (ctaName) => {
-          const receiveSymbol = getTokenSymbol(targetToken, targetChain);
+          const receiveSymbol = getTargetTokenSymbol(targetToken, targetChain);
           onEvent?.({
             type: "deposit_modal_connected_wallet_enter_value_cta_click",
             send_token: effectiveStep.asset.symbol,
@@ -5363,7 +5683,7 @@ function DepositFlow({
         }
       }
     ),
-    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "confirm" && /* @__PURE__ */ jsx11(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -5389,7 +5709,8 @@ function DepositFlow({
               ),
               recipient: effectiveStep.smartAccount,
               asset: effectiveStep.asset,
-              amount: amountUnits
+              amount: amountUnits,
+              backend: service
             }
           );
           return {
@@ -5402,7 +5723,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    effectiveStep.type === "processing" && /* @__PURE__ */ jsx10(
+    effectiveStep.type === "processing" && /* @__PURE__ */ jsx11(
       ProcessingStep,
       {
         smartAccount: effectiveStep.smartAccount,
@@ -5433,8 +5754,8 @@ function DepositFlow({
 }
 
 // src/components/history/DepositHistoryPanel.tsx
-import { useCallback as useCallback4, useState as useState10 } from "react";
-import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
+import { useCallback as useCallback5, useMemo as useMemo7, useState as useState10 } from "react";
+import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
 function shortenHash(hash) {
   if (hash.length <= 14) return hash;
   return `${hash.slice(0, 6)}\u2026${hash.slice(-4)}`;
@@ -5502,20 +5823,19 @@ function formatAmount(rawAmount, token, chainId) {
     const divisor = 10n ** BigInt(decimals);
     const whole = raw / divisor;
     const remainder = raw % divisor;
-    if (remainder === 0n) return whole.toString();
     const fracStr = remainder.toString().padStart(decimals, "0");
-    const trimmed = fracStr.slice(0, 6).replace(/0+$/, "");
-    if (!trimmed) return whole.toString();
-    return `${whole}.${trimmed}`;
+    let frac = fracStr.slice(0, 5).replace(/0+$/, "");
+    if (frac.length < 2) frac = frac.padEnd(2, "0");
+    return `${whole}.${frac}`;
   } catch {
     return rawAmount;
   }
 }
 function getTxExplorerUrl(txHash, chainId) {
   if (!chainId) return null;
-  const base = getExplorerUrl(chainId);
-  if (!base) return null;
-  return `${base}/tx/${txHash}`;
+  const base2 = getExplorerUrl(chainId);
+  if (!base2) return null;
+  return `${base2}/tx/${txHash}`;
 }
 function normalizeStatus(raw, isSpam) {
   const lower = raw.toLowerCase();
@@ -5545,7 +5865,7 @@ function DepositHistoryPanel({
   onClose,
   onCloseModal
 }) {
-  const handleKeyDown = useCallback4(
+  const handleKeyDown = useCallback5(
     (e) => {
       if (e.key === "Escape") {
         e.stopPropagation();
@@ -5554,7 +5874,15 @@ function DepositHistoryPanel({
     },
     [onClose]
   );
-  return /* @__PURE__ */ jsxs11(
+  const visibleDeposits = useMemo7(() => {
+    const sourceHashes = new Set(
+      deposits.map((d) => d.sourceTxHash?.toLowerCase()).filter((h) => Boolean(h))
+    );
+    return deposits.filter(
+      (d) => !(d.txHash && sourceHashes.has(d.txHash.toLowerCase()))
+    );
+  }, [deposits]);
+  return /* @__PURE__ */ jsxs12(
     "div",
     {
       className: "rs-history-panel",
@@ -5562,56 +5890,55 @@ function DepositHistoryPanel({
       "aria-label": "Deposit history",
       onKeyDown: handleKeyDown,
       children: [
-        /* @__PURE__ */ jsxs11("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx11("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx11(
+        /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx12("div", { className: "rs-modal-header-nav-left", children: /* @__PURE__ */ jsx12(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Back",
               onClick: onClose,
-              children: /* @__PURE__ */ jsx11(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx12(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsx11("div", { className: "rs-modal-header-nav-center" }),
-          /* @__PURE__ */ jsx11("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx11(
+          /* @__PURE__ */ jsx12("div", { className: "rs-modal-header-nav-right", children: onCloseModal && /* @__PURE__ */ jsx12(
             "button",
             {
               type: "button",
               className: "rs-modal-close",
               "aria-label": "Close",
               onClick: onCloseModal,
-              children: /* @__PURE__ */ jsx11(CloseIcon, {})
+              children: /* @__PURE__ */ jsx12(CloseIcon, {})
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsxs11("div", { className: "rs-history-screen", children: [
-          /* @__PURE__ */ jsxs11("div", { className: "rs-history-screen-body", children: [
-            /* @__PURE__ */ jsx11(BodyHeader, { icon: /* @__PURE__ */ jsx11(HistoryIcon, {}), title: "History" }),
-            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx11(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx11(Spinner, { className: "rs-spinner--sm" }),
-                /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
+        /* @__PURE__ */ jsxs12("div", { className: "rs-history-screen", children: [
+          /* @__PURE__ */ jsxs12("div", { className: "rs-history-screen-body", children: [
+            /* @__PURE__ */ jsx12(BodyHeader, { icon: /* @__PURE__ */ jsx12(HistoryIcon, {}), title: "History" }),
+            isLoading && deposits.length === 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx12(Spinner, { className: "rs-spinner--sm" }),
+                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-hint", children: "Loading history\u2026" })
               ] })
             ] }),
-            error && !isLoading && /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx11(AlertTriangleIcon, {}) }),
-              /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
-                /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-hint", children: error })
+            error && !isLoading && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(AlertTriangleIcon, {}) }),
+              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-title", children: "Couldn't load history" }),
+                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-hint", children: error })
               ] })
             ] }),
-            !isLoading && !error && deposits.length === 0 && /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty", children: [
-              /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx11(HistoryIcon, {}) }),
-              /* @__PURE__ */ jsxs11("div", { className: "rs-history-empty-text", children: [
-                /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
-                /* @__PURE__ */ jsx11("span", { className: "rs-history-empty-hint", children: "Your deposit history will appear here" })
+            !isLoading && !error && visibleDeposits.length === 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty", children: [
+              /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-glyph", "aria-hidden": "true", children: /* @__PURE__ */ jsx12(HistoryIcon, {}) }),
+              /* @__PURE__ */ jsxs12("div", { className: "rs-history-empty-text", children: [
+                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-title", children: "No deposits yet" }),
+                /* @__PURE__ */ jsx12("span", { className: "rs-history-empty-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(HistoryCard, { deposit }, deposit.txHash || i)),
-              hasMore && /* @__PURE__ */ jsx11(
+            visibleDeposits.length > 0 && /* @__PURE__ */ jsxs12("div", { className: "rs-history-list", children: [
+              visibleDeposits.map((deposit, i) => /* @__PURE__ */ jsx12(HistoryCard, { deposit }, deposit.txHash || i)),
+              hasMore && /* @__PURE__ */ jsx12(
                 "button",
                 {
                   type: "button",
@@ -5623,7 +5950,7 @@ function DepositHistoryPanel({
               )
             ] })
           ] }),
-          /* @__PURE__ */ jsx11(PoweredBy, {})
+          /* @__PURE__ */ jsx12(PoweredBy, {})
         ] })
       ]
     }
@@ -5640,15 +5967,16 @@ function HistoryCard({ deposit }) {
   const targetChainIcon = targetChainId ? getChainIcon(targetChainId) : void 0;
   const sourceSymbol = resolveTokenSymbol(deposit.token, sourceChainId);
   const sourceTokenIcon = sourceSymbol ? getTokenIcon(sourceSymbol) : void 0;
-  const rawAmount = deposit.sourceAmount ?? deposit.amount;
+  const rawAmount = deposit.sourceAmount && deposit.sourceAmount !== "0" ? deposit.sourceAmount : deposit.amount;
   const formattedAmount = rawAmount ? formatAmount(rawAmount, deposit.token, sourceChainId) : null;
   const displayAmount = formattedAmount ? sourceSymbol && /^USD/.test(sourceSymbol) ? `$${Number(formattedAmount).toLocaleString("en-US", {
+    minimumFractionDigits: 2,
     maximumFractionDigits: 2
   })}` : `${formattedAmount} ${sourceSymbol}` : "\u2014";
   const date = deposit.createdAt ? formatDate(deposit.createdAt) : null;
   const txTypeLabel = `Deposit${sourceSymbol ? ` ${sourceSymbol}` : ""}`;
   const srcTxUrl = deposit.sourceTxHash ? getTxExplorerUrl(deposit.sourceTxHash, sourceChainId) : null;
-  return /* @__PURE__ */ jsxs11(
+  return /* @__PURE__ */ jsxs12(
     "button",
     {
       type: "button",
@@ -5656,38 +5984,38 @@ function HistoryCard({ deposit }) {
       onClick: () => setExpanded((v) => !v),
       "aria-expanded": expanded,
       children: [
-        /* @__PURE__ */ jsxs11("div", { className: "rs-history-card-row", children: [
-          /* @__PURE__ */ jsxs11("div", { className: "rs-history-card-icons", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx11("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
-            sourceChainIcon && /* @__PURE__ */ jsx11("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx11("img", { src: sourceChainIcon, alt: "" }) })
+        /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-row", children: [
+          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-icons", children: [
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-token", children: sourceTokenIcon ? /* @__PURE__ */ jsx12("img", { src: sourceTokenIcon, alt: "" }) : sourceSymbol.slice(0, 2) }),
+            sourceChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-history-card-chain", children: /* @__PURE__ */ jsx12("img", { src: sourceChainIcon, alt: "" }) })
           ] }),
-          /* @__PURE__ */ jsxs11("div", { className: "rs-history-card-text", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-card-title", children: txTypeLabel }),
-            date && /* @__PURE__ */ jsx11("span", { className: "rs-history-card-date", children: date })
+          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-text", children: [
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-title", children: txTypeLabel }),
+            date && /* @__PURE__ */ jsx12("span", { className: "rs-history-card-date", children: date })
           ] }),
-          /* @__PURE__ */ jsxs11("div", { className: "rs-history-card-side", children: [
-            /* @__PURE__ */ jsx11("span", { className: "rs-history-card-amount", children: displayAmount }),
-            /* @__PURE__ */ jsx11("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
+          /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-side", children: [
+            /* @__PURE__ */ jsx12("span", { className: "rs-history-card-amount", children: displayAmount }),
+            /* @__PURE__ */ jsx12("span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        expanded && /* @__PURE__ */ jsxs11("div", { className: "rs-history-card-details", children: [
-          sourceChainName && /* @__PURE__ */ jsxs11("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx11("span", { children: "Source chain" }),
-            /* @__PURE__ */ jsxs11("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx11("span", { children: sourceChainName }),
-              sourceChainIcon && /* @__PURE__ */ jsx11("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx11("img", { src: sourceChainIcon, alt: "" }) })
+        expanded && /* @__PURE__ */ jsxs12("div", { className: "rs-history-card-details", children: [
+          sourceChainName && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx12("span", { children: "Source chain" }),
+            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx12("span", { children: sourceChainName }),
+              sourceChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx12("img", { src: sourceChainIcon, alt: "" }) })
             ] })
           ] }),
-          targetChainName && /* @__PURE__ */ jsxs11("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx11("span", { children: "Destination chain" }),
-            /* @__PURE__ */ jsxs11("span", { className: "rs-amount-detail-value", children: [
-              /* @__PURE__ */ jsx11("span", { children: targetChainName }),
-              targetChainIcon && /* @__PURE__ */ jsx11("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx11("img", { src: targetChainIcon, alt: "" }) })
+          targetChainName && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx12("span", { children: "Destination chain" }),
+            /* @__PURE__ */ jsxs12("span", { className: "rs-amount-detail-value", children: [
+              /* @__PURE__ */ jsx12("span", { children: targetChainName }),
+              targetChainIcon && /* @__PURE__ */ jsx12("span", { className: "rs-amount-detail-icon", children: /* @__PURE__ */ jsx12("img", { src: targetChainIcon, alt: "" }) })
             ] })
           ] }),
-          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs11("div", { className: "rs-amount-detail-row", children: [
-            /* @__PURE__ */ jsx11("span", { children: "Transaction details" }),
-            /* @__PURE__ */ jsxs11(
+          srcTxUrl && deposit.sourceTxHash && /* @__PURE__ */ jsxs12("div", { className: "rs-amount-detail-row", children: [
+            /* @__PURE__ */ jsx12("span", { children: "Transaction details" }),
+            /* @__PURE__ */ jsxs12(
               "a",
               {
                 href: srcTxUrl,
@@ -5696,8 +6024,8 @@ function HistoryCard({ deposit }) {
                 className: "rs-history-card-link",
                 onClick: (e) => e.stopPropagation(),
                 children: [
-                  /* @__PURE__ */ jsx11("span", { children: shortenHash(deposit.sourceTxHash) }),
-                  /* @__PURE__ */ jsx11(ArrowUpRightIcon, {})
+                  /* @__PURE__ */ jsx12("span", { children: shortenHash(deposit.sourceTxHash) }),
+                  /* @__PURE__ */ jsx12(ArrowUpRightIcon, {})
                 ]
               }
             )
@@ -5710,9 +6038,9 @@ function HistoryCard({ deposit }) {
 DepositHistoryPanel.displayName = "DepositHistoryPanel";
 
 // src/DepositModal.tsx
-import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
 var ReownDepositInner = lazy2(
-  () => import("./DepositModalReown-3VZ5AKV2.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-42D5V5II.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -5728,7 +6056,7 @@ function DepositModal(props) {
     "dappWalletClient"
   );
   if (needsReown) {
-    return /* @__PURE__ */ jsx12(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx12(
+    return /* @__PURE__ */ jsx13(Suspense2, { fallback: null, children: /* @__PURE__ */ jsx13(
       ReownDepositInner,
       {
         ...props,
@@ -5736,7 +6064,7 @@ function DepositModal(props) {
       }
     ) });
   }
-  return /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx13(
     DepositModalInner,
     {
       ...props,
@@ -5760,6 +6088,7 @@ function DepositModalInner({
   sourceToken,
   defaultAmount,
   recipient,
+  appBalanceUsd,
   backendUrl = DEFAULT_BACKEND_URL,
   solanaRpcUrl,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
@@ -5785,7 +6114,7 @@ function DepositModalInner({
   onError,
   debug
 }) {
-  const modalRef = useRef6(null);
+  const modalRef = useRef8(null);
   const onReadyRef = useLatestRef(onReady);
   const [currentScreen, setCurrentScreen] = useState11("connect");
   const [backHandler, setBackHandler] = useState11(
@@ -5799,19 +6128,19 @@ function DepositModalInner({
   const [historyLoading, setHistoryLoading] = useState11(false);
   const [historyLoadingMore, setHistoryLoadingMore] = useState11(false);
   const [historyError, setHistoryError] = useState11(null);
-  const cursorRef = useRef6(null);
-  const historyStaleRef = useRef6(false);
-  const historyLoadedRef = useRef6(false);
-  const targetChain = getChainId(targetChainProp);
+  const cursorRef = useRef8(null);
+  const historyStaleRef = useRef8(false);
+  const historyLoadedRef = useRef8(false);
+  const targetChain = targetChainProp === "solana" ? "solana" : getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
-  const service = useMemo7(
+  const service = useMemo8(
     () => createDepositService(backendUrl, {
       debug,
       debugScope: "service:deposit"
     }),
     [backendUrl, debug]
   );
-  const store = useMemo7(
+  const store = useMemo8(
     () => createDepositStore({ targetChain, targetToken }),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []
@@ -5832,14 +6161,14 @@ function DepositModalInner({
       onReadyRef.current?.();
     }
   }, [isOpen, onReadyRef]);
-  const handleStepChange = useCallback5(
+  const handleStepChange = useCallback6(
     (onBack, screen) => {
       setBackHandler(() => onBack);
       if (screen) setCurrentScreen(screen);
     },
     []
   );
-  const fetchHistory = useCallback5(
+  const fetchHistory = useCallback6(
     async (mode = "initial") => {
       if (!recipient) return;
       const isInitial = mode === "initial";
@@ -5887,26 +6216,26 @@ function DepositModalInner({
     },
     [recipient, service]
   );
-  const handleHistoryOpen = useCallback5(() => {
+  const handleHistoryOpen = useCallback6(() => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
       fetchHistory("initial");
     }
   }, [fetchHistory]);
-  const handleHistoryClose = useCallback5(() => {
+  const handleHistoryClose = useCallback6(() => {
     setHistoryOpen(false);
   }, []);
-  const handleHistoryLoadMore = useCallback5(() => {
+  const handleHistoryLoadMore = useCallback6(() => {
     fetchHistory("more");
   }, [fetchHistory]);
-  const markHistoryStale = useCallback5(() => {
+  const markHistoryStale = useCallback6(() => {
     historyStaleRef.current = true;
     if (historyOpen) {
       fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
   const onLifecycleRef = useLatestRef(onLifecycle);
-  const handleLifecycle = useCallback5(
+  const handleLifecycle = useCallback6(
     (event) => {
       onLifecycleRef.current?.(event);
       if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
@@ -5936,7 +6265,7 @@ function DepositModalInner({
   }, [isOpen, store]);
   const showBackButton = uiConfig?.showBackButton ?? true;
   const canGoBack = backHandler !== void 0;
-  return /* @__PURE__ */ jsx12(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx12(
+  return /* @__PURE__ */ jsx13(DepositStoreProvider, { store, children: /* @__PURE__ */ jsx13(
     Modal,
     {
       isOpen,
@@ -5944,20 +6273,20 @@ function DepositModalInner({
       className,
       inline,
       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 && backHandler && /* @__PURE__ */ jsx12(
+      children: /* @__PURE__ */ jsxs13("div", { ref: modalRef, className: "rs-modal", children: [
+        /* @__PURE__ */ jsxs13("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx13("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && backHandler && /* @__PURE__ */ jsx13(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ jsx12(ChevronLeftIcon, {})
+              children: /* @__PURE__ */ jsx13(ChevronLeftIcon, {})
             }
           ) }),
-          /* @__PURE__ */ jsxs12("div", { className: "rs-modal-header-nav-right", children: [
-            historyButtonVisible && /* @__PURE__ */ jsx12(
+          /* @__PURE__ */ jsxs13("div", { className: "rs-modal-header-nav-right", children: [
+            historyButtonVisible && /* @__PURE__ */ jsx13(
               "button",
               {
                 type: "button",
@@ -5965,22 +6294,22 @@ function DepositModalInner({
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
                 disabled: !recipient,
-                children: /* @__PURE__ */ jsx12(HistoryIcon, {})
+                children: /* @__PURE__ */ jsx13(HistoryIcon, {})
               }
             ),
-            /* @__PURE__ */ jsx12(
+            /* @__PURE__ */ jsx13(
               "button",
               {
                 type: "button",
                 onClick: onClose,
                 className: "rs-modal-close",
                 "aria-label": "Close",
-                children: /* @__PURE__ */ jsx12(CloseIcon, {})
+                children: /* @__PURE__ */ jsx13(CloseIcon, {})
               }
             )
           ] })
         ] }),
-        /* @__PURE__ */ jsx12(
+        /* @__PURE__ */ jsx13(
           DepositFlow,
           {
             dappWalletClient,
@@ -5994,6 +6323,7 @@ function DepositModalInner({
             sourceToken,
             amount: defaultAmount,
             recipient,
+            appBalanceUsd,
             postBridgeActions,
             outputTokenRules,
             rejectUnmapped,
@@ -6017,7 +6347,7 @@ function DepositModalInner({
             debug
           }
         ),
-        showHistoryButton && historyOpen && /* @__PURE__ */ jsx12(
+        showHistoryButton && historyOpen && /* @__PURE__ */ jsx13(
           DepositHistoryPanel,
           {
             deposits: historyDeposits,