@dynamic-labs/sdk-react-core 0.18.0-beta.29 → 0.18.0-beta.31

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs

@@ -16,12 +16,11 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
+var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
-    const seen = new Set();
     React.useEffect(() => {
         const fetchNetwork = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -40,36 +39,100 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         });
         fetchNetwork();
     }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
-    React.useEffect(() => {
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
+        logger.logger.debug('primary wallet disconnect');
+        handleLogOut();
+    });
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', (_, { chain }) => {
+        logger.logger.debug('primary wallet chain change', { chain });
         if (!primaryWallet) {
             return;
         }
-        addPrimaryWalletEventListeners(seen);
-        return () => {
-            primaryWallet.connector.teardownEventListeners();
-        };
-        // justification: we don't want to setup event listeners more than needed
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
-        user,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
-        multiWalletWidgetState,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
-    ]);
-    React.useEffect(() => {
-        addSecondaryWalletEventListeners(seen);
-        return () => {
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
+        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+        // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
+        if (primaryWallet.chain === 'starknet') {
+            setNetwork(chain);
+        }
+        else {
+            setNetwork(parseInt(chain));
+        }
+    });
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', (_, { accounts }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('primary wallet account change', {
+            accounts,
+        });
+        // change the api here
+        if (!primaryWallet)
+            return;
+        const [newAddress] = accounts;
+        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (authMode === 'connect-only') {
+            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+            return;
+        }
+        if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+            setMultiWalletWidgetState('idle');
+        }
+        else if (!multiWallet) {
+            yield handleLogOut();
+            return;
+        }
+        else if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+        }
+        else if (multiWalletWidgetState === 'idle' && newWallet) {
+            setPrimaryWalletId(newWallet.id);
+        }
+        else if (multiWalletWidgetState === 'idle' && !newWallet) {
+            if (user) {
+                setMultiWalletWidgetState('detected_new_wallet');
+                setSelectedWalletConnector(primaryWallet.connector);
+                yield computeConnectedStateForWallets();
+                return;
             }
-        };
-    }, [
-        multiWalletWidgetState,
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-    ]);
+        }
+        else {
+            logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
+            setMultiWalletWidgetState('idle');
+        }
+        yield computeConnectedStateForWallets();
+    }));
+    const uniqueNonPrimaryWallets = React.useMemo(() => {
+        const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+        const secondaryConnectors = secondaryWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([
+            ...secondaryConnectors,
+            primaryConnector,
+            selectedWalletConnector,
+        ].filter((connector) => Boolean(connector)));
+        if (primaryConnector) {
+            allWalletConnectors.delete(primaryConnector);
+        }
+        return Array.from(allWalletConnectors);
+    }, [secondaryWallets, selectedWalletConnector, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'accountChange', () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('secondary wallet account change');
+        if (authMode === 'connect-only' && secondaryWallets.length) {
+            refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            return;
+        }
+        if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
+        }
+        yield computeConnectedStateForWallets();
+    }));
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('secondary wallet chain change');
+        // We should pass the proper walletId here
+        if (!secondaryWallets.length) {
+            return;
+        }
+        refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+    }));
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', () => {
+        logger.logger.debug('secondary wallet disconnect');
+        computeConnectedStateForWallets();
+    });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
         // this means the user is linking a new account, so we need proof of ownership...
@@ -92,120 +155,6 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         setSelectedWalletWithAction,
         setPrimaryWalletId,
     ]);
