@dynamic-labs/sdk-react-core 1.0.0-alpha.0 → 1.0.0-alpha.10

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

@@ -1,7 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { WalletOption, Wallet, MultiWalletWidgetState, AuthModeType, UserProfile } from '../../../shared';
+import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletOption } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
-import { WalletConnector } from '../../../..';
 type Props = {
     authMode: AuthModeType;
     authToken: string | undefined;
@@ -10,7 +9,7 @@ type Props = {
     setDesktopUri: Dispatch<SetStateAction<string>>;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setQrcodeUri: Dispatch<SetStateAction<string>>;
-    wallets: WalletOption[];
+    walletConnectorOptions: WalletOption[];
     setPrimaryWalletId: (walletId: string) => void;
     primaryWalletId: string | undefined;
     user?: UserProfile;
@@ -18,17 +17,13 @@ type Props = {
     canHaveMultipleWalletsConnected?: boolean;
 };
 export interface UseWalletConnectors {
-    computeConnectedStateForWallets: () => Promise<void>;
     didConnectedStateLoad: boolean;
-    getPrimaryWallet: () => Wallet | null;
-    getSecondaryWallets: () => Wallet[];
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     setPrimaryWallet: (walletId: string) => Promise<void>;
     setShowQrcodeModal: Dispatch<SetStateAction<boolean>>;
     showQrcodeModal: boolean;
-    walletConnectors: WalletConnector[];
     wallets: Wallet[];
 }
-export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
+export declare const useWalletConnectors: ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }: Props) => UseWalletConnectors;
 export {};

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

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useEffect, useCallback } from 'react';
-import { isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { isEmbeddedConnector, isEmailWalletConnector, isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -14,10 +14,10 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
-import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
+import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = useState(false);
     const linkedWallets = useMemo(() => {
         if (!authToken) {
@@ -26,9 +26,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
     const walletsBasedOnAuthMode = useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -38,6 +38,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
             return linkedWallets;
         }
+        /**
+         * This is to handle users in connect-only who are signing in with social/email
+         * with an embedded wallet
+         */
+        if (authMode === 'connect-only' &&
+            linkedWallets.find((wallet) => isEmbeddedConnector(wallet.connector))) {
+            return linkedWallets;
+        }
         return connectedWallets;
     }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     /**
@@ -50,13 +58,10 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    useEffect(() => {
-        computeConnectedStateForWallets();
-    }, [primaryWalletId, computeConnectedStateForWallets]);
-    const getPrimaryWallet = useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = useCallback(() => canHaveMultipleWalletsConnected
+    const primaryWallet = useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
@@ -93,7 +98,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -145,7 +149,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -153,18 +157,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        computeConnectedStateForWallets,
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var sdkApi = require('@dynamic-labs/sdk-api');
 var decodeJwt = require('../../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -10,26 +11,25 @@ require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../../../constants/colors.cjs');
 require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 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');
+var findWallet = require('../findWallet/findWallet.cjs');
+var smartWallet = require('../smartWallet/smartWallet.cjs');
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, 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) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = walletOptions.find((wallet) => account.walletName &&
-            isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+        const wallet = findWallet.findWallet(account, walletConnectorOptions);
         // 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
@@ -40,7 +40,18 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
             shouldManuallyReconnectOnRefresh.shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // this account is the owner of a smart wallet, and should not be surfaced
+        if (smartWallet.isOwnerOfASmartWallet(account, decodedJwt.verifiedCredentials)) {
+            return null;
+        }
         if (account.address && account.chain) {
+            if (account.walletProvider === sdkApi.WalletProviderEnum.SmartContractWallet) {
+                smartWallet.initializeSmartWallet({
+                    account,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletConnectorOptions,
+                });
+            }
             return {
                 address: account.address,
                 chain: account.chain,

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

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

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

@@ -1,3 +1,4 @@
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api';
 import { decodeJwt } from '../../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -6,26 +7,25 @@ import '../../../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../../../constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 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';
+import { findWallet } from '../findWallet/findWallet.js';
+import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
-const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primaryWalletId, }) => {
+const createLinkedWalletsFromWalletOptions = ({ authToken, walletConnectorOptions, primaryWalletId, }) => {
     const decodedJwt = decodeJwt(authToken);
     // wallet state should be null while loading all the wallets or when there is no user
-    if (!walletOptions || !decodedJwt) {
+    if (!walletConnectorOptions || !decodedJwt) {
         return [];
     }
     return decodedJwt.verifiedCredentials
         .map((account) => {
-        const wallet = walletOptions.find((wallet) => account.walletName &&
-            isSameWalletName(wallet.name, account.walletName));
+        const wallet = findWallet(account, walletConnectorOptions);
         // 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
@@ -36,7 +36,18 @@ const createLinkedWalletsFromWalletOptions = ({ authToken, walletOptions, primar
             shouldManuallyReconnectOnRefresh(wallet.walletConnector)) {
             wallet.walletConnector.connect();
         }
+        // this account is the owner of a smart wallet, and should not be surfaced
+        if (isOwnerOfASmartWallet(account, decodedJwt.verifiedCredentials)) {
+            return null;
+        }
         if (account.address && account.chain) {
+            if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
+                initializeSmartWallet({
+                    account,
+                    verifiedCredentials: decodedJwt.verifiedCredentials,
+                    walletConnectorOptions,
+                });
+            }
             return {
                 address: account.address,
                 chain: account.chain,

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

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var isSameWalletName = require('../../../../functions/isSameWalletName/isSameWalletName.cjs');
+
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName.isSameWalletName(wallet.name, account.walletName));
+
+exports.findWallet = findWallet;

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

@@ -0,0 +1,3 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
+import { WalletOption } from '../../../../../shared';
+export declare const findWallet: (account: JwtVerifiedCredential, walletOptions: WalletOption[]) => WalletOption | undefined;

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

@@ -0,0 +1,5 @@
+import { isSameWalletName } from '../../../../functions/isSameWalletName/isSameWalletName.js';
+
+const findWallet = (account, walletOptions) => walletOptions.find((wallet) => account.walletName && isSameWalletName(wallet.name, account.walletName));
+
+export { findWallet };

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

@@ -0,0 +1 @@
+export * from './findWallet';

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

@@ -0,0 +1 @@
+export * from './smartWallet';

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

@@ -0,0 +1,37 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../../_virtual/_tslib.cjs');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var findWallet = require('../findWallet/findWallet.cjs');
+
+// assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
+// the associated eoa account
+const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
+const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
+const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
+const initializeSmartWallet = ({ account, verifiedCredentials, walletConnectorOptions, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const owner = findOwner(account, verifiedCredentials);
+    if (!owner) {
+        throw new Error('could not find associated eoa account for smart wallet');
+    }
+    const ownerWallet = findWallet.findWallet(owner, walletConnectorOptions);
+    if (!ownerWallet) {
+        throw new Error('could not find owner wallet from wallet options');
+    }
+    const smartWallet = findWallet.findWallet(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!walletConnectorCore.isSmartWalletConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    yield connector.setEoaConnector(ownerWallet.walletConnector);
+});
+
+exports.findOwner = findOwner;
+exports.findSmartWallet = findSmartWallet;
+exports.initializeSmartWallet = initializeSmartWallet;
+exports.isOwnerOfASmartWallet = isOwnerOfASmartWallet;

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

@@ -0,0 +1,10 @@
+import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
+import { WalletOption } from '../../../../../shared';
+export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
+export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
+export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, }: {
+    account: JwtVerifiedCredential;
+    verifiedCredentials: JwtVerifiedCredential[];
+    walletConnectorOptions: WalletOption[];
+}) => Promise<void>;

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

@@ -0,0 +1,30 @@
+import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
+import { isSmartWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { findWallet } from '../findWallet/findWallet.js';
+
+// assumes `account` input is a smart wallet (has a signerRefId) and attempts to find
+// the associated eoa account
+const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
+const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
+const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
+const initializeSmartWallet = ({ account, verifiedCredentials, walletConnectorOptions, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const owner = findOwner(account, verifiedCredentials);
+    if (!owner) {
+        throw new Error('could not find associated eoa account for smart wallet');
+    }
+    const ownerWallet = findWallet(owner, walletConnectorOptions);
+    if (!ownerWallet) {
+        throw new Error('could not find owner wallet from wallet options');
+    }
+    const smartWallet = findWallet(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!isSmartWalletConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    yield connector.setEoaConnector(ownerWallet.walletConnector);
+});
+
+export { findOwner, findSmartWallet, initializeSmartWallet, isOwnerOfASmartWallet };

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

@@ -11,14 +11,14 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
+const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -57,7 +57,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             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* () {
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', (_, { accounts }) => {
         logger.logger.debug('primary wallet account change', {
             accounts,
         });
@@ -74,7 +74,11 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             setMultiWalletWidgetState('idle');
         }
         else if (!multiWallet) {
-            yield handleLogOut();
+            setSelectedWalletWithAction({
+                action: 'select',
+                wallet: primaryWallet,
+            });
+            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             return;
         }
         else if (multiWalletWidgetState === 'awaiting_account_switch') {
@@ -86,8 +90,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         else if (multiWalletWidgetState === 'idle' && !newWallet) {
             if (user) {
                 setMultiWalletWidgetState('detected_new_wallet');
-                setSelectedWalletConnector(primaryWallet.connector);
-                yield computeConnectedStateForWallets();
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
                 return;
             }
         }
@@ -95,8 +98,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             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);
@@ -110,35 +112,36 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         }
         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* () {
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'accountChange', (changedConnector) => _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);
+            const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
+            for (const wallet of affectedWallets)
+                refreshConnectedWallet(wallet.id, wallet.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* () {
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'chainChange', (changedConnector) => _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);
+        // Get all wallets with this connector
+        const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === changedConnector.key);
+        for (const wallet of affectedWallets)
+            refreshConnectedWallet(wallet.id, wallet.connector);
     }));
-    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', () => {
+    useWalletConnectorEvent.useWalletConnectorEvent(uniqueNonPrimaryWallets, 'disconnect', (affectedConnector) => {
         logger.logger.debug('secondary wallet disconnect');
         // argent sends a disconnect event when the user adds a new account
-        if (authMode === 'connect-only' &&
-            secondaryWallets.length &&
-            secondaryWallets[0].connector.key === 'argentx') {
-            refreshConnectedWallet(secondaryWallets[0].id, secondaryWallets[0].connector);
-            return;
+        if (authMode === 'connect-only') {
+            // Get all wallets with this connector
+            const affectedWallets = secondaryWallets.filter(({ connector }) => connector.key === affectedConnector.key);
+            for (const wallet of affectedWallets) {
+                if (wallet.connector.key === 'argentx')
+                    refreshConnectedWallet(wallet.id, wallet.connector);
+            }
         }
-        computeConnectedStateForWallets();
     });
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
@@ -146,7 +149,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         if (!linkedSecondaryWallet) {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
             if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnector(primaryWallet.connector);
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
             }
             return;
         }
@@ -158,7 +161,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         setMultiWalletWidgetState,
         primaryWallet,
         secondaryWallets,
-        setSelectedWalletConnector,
+        setSelectedWalletConnectorKey,
         setSelectedWalletWithAction,
         setPrimaryWalletId,
     ]);

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

@@ -2,8 +2,8 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { AuthModeType, MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
+import { IDynamicContext } from '../../../context/DynamicContext/types';
 export type UseWalletEventListenersArgs = {
-    computeConnectedStateForWallets(): Promise<void>;
     handleLogOut(): Promise<void>;
     multiWallet: boolean;
     multiWalletWidgetState: MultiWalletWidgetState;
@@ -13,13 +13,13 @@ export type UseWalletEventListenersArgs = {
     selectedWalletWithAction: WalletWithAction | null;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setPrimaryWalletId(walletId: string): void;
-    setSelectedWalletConnector(connector: WalletConnector | null): void;
+    setSelectedWalletConnectorKey: IDynamicContext['setSelectedWalletConnectorKey'];
     setSelectedWalletWithAction(walletWithAction: WalletWithAction | null): void;
     user: UserProfile | undefined;
     authMode: AuthModeType;
     refreshConnectedWallet: (walletId: string, walletConnector: WalletConnector, shouldCallCallback?: boolean) => Promise<void>;
 };
-export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => {
+export declare const useWalletEventListeners: ({ handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
     network: string | number | undefined;
     setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;