@dynamic-labs/sdk-react-core 0.17.0-RC.9 → 0.17.1

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

@@ -1,9 +1,10 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
-import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useState, useMemo, useEffect, useCallback } from 'react';
+import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
-import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
+import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
@@ -12,79 +13,35 @@ import '../../constants/colors.js';
 import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
-import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/sdk-api';
-import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import { primaryWalletIdValidator } from './utils/primaryWalletIdValidator/primaryWalletIdValidator.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
+import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 
 const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
-    const [wallets, setWallets] = useState([]);
-    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, (value) => typeof value === 'string' || typeof value === 'undefined');
+    const [primaryWalletId, setPrimaryWalletIdState, clearPrimaryWalletId] = useLocalStorage(PRIMARY_WALLET_ID, undefined, primaryWalletIdValidator);
+    const linkedWallets = useMemo(() => {
+        if (!authToken) {
+            return [];
+        }
+        return createLinkedWalletsFromWalletOptions({
+            authToken,
+            primaryWalletId,
+            walletOptions: availableWallets,
+        });
+    }, [availableWallets, primaryWalletId, authToken]);
+    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(linkedWallets);
+    const wallets = useMemo(() => linkedWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, linkedWallets]);
+    useEffect(() => {
+        computeConnectedStateForWallets();
+    }, [primaryWalletId, computeConnectedStateForWallets]);
     const setPrimaryWalletId = useCallback((walletId) => {
         setPrimaryWalletIdState(walletId);
     }, [setPrimaryWalletIdState]);
-    const clearWalletStates = useCallback(() => {
-        setWallets([]);
-        clearPrimaryWalletId();
-    }, [clearPrimaryWalletId]);
-    const getPrimaryWallet = useCallback(() => {
-        const primaryWallet = wallets.find((wallet) => wallet.id === primaryWalletId);
-        if (!primaryWallet) {
-            return null;
-        }
-        return primaryWallet;
-    }, [primaryWalletId, wallets]);
+    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const getSecondaryWallets = useCallback(() => wallets.filter((wallet) => wallet.id !== primaryWalletId), [primaryWalletId, wallets]);
-    useEffect(() => {
-        const decodedJwt = decodeJwt(authToken);
-        // wallet state should be null while loading all the wallets or when there is no user
-        if (!availableWallets || !decodedJwt) {
-            setWallets([]);
-            return;
-        }
-        Promise.all(decodedJwt.verifiedCredentials.map((account) => __awaiter(void 0, void 0, void 0, function* () {
-            const wallet = availableWallets.find((wallet) => account.walletName &&
-                isSameWalletName(wallet.name, account.walletName));
-            // this probably shouldn't happen. this would mean that the user has an account linked
-            // with wallet W, but the customer has toggled off wallet W or the chain that
-            // supports wallet W
-            /* istanbul ignore next */
-            if (!wallet)
-                return null;
-            if (account.id === primaryWalletId &&
-                shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
-                yield wallet.walletConnector.connect();
-            }
-            if (account.address && account.chain) {
-                return {
-                    address: account.address,
-                    chain: account.chain,
-                    connected: yield isWalletConnected({
-                        address: account.address,
-                        chain: account.chain,
-                        connector: wallet.walletConnector,
-                    }),
-                    connector: wallet.walletConnector,
-                    id: account.id,
-                };
-            }
-            return null;
-        }))).then((result) => {
-            setWallets(result.filter((wc) => wc !== null));
-            return null;
-        });
-    }, [availableWallets, primaryWalletId, authToken]);
-    const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (!primaryWalletId)
-            return;
-        const connectionMap = {};
-        for (const wallet of wallets) {
-            connectionMap[wallet.id] = yield isWalletConnected(wallet);
-        }
-        setWallets((currentWallets) => currentWallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: connectionMap[wallet.id] }))));
-    }), [primaryWalletId, wallets]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
@@ -93,9 +50,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet) => {
-        if (!primaryWallet)
-            return;
+    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
         /**
          * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
          * called twice: once when the user clicks "make active" and once when the user performs
@@ -103,8 +58,12 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
          * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
          * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
          */
-        return (multiWalletWidgetState === 'idle' &&
-            isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name));
+        if (!primaryWallet || multiWalletWidgetState !== 'idle')
+            return;
+        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
+            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
+                newPrimaryWallet.address.toLowerCase());
+        return (isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);
@@ -119,7 +78,8 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             return;
         const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            yield newPrimaryWallet.connector.connect();
