@rhinestone/deposit-modal 0.4.0 → 0.4.1

package/dist/{chunk-AE5LHTPM.cjs → chunk-JHT2MJ42.cjs}

@@ -30,7 +30,7 @@
 
 
 
-var _chunkOQVLEVNRcjs = require('./chunk-OQVLEVNR.cjs');
+var _chunkLJJCPDZOcjs = require('./chunk-LJJCPDZO.cjs');
 
 
 
@@ -260,7 +260,7 @@ function WithdrawFormStep({
       setIsSwitching(true);
       switchChain(asset.chainId).catch((err) => {
         const raw = err instanceof Error ? err.message : "Failed to switch chain";
-        setError(_chunkOQVLEVNRcjs.formatUserError.call(void 0, raw));
+        setError(_chunkLJJCPDZOcjs.formatUserError.call(void 0, raw));
       }).finally(() => {
         setIsSwitching(false);
       });
@@ -280,7 +280,7 @@ function WithdrawFormStep({
         return;
       }
       try {
-        const bal = _chunkOQVLEVNRcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
+        const bal = _chunkLJJCPDZOcjs.isNativeAsset.call(void 0, asset) ? await publicClient.getBalance({ address: safeAddress }) : await publicClient.readContract({
           address: asset.token,
           abi: _viem.erc20Abi,
           functionName: "balanceOf",
@@ -384,7 +384,7 @@ function WithdrawFormStep({
       await onSubmit(recipient, amount);
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Withdrawal failed";
-      setError(_chunkOQVLEVNRcjs.formatUserError.call(void 0, raw));
+      setError(_chunkLJJCPDZOcjs.formatUserError.call(void 0, raw));
     } finally {
       setIsSubmitting(false);
     }
@@ -392,16 +392,16 @@ function WithdrawFormStep({
   if (isBalanceLoading) {
     return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-withdraw-loading", children: [
-        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.Spinner, { className: "rs-spinner--lg" }),
+        /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.Spinner, { className: "rs-spinner--lg" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-withdraw-loading-title", children: "Loading on-chain balance" }),
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-withdraw-loading-subtitle", children: chainMismatch ? `Switch to ${_chunkABVRVW3Pcjs.getChainName.call(void 0, asset.chainId)} to continue.` : "Please wait before withdrawing." })
       ] }),
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.PoweredBy, {})
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.PoweredBy, {})
     ] });
   }
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body", children: [
-      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.CircleArrowOutUpLeftIcon, {}), title: "Withdraw" }),
+      /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.BodyHeader, { icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.CircleArrowOutUpLeftIcon, {}), title: "Withdraw" }),
       /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-section", children: [
         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
           "label",
@@ -447,7 +447,7 @@ function WithdrawFormStep({
                 ),
                 isRecipientConnected ? null : "Use connected"
               ] }) : /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, _jsxruntime.Fragment, { children: [
-                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.WalletIcon, { className: "rs-withdraw-use-connected-icon" }),
+                /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.WalletIcon, { className: "rs-withdraw-use-connected-icon" }),
                 isRecipientConnected ? null : "Use connected"
               ] })
             }
@@ -487,7 +487,7 @@ function WithdrawFormStep({
           ) })
         ] }),
         /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-withdraw-amount-info", children: [
-          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-withdraw-usd", children: amountUsd !== null ? _chunkOQVLEVNRcjs.currencyFormatter.format(amountUsd) : "$0.00" }),
+          /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-withdraw-usd", children: amountUsd !== null ? _chunkLJJCPDZOcjs.currencyFormatter.format(amountUsd) : "$0.00" }),
           /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "span", { className: "rs-withdraw-balance", children: [
             "Balance: ",
             formattedBalance,
@@ -528,7 +528,7 @@ function WithdrawFormStep({
                         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: targetChainName })
                       ] }),
                       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                        _chunkOQVLEVNRcjs.ChevronDownIcon,
+                        _chunkLJJCPDZOcjs.ChevronDownIcon,
                         {
                           className: "rs-withdraw-dropdown-arrow",
                           style: {
@@ -597,7 +597,7 @@ function WithdrawFormStep({
                         /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { children: targetSymbol })
                       ] }),
                       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-                        _chunkOQVLEVNRcjs.ChevronDownIcon,
