@rhinestone/deposit-modal 0.4.0 → 0.4.1

package/dist/{DepositModalReown-PC7EX5VK.mjs → DepositModalReown-EXI7MW65.mjs}

@@ -1,12 +1,12 @@
 import {
   DepositModalInner
-} from "./chunk-3PVDRSJ7.mjs";
+} from "./chunk-RTAIW3WW.mjs";
 import "./chunk-FJWLC4AM.mjs";
 import {
   ReownWalletProvider,
   useReownWallet
-} from "./chunk-UFKFSGT3.mjs";
-import "./chunk-GKC22JC4.mjs";
+} from "./chunk-43RTPRQY.mjs";
+import "./chunk-A33QFRKD.mjs";
 import "./chunk-F7P4MV72.mjs";
 import "./chunk-WJX3TJFK.mjs";
 

package/dist/{DepositModalReown-KFTMS2WX.cjs → DepositModalReown-FMAPWBQM.cjs}

@@ -1,12 +1,12 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }
 
-var _chunk7MP2UWIQcjs = require('./chunk-7MP2UWIQ.cjs');
+var _chunkBTDRUAPJcjs = require('./chunk-BTDRUAPJ.cjs');
 require('./chunk-NRNJAQUA.cjs');
 
 
 
-var _chunk3MXWIYATcjs = require('./chunk-3MXWIYAT.cjs');
-require('./chunk-OQVLEVNR.cjs');
+var _chunkULCCXH2Acjs = require('./chunk-ULCCXH2A.cjs');
+require('./chunk-LJJCPDZO.cjs');
 require('./chunk-UEKPBRBY.cjs');
 require('./chunk-ABVRVW3P.cjs');
 
@@ -16,7 +16,7 @@ var _react3 = require('@reown/appkit/react');
 var _react5 = require('@reown/appkit-adapter-solana/react');
 var _jsxruntime = require('react/jsx-runtime');
 function DepositModalWithReown(props) {
-  const reown = _chunk3MXWIYATcjs.useReownWallet.call(void 0, );
+  const reown = _chunkULCCXH2Acjs.useReownWallet.call(void 0, );
   const enableSolana = _nullishCoalesce(props.enableSolana, () => ( true));
   const { walletProvider: solanaWalletProvider } = _react3.useAppKitProvider.call(void 0, 
     enableSolana ? "solana" : "eip155"
@@ -37,7 +37,7 @@ function DepositModalWithReown(props) {
     reown.disconnect();
   }, [reown.disconnect]);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunk7MP2UWIQcjs.DepositModalInner,
+    _chunkBTDRUAPJcjs.DepositModalInner,
     {
       ...props,
       reownWallet: reownWithSolana,
@@ -48,7 +48,7 @@ function DepositModalWithReown(props) {
 }
 function DepositModalReown(props) {
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunk3MXWIYATcjs.ReownWalletProvider,
+    _chunkULCCXH2Acjs.ReownWalletProvider,
     {
       projectId: props.reownAppId,
       theme: props.theme,

package/dist/{WithdrawModalReown-Z2YF2FSJ.cjs → WithdrawModalReown-CTT3EXMG.cjs}

@@ -1,11 +1,11 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkAE5LHTPMcjs = require('./chunk-AE5LHTPM.cjs');
+var _chunkJHT2MJ42cjs = require('./chunk-JHT2MJ42.cjs');
 
 
 
-var _chunk3MXWIYATcjs = require('./chunk-3MXWIYAT.cjs');
-require('./chunk-OQVLEVNR.cjs');
+var _chunkULCCXH2Acjs = require('./chunk-ULCCXH2A.cjs');
+require('./chunk-LJJCPDZO.cjs');
 require('./chunk-UEKPBRBY.cjs');
 require('./chunk-ABVRVW3P.cjs');
 
@@ -13,7 +13,7 @@ require('./chunk-ABVRVW3P.cjs');
 var _react = require('react');
 var _jsxruntime = require('react/jsx-runtime');
 function WithdrawModalWithReown(props) {
-  const reown = _chunk3MXWIYATcjs.useReownWallet.call(void 0, );
+  const reown = _chunkULCCXH2Acjs.useReownWallet.call(void 0, );
   const handleConnect = _react.useCallback.call(void 0, () => {
     reown.openConnect();
   }, [reown.openConnect]);
@@ -21,7 +21,7 @@ function WithdrawModalWithReown(props) {
     reown.disconnect();
   }, [reown.disconnect]);
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkAE5LHTPMcjs.WithdrawModalInner,
+    _chunkJHT2MJ42cjs.WithdrawModalInner,
     {
       ...props,
       reownWallet: reown,
@@ -31,7 +31,7 @@ function WithdrawModalWithReown(props) {
   );
 }
 function WithdrawModalReown(props) {
-  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunk3MXWIYATcjs.ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawModalWithReown, { ...props }) });
+  return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkULCCXH2Acjs.ReownWalletProvider, { projectId: props.reownAppId, theme: props.theme, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawModalWithReown, { ...props }) });
 }
 
 

