@rhinestone/deposit-modal 0.1.48 → 0.1.50

package/dist/{chunk-ZK6VAHSB.cjs → chunk-HXNHL64V.cjs}

@@ -56,7 +56,6 @@ var _react = require('react');
 
 // src/DepositFlow.tsx
 
-var _viem = require('viem');
 
 // src/components/steps/SetupStep.tsx
 
@@ -85,6 +84,7 @@ function SetupStep({
   sessionChainIds,
   recipient,
   forceRegister,
+  enableSolana = true,
   service,
   onSetupComplete,
   onError,
@@ -115,7 +115,10 @@ function SetupStep({
       if (!setup.needsRegistration) {
         setState({ type: "ready", smartAccount });
         _optionalChain([onConnected, 'optionalCall', _ => _(address, smartAccount)]);
-        onSetupComplete(smartAccount, setup.solanaDepositAddress);
+        onSetupComplete(
+          smartAccount,
+          enableSolana ? setup.solanaDepositAddress : void 0
+        );
         return;
       }
       setState({ type: "signing-session" });
@@ -151,7 +154,10 @@ function SetupStep({
       });
       setState({ type: "ready", smartAccount });
       _optionalChain([onConnected, 'optionalCall', _2 => _2(address, smartAccount)]);
-      onSetupComplete(smartAccount, registerResult.solanaDepositAddress);
+      onSetupComplete(
+        smartAccount,
+        enableSolana ? registerResult.solanaDepositAddress : void 0
+      );
     } catch (error) {
       const message = error instanceof Error ? error.message : "Setup failed";
       setState({ type: "error", message });
@@ -166,6 +172,7 @@ function SetupStep({
     sessionChainIds,
     recipient,
     forceRegister,
+    enableSolana,
     service,
     onSetupComplete,
     onError,
@@ -246,7 +253,7 @@ function SetupStep({
 
 // src/components/steps/AssetSelectStep.tsx
 
-
+var _viem = require('viem');
 
 function AssetSelectStep({
   address,
@@ -2006,35 +2013,81 @@ function SolanaAmountStep({
   token,
   balance,
   balanceUsd,
+  defaultAmount,
+  uiConfig,
   onContinue,
   debug
 }) {
   const [amount, setAmount] = _react.useState.call(void 0, "");
   const [error, setError] = _react.useState.call(void 0, null);
+  const isSourceStablecoin = _chunkNELAYNA3cjs.isStablecoinSymbol.call(void 0, token.symbol);
+  const tokenPriceUsd = _react.useMemo.call(void 0, () => {
+    if (isSourceStablecoin) return 1;
+    try {
+      const balanceUnits = Number(_viem.formatUnits.call(void 0, balance, token.decimals));
+      if (!Number.isFinite(balanceUnits) || balanceUnits <= 0 || balanceUsd <= 0) {
+        return null;
+      }
+      const price = balanceUsd / balanceUnits;
+      return price > 0 ? price : null;
+    } catch (e15) {
+      return null;
+    }
+  }, [isSourceStablecoin, balance, token.decimals, balanceUsd]);
+  const hasPricing = tokenPriceUsd !== null;
+  _react.useEffect.call(void 0, () => {
+    if (defaultAmount && !amount) {
+      const parsed = Number(defaultAmount);
+      if (Number.isFinite(parsed) && parsed > 0) {
+        setAmount(parsed.toString());
+      }
+    }
+  }, [defaultAmount, amount]);
   const formattedBalance = _react.useMemo.call(void 0, () => {
     try {
       const raw = _viem.formatUnits.call(void 0, balance, token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
       return _chunk7HJ7IBRHcjs.tokenFormatter.format(numeric);
-    } catch (e15) {
+    } catch (e16) {
       return "...";
     }
   }, [balance, token.decimals]);
+  const computedBalanceUsd = _react.useMemo.call(void 0, () => {
+    try {
+      const balanceUnits = Number(_viem.formatUnits.call(void 0, balance, token.decimals));
+      if (!Number.isFinite(balanceUnits) || balanceUnits < 0) return null;
+      if (tokenPriceUsd !== null) return balanceUnits * tokenPriceUsd;
+      if (Number.isFinite(balanceUsd) && balanceUsd > 0) return balanceUsd;
+      return null;
+    } catch (e17) {
+      return null;
+    }
+  }, [balance, token.decimals, tokenPriceUsd, balanceUsd]);
   const formattedBalanceUsd = _react.useMemo.call(void 0, () => {
-    if (!Number.isFinite(balanceUsd) || balanceUsd <= 0) return null;
-    return _chunk7HJ7IBRHcjs.currencyFormatter.format(balanceUsd);
-  }, [balanceUsd]);
+    if (computedBalanceUsd === null || computedBalanceUsd <= 0) return null;
+    return _chunk7HJ7IBRHcjs.currencyFormatter.format(computedBalanceUsd);
+  }, [computedBalanceUsd]);
   const spendableBalance = _react.useMemo.call(void 0, () => {
     if (!isNativeSol(token)) return balance;
     return balance > SOL_FEE_RESERVE_LAMPORTS ? balance - SOL_FEE_RESERVE_LAMPORTS : 0n;
   }, [balance, token]);
+  const spendableBalanceUsd = _react.useMemo.call(void 0, () => {
+    try {
+      const spendableUnits = Number(_viem.formatUnits.call(void 0, spendableBalance, token.decimals));
+      if (!Number.isFinite(spendableUnits) || spendableUnits < 0) return null;
+      if (tokenPriceUsd !== null) return spendableUnits * tokenPriceUsd;
+      return null;
+    } catch (e18) {
+      return null;
+    }
+  }, [spendableBalance, token.decimals, tokenPriceUsd]);
   const handlePresetClick = (percentage) => {
     try {
       const spendableUnits = Number(_viem.formatUnits.call(void 0, spendableBalance, token.decimals));
       if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return;
-      const value = spendableUnits * percentage / 100;
-      const maxDecimals = token.decimals > 6 ? 6 : token.decimals;
+      const value = isSourceStablecoin || !hasPricing ? spendableUnits * percentage / 100 : (_nullishCoalesce(spendableBalanceUsd, () => ( 0))) * percentage / 100;
+      const maxDecimals = 3;
       const factor = 10 ** maxDecimals;
       const truncated = Math.floor(value * factor) / factor;
       const formatted = truncated.toFixed(maxDecimals).replace(/\.?0+$/, "");
@@ -2044,7 +2097,7 @@ function SolanaAmountStep({
         formatted
       });
       setAmount(formatted);
-    } catch (e16) {
+    } catch (e19) {
       return;
     }
     if (error) setError(null);
@@ -2059,12 +2112,30 @@ function SolanaAmountStep({
       setError("Please enter a valid amount");
       return;
     }
+    const sourceAmount = isSourceStablecoin || !hasPricing ? numericAmount : numericAmount / tokenPriceUsd;
+    if (hasPricing) {
+      const usdValue = numericAmount;
+      if (_optionalChain([uiConfig, 'optionalAccess', _38 => _38.maxDepositUsd]) && usdValue > uiConfig.maxDepositUsd) {
+        setError(
+          `Maximum deposit is ${_chunk7HJ7IBRHcjs.currencyFormatter.format(uiConfig.maxDepositUsd)}`
+        );
+        return;
+      }
+      if (_optionalChain([uiConfig, 'optionalAccess', _39 => _39.minDepositUsd]) && usdValue < uiConfig.minDepositUsd) {
+        setError(
+          `Minimum deposit is ${_chunk7HJ7IBRHcjs.currencyFormatter.format(uiConfig.minDepositUsd)}`
+        );
+        return;
+      }
+    }
+    const sourceAmountStr = sourceAmount.toString();
     let amountInUnits;
     try {
-      amountInUnits = _viem.parseUnits.call(void 0, amount, token.decimals);
-    } catch (e17) {
+      amountInUnits = _viem.parseUnits.call(void 0, sourceAmountStr, token.decimals);
+    } catch (e20) {
       _chunk7HJ7IBRHcjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
         amount,
+        sourceAmount: sourceAmountStr,
         reason: "parse-units-failed"
       });
       setError("Please enter a valid amount");
@@ -2086,46 +2157,47 @@ function SolanaAmountStep({
     }
     _chunk7HJ7IBRHcjs.debugLog.call(void 0, debug, "solana-amount", "amount:continue", {
       symbol: token.symbol,
-      amount,
+      inputAmountUsd: amount,
+      sourceAmount: sourceAmountStr,
       amountInUnits: amountInUnits.toString()
     });
     setError(null);
-    onContinue(token, amount);
+    onContinue(token, sourceAmountStr, amount);
   };
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-title", children: "Enter amount" }) }),
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step-body", style: { paddingTop: 0 }, children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-display", children: [
-        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-input-wrapper", children: [
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-            "input",
-            {
-              type: "text",
-              inputMode: "decimal",
-              className: "rs-amount-input-large",
-              placeholder: "0.00",
-              value: amount,
-              onChange: (e) => {
-                const raw = e.target.value.replace(/[^0-9.]/g, "");
-                const parts = raw.split(".");
-                if (parts.length > 2) return;
-                setAmount(raw);
-                if (error) setError(null);
-              },
-              autoFocus: true
-            }
-          ),
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-amount-token-value", children: token.symbol })
-        ] }),
-        /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-available", children: [
-          /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-available-value", children: [
-            formattedBalance,
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-amount-input-wrapper", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+          "input",
+          {
+            type: "text",
+            inputMode: "decimal",
+            className: "rs-amount-input-large",
+            placeholder: "$0.00",
+            value: amount ? `$${amount}` : "",
+            onChange: (e) => {
+              const raw = e.target.value.replace(/[^0-9.]/g, "");
+              const parts = raw.split(".");
+              if (parts.length > 2) return;
+              setAmount(raw);
+              if (error) setError(null);
+            },
+            autoFocus: true
+          }
+        ) }),
+        !isSourceStablecoin && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-amount-available", children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-amount-available-value", children: [
+          formattedBalance,
+          " ",
+          token.symbol,
+          " available",
+          formattedBalanceUsd && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { style: { color: "var(--rs-muted-foreground)" }, children: [
             " ",
-            token.symbol,
-            " available"
-          ] }),
-          formattedBalanceUsd && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-amount-available-value", children: formattedBalanceUsd })
-        ] })
+            "(",
+            formattedBalanceUsd,
+            ")"
+          ] })
+        ] }) })
       ] }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-presets", children: [
         [25, 50, 75].map((pct) => /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
@@ -2195,7 +2267,8 @@ function SolanaConfirmStep({
   solanaAddress,
   solanaDepositAddress,
   token,
-  amount,
+  sourceAmount,
+  inputAmountUsd,
   targetAmount,
   targetTokenPriceUsd,
   targetChain,
@@ -2210,7 +2283,7 @@ function SolanaConfirmStep({
   const [error, setError] = _react.useState.call(void 0, null);
   const targetSymbol = _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
   const isSameToken = token.symbol.toUpperCase() === targetSymbol.toUpperCase();
-  const formattedAmount = amount && !Number.isNaN(Number(amount)) ? Number(amount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
+  const formattedAmount = sourceAmount && !Number.isNaN(Number(sourceAmount)) ? Number(sourceAmount).toLocaleString("en-US", { maximumFractionDigits: 6 }) : "0";
   const formattedReceiveAmount = (() => {
     if (isSameToken) return formattedAmount;
     const dollarValue = Number(targetAmount);
@@ -2231,11 +2304,11 @@ function SolanaConfirmStep({
       setError("Solana wallet not connected");
       return;
     }
-    const parsedAmount = parseFloat(amount);
+    const parsedAmount = parseFloat(sourceAmount);
     if (isNaN(parsedAmount) || parsedAmount <= 0) {
       _chunk7HJ7IBRHcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
         reason: "invalid-amount",
-        amount
+        sourceAmount
       });
       setError("Please enter a valid amount");
       return;
@@ -2247,7 +2320,8 @@ function SolanaConfirmStep({
       solanaAddress,
       solanaDepositAddress,
       token: token.symbol,
-      amount
+      sourceAmount,
+      inputAmountUsd
     });
     try {
       const check = await service.checkAccount(smartAccount);
@@ -2263,10 +2337,10 @@ function SolanaConfirmStep({
         );
       }
       const connection = getSolanaConnection();
-      const amountUnits = _viem.parseUnits.call(void 0, amount, token.decimals);
+      const amountUnits = _viem.parseUnits.call(void 0, sourceAmount, token.decimals);
       _chunk7HJ7IBRHcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:start", {
         token: token.symbol,
-        amount,
+        sourceAmount,
         amountUnits: amountUnits.toString()
       });
       const transaction = isNativeSol(token) ? await buildSolTransferTransaction(
@@ -2284,7 +2358,7 @@ function SolanaConfirmStep({
       _chunk7HJ7IBRHcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
         token: token.symbol,
         instructionCount: transaction.instructions.length,
-        feePayer: _optionalChain([transaction, 'access', _38 => _38.feePayer, 'optionalAccess', _39 => _39.toBase58, 'call', _40 => _40()]),
+        feePayer: _optionalChain([transaction, 'access', _40 => _40.feePayer, 'optionalAccess', _41 => _41.toBase58, 'call', _42 => _42()]),
         recentBlockhash: transaction.recentBlockhash
       });
       const txHash = await sendSolanaTransaction(
@@ -2303,10 +2377,10 @@ function SolanaConfirmStep({
       _chunk7HJ7IBRHcjs.debugError.call(void 0, debug, "solana-confirm", "submit:failure", err, {
         smartAccount,
         token: token.symbol,
-        amount
+        sourceAmount
       });
       setError(message);
-      _optionalChain([onError, 'optionalCall', _41 => _41(message, "SOLANA_TRANSFER_ERROR")]);
+      _optionalChain([onError, 'optionalCall', _43 => _43(message, "SOLANA_TRANSFER_ERROR")]);
     } finally {
       setIsSubmitting(false);
     }
@@ -2437,7 +2511,7 @@ function SolanaConfirmStep({
       {
         onClick: handleConfirm,
         loading: isSubmitting,
-        disabled: !amount || Number(amount) <= 0,
+        disabled: !sourceAmount || Number(sourceAmount) <= 0,
         fullWidth: true,
         children: "Confirm Order"
       }
@@ -2469,6 +2543,7 @@ function DepositFlow({
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
+  enableSolana = true,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -2518,19 +2593,19 @@ function DepositFlow({
         try {
           const balanceUnits = Number(asset.balance) / 10 ** asset.decimals;
           if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
-        } catch (e18) {
+        } catch (e21) {
         }
       }
     }
     return null;
   }, []);
   const dappSwitchChain = _react.useMemo.call(void 0, () => {
-    if (!_optionalChain([dappWalletClient, 'optionalAccess', _42 => _42.switchChain])) return void 0;
+    if (!_optionalChain([dappWalletClient, 'optionalAccess', _44 => _44.switchChain])) return void 0;
     return async (chainId) => {
-      await _optionalChain([dappWalletClient, 'access', _43 => _43.switchChain, 'optionalCall', _44 => _44({ id: chainId })]);
+      await _optionalChain([dappWalletClient, 'access', _45 => _45.switchChain, 'optionalCall', _46 => _46({ id: chainId })]);
     };
   }, [dappWalletClient]);
-  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _45 => _45.account, 'optionalAccess', _46 => _46.address]), () => ( null));
+  const connectedWalletAddress = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _47 => _47.account, 'optionalAccess', _48 => _48.address]), () => ( null));
   const walletOptions = _react.useMemo.call(void 0, () => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
@@ -2544,7 +2619,7 @@ function DepositFlow({
       });
       seen.add(id);
     }
-    if (_optionalChain([reownWallet, 'optionalAccess', _47 => _47.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
+    if (enableSolana && _optionalChain([reownWallet, 'optionalAccess', _49 => _49.isConnected]) && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
       const id = _nullishCoalesce(reownWallet.caipAddress, () => ( `solana:${reownWallet.solanaAddress}`));
       if (!seen.has(id)) {
         options.push({
@@ -2556,7 +2631,7 @@ function DepositFlow({
         });
         seen.add(id);
       }
-    } else if (_optionalChain([reownWallet, 'optionalAccess', _48 => _48.address]) && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(`evm:${reownWallet.address.toLowerCase()}`)) {
+    } else if (_optionalChain([reownWallet, 'optionalAccess', _50 => _50.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({
@@ -2573,19 +2648,20 @@ function DepositFlow({
   }, [
     connectedWalletAddress,
     dappAddress,
-    _optionalChain([reownWallet, 'optionalAccess', _49 => _49.address]),
-    _optionalChain([reownWallet, 'optionalAccess', _50 => _50.isConnected]),
-    _optionalChain([reownWallet, 'optionalAccess', _51 => _51.walletClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _52 => _52.publicClient]),
-    _optionalChain([reownWallet, 'optionalAccess', _53 => _53.icon]),
-    _optionalChain([reownWallet, 'optionalAccess', _54 => _54.isSolana]),
-    _optionalChain([reownWallet, 'optionalAccess', _55 => _55.solanaAddress]),
-    _optionalChain([reownWallet, 'optionalAccess', _56 => _56.caipAddress])
+    _optionalChain([reownWallet, 'optionalAccess', _51 => _51.address]),
+    _optionalChain([reownWallet, 'optionalAccess', _52 => _52.isConnected]),
+    _optionalChain([reownWallet, 'optionalAccess', _53 => _53.walletClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _54 => _54.publicClient]),
+    _optionalChain([reownWallet, 'optionalAccess', _55 => _55.icon]),
+    enableSolana,
+    _optionalChain([reownWallet, 'optionalAccess', _56 => _56.isSolana]),
+    _optionalChain([reownWallet, 'optionalAccess', _57 => _57.solanaAddress]),
+    _optionalChain([reownWallet, 'optionalAccess', _58 => _58.caipAddress])
   ]);
-  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _57 => _57.account]) && dappAddress && !reownWallet;
+  const canAutoLock = _optionalChain([dappWalletClient, 'optionalAccess', _59 => _59.account]) && dappAddress && !reownWallet;
   const hasWalletOptions = walletOptions.length > 0;
   const hasReownSession = Boolean(
-    _optionalChain([reownWallet, 'optionalAccess', _58 => _58.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _59 => _59.address])
+    enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _60 => _60.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _61 => _61.address]) : _optionalChain([reownWallet, 'optionalAccess', _62 => _62.address])
   );
   const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
   const walletSelectionKey = _react.useMemo.call(void 0, () => {
@@ -2616,7 +2692,7 @@ function DepositFlow({
       };
     }
     if (canAutoLock) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _60 => _60.chain, 'optionalAccess', _61 => _61.id]), () => ( targetChain));
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _63 => _63.chain, 'optionalAccess', _64 => _64.id]), () => ( targetChain));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -2638,8 +2714,8 @@ function DepositFlow({
         switchChain: void 0
       };
     }
-    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _62 => _62.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
-      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _63 => _63.chain, 'optionalAccess', _64 => _64.id]), () => ( targetChain));
+    if (selectedOption.kind === "connected" && _optionalChain([dappWalletClient, 'optionalAccess', _65 => _65.account]) && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+      const fallbackChainId = _nullishCoalesce(_optionalChain([dappWalletClient, 'optionalAccess', _66 => _66.chain, 'optionalAccess', _67 => _67.id]), () => ( targetChain));
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -2647,7 +2723,7 @@ function DepositFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _65 => _65.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+    if (selectedOption.kind === "external" && _optionalChain([reownWallet, 'optionalAccess', _68 => _68.address]) && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -2711,7 +2787,7 @@ function DepositFlow({
     walletSignerContext,
     walletSelectionKey
   ]);
-  const sessionKeyAddress = _nullishCoalesce(_nullishCoalesce(dappAddress, () => ( _optionalChain([signerContext, 'optionalAccess', _66 => _66.ownerAddress]))), () => ( null));
+  const sessionKeyAddress = _nullishCoalesce(_nullishCoalesce(dappAddress, () => ( _optionalChain([signerContext, 'optionalAccess', _69 => _69.ownerAddress]))), () => ( null));
   const lastTargetRef = _react.useRef.call(void 0, null);
   _react.useEffect.call(void 0, () => {
     const prev = lastTargetRef.current;
@@ -2770,7 +2846,8 @@ function DepositFlow({
         solanaDepositAddress: prev.solanaDepositAddress,
         token: prev.token,
         balance: prev.balance,
-        balanceUsd: prev.balanceUsd
+        balanceUsd: prev.balanceUsd,
+        inputAmountUsd: prev.inputAmountUsd
       };
     });
   }, []);
@@ -2787,7 +2864,7 @@ function DepositFlow({
   const stepIndex = step.type === "setup" ? 0 : step.type === "deposit-address" ? 1 : step.type === "select-asset" ? 1 : step.type === "solana-token-select" ? 1 : step.type === "solana-amount" ? 2 : step.type === "amount" ? 2 : step.type === "confirm" ? 3 : step.type === "solana-confirm" ? 3 : 4;
   const currentBackHandler = step.type === "deposit-address" ? handleBackFromDepositAddress : step.type === "select-asset" && signerContext && !canAutoLock ? handleBackFromSelectAsset : step.type === "solana-token-select" ? handleBackFromSolanaTokenSelect : step.type === "solana-amount" ? handleBackFromSolanaAmount : step.type === "solana-confirm" ? handleBackFromSolanaConfirm : step.type === "amount" ? handleBackFromAmount : step.type === "confirm" ? handleBackFromConfirm : void 0;
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onStepChange, 'optionalCall', _67 => _67(stepIndex, currentBackHandler)]);
+    _optionalChain([onStepChange, 'optionalCall', _70 => _70(stepIndex, currentBackHandler)]);
   }, [stepIndex, currentBackHandler, onStepChange]);
   _react.useEffect.call(void 0, () => {
     logFlow("state:changed", {
@@ -2806,7 +2883,7 @@ function DepositFlow({
     targetToken
   ]);
   _react.useEffect.call(void 0, () => {
-    _optionalChain([onTotalBalanceChange, 'optionalCall', _68 => _68(totalBalanceUsd)]);
+    _optionalChain([onTotalBalanceChange, 'optionalCall', _71 => _71(totalBalanceUsd)]);
   }, [totalBalanceUsd, onTotalBalanceChange]);
   const isDepositAddressMode = flowMode === "deposit-address";
   const isSolanaWalletMode = flowMode === "solana-wallet";
@@ -2848,7 +2925,7 @@ function DepositFlow({
             solanaDepositAddress
           });
         } else {
-          _optionalChain([onError, 'optionalCall', _69 => _69({
+          _optionalChain([onError, 'optionalCall', _72 => _72({
             message: "Solana deposit address not available. Please try again.",
             code: "SOLANA_SETUP_FAILED"
           })]);
@@ -2883,7 +2960,7 @@ function DepositFlow({
           directTransfer
         };
       });
-      _optionalChain([onDepositSubmitted, 'optionalCall', _70 => _70({ txHash, sourceChain: chainId, amount })]);
+      _optionalChain([onDepositSubmitted, 'optionalCall', _73 => _73({ txHash, sourceChain: chainId, amount })]);
     },
     [onDepositSubmitted, targetChain, targetToken]
   );
@@ -2898,38 +2975,35 @@ function DepositFlow({
           solanaDepositAddress: prev.solanaDepositAddress,
           token,
           balance,
-          balanceUsd
+          balanceUsd,
+          inputAmountUsd: defaultAmount
         };
       });
     },
-    [logFlow]
+    [defaultAmount, logFlow]
   );
   const handleSolanaAmountContinue = _react.useCallback.call(void 0, 
-    (token, amount) => {
+    (token, sourceAmount, inputAmountUsd) => {
       const targetSym = _chunkNELAYNA3cjs.getTokenSymbol.call(void 0, targetToken, targetChain);
       const isTargetStable = _chunkNELAYNA3cjs.isStablecoinSymbol.call(void 0, targetSym);
       const targetTokenPriceUsd = isTargetStable ? 1 : getTokenPriceUsd(targetSym);
       logFlow("solana:amount:continue", {
         token: token.symbol,
-        amount,
+        sourceAmount,
+        inputAmountUsd,
         targetSymbol: targetSym,
         targetTokenPriceUsd
       });
       setStep((prev) => {
         if (prev.type !== "solana-amount") return prev;
-        const sourceBalance = Number(
-          _viem.formatUnits.call(void 0, prev.balance, prev.token.decimals)
-        );
-        const sourceTokenPriceUsd = Number.isFinite(sourceBalance) && sourceBalance > 0 && prev.balanceUsd > 0 ? prev.balanceUsd / sourceBalance : null;
-        const parsedAmount = Number(amount);
-        const targetAmount = sourceTokenPriceUsd !== null && Number.isFinite(parsedAmount) && parsedAmount > 0 ? (parsedAmount * sourceTokenPriceUsd).toString() : amount;
         return {
           type: "solana-confirm",
           smartAccount: prev.smartAccount,
           solanaDepositAddress: prev.solanaDepositAddress,
           token,
-          amount,
-          targetAmount,
+          sourceAmount,
+          inputAmountUsd,
+          targetAmount: inputAmountUsd,
           targetTokenPriceUsd,
           balance: prev.balance,
           balanceUsd: prev.balanceUsd
@@ -2958,7 +3032,7 @@ function DepositFlow({
           sourceDecimals: prev.token.decimals
         };
       });
-      _optionalChain([onDepositSubmitted, 'optionalCall', _71 => _71({
+      _optionalChain([onDepositSubmitted, 'optionalCall', _74 => _74({
         txHash,
         sourceChain: "solana",
         amount: amountUnits
@@ -2968,7 +3042,7 @@ function DepositFlow({
   );
   const handleConnected = _react.useCallback.call(void 0, 
     (addr, smartAccount) => {
-      _optionalChain([onConnected, 'optionalCall', _72 => _72({ address: addr, smartAccount })]);
+      _optionalChain([onConnected, 'optionalCall', _75 => _75({ address: addr, smartAccount })]);
     },
     [onConnected]
   );
@@ -3031,28 +3105,28 @@ function DepositFlow({
   );
   const handleDepositSubmittedCallback = _react.useCallback.call(void 0, 
     (txHash, sourceChain, amount) => {
-      _optionalChain([onDepositSubmitted, 'optionalCall', _73 => _73({ txHash, sourceChain, amount })]);
+      _optionalChain([onDepositSubmitted, 'optionalCall', _76 => _76({ txHash, sourceChain, amount })]);
     },
     [onDepositSubmitted]
   );
   const handleDepositComplete = _react.useCallback.call(void 0, 
     (txHash, destinationTxHash) => {
       logFlow("deposit:complete", { txHash, destinationTxHash });
-      _optionalChain([onDepositComplete, 'optionalCall', _74 => _74({ txHash, destinationTxHash })]);
+      _optionalChain([onDepositComplete, 'optionalCall', _77 => _77({ txHash, destinationTxHash })]);
     },
     [logFlow, onDepositComplete]
   );
   const handleDepositFailed = _react.useCallback.call(void 0, 
     (txHash, error) => {
       logFlowError("deposit:failed", error, { txHash });
-      _optionalChain([onDepositFailed, 'optionalCall', _75 => _75({ txHash, error })]);
+      _optionalChain([onDepositFailed, 'optionalCall', _78 => _78({ txHash, error })]);
     },
     [logFlowError, onDepositFailed]
   );
   const handleError = _react.useCallback.call(void 0, 
     (message, code) => {
       logFlowError("flow:error", message, { code });
-      _optionalChain([onError, 'optionalCall', _76 => _76({ message, code })]);
+      _optionalChain([onError, 'optionalCall', _79 => _79({ message, code })]);
     },
     [logFlowError, onError]
   );
@@ -3089,6 +3163,17 @@ function DepositFlow({
       setFlowMode(null);
     }
   }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext]);
+  _react.useEffect.call(void 0, () => {
+    if (enableSolana || flowMode !== "solana-wallet") {
+      return;
+    }
+    setFlowMode(null);
+    setIsConnectSelectionConfirmed(false);
+    setSelectedWalletId(null);
+    if (step.type !== "processing") {
+      setStep({ type: "setup" });
+    }
+  }, [enableSolana, flowMode, step.type]);
   _react.useEffect.call(void 0, () => {
     if (hasNavigatedBackRef.current || isConnectSelectionConfirmed || flowMode) {
       return;
@@ -3098,7 +3183,7 @@ function DepositFlow({
       if (walletId) {
         const selectedOption = walletOptions.find((o) => o.id === walletId);
         setSelectedWalletId(walletId);
-        if (_optionalChain([selectedOption, 'optionalAccess', _77 => _77.kind]) === "solana") {
+        if (enableSolana && _optionalChain([selectedOption, 'optionalAccess', _80 => _80.kind]) === "solana") {
           handleSelectSolanaWallet();
         } else {
           handleSelectProvider();
@@ -3114,6 +3199,7 @@ function DepositFlow({
   }, [
     hasWalletOptions,
     hasReownSession,
+    enableSolana,
     isConnectSelectionConfirmed,
     flowMode,
     selectedWalletIdEffective,
@@ -3145,7 +3231,7 @@ function DepositFlow({
           const selectedOption = walletOptions.find(
             (o) => o.id === selectedWalletIdEffective
           );
-          if (_optionalChain([selectedOption, 'optionalAccess', _78 => _78.kind]) === "solana") {
+          if (enableSolana && _optionalChain([selectedOption, 'optionalAccess', _81 => _81.kind]) === "solana") {
             handleSelectSolanaWallet();
           } else {
             handleSelectProvider();
@@ -3169,6 +3255,7 @@ function DepositFlow({
           sessionChainIds,
           recipient,
           forceRegister,
+          enableSolana,
           service,
           onSetupComplete: handleSetupComplete,
           onConnected: handleConnected,
@@ -3179,7 +3266,7 @@ function DepositFlow({
         DepositAddressStep,
         {
           smartAccount: step.smartAccount,
-          solanaDepositAddress: step.solanaDepositAddress,
+          solanaDepositAddress: enableSolana ? step.solanaDepositAddress : void 0,
           service,
           onDepositDetected: handleDepositAddressDetected,
           onError: handleError
@@ -3211,8 +3298,8 @@ function DepositFlow({
   }
   if (isSolanaWalletMode) {
     if (!sessionKeyAddress) return null;
-    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _79 => _79.solanaAddress]);
-    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _80 => _80.solanaProvider]);
+    const solanaAddr = _optionalChain([reownWallet, 'optionalAccess', _82 => _82.solanaAddress]);
+    const solanaProvider = _optionalChain([reownWallet, 'optionalAccess', _83 => _83.solanaProvider]);
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
       step.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
         SetupStep,
@@ -3224,6 +3311,7 @@ function DepositFlow({
           sessionChainIds,
           recipient,
           forceRegister,
+          enableSolana,
           service,
           onSetupComplete: handleSetupComplete,
           onConnected: handleConnected,
@@ -3246,6 +3334,8 @@ function DepositFlow({
           token: step.token,
           balance: step.balance,
           balanceUsd: step.balanceUsd,
+          defaultAmount: step.inputAmountUsd,
+          uiConfig,
           onContinue: handleSolanaAmountContinue,
           debug
         }
@@ -3257,7 +3347,8 @@ function DepositFlow({
           solanaAddress: solanaAddr,
           solanaDepositAddress: step.solanaDepositAddress,
           token: step.token,
-          amount: step.amount,
+          sourceAmount: step.sourceAmount,
+          inputAmountUsd: step.inputAmountUsd,
           targetAmount: step.targetAmount,
           targetTokenPriceUsd: step.targetTokenPriceUsd,
           targetChain,
@@ -3326,13 +3417,13 @@ function DepositFlow({
       )
     ] });
   }
-  if (!_optionalChain([signerContext, 'optionalAccess', _81 => _81.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _82 => _82.publicClient])) {
+  if (!_optionalChain([signerContext, 'optionalAccess', _84 => _84.walletClient]) || !_optionalChain([signerContext, 'optionalAccess', _85 => _85.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..." }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
-  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _83 => _83.walletClient, 'optionalAccess', _84 => _84.chain, 'optionalAccess', _85 => _85.id]), () => ( _optionalChain([signerContext, 'access', _86 => _86.publicClient, 'access', _87 => _87.chain, 'optionalAccess', _88 => _88.id]))), () => ( targetChain));
+  const ownerChainId = _nullishCoalesce(_nullishCoalesce(_optionalChain([signerContext, 'access', _86 => _86.walletClient, 'optionalAccess', _87 => _87.chain, 'optionalAccess', _88 => _88.id]), () => ( _optionalChain([signerContext, 'access', _89 => _89.publicClient, 'access', _90 => _90.chain, 'optionalAccess', _91 => _91.id]))), () => ( targetChain));
   const getReadClientForChain = (chainId) => {
-    if (_optionalChain([signerContext, 'access', _89 => _89.publicClient, 'access', _90 => _90.chain, 'optionalAccess', _91 => _91.id]) === chainId) {
+    if (_optionalChain([signerContext, 'access', _92 => _92.publicClient, 'access', _93 => _93.chain, 'optionalAccess', _94 => _94.id]) === chainId) {
       return signerContext.publicClient;
     }
     return _chunk7HJ7IBRHcjs.getPublicClient.call(void 0, chainId);
@@ -3349,6 +3440,7 @@ function DepositFlow({
         sessionChainIds,
         recipient,
         forceRegister,
+        enableSolana,
         service,
         onSetupComplete: handleSetupComplete,
         onConnected: handleConnected,
@@ -3432,7 +3524,7 @@ function DepositFlow({
 // src/DepositModal.tsx
 
 var ReownDepositInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-SV6QIUTL.cjs"))).then((m) => ({ default: m.DepositModalReown }))
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-SUED62QO.cjs"))).then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
@@ -3461,6 +3553,7 @@ function DepositModalInner({
   sessionChainIds,
   forceRegister = false,
   waitForFinalTx = true,
+  enableSolana = true,
   reownWallet,
   onConnect,
   onDisconnect,
@@ -3504,7 +3597,7 @@ function DepositModalInner({
   _react.useEffect.call(void 0, () => {
     if (isOpen && !hasCalledReady.current) {
       hasCalledReady.current = true;
-      _optionalChain([onReady, 'optionalCall', _92 => _92()]);
+      _optionalChain([onReady, 'optionalCall', _95 => _95()]);
     }
   }, [isOpen, onReady]);
   _react.useEffect.call(void 0, () => {
@@ -3523,14 +3616,14 @@ function DepositModalInner({
     setTotalBalanceUsd(balance2);
   }, []);
   const handleBack = _react.useCallback.call(void 0, () => {
-    _optionalChain([backHandlerRef, 'access', _93 => _93.current, 'optionalCall', _94 => _94()]);
+    _optionalChain([backHandlerRef, 'access', _96 => _96.current, 'optionalCall', _97 => _97()]);
   }, []);
-  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _95 => _95.showLogo]), () => ( false));
-  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _96 => _96.showStepper]), () => ( false));
-  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _97 => _97.showBackButton]), () => ( true));
-  const balance = _optionalChain([uiConfig, 'optionalAccess', _98 => _98.balance]);
-  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _99 => _99.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
-  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _100 => _100.title]), () => ( "Deposit"));
+  const showLogo = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _98 => _98.showLogo]), () => ( false));
+  const showStepper = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _99 => _99.showStepper]), () => ( false));
+  const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _100 => _100.showBackButton]), () => ( true));
+  const balance = _optionalChain([uiConfig, 'optionalAccess', _101 => _101.balance]);
+  const logoUrl = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _102 => _102.logoUrl]), () => ( "https://github.com/rhinestonewtf.png"));
+  const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _103 => _103.title]), () => ( "Deposit"));
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 4 && backHandlerRef.current !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
     _chunk7HJ7IBRHcjs.Modal,
@@ -3641,6 +3734,7 @@ function DepositModalInner({
             sessionChainIds,
             forceRegister,
             waitForFinalTx,
+            enableSolana,
             reownWallet,
             onConnect,
             onDisconnect,