+                        _chunkLJJCPDZOcjs.ChevronDownIcon,
                         {
                           className: "rs-withdraw-dropdown-arrow",
                           style: {
@@ -637,10 +637,10 @@ function WithdrawFormStep({
         ] })
       ] }),
       chainMismatch && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-chain-switch", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-chain-switch-text", children: isSwitching ? `Switching to ${_chunkABVRVW3Pcjs.getChainName.call(void 0, asset.chainId)}...` : `Switch to ${_chunkABVRVW3Pcjs.getChainName.call(void 0, asset.chainId)} to continue.` }) }),
-      error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.Callout, { variant: "error", children: error }),
-      !error && registrationError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.Callout, { variant: "error", children: registrationError }),
+      error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.Callout, { variant: "error", children: error }),
+      !error && registrationError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.Callout, { variant: "error", children: registrationError }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkOQVLEVNRcjs.Button,
+        _chunkLJJCPDZOcjs.Button,
         {
           onClick: handleWithdraw,
           fullWidth: true,
@@ -650,7 +650,7 @@ function WithdrawFormStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.PoweredBy, {})
   ] });
 }
 WithdrawFormStep.displayName = "WithdrawFormStep";
@@ -685,9 +685,9 @@ function WithdrawReviewStep({
   const sourceTokenIcon = _chunkABVRVW3Pcjs.getTokenIcon.call(void 0, sourceSymbol);
   const targetTokenIcon = _chunkABVRVW3Pcjs.getTokenIcon.call(void 0, targetSymbol);
   const amountNumber = Number(amount);
-  const formattedSendAmount = _nullishCoalesce(_chunkOQVLEVNRcjs.formatTokenAmount.call(void 0, amountNumber, sourceSymbol), () => ( amount));
-  const prices = _chunkOQVLEVNRcjs.useTokenPrices.call(void 0, service, [sourceSymbol, targetSymbol]);
-  const receiveDisplay = _nullishCoalesce(_chunkOQVLEVNRcjs.formatReceiveEstimate.call(void 0, {
+  const formattedSendAmount = _nullishCoalesce(_chunkLJJCPDZOcjs.formatTokenAmount.call(void 0, amountNumber, sourceSymbol), () => ( amount));
+  const prices = _chunkLJJCPDZOcjs.useTokenPrices.call(void 0, service, [sourceSymbol, targetSymbol]);
+  const receiveDisplay = _nullishCoalesce(_chunkLJJCPDZOcjs.formatReceiveEstimate.call(void 0, {
     sourceAmount: Number.isFinite(amountNumber) ? amountNumber : void 0,
     sourceSymbol,
     targetSymbol,
@@ -701,7 +701,7 @@ function WithdrawReviewStep({
       await onConfirm();
     } catch (err) {
       const raw = err instanceof Error ? err.message : "Withdraw failed";
-      const message = _chunkOQVLEVNRcjs.formatUserError.call(void 0, raw);
+      const message = _chunkLJJCPDZOcjs.formatUserError.call(void 0, raw);
       setError(message);
       _optionalChain([onError, 'optionalCall', _8 => _8(message, "WITHDRAW_REVIEW_ERROR")]);
     } finally {
@@ -712,9 +712,9 @@ function WithdrawReviewStep({
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen", children: [
     /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-screen-body rs-screen-body--gap-32", children: [
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkOQVLEVNRcjs.BodyHeader,
+        _chunkLJJCPDZOcjs.BodyHeader,
         {
-          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.CircleArrowOutUpLeftIcon, {}),
+          icon: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.CircleArrowOutUpLeftIcon, {}),
           title: "Review withdrawal"
         }
       ),
@@ -760,10 +760,10 @@ function WithdrawReviewStep({
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "span", { className: "rs-review-detail-value", children: estimatedTime })
         ] })
       ] }),
-      error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.Callout, { variant: "error", children: error }),
-      !error && registrationError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.Callout, { variant: "error", children: registrationError }),
+      error && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.Callout, { variant: "error", children: error }),
+      !error && registrationError && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.Callout, { variant: "error", children: registrationError }),
       /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-        _chunkOQVLEVNRcjs.Button,
+        _chunkLJJCPDZOcjs.Button,
         {
           onClick: handleConfirm,
           loading: isSubmitting,
@@ -774,7 +774,7 @@ function WithdrawReviewStep({
         }
       )
     ] }),
-    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.PoweredBy, {})
+    /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.PoweredBy, {})
   ] });
 }
 WithdrawReviewStep.displayName = "WithdrawReviewStep";