-    const addPrimaryWalletEventListeners = React.useCallback((seen) => {
-        if (!primaryWallet) {
-            return;
-        }
-        seen.add(primaryWallet.connector.name);
-        primaryWallet.connector.setupEventListeners({
-            onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                const [newAddress] = accounts;
-                const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-                if (authMode === 'connect-only') {
-                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-                    return;
-                }
-                if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
-                    setMultiWalletWidgetState('idle');
-                }
-                else if (!multiWallet) {
-                    yield handleLogOut();
-                    return;
-                }
-                else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
-                }
-                else if (multiWalletWidgetState === 'idle' && newWallet) {
-                    setPrimaryWalletId(newWallet.id);
-                }
-                else if (multiWalletWidgetState === 'idle' && !newWallet) {
-                    if (user) {
-                        setMultiWalletWidgetState('detected_new_wallet');
-                        setSelectedWalletConnector(primaryWallet.connector);
-                        yield computeConnectedStateForWallets();
-                        return;
-                    }
-                }
-                else {
-                    logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
-                    setMultiWalletWidgetState('idle');
-                }
-                yield computeConnectedStateForWallets();
-            }),
-            onChainChange: (chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                if (!primaryWallet) {
-                    return;
-                }
-                refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-                // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
-                if (primaryWallet.chain === 'starknet') {
-                    setNetwork(chain);
-                }
-                else {
-                    setNetwork(parseInt(chain));
-                }
-            }),
-            onDisconnect: handleLogOut,
-        });
-    }, [
-        authMode,
-        primaryWallet,
-        setMultiWalletWidgetState,
-        multiWallet,
-        user,
-        computeConnectedStateForWallets,
-        handleLogOut,
-        multiWalletWidgetState,
-        secondaryWallets,
-        setSelectedWalletConnector,
-        handleAccountChangeWhenAwaitingAccountSwitch,
-        setPrimaryWalletId,
-        refreshConnectedWallet,
-    ]);
-    const addSecondaryWalletEventListeners = React.useCallback((seen) => {
-        const secondaryListeners = {
-            onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                if (authMode === 'connect-only' && secondaryWallets.length) {
-                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
-                    return;
-                }
-                if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
-                }
-                yield computeConnectedStateForWallets();
-            }),
-            onChainChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                // We should pass the proper walletId here
-                if (!secondaryWallets.length) {
-                    return;
-                }
-                refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
-            }),
-            onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                yield computeConnectedStateForWallets();
-            }),
-        };
-        if (selectedWalletConnector && !seen.has(selectedWalletConnector.name)) {
-            seen.add(selectedWalletConnector.name);
-            selectedWalletConnector.setupEventListeners(secondaryListeners);
-        }
-        for (const wallet of secondaryWallets) {
-            if (seen.has(wallet.connector.name)) {
-                continue;
-            }
-            seen.add(wallet.connector.name);
-            wallet.connector.setupEventListeners(secondaryListeners);
-        }
-    }, [
-        authMode,
-        computeConnectedStateForWallets,
-        selectedWalletConnector,
-        selectedWalletWithAction,
-        handleAccountChangeWhenAwaitingAccountSwitch,
-        multiWalletWidgetState,
-        secondaryWallets,
-        refreshConnectedWallet,
-    ]);
     return {
         loadingNetwork,
         network,

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.js

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useMemo, useCallback } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
@@ -12,12 +12,11 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
+import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
 
-const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
 const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
     const [network, setNetwork] = useState(undefined);
-    const seen = new Set();
     useEffect(() => {
         const fetchNetwork = () => __awaiter(void 0, void 0, void 0, function* () {
             try {
@@ -36,36 +35,100 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         });
         fetchNetwork();
     }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id]);
