@rhinestone/deposit-modal 0.1.40 → 0.1.41

package/dist/{chunk-F5S6RHUI.mjs → chunk-6PRJUXTM.mjs}

@@ -11,9 +11,10 @@ import {
   createDepositService,
   createSessionOwnerKey,
   currencyFormatter,
+  debugError,
+  debugLog,
   formatUserError,
   getAssetId,
-  getEventSourceDetails,
   getEventTxHash,
   getPublicClient,
   isDepositEvent,
@@ -21,8 +22,10 @@ import {
   loadSessionOwnerFromStorage,
   portfolioToAssets,
   saveSessionOwnerToStorage,
-  tokenFormatter
-} from "./chunk-IC2M2DZ7.mjs";
+  toEvmCaip2,
+  tokenFormatter,
+  txRefsMatch
+} from "./chunk-QIK6ONMQ.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -38,21 +41,21 @@ import {
   getTokenIcon,
   getTokenSymbol,
   isStablecoinSymbol
-} from "./chunk-I7RYTI4G.mjs";
+} from "./chunk-ZJQZEIHA.mjs";
 
 // src/DepositModal.tsx
 import {
-  useMemo as useMemo6,
-  useEffect as useEffect8,
+  useMemo as useMemo8,
+  useEffect as useEffect9,
   useRef as useRef6,
-  useState as useState8,
+  useState as useState11,
   useCallback as useCallback4,
   lazy,
   Suspense
 } from "react";
 
 // src/DepositFlow.tsx
-import { useState as useState7, useCallback as useCallback3, useMemo as useMemo5, useEffect as useEffect7, useRef as useRef5 } from "react";
+import { useState as useState10, useCallback as useCallback3, useMemo as useMemo7, useEffect as useEffect8, useRef as useRef5 } from "react";
 
 // src/components/steps/SetupStep.tsx
 import { useState, useEffect, useRef, useCallback } from "react";