package/dist/{WithdrawModalReown-BE23LUMT.mjs → WithdrawModalReown-G7EM6HXO.mjs}

@@ -1,11 +1,11 @@
 import {
   WithdrawModalInner
-} from "./chunk-WCIGOV34.mjs";
+} from "./chunk-3GLQC2KQ.mjs";
 import {
   ReownWalletProvider,
   useReownWallet
-} from "./chunk-UFKFSGT3.mjs";
-import "./chunk-GKC22JC4.mjs";
+} from "./chunk-43RTPRQY.mjs";
+import "./chunk-A33QFRKD.mjs";
 import "./chunk-F7P4MV72.mjs";
 import "./chunk-WJX3TJFK.mjs";
 

package/dist/{chunk-WCIGOV34.mjs → chunk-3GLQC2KQ.mjs}

@@ -30,7 +30,7 @@ import {
   saveSessionOwnerToStorage,
   useLatestRef,
   useTokenPrices
-} from "./chunk-GKC22JC4.mjs";
+} from "./chunk-A33QFRKD.mjs";
 import {
   buildSafeTransaction,
   executeSafeErc20Transfer,
@@ -784,6 +784,7 @@ import { encodeFunctionData, erc20Abi as erc20Abi2, parseUnits as parseUnits2 }
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ADDR_REGEX = /^0x[a-fA-F0-9]{40}$/;
 var REGISTRATION_DEBOUNCE_MS = 600;
+var WITHDRAW_INDEXING_DELAY_MS = 2e3;
 function resolveSessionOwner(eoaAddress) {
   const localOwner = loadSessionOwnerFromStorage(eoaAddress);
   if (localOwner) {
@@ -832,6 +833,14 @@ function WithdrawFlow({
   const onEventRef = useLatestRef(onEvent);
   const onLifecycleRef = useLatestRef(onLifecycle);
   const onErrorRef = useLatestRef(onError);
+  const isFlowActiveRef = useRef2(true);
+  const submitGenerationRef = useRef2(0);
+  useEffect2(() => {
+    isFlowActiveRef.current = true;
+    return () => {
+      isFlowActiveRef.current = false;
+    };
+  }, []);
   const logFlow = useCallback2(
     (message, data) => {
       debugLog(debug, "withdraw-flow", message, data);
@@ -905,6 +914,7 @@ function WithdrawFlow({
   const selectedWalletId = useWithdrawStore((s) => s.selectedWalletId);
   const registration = useWithdrawStore((s) => s.registration);
   const flowStep = useWithdrawStore((s) => s.step);
+  const reviewedRecipient = useWithdrawStore((s) => s.recipient);
   const setSelectedWalletId = useCallback2(
     (walletId) => storeApi.dispatch({ type: "wallet/id-selected", walletId }),
     [storeApi]
@@ -965,7 +975,7 @@ function WithdrawFlow({
     return ADDR_REGEX.test(recipientInput) ? recipientInput : void 0;
   }, [recipientInput]);
   useEffect2(() => {
-    if (!ownerAddress) return;
+    if (!ownerAddress || !recipientForRegistration) return;
     const desiredTarget = {
       chain: targetChain,
       token: targetToken,
@@ -1098,7 +1108,14 @@ function WithdrawFlow({
   }, [sourceChain, sourceToken]);
   const isSourceNative = sourceToken.toLowerCase() === NATIVE_TOKEN_ADDRESS.toLowerCase();
   const isSameRoute = targetChain === sourceChain && targetToken.toLowerCase() === sourceToken.toLowerCase();
+  const reviewedTarget = reviewedRecipient ? {
+    chain: targetChain,
+    token: targetToken,
+    recipient: reviewedRecipient
+  } : null;
+  const isReviewedTargetReady = registration.kind === "ready" && reviewedTarget !== null && targetsEqual(registration.registeredTarget, reviewedTarget);
   const reviewBackHandler = useCallback2(() => {
+    submitGenerationRef.current += 1;
     storeApi.dispatch({ type: "review/back" });
   }, [storeApi]);
   useEffect2(() => {
@@ -1173,19 +1190,38 @@ function WithdrawFlow({
   const handleReviewConfirm = useCallback2(
     async () => {
       const state = storeApi.getState();
-      if (state.registration.kind !== "ready") {
-        throw new Error("Session not ready");
-      }
-      const smartAccount = state.registration.smartAccount;
       const recipient = state.recipient;
       const amountValue = state.amount;
       if (!recipient || !amountValue) {
         throw new Error("Missing recipient or amount");
       }
+      const desiredTarget = {
+        chain: targetChain,
+        token: targetToken,
+        recipient
+      };
+      const getMatchingRegistration = () => {
+        const current = storeApi.getState().registration;
+        return current.kind === "ready" && targetsEqual(current.registeredTarget, desiredTarget) ? current : null;
+      };
+      const matchingRegistration = getMatchingRegistration();
+      if (!matchingRegistration) {
+        throw new Error("Withdrawal target is still being prepared");
+      }
+      const smartAccount = matchingRegistration.smartAccount;
       if (!onSignTransaction && !signerContext?.walletClient) {
         throw new Error("Wallet not connected");
       }
+      const submitGeneration = submitGenerationRef.current += 1;
+      const isSubmissionLive = () => isFlowActiveRef.current && submitGenerationRef.current === submitGeneration;
       try {
+        await new Promise((resolve) => {
+          setTimeout(resolve, WITHDRAW_INDEXING_DELAY_MS);
+        });
+        if (!isSubmissionLive()) return;
+        if (!getMatchingRegistration()) {
+          throw new Error("Withdrawal target changed before submission");
+        }
         logFlow("submit:start", {
           smartAccount,
           recipient,
@@ -1217,7 +1253,12 @@ function WithdrawFlow({
             data: transferData.data,
             chainId: sourceChain
           });
+          if (!isSubmissionLive()) return;
           const { signature } = await onSignTransaction(request);
+          if (!isSubmissionLive()) return;
+          if (!getMatchingRegistration()) {
+            throw new Error("Withdrawal target changed before submission");
+          }
           const relayResult = await service.relayWithdraw({
             smartAccount,
             chainId: toEvmCaip2(sourceChain),
@@ -1230,6 +1271,9 @@ function WithdrawFlow({
           }
           result = { txHash: relayResult.txHash };
         } else if (isSourceNative) {
+          if (!getMatchingRegistration()) {
+            throw new Error("Withdrawal target changed before submission");
+          }
           result = await executeSafeEthTransfer({
             walletClient: signerContext.walletClient,
             publicClient: pc,
@@ -1239,6 +1283,9 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         } else {
+          if (!getMatchingRegistration()) {
+            throw new Error("Withdrawal target changed before submission");
+          }
           result = await executeSafeErc20Transfer({
             walletClient: signerContext.walletClient,
             publicClient: pc,
@@ -1249,6 +1296,7 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
+        if (!isSubmissionLive()) return;
         logFlow("withdraw:submitted", {
           txHash: result.txHash,
           smartAccount,
@@ -1467,7 +1515,7 @@ function WithdrawFlow({
         amount: storeApi.getState().amount ?? "0",
         recipient: storeApi.getState().recipient ?? recipientForRegistration ?? "0x0",
         service,
-        registrationPending: registration.kind === "pending" || registration.kind === "stale",
+        registrationPending: registration.kind === "pending" || registration.kind === "stale" || !isReviewedTargetReady,
         registrationError: registration.kind === "failed" ? registration.error : null,
         onConfirm: handleReviewConfirm,
         onError: handleError
@@ -1516,7 +1564,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-BE23LUMT.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-G7EM6HXO.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );

package/dist/{chunk-UFKFSGT3.mjs → chunk-43RTPRQY.mjs}

@@ -1,6 +1,6 @@
 import {
   isUnsupportedChainSwitchError
-} from "./chunk-GKC22JC4.mjs";
+} from "./chunk-A33QFRKD.mjs";
 import {
   SUPPORTED_CHAINS,
   getChainName