-    useEffect(() => {
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
+        logger.debug('primary wallet disconnect');
+        handleLogOut();
+    });
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'chainChange', (_, { chain }) => {
+        logger.debug('primary wallet chain change', { chain });
         if (!primaryWallet) {
             return;
         }
-        addPrimaryWalletEventListeners(seen);
-        return () => {
-            primaryWallet.connector.teardownEventListeners();
-        };
-        // justification: we don't want to setup event listeners more than needed
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [
-        user,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
-        multiWalletWidgetState,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
-    ]);
-    useEffect(() => {
-        addSecondaryWalletEventListeners(seen);
-        return () => {
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
+        refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+        // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
+        if (primaryWallet.chain === 'starknet') {
+            setNetwork(chain);
+        }
+        else {
+            setNetwork(parseInt(chain));
+        }
+    });
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', (_, { accounts }) => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('primary wallet account change', {
+            accounts,
+        });
+        // change the api here
+        if (!primaryWallet)
+            return;
+        const [newAddress] = accounts;
+        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (authMode === 'connect-only') {
+            refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
+            return;
+        }
+        if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+            setMultiWalletWidgetState('idle');
+        }
+        else if (!multiWallet) {
+            yield handleLogOut();
+            return;
+        }
+        else if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
+        }
+        else if (multiWalletWidgetState === 'idle' && newWallet) {
+            setPrimaryWalletId(newWallet.id);
+        }
+        else if (multiWalletWidgetState === 'idle' && !newWallet) {
+            if (user) {
+                setMultiWalletWidgetState('detected_new_wallet');
+                setSelectedWalletConnector(primaryWallet.connector);
+                yield computeConnectedStateForWallets();
+                return;
             }
-        };
-    }, [
-        multiWalletWidgetState,
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-    ]);
+        }
+        else {
+            logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
+            setMultiWalletWidgetState('idle');
+        }
+        yield computeConnectedStateForWallets();
+    }));
+    const uniqueNonPrimaryWallets = useMemo(() => {
+        const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+        const secondaryConnectors = secondaryWallets.map(({ connector }) => connector);
+        const allWalletConnectors = new Set([
+            ...secondaryConnectors,
+            primaryConnector,
+            selectedWalletConnector,
+        ].filter((connector) => Boolean(connector)));
+        if (primaryConnector) {
+            allWalletConnectors.delete(primaryConnector);
+        }
+        return Array.from(allWalletConnectors);
+    }, [secondaryWallets, selectedWalletConnector, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
+    useWalletConnectorEvent(uniqueNonPrimaryWallets, 'accountChange', () => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('secondary wallet account change');
+        if (authMode === 'connect-only' && secondaryWallets.length) {
+            refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+            return;
+        }
+        if (multiWalletWidgetState === 'awaiting_account_switch') {
+            handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
+        }
+        yield computeConnectedStateForWallets();
+    }));
+    useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', () => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('secondary wallet chain change');
+        // We should pass the proper walletId here
+        if (!secondaryWallets.length) {
+            return;
+        }
+        refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
+    }));
+    useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', () => {
+        logger.debug('secondary wallet disconnect');
+        computeConnectedStateForWallets();
+    });
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
         // this means the user is linking a new account, so we need proof of ownership...
@@ -88,120 +151,6 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         setSelectedWalletWithAction,
         setPrimaryWalletId,
     ]);
