@rhinestone/deposit-modal 0.3.0-alpha.10 → 0.3.0-alpha.12

package/dist/{chunk-HUPEN2T5.cjs → chunk-I5G5ULRP.cjs}

@@ -1376,14 +1376,15 @@ function getDepositEventDetails(event) {
       ...solanaMeta
     };
   }
-  if (event.type === "bridge-started") {
-    const source = isRecord(event.data.source) ? event.data.source : void 0;
-    const chainId = asChainId(_optionalChain([source, 'optionalAccess', _48 => _48.chain]));
-    const token = asString(_optionalChain([source, 'optionalAccess', _49 => _49.asset]));
+  const source = isRecord(event.data.source) ? event.data.source : void 0;
+  const deposit = isRecord(event.data.deposit) ? event.data.deposit : void 0;
+  if (source || deposit) {
+    const chainId = _nullishCoalesce(asChainId(_optionalChain([source, 'optionalAccess', _48 => _48.chain])), () => ( asChainId(_optionalChain([deposit, 'optionalAccess', _49 => _49.chain]))));
+    const token = _nullishCoalesce(_nullishCoalesce(asString(_optionalChain([source, 'optionalAccess', _50 => _50.asset])), () => ( asString(_optionalChain([deposit, 'optionalAccess', _51 => _51.asset])))), () => ( asString(_optionalChain([deposit, 'optionalAccess', _52 => _52.token]))));
     const solanaMeta = chainId === "solana" ? resolveSolanaTokenMeta(token) : {};
     return {
       chainId,
-      amount: asAmount(_optionalChain([source, 'optionalAccess', _50 => _50.amount])),
+      amount: _nullishCoalesce(asAmount(_optionalChain([source, 'optionalAccess', _53 => _53.amount])), () => ( asAmount(_optionalChain([deposit, 'optionalAccess', _54 => _54.amount])))),
       token,
       ...solanaMeta
     };
@@ -1420,12 +1421,12 @@ function DepositAddressStep({
 }) {
   const hasSolana = Boolean(solanaDepositAddress);
   const allowedChainSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _51 => _51.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _52 => _52.sourceChains])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _55 => _55.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _56 => _56.sourceChains])]
   );
   const allowedTokenSet = _react.useMemo.call(void 0, 
-    () => _optionalChain([allowedRoutes, 'optionalAccess', _53 => _53.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
-    [_optionalChain([allowedRoutes, 'optionalAccess', _54 => _54.sourceTokens])]
+    () => _optionalChain([allowedRoutes, 'optionalAccess', _57 => _57.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null,
+    [_optionalChain([allowedRoutes, 'optionalAccess', _58 => _58.sourceTokens])]
   );
   const evmChainIds = _react.useMemo.call(void 0, () => {
     const all = _chunk7JIDIX27cjs.getSupportedChainIds.call(void 0, );
@@ -1437,8 +1438,8 @@ function DepositAddressStep({
     options.splice(1, 0, "solana");
     return options;
   }, [evmChainIds, hasSolana]);
-  const BASE_CHAIN_ID = 8453;
-  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
+  const BASE_CHAIN_ID2 = 8453;
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID2) ? BASE_CHAIN_ID2 : evmChainIds[0];
   const [sourceChainId, setSourceChainId] = _react.useState.call(void 0, defaultChainId);
   const isSolana = sourceChainId === "solana";
   const tokensForChain = _react.useMemo.call(void 0, 
@@ -1517,8 +1518,8 @@ function DepositAddressStep({
     function handlePointerDown(event) {
       const target = event.target;
       if (!target) return;
-      const clickedChainDropdown = _optionalChain([chainDropdownRef, 'access', _55 => _55.current, 'optionalAccess', _56 => _56.contains, 'call', _57 => _57(target)]);
-      const clickedTokenDropdown = _optionalChain([tokenDropdownRef, 'access', _58 => _58.current, 'optionalAccess', _59 => _59.contains, 'call', _60 => _60(target)]);
+      const clickedChainDropdown = _optionalChain([chainDropdownRef, 'access', _59 => _59.current, 'optionalAccess', _60 => _60.contains, 'call', _61 => _61(target)]);
+      const clickedTokenDropdown = _optionalChain([tokenDropdownRef, 'access', _62 => _62.current, 'optionalAccess', _63 => _63.contains, 'call', _64 => _64(target)]);
       if (clickedChainDropdown || clickedTokenDropdown) return;
       setChainDropdownOpen(false);
       setTokenDropdownOpen(false);
@@ -1532,7 +1533,7 @@ function DepositAddressStep({
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = _react.useCallback.call(void 0, async () => {
     if (isUpdating) return;
-    _optionalChain([onCopyAddress, 'optionalCall', _61 => _61()]);
+    _optionalChain([onCopyAddress, 'optionalCall', _65 => _65()]);
     try {
       await navigator.clipboard.writeText(displayAddress);
       setCopied(true);
@@ -1643,7 +1644,7 @@ function DepositAddressStep({
             directTransfer
           };
           setNotifications((prev) => [notification, ...prev]);
-          _optionalChain([onDepositSubmittedRef, 'access', _62 => _62.current, 'optionalCall', _63 => _63({
+          _optionalChain([onDepositSubmittedRef, 'access', _66 => _66.current, 'optionalCall', _67 => _67({
             txHash: eventTxHash,
             sourceChain: chainId,
             amount
@@ -1654,7 +1655,7 @@ function DepositAddressStep({
         if (!cancelled) {
           const msg = err instanceof Error ? err.message : "Failed to check status";
           setPollingError(msg);
-          _optionalChain([onErrorRef, 'access', _64 => _64.current, 'optionalCall', _65 => _65(msg, "STATUS_POLL_ERROR")]);
+          _optionalChain([onErrorRef, 'access', _68 => _68.current, 'optionalCall', _69 => _69(msg, "STATUS_POLL_ERROR")]);
         }
       }
       if (!cancelled) {
@@ -1670,14 +1671,14 @@ function DepositAddressStep({
   const handleNotificationComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash, context) => {
       isTrackingRef.current = false;
-      _optionalChain([onDepositCompleteRef, 'access', _66 => _66.current, 'optionalCall', _67 => _67(txHash, destinationTxHash, context)]);
+      _optionalChain([onDepositCompleteRef, 'access', _70 => _70.current, 'optionalCall', _71 => _71(txHash, destinationTxHash, context)]);
     },
     []
   );
   const handleNotificationFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       isTrackingRef.current = false;
-      _optionalChain([onDepositFailedRef, 'access', _68 => _68.current, 'optionalCall', _69 => _69(txHash, error)]);
+      _optionalChain([onDepositFailedRef, 'access', _72 => _72.current, 'optionalCall', _73 => _73(txHash, error)]);
     },
     []
   );
@@ -1741,7 +1742,7 @@ function DepositAddressStep({
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Supported token" }),
             /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-deposit-address-min", children: [
               "Min.$",
-              (_nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _70 => _70.minDepositUsd]), () => ( 0.1))).toFixed(2),
+              (_nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _74 => _74.minDepositUsd]), () => ( 0.1))).toFixed(2),
               /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                 _chunk2TWQGPPBcjs.InfoIcon,
                 {
@@ -1947,6 +1948,129 @@ function DepositAddressStep({
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
+// src/components/steps/DepositAddressSkeleton.tsx
+
+var BASE_CHAIN_ID = 8453;
+function DepositAddressSkeleton({
+  uiConfig,
+  allowedRoutes
+}) {
+  const allowedChainSet = _optionalChain([allowedRoutes, 'optionalAccess', _75 => _75.sourceChains]) ? new Set(allowedRoutes.sourceChains) : null;
+  const allowedTokenSet = _optionalChain([allowedRoutes, 'optionalAccess', _76 => _76.sourceTokens]) ? new Set(allowedRoutes.sourceTokens.map((s) => s.toUpperCase())) : null;
+  const evmChainIds = (() => {
+    const all = _chunk7JIDIX27cjs.getSupportedChainIds.call(void 0, );
+    return allowedChainSet ? all.filter((id) => allowedChainSet.has(id)) : all;
+  })();
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
+  const tokensForChain = (() => {
+    const all = _chunk7JIDIX27cjs.getTargetTokenSymbolsForChain.call(void 0, defaultChainId);
+    return allowedTokenSet ? all.filter((s) => allowedTokenSet.has(s.toUpperCase())) : all;
+  })();
+  const defaultToken = tokensForChain.includes("USDC") ? "USDC" : _nullishCoalesce(tokensForChain[0], () => ( "USDC"));
+  const chainName = _chunk7JIDIX27cjs.getChainName.call(void 0, defaultChainId);
+  const chainIcon = _chunk7JIDIX27cjs.getChainIcon.call(void 0, defaultChainId);
+  const tokenIcon = _chunk7JIDIX27cjs.getTokenIcon.call(void 0, defaultToken);
+  return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", "aria-busy": "true", children: [
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-sr-only", role: "status", children: "Preparing deposit details\u2026" }),
+    /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body", children: [
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.TransferCryptoIcon, {}), title: "Transfer crypto" }),
+      /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-selectors", "aria-hidden": "true", children: [
+        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+          /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            chainIcon && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+              "img",
+              {
+                src: chainIcon,
+                alt: "",
+                className: "rs-deposit-address-dropdown-icon"
+              }
+            ),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: chainName }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+          ] })
+        ] }),
+        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown", children: [
+          /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown-label rs-deposit-address-dropdown-label--with-min", children: [
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Supported token" }),
+            /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-deposit-address-min", children: [
+              "Min.$",
+              (_nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _77 => _77.minDepositUsd]), () => ( 0.1))).toFixed(2),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.Tooltip, { content: "Minimum deposit amount required for the selected chain.", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                _chunk2TWQGPPBcjs.InfoIcon,
+                {
+                  className: "rs-deposit-address-min-icon",
+                  "aria-hidden": "true"
+                }
+              ) })
+            ] })
+          ] }),
+          /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-dropdown-trigger", children: [
+            tokenIcon && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+              "img",
+              {
+                src: tokenIcon,
+                alt: "",
+                className: "rs-deposit-address-dropdown-icon"
+              }
+            ),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: defaultToken }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.ChevronDownIcon, { className: "rs-deposit-address-dropdown-chevron" })
+          ] })
+        ] })
+      ] }),
+      /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+        "div",
+        {
+          style: { display: "flex", flexDirection: "column", gap: 4, width: "100%" },
+          children: [
+            /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-well", children: [
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-skeleton rs-skeleton-qr", "aria-hidden": "true" }) }),
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-skeleton rs-skeleton-address", "aria-hidden": "true" })
+            ] }),
+            /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+              "button",
+              {
+                type: "button",
+                className: "rs-deposit-address-copy",
+                disabled: true,
+                "aria-hidden": "true",
+                children: [
+                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.CopyIcon, {}),
+                  "Copy address"
+                ]
+              }
+            )
+          ]
+        }
+      ),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-price-impact", "aria-hidden": "true", children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-price-impact-header", children: [
+        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-price-impact-header-left", children: [
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-label", children: "Price impact" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-price-impact-label", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "strong", { children: "0.00%" }) }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+            _chunk2TWQGPPBcjs.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__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.InfoIcon, { "aria-hidden": "true" })
+            }
+          )
+        ] }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+          _chunk2TWQGPPBcjs.ChevronDownIcon,
+          {
+            className: "rs-price-impact-chevron",
+            "aria-hidden": "true"
+          }
+        )
+      ] }) })
+    ] }),
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk2TWQGPPBcjs.PoweredBy, {})
+  ] });
+}
+DepositAddressSkeleton.displayName = "DepositAddressSkeleton";
+
 // src/components/steps/SolanaTokenSelectStep.tsx
 
 
