@rhinestone/deposit-modal 0.2.1 → 0.2.3

package/dist/{chunk-HTYUCLJP.mjs → chunk-DGT2DZXN.mjs}

@@ -28,7 +28,7 @@ import {
   tokenFormatter,
   txRefsMatch,
   useLatestRef
-} from "./chunk-3CRG5NPG.mjs";
+} from "./chunk-JRNGXHWQ.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -1451,6 +1451,7 @@ var txLinkIcon = /* @__PURE__ */ jsx7(
 function DepositNotification({
   deposit,
   smartAccount,
+  solanaDepositAddress,
   targetChain,
   targetToken,
   waitForFinalTx,
@@ -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
   ]);
@@ -2377,9 +2381,29 @@ function DepositAddressStep({
       /* @__PURE__ */ jsx8("div", { className: "rs-deposit-address-qr", children: /* @__PURE__ */ jsx8(QRCode, { value: displayAddress, size: 150, iconSrc: qrIconSrc }) }),
       /* @__PURE__ */ jsxs7("div", { className: "rs-deposit-address-info", children: [
         /* @__PURE__ */ jsxs7("div", { className: "rs-deposit-address-label", children: [
-          "Your ",
-          isSolana ? "Solana" : "EVM",
-          " deposit address"
+          /* @__PURE__ */ jsx8("span", { children: "Your deposit address" }),
+          /* @__PURE__ */ jsx8(Tooltip, { content: "Send any accepted token to this address and it will auto swap to your account.", children: /* @__PURE__ */ jsxs7(
+            "svg",
+            {
+              className: "rs-deposit-address-label-icon",
+              viewBox: "0 0 24 24",
+              fill: "none",
+              stroke: "currentColor",
+              strokeWidth: "2",
+              "aria-hidden": "true",
+              children: [
+                /* @__PURE__ */ jsx8("circle", { cx: "12", cy: "12", r: "9" }),
+                /* @__PURE__ */ jsx8(
+                  "path",
+                  {
+                    strokeLinecap: "round",
+                    strokeLinejoin: "round",
+                    d: "M12 8h.01M11 12h1v4h1"
+                  }
+                )
+              ]
+            }
+          ) })
         ] }),
         /* @__PURE__ */ jsx8("div", { className: "rs-deposit-address-value", children: displayAddress }),
         /* @__PURE__ */ jsxs7(
@@ -2544,6 +2568,7 @@ function DepositAddressStep({
       {
         deposit,
         smartAccount,
+        solanaDepositAddress,
         targetChain,
         targetToken,
         waitForFinalTx,
@@ -3755,7 +3780,7 @@ function DepositFlow({
     setStep({ type: "setup" });
   }, []);
   const handleNewDeposit = useCallback5(() => {
-    onSmartAccountChangeRef.current?.(null);
+    onSmartAccountChangeRef.current?.({ 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"
       });
-      onSmartAccountChangeRef.current?.(smartAccount);
+      onSmartAccountChangeRef.current?.({
+        evm: smartAccount,
+        solana: 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,
@@ -4253,6 +4282,7 @@ function DepositFlow({
         ProcessingStep,
         {
           smartAccount: step.smartAccount,
+          solanaDepositAddress: step.solanaDepositAddress,
           txHash: step.txHash,
           sourceChain: step.sourceChain,
           sourceToken: step.sourceToken,
@@ -4377,6 +4407,7 @@ function DepositFlow({
       ProcessingStep,
       {
         smartAccount: step.smartAccount,
+        solanaDepositAddress: step.solanaDepositAddress,
         txHash: step.txHash,
         sourceChain: step.sourceChain,
         sourceToken: step.sourceToken,
@@ -4669,8 +4700,15 @@ DepositHistoryPanel.displayName = "DepositHistoryPanel";
 // src/DepositModal.tsx
 import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-IIEXOTKU.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-SJHEU6RQ.mjs").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(
@@ -4745,13 +4783,18 @@ function DepositModalInner({
   const [totalBalanceUsd, setTotalBalanceUsd] = useState12(null);
   const backHandlerRef = useRef8(void 0);
   const showHistoryButton = uiConfig?.showHistoryButton ?? false;
-  const [activeSmartAccount, setActiveSmartAccount] = useState12(null);
+  const [activeEvmAccount, setActiveEvmAccount] = useState12(null);
+  const [activeSolanaAccount, setActiveSolanaAccount] = useState12(
+    null
+  );
   const [historyOpen, setHistoryOpen] = useState12(false);
   const [historyDeposits, setHistoryDeposits] = useState12([]);
-  const [historyNextCursor, setHistoryNextCursor] = useState12(null);
+  const [hasMoreHistory, setHasMoreHistory] = useState12(false);
   const [historyLoading, setHistoryLoading] = useState12(false);
   const [historyLoadingMore, setHistoryLoadingMore] = useState12(false);
   const [historyError, setHistoryError] = useState12(null);
+  const evmCursorRef = useRef8(null);
+  const solanaCursorRef = useRef8(null);
   const historyStaleRef = useRef8(false);
   const historyLoadedRef = useRef8(false);
   const targetChain = getChainId(targetChainProp);
@@ -4795,18 +4838,19 @@ function DepositModalInner({
     backHandlerRef.current?.();
   }, []);
   const handleSmartAccountChange = useCallback7(
-    (account) => {
-      setActiveSmartAccount(account);
-      if (!account) {
+    ({ evm, solana }) => {
+      setActiveEvmAccount(evm);
+      setActiveSolanaAccount(solana);
+      if (!evm && !solana) {
         historyStaleRef.current = true;
       }
     },
     []
   );
   const fetchHistory = useCallback7(
-    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: evmCursor ?? void 0
+            }).then((r) => ({
+              deposits: r.deposits,
+              nextCursor: r.nextCursor ?? null,
+              source: "evm"
+            }))
+          );
+        }
+        if (activeSolanaAccount && (isInitial || solanaCursor)) {
+          requests.push(
+            service.fetchDepositHistory({
+              account: activeSolanaAccount,
+              limit: 20,
+              cursor: solanaCursor ?? void 0
+            }).then((r) => ({
+              deposits: r.deposits,
+              nextCursor: 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(result.nextCursor ?? null);
+        evmCursorRef.current = nextEvm;
+        solanaCursorRef.current = nextSolana;
+        setHasMoreHistory(Boolean(nextEvm || nextSolana));
         historyStaleRef.current = false;
         historyLoadedRef.current = true;
       } catch (err) {
@@ -4839,26 +4920,24 @@ function DepositModalInner({
         }
       }
     },
-    [activeSmartAccount, service]
+    [activeEvmAccount, activeSolanaAccount, service]
   );
   const handleHistoryOpen = useCallback7(() => {
     setHistoryOpen(true);
     if (!historyLoadedRef.current || historyStaleRef.current) {
-      fetchHistory();
+      fetchHistory("initial");
     }
   }, [fetchHistory]);
   const handleHistoryClose = useCallback7(() => {
     setHistoryOpen(false);
   }, []);
   const handleHistoryLoadMore = useCallback7(() => {
-    if (historyNextCursor) {
-      fetchHistory(historyNextCursor);
-    }
-  }, [fetchHistory, historyNextCursor]);
+    fetchHistory("more");
+  }, [fetchHistory]);
   const markHistoryStale = useCallback7(() => {
     historyStaleRef.current = true;
     if (historyOpen) {
-      fetchHistory();
+      fetchHistory("initial");
     }
   }, [historyOpen, fetchHistory]);
   const onDepositSubmittedRef = useLatestRef(onDepositSubmitted);
@@ -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;
     }
@@ -5008,7 +5090,7 @@ function DepositModalInner({
                 className: "rs-modal-header-history",
                 "aria-label": "Deposit history",
                 onClick: handleHistoryOpen,
-                disabled: !activeSmartAccount,
+                disabled: !activeEvmAccount && !activeSolanaAccount,
                 children: /* @__PURE__ */ jsx14(
                   "svg",
                   {
@@ -5104,7 +5186,7 @@ function DepositModalInner({
             deposits: historyDeposits,
             isLoading: historyLoading,
             error: historyError,
-            hasMore: Boolean(historyNextCursor),
+            hasMore: hasMoreHistory,
             isLoadingMore: historyLoadingMore,
             onLoadMore: handleHistoryLoadMore,
             onClose: handleHistoryClose

package/dist/{chunk-3CRG5NPG.mjs → chunk-JRNGXHWQ.mjs}

@@ -1680,6 +1680,7 @@ function getCurrentPhaseId(state, phaseTimings, isEarlyComplete) {
 }
 function ProcessingStep({
   smartAccount,
+  solanaDepositAddress,
   txHash,
   sourceChain,
   sourceToken,
@@ -1792,12 +1793,13 @@ function ProcessingStep({
     let isMounted = true;
     async function pollStatus() {
       try {
+        const account = sourceChain === "solana" && solanaDepositAddress ? solanaDepositAddress : smartAccount;
         debugLog(debug, "processing", "poll:request", {
-          smartAccount,
+          account,
           txHash,
           intervalMs: pollIntervalRef.current
         });
-        const data = await service.fetchStatus(smartAccount, txHash);
+        const data = await service.fetchStatus(account, txHash);
         const lastEvent2 = data.lastEvent;
         const eventMatchesTx = isEventForTx(lastEvent2, txHash);
         const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;
@@ -1949,6 +1951,8 @@ function ProcessingStep({
     processingContextRef,
     service,
     smartAccount,
+    solanaDepositAddress,
+    sourceChain,
     state.type,
     txHash
   ]);

package/dist/{chunk-TKTOPC2W.mjs → chunk-MKO5TNVQ.mjs}

@@ -21,7 +21,7 @@ import {
   saveSessionOwnerToStorage,
   toEvmCaip2,
   useLatestRef
-} from "./chunk-3CRG5NPG.mjs";
+} from "./chunk-JRNGXHWQ.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -1485,7 +1485,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-URF6AERQ.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-RUJZCQ4C.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );

package/dist/{chunk-XW4M7WDI.cjs → chunk-T2KOQH57.cjs}

@@ -1680,6 +1680,7 @@ function getCurrentPhaseId(state, phaseTimings, isEarlyComplete) {
 }
 function ProcessingStep({
   smartAccount,
+  solanaDepositAddress,
   txHash,
   sourceChain,
   sourceToken,
@@ -1792,12 +1793,13 @@ function ProcessingStep({
     let isMounted = true;
     async function pollStatus() {
       try {
+        const account = sourceChain === "solana" && solanaDepositAddress ? solanaDepositAddress : smartAccount;
         debugLog(debug, "processing", "poll:request", {
-          smartAccount,
+          account,
           txHash,
           intervalMs: pollIntervalRef.current
         });
-        const data = await service.fetchStatus(smartAccount, txHash);
+        const data = await service.fetchStatus(account, txHash);
         const lastEvent2 = data.lastEvent;
         const eventMatchesTx = isEventForTx(lastEvent2, txHash);
         const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;
@@ -1949,6 +1951,8 @@ function ProcessingStep({
     processingContextRef,
     service,
     smartAccount,
+    solanaDepositAddress,
+    sourceChain,
     state.type,
     txHash
   ]);