@dynamic-labs/sdk-react-core 2.2.2 → 2.2.4

package/src/lib/utils/hooks/events/useDynamicEvents/useDynamicEvents.d.ts

@@ -2,7 +2,7 @@ import { DynamicEvents } from '../../../../events';
 import { EventArgs } from '../types';
 type DynamicEventListener<E extends keyof DynamicEvents> = (...args: EventArgs<DynamicEvents, E>) => void;
 /** Allows us to subscribe to all dynamicEvents with a hook, even the internal ones */
-export declare const useInternalDynamicEvents: <E extends keyof import("../../../../events/auth").AuthEvents | keyof import("../../../../events/ui").UIEvents | keyof import("../../../../events/otp").OTPEvents | keyof import("../../../../events/wallets").WalletEvents | keyof import("../../../../events/passkey").PasskeyEvents | "farcasterConnectCancelled" | keyof import("../../../../events/embeddedWallet").EmbeddedWalletEvents>(event: E, listener: DynamicEventListener<E>) => void;
+export declare const useInternalDynamicEvents: <E extends keyof import("../../../../events/auth").AuthEvents | keyof import("../../../../events/ui").UIEvents | keyof import("../../../../events/otp").OTPEvents | keyof import("../../../../events/wallets").WalletEvents | keyof import("../../../../events/passkey").PasskeyEvents | "farcasterConnectCancelled" | keyof import("../../../../events/embeddedWallet").EmbeddedWalletEvents | "triggerComputePrimaryWalletMultiWalletStateFromAccounts">(event: E, listener: DynamicEventListener<E>) => void;
 /** Allows subscribing to dynamic events directly inside components with a hook */
 export declare const useDynamicEvents: <E extends "logout" | "emailVerificationResult" | "walletAdded" | "embeddedWalletCreated">(event: E, listener: DynamicEventListener<E>) => void;
 export {};

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -3,6 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -17,8 +18,7 @@ require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
-require('../../../../events/dynamicEvents.cjs');
-require('../../../../../../_virtual/_tslib.cjs');
+var useDynamicEvents = require('../../events/useDynamicEvents/useDynamicEvents.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -32,6 +32,7 @@ require('viem');
 require('viem/chains');
 require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
+require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -82,29 +83,54 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign.useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = React.useRef(false);
+    const runConnectAndSign = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        logger.logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     React.useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication.requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 exports.useVerifyOnAwaitingSignature = useVerifyOnAwaitingSignature;

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -1,5 +1,6 @@
 'use client'
-import { useEffect } from 'react';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { useRef, useCallback, useEffect } from 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../../shared/logger.js';
@@ -13,8 +14,7 @@ import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
-import '../../../../events/dynamicEvents.js';
-import '../../../../../../_virtual/_tslib.js';
+import { useInternalDynamicEvents } from '../../events/useDynamicEvents/useDynamicEvents.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -28,6 +28,7 @@ import 'viem';
 import 'viem/chains';
 import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
+import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -78,29 +79,54 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useVerifyOnAwaitingSignature = () => {
     const { awaitingSignatureState, multiWalletWidgetState, setMultiWalletWidgetState, legacyIsVerifying, setLegacyIsVerifying, selectedWalletConnector, } = useInternalDynamicContext();
     const triggerConnectAndSign = useConnectAndSign();
+    // this is to prevent calling runConnectAndSign multiple times
+    // due to changes in legacyIsVerifying
+    const isVerifying = useRef(false);
+    const runConnectAndSign = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('runConnectAndSign', {
+            selectedWalletConnector,
+        });
+        if (!selectedWalletConnector) {
+            return;
+        }
+        isVerifying.current = true;
+        setLegacyIsVerifying(true);
+        try {
+            yield triggerConnectAndSign({
+                walletConnector: selectedWalletConnector,
+            });
+        }
+        catch (e) {
+            logger.error(e);
+        }
+        setMultiWalletWidgetState('idle');
+        setLegacyIsVerifying(false);
+        isVerifying.current = false;
+    }), [
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
+        setMultiWalletWidgetState,
+        triggerConnectAndSign,
+    ]);
     useEffect(() => {
         if (!legacyIsVerifying &&
+            !isVerifying.current &&
             multiWalletWidgetState === 'awaiting_signature' &&
             selectedWalletConnector &&
             awaitingSignatureState === 'linking_new_wallet' &&
             !requiresTwoStepAuthentication(selectedWalletConnector)) {
-            setLegacyIsVerifying(true);
-            triggerConnectAndSign({ walletConnector: selectedWalletConnector })
-                .catch((e) => {
-                logger.error(e);
-            })
-                .finally(() => {
-                setMultiWalletWidgetState('idle');
-                setLegacyIsVerifying(false);
-            });
+            runConnectAndSign();
         }
     }, [
+        runConnectAndSign,
         awaitingSignatureState,
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        legacyIsVerifying,
         multiWalletWidgetState,
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
+        setLegacyIsVerifying,
         setMultiWalletWidgetState,
-        legacyIsVerifying,
     ]);