@@ -2027,7 +2151,7 @@ function SolanaTokenSelectStep({
       setTokenBalances(results);
       setLoading(false);
       const totalUsd = results.reduce((sum, r) => sum + r.balanceUsd, 0);
-      _optionalChain([onTotalBalanceComputed, 'optionalCall', _71 => _71(totalUsd)]);
+      _optionalChain([onTotalBalanceComputed, 'optionalCall', _78 => _78(totalUsd)]);
     }
     void loadBalances();
     return () => {
@@ -2173,7 +2297,7 @@ function SolanaAmountStep({
   const [error, setError] = _react.useState.call(void 0, null);
   const hasAppliedDefaultRef = _react.useRef.call(void 0, false);
   const isSourceStablecoin = _chunk7JIDIX27cjs.isStablecoinSymbol.call(void 0, token.symbol);
-  const isMaxDefault = _optionalChain([defaultAmount, 'optionalAccess', _72 => _72.trim, 'call', _73 => _73(), 'access', _74 => _74.toLowerCase, 'call', _75 => _75()]) === "max";
+  const isMaxDefault = _optionalChain([defaultAmount, 'optionalAccess', _79 => _79.trim, 'call', _80 => _80(), 'access', _81 => _81.toLowerCase, 'call', _82 => _82()]) === "max";
   const tokenPriceUsd = _react.useMemo.call(void 0, () => {
     if (isSourceStablecoin) return 1;
     try {
@@ -2275,8 +2399,8 @@ function SolanaAmountStep({
       return null;
     }
   }, [numericAmount, isSourceStablecoin, hasPricing, tokenPriceUsd, token.decimals]);
-  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _76 => _76.minDepositUsd]), () => ( null));
-  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _77 => _77.maxDepositUsd]), () => ( null));
+  const minDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _83 => _83.minDepositUsd]), () => ( null));
+  const maxDepositUsd = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _84 => _84.maxDepositUsd]), () => ( null));
   const isBelowMin = minDepositUsd !== null && numericAmount > 0 && numericAmount < minDepositUsd;
   const isAboveMax = maxDepositUsd !== null && numericAmount > maxDepositUsd;
   const exceedsBalance = Boolean(
@@ -2453,7 +2577,7 @@ var DEFAULT_SOLANA_RPC_URL = "https://api.mainnet.solana.com";
 var configuredSolanaRpcUrl = null;
 var cachedConnections = /* @__PURE__ */ new Map();
 function configureSolanaRpcUrl(rpcUrl) {
-  const normalized = _optionalChain([rpcUrl, 'optionalAccess', _78 => _78.trim, 'call', _79 => _79()]);
+  const normalized = _optionalChain([rpcUrl, 'optionalAccess', _85 => _85.trim, 'call', _86 => _86()]);
   configuredSolanaRpcUrl = normalized ? normalized : null;
   cachedConnections.clear();
 }
@@ -2573,8 +2697,8 @@ function SolanaConfirmStep({
   const targetChainIcon = _chunk7JIDIX27cjs.getChainIcon.call(void 0, targetChain);
   const sourceTokenIcon = _chunk7JIDIX27cjs.getTokenIcon.call(void 0, token.symbol);
   const targetTokenIcon = _chunk7JIDIX27cjs.getTokenIcon.call(void 0, targetSymbol);
-  const feeSponsored = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _80 => _80.feeSponsored]), () => ( false));
-  const feeTooltip = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _81 => _81.feeTooltip]), () => ( (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.")));
+  const feeSponsored = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _87 => _87.feeSponsored]), () => ( false));
+  const feeTooltip = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _88 => _88.feeTooltip]), () => ( (feeSponsored ? "Network fees are sponsored for this deposit." : "Network fees apply.")));
   const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", {
     minimumFractionDigits: 2,
     maximumFractionDigits: 6