@@ -101,7 +104,7 @@ function SetupStep({
       const setup = await service.setupAccount({
         ownerAddress: address,
         sessionOwnerAddress: sessionOwner.address,
-        targetChain,
+        targetChain: toEvmCaip2(targetChain),
         targetToken,
         signerAddress,
         sessionChainIds,
@@ -111,7 +114,7 @@ function SetupStep({
       if (!setup.needsRegistration) {
         setState({ type: "ready", smartAccount });
         onConnected?.(address, smartAccount);
-        onSetupComplete(smartAccount);
+        onSetupComplete(smartAccount, setup.solanaDepositAddress);
         return;
       }
       setState({ type: "signing-session" });
@@ -130,7 +133,7 @@ function SetupStep({
       });
       const sessionDetails = buildSessionDetails(setup.sessionDetailsUnsigned, signature);
       setState({ type: "registering" });
-      await service.registerAccount({
+      const registerResult = await service.registerAccount({
         address: smartAccount,
         accountParams: {
           factory: setup.accountParams.factory,
@@ -140,14 +143,14 @@ function SetupStep({
         eoaAddress: address,
         sessionOwner: sessionOwner.address,
         target: {
-          chain: targetChain,
+          chain: toEvmCaip2(targetChain),
           token: targetToken,
           ...recipient && { recipient }
         }
       });
       setState({ type: "ready", smartAccount });
       onConnected?.(address, smartAccount);
-      onSetupComplete(smartAccount);
+      onSetupComplete(smartAccount, registerResult.solanaDepositAddress);
     } catch (error) {
       const message = error instanceof Error ? error.message : "Setup failed";
       setState({ type: "error", message });
@@ -1234,28 +1237,218 @@ function QRCode({ value, size = 200, iconSrc, className }) {
 }
 QRCode.displayName = "QRCode";
 
+// src/core/solana.ts
+import {
+  Connection,
+  PublicKey,
+  SystemProgram,
+  Transaction
+} from "@solana/web3.js";
+import {
+  getAssociatedTokenAddress,
+  createAssociatedTokenAccountInstruction,
+  createTransferInstruction
+} from "@solana/spl-token";
+var SOLANA_TOKENS = [
+  { symbol: "SOL", mint: "native", decimals: 9 },
+  {
+    symbol: "USDC",
+    mint: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+    decimals: 6
+  },
+  {
+    symbol: "USDT",
+    mint: "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
+    decimals: 6
+  }
+];
+var DEFAULT_SOLANA_RPC_URL = "https://api.mainnet-beta.solana.com";
+var configuredSolanaRpcUrl = null;
+var cachedConnections = /* @__PURE__ */ new Map();
+function getSolanaRpcUrl() {
+  return configuredSolanaRpcUrl ?? DEFAULT_SOLANA_RPC_URL;
+}
+function getSolanaConnection() {
+  const rpcUrl = getSolanaRpcUrl();
+  const cached = cachedConnections.get(rpcUrl);
+  if (cached) {
+    return cached;
+  }
+  const next = new Connection(rpcUrl, "confirmed");
+  cachedConnections.set(rpcUrl, next);
+  return next;
+}
+function isNativeSol(token) {
+  return token.mint === "native";
+}
+async function buildSolTransferTransaction(connection, from, to, lamports) {
+  const fromPubkey = new PublicKey(from);
+  const toPubkey = new PublicKey(to);
+  const tx = new Transaction().add(
+    SystemProgram.transfer({
+      fromPubkey,
+      toPubkey,
+      lamports
+    })
+  );
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
+  tx.recentBlockhash = blockhash;
+  tx.lastValidBlockHeight = lastValidBlockHeight;
+  tx.feePayer = fromPubkey;
+  return tx;
+}
+async function buildSplTransferTransaction(connection, from, to, mint, amount) {
+  const fromPubkey = new PublicKey(from);
+  const toPubkey = new PublicKey(to);
+  const mintPubkey = new PublicKey(mint);
+  const fromAta = await getAssociatedTokenAddress(mintPubkey, fromPubkey);
+  const toAta = await getAssociatedTokenAddress(mintPubkey, toPubkey, true);
+  const tx = new Transaction();
+  const toAtaInfo = await connection.getAccountInfo(toAta);
+  if (!toAtaInfo) {
+    tx.add(
+      createAssociatedTokenAccountInstruction(
+        fromPubkey,
+        toAta,
+        toPubkey,
+        mintPubkey
+      )
+    );
+  }
+  tx.add(createTransferInstruction(fromAta, toAta, fromPubkey, amount));
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
+  tx.recentBlockhash = blockhash;
+  tx.lastValidBlockHeight = lastValidBlockHeight;
+  tx.feePayer = fromPubkey;
+  return tx;
+}
+function extractSignature(value) {
+  if (typeof value === "string") {
+    return value.length > 0 ? value : null;
+  }
+  if (typeof value.signature === "string" && value.signature.length > 0) {
+    return value.signature;
+  }
+  if (typeof value.hash === "string" && value.hash.length > 0) {
+    return value.hash;
+  }
+  if (typeof value.txid === "string" && value.txid.length > 0) {
+    return value.txid;
+  }
+  if (typeof value.transactionId === "string" && value.transactionId.length > 0) {
+    return value.transactionId;
+  }
+  return null;
+}
+async function sendSolanaTransaction(provider, _connection, transaction) {
+  const result = await provider.signAndSendTransaction(transaction);
+  const signature = extractSignature(result);
+  if (!signature) {
+    throw new Error("Transaction sent but wallet did not return a signature");
+  }
+  return signature;
+}
+
 // src/components/steps/DepositAddressStep.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var POLL_INTERVAL_MS = 4e3;
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function asNumber(value) {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  if (typeof value === "string" && value.trim() !== "") {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) ? parsed : void 0;
+  }
+  return void 0;
+}
+function asChainId(value) {
+  if (typeof value === "string") {
+    if (value.startsWith("solana")) return "solana";
+    const eip155Match = value.match(/^eip155:(\d+)$/);
+    if (eip155Match) return Number(eip155Match[1]);
+  }
+  return asNumber(value);
+}
+function asAmount(value) {
+  if (typeof value === "string") return value;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value.toString();
+  }
+  return void 0;
+}
+function asString(value) {
+  return typeof value === "string" ? value : void 0;
+}
+function resolveSolanaTokenMeta(token) {
+  if (!token) return {};
+  const normalized = token.toLowerCase();
+  const matched = SOLANA_TOKENS.find(
+    (entry) => entry.mint.toLowerCase() === normalized
+  );
+  if (matched) {
+    return { sourceSymbol: matched.symbol, sourceDecimals: matched.decimals };
+  }
+  if (normalized === "native" || normalized === "11111111111111111111111111111111" || normalized === "so11111111111111111111111111111111111111112") {
+    return { sourceSymbol: "SOL", sourceDecimals: 9 };
+  }
+  return {};
+}
+function getDepositEventDetails(event) {
+  if (!event?.type || !isRecord(event.data)) return {};
+  if (event.type === "deposit-received") {
+    const chainId = asChainId(event.data.chain);
+    const token = asString(event.data.token);
+    const solanaMeta = chainId === "solana" ? resolveSolanaTokenMeta(token) : {};
+    return {
+      chainId,
+      amount: asAmount(event.data.amount),
+      token,
+      ...solanaMeta
+    };
+  }
+  if (event.type === "bridge-started") {
+    const source = isRecord(event.data.source) ? event.data.source : void 0;
+    const chainId = asChainId(source?.chain);
+    const token = asString(source?.asset);
+    const solanaMeta = chainId === "solana" ? resolveSolanaTokenMeta(token) : {};
+    return {
+      chainId,
+      amount: asAmount(source?.amount),
+      token,
+      ...solanaMeta
+    };
+  }
+  return {};
+}
 function DepositAddressStep({
   smartAccount,
+  solanaDepositAddress,
   service,
   onDepositDetected,
   onError
 }) {
-  const supportedChainIds = useMemo4(() => getSupportedChainIds(), []);
+  const hasSolana = Boolean(solanaDepositAddress);
+  const evmChainIds = useMemo4(() => getSupportedChainIds(), []);
+  const chainOptions = useMemo4(
+    () => hasSolana ? [...evmChainIds, "solana"] : evmChainIds,
+    [evmChainIds, hasSolana]
+  );
   const BASE_CHAIN_ID = 8453;
-  const defaultChainId = supportedChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : supportedChainIds[0];
+  const defaultChainId = evmChainIds.includes(BASE_CHAIN_ID) ? BASE_CHAIN_ID : evmChainIds[0];
   const [sourceChainId, setSourceChainId] = useState6(defaultChainId);
+  const isSolana = sourceChainId === "solana";
   const tokensForChain = useMemo4(
-    () => getTargetTokenSymbolsForChain(sourceChainId),
-    [sourceChainId]
+    () => isSolana ? SOLANA_TOKENS.map((t) => t.symbol) : getTargetTokenSymbolsForChain(sourceChainId),
+    [sourceChainId, isSolana]
   );
   const defaultToken = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
   const [sourceTokenSymbol, setSourceTokenSymbol] = useState6(defaultToken);
   useEffect6(() => {
     if (!tokensForChain.includes(sourceTokenSymbol)) {
-      setSourceTokenSymbol(tokensForChain[0] ?? "USDC");
+      const fallback = tokensForChain.includes("USDC") ? "USDC" : tokensForChain[0] ?? "USDC";
+      setSourceTokenSymbol(fallback);
     }
   }, [tokensForChain, sourceTokenSymbol]);
   const [copied, setCopied] = useState6(false);
@@ -1267,14 +1460,27 @@ function DepositAddressStep({
   const depositHandledRef = useRef4(false);
   const sourceSelectionRef = useRef4({
     chainId: defaultChainId,
-    tokenSymbol: defaultToken
+    token: typeof defaultChainId === "number" ? getTokenAddress(defaultToken, defaultChainId) : void 0,
+    sourceSymbol: defaultToken
   });
   useEffect6(() => {
+    if (isSolana) {
+      const matched = SOLANA_TOKENS.find((t) => t.symbol === sourceTokenSymbol) ?? SOLANA_TOKENS[0];
+      sourceSelectionRef.current = {
+        chainId: "solana",
+        token: matched?.mint,
+        sourceSymbol: matched?.symbol,
+        sourceDecimals: matched?.decimals
+      };
+      return;
+    }
     sourceSelectionRef.current = {
       chainId: sourceChainId,
-      tokenSymbol: sourceTokenSymbol
+      token: getTokenAddress(sourceTokenSymbol, sourceChainId),
+      sourceSymbol: sourceTokenSymbol
     };
-  }, [sourceChainId, sourceTokenSymbol]);
+  }, [sourceChainId, sourceTokenSymbol, isSolana]);
+  const displayAddress = isSolana && solanaDepositAddress ? solanaDepositAddress : smartAccount;
   useEffect6(() => {
     if (!chainDropdownOpen && !tokenDropdownOpen) return;
     function handlePointerDown(event) {
@@ -1295,12 +1501,12 @@ function DepositAddressStep({
   }, [chainDropdownOpen, tokenDropdownOpen]);
   const handleCopy = useCallback2(async () => {
     try {
-      await navigator.clipboard.writeText(smartAccount);
+      await navigator.clipboard.writeText(displayAddress);
       setCopied(true);
       setTimeout(() => setCopied(false), 2e3);
     } catch {
       const textarea = document.createElement("textarea");
-      textarea.value = smartAccount;
+      textarea.value = displayAddress;
       textarea.style.position = "fixed";
       textarea.style.opacity = "0";
       document.body.appendChild(textarea);
@@ -1310,7 +1516,12 @@ function DepositAddressStep({
       setCopied(true);
       setTimeout(() => setCopied(false), 2e3);
     }
-  }, [smartAccount]);
+  }, [displayAddress]);
+  useEffect6(() => {
+    setCopied(false);
+    setChainDropdownOpen(false);
+    setTokenDropdownOpen(false);
+  }, [sourceChainId]);
   useEffect6(() => {
     depositHandledRef.current = false;
     setPollingError(null);
@@ -1323,18 +1534,27 @@ function DepositAddressStep({
         const status = await service.fetchLatestStatus(smartAccount);
         if (cancelled || depositHandledRef.current) return;
         const event = status.lastEvent;
-        const eventTxHash = isDepositEvent(event) ? getEventTxHash(event)?.toLowerCase() ?? null : null;
+        const eventTxHash = isDepositEvent(event) ? getEventTxHash(event) ?? null : null;
         if (baselineTxHash === void 0) {
           baselineTxHash = eventTxHash;
-        } else if (eventTxHash && eventTxHash !== baselineTxHash) {
-          const details = getEventSourceDetails(event);
+        } else if (eventTxHash && (!baselineTxHash || !txRefsMatch(eventTxHash, baselineTxHash))) {
+          const details = getDepositEventDetails(event);
           const fallback = sourceSelectionRef.current;
           const chainId = details.chainId ?? fallback.chainId;
           const amount = details.amount ?? "0";
-          const token = details.token ?? getTokenAddress(fallback.tokenSymbol, fallback.chainId);
+          const token = details.token ?? fallback.token;
+          const sourceSymbol = details.sourceSymbol ?? fallback.sourceSymbol;
+          const sourceDecimals = details.sourceDecimals ?? fallback.sourceDecimals;
           if (token) {
             depositHandledRef.current = true;
-            onDepositDetected(eventTxHash, chainId, amount, token);
+            onDepositDetected(
+              eventTxHash,
+              chainId,
+              amount,
+              token,
+              sourceSymbol,
+              sourceDecimals
+            );
             return;
           }
         }
@@ -1356,31 +1576,31 @@ function DepositAddressStep({
       clearTimeout(timeoutId);
     };
   }, [smartAccount, service, onDepositDetected, onError]);
-  const chainIconSrc = getChainIcon(sourceChainId);
+  const qrIconSrc = getChainIcon(sourceChainId);
   return /* @__PURE__ */ jsxs6("div", { className: "rs-step", children: [
     /* @__PURE__ */ jsx6("div", { className: "rs-step-body", children: /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address", children: [
       /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-selectors", children: [
-        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
-          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Supported token" }),
+        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
+          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Chain" }),
           /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
               className: "rs-deposit-address-dropdown-trigger",
               onClick: () => {
-                setTokenDropdownOpen(!tokenDropdownOpen);
-                setChainDropdownOpen(false);
+                setChainDropdownOpen(!chainDropdownOpen);
+                setTokenDropdownOpen(false);
               },
               children: [
-                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
+                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx6(
                   "img",
                   {
-                    src: getTokenIcon(sourceTokenSymbol),
+                    src: getChainIcon(sourceChainId),
                     alt: "",
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
+                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
                 /* @__PURE__ */ jsx6(
                   "svg",
                   {
@@ -1402,51 +1622,51 @@ function DepositAddressStep({
               ]
             }
           ),
-          tokenDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
+          chainDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: chainOptions.map((chainId) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
-              className: `rs-deposit-address-dropdown-item ${symbol === sourceTokenSymbol ? "rs-deposit-address-dropdown-item--active" : ""}`,
+              className: `rs-deposit-address-dropdown-item ${chainId === sourceChainId ? "rs-deposit-address-dropdown-item--active" : ""}`,
               onClick: () => {
-                setSourceTokenSymbol(symbol);
-                setTokenDropdownOpen(false);
+                setSourceChainId(chainId);
+                setChainDropdownOpen(false);
               },
               children: [
-                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
+                getChainIcon(chainId) && /* @__PURE__ */ jsx6(
                   "img",
                   {
-                    src: getTokenIcon(symbol),
+                    src: getChainIcon(chainId),
                     alt: "",
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: symbol })
+                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
               ]
             },
-            symbol
+            String(chainId)
           )) })
         ] }),
-        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: chainDropdownRef, children: [
-          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Supported chain" }),
+        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-dropdown", ref: tokenDropdownRef, children: [
+          /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-label", children: "Token" }),
           /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
               className: "rs-deposit-address-dropdown-trigger",
               onClick: () => {
-                setChainDropdownOpen(!chainDropdownOpen);
-                setTokenDropdownOpen(false);
+                setTokenDropdownOpen(!tokenDropdownOpen);
+                setChainDropdownOpen(false);
               },
               children: [
-                getChainIcon(sourceChainId) && /* @__PURE__ */ jsx6(
+                getTokenIcon(sourceTokenSymbol) && /* @__PURE__ */ jsx6(
                   "img",
                   {
-                    src: getChainIcon(sourceChainId),
+                    src: getTokenIcon(sourceTokenSymbol),
                     alt: "",
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(sourceChainId) }),
+                /* @__PURE__ */ jsx6("span", { children: sourceTokenSymbol }),
                 /* @__PURE__ */ jsx6(
                   "svg",
                   {
@@ -1468,35 +1688,39 @@ function DepositAddressStep({
               ]
             }
           ),
-          chainDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: supportedChainIds.map((chainId) => /* @__PURE__ */ jsxs6(
+          tokenDropdownOpen && /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-dropdown-menu", children: tokensForChain.map((symbol) => /* @__PURE__ */ jsxs6(
             "button",
             {
               type: "button",
-              className: `rs-deposit-address-dropdown-item ${chainId === sourceChainId ? "rs-deposit-address-dropdown-item--active" : ""}`,
+              className: `rs-deposit-address-dropdown-item ${symbol === sourceTokenSymbol ? "rs-deposit-address-dropdown-item--active" : ""}`,
               onClick: () => {
-                setSourceChainId(chainId);
-                setChainDropdownOpen(false);
+                setSourceTokenSymbol(symbol);
+                setTokenDropdownOpen(false);
               },
               children: [
-                getChainIcon(chainId) && /* @__PURE__ */ jsx6(
+                getTokenIcon(symbol) && /* @__PURE__ */ jsx6(
                   "img",
                   {
-                    src: getChainIcon(chainId),
+                    src: getTokenIcon(symbol),
                     alt: "",
                     className: "rs-deposit-address-dropdown-icon"
                   }
                 ),
-                /* @__PURE__ */ jsx6("span", { children: getChainName(chainId) })
+                /* @__PURE__ */ jsx6("span", { children: symbol })
               ]
             },
-            chainId
+            symbol
           )) })
         ] })
       ] }),
-      /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(QRCode, { value: smartAccount, size: 200, iconSrc: chainIconSrc }) }),
+      /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx6(QRCode, { value: displayAddress, size: 200, iconSrc: qrIconSrc }) }),
       /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-info", children: [
-        /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-label", children: "Your deposit address" }),
-        /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: smartAccount }),
+        /* @__PURE__ */ jsxs6("div", { className: "rs-deposit-address-label", children: [
+          "Your ",
+          isSolana ? "Solana" : "EVM",
+          " deposit address"
+        ] }),
+        /* @__PURE__ */ jsx6("div", { className: "rs-deposit-address-value", children: displayAddress }),
         /* @__PURE__ */ jsxs6(
           "button",
           {
@@ -1541,170 +1765,872 @@ function DepositAddressStep({
 }
 DepositAddressStep.displayName = "DepositAddressStep";
 
-// src/DepositFlow.tsx
+// src/components/steps/SolanaTokenSelectStep.tsx
+import { useState as useState7, useEffect as useEffect7, useMemo as useMemo5 } from "react";
+import { formatUnits as formatUnits3 } from "viem";
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
-function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
-  return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
-}
-function getAddressKey(address) {
-  return address ? address.toLowerCase() : null;
-}
-function DepositFlow({
-  dappWalletClient,
-  dappPublicClient,
-  dappAddress,
-  targetChain,
-  targetToken,
+function SolanaTokenSelectStep({
+  solanaAddress,
   service,
-  sourceChain: defaultSourceChain,
-  sourceToken: defaultSourceToken,
-  amount: defaultAmount,
-  recipient,
-  signerAddress = DEFAULT_SIGNER_ADDRESS,
-  sessionChainIds,
-  forceRegister = false,
-  waitForFinalTx = true,
-  reownWallet,
-  onConnect,
-  onDisconnect,
-  onRequestConnect,
-  connectButtonLabel,
-  uiConfig,
-  onStepChange,
-  onTotalBalanceChange,
-  onClose,
-  onConnected,
-  onDepositSubmitted,
-  onDepositComplete,
-  onDepositFailed,
-  onError,
+  onContinue,
+  onTotalBalanceComputed,
   debug
 }) {
-  const [step, setStep] = useState7({ type: "setup" });
-  const [flowMode, setFlowMode] = useState7(null);
-  const [totalBalanceUsd, setTotalBalanceUsd] = useState7(0);
-  const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState7(false);
-  const [selectedConnectAddress, setSelectedConnectAddress] = useState7(null);
-  const portfolioAssetsRef = useRef5([]);
-  const stableWalletSignerRef = useRef5(null);
-  const stableWalletSelectionKeyRef = useRef5(null);
-  const hasNavigatedBackRef = useRef5(false);
-  const handleAssetsLoaded = useCallback3((assets) => {
-    portfolioAssetsRef.current = assets;
-  }, []);
-  const getTokenPriceUsd = useCallback3((symbol) => {
-    const sym = symbol.toLowerCase();
-    for (const asset of portfolioAssetsRef.current) {
-      if (asset.symbol.toLowerCase() === sym && asset.balanceUsd && asset.balance) {
-        try {
-          const balanceUnits = Number(asset.balance) / 10 ** asset.decimals;
-          if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
-        } catch {
+  const [tokenBalances, setTokenBalances] = useState7([]);
+  const [selectedSymbol, setSelectedSymbol] = useState7(null);
+  const [loading, setLoading] = useState7(true);
+  const [error, setError] = useState7(null);
+  useEffect7(() => {
+    let active = true;
+    async function loadBalances() {
+      if (!solanaAddress) {
+        setLoading(false);
+        return;
+      }
+      setLoading(true);
+      setError(null);
+      const portfolioBySymbol = {};
+      try {
+        debugLog(debug, "solana-token-select", "portfolio:request", {
+          solanaAddress
+        });
+        const portfolio = await service.fetchSolanaPortfolio(solanaAddress);
+        if (!active) return;
+        for (const t of portfolio.tokens) {
+          const symbol = t.symbol.toUpperCase();
+          if (!SOLANA_TOKENS.some((st) => st.symbol === symbol)) continue;
+          let parsed = 0n;
+          try {
+            parsed = BigInt(t.balance || "0");
+          } catch {
+            parsed = 0n;
+          }
+          if (parsed <= 0n) continue;
+          const existing = portfolioBySymbol[symbol];
+          if (!existing || (t.balanceUsd ?? 0) > existing.balanceUsd) {
+            portfolioBySymbol[symbol] = {
+              balance: parsed,
+              balanceUsd: t.balanceUsd ?? 0
+            };
+          }
+        }
+        debugLog(debug, "solana-token-select", "portfolio:success", {
+          symbols: Object.keys(portfolioBySymbol)
+        });
+      } catch (err) {
+        if (!active) return;
+        debugError(debug, "solana-token-select", "portfolio:failure", err, {
+          solanaAddress
+        });
+        setError(
+          err instanceof Error ? err.message : "Failed to load balances"
+        );
+        setTokenBalances([]);
+        setLoading(false);
+        return;
+      }
+      const results = [];
+      for (const token of SOLANA_TOKENS) {
+        const fromPortfolio = portfolioBySymbol[token.symbol];
+        if (fromPortfolio && fromPortfolio.balance > 0n) {
+          results.push({
+            token,
+            balance: fromPortfolio.balance,
+            balanceUsd: fromPortfolio.balanceUsd
+          });
         }
       }
+      if (!active) return;
+      setTokenBalances(results);
+      setLoading(false);
+      const totalUsd = results.reduce((sum, r) => sum + r.balanceUsd, 0);
+      onTotalBalanceComputed?.(totalUsd);
     }
-    return null;
-  }, []);
-  const dappSwitchChain = useMemo5(() => {
-    if (!dappWalletClient?.switchChain) return void 0;
-    return async (chainId) => {
-      await dappWalletClient.switchChain?.({ id: chainId });
+    void loadBalances();
+    return () => {
+      active = false;
     };
-  }, [dappWalletClient]);
-  const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
-  const walletOptions = useMemo5(() => {
-    const options = [];
-    const seen = /* @__PURE__ */ new Set();
-    if (connectedWalletAddress && dappAddress) {
-      options.push({
-        address: connectedWalletAddress,
-        label: "Connected Wallet",
-        kind: "connected"
-      });
-      seen.add(connectedWalletAddress.toLowerCase());
-    }
-    if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(reownWallet.address.toLowerCase())) {
-      options.push({
-        address: reownWallet.address,
-        label: "External Wallet",
-        kind: "external",
-        icon: reownWallet.icon
-      });
-    }
-    return options;
-  }, [
-    connectedWalletAddress,
-    dappAddress,
-    reownWallet?.address,
-    reownWallet?.isConnected,
-    reownWallet?.walletClient,
-    reownWallet?.publicClient,
-    reownWallet?.icon
-  ]);
-  const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
-  const hasWalletOptions = walletOptions.length > 0;
-  const hasReownSession = Boolean(
-    reownWallet?.isConnected || reownWallet?.address
+  }, [debug, solanaAddress, service, onTotalBalanceComputed]);
+  const rows = useMemo5(
+    () => [...tokenBalances].sort((a, b) => {
+      if (a.balanceUsd !== b.balanceUsd) return b.balanceUsd - a.balanceUsd;
+      if (b.balance > a.balance) return 1;
+      if (b.balance < a.balance) return -1;
+      return 0;
+    }),
+    [tokenBalances]
   );
-  const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
-  const walletSelectionKey = useMemo5(() => {
-    if (flowMode !== "wallet") return null;
-    if (canAutoLock) {
-      return getAddressKey(connectedWalletAddress);
-    }
-    if (!isConnectSelectionConfirmed) return null;
-    return getAddressKey(selectedConnectAddress);
-  }, [
-    flowMode,
-    canAutoLock,
-    connectedWalletAddress,
-    isConnectSelectionConfirmed,
-    selectedConnectAddress
-  ]);
-  const walletSignerContext = useMemo5(() => {
-    if (flowMode === "deposit-address") {
-      return null;
-    }
-    if (canAutoLock) {
-      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
-      return {
-        ownerAddress: dappWalletClient.account.address,
-        walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
-        switchChain: dappSwitchChain
-      };
-    }
-    if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
-    if (dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
-      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
-      return {
-        ownerAddress: dappWalletClient.account.address,
-        walletClient: dappWalletClient,
-        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
-        switchChain: dappSwitchChain
-      };
-    }
-    if (reownWallet?.address?.toLowerCase() === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
-      return {
-        ownerAddress: reownWallet.address,
-        walletClient: reownWallet.walletClient,
-        publicClient: reownWallet.publicClient,
-        switchChain: reownWallet.switchChain
-      };
-    }
-    return null;
-  }, [
-    canAutoLock,
-    isConnectSelectionConfirmed,
-    selectedConnectAddress,
-    dappWalletClient,
-    dappPublicClient,
-    dappSwitchChain,
-    dappAddress,
+  const selectedEntry = selectedSymbol ? rows.find((r) => r.token.symbol === selectedSymbol) : null;
+  if (error) {
+    return /* @__PURE__ */ jsx7("div", { className: "rs-step", children: /* @__PURE__ */ jsx7("div", { className: "rs-step-body", children: /* @__PURE__ */ jsx7("div", { className: "rs-alert rs-alert--error", children: /* @__PURE__ */ jsx7("span", { className: "rs-alert-text", children: error }) }) }) });
+  }
+  return /* @__PURE__ */ jsxs7("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx7("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx7("div", { className: "rs-step-title", children: "Select source asset" }) }),
+    /* @__PURE__ */ jsxs7(
+      "div",
+      {
+        className: "rs-step-body",
+        style: { paddingTop: 4, overflow: "auto", maxHeight: 340 },
+        children: [
+          loading && /* @__PURE__ */ jsxs7("div", { className: "rs-loading-state", style: { padding: "40px 12px" }, children: [
+            /* @__PURE__ */ jsx7(Spinner, { className: "rs-text-tertiary" }),
+            /* @__PURE__ */ jsx7("span", { className: "rs-text-sm rs-text-tertiary", children: "Loading balances" })
+          ] }),
+          !loading && rows.length === 0 && /* @__PURE__ */ jsxs7("div", { className: "rs-empty-state", children: [
+            /* @__PURE__ */ jsx7(
+              "svg",
+              {
+                className: "rs-empty-icon",
+                viewBox: "0 0 24 24",
+                fill: "none",
+                stroke: "currentColor",
+                strokeWidth: "1.5",
+                children: /* @__PURE__ */ jsx7(
+                  "path",
+                  {
+                    strokeLinecap: "round",
+                    strokeLinejoin: "round",
+                    d: "M21 12a2.25 2.25 0 00-2.25-2.25H15a3 3 0 11-6 0H5.25A2.25 2.25 0 003 12m18 0v6a2.25 2.25 0 01-2.25 2.25H5.25A2.25 2.25 0 013 18v-6m18 0V9M3 12V9m18 0a2.25 2.25 0 00-2.25-2.25H5.25A2.25 2.25 0 003 9m18 0V6a2.25 2.25 0 00-2.25-2.25H5.25A2.25 2.25 0 003 6v3"
+                  }
+                )
+              }
+            ),
+            /* @__PURE__ */ jsx7("div", { className: "rs-empty-text", children: "No funds in connected wallet" }),
+            /* @__PURE__ */ jsxs7("div", { className: "rs-empty-address", children: [
+              solanaAddress.slice(0, 6),
+              "...",
+              solanaAddress.slice(-4)
+            ] })
+          ] }),
+          !loading && rows.length > 0 && /* @__PURE__ */ jsx7("div", { className: "rs-asset-list", children: rows.map((entry) => {
+            const isSelected = selectedSymbol === entry.token.symbol;
+            const tokenIcon = getTokenIcon(entry.token.symbol);
+            const chainIcon = getChainIcon("solana");
+            let formattedBalance;
+            try {
+              const raw = formatUnits3(entry.balance, entry.token.decimals);
+              const numeric = Number(raw);
+              formattedBalance = Number.isFinite(numeric) ? tokenFormatter.format(numeric) : raw;
+            } catch {
+              formattedBalance = "...";
+            }
+            return /* @__PURE__ */ jsxs7(
+              "button",
+              {
+                type: "button",
+                onClick: () => setSelectedSymbol(entry.token.symbol),
+                className: `rs-asset-row ${isSelected ? "rs-asset-row--selected" : ""}`,
+                style: { textAlign: "left" },
+                children: [
+                  /* @__PURE__ */ jsxs7("div", { className: "rs-asset-info", children: [
+                    /* @__PURE__ */ jsxs7("div", { className: "rs-asset-icon-wrapper", children: [
+                      tokenIcon ? /* @__PURE__ */ jsx7(
+                        "img",
+                        {
+                          src: tokenIcon,
+                          alt: entry.token.symbol,
+                          className: "rs-asset-icon",
+                          style: { background: "transparent" }
+                        }
+                      ) : /* @__PURE__ */ jsx7("div", { className: "rs-asset-icon", children: entry.token.symbol.slice(0, 4) }),
+                      chainIcon && /* @__PURE__ */ jsx7(
+                        "img",
+                        {
+                          src: chainIcon,
+                          alt: "Solana",
+                          className: "rs-asset-chain-badge"
+                        }
+                      )
+                    ] }),
+                    /* @__PURE__ */ jsxs7("div", { children: [
+                      /* @__PURE__ */ jsxs7("div", { className: "rs-asset-name", children: [
+                        entry.token.symbol,
+                        /* @__PURE__ */ jsx7("span", { className: "rs-asset-chain", children: " on Solana" })
+                      ] }),
+                      /* @__PURE__ */ jsxs7("div", { className: "rs-asset-balance-small", children: [
+                        formattedBalance,
+                        " ",
+                        entry.token.symbol
+                      ] })
+                    ] })
+                  ] }),
+                  /* @__PURE__ */ jsx7("div", { className: "rs-asset-balance", children: entry.balanceUsd > 0 ? currencyFormatter.format(entry.balanceUsd) : `${formattedBalance} ${entry.token.symbol}` })
+                ]
+              },
+              entry.token.symbol
+            );
+          }) })
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsx7("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx7(
+      Button,
+      {
+        onClick: () => selectedEntry && onContinue(
+          selectedEntry.token,
+          selectedEntry.balance,
+          selectedEntry.balanceUsd
+        ),
+        disabled: !selectedEntry,
+        fullWidth: true,
+        children: "Continue"
+      }
+    ) }),
+    /* @__PURE__ */ jsx7(PoweredBy, {})
+  ] });
+}
+
+// src/components/steps/SolanaAmountStep.tsx
+import { useState as useState8, useMemo as useMemo6 } from "react";
+import { formatUnits as formatUnits4, parseUnits as parseUnits3 } from "viem";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+var SOL_FEE_RESERVE_LAMPORTS = 1000000n;
+function SolanaAmountStep({
+  token,
+  balance,
+  balanceUsd,
+  onContinue,
+  debug
+}) {
+  const [amount, setAmount] = useState8("");
+  const [error, setError] = useState8(null);
+  const formattedBalance = useMemo6(() => {
+    try {
+      const raw = formatUnits4(balance, token.decimals);
+      const numeric = Number(raw);
+      if (!Number.isFinite(numeric)) return raw;
+      return tokenFormatter.format(numeric);
+    } catch {
+      return "...";
+    }
+  }, [balance, token.decimals]);
+  const formattedBalanceUsd = useMemo6(() => {
+    if (!Number.isFinite(balanceUsd) || balanceUsd <= 0) return null;
+    return currencyFormatter.format(balanceUsd);
+  }, [balanceUsd]);
+  const spendableBalance = useMemo6(() => {
+    if (!isNativeSol(token)) return balance;
+    return balance > SOL_FEE_RESERVE_LAMPORTS ? balance - SOL_FEE_RESERVE_LAMPORTS : 0n;
+  }, [balance, token]);
+  const handlePresetClick = (percentage) => {
+    try {
+      const spendableUnits = Number(formatUnits4(spendableBalance, token.decimals));
+      if (!Number.isFinite(spendableUnits) || spendableUnits <= 0) return;
+      const value = spendableUnits * percentage / 100;
+      const maxDecimals = token.decimals > 6 ? 6 : token.decimals;
+      const factor = 10 ** maxDecimals;
+      const truncated = Math.floor(value * factor) / factor;
+      const formatted = truncated.toFixed(maxDecimals).replace(/\.?0+$/, "");
+      debugLog(debug, "solana-amount", "amount:preset", {
+        percentage,
+        symbol: token.symbol,
+        formatted
+      });
+      setAmount(formatted);
+    } catch {
+      return;
+    }
+    if (error) setError(null);
+  };
+  const handleContinue = () => {
+    const numericAmount = parseFloat(amount);
+    if (isNaN(numericAmount) || numericAmount <= 0) {
+      debugLog(debug, "solana-amount", "amount:invalid", {
+        amount,
+        reason: "nan-or-non-positive"
+      });
+      setError("Please enter a valid amount");
+      return;
+    }
+    let amountInUnits;
+    try {
+      amountInUnits = parseUnits3(amount, token.decimals);
+    } catch {
+      debugLog(debug, "solana-amount", "amount:invalid", {
+        amount,
+        reason: "parse-units-failed"
+      });
+      setError("Please enter a valid amount");
+      return;
+    }
+    if (amountInUnits > spendableBalance) {
+      const isReserveIssue = isNativeSol(token) && amountInUnits <= balance;
+      debugLog(debug, "solana-amount", "amount:invalid", {
+        amount,
+        balance: balance.toString(),
+        spendableBalance: spendableBalance.toString(),
+        amountInUnits: amountInUnits.toString(),
+        reason: isReserveIssue ? "native-buffer" : "insufficient-balance"
+      });
+      setError(
+        isReserveIssue ? "Use a bit less than your full SOL balance" : "Insufficient balance"
+      );
+      return;
+    }
+    debugLog(debug, "solana-amount", "amount:continue", {
+      symbol: token.symbol,
+      amount,
+      amountInUnits: amountInUnits.toString()
+    });
+    setError(null);
+    onContinue(token, amount);
+  };
+  return /* @__PURE__ */ jsxs8("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx8("div", { style: { padding: "12px 12px 4px" }, children: /* @__PURE__ */ jsx8("div", { className: "rs-step-title", children: "Enter amount" }) }),
+    /* @__PURE__ */ jsxs8("div", { className: "rs-step-body", style: { paddingTop: 0 }, children: [
+      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-display", children: [
+        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-input-wrapper", children: [
+          /* @__PURE__ */ jsx8(
+            "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__ */ jsx8("div", { className: "rs-amount-token-value", children: token.symbol })
+        ] }),
+        /* @__PURE__ */ jsxs8("div", { className: "rs-amount-available", children: [
+          /* @__PURE__ */ jsxs8("span", { className: "rs-amount-available-value", children: [
+            formattedBalance,
+            " ",
+            token.symbol,
+            " available"
+          ] }),
+          formattedBalanceUsd && /* @__PURE__ */ jsx8("span", { className: "rs-amount-available-value", children: formattedBalanceUsd })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs8("div", { className: "rs-amount-presets", children: [
+        [25, 50, 75].map((pct) => /* @__PURE__ */ jsxs8(
+          "button",
+          {
+            type: "button",
+            className: "rs-amount-preset-btn",
+            onClick: () => handlePresetClick(pct),
+            children: [
+              pct,
+              "%"
+            ]
+          },
+          pct
+        )),
+        /* @__PURE__ */ jsx8(
+          "button",
+          {
+            type: "button",
+            className: "rs-amount-preset-btn",
+            onClick: () => handlePresetClick(100),
+            children: "Max"
+          }
+        )
+      ] }),
+      error && /* @__PURE__ */ jsxs8("div", { className: "rs-amount-error", children: [
+        /* @__PURE__ */ jsx8(
+          "svg",
+          {
+            viewBox: "0 0 24 24",
+            fill: "none",
+            stroke: "currentColor",
+            strokeWidth: "2",
+            style: { width: 16, height: 16, flexShrink: 0 },
+            children: /* @__PURE__ */ jsx8(
+              "path",
+              {
+                strokeLinecap: "round",
+                strokeLinejoin: "round",
+                d: "M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zm-9 3.75h.008v.008H12v-.008z"
+              }
+            )
+          }
+        ),
+        /* @__PURE__ */ jsx8("span", { children: error })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx8("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx8(
+      Button,
+      {
+        onClick: handleContinue,
+        fullWidth: true,
+        disabled: !amount,
+        children: "Continue"
+      }
+    ) }),
+    /* @__PURE__ */ jsx8(PoweredBy, {})
+  ] });
+}
+
+// src/components/steps/SolanaConfirmStep.tsx
+import { useState as useState9 } from "react";
+import { parseUnits as parseUnits4 } from "viem";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+function SolanaConfirmStep({
+  smartAccount,
+  solanaAddress,
+  solanaDepositAddress,
+  token,
+  amount,
+  targetChain,
+  targetToken,
+  service,
+  solanaProvider,
+  onConfirm,
+  onError,
+  debug
+}) {
+  const [isSubmitting, setIsSubmitting] = useState9(false);
+  const [error, setError] = useState9(null);
+  const targetSymbol = getTokenSymbol(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 handleConfirm = async () => {
+    if (!solanaProvider) {
+      debugLog(debug, "solana-confirm", "submit:blocked", {
+        reason: "missing-provider"
+      });
+      setError("Solana wallet not connected");
+      return;
+    }
+    const parsedAmount = parseFloat(amount);
+    if (isNaN(parsedAmount) || parsedAmount <= 0) {
+      debugLog(debug, "solana-confirm", "submit:blocked", {
+        reason: "invalid-amount",
+        amount
+      });
+      setError("Please enter a valid amount");
+      return;
+    }
+    setError(null);
+    setIsSubmitting(true);
+    debugLog(debug, "solana-confirm", "submit:start", {
+      smartAccount,
+      solanaAddress,
+      solanaDepositAddress,
+      token: token.symbol,
+      amount
+    });
+    try {
+      const check = await service.checkAccount(smartAccount);
+      debugLog(debug, "solana-confirm", "check:success", {
+        smartAccount,
+        isRegistered: check.isRegistered,
+        targetChain: check.targetChain,
+        targetToken: check.targetToken
+      });
+      if (!check.isRegistered) {
+        throw new Error(
+          "Deposit account is not registered yet. Please restart setup and try again."
+        );
+      }
+      const connection = getSolanaConnection();
+      const amountUnits = parseUnits4(amount, token.decimals);
+      debugLog(debug, "solana-confirm", "tx:build:start", {
+        token: token.symbol,
+        amount,
+        amountUnits: amountUnits.toString()
+      });
+      const transaction = isNativeSol(token) ? await buildSolTransferTransaction(
+        connection,
+        solanaAddress,
+        solanaDepositAddress,
+        amountUnits
+      ) : await buildSplTransferTransaction(
+        connection,
+        solanaAddress,
+        solanaDepositAddress,
+        token.mint,
+        amountUnits
+      );
+      debugLog(debug, "solana-confirm", "tx:build:success", {
+        token: token.symbol,
+        instructionCount: transaction.instructions.length,
+        feePayer: transaction.feePayer?.toBase58(),
+        recentBlockhash: transaction.recentBlockhash
+      });
+      const txHash = await sendSolanaTransaction(
+        solanaProvider,
+        connection,
+        transaction
+      );
+      debugLog(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 = formatUserError(raw);
+      debugError(debug, "solana-confirm", "submit:failure", err, {
+        smartAccount,
+        token: token.symbol,
+        amount
+      });
+      setError(message);
+      onError?.(message, "SOLANA_TRANSFER_ERROR");
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+  return /* @__PURE__ */ jsxs9("div", { className: "rs-step", children: [
+    /* @__PURE__ */ jsx9("div", { style: { padding: "12px 12px 10px" }, children: /* @__PURE__ */ jsx9("div", { className: "rs-step-title", children: "Review order" }) }),
+    /* @__PURE__ */ jsxs9("div", { className: "rs-step-body rs-space-y-3", style: { paddingTop: 0 }, children: [
+      /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
+        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Source" }),
+          /* @__PURE__ */ jsxs9(
+            "span",
+            {
+              className: "rs-card-value",
+              style: { display: "flex", alignItems: "center", gap: 8 },
+              children: [
+                getChainIcon("solana") && /* @__PURE__ */ jsx9(
+                  "img",
+                  {
+                    src: getChainIcon("solana"),
+                    alt: "",
+                    style: { width: 16, height: 16, borderRadius: 3 }
+                  }
+                ),
+                getChainName("solana")
+              ]
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Destination" }),
+          /* @__PURE__ */ jsxs9(
+            "span",
+            {
+              className: "rs-card-value",
+              style: { display: "flex", alignItems: "center", gap: 8 },
+              children: [
+                getChainIcon(targetChain) && /* @__PURE__ */ jsx9(
+                  "img",
+                  {
+                    src: getChainIcon(targetChain),
+                    alt: "",
+                    style: { width: 16, height: 16, borderRadius: 3 }
+                  }
+                ),
+                getChainName(targetChain)
+              ]
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "Estimated time" }),
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-value", children: "< 1 min" })
+        ] })
+      ] }),
+      /* @__PURE__ */ jsxs9("div", { className: "rs-card", children: [
+        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You send" }),
+          /* @__PURE__ */ jsxs9(
+            "span",
+            {
+              className: "rs-card-value",
+              style: { display: "flex", alignItems: "center", gap: 6 },
+              children: [
+                getTokenIcon(token.symbol) && /* @__PURE__ */ jsx9(
+                  "img",
+                  {
+                    src: getTokenIcon(token.symbol),
+                    alt: "",
+                    style: { width: 16, height: 16, borderRadius: "50%" }
+                  }
+                ),
+                formattedAmount,
+                " ",
+                token.symbol
+              ]
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsxs9("div", { className: "rs-card-row", children: [
+          /* @__PURE__ */ jsx9("span", { className: "rs-card-label", children: "You receive" }),
+          /* @__PURE__ */ jsxs9(
+            "span",
+            {
+              className: "rs-card-value",
+              style: { display: "flex", alignItems: "center", gap: 6 },
+              children: [
+                getTokenIcon(targetSymbol) && /* @__PURE__ */ jsx9(
+                  "img",
+                  {
+                    src: getTokenIcon(targetSymbol),
+                    alt: "",
+                    style: { width: 16, height: 16, borderRadius: "50%" }
+                  }
+                ),
+                isSameToken ? `~ ${formattedAmount} ${targetSymbol}` : `~ equivalent in ${targetSymbol}`
+              ]
+            }
+          )
+        ] })
+      ] }),
+      error && /* @__PURE__ */ jsxs9("div", { className: "rs-alert rs-alert--error", children: [
+        /* @__PURE__ */ jsx9(
+          "svg",
+          {
+            className: "rs-alert-icon",
+            viewBox: "0 0 24 24",
+            fill: "none",
+            stroke: "currentColor",
+            strokeWidth: "2",
+            children: /* @__PURE__ */ jsx9(
+              "path",
+              {
+                strokeLinecap: "round",
+                strokeLinejoin: "round",
+                d: "M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zm-9 3.75h.008v.008H12v-.008z"
+              }
+            )
+          }
+        ),
+        /* @__PURE__ */ jsx9("span", { className: "rs-alert-text", children: error })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx9("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx9(
+      Button,
+      {
+        onClick: handleConfirm,
+        loading: isSubmitting,
+        disabled: !amount || Number(amount) <= 0,
+        fullWidth: true,
+        children: "Confirm Order"
+      }
+    ) }),
+    /* @__PURE__ */ jsx9(PoweredBy, {})
+  ] });
+}
+
+// src/DepositFlow.tsx
+import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+function isSameRoute(sourceChain, sourceToken, targetChain, targetToken) {
+  return sourceChain === targetChain && sourceToken.toLowerCase() === targetToken.toLowerCase();
+}
+function getAddressKey(address) {
+  return address ? address.toLowerCase() : null;
+}
+function DepositFlow({
+  dappWalletClient,
+  dappPublicClient,
+  dappAddress,
+  targetChain,
+  targetToken,
+  service,
+  sourceChain: defaultSourceChain,
+  sourceToken: defaultSourceToken,
+  amount: defaultAmount,
+  recipient,
+  signerAddress = DEFAULT_SIGNER_ADDRESS,
+  sessionChainIds,
+  forceRegister = false,
+  waitForFinalTx = true,
+  reownWallet,
+  onConnect,
+  onDisconnect,
+  onRequestConnect,
+  connectButtonLabel,
+  uiConfig,
+  onStepChange,
+  onTotalBalanceChange,
+  onClose,
+  onConnected,
+  onDepositSubmitted,
+  onDepositComplete,
+  onDepositFailed,
+  onError,
+  debug
+}) {
+  const [step, setStep] = useState10({ type: "setup" });
+  const [flowMode, setFlowMode] = useState10(null);
+  const [totalBalanceUsd, setTotalBalanceUsd] = useState10(0);
+  const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState10(false);
+  const [selectedWalletId, setSelectedWalletId] = useState10(null);
+  const portfolioAssetsRef = useRef5([]);
+  const stableWalletSignerRef = useRef5(null);
+  const stableWalletSelectionKeyRef = useRef5(null);
+  const logFlow = useCallback3(
+    (message, data) => {
+      debugLog(debug, "deposit-flow", message, data);
+    },
+    [debug]
+  );
+  const logFlowError = useCallback3(
+    (message, error, data) => {
+      debugError(debug, "deposit-flow", message, error, data);
+    },
+    [debug]
+  );
+  const handleAssetsLoaded = useCallback3((assets) => {
+    portfolioAssetsRef.current = assets;
+  }, []);
+  const getTokenPriceUsd = useCallback3((symbol) => {
+    const sym = symbol.toLowerCase();
+    for (const asset of portfolioAssetsRef.current) {
+      if (asset.symbol.toLowerCase() === sym && asset.balanceUsd && asset.balance) {
+        try {
+          const balanceUnits = Number(asset.balance) / 10 ** asset.decimals;
+          if (balanceUnits > 0) return asset.balanceUsd / balanceUnits;
+        } catch {
+        }
+      }
+    }
+    return null;
+  }, []);
+  const dappSwitchChain = useMemo7(() => {
+    if (!dappWalletClient?.switchChain) return void 0;
+    return async (chainId) => {
+      await dappWalletClient.switchChain?.({ id: chainId });
+    };
+  }, [dappWalletClient]);
+  const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
+  const walletOptions = useMemo7(() => {
+    const options = [];
+    const seen = /* @__PURE__ */ new Set();
+    if (connectedWalletAddress && dappAddress) {
+      const id = `evm:${connectedWalletAddress.toLowerCase()}`;
+      options.push({
+        id,
+        address: connectedWalletAddress,
+        label: "Connected Wallet",
+        kind: "connected"
+      });
+      seen.add(id);
+    }
+    if (reownWallet?.isConnected && reownWallet.isSolana && reownWallet.solanaAddress && dappAddress) {
+      const id = reownWallet.caipAddress ?? `solana:${reownWallet.solanaAddress}`;
+      if (!seen.has(id)) {
+        options.push({
+          id,
+          solanaAddress: reownWallet.solanaAddress,
+          label: "Solana Wallet",
+          kind: "solana",
+          icon: reownWallet.icon
+        });
+        seen.add(id);
+      }
+    } else if (reownWallet?.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({
+          id,
+          address: reownWallet.address,
+          label: "External Wallet",
+          kind: "external",
+          icon: reownWallet.icon
+        });
+        seen.add(id);
+      }
+    }
+    return options;
+  }, [
+    connectedWalletAddress,
+    dappAddress,
+    reownWallet?.address,
+    reownWallet?.isConnected,
+    reownWallet?.walletClient,
+    reownWallet?.publicClient,
+    reownWallet?.icon,
+    reownWallet?.isSolana,
+    reownWallet?.solanaAddress,
+    reownWallet?.caipAddress
+  ]);
+  const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
+  const hasWalletOptions = walletOptions.length > 0;
+  const hasReownSession = Boolean(
+    reownWallet?.isConnected || reownWallet?.address
+  );
+  const showConnectStep = flowMode === null && !canAutoLock && !isConnectSelectionConfirmed;
+  const walletSelectionKey = useMemo7(() => {
+    if (flowMode !== "wallet") return null;
+    if (canAutoLock) {
+      return getAddressKey(connectedWalletAddress);
+    }
+    if (!isConnectSelectionConfirmed) return null;
+    return selectedWalletId;
+  }, [
+    flowMode,
+    canAutoLock,
+    connectedWalletAddress,
+    isConnectSelectionConfirmed,
+    selectedWalletId
+  ]);
+  const walletSignerContext = useMemo7(() => {
+    if (flowMode === "deposit-address") {
+      return null;
+    }
+    if (flowMode === "solana-wallet") {
+      if (!dappAddress) return null;
+      return {
+        ownerAddress: dappAddress,
+        walletClient: void 0,
+        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        switchChain: void 0
+      };
+    }
+    if (canAutoLock) {
+      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (!isConnectSelectionConfirmed || !selectedWalletId) return null;
+    const selectedOption = walletOptions.find((option) => option.id === selectedWalletId);
+    if (!selectedOption) return null;
+    if (selectedOption.kind === "solana") {
+      if (!dappAddress) return null;
+      return {
+        ownerAddress: dappAddress,
+        walletClient: void 0,
+        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        switchChain: void 0
+      };
+    }
+    if (selectedOption.kind === "connected" && dappWalletClient?.account && selectedOption.address && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+      const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
+      return {
+        ownerAddress: dappWalletClient.account.address,
+        walletClient: dappWalletClient,
+        publicClient: dappPublicClient ?? getPublicClient(fallbackChainId),
+        switchChain: dappSwitchChain
+      };
+    }
+    if (selectedOption.kind === "external" && reownWallet?.address && selectedOption.address && reownWallet.address.toLowerCase() === selectedOption.address.toLowerCase()) {
+      return {
+        ownerAddress: reownWallet.address,
+        walletClient: reownWallet.walletClient,
+        publicClient: reownWallet.publicClient ?? getPublicClient(targetChain),
+        switchChain: reownWallet.switchChain
+      };
+    }
+    return null;
+  }, [
+    canAutoLock,
+    isConnectSelectionConfirmed,
+    selectedWalletId,
+    walletOptions,
+    dappWalletClient,
+    dappPublicClient,
+    dappSwitchChain,
+    dappAddress,
     reownWallet,
     targetChain
   ]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (flowMode !== "wallet") {
       stableWalletSelectionKeyRef.current = null;
       stableWalletSignerRef.current = null;
@@ -1719,7 +2645,7 @@ function DepositFlow({
       stableWalletSignerRef.current = walletSignerContext;
     }
   }, [flowMode, walletSelectionKey, walletSignerContext]);
-  const signerContext = useMemo5(() => {
+  const signerContext = useMemo7(() => {
     if (flowMode === "deposit-address") {
       if (!dappAddress) return null;
       return {
@@ -1749,7 +2675,7 @@ function DepositFlow({
   ]);
   const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
   const lastTargetRef = useRef5(null);
-  useEffect7(() => {
+  useEffect8(() => {
     const prev = lastTargetRef.current;
     if (prev && (prev.chain !== targetChain || prev.token.toLowerCase() !== targetToken.toLowerCase())) {
       if (step.type !== "processing") {
@@ -1779,6 +2705,37 @@ function DepositFlow({
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
+  const handleBackFromSolanaTokenSelect = useCallback3(() => {
+    setFlowMode(null);
+    setStep({ type: "setup" });
+    if (hasWalletOptions || reownWallet) {
+      hasNavigatedBackRef.current = true;
+      setIsConnectSelectionConfirmed(false);
+    }
+  }, [hasWalletOptions, reownWallet]);
+  const handleBackFromSolanaAmount = useCallback3(() => {
+    setStep((prev) => {
+      if (prev.type !== "solana-amount") return prev;
+      return {
+        type: "solana-token-select",
+        smartAccount: prev.smartAccount,
+        solanaDepositAddress: prev.solanaDepositAddress
+      };
+    });
+  }, []);
+  const handleBackFromSolanaConfirm = useCallback3(() => {
+    setStep((prev) => {
+      if (prev.type !== "solana-confirm") return prev;
+      return {
+        type: "solana-amount",
+        smartAccount: prev.smartAccount,
+        solanaDepositAddress: prev.solanaDepositAddress,
+        token: prev.token,
+        balance: prev.balance,
+        balanceUsd: prev.balanceUsd
+      };
+    });
+  }, []);
   const handleBackFromConfirm = useCallback3(() => {
     setStep((prev) => {
       if (prev.type !== "confirm") return prev;
@@ -1789,50 +2746,79 @@ function DepositFlow({
       };
     });
   }, []);
-  const stepIndex = step.type === "setup" ? 0 : step.type === "deposit-address" ? 1 : step.type === "select-asset" ? 1 : step.type === "amount" ? 2 : step.type === "confirm" ? 3 : 4;
-  const currentBackHandler = step.type === "deposit-address" ? handleBackFromDepositAddress : step.type === "select-asset" && signerContext && !canAutoLock ? handleBackFromSelectAsset : step.type === "amount" ? handleBackFromAmount : step.type === "confirm" ? handleBackFromConfirm : void 0;
-  useEffect7(() => {
+  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;
+  useEffect8(() => {
     onStepChange?.(stepIndex, currentBackHandler);
   }, [stepIndex, currentBackHandler, onStepChange]);
-  useEffect7(() => {
+  useEffect8(() => {
+    logFlow("state:changed", {
+      step: step.type,
+      flowMode,
+      targetChain,
+      targetToken,
+      selectedWalletId
+    });
+  }, [
+    flowMode,
+    logFlow,
+    selectedWalletId,
+    step.type,
+    targetChain,
+    targetToken
+  ]);
+  useEffect8(() => {
     onTotalBalanceChange?.(totalBalanceUsd);
   }, [totalBalanceUsd, onTotalBalanceChange]);
   const isDepositAddressMode = flowMode === "deposit-address";
+  const isSolanaWalletMode = flowMode === "solana-wallet";
   const handleSelectProvider = useCallback3(() => {
     setFlowMode("wallet");
   }, []);
+  const handleSelectSolanaWallet = useCallback3(() => {
+    setFlowMode("solana-wallet");
+  }, []);
   const handleSelectTransferCrypto = useCallback3(() => {
     setFlowMode("deposit-address");
     setStep({ type: "setup" });
   }, []);
-  const handleResetFlow = useCallback3(() => {
-    portfolioAssetsRef.current = [];
-    stableWalletSignerRef.current = null;
-    stableWalletSelectionKeyRef.current = null;
-    hasNavigatedBackRef.current = false;
-    setTotalBalanceUsd(0);
-    setSelectedConnectAddress(null);
-    setIsConnectSelectionConfirmed(false);
+  const handleNewDeposit = useCallback3(() => {
     setFlowMode(null);
     setStep({ type: "setup" });
   }, []);
-  const handleNewDeposit = useCallback3(() => {
-    handleResetFlow();
-  }, [handleResetFlow]);
   const handleSetupComplete = useCallback3(
-    (smartAccount) => {
+    (smartAccount, solanaDepositAddress) => {
+      logFlow("setup:complete", {
+        smartAccount,
+        hasSolanaDepositAddress: Boolean(solanaDepositAddress),
+        flowMode: isDepositAddressMode ? "deposit-address" : isSolanaWalletMode ? "solana-wallet" : "wallet"
+      });
       if (isDepositAddressMode) {
-        setStep({ type: "deposit-address", smartAccount });
+        setStep({ type: "deposit-address", smartAccount, solanaDepositAddress });
+      } else if (isSolanaWalletMode) {
+        if (solanaDepositAddress) {
+          setStep({ type: "solana-token-select", smartAccount, solanaDepositAddress });
+        } else {
+          onError?.({ message: "Solana deposit address not available. Please try again.", code: "SOLANA_SETUP_FAILED" });
+        }
       } else {
         setStep({ type: "select-asset", smartAccount });
       }
     },
-    [isDepositAddressMode]
+    [isDepositAddressMode, isSolanaWalletMode, logFlow]
   );
   const handleDepositAddressDetected = useCallback3(
-    (txHash, chainId, amount, token) => {
+    (txHash, chainId, amount, token, sourceSymbol, sourceDecimals) => {
+      logFlow("deposit-address:detected", {
+        txHash,
+        sourceChain: chainId,
+        sourceToken: token,
+        amount
+      });
       setStep((prev) => {
         if (prev.type !== "deposit-address") return prev;
+        const isEvmToken = /^0x[a-fA-F0-9]{40}$/.test(token);
+        const directTransfer = typeof chainId === "number" && isEvmToken && isSameRoute(chainId, token, targetChain, targetToken);
         return {
           type: "processing",
           smartAccount: prev.smartAccount,
@@ -1840,13 +2826,81 @@ function DepositFlow({
           sourceChain: chainId,
           sourceToken: token,
           amount,
-          directTransfer: isSameRoute(chainId, token, targetChain, targetToken)
+          sourceSymbol,
+          sourceDecimals,
+          directTransfer
         };
       });
       onDepositSubmitted?.({ txHash, sourceChain: chainId, amount });
     },
     [onDepositSubmitted, targetChain, targetToken]
   );
+  const handleSolanaTokenContinue = useCallback3(
+    (token, balance, balanceUsd) => {
+      logFlow("solana:token:continue", { token: token.symbol });
+      setStep((prev) => {
+        if (prev.type !== "solana-token-select") return prev;
+        return {
+          type: "solana-amount",
+          smartAccount: prev.smartAccount,
+          solanaDepositAddress: prev.solanaDepositAddress,
+          token,
+          balance,
+          balanceUsd
+        };
+      });
+    },
+    [logFlow]
+  );
+  const handleSolanaAmountContinue = useCallback3(
+    (token, amount) => {
+      logFlow("solana:amount:continue", {
+        token: token.symbol,
+        amount
+      });
+      setStep((prev) => {
+        if (prev.type !== "solana-amount") return prev;
+        return {
+          type: "solana-confirm",
+          smartAccount: prev.smartAccount,
+          solanaDepositAddress: prev.solanaDepositAddress,
+          token,
+          amount,
+          balance: prev.balance,
+          balanceUsd: prev.balanceUsd
+        };
+      });
+    },
+    [logFlow]
+  );
+  const handleSolanaConfirmed = useCallback3(
+    (txHash, amountUnits) => {
+      setStep((prev) => {
+        if (prev.type !== "solana-confirm") return prev;
+        logFlow("solana:submitted", {
+          txHash,
+          amountUnits,
+          token: prev.token.symbol
+        });
+        return {
+          type: "processing",
+          smartAccount: prev.smartAccount,
+          txHash,
+          sourceChain: "solana",
+          sourceToken: prev.token.mint,
+          amount: amountUnits,
+          sourceSymbol: prev.token.symbol,
+          sourceDecimals: prev.token.decimals
+        };
+      });
+      onDepositSubmitted?.({
+        txHash,
+        sourceChain: "solana",
+        amount: amountUnits
+      });
+    },
+    [logFlow, onDepositSubmitted]
+  );
   const handleConnected = useCallback3(
     (addr, smartAccount) => {
       onConnected?.({ address: addr, smartAccount });
@@ -1889,6 +2943,12 @@ function DepositFlow({
   );
   const handleDepositSubmitted = useCallback3(
     (txHash, chainId, amount, token) => {
+      logFlow("evm:submitted", {
+        txHash,
+        sourceChain: chainId,
+        sourceToken: token,
+        amount
+      });
       setStep((prev) => {
         if (prev.type !== "confirm") return prev;
         return {
@@ -1912,48 +2972,69 @@ function DepositFlow({
   );
   const handleDepositComplete = useCallback3(
     (txHash, destinationTxHash) => {
+      logFlow("deposit:complete", { txHash, destinationTxHash });
       onDepositComplete?.({ txHash, destinationTxHash });
     },
-    [onDepositComplete]
+    [logFlow, onDepositComplete]
   );
   const handleDepositFailed = useCallback3(
     (txHash, error) => {
+      logFlowError("deposit:failed", error, { txHash });
       onDepositFailed?.({ txHash, error });
     },
-    [onDepositFailed]
+    [logFlowError, onDepositFailed]
   );
   const handleError = useCallback3(
     (message, code) => {
+      logFlowError("flow:error", message, { code });
       onError?.({ message, code });
     },
-    [onError]
+    [logFlowError, onError]
   );
   const handleTotalBalanceComputed = useCallback3((total) => {
     setTotalBalanceUsd(total);
   }, []);
-  const selectedConnectAddressEffective = useMemo5(() => {
-    if (selectedConnectAddress) return selectedConnectAddress;
+  const selectedWalletIdEffective = useMemo7(() => {
+    if (selectedWalletId) return selectedWalletId;
     if (walletOptions.length === 1) {
-      return walletOptions[0].address;
+      return walletOptions[0].id;
     }
     return null;
-  }, [selectedConnectAddress, walletOptions]);
-  useEffect7(() => {
+  }, [selectedWalletId, walletOptions]);
+  const walletOptionsKey = useMemo7(
+    () => walletOptions.map((option) => option.id).join(","),
+    [walletOptions]
+  );
+  const hasNavigatedBackRef = useRef5(false);
+  useEffect8(() => {
+    setIsConnectSelectionConfirmed(false);
+    setSelectedWalletId(null);
+    setFlowMode(null);
+    if (step.type !== "processing" && step.type !== "confirm" && step.type !== "solana-confirm" && step.type !== "amount" && step.type !== "solana-amount") {
+      setStep({ type: "setup" });
+    }
+  }, [walletOptionsKey]);
+  useEffect8(() => {
     if (!showConnectStep && isConnectSelectionConfirmed && flowMode === "wallet" && !signerContext) {
-      setSelectedConnectAddress(null);
+      setSelectedWalletId(null);
       setIsConnectSelectionConfirmed(false);
       setFlowMode(null);
     }
   }, [showConnectStep, isConnectSelectionConfirmed, flowMode, signerContext]);
-  useEffect7(() => {
+  useEffect8(() => {
     if (hasNavigatedBackRef.current || isConnectSelectionConfirmed || flowMode) {
       return;
     }
     if (hasWalletOptions) {
-      const address = selectedConnectAddressEffective;
-      if (address) {
-        setSelectedConnectAddress(address);
-        handleSelectProvider();
+      const walletId = selectedWalletIdEffective;
+      if (walletId) {
+        const selectedOption = walletOptions.find((o) => o.id === walletId);
+        setSelectedWalletId(walletId);
+        if (selectedOption?.kind === "solana") {
+          handleSelectSolanaWallet();
+        } else {
+          handleSelectProvider();
+        }
         setIsConnectSelectionConfirmed(true);
         return;
       }
@@ -1967,18 +3048,20 @@ function DepositFlow({
     hasReownSession,
     isConnectSelectionConfirmed,
     flowMode,
-    selectedConnectAddressEffective,
+    selectedWalletIdEffective,
     dappAddress,
+    walletOptions,
     handleSelectProvider,
+    handleSelectSolanaWallet,
     handleSelectTransferCrypto
   ]);
   if (showConnectStep) {
-    return /* @__PURE__ */ jsx7("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx7(
+    return /* @__PURE__ */ jsx10("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx10(
       ConnectStep,
       {
         walletOptions,
-        selectedAddress: selectedConnectAddressEffective,
-        onSelectAddress: setSelectedConnectAddress,
+        selectedWalletId: selectedWalletIdEffective,
+        onSelectWallet: setSelectedWalletId,
         onSelectTransferCrypto: dappAddress ? () => {
           handleSelectTransferCrypto();
           setIsConnectSelectionConfirmed(true);
@@ -1987,10 +3070,17 @@ function DepositFlow({
         onConnect,
         onDisconnect,
         onContinue: () => {
-          if (selectedConnectAddressEffective) {
-            setSelectedConnectAddress(selectedConnectAddressEffective);
+          if (selectedWalletIdEffective) {
+            setSelectedWalletId(selectedWalletIdEffective);
+          }
+          const selectedOption = walletOptions.find(
+            (o) => o.id === selectedWalletIdEffective
+          );
+          if (selectedOption?.kind === "solana") {
+            handleSelectSolanaWallet();
+          } else {
+            handleSelectProvider();
           }
-          handleSelectProvider();
           setIsConnectSelectionConfirmed(true);
         },
         connectButtonLabel
@@ -1999,8 +3089,8 @@ function DepositFlow({
   }
   if (isDepositAddressMode) {
     if (!dappAddress || !sessionKeyAddress) return null;
-    return /* @__PURE__ */ jsxs7("div", { className: "rs-modal-body", children: [
-      step.type === "setup" && /* @__PURE__ */ jsx7(
+    return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
+      step.type === "setup" && /* @__PURE__ */ jsx10(
         SetupStep,
         {
           address: sessionKeyAddress,
@@ -2016,16 +3106,17 @@ function DepositFlow({
           onError: handleError
         }
       ),
-      step.type === "deposit-address" && /* @__PURE__ */ jsx7(
+      step.type === "deposit-address" && /* @__PURE__ */ jsx10(
         DepositAddressStep,
         {
           smartAccount: step.smartAccount,
+          solanaDepositAddress: step.solanaDepositAddress,
           service,
           onDepositDetected: handleDepositAddressDetected,
           onError: handleError
         }
       ),
-      step.type === "processing" && /* @__PURE__ */ jsx7(
+      step.type === "processing" && /* @__PURE__ */ jsx10(
         ProcessingStep,
         {
           smartAccount: step.smartAccount,
@@ -2034,6 +3125,99 @@ function DepositFlow({
           sourceToken: step.sourceToken,
           targetChain,
           amount: step.amount,
+          sourceSymbol: step.sourceSymbol,
+          sourceDecimals: step.sourceDecimals,
+          waitForFinalTx,
+          service,
+          directTransfer: step.directTransfer,
+          onClose,
+          onNewDeposit: handleNewDeposit,
+          onDepositComplete: handleDepositComplete,
+          onDepositFailed: handleDepositFailed,
+          onError: handleError,
+          debug
+        }
+      )
+    ] });
+  }
+  if (isSolanaWalletMode) {
+    if (!sessionKeyAddress) return null;
+    const solanaAddr = reownWallet?.solanaAddress;
+    const solanaProvider = reownWallet?.solanaProvider;
+    return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
+      step.type === "setup" && /* @__PURE__ */ jsx10(
+        SetupStep,
+        {
+          address: sessionKeyAddress,
+          targetChain,
+          targetToken,
+          signerAddress,
+          sessionChainIds,
+          recipient,
+          forceRegister,
+          service,
+          onSetupComplete: handleSetupComplete,
+          onConnected: handleConnected,
+          onError: handleError
+        }
+      ),
+      step.type === "solana-token-select" && solanaAddr && /* @__PURE__ */ jsx10(
+        SolanaTokenSelectStep,
+        {
+          solanaAddress: solanaAddr,
+          service,
+          onContinue: handleSolanaTokenContinue,
+          onTotalBalanceComputed: handleTotalBalanceComputed,
+          debug
+        }
+      ),
+      step.type === "solana-amount" && /* @__PURE__ */ jsx10(
+        SolanaAmountStep,
+        {
+          token: step.token,
+          balance: step.balance,
+          balanceUsd: step.balanceUsd,
+          onContinue: handleSolanaAmountContinue,
+          debug
+        }
+      ),
+      step.type === "solana-confirm" && solanaAddr && solanaProvider ? /* @__PURE__ */ jsx10(
+        SolanaConfirmStep,
+        {
+          smartAccount: step.smartAccount,
+          solanaAddress: solanaAddr,
+          solanaDepositAddress: step.solanaDepositAddress,
+          token: step.token,
+          amount: step.amount,
+          targetChain,
+          targetToken,
+          service,
+          solanaProvider,
+          onConfirm: handleSolanaConfirmed,
+          onError: handleError,
+          debug
+        }
+      ) : step.type === "solana-confirm" ? /* @__PURE__ */ jsxs10("div", { className: "rs-step", children: [
+        /* @__PURE__ */ jsxs10("div", { className: "rs-loading-state", children: [
+          /* @__PURE__ */ jsx10("div", { className: "rs-step-icon rs-step-icon--error", children: /* @__PURE__ */ jsx10("svg", { viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", children: /* @__PURE__ */ jsx10("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zm-9 3.75h.008v.008H12v-.008z" }) }) }),
+          /* @__PURE__ */ jsxs10("div", { className: "rs-loading-text", children: [
+            /* @__PURE__ */ jsx10("div", { className: "rs-loading-title rs-text-error", children: "Wallet disconnected" }),
+            /* @__PURE__ */ jsx10("div", { className: "rs-loading-subtitle", children: "Please reconnect your Solana wallet to continue." })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx10("div", { className: "rs-step-footer", children: /* @__PURE__ */ jsx10("button", { type: "button", className: "rs-button rs-button--default rs-button--full-width", onClick: handleBackFromSolanaConfirm, children: /* @__PURE__ */ jsx10("span", { children: "Go Back" }) }) })
+      ] }) : null,
+      step.type === "processing" && /* @__PURE__ */ jsx10(
+        ProcessingStep,
+        {
+          smartAccount: step.smartAccount,
+          txHash: step.txHash,
+          sourceChain: step.sourceChain,
+          sourceToken: step.sourceToken,
+          targetChain,
+          amount: step.amount,
+          sourceSymbol: step.sourceSymbol,
+          sourceDecimals: step.sourceDecimals,
           waitForFinalTx,
           service,
           directTransfer: step.directTransfer,
@@ -2048,7 +3232,7 @@ function DepositFlow({
     ] });
   }
   if (!signerContext?.walletClient || !signerContext?.publicClient) {
-    return null;
+    return /* @__PURE__ */ jsx10("div", { className: "rs-modal-body", children: /* @__PURE__ */ jsx10("div", { className: "rs-step", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-state", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-text", children: /* @__PURE__ */ jsx10("div", { className: "rs-loading-title", children: "Connecting wallet..." }) }) }) }) });
   }
   const ownerAddress = signerContext.ownerAddress;
   const ownerChainId = signerContext.walletClient?.chain?.id ?? signerContext.publicClient.chain?.id ?? targetChain;
@@ -2058,8 +3242,8 @@ function DepositFlow({
     }
     return getPublicClient(chainId);
   };
-  return /* @__PURE__ */ jsxs7("div", { className: "rs-modal-body", children: [
-    step.type === "setup" && /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs10("div", { className: "rs-modal-body", children: [
+    step.type === "setup" && /* @__PURE__ */ jsx10(
       SetupStep,
       {
         walletClient: signerContext.walletClient,
@@ -2076,7 +3260,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    step.type === "select-asset" && /* @__PURE__ */ jsx7(
+    step.type === "select-asset" && /* @__PURE__ */ jsx10(
       AssetSelectStep,
       {
         address: ownerAddress,
@@ -2089,7 +3273,7 @@ function DepositFlow({
         onAssetsLoaded: handleAssetsLoaded
       }
     ),
-    step.type === "amount" && /* @__PURE__ */ jsx7(
+    step.type === "amount" && /* @__PURE__ */ jsx10(
       AmountStep,
       {
         walletClient: signerContext.walletClient,
@@ -2104,7 +3288,7 @@ function DepositFlow({
         onContinue: handleAmountContinue
       }
     ),
-    step.type === "confirm" && /* @__PURE__ */ jsx7(
+    step.type === "confirm" && /* @__PURE__ */ jsx10(
       ConfirmStep,
       {
         walletClient: signerContext.walletClient,
@@ -2124,7 +3308,7 @@ function DepositFlow({
         onError: handleError
       }
     ),
-    step.type === "processing" && /* @__PURE__ */ jsx7(
+    step.type === "processing" && /* @__PURE__ */ jsx10(
       ProcessingStep,
       {
         smartAccount: step.smartAccount,
@@ -2133,6 +3317,8 @@ function DepositFlow({
         sourceToken: step.sourceToken,
         targetChain,
         amount: step.amount,
+        sourceSymbol: step.sourceSymbol,
+        sourceDecimals: step.sourceDecimals,
         waitForFinalTx,
         service,
         directTransfer: step.directTransfer,
@@ -2140,23 +3326,24 @@ function DepositFlow({
         onNewDeposit: handleNewDeposit,
         onDepositComplete: handleDepositComplete,
         onDepositFailed: handleDepositFailed,
-        onError: handleError
+        onError: handleError,
+        debug
       }
     )
   ] });
 }
 
 // src/DepositModal.tsx
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-3HNOCOOO.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-WS6WNWJP.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;
   if (needsReown) {
-    return /* @__PURE__ */ jsx8(Suspense, { fallback: null, children: /* @__PURE__ */ jsx8(ReownDepositInner, { ...props }) });
+    return /* @__PURE__ */ jsx11(Suspense, { fallback: null, children: /* @__PURE__ */ jsx11(ReownDepositInner, { ...props }) });
   }
-  return /* @__PURE__ */ jsx8(DepositModalInner, { ...props });
+  return /* @__PURE__ */ jsx11(DepositModalInner, { ...props });
 }
 DepositModal.displayName = "DepositModal";
 function DepositModalInner({
@@ -2195,30 +3382,30 @@ function DepositModalInner({
   debug
 }) {
   const modalRef = useRef6(null);
-  const [currentStepIndex, setCurrentStepIndex] = useState8(0);
-  const [totalBalanceUsd, setTotalBalanceUsd] = useState8(null);
+  const [currentStepIndex, setCurrentStepIndex] = useState11(0);
+  const [totalBalanceUsd, setTotalBalanceUsd] = useState11(null);
   const backHandlerRef = useRef6(void 0);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = sourceChainProp ? getChainId(sourceChainProp) : void 0;
-  const service = useMemo6(() => createDepositService(backendUrl), [backendUrl]);
-  useEffect8(() => {
+  const service = useMemo8(
+    () => createDepositService(backendUrl, { debug, debugScope: "service:deposit" }),
+    [backendUrl, debug]
+  );
+  useEffect9(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);
     }
   }, [isOpen, theme]);
   const hasCalledReady = useRef6(false);
-  useEffect8(() => {
+  useEffect9(() => {
     if (isOpen && !hasCalledReady.current) {
       hasCalledReady.current = true;
       onReady?.();
     }
   }, [isOpen, onReady]);
-  useEffect8(() => {
+  useEffect9(() => {
     if (!isOpen) {
       setCurrentStepIndex(0);
-      setTotalBalanceUsd(null);
-      backHandlerRef.current = void 0;
-      hasCalledReady.current = false;
     }
   }, [isOpen]);
   const handleStepChange = useCallback4(
@@ -2241,30 +3428,30 @@ function DepositModalInner({
   const logoUrl = branding?.logoUrl ?? "https://github.com/rhinestonewtf.png";
   const title = branding?.title ?? "Deposit";
   const canGoBack = currentStepIndex > 0 && currentStepIndex < 4 && backHandlerRef.current !== void 0;
-  return /* @__PURE__ */ jsx8(
+  return /* @__PURE__ */ jsx11(
     Modal,
     {
       isOpen,
       onClose,
       className,
       inline,
-      children: /* @__PURE__ */ jsxs8("div", { ref: modalRef, className: "rs-modal", children: [
-        /* @__PURE__ */ jsxs8("div", { className: "rs-modal-header--redesigned", children: [
-          /* @__PURE__ */ jsx8("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && /* @__PURE__ */ jsx8(
+      children: /* @__PURE__ */ jsxs11("div", { ref: modalRef, className: "rs-modal", children: [
+        /* @__PURE__ */ jsxs11("div", { className: "rs-modal-header--redesigned", children: [
+          /* @__PURE__ */ jsx11("div", { className: "rs-modal-header-nav-left", children: showBackButton && canGoBack && /* @__PURE__ */ jsx11(
             "button",
             {
               type: "button",
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: handleBack,
-              children: /* @__PURE__ */ jsx8(
+              children: /* @__PURE__ */ jsx11(
                 "svg",
                 {
                   viewBox: "0 0 24 24",
                   fill: "none",
                   stroke: "currentColor",
                   strokeWidth: "2",
-                  children: /* @__PURE__ */ jsx8(
+                  children: /* @__PURE__ */ jsx11(
                     "path",
                     {
                       strokeLinecap: "round",
@@ -2276,9 +3463,9 @@ function DepositModalInner({
               )
             }
           ) }),
-          /* @__PURE__ */ jsxs8("div", { className: "rs-modal-header-nav-center", children: [
-            /* @__PURE__ */ jsxs8("div", { className: "rs-modal-header-title-row", children: [
-              showLogo && logoUrl && /* @__PURE__ */ jsx8(
+          /* @__PURE__ */ jsxs11("div", { className: "rs-modal-header-nav-center", children: [
+            /* @__PURE__ */ jsxs11("div", { className: "rs-modal-header-title-row", children: [
+              showLogo && logoUrl && /* @__PURE__ */ jsx11(
                 "img",
                 {
                   src: logoUrl,
@@ -2289,8 +3476,8 @@ function DepositModalInner({
                   }
                 }
               ),
-              /* @__PURE__ */ jsx8("span", { className: "rs-modal-header-title", children: title }),
-              showStepper && /* @__PURE__ */ jsx8("div", { className: "rs-modal-progress", style: { marginLeft: 8 }, children: [0, 1, 2, 3, 4].map((i) => /* @__PURE__ */ jsx8(
+              /* @__PURE__ */ jsx11("span", { className: "rs-modal-header-title", children: title }),
+              showStepper && /* @__PURE__ */ jsx11("div", { className: "rs-modal-progress", style: { marginLeft: 8 }, children: [0, 1, 2, 3, 4].map((i) => /* @__PURE__ */ jsx11(
                 "div",
                 {
                   className: `rs-modal-progress-dot ${i <= currentStepIndex ? "rs-modal-progress-dot--active" : "rs-modal-progress-dot--inactive"}`
@@ -2298,29 +3485,29 @@ function DepositModalInner({
                 i
               )) })
             ] }),
-            balance && /* @__PURE__ */ jsxs8("div", { className: "rs-modal-header-balance", children: [
-              /* @__PURE__ */ jsxs8("span", { children: [
+            balance && /* @__PURE__ */ jsxs11("div", { className: "rs-modal-header-balance", children: [
+              /* @__PURE__ */ jsxs11("span", { children: [
                 balance.title,
                 ":"
               ] }),
-              /* @__PURE__ */ jsx8("span", { className: "rs-modal-header-balance-value", children: balance.amount ?? (totalBalanceUsd !== null ? currencyFormatter.format(totalBalanceUsd) : null) })
+              /* @__PURE__ */ jsx11("span", { className: "rs-modal-header-balance-value", children: balance.amount ?? (totalBalanceUsd !== null ? currencyFormatter.format(totalBalanceUsd) : null) })
             ] })
           ] }),
-          /* @__PURE__ */ jsx8("div", { className: "rs-modal-header-nav-right", children: /* @__PURE__ */ jsx8(
+          /* @__PURE__ */ jsx11("div", { className: "rs-modal-header-nav-right", children: /* @__PURE__ */ jsx11(
             "button",
             {
               type: "button",
               onClick: onClose,
               className: "rs-modal-close",
               "aria-label": "Close",
-              children: /* @__PURE__ */ jsx8(
+              children: /* @__PURE__ */ jsx11(
                 "svg",
                 {
                   viewBox: "0 0 24 24",
                   fill: "none",
                   stroke: "currentColor",
                   strokeWidth: "2",
-                  children: /* @__PURE__ */ jsx8(
+                  children: /* @__PURE__ */ jsx11(
                     "path",
                     {
                       strokeLinecap: "round",
@@ -2333,7 +3520,7 @@ function DepositModalInner({
             }
           ) })
         ] }),
-        /* @__PURE__ */ jsx8(
+        /* @__PURE__ */ jsx11(
           DepositFlow,
           {
             dappWalletClient,