+            setPrimaryWalletId(walletId);
             return;
         }
         if (!connectedAccounts.length) {
@@ -133,6 +93,11 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 emailConnector.setEmail(email);
             }
         }
+        if (isSocialWalletConnector(newPrimaryWallet.connector) &&
+            !newPrimaryWallet.connected) {
+            reconnectSocialWallet(authToken, newPrimaryWallet);
+            return;
+        }
         /* istanbul ignore next */
         const publicAddress = yield newPrimaryWallet.connector.fetchPublicAddress({
             onDesktopUri: (uri) => __awaiter(void 0, void 0, void 0, function* () {
@@ -142,6 +107,16 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 setQrcodeUri(uri);
             }),
         });
+        /**
+         * need to check for connected account again for wallets that disconnect on refresh
+         *  and only reconnect upon fetching public address above
+         */
+        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
+        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts) &&
+            !isEmailWalletConnector(newPrimaryWallet.connector)) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
         if (publicAddress) {
             setPrimaryWalletId(walletId);
             setMultiWalletWidgetState('idle');
@@ -150,6 +125,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             logger.error('Failed to connect to wallet');
         }
     }), [
+        authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
         getPrimaryWallet,
@@ -162,8 +138,9 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     ]);
     const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        clearWalletStates,
+        clearPrimaryWalletId,
         computeConnectedStateForWallets,
+        didConnectedStateLoad,
         getPrimaryWallet,
         getSecondaryWallets,
         primaryWallet: getPrimaryWallet(),

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -0,0 +1,56 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var decodeJwt = require('../../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+require('../../../../../shared/logger.cjs');
+require('../../../../../config/LSSuffix.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/utils');
+require('../../../../constants/colors.cjs');
+require('ethers');
+require('../../../../../shared/consts/index.cjs');
+var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/sdk-api');
+var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt.decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+exports.createLinkedWalletsFromWalletOptions = createLinkedWalletsFromWalletOptions;

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.d.ts

@@ -0,0 +1,8 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+type CreateWalletsFromWalletOptionsProps = {
+    authToken: string;
+    primaryWalletId: string | undefined;
+    walletOptions: WalletOption[] | undefined;
+};
+export declare const createLinkedWalletsFromWalletOptions: ({ authToken, walletOptions, primaryWalletId, }: CreateWalletsFromWalletOptionsProps) => Wallet[];
+export {};

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -0,0 +1,52 @@
+import { decodeJwt } from '../../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '../../../../../shared/logger.js';
+import '../../../../../config/LSSuffix.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/utils';
+import '../../../../constants/colors.js';
+import 'ethers';
+import '../../../../../shared/consts/index.js';
+import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/sdk-api';
+import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+    const decodedJwt = decodeJwt(authToken);
+    // wallet state should be null while loading all the wallets or when there is no user
+    if (!walletOptions || !decodedJwt) {
+        return [];
+    }
+    return decodedJwt.verifiedCredentials
+        .map((account) => {
+        const wallet = walletOptions.find((wallet) => account.walletName &&
+            isSameWalletName(wallet.name, account.walletName));
+        // this probably shouldn't happen. this would mean that the user has an account linked
+        // with wallet W, but the customer has toggled off wallet W or the chain that
+        // supports wallet W
+        /* istanbul ignore next */
+        if (!wallet)
+            return null;
+        if (account.id === primaryWalletId &&
+            shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
+            wallet.walletConnector.connect();
+        }
+        if (account.address && account.chain) {
+            return {
+                address: account.address,
+                chain: account.chain,
+                connected: false,
+                connector: wallet.walletConnector,
+                id: account.id,
+            };
+        }
+        return null;
+    })
+        .filter((wc) => wc !== null);
+};
+
+export { createLinkedWalletsFromWalletOptions };

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/index.d.ts

@@ -0,0 +1 @@
+export { createLinkedWalletsFromWalletOptions } from './createLinkedWalletsFromWalletOptions';

package/src/lib/utils/hooks/useWalletConnectors/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './primaryWalletIdValidator';
+export * from './createLinkedWalletsFromWalletOptions';

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/index.d.ts

@@ -0,0 +1 @@
+export { primaryWalletIdValidator } from './primaryWalletIdValidator';

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+exports.primaryWalletIdValidator = primaryWalletIdValidator;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.d.ts

@@ -0,0 +1 @@
+export declare const primaryWalletIdValidator: (value: string | unknown) => value is string | undefined;

package/src/lib/utils/hooks/useWalletConnectors/utils/primaryWalletIdValidator/primaryWalletIdValidator.js