@@ -2656,7 +2780,7 @@ function SolanaConfirmStep({
       _chunk2TWQGPPBcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
         token: token.symbol,
         instructionCount: transaction.instructions.length,
-        feePayer: _optionalChain([transaction, 'access', _82 => _82.feePayer, 'optionalAccess', _83 => _83.toBase58, 'call', _84 => _84()]),
+        feePayer: _optionalChain([transaction, 'access', _89 => _89.feePayer, 'optionalAccess', _90 => _90.toBase58, 'call', _91 => _91()]),
         recentBlockhash: transaction.recentBlockhash
       });
       const txHash = await sendSolanaTransaction(
@@ -2678,7 +2802,7 @@ function SolanaConfirmStep({
         sourceAmount
       });
       setError(message);
-      _optionalChain([onError, 'optionalCall', _85 => _85(message, "SOLANA_TRANSFER_ERROR")]);
+      _optionalChain([onError, 'optionalCall', _92 => _92(message, "SOLANA_TRANSFER_ERROR")]);
     } finally {
       setIsSubmitting(false);
     }
@@ -3221,21 +3345,21 @@ var polymarketProvider = {
   async fetchAvailability({ eoa, getPublicClient: getPublicClient2, signal }) {
     const proxyWallet = await fetchPolymarketProxyWallet(eoa, signal);
     if (!proxyWallet) return null;
-    if (_optionalChain([signal, 'optionalAccess', _86 => _86.aborted])) return null;
+    if (_optionalChain([signal, 'optionalAccess', _93 => _93.aborted])) return null;
     const polygonClient = getPublicClient2(POLYMARKET_POLYGON_CHAIN_ID);
     if (!polygonClient) return null;
     const balances = await readPolymarketBalances({
       publicClient: polygonClient,
       proxyWallet
     });
-    if (_optionalChain([signal, 'optionalAccess', _87 => _87.aborted])) return null;
+    if (_optionalChain([signal, 'optionalAccess', _94 => _94.aborted])) return null;
     if (balances.pusd === 0n && balances.usdce === 0n) return null;
     const walletKind = await detectPolymarketWalletKind({
       publicClient: polygonClient,
       proxyWallet,
       eoa
     });
-    if (_optionalChain([signal, 'optionalAccess', _88 => _88.aborted])) return null;
+    if (_optionalChain([signal, 'optionalAccess', _95 => _95.aborted])) return null;
     if (!walletKind) return null;
     const assets = [];
     if (balances.pusd > 0n) {
@@ -3399,6 +3523,7 @@ function applyBack(state, hasWalletOptions) {
           targetAmount: null,
           targetTokenPriceUsd: null,
           balance: null,
+          inputAmountUsd: null,
           liquidityWarning: null
         },
         flow: {
@@ -3598,12 +3723,12 @@ function applyAction(state, action) {
         requestKey: action.requestKey,
         cacheKey: action.cacheKey,
         status: "loading",
-        smartAccount: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _89 => _89.smartAccount]), () => ( null)),
-        sessionOwnerAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _90 => _90.sessionOwnerAddress]), () => ( null)),
-        solanaDepositAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _91 => _91.solanaDepositAddress]), () => ( null)),
+        smartAccount: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _96 => _96.smartAccount]), () => ( null)),
+        sessionOwnerAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _97 => _97.sessionOwnerAddress]), () => ( null)),
+        solanaDepositAddress: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _98 => _98.solanaDepositAddress]), () => ( null)),
         message: null,
         cacheable: action.cacheable,
-        attemptNonce: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _92 => _92.attemptNonce]), () => ( 0))
+        attemptNonce: _nullishCoalesce(_optionalChain([existing, 'optionalAccess', _99 => _99.attemptNonce]), () => ( 0))
       }));
     }
     case "setup/ready": {
@@ -3654,7 +3779,11 @@ function applyAction(state, action) {
           selectedAsset: action.asset,
           // Seed the user-facing amount input with the modal's defaultAmount
           // on first visit. Subsequent visits override via amount/entered.
-          amount: _nullishCoalesce(action.seedAmount, () => ( state.deposit.amount))
+          // `inputAmountUsd` is the USD-style value the input shows; it (not
+          // the native `amount`) is what re-seeds the input on back, so seed
+          // it here too and reset it on a fresh pick.
+          amount: _nullishCoalesce(action.seedAmount, () => ( state.deposit.amount)),
+          inputAmountUsd: _nullishCoalesce(action.seedAmount, () => ( null))
         },
         flow: { ...state.flow, step: "amount" }
       };
@@ -3667,6 +3796,11 @@ function applyAction(state, action) {
           targetAmount: action.targetAmount,
           targetTokenPriceUsd: action.targetTokenPriceUsd,
           balance: _nullishCoalesce(action.balance, () => ( null)),
+          // `targetAmount` is the USD-style value the user typed. Preserve it
+          // as `inputAmountUsd` so back-from-confirm re-seeds the input with
+          // the typed USD value rather than the converted native `amount`
+          // (which corrupts the input for non-stablecoin priced tokens).
+          inputAmountUsd: action.targetAmount,
           liquidityWarning: _nullishCoalesce(action.liquidityWarning, () => ( null))
         },
         flow: { ...state.flow, step: "confirm" }
