@rhinestone/deposit-modal 0.1.38 → 0.1.39

package/dist/{chunk-7HJ7TUHX.mjs → chunk-TK7BVWX6.mjs}

@@ -13,6 +13,7 @@ import {
   currencyFormatter,
   formatUserError,
   getAssetId,
+  getEventSourceDetails,
   getEventTxHash,
   getPublicClient,
   isDepositEvent,
@@ -21,7 +22,7 @@ import {
   portfolioToAssets,
   saveSessionOwnerToStorage,
   tokenFormatter
-} from "./chunk-UBPIPY3L.mjs";
+} from "./chunk-IC2M2DZ7.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -37,7 +38,7 @@ import {
   getTokenIcon,
   getTokenSymbol,
   isStablecoinSymbol
-} from "./chunk-ZL4KPLWE.mjs";
+} from "./chunk-I7RYTI4G.mjs";
 
 // src/DepositModal.tsx
 import {
@@ -1236,46 +1237,6 @@ QRCode.displayName = "QRCode";
 // 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 asAmount(value) {
-  if (typeof value === "string") return value;
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return value.toString();
-  }
-  return void 0;
-}
-function asAddress(value) {
-  if (typeof value !== "string") return void 0;
-  return /^0x[a-fA-F0-9]{40}$/.test(value) ? value : void 0;
-}
-function getDepositEventDetails(event) {
-  if (!event?.type || !isRecord(event.data)) return {};
-  if (event.type === "deposit-received") {
-    return {
-      chainId: asNumber(event.data.chain),
-      amount: asAmount(event.data.amount),
-      token: asAddress(event.data.token)
-    };
-  }
-  if (event.type === "bridge-started") {
-    const source = isRecord(event.data.source) ? event.data.source : void 0;
-    return {
-      chainId: asNumber(source?.chain),
-      token: asAddress(source?.asset)
-    };
-  }
-  return {};
-}
 function DepositAddressStep({
   smartAccount,
   service,
@@ -1366,7 +1327,7 @@ function DepositAddressStep({
         if (baselineTxHash === void 0) {
           baselineTxHash = eventTxHash;
         } else if (eventTxHash && eventTxHash !== baselineTxHash) {
-          const details = getDepositEventDetails(event);
+          const details = getEventSourceDetails(event);
           const fallback = sourceSelectionRef.current;
           const chainId = details.chainId ?? fallback.chainId;
           const amount = details.amount ?? "0";
@@ -1585,6 +1546,9 @@ 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,
@@ -1622,6 +1586,8 @@ function DepositFlow({
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState7(false);
   const [selectedConnectAddress, setSelectedConnectAddress] = useState7(null);
   const portfolioAssetsRef = useRef5([]);
+  const stableWalletSignerRef = useRef5(null);
+  const stableWalletSelectionKeyRef = useRef5(null);
   const handleAssetsLoaded = useCallback3((assets) => {
     portfolioAssetsRef.current = assets;
   }, []);
@@ -1644,16 +1610,17 @@ function DepositFlow({
       await dappWalletClient.switchChain?.({ id: chainId });
     };
   }, [dappWalletClient]);
+  const connectedWalletAddress = dappWalletClient?.account?.address ?? null;
   const walletOptions = useMemo5(() => {
     const options = [];
     const seen = /* @__PURE__ */ new Set();
-    if (dappWalletClient?.account && dappAddress) {
+    if (connectedWalletAddress && dappAddress) {
       options.push({
-        address: dappWalletClient.account.address,
+        address: connectedWalletAddress,
         label: "Connected Wallet",
         kind: "connected"
       });
-      seen.add(dappWalletClient.account.address.toLowerCase());
+      seen.add(connectedWalletAddress.toLowerCase());
     }
     if (reownWallet?.address && reownWallet.isConnected && reownWallet.walletClient && reownWallet.publicClient && !seen.has(reownWallet.address.toLowerCase())) {
       options.push({
@@ -1665,7 +1632,7 @@ function DepositFlow({
     }
     return options;
   }, [
-    dappWalletClient,
+    connectedWalletAddress,
     dappAddress,
     reownWallet?.address,
     reownWallet?.isConnected,
@@ -1675,17 +1642,27 @@ function DepositFlow({
   ]);
   const canAutoLock = dappWalletClient?.account && dappAddress && !reownWallet;
   const hasWalletOptions = walletOptions.length > 0;
-  const hasReownSession = Boolean(reownWallet?.isConnected || reownWallet?.address);
-  const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
-  const signerContext = useMemo5(() => {
+  const hasReownSession = Boolean(
+    reownWallet?.isConnected || reownWallet?.address
+  );
+  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") {
-      if (!dappAddress) return null;
-      return {
-        ownerAddress: dappAddress,
-        walletClient: void 0,
-        publicClient: dappPublicClient ?? getPublicClient(targetChain),
-        switchChain: void 0
-      };
+      return null;
     }
     if (canAutoLock) {
       const fallbackChainId = dappWalletClient?.chain?.id ?? targetChain;
@@ -1716,7 +1693,6 @@ function DepositFlow({
     }
     return null;
   }, [
-    flowMode,
     canAutoLock,
     isConnectSelectionConfirmed,
     selectedConnectAddress,
@@ -1727,6 +1703,49 @@ function DepositFlow({
     reownWallet,
     targetChain
   ]);
+  useEffect7(() => {
+    if (flowMode !== "wallet") {
+      stableWalletSelectionKeyRef.current = null;
+      stableWalletSignerRef.current = null;
+      return;
+    }
+    if (walletSelectionKey !== stableWalletSelectionKeyRef.current) {
+      stableWalletSelectionKeyRef.current = walletSelectionKey;
+      stableWalletSignerRef.current = null;
+    }
+    if (walletSignerContext && walletSelectionKey) {
+      stableWalletSelectionKeyRef.current = walletSelectionKey;
+      stableWalletSignerRef.current = walletSignerContext;
+    }
+  }, [flowMode, walletSelectionKey, walletSignerContext]);
+  const signerContext = useMemo5(() => {
+    if (flowMode === "deposit-address") {
+      if (!dappAddress) return null;
+      return {
+        ownerAddress: dappAddress,
+        walletClient: void 0,
+        publicClient: dappPublicClient ?? getPublicClient(targetChain),
+        switchChain: void 0
+      };
+    }
+    if (flowMode !== "wallet") {
+      return null;
+    }
+    if (walletSignerContext) {
+      return walletSignerContext;
+    }
+    if (walletSelectionKey && stableWalletSelectionKeyRef.current === walletSelectionKey) {
+      return stableWalletSignerRef.current;
+    }
+    return null;
+  }, [
+    flowMode,
+    dappAddress,
+    dappPublicClient,
+    targetChain,
+    walletSignerContext,
+    walletSelectionKey
+  ]);
   const sessionKeyAddress = dappAddress ?? signerContext?.ownerAddress ?? null;
   const lastTargetRef = useRef5(null);
   useEffect7(() => {
@@ -1747,6 +1766,7 @@ function DepositFlow({
   const handleBackFromSelectAsset = useCallback3(() => {
     if (hasWalletOptions || reownWallet) {
       hasNavigatedBackRef.current = true;
+      setFlowMode(null);
       setIsConnectSelectionConfirmed(false);
     }
   }, [hasWalletOptions, reownWallet]);
@@ -2119,7 +2139,7 @@ function DepositFlow({
 // src/DepositModal.tsx
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var ReownDepositInner = lazy(
-  () => import("./DepositModalReown-BJWM3JMC.mjs").then((m) => ({ default: m.DepositModalReown }))
+  () => import("./DepositModalReown-YTUE3XAB.mjs").then((m) => ({ default: m.DepositModalReown }))
 );
 function DepositModal(props) {
   const needsReown = !!props.reownAppId;