@rhinestone/deposit-modal 0.2.1 → 0.2.3

package/dist/{chunk-PZ3GVS3D.cjs → chunk-TYJEZX6S.cjs}

@@ -28,7 +28,7 @@
 
 
 
-var _chunkXW4M7WDIcjs = require('./chunk-XW4M7WDI.cjs');
+var _chunkT2KOQH57cjs = require('./chunk-T2KOQH57.cjs');
 
 
 
@@ -68,15 +68,15 @@ var _viem = require('viem');
 
 var _jsxruntime = require('react/jsx-runtime');
 async function resolveSessionOwner(eoaAddress) {
-  const localOwner = _chunkXW4M7WDIcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
+  const localOwner = _chunkT2KOQH57cjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
   if (localOwner) {
     return {
-      account: _chunkXW4M7WDIcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
+      account: _chunkT2KOQH57cjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
       address: localOwner.address
     };
   }
-  const created = _chunkXW4M7WDIcjs.createSessionOwnerKey.call(void 0, );
-  _chunkXW4M7WDIcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
+  const created = _chunkT2KOQH57cjs.createSessionOwnerKey.call(void 0, );
+  _chunkT2KOQH57cjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
   return {
     account: created.account,
     address: created.address
@@ -115,7 +115,7 @@ function SetupStep({
       const setup = await service.setupAccount({
         ownerAddress: address,
         sessionOwnerAddress: sessionOwner.address,
-        targetChain: _chunkXW4M7WDIcjs.toEvmCaip2.call(void 0, targetChain),
+        targetChain: _chunkT2KOQH57cjs.toEvmCaip2.call(void 0, targetChain),
         targetToken,
         recipient,
         postBridgeActions,
@@ -149,7 +149,7 @@ function SetupStep({
         primaryType: typedData.primaryType,
         message: typedData.message
       });
-      const sessionDetails = _chunkXW4M7WDIcjs.buildSessionDetails.call(void 0, setup.sessionDetailsUnsigned, signature);
+      const sessionDetails = _chunkT2KOQH57cjs.buildSessionDetails.call(void 0, setup.sessionDetailsUnsigned, signature);
       setState({ type: "registering" });
       const registerResult = await service.registerAccount({
         address: smartAccount,
@@ -161,7 +161,7 @@ function SetupStep({
         eoaAddress: address,
         sessionOwner: sessionOwner.address,
         target: {
-          chain: _chunkXW4M7WDIcjs.toEvmCaip2.call(void 0, targetChain),
+          chain: _chunkT2KOQH57cjs.toEvmCaip2.call(void 0, targetChain),
           token: targetToken,
           ...recipient && { recipient },
           ..._optionalChain([postBridgeActions, 'optionalAccess', _2 => _2.length]) && { postBridgeActions },
@@ -230,7 +230,7 @@ function SetupStep({
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-step", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", children: [
       isLoading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.Spinner, { className: "rs-spinner--lg rs-text-accent" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.Spinner, { className: "rs-spinner--lg rs-text-accent" }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-text", children: [
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-title", children: renderStateMessage() }),
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-loading-subtitle", children: "This may take a moment" })
@@ -267,7 +267,7 @@ function SetupStep({
         ] })
       ] })
     ] }),
-    isError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.Button, { onClick: handleRetry, variant: "default", fullWidth: true, children: "Try Again" }) })
+    isError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.Button, { onClick: handleRetry, variant: "default", fullWidth: true, children: "Try Again" }) })
   ] });
 }
 
