@rhinestone/deposit-modal 0.1.6 → 0.1.8

package/dist/index.cjs

@@ -651,12 +651,27 @@ async function signEnableSessionWithOwner(rhinestoneAccount, sessionDetails, sig
     rhinestoneAccount.config.owners = originalOwners;
   }
 }
-async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken) {
+async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken, sessionChainIds) {
   const isTargetTestnet = Boolean(targetChain.testnet);
   const chainsByNetworkType = SUPPORTED_CHAINS.filter(
     (chain) => Boolean(chain.testnet) === isTargetTestnet
   );
+  const chainsById = new Map(
+    chainsByNetworkType.map((chain) => [chain.id, chain])
+  );
   let selectedChains = [...chainsByNetworkType];
+  if (sessionChainIds && sessionChainIds.length > 0) {
+    const selectedByCaller = [];
+    for (const chainId of sessionChainIds) {
+      const chain = chainsById.get(chainId);
+      if (chain) {
+        selectedByCaller.push(chain);
+      }
+    }
+    if (selectedByCaller.length > 0) {
+      selectedChains = selectedByCaller;
+    }
+  }
   if (targetToken) {
     const targetSymbol = getTokenSymbol(targetToken, targetChain.id).toUpperCase();
     if (targetSymbol && targetSymbol !== "TOKEN") {
@@ -671,7 +686,10 @@ async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress,
   if (!selectedChains.some((c) => c.id === targetChain.id)) {
     selectedChains.push(targetChain);
   }
-  const sessions = selectedChains.map(
+  const uniqueChains = Array.from(
+    new Map(selectedChains.map((chain) => [chain.id, chain])).values()
+  );
+  const sessions = uniqueChains.map(
     (chain) => buildSession(chain, signerAddress)
   );
   const sessionDetails = await rhinestoneAccount.experimental_getSessionDetails(sessions);
@@ -759,6 +777,7 @@ function SetupStep({
   targetChainObj,
   targetToken,
   signerAddress,
+  sessionChainIds,
   recipient,
   forceRegister,
   service,
@@ -799,7 +818,8 @@ function SetupStep({
         targetChainObj,
         signerAddress,
         sessionOwner.account,
-        targetToken
+        targetToken,
+        sessionChainIds
       );
       setState({ type: "registering" });
       await service.registerAccount({
@@ -832,6 +852,7 @@ function SetupStep({
     targetChain,
     targetToken,
     signerAddress,
+    sessionChainIds,
     recipient,
     forceRegister,
     service,
@@ -2121,6 +2142,49 @@ var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
 var PROCESS_TIMEOUT_MS = 10 * 60 * 1e3;
+function getEventTxHash(event) {
+  if (!event?.type) return void 0;
+  if (event.type === "deposit-received") {
+    const data = event.data;
+    return typeof data?.transactionHash === "string" ? data.transactionHash : void 0;
+  }
+  if (event.type === "bridge-started" || event.type === "bridge-complete") {
+    const data = event.data;
+    const txHash = data?.source?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  if (event.type === "bridge-failed") {
+    const data = event.data;
+    const txHash = data?.deposit?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  if (event.type === "error") {
+    const data = event.data;
+    const txHash = data?.deposit?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  return void 0;
+}
+function isEventForTx(event, txHash) {
+  const eventTxHash = getEventTxHash(event);
+  if (!eventTxHash) return false;
+  return eventTxHash.toLowerCase() === txHash.toLowerCase();
+}
+function formatBridgeFailedMessage(event) {
+  const eventData = event?.data ?? {};
+  const code = typeof eventData.errorCode === "string" ? eventData.errorCode : void 0;
+  const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
+  if (backendMessage.length > 0) {
+    return {
+      message: backendMessage,
+      code
+    };
+  }
+  if (code) {
+    return { message: `Bridge failed (${code})`, code };
+  }
+  return { message: "Bridge failed" };
+}
 function ProcessingStep({
   publicClient,
   smartAccount,
@@ -2238,36 +2302,46 @@ function ProcessingStep({
       try {
         const data = await service.fetchStatus(smartAccount);
         const lastEvent2 = data.lastEvent;
+        const eventMatchesTx = isEventForTx(lastEvent2, txHash);
+        const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;
         if (!isMounted) return;
-        if (lastEvent2?.type === "bridge-complete") {
-          setState({ type: "complete", lastEvent: lastEvent2 });
-          const destinationTxHash2 = lastEvent2.data?.destination?.transactionHash;
+        if (eventForCurrentTx?.type === "bridge-complete") {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
+          const destinationTxHash2 = eventForCurrentTx.data?.destination?.transactionHash;
           onDepositComplete?.(txHash, destinationTxHash2);
           return;
         }
-        if (!waitForFinalTx && lastEvent2?.type === "bridge-started") {
-          setState({ type: "complete", lastEvent: lastEvent2 });
+        if (!waitForFinalTx && eventForCurrentTx?.type === "bridge-started") {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
           onDepositComplete?.(txHash);
           return;
         }
-        if (lastEvent2?.type === "deposit-received" && sameChainAndToken) {
-          setState({ type: "complete", lastEvent: lastEvent2 });
+        if (eventForCurrentTx?.type === "deposit-received" && sameChainAndToken) {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
           onDepositComplete?.(txHash);
           return;
         }
-        if (lastEvent2?.type === "bridge-failed") {
-          const errorCode = lastEvent2.data?.errorCode ?? "Bridge failed";
-          setState({ type: "failed", message: errorCode, lastEvent: lastEvent2 });
-          onDepositFailed?.(txHash, errorCode);
+        if (eventForCurrentTx?.type === "bridge-failed") {
+          const formatted = formatBridgeFailedMessage(eventForCurrentTx);
+          setState({
+            type: "failed",
+            message: formatted.message,
+            lastEvent: eventForCurrentTx
+          });
+          onDepositFailed?.(txHash, formatted.message);
           return;
         }
-        if (lastEvent2?.type === "error") {
-          const errorMessage = lastEvent2.data?.message ?? "Unknown error";
-          setState({ type: "failed", message: errorMessage, lastEvent: lastEvent2 });
+        if (eventForCurrentTx?.type === "error") {
+          const errorMessage = eventForCurrentTx.data?.message ?? "Unknown error";
+          setState({
+            type: "failed",
+            message: errorMessage,
+            lastEvent: eventForCurrentTx
+          });
           onDepositFailed?.(txHash, errorMessage);
           return;
         }
-        setState({ type: "processing", lastEvent: lastEvent2 });
+        setState({ type: "processing", lastEvent: eventForCurrentTx });
         scheduleNextPoll();
       } catch {
         scheduleNextPoll();
@@ -2730,7 +2804,8 @@ function DepositFlow({
   amount: defaultAmount,
   recipient,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
-  forceRegister = true,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -2885,6 +2960,7 @@ function DepositFlow({
         targetChainObj,
         targetToken,
         signerAddress,
+        sessionChainIds,
         recipient,
         forceRegister,
         service,
@@ -3024,7 +3100,8 @@ function DepositModal({
   recipient,
   backendUrl = DEFAULT_BACKEND_URL,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
-  forceRegister = true,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -3190,6 +3267,7 @@ function DepositModal({
             amount: defaultAmount,
             recipient,
             signerAddress,
+            sessionChainIds,
             forceRegister,
             waitForFinalTx,
             onRequestConnect,
@@ -3964,6 +4042,8 @@ function WithdrawFlow({
   service,
   switchChain,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -4052,29 +4132,34 @@ function WithdrawFlow({
           sessionOwner.account
         );
         const smartAccount = getAccountAddress(account);
-        const initData = getAccountInitData(account);
-        const sessionDetails = await getSessionDetails(
-          account,
-          targetChainObj,
-          signerAddress,
-          sessionOwner.account,
-          targetToken
-        );
-        await service.registerAccount({
-          address: smartAccount,
-          accountParams: {
-            factory: initData.factory,
-            factoryData: initData.factoryData,
-            sessionDetails
-          },
-          eoaAddress: address,
-          sessionOwner: sessionOwner.address,
-          target: {
-            chain: targetChain,
-            token: targetToken,
-            recipient
-          }
-        });
+        const checkResult = await service.checkAccount(smartAccount);
+        const targetMatches = checkResult.targetChain === targetChain && checkResult.targetToken?.toLowerCase() === targetToken.toLowerCase();
+        if (!checkResult.isRegistered || forceRegister || !targetMatches) {
+          const initData = getAccountInitData(account);
+          const sessionDetails = await getSessionDetails(
+            account,
+            targetChainObj,
+            signerAddress,
+            sessionOwner.account,
+            targetToken,
+            sessionChainIds
+          );
+          await service.registerAccount({
+            address: smartAccount,
+            accountParams: {
+              factory: initData.factory,
+              factoryData: initData.factoryData,
+              sessionDetails
+            },
+            eoaAddress: address,
+            sessionOwner: sessionOwner.address,
+            target: {
+              chain: targetChain,
+              token: targetToken,
+              recipient
+            }
+          });
+        }
         handleConnected(address, smartAccount);
         const amountUnits = (0, import_viem9.parseUnits)(amountValue, asset.decimals);
         const result = isSourceNative ? await executeSafeEthTransfer({
@@ -4122,6 +4207,8 @@ function WithdrawFlow({
       targetChainObj,
       resolveSessionOwner2,
       signerAddress,
+      sessionChainIds,
+      forceRegister,
       targetChain,
       targetToken,
       service,
@@ -4260,6 +4347,8 @@ function WithdrawModal({
   switchChain,
   backendUrl = DEFAULT_BACKEND_URL,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -4423,6 +4512,8 @@ function WithdrawModal({
             service,
             switchChain,
             signerAddress,
+            sessionChainIds,
+            forceRegister,
             waitForFinalTx,
             onRequestConnect,
             connectButtonLabel,

package/dist/index.d.cts

@@ -77,6 +77,7 @@ interface DepositModalProps {
     recipient?: Address;
     backendUrl?: string;
     signerAddress?: Address;
+    sessionChainIds?: number[];
     forceRegister?: boolean;
     waitForFinalTx?: boolean;
     onRequestConnect?: () => void;
@@ -111,6 +112,8 @@ interface WithdrawModalProps {
     } | void>;
     backendUrl?: string;
     signerAddress?: Address;
+    sessionChainIds?: number[];
+    forceRegister?: boolean;
     waitForFinalTx?: boolean;
     onRequestConnect?: () => void;
     connectButtonLabel?: string;
@@ -136,12 +139,12 @@ interface AssetOption {
     balanceUsd?: number;
 }
 
-declare function DepositModal({ walletClient, publicClient, address, targetChain: targetChainProp, targetToken, isOpen, onClose, inline, switchChain, sourceChain: sourceChainProp, sourceToken, defaultAmount, recipient, backendUrl, signerAddress, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onDepositSubmitted, onDepositComplete, onDepositFailed, onError, }: DepositModalProps): react_jsx_runtime.JSX.Element;
+declare function DepositModal({ walletClient, publicClient, address, targetChain: targetChainProp, targetToken, isOpen, onClose, inline, switchChain, sourceChain: sourceChainProp, sourceToken, defaultAmount, recipient, backendUrl, signerAddress, sessionChainIds, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onDepositSubmitted, onDepositComplete, onDepositFailed, onError, }: DepositModalProps): react_jsx_runtime.JSX.Element;
 declare namespace DepositModal {
     var displayName: string;
 }
 
-declare function WithdrawModal({ walletClient, publicClient, address, safeAddress, sourceChain: sourceChainProp, sourceToken, targetChain: targetChainProp, targetToken, recipient, defaultAmount, isOpen, onClose, inline, switchChain, backendUrl, signerAddress, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onWithdrawSubmitted, onWithdrawComplete, onWithdrawFailed, onError, }: WithdrawModalProps): react_jsx_runtime.JSX.Element;
+declare function WithdrawModal({ walletClient, publicClient, address, safeAddress, sourceChain: sourceChainProp, sourceToken, targetChain: targetChainProp, targetToken, recipient, defaultAmount, isOpen, onClose, inline, switchChain, backendUrl, signerAddress, sessionChainIds, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onWithdrawSubmitted, onWithdrawComplete, onWithdrawFailed, onError, }: WithdrawModalProps): react_jsx_runtime.JSX.Element;
 declare namespace WithdrawModal {
     var displayName: string;
 }

package/dist/index.d.ts

@@ -77,6 +77,7 @@ interface DepositModalProps {
     recipient?: Address;
     backendUrl?: string;
     signerAddress?: Address;
+    sessionChainIds?: number[];
     forceRegister?: boolean;
     waitForFinalTx?: boolean;
     onRequestConnect?: () => void;
@@ -111,6 +112,8 @@ interface WithdrawModalProps {
     } | void>;
     backendUrl?: string;
     signerAddress?: Address;
+    sessionChainIds?: number[];
+    forceRegister?: boolean;
     waitForFinalTx?: boolean;
     onRequestConnect?: () => void;
     connectButtonLabel?: string;
@@ -136,12 +139,12 @@ interface AssetOption {
     balanceUsd?: number;
 }
 
-declare function DepositModal({ walletClient, publicClient, address, targetChain: targetChainProp, targetToken, isOpen, onClose, inline, switchChain, sourceChain: sourceChainProp, sourceToken, defaultAmount, recipient, backendUrl, signerAddress, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onDepositSubmitted, onDepositComplete, onDepositFailed, onError, }: DepositModalProps): react_jsx_runtime.JSX.Element;
+declare function DepositModal({ walletClient, publicClient, address, targetChain: targetChainProp, targetToken, isOpen, onClose, inline, switchChain, sourceChain: sourceChainProp, sourceToken, defaultAmount, recipient, backendUrl, signerAddress, sessionChainIds, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onDepositSubmitted, onDepositComplete, onDepositFailed, onError, }: DepositModalProps): react_jsx_runtime.JSX.Element;
 declare namespace DepositModal {
     var displayName: string;
 }
 
-declare function WithdrawModal({ walletClient, publicClient, address, safeAddress, sourceChain: sourceChainProp, sourceToken, targetChain: targetChainProp, targetToken, recipient, defaultAmount, isOpen, onClose, inline, switchChain, backendUrl, signerAddress, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onWithdrawSubmitted, onWithdrawComplete, onWithdrawFailed, onError, }: WithdrawModalProps): react_jsx_runtime.JSX.Element;
+declare function WithdrawModal({ walletClient, publicClient, address, safeAddress, sourceChain: sourceChainProp, sourceToken, targetChain: targetChainProp, targetToken, recipient, defaultAmount, isOpen, onClose, inline, switchChain, backendUrl, signerAddress, sessionChainIds, forceRegister, waitForFinalTx, onRequestConnect, connectButtonLabel, theme, branding, uiConfig, className, onReady, onConnected, onWithdrawSubmitted, onWithdrawComplete, onWithdrawFailed, onError, }: WithdrawModalProps): react_jsx_runtime.JSX.Element;
 declare namespace WithdrawModal {
     var displayName: string;
 }

package/dist/index.mjs

@@ -610,12 +610,27 @@ async function signEnableSessionWithOwner(rhinestoneAccount, sessionDetails, sig
     rhinestoneAccount.config.owners = originalOwners;
   }
 }
-async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken) {
+async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress, sessionSigner, targetToken, sessionChainIds) {
   const isTargetTestnet = Boolean(targetChain.testnet);
   const chainsByNetworkType = SUPPORTED_CHAINS.filter(
     (chain) => Boolean(chain.testnet) === isTargetTestnet
   );
+  const chainsById = new Map(
+    chainsByNetworkType.map((chain) => [chain.id, chain])
+  );
   let selectedChains = [...chainsByNetworkType];
+  if (sessionChainIds && sessionChainIds.length > 0) {
+    const selectedByCaller = [];
+    for (const chainId of sessionChainIds) {
+      const chain = chainsById.get(chainId);
+      if (chain) {
+        selectedByCaller.push(chain);
+      }
+    }
+    if (selectedByCaller.length > 0) {
+      selectedChains = selectedByCaller;
+    }
+  }
   if (targetToken) {
     const targetSymbol = getTokenSymbol(targetToken, targetChain.id).toUpperCase();
     if (targetSymbol && targetSymbol !== "TOKEN") {
@@ -630,7 +645,10 @@ async function getSessionDetails(rhinestoneAccount, targetChain, signerAddress,
   if (!selectedChains.some((c) => c.id === targetChain.id)) {
     selectedChains.push(targetChain);
   }
-  const sessions = selectedChains.map(
+  const uniqueChains = Array.from(
+    new Map(selectedChains.map((chain) => [chain.id, chain])).values()
+  );
+  const sessions = uniqueChains.map(
     (chain) => buildSession(chain, signerAddress)
   );
   const sessionDetails = await rhinestoneAccount.experimental_getSessionDetails(sessions);
@@ -721,6 +739,7 @@ function SetupStep({
   targetChainObj,
   targetToken,
   signerAddress,
+  sessionChainIds,
   recipient,
   forceRegister,
   service,
@@ -761,7 +780,8 @@ function SetupStep({
         targetChainObj,
         signerAddress,
         sessionOwner.account,
-        targetToken
+        targetToken,
+        sessionChainIds
       );
       setState({ type: "registering" });
       await service.registerAccount({
@@ -794,6 +814,7 @@ function SetupStep({
     targetChain,
     targetToken,
     signerAddress,
+    sessionChainIds,
     recipient,
     forceRegister,
     service,
@@ -2083,6 +2104,49 @@ var INITIAL_POLL_INTERVAL = 3e3;
 var MAX_POLL_INTERVAL = 3e4;
 var BACKOFF_MULTIPLIER = 1.5;
 var PROCESS_TIMEOUT_MS = 10 * 60 * 1e3;
+function getEventTxHash(event) {
+  if (!event?.type) return void 0;
+  if (event.type === "deposit-received") {
+    const data = event.data;
+    return typeof data?.transactionHash === "string" ? data.transactionHash : void 0;
+  }
+  if (event.type === "bridge-started" || event.type === "bridge-complete") {
+    const data = event.data;
+    const txHash = data?.source?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  if (event.type === "bridge-failed") {
+    const data = event.data;
+    const txHash = data?.deposit?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  if (event.type === "error") {
+    const data = event.data;
+    const txHash = data?.deposit?.transactionHash;
+    return typeof txHash === "string" ? txHash : void 0;
+  }
+  return void 0;
+}
+function isEventForTx(event, txHash) {
+  const eventTxHash = getEventTxHash(event);
+  if (!eventTxHash) return false;
+  return eventTxHash.toLowerCase() === txHash.toLowerCase();
+}
+function formatBridgeFailedMessage(event) {
+  const eventData = event?.data ?? {};
+  const code = typeof eventData.errorCode === "string" ? eventData.errorCode : void 0;
+  const backendMessage = typeof eventData.message === "string" ? eventData.message.trim() : "";
+  if (backendMessage.length > 0) {
+    return {
+      message: backendMessage,
+      code
+    };
+  }
+  if (code) {
+    return { message: `Bridge failed (${code})`, code };
+  }
+  return { message: "Bridge failed" };
+}
 function ProcessingStep({
   publicClient,
   smartAccount,
@@ -2200,36 +2264,46 @@ function ProcessingStep({
       try {
         const data = await service.fetchStatus(smartAccount);
         const lastEvent2 = data.lastEvent;
+        const eventMatchesTx = isEventForTx(lastEvent2, txHash);
+        const eventForCurrentTx = eventMatchesTx ? lastEvent2 : void 0;
         if (!isMounted) return;
-        if (lastEvent2?.type === "bridge-complete") {
-          setState({ type: "complete", lastEvent: lastEvent2 });
-          const destinationTxHash2 = lastEvent2.data?.destination?.transactionHash;
+        if (eventForCurrentTx?.type === "bridge-complete") {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
+          const destinationTxHash2 = eventForCurrentTx.data?.destination?.transactionHash;
           onDepositComplete?.(txHash, destinationTxHash2);
           return;
         }
-        if (!waitForFinalTx && lastEvent2?.type === "bridge-started") {
-          setState({ type: "complete", lastEvent: lastEvent2 });
+        if (!waitForFinalTx && eventForCurrentTx?.type === "bridge-started") {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
           onDepositComplete?.(txHash);
           return;
         }
-        if (lastEvent2?.type === "deposit-received" && sameChainAndToken) {
-          setState({ type: "complete", lastEvent: lastEvent2 });
+        if (eventForCurrentTx?.type === "deposit-received" && sameChainAndToken) {
+          setState({ type: "complete", lastEvent: eventForCurrentTx });
           onDepositComplete?.(txHash);
           return;
         }
-        if (lastEvent2?.type === "bridge-failed") {
-          const errorCode = lastEvent2.data?.errorCode ?? "Bridge failed";
-          setState({ type: "failed", message: errorCode, lastEvent: lastEvent2 });
-          onDepositFailed?.(txHash, errorCode);
+        if (eventForCurrentTx?.type === "bridge-failed") {
+          const formatted = formatBridgeFailedMessage(eventForCurrentTx);
+          setState({
+            type: "failed",
+            message: formatted.message,
+            lastEvent: eventForCurrentTx
+          });
+          onDepositFailed?.(txHash, formatted.message);
           return;
         }
-        if (lastEvent2?.type === "error") {
-          const errorMessage = lastEvent2.data?.message ?? "Unknown error";
-          setState({ type: "failed", message: errorMessage, lastEvent: lastEvent2 });
+        if (eventForCurrentTx?.type === "error") {
+          const errorMessage = eventForCurrentTx.data?.message ?? "Unknown error";
+          setState({
+            type: "failed",
+            message: errorMessage,
+            lastEvent: eventForCurrentTx
+          });
           onDepositFailed?.(txHash, errorMessage);
           return;
         }
-        setState({ type: "processing", lastEvent: lastEvent2 });
+        setState({ type: "processing", lastEvent: eventForCurrentTx });
         scheduleNextPoll();
       } catch {
         scheduleNextPoll();
@@ -2692,7 +2766,8 @@ function DepositFlow({
   amount: defaultAmount,
   recipient,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
-  forceRegister = true,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -2847,6 +2922,7 @@ function DepositFlow({
         targetChainObj,
         targetToken,
         signerAddress,
+        sessionChainIds,
         recipient,
         forceRegister,
         service,
@@ -2986,7 +3062,8 @@ function DepositModal({
   recipient,
   backendUrl = DEFAULT_BACKEND_URL,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
-  forceRegister = true,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -3152,6 +3229,7 @@ function DepositModal({
             amount: defaultAmount,
             recipient,
             signerAddress,
+            sessionChainIds,
             forceRegister,
             waitForFinalTx,
             onRequestConnect,
@@ -3934,6 +4012,8 @@ function WithdrawFlow({
   service,
   switchChain,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -4022,29 +4102,34 @@ function WithdrawFlow({
           sessionOwner.account
         );
         const smartAccount = getAccountAddress(account);
-        const initData = getAccountInitData(account);
-        const sessionDetails = await getSessionDetails(
-          account,
-          targetChainObj,
-          signerAddress,
-          sessionOwner.account,
-          targetToken
-        );
-        await service.registerAccount({
-          address: smartAccount,
-          accountParams: {
-            factory: initData.factory,
-            factoryData: initData.factoryData,
-            sessionDetails
-          },
-          eoaAddress: address,
-          sessionOwner: sessionOwner.address,
-          target: {
-            chain: targetChain,
-            token: targetToken,
-            recipient
-          }
-        });
+        const checkResult = await service.checkAccount(smartAccount);
+        const targetMatches = checkResult.targetChain === targetChain && checkResult.targetToken?.toLowerCase() === targetToken.toLowerCase();
+        if (!checkResult.isRegistered || forceRegister || !targetMatches) {
+          const initData = getAccountInitData(account);
+          const sessionDetails = await getSessionDetails(
+            account,
+            targetChainObj,
+            signerAddress,
+            sessionOwner.account,
+            targetToken,
+            sessionChainIds
+          );
+          await service.registerAccount({
+            address: smartAccount,
+            accountParams: {
+              factory: initData.factory,
+              factoryData: initData.factoryData,
+              sessionDetails
+            },
+            eoaAddress: address,
+            sessionOwner: sessionOwner.address,
+            target: {
+              chain: targetChain,
+              token: targetToken,
+              recipient
+            }
+          });
+        }
         handleConnected(address, smartAccount);
         const amountUnits = parseUnits4(amountValue, asset.decimals);
         const result = isSourceNative ? await executeSafeEthTransfer({
@@ -4092,6 +4177,8 @@ function WithdrawFlow({
       targetChainObj,
       resolveSessionOwner2,
       signerAddress,
+      sessionChainIds,
+      forceRegister,
       targetChain,
       targetToken,
       service,
@@ -4230,6 +4317,8 @@ function WithdrawModal({
   switchChain,
   backendUrl = DEFAULT_BACKEND_URL,
   signerAddress = DEFAULT_SIGNER_ADDRESS,
+  sessionChainIds,
+  forceRegister = false,
   waitForFinalTx = true,
   onRequestConnect,
   connectButtonLabel,
@@ -4393,6 +4482,8 @@ function WithdrawModal({
             service,
             switchChain,
             signerAddress,
+            sessionChainIds,
+            forceRegister,
             waitForFinalTx,
             onRequestConnect,
             connectButtonLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhinestone/deposit-modal",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "React modal component for Rhinestone cross-chain deposits",
   "author": "Rhinestone <dev@rhinestone.wtf>",
   "bugs": {