@@ -784,16 +784,17 @@ WithdrawReviewStep.displayName = "WithdrawReviewStep";
 
 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 = _chunkOQVLEVNRcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
+  const localOwner = _chunkLJJCPDZOcjs.loadSessionOwnerFromStorage.call(void 0, eoaAddress);
   if (localOwner) {
     return {
-      account: _chunkOQVLEVNRcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
+      account: _chunkLJJCPDZOcjs.accountFromPrivateKey.call(void 0, localOwner.privateKey),
       address: localOwner.address
     };
   }
-  const created = _chunkOQVLEVNRcjs.createSessionOwnerKey.call(void 0, );
-  _chunkOQVLEVNRcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
+  const created = _chunkLJJCPDZOcjs.createSessionOwnerKey.call(void 0, );
+  _chunkLJJCPDZOcjs.saveSessionOwnerToStorage.call(void 0, eoaAddress, created.privateKey, created.address);
   return { account: created.account, address: created.address };
 }
 function targetsEqual(a, b) {
@@ -828,19 +829,27 @@ function WithdrawFlow({
   onError,
   debug
 }) {
-  const onStepChangeRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onStepChange);
-  const onEventRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onEvent);
-  const onLifecycleRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onLifecycle);
-  const onErrorRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onError);
+  const onStepChangeRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onStepChange);
+  const onEventRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onEvent);
+  const onLifecycleRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onLifecycle);
+  const onErrorRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onError);
+  const isFlowActiveRef = _react.useRef.call(void 0, true);
+  const submitGenerationRef = _react.useRef.call(void 0, 0);
+  _react.useEffect.call(void 0, () => {
+    isFlowActiveRef.current = true;
+    return () => {
+      isFlowActiveRef.current = false;
+    };
+  }, []);
   const logFlow = _react.useCallback.call(void 0, 
     (message, data) => {
-      _chunkOQVLEVNRcjs.debugLog.call(void 0, debug, "withdraw-flow", message, data);
+      _chunkLJJCPDZOcjs.debugLog.call(void 0, debug, "withdraw-flow", message, data);
     },
     [debug]
   );
   const logFlowError = _react.useCallback.call(void 0, 
     (message, error, data) => {
-      _chunkOQVLEVNRcjs.debugError.call(void 0, debug, "withdraw-flow", message, error, data);
+      _chunkLJJCPDZOcjs.debugError.call(void 0, debug, "withdraw-flow", message, error, data);
     },
     [debug]
   );
@@ -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 = _react.useCallback.call(void 0, 
     (walletId) => storeApi.dispatch({ type: "wallet/id-selected", walletId }),
     [storeApi]
@@ -915,14 +925,14 @@ function WithdrawFlow({
         return {
           ownerAddress: dappAddress,
           walletClient: _nullishCoalesce(dappWalletClient, () => ( void 0)),
-          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkOQVLEVNRcjs.getPublicClient.call(void 0, sourceChain))),
+          publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLJJCPDZOcjs.getPublicClient.call(void 0, sourceChain))),
           switchChain: dappSwitchChain
         };
       }
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkOQVLEVNRcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLJJCPDZOcjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
@@ -933,7 +943,7 @@ function WithdrawFlow({
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
-        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkOQVLEVNRcjs.getPublicClient.call(void 0, sourceChain))),
+        publicClient: _nullishCoalesce(dappPublicClient, () => ( _chunkLJJCPDZOcjs.getPublicClient.call(void 0, sourceChain))),
         switchChain: dappSwitchChain
       };
     }