@@ -293,7 +293,7 @@ function AssetSelectStep({
   const [error, setError] = _react.useState.call(void 0, null);
   const defaultAssetId = _react.useMemo.call(void 0, () => {
     if (!defaultSourceChain || !defaultSourceToken) return null;
-    return _chunkXW4M7WDIcjs.getAssetId.call(void 0, {
+    return _chunkT2KOQH57cjs.getAssetId.call(void 0, {
       chainId: defaultSourceChain,
       token: defaultSourceToken
     });
@@ -310,7 +310,7 @@ function AssetSelectStep({
       try {
         const portfolio = await service.fetchPortfolio(address);
         if (!active) return;
-        const portfolioAssets = _chunkXW4M7WDIcjs.portfolioToAssets.call(void 0, portfolio.tokens);
+        const portfolioAssets = _chunkT2KOQH57cjs.portfolioToAssets.call(void 0, portfolio.tokens);
         setAssets(portfolioAssets);
         const hasNative = portfolioAssets.some(
           (asset) => asset.token.toLowerCase() === _chunkMUWVDVY4cjs.NATIVE_TOKEN_ADDRESS
@@ -391,7 +391,7 @@ function AssetSelectStep({
       const raw = _viem.formatUnits.call(void 0, BigInt(asset.balance), asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkXW4M7WDIcjs.tokenFormatter.format(numeric);
+      return _chunkT2KOQH57cjs.tokenFormatter.format(numeric);
     } catch (e3) {
       return asset.balance;
     }
@@ -405,7 +405,7 @@ function AssetSelectStep({
         style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
         children: [
           loading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.Spinner, { className: "rs-text-tertiary" }),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
           ] }),
           error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-alert-text", children: error }) }),
@@ -504,7 +504,7 @@ function AssetSelectStep({
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? _chunkXW4M7WDIcjs.currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
+                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: asset.balanceUsd !== void 0 && asset.balanceUsd > 0 ? _chunkT2KOQH57cjs.currencyFormatter.format(asset.balanceUsd) : tokenAmount !== "--" ? `${tokenAmount} ${asset.symbol}` : "--" })
                 ]
               },
               asset.id
@@ -514,7 +514,7 @@ function AssetSelectStep({
       }
     ),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: () => selectedAsset && onContinue(selectedAsset),
         disabled: !selectedAsset,
@@ -522,7 +522,7 @@ function AssetSelectStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 async function fetchNativeAssets(address, publicClient, existing) {
@@ -530,7 +530,7 @@ async function fetchNativeAssets(address, publicClient, existing) {
   const connectedChainId = _optionalChain([publicClient, 'access', _12 => _12.chain, 'optionalAccess', _13 => _13.id]);
   if (!connectedChainId) return [];
   if (!_chunkMUWVDVY4cjs.SOURCE_CHAINS.some((chain) => chain.id === connectedChainId)) return [];
-  const id = _chunkXW4M7WDIcjs.getAssetId.call(void 0, {
+  const id = _chunkT2KOQH57cjs.getAssetId.call(void 0, {
     chainId: connectedChainId,
     token: _chunkMUWVDVY4cjs.NATIVE_TOKEN_ADDRESS
   });
@@ -619,7 +619,7 @@ function AmountStep({
       const balanceTarget = _nullishCoalesce(balanceAddress, () => ( address));
       if (!balanceTarget || !publicClient) return;
       try {
-        const bal = _chunkXW4M7WDIcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: balanceTarget }) : await publicClient.readContract({
+        const bal = _chunkT2KOQH57cjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: balanceTarget }) : await publicClient.readContract({
           address: asset.token,
           abi: _viem.erc20Abi,
           functionName: "balanceOf",
@@ -645,7 +645,7 @@ function AmountStep({
       setIsSwitching(true);
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkXW4M7WDIcjs.formatUserError.call(void 0, raw));
+        setError(_chunkT2KOQH57cjs.formatUserError.call(void 0, raw));
       }).finally(() => {
         setIsSwitching(false);
       });
@@ -681,7 +681,7 @@ function AmountStep({
       const raw = _viem.formatUnits.call(void 0, balance, asset.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkXW4M7WDIcjs.tokenFormatter.format(numeric);
+      return _chunkT2KOQH57cjs.tokenFormatter.format(numeric);
     } catch (e8) {
       return "...";
     }
@@ -725,7 +725,7 @@ function AmountStep({
       const usdValue = numericAmount;
       if (_optionalChain([uiConfig, 'optionalAccess', _18 => _18.maxDepositUsd]) && usdValue > uiConfig.maxDepositUsd) {
         setError(
-          `Maximum deposit is ${_chunkXW4M7WDIcjs.currencyFormatter.format(uiConfig.maxDepositUsd)}`
+          `Maximum deposit is ${_chunkT2KOQH57cjs.currencyFormatter.format(uiConfig.maxDepositUsd)}`
         );
         return;
       }
@@ -807,7 +807,7 @@ function AmountStep({
           hasPricing && balanceUsd !== null && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { style: { color: "var(--rs-muted-foreground)" }, children: [
             " ",
             "(",
-            _chunkXW4M7WDIcjs.currencyFormatter.format(balanceUsd),
+            _chunkT2KOQH57cjs.currencyFormatter.format(balanceUsd),
             ")"
           ] })
         ] }) })
@@ -944,7 +944,7 @@ function AmountStep({
         )
       ] }),
       _optionalChain([uiConfig, 'optionalAccess', _21 => _21.minDepositUsd]) && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-minimum", children: [
-        _chunkXW4M7WDIcjs.currencyFormatter.format(uiConfig.minDepositUsd),
+        _chunkT2KOQH57cjs.currencyFormatter.format(uiConfig.minDepositUsd),
         " minimum deposit"
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", children: [
@@ -970,7 +970,7 @@ function AmountStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: handleContinue,
         fullWidth: true,
@@ -978,7 +978,7 @@ function AmountStep({
         children: isCheckingLiquidity ? "Checking liquidity\u2026" : _optionalChain([uiConfig, 'optionalAccess', _22 => _22.minDepositUsd]) && parseFloat(amount) > 0 && parseFloat(amount) < uiConfig.minDepositUsd ? "Update order" : "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 
@@ -1029,7 +1029,7 @@ function ConfirmStep({
       setIsSwitching(true);
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkXW4M7WDIcjs.formatUserError.call(void 0, raw));
+        setError(_chunkT2KOQH57cjs.formatUserError.call(void 0, raw));
       }).finally(() => {
         setIsSwitching(false);
       });
@@ -1072,7 +1072,7 @@ function ConfirmStep({
         throw new Error("Wallet not properly connected");
       }
       const transferTo = sameRoute ? recipient : smartAccount;
-      const hash = _chunkXW4M7WDIcjs.isNativeAsset.call(void 0, asset) ? await walletClient.sendTransaction({
+      const hash = _chunkT2KOQH57cjs.isNativeAsset.call(void 0, asset) ? await walletClient.sendTransaction({
         account,
         chain,
         to: transferTo,
@@ -1089,7 +1089,7 @@ function ConfirmStep({
       onConfirm(hash, asset.chainId, amountUnits.toString(), asset.token);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
-      const message = _chunkXW4M7WDIcjs.formatUserError.call(void 0, raw);
+      const message = _chunkT2KOQH57cjs.formatUserError.call(void 0, raw);
       setError(message);
       _optionalChain([onError, 'optionalCall', _26 => _26(message, "TRANSFER_ERROR")]);
     } finally {
@@ -1231,7 +1231,7 @@ function ConfirmStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: handleConfirm,
         loading: isSubmitting,
@@ -1240,7 +1240,7 @@ function ConfirmStep({
         children: "Confirm Order"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 
@@ -1378,9 +1378,9 @@ var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
 function isEventForTx(event, txHash) {
-  const eventTxHash = _chunkXW4M7WDIcjs.getEventTxHash.call(void 0, event);
+  const eventTxHash = _chunkT2KOQH57cjs.getEventTxHash.call(void 0, event);
   if (!eventTxHash) return false;
-  return _chunkXW4M7WDIcjs.txRefsMatch.call(void 0, eventTxHash, txHash);
+  return _chunkT2KOQH57cjs.txRefsMatch.call(void 0, eventTxHash, txHash);
 }
 function truncateHash(hash) {
   return `${hash.slice(0, 4)}\u2026${hash.slice(-4)}`;
@@ -1451,6 +1451,7 @@ var txLinkIcon = /* @__PURE__ */ _jsxruntime.jsx.call(void 0,
 function DepositNotification({
   deposit,
   smartAccount,
+  solanaDepositAddress,
   targetChain,
   targetToken,
   waitForFinalTx,
@@ -1474,7 +1475,7 @@ function DepositNotification({
   const pollIntervalRef = _react.useRef.call(void 0, INITIAL_POLL_INTERVAL);
   const pollTimeoutRef = _react.useRef.call(void 0, null);
   const completedRef = _react.useRef.call(void 0, _nullishCoalesce(directTransfer, () => ( false)));
-  const depositContextRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, {
+  const depositContextRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, {
     amount,
     sourceChain,
     sourceToken: token,
@@ -1483,8 +1484,8 @@ function DepositNotification({
     waitForFinalTx,
     hasPostBridgeActions
   });
-  const onCompleteRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onComplete);
-  const onFailedRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onFailed);
+  const onCompleteRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onComplete);
+  const onFailedRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onFailed);
   const handleComplete = _react.useCallback.call(void 0, 
     (destTxHash) => {
       if (completedRef.current) return;
@@ -1521,7 +1522,8 @@ function DepositNotification({
     let isMounted = true;
     async function pollStatus() {
       try {
-        const data = await service.fetchStatus(smartAccount, txHash);
+        const account = sourceChain === "solana" && solanaDepositAddress ? solanaDepositAddress : smartAccount;
+        const data = await service.fetchStatus(account, txHash);
         if (!isMounted) return;
         const lastEvent = data.lastEvent;
         const eventForTx = isEventForTx(lastEvent, txHash) ? lastEvent : void 0;
@@ -1582,6 +1584,8 @@ function DepositNotification({
     handleFailed,
     service,
     smartAccount,
+    solanaDepositAddress,
+    sourceChain,
     status,
     txHash
   ]);
@@ -1621,7 +1625,7 @@ function DepositNotification({
         }
       )
     }
-  ) }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.Spinner, {}) });
+  ) }) : /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-notification-badge rs-deposit-notification-badge--processing", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.Spinner, {}) });
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
     "div",
     {
@@ -2140,10 +2144,10 @@ function DepositAddressStep({
           return;
         }
         const event = status.lastEvent;
-        const eventTxHash = _chunkXW4M7WDIcjs.isDepositEvent.call(void 0, event) ? _nullishCoalesce(_chunkXW4M7WDIcjs.getEventTxHash.call(void 0, event), () => ( null)) : null;
+        const eventTxHash = _chunkT2KOQH57cjs.isDepositEvent.call(void 0, event) ? _nullishCoalesce(_chunkT2KOQH57cjs.getEventTxHash.call(void 0, event), () => ( null)) : null;
         if (baselineTxHashRef.current === void 0) {
           baselineTxHashRef.current = eventTxHash;
-        } else if (eventTxHash && (!baselineTxHashRef.current || !_chunkXW4M7WDIcjs.txRefsMatch.call(void 0, eventTxHash, baselineTxHashRef.current))) {
+        } else if (eventTxHash && (!baselineTxHashRef.current || !_chunkT2KOQH57cjs.txRefsMatch.call(void 0, eventTxHash, baselineTxHashRef.current))) {
           const details = getDepositEventDetails(event);
           const fallback = sourceSelectionRef.current;
           const chainId = _nullishCoalesce(details.chainId, () => ( fallback.chainId));
@@ -2377,9 +2381,29 @@ function DepositAddressStep({
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, QRCode, { value: displayAddress, size: 150, iconSrc: qrIconSrc }) }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-info", children: [
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-deposit-address-label", children: [
-          "Your ",
-          isSolana ? "Solana" : "EVM",
-          " deposit address"
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: "Your deposit address" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, Tooltip, { content: "Send any accepted token to this address and it will auto swap to your account.", children: /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
+            "svg",
+            {
+              className: "rs-deposit-address-label-icon",
+              viewBox: "0 0 24 24",
+              fill: "none",
+              stroke: "currentColor",
+              strokeWidth: "2",
+              "aria-hidden": "true",
+              children: [
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "circle", { cx: "12", cy: "12", r: "9" }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
+                  "path",
+                  {
+                    strokeLinecap: "round",
+                    strokeLinejoin: "round",
+                    d: "M12 8h.01M11 12h1v4h1"
+                  }
+                )
+              ]
+            }
+          ) })
         ] }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-deposit-address-value", children: displayAddress }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, 
@@ -2544,6 +2568,7 @@ function DepositAddressStep({
       {
         deposit,
         smartAccount,
+        solanaDepositAddress,
         targetChain,
         targetToken,
         waitForFinalTx,
@@ -2555,7 +2580,7 @@ function DepositAddressStep({
       },
       deposit.id
     )) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 DepositAddressStep.displayName = "DepositAddressStep";
@@ -2586,7 +2611,7 @@ function SolanaTokenSelectStep({
       setError(null);
       const portfolioBySymbol = {};
       try {
-        _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:request", {
+        _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:request", {
           solanaAddress
         });
         const portfolio = await service.fetchSolanaPortfolio(solanaAddress);
@@ -2609,12 +2634,12 @@ function SolanaTokenSelectStep({
             };
           }
         }
-        _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:success", {
+        _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-token-select", "portfolio:success", {
           symbols: Object.keys(portfolioBySymbol)
         });
       } catch (err) {
         if (!active) return;
-        _chunkXW4M7WDIcjs.debugError.call(void 0, debug, "solana-token-select", "portfolio:failure", err, {
+        _chunkT2KOQH57cjs.debugError.call(void 0, debug, "solana-token-select", "portfolio:failure", err, {
           solanaAddress
         });
         setError(
@@ -2668,7 +2693,7 @@ function SolanaTokenSelectStep({
         style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
         children: [
           loading && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
-            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.Spinner, { className: "rs-text-tertiary" }),
             /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
           ] }),
           !loading && rows.length === 0 && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-empty-state", children: [
@@ -2705,7 +2730,7 @@ function SolanaTokenSelectStep({
             try {
               const raw = _viem.formatUnits.call(void 0, entry.balance, entry.token.decimals);
               const numeric = Number(raw);
-              formattedBalance = Number.isFinite(numeric) ? _chunkXW4M7WDIcjs.tokenFormatter.format(numeric) : raw;
+              formattedBalance = Number.isFinite(numeric) ? _chunkT2KOQH57cjs.tokenFormatter.format(numeric) : raw;
             } catch (e16) {
               formattedBalance = "...";
             }
@@ -2749,7 +2774,7 @@ function SolanaTokenSelectStep({
                       ] })
                     ] })
                   ] }),
-                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? _chunkXW4M7WDIcjs.currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
+                  /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? _chunkT2KOQH57cjs.currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
                 ]
               },
               entry.token.symbol
@@ -2759,7 +2784,7 @@ function SolanaTokenSelectStep({
       }
     ),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: () => selectedEntry && onContinue(
           selectedEntry.token,
@@ -2771,7 +2796,7 @@ function SolanaTokenSelectStep({
         children: "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 
@@ -2819,7 +2844,7 @@ function SolanaAmountStep({
       const raw = _viem.formatUnits.call(void 0, balance, token.decimals);
       const numeric = Number(raw);
       if (!Number.isFinite(numeric)) return raw;
-      return _chunkXW4M7WDIcjs.tokenFormatter.format(numeric);
+      return _chunkT2KOQH57cjs.tokenFormatter.format(numeric);
     } catch (e18) {
       return "...";
     }
@@ -2837,7 +2862,7 @@ function SolanaAmountStep({
   }, [balance, token.decimals, tokenPriceUsd, balanceUsd]);
   const formattedBalanceUsd = _react.useMemo.call(void 0, () => {
     if (computedBalanceUsd === null || computedBalanceUsd <= 0) return null;
-    return _chunkXW4M7WDIcjs.currencyFormatter.format(computedBalanceUsd);
+    return _chunkT2KOQH57cjs.currencyFormatter.format(computedBalanceUsd);
   }, [computedBalanceUsd]);
   const spendableBalance = _react.useMemo.call(void 0, () => {
     if (!isNativeSol(token)) return balance;
@@ -2862,7 +2887,7 @@ function SolanaAmountStep({
       const factor = 10 ** maxDecimals;
       const truncated = Math.floor(value * factor) / factor;
       const formatted = truncated.toFixed(maxDecimals).replace(/\.?0+$/, "");
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-amount", "amount:preset", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-amount", "amount:preset", {
         percentage,
         symbol: token.symbol,
         formatted
@@ -2876,7 +2901,7 @@ function SolanaAmountStep({
   const handleContinue = () => {
     const numericAmount = parseFloat(amount);
     if (isNaN(numericAmount) || numericAmount <= 0) {
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
         amount,
         reason: "nan-or-non-positive"
       });
@@ -2888,7 +2913,7 @@ function SolanaAmountStep({
       const usdValue = numericAmount;
       if (_optionalChain([uiConfig, 'optionalAccess', _82 => _82.maxDepositUsd]) && usdValue > uiConfig.maxDepositUsd) {
         setError(
-          `Maximum deposit is ${_chunkXW4M7WDIcjs.currencyFormatter.format(uiConfig.maxDepositUsd)}`
+          `Maximum deposit is ${_chunkT2KOQH57cjs.currencyFormatter.format(uiConfig.maxDepositUsd)}`
         );
         return;
       }
@@ -2903,7 +2928,7 @@ function SolanaAmountStep({
     try {
       amountInUnits = _viem.parseUnits.call(void 0, sourceAmountStr, token.decimals);
     } catch (e22) {
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
         amount,
         sourceAmount: sourceAmountStr,
         reason: "parse-units-failed"
@@ -2913,7 +2938,7 @@ function SolanaAmountStep({
     }
     if (amountInUnits > spendableBalance) {
       const isReserveIssue = isNativeSol(token) && amountInUnits <= balance;
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-amount", "amount:invalid", {
         amount,
         balance: balance.toString(),
         spendableBalance: spendableBalance.toString(),
@@ -2925,7 +2950,7 @@ function SolanaAmountStep({
       );
       return;
     }
-    _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-amount", "amount:continue", {
+    _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-amount", "amount:continue", {
       symbol: token.symbol,
       inputAmountUsd: amount,
       sourceAmount: sourceAmountStr,
@@ -2994,7 +3019,7 @@ function SolanaAmountStep({
         )
       ] }),
       _optionalChain([uiConfig, 'optionalAccess', _84 => _84.minDepositUsd]) && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-minimum", children: [
-        _chunkXW4M7WDIcjs.currencyFormatter.format(uiConfig.minDepositUsd),
+        _chunkT2KOQH57cjs.currencyFormatter.format(uiConfig.minDepositUsd),
         " minimum deposit"
       ] }),
       error && /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-amount-error", children: [
@@ -3020,7 +3045,7 @@ function SolanaAmountStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: handleContinue,
         fullWidth: true,
@@ -3028,7 +3053,7 @@ function SolanaAmountStep({
         children: _optionalChain([uiConfig, 'optionalAccess', _85 => _85.minDepositUsd]) && parseFloat(amount) > 0 && parseFloat(amount) < uiConfig.minDepositUsd ? "Update order" : "Continue"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 
@@ -3072,7 +3097,7 @@ function SolanaConfirmStep({
   const receiveAmount = isSameToken ? formattedReceiveAmount : `~ ${formattedReceiveAmount}`;
   const handleConfirm = async () => {
     if (!solanaProvider) {
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
         reason: "missing-provider"
       });
       setError("Solana wallet not connected");
@@ -3080,7 +3105,7 @@ function SolanaConfirmStep({
     }
     const parsedAmount = parseFloat(sourceAmount);
     if (isNaN(parsedAmount) || parsedAmount <= 0) {
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "submit:blocked", {
         reason: "invalid-amount",
         sourceAmount
       });
@@ -3089,7 +3114,7 @@ function SolanaConfirmStep({
     }
     setError(null);
     setIsSubmitting(true);
-    _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "submit:start", {
+    _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "submit:start", {
       smartAccount,
       solanaAddress,
       solanaDepositAddress,
@@ -3099,7 +3124,7 @@ function SolanaConfirmStep({
     });
     try {
       const check = await service.checkAccount(smartAccount);
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "check:success", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "check:success", {
         smartAccount,
         isRegistered: check.isRegistered,
         targetChain: check.targetChain,
@@ -3112,7 +3137,7 @@ function SolanaConfirmStep({
       }
       const connection = getSolanaConnection();
       const amountUnits = _viem.parseUnits.call(void 0, sourceAmount, token.decimals);
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:start", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:start", {
         token: token.symbol,
         sourceAmount,
         amountUnits: amountUnits.toString()
@@ -3129,7 +3154,7 @@ function SolanaConfirmStep({
         token.mint,
         amountUnits
       );
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "tx:build:success", {
         token: token.symbol,
         instructionCount: transaction.instructions.length,
         feePayer: _optionalChain([transaction, 'access', _86 => _86.feePayer, 'optionalAccess', _87 => _87.toBase58, 'call', _88 => _88()]),
@@ -3140,15 +3165,15 @@ function SolanaConfirmStep({
         connection,
         transaction
       );
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "solana-confirm", "tx:sent", {
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "solana-confirm", "tx:sent", {
         txHash,
         amountUnits: amountUnits.toString()
       });
       onConfirm(txHash, amountUnits.toString());
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Transfer failed";
-      const message = _chunkXW4M7WDIcjs.formatUserError.call(void 0, raw);
-      _chunkXW4M7WDIcjs.debugError.call(void 0, debug, "solana-confirm", "submit:failure", err, {
+      const message = _chunkT2KOQH57cjs.formatUserError.call(void 0, raw);
+      _chunkT2KOQH57cjs.debugError.call(void 0, debug, "solana-confirm", "submit:failure", err, {
         smartAccount,
         token: token.symbol,
         sourceAmount
@@ -3281,7 +3306,7 @@ function SolanaConfirmStep({
       ] })
     ] }),
     /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-step-footer", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.Button,
+      _chunkT2KOQH57cjs.Button,
       {
         onClick: handleConfirm,
         loading: isSubmitting,
@@ -3290,7 +3315,7 @@ function SolanaConfirmStep({
         children: "Confirm Order"
       }
     ) }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkXW4M7WDIcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkT2KOQH57cjs.PoweredBy, {})
   ] });
 }
 
@@ -3342,14 +3367,14 @@ function DepositFlow({
   onError,
   debug
 }) {
-  const onStepChangeRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onStepChange);
-  const onTotalBalanceChangeRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onTotalBalanceChange);
-  const onSmartAccountChangeRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onSmartAccountChange);
-  const onEventRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onEvent);
-  const onDepositSubmittedRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositSubmitted);
-  const onDepositCompleteRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositComplete);
-  const onDepositFailedRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositFailed);
-  const onErrorRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onError);
+  const onStepChangeRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onStepChange);
+  const onTotalBalanceChangeRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onTotalBalanceChange);
+  const onSmartAccountChangeRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onSmartAccountChange);
+  const onEventRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onEvent);
+  const onDepositSubmittedRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositSubmitted);
+  const onDepositCompleteRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositComplete);
+  const onDepositFailedRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositFailed);
+  const onErrorRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onError);
   const hasInitialReownSession = Boolean(
     enableSolana ? _optionalChain([reownWallet, 'optionalAccess', _90 => _90.isConnected]) || _optionalChain([reownWallet, 'optionalAccess', _91 => _91.address]) : _optionalChain([reownWallet, 'optionalAccess', _92 => _92.address])
   );
@@ -3369,13 +3394,13 @@ function DepositFlow({
   flowModeRef.current = flowMode;
   const logFlow = _react.useCallback.call(void 0, 
     (message, data) => {
-      _chunkXW4M7WDIcjs.debugLog.call(void 0, debug, "deposit-flow", message, data);
+      _chunkT2KOQH57cjs.debugLog.call(void 0, debug, "deposit-flow", message, data);
     },
     [debug]
   );
   const logFlowError = _react.useCallback.call(void 0, 
     (message, error, data) => {
-      _chunkXW4M7WDIcjs.debugError.call(void 0, debug, "deposit-flow", message, error, data);
+      _chunkT2KOQH57cjs.debugError.call(void 0, debug, "deposit-flow", message, error, data);
     },
     [debug]
   );
@@ -3499,7 +3524,7 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
@@ -3508,7 +3533,7 @@ function DepositFlow({
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, fallbackChainId))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, fallbackChainId))),
         switchChain: dappSwitchChain
       };
     }
@@ -3522,7 +3547,7 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
@@ -3531,7 +3556,7 @@ function DepositFlow({
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, fallbackChainId))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, fallbackChainId))),
         switchChain: dappSwitchChain
       };
     }
@@ -3539,7 +3564,7 @@ function DepositFlow({
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
-        publicClient: _nullishCoalesce(reownWallet.publicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(reownWallet.publicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, targetChain))),
         switchChain: reownWallet.switchChain
       };
     }
@@ -3577,7 +3602,7 @@ function DepositFlow({
       return {
         ownerAddress: dappAddress,
         walletClient: void 0,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkXW4M7WDIcjs.getPublicClient.call(void 0, targetChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkT2KOQH57cjs.getPublicClient.call(void 0, targetChain))),
         switchChain: void 0
       };
     }
@@ -3755,7 +3780,7 @@ function DepositFlow({
     setStep({ type: "setup" });
   }, []);
   const handleNewDeposit = _react.useCallback.call(void 0, () => {
-    _optionalChain([onSmartAccountChangeRef, 'access', _129 => _129.current, 'optionalCall', _130 => _130(null)]);
+    _optionalChain([onSmartAccountChangeRef, 'access', _129 => _129.current, 'optionalCall', _130 => _130({ evm: null, solana: null })]);
     setFlowMode(null);
     setStep({ type: "setup" });
     setIsConnectSelectionConfirmed(false);
@@ -3769,7 +3794,10 @@ function DepositFlow({
         hasSolanaDepositAddress: Boolean(solanaDepositAddress),
         flowMode: isDepositAddressMode ? "deposit-address" : isSolanaWalletMode ? "solana-wallet" : "wallet"
       });
-      _optionalChain([onSmartAccountChangeRef, 'access', _131 => _131.current, 'optionalCall', _132 => _132(smartAccount)]);
+      _optionalChain([onSmartAccountChangeRef, 'access', _131 => _131.current, 'optionalCall', _132 => _132({
+        evm: smartAccount,
+        solana: _nullishCoalesce(solanaDepositAddress, () => ( null))
+      })]);
       if (isDepositAddressMode) {
         setStep({
           type: "deposit-address",
@@ -3866,6 +3894,7 @@ function DepositFlow({
         return {
           type: "processing",
           smartAccount: prev.smartAccount,
+          solanaDepositAddress: prev.solanaDepositAddress,
           txHash,
           sourceChain: "solana",
           sourceToken: prev.token.mint,
@@ -4064,7 +4093,7 @@ function DepositFlow({
   ]);
   if (showConnectStep) {
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.ConnectStep,
+      _chunkT2KOQH57cjs.ConnectStep,
       {
         walletOptions,
         selectedWalletId: selectedWalletIdEffective,
@@ -4250,9 +4279,10 @@ function DepositFlow({
         ) })
       ] }) : null,
       step.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkXW4M7WDIcjs.ProcessingStep,
+        _chunkT2KOQH57cjs.ProcessingStep,
         {
           smartAccount: step.smartAccount,
+          solanaDepositAddress: step.solanaDepositAddress,
           txHash: step.txHash,
           sourceChain: step.sourceChain,
           sourceToken: step.sourceToken,
@@ -4284,7 +4314,7 @@ function DepositFlow({
     if (_optionalChain([signerContext, 'access', _162 => _162.publicClient, 'access', _163 => _163.chain, 'optionalAccess', _164 => _164.id]) === chainId) {
       return signerContext.publicClient;
     }
-    return _chunkXW4M7WDIcjs.getPublicClient.call(void 0, chainId);
+    return _chunkT2KOQH57cjs.getPublicClient.call(void 0, chainId);
   };
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
     step.type === "setup" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -4374,9 +4404,10 @@ function DepositFlow({
       }
     ),
     step.type === "processing" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkXW4M7WDIcjs.ProcessingStep,
+      _chunkT2KOQH57cjs.ProcessingStep,
       {
         smartAccount: step.smartAccount,
+        solanaDepositAddress: step.solanaDepositAddress,
         txHash: step.txHash,
         sourceChain: step.sourceChain,
         sourceToken: step.sourceToken,
@@ -4431,8 +4462,8 @@ function formatTimestamp2(iso) {
 function resolveChainId(value) {
   if (value === void 0 || value === null) return null;
   if (typeof value === "number") return value;
-  if (_chunkXW4M7WDIcjs.isSolanaCaip2.call(void 0, value) || value === "solana") return "solana";
-  const parsed = _chunkXW4M7WDIcjs.parseEvmChainId.call(void 0, value);
+  if (_chunkT2KOQH57cjs.isSolanaCaip2.call(void 0, value) || value === "solana") return "solana";
+  const parsed = _chunkT2KOQH57cjs.parseEvmChainId.call(void 0, value);
   if (parsed !== null) return parsed;
   const num = Number(value);
   return Number.isFinite(num) ? num : null;
@@ -4669,8 +4700,15 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 
 var ReownDepositInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-MMDTCHQL.cjs"))).then((m) => ({ default: m.DepositModalReown }))
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./DepositModalReown-QPJ5TT57.cjs"))).then((m) => ({ default: m.DepositModalReown }))
 );
+function sortByCreatedAtDesc(items) {
+  return [...items].sort((a, b) => {
+    const at = a.createdAt ? Date.parse(a.createdAt) : 0;
+    const bt = b.createdAt ? Date.parse(b.createdAt) : 0;
+    return bt - at;
+  });
+}
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
   const hasDappWalletClientProp = Object.prototype.hasOwnProperty.call(
@@ -4740,24 +4778,29 @@ function DepositModalInner({
   debug
 }) {
   const modalRef = _react.useRef.call(void 0, null);
-  const onReadyRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onReady);
+  const onReadyRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onReady);
   const [currentStepIndex, setCurrentStepIndex] = _react.useState.call(void 0, 0);
   const [totalBalanceUsd, setTotalBalanceUsd] = _react.useState.call(void 0, null);
   const backHandlerRef = _react.useRef.call(void 0, void 0);
   const showHistoryButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _167 => _167.showHistoryButton]), () => ( false));
-  const [activeSmartAccount, setActiveSmartAccount] = _react.useState.call(void 0, null);
+  const [activeEvmAccount, setActiveEvmAccount] = _react.useState.call(void 0, null);
+  const [activeSolanaAccount, setActiveSolanaAccount] = _react.useState.call(void 0, 
+    null
+  );
   const [historyOpen, setHistoryOpen] = _react.useState.call(void 0, false);
   const [historyDeposits, setHistoryDeposits] = _react.useState.call(void 0, []);
-  const [historyNextCursor, setHistoryNextCursor] = _react.useState.call(void 0, null);
+  const [hasMoreHistory, setHasMoreHistory] = _react.useState.call(void 0, false);
   const [historyLoading, setHistoryLoading] = _react.useState.call(void 0, false);
   const [historyLoadingMore, setHistoryLoadingMore] = _react.useState.call(void 0, false);
   const [historyError, setHistoryError] = _react.useState.call(void 0, null);
+  const evmCursorRef = _react.useRef.call(void 0, null);
+  const solanaCursorRef = _react.useRef.call(void 0, null);
   const historyStaleRef = _react.useRef.call(void 0, false);
   const historyLoadedRef = _react.useRef.call(void 0, false);
   const targetChain = _chunkMUWVDVY4cjs.getChainId.call(void 0, targetChainProp);
   const sourceChain = sourceChainProp ? _chunkMUWVDVY4cjs.getChainId.call(void 0, sourceChainProp) : void 0;
   const service = _react.useMemo.call(void 0, 
-    () => _chunkXW4M7WDIcjs.createDepositService.call(void 0, backendUrl, {
+    () => _chunkT2KOQH57cjs.createDepositService.call(void 0, backendUrl, {
       debug,
       debugScope: "service:deposit"
     }),
@@ -4765,7 +4808,7 @@ function DepositModalInner({
   );
   _react.useEffect.call(void 0, () => {
     if (isOpen && modalRef.current) {
-      _chunkXW4M7WDIcjs.applyTheme.call(void 0, modalRef.current, theme);
+      _chunkT2KOQH57cjs.applyTheme.call(void 0, modalRef.current, theme);
     }
   }, [isOpen, theme]);
   _react.useEffect.call(void 0, () => {
@@ -4795,18 +4838,19 @@ function DepositModalInner({
     _optionalChain([backHandlerRef, 'access', _170 => _170.current, 'optionalCall', _171 => _171()]);
   }, []);
   const handleSmartAccountChange = _react.useCallback.call(void 0, 
-    (account) => {
-      setActiveSmartAccount(account);
-      if (!account) {
+    ({ evm, solana }) => {
+      setActiveEvmAccount(evm);
+      setActiveSolanaAccount(solana);
+      if (!evm && !solana) {
         historyStaleRef.current = true;
       }
     },
     []
   );
   const fetchHistory = _react.useCallback.call(void 0, 
-    async (cursor) => {
-      if (!activeSmartAccount) return;
-      const isInitial = !cursor;
+    async (mode = "initial") => {
+      if (!activeEvmAccount && !activeSolanaAccount) return;
+      const isInitial = mode === "initial";
       if (isInitial) {
         setHistoryLoading(true);
       } else {
@@ -4814,17 +4858,54 @@ function DepositModalInner({
       }
       setHistoryError(null);
       try {
-        const result = await service.fetchDepositHistory({
-          account: activeSmartAccount,
-          limit: 20,
-          cursor
-        });
+        const evmCursor = isInitial ? null : evmCursorRef.current;
+        const solanaCursor = isInitial ? null : solanaCursorRef.current;
+        const requests = [];
+        if (activeEvmAccount && (isInitial || evmCursor)) {
+          requests.push(
+            service.fetchDepositHistory({
+              account: activeEvmAccount,
+              limit: 20,
+              cursor: _nullishCoalesce(evmCursor, () => ( void 0))
+            }).then((r) => ({
+              deposits: r.deposits,
+              nextCursor: _nullishCoalesce(r.nextCursor, () => ( null)),
+              source: "evm"
+            }))
+          );
+        }
+        if (activeSolanaAccount && (isInitial || solanaCursor)) {
+          requests.push(
+            service.fetchDepositHistory({
+              account: activeSolanaAccount,
+              limit: 20,
+              cursor: _nullishCoalesce(solanaCursor, () => ( void 0))
+            }).then((r) => ({
+              deposits: r.deposits,
+              nextCursor: _nullishCoalesce(r.nextCursor, () => ( null)),
+              source: "solana"
+            }))
+          );
+        }
+        const results = await Promise.all(requests);
+        let nextEvm = isInitial ? null : evmCursor;
+        let nextSolana = isInitial ? null : solanaCursor;
+        const incoming = [];
+        for (const r of results) {
+          incoming.push(...r.deposits);
+          if (r.source === "evm") nextEvm = r.nextCursor;
+          else nextSolana = r.nextCursor;
+        }
         if (isInitial) {
-          setHistoryDeposits(result.deposits);
+          setHistoryDeposits(sortByCreatedAtDesc(incoming));
         } else {
-          setHistoryDeposits((prev) => [...prev, ...result.deposits]);
+          setHistoryDeposits(
+            (prev) => sortByCreatedAtDesc([...prev, ...incoming])
+          );
         }
-        setHistoryNextCursor(_nullishCoalesce(result.nextCursor, () => ( null)));
+        evmCursorRef.current = nextEvm;
+        solanaCursorRef.current = nextSolana;
+        setHasMoreHistory(Boolean(nextEvm || nextSolana));
         historyStaleRef.current = false;
         historyLoadedRef.current = true;
       } catch (err) {
@@ -4839,31 +4920,29 @@ function DepositModalInner({
         }
       }
     },
-    [activeSmartAccount, service]
+    [activeEvmAccount, activeSolanaAccount, service]
   );
   const handleHistoryOpen = _react.useCallback.call(void 0, () => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
-      fetchHistory();
+      fetchHistory("initial");
     }
   }, [fetchHistory]);
   const handleHistoryClose = _react.useCallback.call(void 0, () => {
     setHistoryOpen(false);
   }, []);
   const handleHistoryLoadMore = _react.useCallback.call(void 0, () => {
-    if (historyNextCursor) {
-      fetchHistory(historyNextCursor);
-    }
-  }, [fetchHistory, historyNextCursor]);
+    fetchHistory("more");
+  }, [fetchHistory]);
   const markHistoryStale = _react.useCallback.call(void 0, () => {
     historyStaleRef.current = true;
     if (historyOpen) {
-      fetchHistory();
+      fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
-  const onDepositSubmittedRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositSubmitted);
-  const onDepositCompleteRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositComplete);
-  const onDepositFailedRef = _chunkXW4M7WDIcjs.useLatestRef.call(void 0, onDepositFailed);
+  const onDepositSubmittedRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositSubmitted);
+  const onDepositCompleteRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositComplete);
+  const onDepositFailedRef = _chunkT2KOQH57cjs.useLatestRef.call(void 0, onDepositFailed);
   const handleDepositSubmitted = _react.useCallback.call(void 0, 
     (data) => {
       _optionalChain([onDepositSubmittedRef, 'access', _172 => _172.current, 'optionalCall', _173 => _173(data)]);
@@ -4889,9 +4968,12 @@ function DepositModalInner({
     if (!isOpen) {
       setHistoryOpen(false);
       setHistoryDeposits([]);
-      setHistoryNextCursor(null);
+      setHasMoreHistory(false);
       setHistoryError(null);
-      setActiveSmartAccount(null);
+      setActiveEvmAccount(null);
+      setActiveSolanaAccount(null);
+      evmCursorRef.current = null;
+      solanaCursorRef.current = null;
       historyStaleRef.current = false;
       historyLoadedRef.current = false;
     }
@@ -4904,7 +4986,7 @@ function DepositModalInner({
   const title = _nullishCoalesce(_optionalChain([branding, 'optionalAccess', _183 => _183.title]), () => ( "Deposit"));
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 4 && backHandlerRef.current !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkXW4M7WDIcjs.Modal,
+    _chunkT2KOQH57cjs.Modal,
     {
       isOpen,
       onClose,
@@ -4997,7 +5079,7 @@ function DepositModalInner({
                 balance.title,
                 ":"
               ] }),
-              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _nullishCoalesce(balance.amount, () => ( (totalBalanceUsd !== null ? _chunkXW4M7WDIcjs.currencyFormatter.format(totalBalanceUsd) : null))) })
+              /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-modal-header-balance-value", children: _nullishCoalesce(balance.amount, () => ( (totalBalanceUsd !== null ? _chunkT2KOQH57cjs.currencyFormatter.format(totalBalanceUsd) : null))) })
             ] })
           ] }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-header-nav-right", children: [
@@ -5008,7 +5090,7 @@ function DepositModalInner({
                 className: "rs-modal-header-history",
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
-                disabled: !activeSmartAccount,
+                disabled: !activeEvmAccount && !activeSolanaAccount,
                 children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
                   "svg",
                   {
@@ -5104,7 +5186,7 @@ function DepositModalInner({
             deposits: historyDeposits,
             isLoading: historyLoading,
             error: historyError,
-            hasMore: Boolean(historyNextCursor),
+            hasMore: hasMoreHistory,
             isLoadingMore: historyLoadingMore,
             onLoadMore: handleHistoryLoadMore,
             onClose: handleHistoryClose