+    useInternalDynamicEvents('triggerConnectAndSign', runConnectAndSign);
 };
 
 export { useVerifyOnAwaitingSignature };

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

@@ -46,6 +46,9 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             return;
         yield wallets.unlinkWallet({
             environmentId,
+            onSuccess: () => {
+                removedWalletsIds.current.push(walletId);
+            },
             primaryWalletId: currentPrimaryWalletId,
             walletId,
         });
@@ -55,7 +58,6 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         if (numberOfLinkedWallets === 1) {
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
-        removedWalletsIds.current.push(walletId);
     }), [
         primaryWalletId,
         environmentId,

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

@@ -42,6 +42,9 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
             return;
         yield unlinkWallet({
             environmentId,
+            onSuccess: () => {
+                removedWalletsIds.current.push(walletId);
+            },
             primaryWalletId: currentPrimaryWalletId,
             walletId,
         });
@@ -51,7 +54,6 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         if (numberOfLinkedWallets === 1) {
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
-        removedWalletsIds.current.push(walletId);
     }), [
         primaryWalletId,
         environmentId,

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

@@ -26,7 +26,7 @@ require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var user = require('../../../data/api/user/user.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../events/dynamicEvents.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -79,7 +79,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useMergeUserAccounts = () => {
-    const { environmentId, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     const mergeUserAccounts = (mergeConflictResolutions) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const user$1 = yield user.verifyMergeUsers(environmentId, mergeConflictResolutions);
@@ -87,6 +87,10 @@ const useMergeUserAccounts = () => {
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
+        const accounts = yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.getConnectedAccounts());
+        if (accounts === null || accounts === void 0 ? void 0 : accounts.length) {
+            dynamicEvents.dynamicEvents.emit('triggerComputePrimaryWalletMultiWalletStateFromAccounts', { accounts });
+        }
         setShowAuthFlow(false);
     });
     return {

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

@@ -22,7 +22,7 @@ import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { verifyMergeUsers } from '../../../data/api/user/user.js';
 import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../events/dynamicEvents.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -75,7 +75,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useMergeUserAccounts = () => {
-    const { environmentId, setShowAuthFlow } = useInternalDynamicContext();
+    const { environmentId, setShowAuthFlow, selectedWalletConnector } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const mergeUserAccounts = (mergeConflictResolutions) => __awaiter(void 0, void 0, void 0, function* () {
         const user = yield verifyMergeUsers(environmentId, mergeConflictResolutions);
@@ -83,6 +83,10 @@ const useMergeUserAccounts = () => {
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
+        const accounts = yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.getConnectedAccounts());
+        if (accounts === null || accounts === void 0 ? void 0 : accounts.length) {
+            dynamicEvents.emit('triggerComputePrimaryWalletMultiWalletStateFromAccounts', { accounts });
+        }
         setShowAuthFlow(false);
     });
     return {

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

@@ -82,14 +82,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        // we don't want to set the user wallets until their connected states have been computed
-        // but that doesn't matter if the wallets list is empty, and if we return early when
-        // the wallets list is empty, we'll never set the user wallets correctly after logout
-        if (!didConnectedStateLoad.current && wallets.length)
-            return;
         logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [didConnectedStateLoad, setUserWallets, wallets]);
+    }, [setUserWallets, wallets]);
     const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
     const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)

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

@@ -78,14 +78,9 @@ const useWalletConnectors = ({ authMode, connectedWallets, walletConnectorOption
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        // we don't want to set the user wallets until their connected states have been computed
-        // but that doesn't matter if the wallets list is empty, and if we return early when
-        // the wallets list is empty, we'll never set the user wallets correctly after logout
-        if (!didConnectedStateLoad.current && wallets.length)
-            return;
         logVerboseTroubleshootingMessage('[useWalletConnectors] will call setUserWallets', wallets);
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [didConnectedStateLoad, setUserWallets, wallets]);
+    }, [setUserWallets, wallets]);
     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)

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