-    const addPrimaryWalletEventListeners = useCallback((seen) => {
-        if (!primaryWallet) {
-            return;
-        }
-        seen.add(primaryWallet.connector.name);
-        primaryWallet.connector.setupEventListeners({
-            onAccountChange: (accounts) => __awaiter(void 0, void 0, void 0, function* () {
-                const [newAddress] = accounts;
-                const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-                if (authMode === 'connect-only') {
-                    refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-                    return;
-                }
-                if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
-                    setMultiWalletWidgetState('idle');
-                }
-                else if (!multiWallet) {
-                    yield handleLogOut();
-                    return;
-                }
-                else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
-                }
-                else if (multiWalletWidgetState === 'idle' && newWallet) {
-                    setPrimaryWalletId(newWallet.id);
-                }
-                else if (multiWalletWidgetState === 'idle' && !newWallet) {
-                    if (user) {
-                        setMultiWalletWidgetState('detected_new_wallet');
-                        setSelectedWalletConnector(primaryWallet.connector);
-                        yield computeConnectedStateForWallets();
-                        return;
-                    }
-                }
-                else {
-                    logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
-                    setMultiWalletWidgetState('idle');
-                }
-                yield computeConnectedStateForWallets();
-            }),
-            onChainChange: (chain) => __awaiter(void 0, void 0, void 0, function* () {
-                if (!primaryWallet) {
-                    return;
-                }
-                refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
-                // https://linear.app/dynamic-labs/issue/QNTM-84/breaking-change-rename-network-to-primarywalletnetwork
-                if (primaryWallet.chain === 'starknet') {
-                    setNetwork(chain);
-                }
-                else {
-                    setNetwork(parseInt(chain));
-                }
-            }),
-            onDisconnect: handleLogOut,
-        });
-    }, [
-        authMode,
-        primaryWallet,
-        setMultiWalletWidgetState,
-        multiWallet,
-        user,
-        computeConnectedStateForWallets,
-        handleLogOut,
-        multiWalletWidgetState,
-        secondaryWallets,
-        setSelectedWalletConnector,
-        handleAccountChangeWhenAwaitingAccountSwitch,
-        setPrimaryWalletId,
-        refreshConnectedWallet,
-    ]);
-    const addSecondaryWalletEventListeners = useCallback((seen) => {
-        const secondaryListeners = {
-            onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
-                if (authMode === 'connect-only' && secondaryWallets.length) {
-                    refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
-                    return;
-                }
-                if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
-                }
-                yield computeConnectedStateForWallets();
-            }),
-            onChainChange: () => __awaiter(void 0, void 0, void 0, function* () {
-                // We should pass the proper walletId here
-                if (!secondaryWallets.length) {
-                    return;
-                }
-                refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
-            }),
-            onDisconnect: () => __awaiter(void 0, void 0, void 0, function* () {
-                yield computeConnectedStateForWallets();
-            }),
-        };
-        if (selectedWalletConnector && !seen.has(selectedWalletConnector.name)) {
-            seen.add(selectedWalletConnector.name);
-            selectedWalletConnector.setupEventListeners(secondaryListeners);
-        }
-        for (const wallet of secondaryWallets) {
-            if (seen.has(wallet.connector.name)) {
-                continue;
-            }
-            seen.add(wallet.connector.name);
-            wallet.connector.setupEventListeners(secondaryListeners);
-        }
-    }, [
-        authMode,
-        computeConnectedStateForWallets,
-        selectedWalletConnector,
-        selectedWalletWithAction,
-        handleAccountChangeWhenAwaitingAccountSwitch,
-        multiWalletWidgetState,
-        secondaryWallets,
-        refreshConnectedWallet,
-    ]);
     return {
         loadingNetwork,
         network,

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -101,6 +101,11 @@ const EmailVerification = () => {
         }
         catch (error) {
             logger.logger.debug(error);
+            // Handle the case where the user has already an account with the email
+            if (error instanceof utils.UserHasAccountWithEmailError) {
+                setView('merge-user-accounts');
+                return; // Early return to not show the error message
+            }
             setErrorMessage(error.code);
         }
         finally {
@@ -119,6 +124,7 @@ const EmailVerification = () => {
         setOnboardingOnlyJwt,
         setCallback,
         setErrorMessage,
+        setView,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -2,7 +2,7 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { useState, useCallback } from 'react';
 import { SignInWithEmailIcon } from '@dynamic-labs/iconic';
-import { NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { UserHasAccountWithEmailError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
 import { Typography } from '../../components/Typography/Typography.js';
 import { decodeJwt } from '../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/wallet-connector-core';
@@ -97,6 +97,11 @@ const EmailVerification = () => {
         }
         catch (error) {
             logger.debug(error);
+            // Handle the case where the user has already an account with the email
+            if (error instanceof UserHasAccountWithEmailError) {
+                setView('merge-user-accounts');
+                return; // Early return to not show the error message
+            }
             setErrorMessage(error.code);
         }
         finally {
@@ -115,6 +120,7 @@ const EmailVerification = () => {
         setOnboardingOnlyJwt,
         setCallback,
         setErrorMessage,
+        setView,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         setError(undefined);