@@ -4015,14 +4149,14 @@ function computeCacheKey(input, sessionOwnerAddress) {
   });
 }
 function computeIsCacheable(input) {
-  return !input.forceRegister && !(_nullishCoalesce(_optionalChain([input, 'access', _93 => _93.postBridgeActions, 'optionalAccess', _94 => _94.length]), () => ( 0)));
+  return !input.forceRegister && !(_nullishCoalesce(_optionalChain([input, 'access', _100 => _100.postBridgeActions, 'optionalAccess', _101 => _101.length]), () => ( 0)));
 }
 var SETUP_REQUEST_DEDUPE_TTL_MS = 3e4;
 var setupRequestDedupe = /* @__PURE__ */ new Map();
 function readDedupedAccountSetupResult(requestKey) {
   const now = Date.now();
   const existing = setupRequestDedupe.get(requestKey);
-  if (_optionalChain([existing, 'optionalAccess', _95 => _95.settled]) && existing.expiresAt > now && existing.result) {
+  if (_optionalChain([existing, 'optionalAccess', _102 => _102.settled]) && existing.expiresAt > now && existing.result) {
     return existing.result;
   }
   return null;
@@ -4036,7 +4170,7 @@ async function runAccountSetup(input, deps) {
     _chunk2TWQGPPBcjs.debugLog.call(void 0, debug, "account-setup", "setup:start", {
       owner: input.ownerAddress,
       sessionOwner: sessionOwner.address,
-      hasPostBridgeActions: Boolean(_optionalChain([input, 'access', _96 => _96.postBridgeActions, 'optionalAccess', _97 => _97.length])),
+      hasPostBridgeActions: Boolean(_optionalChain([input, 'access', _103 => _103.postBridgeActions, 'optionalAccess', _104 => _104.length])),
       forceRegister: _nullishCoalesce(input.forceRegister, () => ( false))
     });
     const setup = await service.setupAccount({
@@ -4098,10 +4232,10 @@ async function runAccountSetup(input, deps) {
         chain: _chunk2TWQGPPBcjs.targetChainToCaip2.call(void 0, input.targetChain),
         token: input.targetToken,
         ...input.recipient && { recipient: input.recipient },
-        ..._optionalChain([input, 'access', _98 => _98.postBridgeActions, 'optionalAccess', _99 => _99.length]) && {
+        ..._optionalChain([input, 'access', _105 => _105.postBridgeActions, 'optionalAccess', _106 => _106.length]) && {
           postBridgeActions: input.postBridgeActions
         },
-        ..._optionalChain([input, 'access', _100 => _100.outputTokenRules, 'optionalAccess', _101 => _101.length]) && {
+        ..._optionalChain([input, 'access', _107 => _107.outputTokenRules, 'optionalAccess', _108 => _108.length]) && {
           outputTokenRules: input.outputTokenRules
         },
         ...input.rejectUnmapped != null && {
@@ -4243,7 +4377,9 @@ function deriveStep(flow, d, p, activeEntry) {
         type: "amount",
         smartAccount,
         asset: d.selectedAsset,
-        amount: _nullishCoalesce(d.amount, () => ( void 0))
+        // Seed the input from the USD-style value the user typed, not the
+        // native source `amount` (which would corrupt the input on back).
+        inputAmountUsd: _nullishCoalesce(d.inputAmountUsd, () => ( void 0))
       };
     case "confirm":
       if (!smartAccount || !d.selectedAsset || !d.amount || !d.targetAmount) {
@@ -4368,7 +4504,7 @@ function DepositFlow({
   const onLifecycleRef = _chunk2TWQGPPBcjs.useLatestRef.call(void 0, onLifecycle);
   const onErrorRef = _chunk2TWQGPPBcjs.useLatestRef.call(void 0, onError);
   const hasInitialReownSession = Boolean(
-    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _102 => _102.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _103 => _103.address]) : _optionalChain([reownWallet, 'optionalAccess', _104 => _104.address])
+    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _109 => _109.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _110 => _110.address]) : _optionalChain([reownWallet, 'optionalAccess', _111 => _111.address])
   );
   const hasInitialWalletHydrationPending = Boolean(
     dappAddress && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasInitialReownSession && !reownWallet.isReady)
@@ -4418,12 +4554,12 @@ function DepositFlow({
     return null;
   }, []);
   const dappSwitchChain = _react.useMemo.call(void 0, () => {
-    if (!_optionalChain([dappWalletClient, 'optionalAccess', _105 => _105.switchChain])) return void 0;
+    if (!_optionalChain([dappWalletClient, 'optionalAccess', _112 => _112.switchChain])) return void 0;
     return async (chainId) => {
-      await _optionalChain([dappWalletClient, 'access', _106 => _106.switchChain, 'optionalCall', _107 => _107({ id: chainId })]);
+      await _optionalChain([dappWalletClient, 'access', _113 => _113.switchChain, 'optionalCall', _114 => _114({ id: chainId })]);
     };
   }, [dappWalletClient]);
-  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _108 => _108.account, 'optionalAccess', _109 => _109.address]), () => ( null));
+  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _115 => _115.account, 'optionalAccess', _116 => _116.address]), () => ( null));
   const walletOptions = _react.useMemo.call(void 0, () => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
@@ -4437,7 +4573,7 @@ function DepositFlow({
       });
       seen.add(id);
     }
-    if (enableSolana && _optionalChain([reownWallet, 'optionalAccess', _110 => _110.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
+    if (enableSolana && _optionalChain([reownWallet, 'optionalAccess', _117 => _117.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
       const id = _nullishCoalesce(reownWallet.caipAddress, () => ( `solana:${reownWallet.solanaAddress}`));
       if (!seen.has(id)) {
         options.push({
@@ -4449,7 +4585,7 @@ function DepositFlow({
         });
         seen.add(id);
       }
-    } else if (_optionalChain([reownWallet, 'optionalAccess', _111 => _111.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
+    } else if (_optionalChain([reownWallet, 'optionalAccess', _118 => _118.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
       const id = `evm:${reownWallet.address.toLowerCase()}`;
       if (!seen.has(id)) {
         options.push({
@@ -4466,20 +4602,20 @@ function DepositFlow({
   }, [
     connectedWalletAddress,
     dappAddress,
-    _optionalChain([reownWallet, 'optionalAccess', _112 => _112.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _113 => _113.isConnected]),
-    _optionalChain([reownWallet, 'optionalAccess', _114 => _114.walletClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _115 => _115.publicClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _116 => _116.icon]),
+    _optionalChain([reownWallet, 'optionalAccess', _119 => _119.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _120 => _120.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _121 => _121.walletClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _122 => _122.publicClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _123 => _123.icon]),
     enableSolana,
-    _optionalChain([reownWallet, 'optionalAccess', _117 => _117.isSolana]),
-    _optionalChain([reownWallet, 'optionalAccess', _118 => _118.solanaAddress]),
-    _optionalChain([reownWallet, 'optionalAccess', _119 => _119.caipAddress])
+    _optionalChain([reownWallet, 'optionalAccess', _124 => _124.isSolana]),
+    _optionalChain([reownWallet, 'optionalAccess', _125 => _125.solanaAddress]),
+    _optionalChain([reownWallet, 'optionalAccess', _126 => _126.caipAddress])
   ]);
-  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _120 => _120.account]) && dappAddress && !reownWallet;
+  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _127 => _127.account]) && dappAddress && !reownWallet;
   const hasWalletOptions = walletOptions.length > 0;
   const hasReownSession = Boolean(
-    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _121 => _121.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _122 => _122.address]) : _optionalChain([reownWallet, 'optionalAccess', _123 => _123.address])
+    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _128 => _128.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _129 => _129.address]) : _optionalChain([reownWallet, 'optionalAccess', _130 => _130.address])
   );
   const isWalletHydrationPending = Boolean(
     dappAddress && !hasWalletOptions && (hasDappWalletClientProp && dappWalletClient === void 0 || reownWallet && !hasReownSession && !reownWallet.isReady)
@@ -4543,7 +4679,7 @@ function DepositFlow({
       };
     }
     if (canAutoLock) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _124 => _124.chain, 'optionalAccess', _125 => _125.id]), () => ( setupChainId));
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _131 => _131.chain, 'optionalAccess', _132 => _132.id]), () => ( setupChainId));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -4565,8 +4701,8 @@ function DepositFlow({
         switchChain: void 0
       };
     }
-    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _126 => _126.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _127 => _127.chain, 'optionalAccess', _128 => _128.id]), () => ( setupChainId));
+    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _133 => _133.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _134 => _134.chain, 'optionalAccess', _135 => _135.id]), () => ( setupChainId));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -4574,7 +4710,7 @@ function DepositFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _129 => _129.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _136 => _136.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -4641,37 +4777,37 @@ function DepositFlow({
   const selectedEvmWalletOwner = _react.useMemo.call(void 0, () => {
     if (!selectedWalletId) return null;
     const opt = walletOptions.find((o) => o.id === selectedWalletId);
-    if (_optionalChain([opt, 'optionalAccess', _130 => _130.kind]) === "external" && opt.address) {
+    if (_optionalChain([opt, 'optionalAccess', _137 => _137.kind]) === "external" && opt.address) {
       return opt.address;
     }
-    if (_optionalChain([opt, 'optionalAccess', _131 => _131.kind]) === "connected" && opt.address) {
+    if (_optionalChain([opt, 'optionalAccess', _138 => _138.kind]) === "connected" && opt.address) {
       return opt.address;
     }
     return null;
   }, [selectedWalletId, walletOptions]);
   const dappImportOwner = _react.useMemo.call(void 0, () => {
     if (selectedEvmWalletOwner) return selectedEvmWalletOwner;
-    if (_optionalChain([reownWallet, 'optionalAccess', _132 => _132.address]) && reownWallet.isConnected) {
+    if (_optionalChain([reownWallet, 'optionalAccess', _139 => _139.address]) && reownWallet.isConnected) {
       return reownWallet.address;
     }
     if (connectedWalletAddress) return connectedWalletAddress;
     return null;
   }, [
     selectedEvmWalletOwner,
-    _optionalChain([reownWallet, 'optionalAccess', _133 => _133.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _134 => _134.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _140 => _140.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _141 => _141.isConnected]),
     connectedWalletAddress
   ]);
   const activeOwner = _react.useMemo.call(void 0, 
     () => resolveOwnerForMode(flowMode, {
       dappAddress,
-      walletOwner: _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _135 => _135.ownerAddress]), () => ( (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner))),
+      walletOwner: _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _142 => _142.ownerAddress]), () => ( (canAutoLock ? connectedWalletAddress : selectedEvmWalletOwner))),
       dappImportOwner
     }),
     [
       flowMode,
       dappAddress,
-      _optionalChain([signerContext, 'optionalAccess', _136 => _136.ownerAddress]),
+      _optionalChain([signerContext, 'optionalAccess', _143 => _143.ownerAddress]),
       canAutoLock,
       connectedWalletAddress,
       selectedEvmWalletOwner,
@@ -4700,12 +4836,12 @@ function DepositFlow({
       return;
     }
     lastActiveSetupLifecycleKeyRef.current = lifecycleKey;
-    _optionalChain([onLifecycleRef, 'access', _137 => _137.current, 'optionalCall', _138 => _138({
+    _optionalChain([onLifecycleRef, 'access', _144 => _144.current, 'optionalCall', _145 => _145({
       type: "smart-account-changed",
       evm: activeEntry.smartAccount,
       solana: _nullishCoalesce(activeEntry.solanaDepositAddress, () => ( null))
     })]);
-    _optionalChain([onLifecycleRef, 'access', _139 => _139.current, 'optionalCall', _140 => _140({
+    _optionalChain([onLifecycleRef, 'access', _146 => _146.current, 'optionalCall', _147 => _147({
       type: "connected",
       address: activeOwner,
       smartAccount: activeEntry.smartAccount
@@ -4738,7 +4874,7 @@ function DepositFlow({
   const currentBackHandler = canGoBackFromHere ? handleBack : void 0;
   const currentScreen = showConnectStep ? "connect" : effectiveStep.type;
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onStepChangeRef, 'access', _141 => _141.current, 'optionalCall', _142 => _142(currentBackHandler, currentScreen)]);
+    _optionalChain([onStepChangeRef, 'access', _148 => _148.current, 'optionalCall', _149 => _149(currentBackHandler, currentScreen)]);
   }, [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;
@@ -4753,7 +4889,7 @@ function DepositFlow({
     }
     lastStepOpenEventKeyRef.current = stepOpenEventKey;
     if (effectiveStep.type === "select-asset") {
-      _optionalChain([onEventRef, 'access', _143 => _143.current, 'optionalCall', _144 => _144({
+      _optionalChain([onEventRef, 'access', _150 => _150.current, 'optionalCall', _151 => _151({
         type: "deposit_modal_connected_wallet_select_source_open",
         total_balance_in_external_wallet: totalBalanceUsd,
         pred_balance: totalBalanceUsd
@@ -4761,7 +4897,7 @@ function DepositFlow({
     } else if (effectiveStep.type === "deposit-address") {
       const chainName = _chunk7JIDIX27cjs.getChainName.call(void 0, targetChain);
       const tokenSymbol = _chunk7JIDIX27cjs.getTargetTokenSymbol.call(void 0, targetToken, targetChain);
-      _optionalChain([onEventRef, 'access', _145 => _145.current, 'optionalCall', _146 => _146({
+      _optionalChain([onEventRef, 'access', _152 => _152.current, 'optionalCall', _153 => _153({
         type: "deposit_modal_transfer_crypto_open",
         default_chain: chainName,
         default_token: tokenSymbol,
@@ -4769,7 +4905,7 @@ function DepositFlow({
       })]);
     } else if (effectiveStep.type === "amount" && stepSendToken) {
       const receiveSymbol = _chunk7JIDIX27cjs.getTargetTokenSymbol.call(void 0, targetToken, targetChain);
-      _optionalChain([onEventRef, 'access', _147 => _147.current, 'optionalCall', _148 => _148({
+      _optionalChain([onEventRef, 'access', _154 => _154.current, 'optionalCall', _155 => _155({
         type: "deposit_modal_connected_wallet_enter_value_open",
         send_token: stepSendToken,
         receive_token: receiveSymbol,
@@ -4802,7 +4938,7 @@ function DepositFlow({
     targetToken
   ]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onLifecycleRef, 'access', _149 => _149.current, 'optionalCall', _150 => _150({
+    _optionalChain([onLifecycleRef, 'access', _156 => _156.current, 'optionalCall', _157 => _157({
       type: "balance-changed",
       totalUsd: totalBalanceUsd
     })]);
@@ -4816,7 +4952,7 @@ function DepositFlow({
   const handleConfirmWallet = _react.useCallback.call(void 0, 
     (walletId) => {
       const selectedOption = walletOptions.find((o) => o.id === walletId);
-      const mode = enableSolana && _optionalChain([selectedOption, 'optionalAccess', _151 => _151.kind]) === "solana" ? "solana-wallet" : "wallet";
+      const mode = enableSolana && _optionalChain([selectedOption, 'optionalAccess', _158 => _158.kind]) === "solana" ? "solana-wallet" : "wallet";
       storeApi.dispatch({
         type: "connect/wallet-confirmed",
         walletId,
@@ -4826,7 +4962,7 @@ function DepositFlow({
     [walletOptions, enableSolana, storeApi]
   );
   const isSolanaWalletConnected = Boolean(
-    enableSolana && _optionalChain([reownWallet, 'optionalAccess', _152 => _152.isConnected]) && _optionalChain([reownWallet, 'optionalAccess', _153 => _153.isSolana])
+    enableSolana && _optionalChain([reownWallet, 'optionalAccess', _159 => _159.isConnected]) && _optionalChain([reownWallet, 'optionalAccess', _160 => _160.isSolana])
   );
   const dappImportsKey = dappImports ? Object.keys(dappImports).filter((k) => dappImports[k]).sort().join(",") : "";
   const enabledDappImportProviders = _react.useMemo.call(void 0, 
@@ -4839,7 +4975,7 @@ function DepositFlow({
       const owner = dappImportOwner;
       if (owner) {
         const wallet = walletOptions.find(
-          (o) => _optionalChain([(_nullishCoalesce(o.address, () => ( null))), 'optionalAccess', _154 => _154.toLowerCase, 'call', _155 => _155()]) === owner.toLowerCase()
+          (o) => _optionalChain([(_nullishCoalesce(o.address, () => ( null))), 'optionalAccess', _161 => _161.toLowerCase, 'call', _162 => _162()]) === owner.toLowerCase()
         );
         if (wallet) {
           storeApi.dispatch({
@@ -4920,7 +5056,7 @@ function DepositFlow({
       if (!dappImportOwner) {
         return { ...baseRow, status: "needs-connect" };
       }
-      const availabilityEntry = _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _156 => _156.toLowerCase, 'call', _157 => _157()]) === dappImportOwner.toLowerCase() ? dappImportAvailability[provider.id] : void 0;
+      const availabilityEntry = _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _163 => _163.toLowerCase, 'call', _164 => _164()]) === dappImportOwner.toLowerCase() ? dappImportAvailability[provider.id] : void 0;
       const dappImportSetup = readSetupForOwner(setupSlice, dappImportOwner);
       if (availabilityEntry === "loading" || availabilityEntry === void 0) {
         return { ...baseRow, status: "loading" };
@@ -4968,7 +5104,7 @@ function DepositFlow({
   }, [activeDappImportProviderId, enabledDappImportProviders]);
   const activeDappImportAvailability = _react.useMemo.call(void 0, () => {
     if (!activeDappImportProviderId) return null;
-    if (!dappImportOwner || _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _158 => _158.toLowerCase, 'call', _159 => _159()]) !== dappImportOwner.toLowerCase()) {
+    if (!dappImportOwner || _optionalChain([dappImportAvailabilityOwner, 'optionalAccess', _165 => _165.toLowerCase, 'call', _166 => _166()]) !== dappImportOwner.toLowerCase()) {
       return null;
     }
     const entry = dappImportAvailability[activeDappImportProviderId];
@@ -4981,7 +5117,7 @@ function DepositFlow({
     dappImportOwner
   ]);
   const handleNewDeposit = _react.useCallback.call(void 0, () => {
-    _optionalChain([onLifecycleRef, 'access', _160 => _160.current, 'optionalCall', _161 => _161({
+    _optionalChain([onLifecycleRef, 'access', _167 => _167.current, 'optionalCall', _168 => _168({
       type: "smart-account-changed",
       evm: null,
       solana: null
@@ -5029,13 +5165,13 @@ function DepositFlow({
     };
     push(dappAddress);
     push(connectedWalletAddress);
-    push(_optionalChain([reownWallet, 'optionalAccess', _162 => _162.address]));
+    push(_optionalChain([reownWallet, 'optionalAccess', _169 => _169.address]));
     push(dappImportOwner);
     return owners;
   }, [
     dappAddress,
     connectedWalletAddress,
-    _optionalChain([reownWallet, 'optionalAccess', _163 => _163.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _170 => _170.address]),
     dappImportOwner
   ]);
   _react.useEffect.call(void 0, () => {
@@ -5140,7 +5276,7 @@ function DepositFlow({
         sourceChain: data.sourceChain,
         amount: data.amount
       });
-      _optionalChain([onLifecycleRef, 'access', _164 => _164.current, 'optionalCall', _165 => _165({ type: "submitted", ...data })]);
+      _optionalChain([onLifecycleRef, 'access', _171 => _171.current, 'optionalCall', _172 => _172({ type: "submitted", ...data })]);
     },
     [logFlow, onLifecycleRef]
   );
@@ -5197,7 +5333,7 @@ function DepositFlow({
         sourceSymbol: tokenAtSubmit.symbol,
         sourceDecimals: tokenAtSubmit.decimals
       });
-      _optionalChain([onLifecycleRef, 'access', _166 => _166.current, 'optionalCall', _167 => _167({
+      _optionalChain([onLifecycleRef, 'access', _173 => _173.current, 'optionalCall', _174 => _174({
         type: "submitted",
         txHash,
         sourceChain: "solana",
@@ -5208,7 +5344,7 @@ function DepositFlow({
   );
   const handleAssetContinue = _react.useCallback.call(void 0, 
     (asset) => {
-      _optionalChain([onEventRef, 'access', _168 => _168.current, 'optionalCall', _169 => _169({
+      _optionalChain([onEventRef, 'access', _175 => _175.current, 'optionalCall', _176 => _176({
         type: "deposit_modal_connected_wallet_select_source_cta_click",
         total_balance_in_external_wallet: totalBalanceUsd,
         pred_balance: totalBalanceUsd,
@@ -5261,8 +5397,8 @@ function DepositFlow({
         sourceChain: chainId,
         sourceToken: token,
         amount,
-        sourceSymbol: _optionalChain([dappImport, 'optionalAccess', _170 => _170.symbol]),
-        sourceDecimals: _optionalChain([dappImport, 'optionalAccess', _171 => _171.decimals]),
+        sourceSymbol: _optionalChain([dappImport, 'optionalAccess', _177 => _177.symbol]),
+        sourceDecimals: _optionalChain([dappImport, 'optionalAccess', _178 => _178.decimals]),
         directTransfer: !dappImport && isSameRoute2(chainId, token, targetChain, targetToken)
       });
     },
@@ -5270,7 +5406,7 @@ function DepositFlow({
   );
   const handleDepositSubmittedCallback = _react.useCallback.call(void 0, 
     (txHash, sourceChain, amount) => {
-      _optionalChain([onLifecycleRef, 'access', _172 => _172.current, 'optionalCall', _173 => _173({
+      _optionalChain([onLifecycleRef, 'access', _179 => _179.current, 'optionalCall', _180 => _180({
         type: "submitted",
         txHash,
         sourceChain,
@@ -5282,7 +5418,7 @@ function DepositFlow({
   const handleDepositComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash, context) => {
       logFlow("deposit:complete", { txHash, destinationTxHash, ...context });
-      _optionalChain([onLifecycleRef, 'access', _174 => _174.current, 'optionalCall', _175 => _175({
+      _optionalChain([onLifecycleRef, 'access', _181 => _181.current, 'optionalCall', _182 => _182({
         type: "complete",
         txHash,
         destinationTxHash,
@@ -5294,14 +5430,14 @@ function DepositFlow({
   const handleDepositFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
-      _optionalChain([onLifecycleRef, 'access', _176 => _176.current, 'optionalCall', _177 => _177({ type: "failed", txHash, error })]);
+      _optionalChain([onLifecycleRef, 'access', _183 => _183.current, 'optionalCall', _184 => _184({ type: "failed", txHash, error })]);
     },
     [logFlowError, onLifecycleRef]
   );
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
       logFlowError("flow:error", message, { code });
-      _optionalChain([onErrorRef, 'access', _178 => _178.current, 'optionalCall', _179 => _179({ message, code })]);
+      _optionalChain([onErrorRef, 'access', _185 => _185.current, 'optionalCall', _186 => _186({ message, code })]);
     },
     [logFlowError, onErrorRef]
   );
@@ -5430,13 +5566,19 @@ function DepositFlow({
   if (isDepositAddressMode) {
     if (!dappAddress) return null;
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
-      effectiveStep.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+      effectiveStep.type === "setup" && (activeEntry.status === "error" ? /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         AccountPreparingSkeleton,
         {
-          errorMessage: activeEntry.status === "error" ? _nullishCoalesce(activeEntry.message, () => ( void 0)) : void 0,
-          onRetry: activeEntry.status === "error" ? () => handleRetrySetup(dappAddress) : void 0
+          errorMessage: _nullishCoalesce(activeEntry.message, () => ( void 0)),
+          onRetry: () => handleRetrySetup(dappAddress)
         }
-      ),
+      ) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+        DepositAddressSkeleton,
+        {
+          uiConfig,
+          allowedRoutes
+        }
+      )),
       effectiveStep.type === "deposit-address" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         DepositAddressStep,
         {
@@ -5447,7 +5589,7 @@ function DepositFlow({
           allowedRoutes,
           targetChain,
           targetToken,
-          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _180 => _180.length])),
+          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _187 => _187.length])),
           uiConfig,
           onDepositSubmitted: handleDepositAddressSubmitted,
           onDepositComplete: handleDepositComplete,
@@ -5455,7 +5597,7 @@ function DepositFlow({
           onCopyAddress: () => {
             const chainName = _chunk7JIDIX27cjs.getChainName.call(void 0, targetChain);
             const tokenSymbol = _chunk7JIDIX27cjs.getTargetTokenSymbol.call(void 0, targetToken, targetChain);
-            _optionalChain([onEvent, 'optionalCall', _181 => _181({
+            _optionalChain([onEvent, 'optionalCall', _188 => _188({
               type: "deposit_modal_transfer_crypto_cta_click",
               default_chain: chainName,
               default_token: tokenSymbol,
@@ -5471,8 +5613,8 @@ function DepositFlow({
   }
   if (isSolanaWalletMode) {
     if (!dappAddress) return null;
-    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _182 => _182.solanaAddress]);
-    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _183 => _183.solanaProvider]);
+    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _189 => _189.solanaAddress]);
+    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _190 => _190.solanaProvider]);
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
       effectiveStep.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         AccountPreparingSkeleton,
@@ -5528,7 +5670,7 @@ function DepositFlow({
           targetToken,
           service,
           solanaProvider,
-          solanaConnection: _optionalChain([reownWallet, 'optionalAccess', _184 => _184.solanaConnection]),
+          solanaConnection: _optionalChain([reownWallet, 'optionalAccess', _191 => _191.solanaConnection]),
           uiConfig,
           onConfirm: handleSolanaConfirmed,
           onError: handleError,
@@ -5581,7 +5723,7 @@ function DepositFlow({
           amount: effectiveStep.amount,
           sourceSymbol: effectiveStep.sourceSymbol,
           sourceDecimals: effectiveStep.sourceDecimals,
-          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _185 => _185.length])),
+          hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _192 => _192.length])),
           service,
           directTransfer: effectiveStep.directTransfer,
           onClose,
@@ -5594,13 +5736,13 @@ function DepositFlow({
       )
     ] });
   }
-  if (!_optionalChain([signerContext, 'optionalAccess', _186 => _186.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _187 => _187.publicClient])) {
+  if (!_optionalChain([signerContext, 'optionalAccess', _193 => _193.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _194 => _194.publicClient])) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-state", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-text", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-title", children: "Connecting wallet\u2026" }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
-  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _188 => _188.walletClient, 'optionalAccess', _189 => _189.chain, 'optionalAccess', _190 => _190.id]), () => ( _optionalChain([signerContext, 'access', _191 => _191.publicClient, 'access', _192 => _192.chain, 'optionalAccess', _193 => _193.id]))), () => ( setupChainId));
+  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _195 => _195.walletClient, 'optionalAccess', _196 => _196.chain, 'optionalAccess', _197 => _197.id]), () => ( _optionalChain([signerContext, 'access', _198 => _198.publicClient, 'access', _199 => _199.chain, 'optionalAccess', _200 => _200.id]))), () => ( setupChainId));
   const getReadClientForChain = (chainId) => {
-    if (_optionalChain([signerContext, 'access', _194 => _194.publicClient, 'access', _195 => _195.chain, 'optionalAccess', _196 => _196.id]) === chainId) {
+    if (_optionalChain([signerContext, 'access', _201 => _201.publicClient, 'access', _202 => _202.chain, 'optionalAccess', _203 => _203.id]) === chainId) {
       return signerContext.publicClient;
     }
     return _chunk2TWQGPPBcjs.getPublicClient.call(void 0, chainId);
@@ -5634,7 +5776,7 @@ function DepositFlow({
     effectiveStep.type === "dapp-import-asset-select" && activeDappImportProvider && activeDappImportAvailability && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
       DappImportAssetSelectStep,
       {
-        sourceLabel: _nullishCoalesce(_optionalChain([activeDappImportAvailability, 'access', _197 => _197.assets, 'access', _198 => _198[0], 'optionalAccess', _199 => _199.sourceLabel]), () => ( activeDappImportProvider.label)),
+        sourceLabel: _nullishCoalesce(_optionalChain([activeDappImportAvailability, 'access', _204 => _204.assets, 'access', _205 => _205[0], 'optionalAccess', _206 => _206.sourceLabel]), () => ( activeDappImportProvider.label)),
         assets: activeDappImportAvailability.assets,
         onSelect: handleDappImportAssetSelected
       }
@@ -5651,7 +5793,7 @@ function DepositFlow({
           chainId: effectiveStep.asset.depositChainId,
           token: effectiveStep.asset.depositToken
         } : void 0,
-        defaultAmount: _nullishCoalesce(effectiveStep.amount, () => ( defaultAmount)),
+        defaultAmount: _nullishCoalesce(effectiveStep.inputAmountUsd, () => ( defaultAmount)),
         switchChain: signerContext.switchChain,
         targetChain,
         targetToken,
@@ -5661,7 +5803,7 @@ function DepositFlow({
         onContinue: handleAmountContinue,
         onCtaClick: (ctaName) => {
           const receiveSymbol = _chunk7JIDIX27cjs.getTargetTokenSymbol.call(void 0, targetToken, targetChain);
-          _optionalChain([onEvent, 'optionalCall', _200 => _200({
+          _optionalChain([onEvent, 'optionalCall', _207 => _207({
             type: "deposit_modal_connected_wallet_enter_value_cta_click",
             send_token: effectiveStep.asset.symbol,
             receive_token: receiveSymbol,
@@ -5724,7 +5866,7 @@ function DepositFlow({
         amount: effectiveStep.amount,
         sourceSymbol: effectiveStep.sourceSymbol,
         sourceDecimals: effectiveStep.sourceDecimals,
-        hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _201 => _201.length])),
+        hasPostBridgeActions: Boolean(_optionalChain([postBridgeActions, 'optionalAccess', _208 => _208.length])),
         service,
         directTransfer: effectiveStep.directTransfer,
         uiConfig,
@@ -5863,7 +6005,7 @@ function DepositHistoryPanel({
   );
   const visibleDeposits = _react.useMemo.call(void 0, () => {
     const sourceHashes = new Set(
-      deposits.map((d) => _optionalChain([d, 'access', _202 => _202.sourceTxHash, 'optionalAccess', _203 => _203.toLowerCase, 'call', _204 => _204()])).filter((h) => Boolean(h))
+      deposits.map((d) => _optionalChain([d, 'access', _209 => _209.sourceTxHash, 'optionalAccess', _210 => _210.toLowerCase, 'call', _211 => _211()])).filter((h) => Boolean(h))
     );
     return deposits.filter(
       (d) => !(d.txHash && sourceHashes.has(d.txHash.toLowerCase()))
@@ -5985,7 +6127,7 @@ function HistoryCard({ deposit }) {
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: `rs-history-badge rs-history-badge--${status}`, children: STATUS_LABEL[status] })
           ] })
         ] }),
-        expanded && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-card-details", children: [
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-history-card-panel", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-history-card-panel-inner", children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-history-card-details", children: [
           sourceChainName && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-detail-row", children: [
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Source chain" }),
             /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-detail-value", children: [
@@ -6017,7 +6159,7 @@ function HistoryCard({ deposit }) {
               }
             )
           ] })
-        ] })
+        ] }) }) })
       ]
     }
   );
@@ -6027,7 +6169,7 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 
 var ReownDepositInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-4NV6JM2U.cjs"))).then((m) => ({ default: m.DepositModalReown }))
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-EC4DJ3EC.cjs"))).then((m) => ({ default: m.DepositModalReown }))
 );
 function sortByCreatedAtDesc(items) {
   return [...items].sort((a, b) => {
@@ -6106,7 +6248,7 @@ function DepositModalInner({
   const [backHandler, setBackHandler] = _react.useState.call(void 0, 
     void 0
   );
-  const showHistoryButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _205 => _205.showHistoryButton]), () => ( false));
+  const showHistoryButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _212 => _212.showHistoryButton]), () => ( false));
   const historyButtonVisible = showHistoryButton && (currentScreen === "select-asset" || currentScreen === "deposit-address");
   const [historyOpen, setHistoryOpen] = _react.useState.call(void 0, false);
   const [historyDeposits, setHistoryDeposits] = _react.useState.call(void 0, []);
@@ -6144,7 +6286,7 @@ function DepositModalInner({
   }, [solanaRpcUrl]);
   _react.useEffect.call(void 0, () => {
     if (isOpen) {
-      _optionalChain([onReadyRef, 'access', _206 => _206.current, 'optionalCall', _207 => _207()]);
+      _optionalChain([onReadyRef, 'access', _213 => _213.current, 'optionalCall', _214 => _214()]);
     }
   }, [isOpen, onReadyRef]);
   const handleStepChange = _react.useCallback.call(void 0, 
@@ -6223,7 +6365,7 @@ function DepositModalInner({
   const onLifecycleRef = _chunk2TWQGPPBcjs.useLatestRef.call(void 0, onLifecycle);
   const handleLifecycle = _react.useCallback.call(void 0, 
     (event) => {
-      _optionalChain([onLifecycleRef, 'access', _208 => _208.current, 'optionalCall', _209 => _209(event)]);
+      _optionalChain([onLifecycleRef, 'access', _215 => _215.current, 'optionalCall', _216 => _216(event)]);
       if (event.type === "smart-account-changed" && !event.evm && !event.solana) {
         historyStaleRef.current = true;
       }
@@ -6249,7 +6391,7 @@ function DepositModalInner({
       store.dispatch({ type: "flow/reset" });
     }
   }, [isOpen, store]);
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _210 => _210.showBackButton]), () => ( true));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _217 => _217.showBackButton]), () => ( true));
   const canGoBack = backHandler !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, DepositStoreProvider, { store, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     _chunk2TWQGPPBcjs.Modal,