@@ -17,8 +17,17 @@ require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../locale/locale.cjs');
+var logVerboseTroubleshootingMessage = require('../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.cjs');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
@@ -32,9 +41,46 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
-    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
-        logger.logger.debug('primary wallet account change', {
+    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
+        logger.logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
+            isPrimaryWallet,
+            newAddress,
+        });
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        logVerboseTroubleshootingMessage.logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
+        // 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) {
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            }
+            return;
+        }
+        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.dynamicEvents.emit('triggerConnectAndSign');
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const calculatePrimaryWalletMultiWalletStateFromAccounts = React.useCallback(({ accounts }) => {
+        logger.logger.debug('calculatePrimaryWalletMultiWalletStateFromAccounts', {
             accounts,
+            authMode,
+            multiWallet,
+            multiWalletWidgetState,
+            primaryWallet,
         });
         // change the api here
         if (!primaryWallet)
@@ -74,6 +120,26 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+    }, [
+        authMode,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        multiWallet,
+        multiWalletWidgetState,
+        primaryWallet,
+        refreshConnectedWallet,
+        secondaryWallets,
+        setMultiWalletWidgetState,
+        setPrimaryWalletId,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        user,
+    ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
+        logger.logger.debug('primary wallet account change', {
+            accounts,
+        });
+        calculatePrimaryWalletMultiWalletStateFromAccounts({ accounts });
     });
     const uniqueNonPrimaryWallets = React.useMemo(() => {
         const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
@@ -117,28 +183,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
         }
     });
-    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) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-            }
-            return;
-        }
-        // ...otherwise, the user is switching primary accounts betweeen the same wallet
-        setSelectedWalletWithAction(null);
-        setPrimaryWalletId(linkedSecondaryWallet.id);
-        setMultiWalletWidgetState('idle');
-    }, [
-        setMultiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
-        setPrimaryWalletId,
-    ]);
 };
 
 exports.useWalletEventListeners = useWalletEventListeners;

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useMemo, useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
@@ -13,8 +13,17 @@ import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
+import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../locale/locale.js';
+import { logVerboseTroubleshootingMessage } from '../../functions/logVerboseTroubleshootingMessage/logVerboseTroubleshootingMessage.js';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
     useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'disconnect', () => {
@@ -28,9 +37,46 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
-    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
-        logger.debug('primary wallet account change', {
+    const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
+        logger.debug('handleAccountChangeWhenAwaitingAccountSwitch', {
+            isPrimaryWallet,
+            newAddress,
+        });
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        logVerboseTroubleshootingMessage('[handleAccountChangeWhenAwaitingAccountSwitch]', { linkedSecondaryWallet });
+        // 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) {
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            }
+            return;
+        }
+        const isTryingToUpdateUnkownWallet = linkedSecondaryWallet.connector.key === 'unknown';
+        if (isTryingToUpdateUnkownWallet) {
+            //prompt the user to connect and sign with the wallet
+            dynamicEvents.emit('triggerConnectAndSign');
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const calculatePrimaryWalletMultiWalletStateFromAccounts = useCallback(({ accounts }) => {
+        logger.debug('calculatePrimaryWalletMultiWalletStateFromAccounts', {
             accounts,
+            authMode,
+            multiWallet,
+            multiWalletWidgetState,
+            primaryWallet,
         });
         // change the api here
         if (!primaryWallet)
@@ -70,6 +116,26 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+    }, [
+        authMode,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        multiWallet,
+        multiWalletWidgetState,
+        primaryWallet,
+        refreshConnectedWallet,
+        secondaryWallets,
+        setMultiWalletWidgetState,
+        setPrimaryWalletId,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        user,
+    ]);
+    useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
+        logger.debug('primary wallet account change', {
+            accounts,
+        });
+        calculatePrimaryWalletMultiWalletStateFromAccounts({ accounts });
     });
     const uniqueNonPrimaryWallets = useMemo(() => {
         const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
@@ -113,28 +179,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
         }
     });
-    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...
-        if (!linkedSecondaryWallet) {
-            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-            }
-            return;
-        }
-        // ...otherwise, the user is switching primary accounts betweeen the same wallet
-        setSelectedWalletWithAction(null);
-        setPrimaryWalletId(linkedSecondaryWallet.id);
-        setMultiWalletWidgetState('idle');
-    }, [
-        setMultiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
-        setPrimaryWalletId,
-    ]);
 };
 
 export { useWalletEventListeners };