@@ -0,0 +1,3 @@
+const primaryWalletIdValidator = (value) => typeof value === 'string' || typeof value === 'undefined';
+
+export { primaryWalletIdValidator };

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

@@ -7,6 +7,7 @@ var React = require('react');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
+require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
@@ -16,7 +17,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -42,39 +43,74 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             return;
         }
         const seen = new Set();
+        addPrimaryWalletEventListeners(seen);
+        addSecondaryWalletEventListeners(seen);
+        return () => {
+            primaryWallet.connector.teardownEventListeners();
+            for (const wallet of secondaryWallets) {
+                wallet.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
+        orderedSecondaryWalletAddresses(secondaryWallets).join(),
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+    ]);
+    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...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnector(primaryWallet.connector);
+            }
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        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;
-                yield computeConnectedStateForWallets();
+                const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
                 if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
                 else if (!multiWallet) {
                     yield handleLogOut();
+                    return;
                 }
                 else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    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...
-                    if (!linkedSecondaryWallet) {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                        setSelectedWalletConnector(primaryWallet.connector);
-                        return;
-                    }
-                    // ...otherwise, the user is switching primary accounts betweeen the same wallet
-                    setPrimaryWalletId(linkedSecondaryWallet.id);
-                    setMultiWalletWidgetState('idle');
-                    yield computeConnectedStateForWallets();
+                    handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    secondaryWallets.some((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain))) {
-                    setMultiWalletWidgetState('detected_known_secondary_wallet');
+                else if (multiWalletWidgetState === 'idle' && newWallet) {
+                    setPrimaryWalletId(newWallet.id);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    !secondaryWallets.some((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain))) {
+                else if (multiWalletWidgetState === 'idle' && !newWallet) {
                     if (user) {
                         setMultiWalletWidgetState('detected_new_wallet');
                         setSelectedWalletConnector(primaryWallet.connector);
+                        yield computeConnectedStateForWallets();
                         return;
                     }
                     connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
@@ -83,57 +119,57 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                     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* () {
-                /* istanbul ignore next */
                 setNetwork(parseInt(chain));
             }),
             onDisconnect: handleLogOut,
         });
+    }, [
+        primaryWallet,
+        setMultiWalletWidgetState,
+        multiWallet,
+        user,
+        computeConnectedStateForWallets,
+        handleLogOut,
+        connectWalletByAddressAndChain,
+        multiWalletWidgetState,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        setPrimaryWalletId,
+    ]);
+    const addSecondaryWalletEventListeners = React.useCallback((seen) => {
+        const secondaryListeners = {
+            onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                if (multiWalletWidgetState === 'awaiting_account_switch') {
+                    handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
+                }
+                yield computeConnectedStateForWallets();
+            }),
+            onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                yield computeConnectedStateForWallets();
+            }),
+        };
         if (selectedWalletConnector && !seen.has(selectedWalletConnector.name)) {
             seen.add(selectedWalletConnector.name);
-            selectedWalletConnector.setupEventListeners({
-                onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    if (multiWalletWidgetState === 'awaiting_account_switch') {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                    }
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            selectedWalletConnector.setupEventListeners(secondaryListeners);
         }
         for (const wallet of secondaryWallets) {
             if (seen.has(wallet.connector.name)) {
                 continue;
             }
             seen.add(wallet.connector.name);
-            wallet.connector.setupEventListeners({
-                onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            wallet.connector.setupEventListeners(secondaryListeners);
         }
-        return () => {
-            primaryWallet.connector.teardownEventListeners();
-            for (const wallet of secondaryWallets) {
-                wallet.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,
+        computeConnectedStateForWallets,
+        selectedWalletConnector,
+        selectedWalletWithAction,
+        handleAccountChangeWhenAwaitingAccountSwitch,
         multiWalletWidgetState,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        secondaryWallets,
     ]);
     return {
         loadingNetwork,

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { MultiWalletWidgetState, UserProfile, Wallet } from '../../../shared';
+import { MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 export type UseWalletEventListenersArgs = {
     computeConnectedStateForWallets(): Promise<void>;
@@ -11,12 +11,14 @@ export type UseWalletEventListenersArgs = {
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     selectedWalletConnector: WalletConnector | null;
+    selectedWalletWithAction: WalletWithAction | null;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setPrimaryWalletId(walletId: string): void;
     setSelectedWalletConnector(connector: WalletConnector | null): void;
+    setSelectedWalletWithAction(walletWithAction: WalletWithAction | null): void;
     user: UserProfile | undefined;
 };
-export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
+export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
     network: string | number | undefined;
     setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;