@rhinestone/deposit-modal 0.1.40 → 0.1.41

package/dist/{chunk-CFLZYWX7.mjs → chunk-KWAFKVV6.mjs}

@@ -11,13 +11,16 @@ import {
   createDepositService,
   createSessionOwnerKey,
   currencyFormatter,
+  debugError,
+  debugLog,
   formatUserError,
   getAssetId,
   getPublicClient,
   isNativeAsset,
   loadSessionOwnerFromStorage,
-  saveSessionOwnerToStorage
-} from "./chunk-IC2M2DZ7.mjs";
+  saveSessionOwnerToStorage,
+  toEvmCaip2
+} from "./chunk-QIK6ONMQ.mjs";
 import {
   DEFAULT_BACKEND_URL,
   DEFAULT_SIGNER_ADDRESS,
@@ -30,7 +33,7 @@ import {
   getTokenDecimalsByAddress,
   getTokenIcon,
   getTokenSymbol
-} from "./chunk-I7RYTI4G.mjs";
+} from "./chunk-ZJQZEIHA.mjs";
 
 // src/WithdrawModal.tsx
 import {
@@ -900,6 +903,18 @@ function WithdrawFlow({
   const [isSubmitting, setIsSubmitting] = useState2(false);
   const [totalBalanceUsd, setTotalBalanceUsd] = useState2(0);
   const [isConnectSelectionConfirmed, setIsConnectSelectionConfirmed] = useState2(false);
+  const logFlow = useCallback2(
+    (message, data) => {
+      debugLog(debug, "withdraw-flow", message, data);
+    },
+    [debug]
+  );
+  const logFlowError = useCallback2(
+    (message, error, data) => {
+      debugError(debug, "withdraw-flow", message, error, data);
+    },
+    [debug]
+  );
   const [targetChain, setTargetChain] = useState2(targetChainProp);
   const [targetToken, setTargetToken] = useState2(targetTokenProp);
   useEffect2(() => {
@@ -917,20 +932,26 @@ function WithdrawFlow({
     const options = [];
     const seen = /* @__PURE__ */ new Set();
     if (dappWalletClient?.account && dappAddress) {
+      const id = `evm:${dappWalletClient.account.address.toLowerCase()}`;
       options.push({
+        id,
         address: dappWalletClient.account.address,
         label: "Connected Wallet",
         kind: "connected"
       });
-      seen.add(dappWalletClient.account.address.toLowerCase());
+      seen.add(id);
     }
     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
-      });
+      const id = `evm:${reownWallet.address.toLowerCase()}`;
+      if (!seen.has(id)) {
+        options.push({
+          id,
+          address: reownWallet.address,
+          label: "External Wallet",
+          kind: "external",
+          icon: reownWallet.icon
+        });
+      }
     }
     return options;
   }, [
@@ -942,7 +963,7 @@ function WithdrawFlow({
     reownWallet?.publicClient
   ]);
   const canAutoLock = hasCustomSigner || Boolean(dappWalletClient?.account && dappAddress) && !reownWallet;
-  const [selectedConnectAddress, setSelectedConnectAddress] = useState2(null);
+  const [selectedWalletId, setSelectedWalletId] = useState2(null);
   const signerContext = useMemo2(() => {
     if (canAutoLock) {
       if (hasCustomSigner) {
@@ -960,8 +981,10 @@ function WithdrawFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (!isConnectSelectionConfirmed || !selectedConnectAddress) return null;
-    if (dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedConnectAddress.toLowerCase()) {
+    if (!isConnectSelectionConfirmed || !selectedWalletId) return null;
+    const selectedOption = walletOptions.find((option) => option.id === selectedWalletId);
+    if (!selectedOption || !selectedOption.address) return null;
+    if (selectedOption.kind === "connected" && dappWalletClient?.account && dappWalletClient.account.address.toLowerCase() === selectedOption.address.toLowerCase()) {
       return {
         ownerAddress: dappWalletClient.account.address,
         walletClient: dappWalletClient,
@@ -969,7 +992,7 @@ function WithdrawFlow({
         switchChain: dappSwitchChain
       };
     }
-    if (reownWallet?.address?.toLowerCase() === selectedConnectAddress.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
+    if (selectedOption.kind === "external" && reownWallet?.address?.toLowerCase() === selectedOption.address.toLowerCase() && reownWallet.walletClient && reownWallet.publicClient) {
       return {
         ownerAddress: reownWallet.address,
         walletClient: reownWallet.walletClient,
@@ -982,7 +1005,8 @@ function WithdrawFlow({
     canAutoLock,
     hasCustomSigner,
     isConnectSelectionConfirmed,
-    selectedConnectAddress,
+    selectedWalletId,
+    walletOptions,
     dappWalletClient,
     dappPublicClient,
     dappSwitchChain,
@@ -1008,20 +1032,40 @@ function WithdrawFlow({
   useEffect2(() => {
     onStepChange?.(stepIndex, currentBackHandler);
   }, [stepIndex, currentBackHandler, onStepChange]);
+  useEffect2(() => {
+    logFlow("state:changed", {
+      step: step.type,
+      sourceChain,
+      sourceToken,
+      targetChain,
+      targetToken,
+      selectedWalletId
+    });
+  }, [
+    logFlow,
+    selectedWalletId,
+    sourceChain,
+    sourceToken,
+    step.type,
+    targetChain,
+    targetToken
+  ]);
   useEffect2(() => {
     onTotalBalanceChange?.(totalBalanceUsd);
   }, [totalBalanceUsd, onTotalBalanceChange]);
   const handleConnected = useCallback2(
     (addr, smartAccount) => {
+      logFlow("setup:connected", { address: addr, smartAccount });
       onConnected?.({ address: addr, smartAccount });
     },
-    [onConnected]
+    [logFlow, onConnected]
   );
   const handleError = useCallback2(
     (message, code) => {
+      logFlowError("flow:error", message, { code });
       onError?.({ message, code });
     },
-    [onError]
+    [logFlowError, onError]
   );
   const resolveSessionOwner = useCallback2(async (eoaAddress) => {
     const localOwner = loadSessionOwnerFromStorage(eoaAddress);
@@ -1049,17 +1093,30 @@ function WithdrawFlow({
       }
       setIsSubmitting(true);
       try {
+        logFlow("submit:start", {
+          ownerAddress: ownerAddress2,
+          recipient,
+          amount: amountValue,
+          sourceChain,
+          sourceToken,
+          targetChain,
+          targetToken
+        });
         const sessionOwner = await resolveSessionOwner(ownerAddress2);
         const setup = await service.setupAccount({
           ownerAddress: ownerAddress2,
           sessionOwnerAddress: sessionOwner.address,
-          targetChain,
+          targetChain: toEvmCaip2(targetChain),
           targetToken,
           signerAddress,
           sessionChainIds,
           forceRegister
         });
         const smartAccount = setup.smartAccount;
+        logFlow("setup:resolved", {
+          smartAccount,
+          needsRegistration: setup.needsRegistration
+        });
         if (setup.needsRegistration) {
           if (!setup.accountParams || !setup.sessionDetailsUnsigned) {
             throw new Error("Missing registration payload from setup-account");
@@ -1090,11 +1147,12 @@ function WithdrawFlow({
             eoaAddress: ownerAddress2,
             sessionOwner: sessionOwner.address,
             target: {
-              chain: targetChain,
+              chain: toEvmCaip2(targetChain),
               token: targetToken,
               recipient
             }
           });
+          logFlow("register:success", { smartAccount });
         }
         handleConnected(ownerAddress2, smartAccount);
         const amountUnits = parseUnits2(amountValue, asset.decimals);
@@ -1121,7 +1179,7 @@ function WithdrawFlow({
           const { signature } = await onSignTransaction(request);
           const relayResult = await service.relayWithdraw({
             smartAccount,
-            chainId: sourceChain,
+            chainId: toEvmCaip2(sourceChain),
             safeAddress,
             safeTransaction: request.typedData.message,
             signature
@@ -1150,6 +1208,13 @@ function WithdrawFlow({
             chainId: sourceChain
           });
         }
+        logFlow("withdraw:submitted", {
+          txHash: result.txHash,
+          smartAccount,
+          amount: amountUnits.toString(),
+          sourceChain,
+          sourceToken
+        });
         onWithdrawSubmitted?.({
           txHash: result.txHash,
           sourceChain,
@@ -1166,6 +1231,12 @@ function WithdrawFlow({
         });
       } catch (err) {
         const raw = err instanceof Error ? err.message : "Withdraw failed";
+        logFlowError("submit:failed", err, {
+          sourceChain,
+          sourceToken,
+          targetChain,
+          targetToken
+        });
         handleError(formatUserError(raw), "WITHDRAW_FLOW_ERROR");
         throw err;
       } finally {
@@ -1189,20 +1260,24 @@ function WithdrawFlow({
       onWithdrawSubmitted,
       onSignTransaction,
       isSourceNative,
-      handleError
+      handleError,
+      logFlow,
+      logFlowError
     ]
   );
   const handleWithdrawComplete = useCallback2(
     (txHash, destinationTxHash) => {
+      logFlow("withdraw:complete", { txHash, destinationTxHash });
       onWithdrawComplete?.({ txHash, destinationTxHash });
     },
-    [onWithdrawComplete]
+    [logFlow, onWithdrawComplete]
   );
   const handleWithdrawFailed = useCallback2(
     (txHash, error) => {
+      logFlowError("withdraw:failed", error, { txHash });
       onWithdrawFailed?.({ txHash, error });
     },
-    [onWithdrawFailed]
+    [logFlowError, onWithdrawFailed]
   );
   const targetChainOptions = useMemo2(() => {
     return SOURCE_CHAINS.filter(
@@ -1241,17 +1316,24 @@ function WithdrawFlow({
   const handleTargetTokenChange = useCallback2((token) => {
     setTargetToken(token);
   }, []);
-  const selectedConnectAddressEffective = useMemo2(() => {
-    if (selectedConnectAddress) return selectedConnectAddress;
+  const selectedWalletIdEffective = useMemo2(() => {
+    if (selectedWalletId) return selectedWalletId;
     if (walletOptions.length === 1) {
-      return walletOptions[0].address;
+      return walletOptions[0].id;
     }
     return null;
-  }, [selectedConnectAddress, walletOptions]);
+  }, [selectedWalletId, walletOptions]);
+  const walletOptionsKey = useMemo2(
+    () => walletOptions.map((option) => option.id).join(","),
+    [walletOptions]
+  );
   const showConnectStep = !canAutoLock && !isConnectSelectionConfirmed;
+  useEffect2(() => {
+    setIsConnectSelectionConfirmed(false);
+  }, [walletOptionsKey, selectedWalletIdEffective]);
   useEffect2(() => {
     if (!showConnectStep && isConnectSelectionConfirmed && !signerContext) {
-      setSelectedConnectAddress(null);
+      setSelectedWalletId(null);
       setIsConnectSelectionConfirmed(false);
     }
   }, [showConnectStep, isConnectSelectionConfirmed, signerContext]);
@@ -1259,7 +1341,7 @@ function WithdrawFlow({
   const selectedWalletIcon = useMemo2(() => {
     if (!ownerAddress) return reownWallet?.icon;
     const selected = walletOptions.find(
-      (o) => o.address.toLowerCase() === ownerAddress.toLowerCase()
+      (o) => o.address?.toLowerCase() === ownerAddress.toLowerCase()
     );
     return selected?.icon ?? reownWallet?.icon;
   }, [walletOptions, ownerAddress, reownWallet?.icon]);
@@ -1268,14 +1350,14 @@ function WithdrawFlow({
       ConnectStep,
       {
         walletOptions,
-        selectedAddress: selectedConnectAddressEffective,
-        onSelectAddress: setSelectedConnectAddress,
+        selectedWalletId: selectedWalletIdEffective,
+        onSelectWallet: setSelectedWalletId,
         onRequestConnect,
         onConnect,
         onDisconnect,
         onContinue: () => {
-          if (selectedConnectAddressEffective) {
-            setSelectedConnectAddress(selectedConnectAddressEffective);
+          if (selectedWalletIdEffective) {
+            setSelectedWalletId(selectedWalletIdEffective);
           }
           setIsConnectSelectionConfirmed(true);
         },
@@ -1340,7 +1422,7 @@ function WithdrawFlow({
 // src/WithdrawModal.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var ReownWithdrawInner = lazy(
-  () => import("./WithdrawModalReown-XXCOZYVU.mjs").then((m) => ({
+  () => import("./WithdrawModalReown-7CSCY55U.mjs").then((m) => ({
     default: m.WithdrawModalReown
   }))
 );
@@ -1395,7 +1477,10 @@ function WithdrawModalInner({
   const backHandlerRef = useRef2(void 0);
   const targetChain = getChainId(targetChainProp);
   const sourceChain = getChainId(sourceChainProp);
-  const service = useMemo3(() => createDepositService(backendUrl), [backendUrl]);
+  const service = useMemo3(
+    () => createDepositService(backendUrl, { debug, debugScope: "service:withdraw" }),
+    [backendUrl, debug]
+  );
   useEffect3(() => {
     if (isOpen && modalRef.current) {
       applyTheme(modalRef.current, theme);