@@ -965,7 +975,7 @@ function WithdrawFlow({
     return ADDR_REGEX.test(recipientInput) ? recipientInput : void 0;
   }, [recipientInput]);
   _react.useEffect.call(void 0, () => {
-    if (!ownerAddress) return;
+    if (!ownerAddress || !recipientForRegistration) return;
     const desiredTarget = {
       chain: targetChain,
       token: targetToken,
@@ -1015,7 +1025,7 @@ function WithdrawFlow({
             message: typedData.message
           });
           if (cancelled) return;
-          const sessionDetails = _chunkOQVLEVNRcjs.buildSessionDetails.call(void 0, 
+          const sessionDetails = _chunkLJJCPDZOcjs.buildSessionDetails.call(void 0, 
             setup.sessionDetailsUnsigned,
             signature
           );
@@ -1052,7 +1062,7 @@ function WithdrawFlow({
       } catch (err) {
         if (cancelled) return;
         const raw = err instanceof Error ? err.message : "Registration failed";
-        const message = _chunkOQVLEVNRcjs.formatUserError.call(void 0, raw);
+        const message = _chunkLJJCPDZOcjs.formatUserError.call(void 0, raw);
         logFlowError("auto-register:failed", err, {
           ownerAddress,
           targetChain,
@@ -1088,7 +1098,7 @@ function WithdrawFlow({
     const symbol = _chunkABVRVW3Pcjs.getTokenSymbol.call(void 0, sourceToken, sourceChain);
     const decimals = _chunkABVRVW3Pcjs.getTokenDecimalsByAddress.call(void 0, sourceToken, sourceChain);
     return {
-      id: _chunkOQVLEVNRcjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
+      id: _chunkLJJCPDZOcjs.getAssetId.call(void 0, { chainId: sourceChain, token: sourceToken }),
       chainId: sourceChain,
       token: sourceToken,
       symbol,
@@ -1098,7 +1108,14 @@ function WithdrawFlow({
   }, [sourceChain, sourceToken]);
   const isSourceNative = sourceToken.toLowerCase() === _chunkABVRVW3Pcjs.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 = _react.useCallback.call(void 0, () => {
+    submitGenerationRef.current += 1;
     storeApi.dispatch({ type: "review/back" });
   }, [storeApi]);
   _react.useEffect.call(void 0, () => {
@@ -1173,19 +1190,38 @@ function WithdrawFlow({
   const handleReviewConfirm = _react.useCallback.call(void 0, 
     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 && !_optionalChain([signerContext, 'optionalAccess', _43 => _43.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,
@@ -1196,7 +1232,7 @@ function WithdrawFlow({
           targetToken
         });
         const amountUnits = _viem.parseUnits.call(void 0, amountValue, asset.decimals);
-        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _44 => _44.publicClient]), () => ( _chunkOQVLEVNRcjs.getPublicClient.call(void 0, sourceChain)));
+        const pc = _nullishCoalesce(_optionalChain([signerContext, 'optionalAccess', _44 => _44.publicClient]), () => ( _chunkLJJCPDZOcjs.getPublicClient.call(void 0, sourceChain)));
         let result;
         if (onSignTransaction) {
           const transferTarget = isSameRoute ? recipient : smartAccount;
@@ -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: _chunkABVRVW3Pcjs.toEvmCaip2.call(void 0, 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 _chunkUEKPBRBYcjs.executeSafeEthTransfer.call(void 0, {
             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 _chunkUEKPBRBYcjs.executeSafeErc20Transfer.call(void 0, {
             walletClient: signerContext.walletClient,
             publicClient: pc,
@@ -1249,6 +1296,7 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
+        if (!isSubmissionLive()) return;
         logFlow("withdraw:submitted", {
           txHash: result.txHash,
           smartAccount,
@@ -1272,7 +1320,7 @@ function WithdrawFlow({
           targetChain,
           targetToken
         });
-        handleError(_chunkOQVLEVNRcjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
+        handleError(_chunkLJJCPDZOcjs.formatUserError.call(void 0, raw), "WITHDRAW_FLOW_ERROR");
         throw err;
       }
     },
@@ -1411,7 +1459,7 @@ function WithdrawFlow({
       state: "ready"
     }));
     return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-body", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkOQVLEVNRcjs.ConnectStep,
+      _chunkLJJCPDZOcjs.ConnectStep,
       {
         walletRows: withdrawRows,
         onConfirmWallet: (walletId) => {
@@ -1429,7 +1477,7 @@ function WithdrawFlow({
   if (!signerContext) return null;
   if (!onSignTransaction && !signerContext.walletClient) return null;
   const resolvedConnectedRecipient = _optionalChain([selectedWalletOption, 'optionalAccess', _61 => _61.kind]) === "external" ? selectedWalletOption.address : void 0;
-  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkOQVLEVNRcjs.getPublicClient.call(void 0, sourceChain)));
+  const formPublicClient = _nullishCoalesce(signerContext.publicClient, () => ( _chunkLJJCPDZOcjs.getPublicClient.call(void 0, sourceChain)));
   const stepView = deriveStepView(flowStep, registration);
   return /* @__PURE__ */ _jsxruntime.jsxs.call(void 0, "div", { className: "rs-modal-body", children: [
     stepView === "form" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -1467,14 +1515,14 @@ function WithdrawFlow({
         amount: _nullishCoalesce(storeApi.getState().amount, () => ( "0")),
         recipient: _nullishCoalesce(_nullishCoalesce(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
       }
     ),
     stepView === "processing" && registration.kind !== "idle" && /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-      _chunkOQVLEVNRcjs.ProcessingStep,
+      _chunkLJJCPDZOcjs.ProcessingStep,
       {
         smartAccount: registration.kind === "ready" || registration.kind === "stale" ? registration.smartAccount : "0x0",
         txHash: _nullishCoalesce(storeApi.getState().txHash, () => ( "0x0")),
@@ -1516,7 +1564,7 @@ function deriveStepView(step, _registration) {
 // src/WithdrawModal.tsx
 
 var ReownWithdrawInner = _react.lazy.call(void 0, 
-  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-Z2YF2FSJ.cjs"))).then((m) => ({
+  () => Promise.resolve().then(() => _interopRequireWildcard(require("./WithdrawModalReown-CTT3EXMG.cjs"))).then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1563,18 +1611,18 @@ function WithdrawModalInner({
   debug
 }) {
   const modalRef = _react.useRef.call(void 0, null);
-  const onReadyRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onReady);
+  const onReadyRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onReady);
   const [backHandler, setBackHandler] = _react.useState.call(void 0, 
     void 0
   );
   const targetChain = _chunkABVRVW3Pcjs.getChainId.call(void 0, targetChainProp);
   const sourceChain = _chunkABVRVW3Pcjs.getChainId.call(void 0, sourceChainProp);
   const service = _react.useMemo.call(void 0, 
-    () => _chunkOQVLEVNRcjs.createDepositService.call(void 0, backendUrl, { debug, debugScope: "service:withdraw" }),
+    () => _chunkLJJCPDZOcjs.createDepositService.call(void 0, backendUrl, { debug, debugScope: "service:withdraw" }),
     [backendUrl, debug]
   );
   const store = _react.useMemo.call(void 0, () => createWithdrawStore(), []);
-  const onErrorRef = _chunkOQVLEVNRcjs.useLatestRef.call(void 0, onError);
+  const onErrorRef = _chunkLJJCPDZOcjs.useLatestRef.call(void 0, onError);
   _react.useEffect.call(void 0, () => {
     if (isOpen && onSignTransaction && !dappAddress) {
       _optionalChain([onErrorRef, 'access', _62 => _62.current, 'optionalCall', _63 => _63({
@@ -1585,7 +1633,7 @@ function WithdrawModalInner({
   }, [isOpen, onSignTransaction, dappAddress, onErrorRef]);
   _react.useEffect.call(void 0, () => {
     if (isOpen && modalRef.current) {
-      _chunkOQVLEVNRcjs.applyTheme.call(void 0, modalRef.current, theme);
+      _chunkLJJCPDZOcjs.applyTheme.call(void 0, modalRef.current, theme);
     }
   }, [isOpen, theme]);
   _react.useEffect.call(void 0, () => {
@@ -1604,7 +1652,7 @@ function WithdrawModalInner({
   const showBackButton = _nullishCoalesce(_optionalChain([uiConfig, 'optionalAccess', _66 => _66.showBackButton]), () => ( true));
   const canGoBack = backHandler !== void 0;
   return /* @__PURE__ */ _jsxruntime.jsx.call(void 0, WithdrawStoreProvider, { store, children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
-    _chunkOQVLEVNRcjs.Modal,
+    _chunkLJJCPDZOcjs.Modal,
     {
       isOpen,
       onClose,
@@ -1620,7 +1668,7 @@ function WithdrawModalInner({
               className: "rs-modal-header-back",
               "aria-label": "Go back",
               onClick: backHandler,
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.ChevronLeftIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.ChevronLeftIcon, {})
             }
           ) }),
           /* @__PURE__ */ _jsxruntime.jsx.call(void 0, "div", { className: "rs-modal-header-nav-right", children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, 
@@ -1630,7 +1678,7 @@ function WithdrawModalInner({
               onClick: onClose,
               className: "rs-modal-close",
               "aria-label": "Close",
-              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkOQVLEVNRcjs.CloseIcon, {})
+              children: /* @__PURE__ */ _jsxruntime.jsx.call(void 0, _chunkLJJCPDZOcjs.CloseIcon, {})
             }
           ) })
         ] }),