@dynamic-labs/sdk-react-core 1.0.5 → 1.0.7

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

@@ -1,12 +1,14 @@
 import { Dispatch, SetStateAction } from 'react';
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
-import { UserProfile, Wallet } from '../../../shared';
+import { DynamicEventsCallbacks, UserProfile, Wallet } from '../../../shared';
 type UseHandleUnlinkProps = {
     environmentId: string;
     primaryWalletId: string | undefined;
     secondaryWallets: Wallet[];
     setUser: Dispatch<SetStateAction<UserProfile | undefined>>;
     verifiedCredentials: JwtVerifiedCredential[];
+    eventsCallbacks: DynamicEventsCallbacks | undefined;
+    user: UserProfile | undefined;
 };
-export declare const useHandleUnlinkWallet: ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, }: UseHandleUnlinkProps) => (walletId: string) => Promise<void>;
+export declare const useHandleUnlinkWallet: ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, user, eventsCallbacks, }: UseHandleUnlinkProps) => (walletId: string) => Promise<void>;
 export {};

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

@@ -16,7 +16,7 @@ import '../../../shared/consts/index.js';
 import { handleUnlinkHelper } from '../../functions/handleUnlinkHelper/handleUnlinkHelper.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 
-const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, }) => {
+const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWalletId, secondaryWallets, setUser, user, eventsCallbacks, }) => {
     const callback = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         // when we call handleUnlinkWallet on the same execution stack as setPrimaryWallet, the value of
@@ -31,6 +31,7 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         const currentPrimaryWalletId = (_a = LocalStorage.getFromLS(PRIMARY_WALLET_ID)) !== null && _a !== void 0 ? _a : primaryWalletId;
         if (walletId === currentPrimaryWalletId)
             return;
+        const vcWalletFromId = user === null || user === void 0 ? void 0 : user.verifiedCredentials.find((wallet) => wallet.id === walletId);
         const newUser = yield handleUnlinkHelper({
             environmentId,
             primaryWalletId: currentPrimaryWalletId,
@@ -46,12 +47,17 @@ const useHandleUnlinkWallet = ({ verifiedCredentials, environmentId, primaryWall
         if (numberOfLinkedWallets === 1) {
             yield (wallet === null || wallet === void 0 ? void 0 : wallet.connector.endSession());
         }
+        if (vcWalletFromId && (eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onUnlinkSuccess)) {
+            eventsCallbacks.onUnlinkSuccess(vcWalletFromId);
+        }
     }), [
         primaryWalletId,
         environmentId,
         secondaryWallets,
         setUser,
         verifiedCredentials,
+        eventsCallbacks,
+        user,
     ]);
     return callback;
 };

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

@@ -5,10 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var useOnlyConnectedMode = require('../useOnlyConnectedMode/useOnlyConnectedMode.cjs');
 var getUserProfileFields = require('../../functions/getUserProfileFields/getUserProfileFields.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');

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

@@ -1,10 +1,10 @@
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useOnlyConnectedMode } from '../useOnlyConnectedMode/useOnlyConnectedMode.js';
 import { getUserProfileFields } from '../../functions/getUserProfileFields/getUserProfileFields.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -7,10 +7,10 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var constants = require('../../../views/Passkey/PasskeyRecovery/constants.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');

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

@@ -3,10 +3,10 @@ import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { iframeContainerId } from '../../../views/Passkey/PasskeyRecovery/constants.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';

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

@@ -8,10 +8,10 @@ var types = require('@dynamic-labs/types');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../data/api.cjs');
 var useUpdateUserProfileByJWTCallback = require('../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');

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

@@ -4,10 +4,10 @@ import { SocialOAuthErrorCode } from '@dynamic-labs/types';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { unlinkOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';

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

@@ -10,11 +10,11 @@ var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var api = require('../../../data/api.cjs');
 var useUpdateUserProfileByJWTCallback = require('../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var digestSHA256 = require('../../functions/digestSHA256/digestSHA256.cjs');
 var encodeBase64URL = require('../../functions/encodeBase64URL/encodeBase64URL.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var logger = require('../../../shared/logger.cjs');

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

@@ -6,11 +6,11 @@ import { isMobile, SocialAccountAlreadyExistsError, NoAccessError } from '@dynam
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { getOAuthResult, verifyOAuth, signInOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import '@dynamic-labs/wallet-connector-core';
 import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
 import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { logger } from '../../../shared/logger.js';

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

@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, setMultiWalletWidgetState, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -179,6 +179,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             index.storeAuthToken(Jwt);
             setOnboardingOnlyJwt(undefined);
+            setMultiWalletWidgetState('idle');
             setUser(user); // The user should only be set if no KYC is needed.
             setShowAuthFlow(false);
             /* istanbul ignore else */

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

@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, primaryWallet, setMultiWalletWidgetState, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -175,6 +175,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             storeAuthToken(Jwt);
             setOnboardingOnlyJwt(undefined);
+            setMultiWalletWidgetState('idle');
             setUser(user); // The user should only be set if no KYC is needed.
             setShowAuthFlow(false);
             /* istanbul ignore else */

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('react');

package/src/lib/utils/hooks/useWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -1,7 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
 import 'react';

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

@@ -17,6 +17,8 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
@@ -64,13 +66,15 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
+        if (!didConnectedStateLoad.current)
+            return;
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+    }, [didConnectedStateLoad, 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)
@@ -169,7 +173,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         setQrcodeUri,
     ]);
     return {
-        didConnectedStateLoad,
+        didConnectedStateLoad: didConnectedStateLoad.current,
         primaryWallet,
         secondaryWallets,
         setPrimaryWallet,

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

@@ -13,6 +13,8 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
@@ -60,13 +62,15 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
     useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
-    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
+    const { connectedWalletsMap, didConnectedStateLoad } = useWalletsConnectionState(walletsBasedOnAuthMode);
+    const wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletsMap[getWalletIdentifier(wallet)]) }))), [connectedWalletsMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
+        if (!didConnectedStateLoad.current)
+            return;
         setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+    }, [didConnectedStateLoad, 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)
@@ -165,7 +169,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         setQrcodeUri,
     ]);
     return {
-        didConnectedStateLoad,
+        didConnectedStateLoad: didConnectedStateLoad.current,
         primaryWallet,
         secondaryWallets,
         setPrimaryWallet,

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

@@ -65,12 +65,13 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
         if (!primaryWallet)
             return;
         const [newAddress] = accounts;
-        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-        if (authMode === 'connect-only') {
+        const changedAddress = !walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
+        if (changedAddress && authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
             return;
         }
-        if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+        const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (!changedAddress) {
             setMultiWalletWidgetState('idle');
         }
         else if (!multiWallet) {

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

@@ -61,12 +61,13 @@ const useWalletEventListeners = ({ handleLogOut, multiWallet, multiWalletWidgetS
         if (!primaryWallet)
             return;
         const [newAddress] = accounts;
-        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-        if (authMode === 'connect-only') {
+        const changedAddress = !isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain);
+        if (changedAddress && authMode === 'connect-only') {
             refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
             return;
         }
-        if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+        const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        if (!changedAddress) {
             setMultiWalletWidgetState('idle');
         }
         else if (!multiWallet) {

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

@@ -8,10 +8,10 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');

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

@@ -4,10 +4,10 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
-var logger = require('../../../shared/logger.cjs');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -15,68 +15,92 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
+var useThrottle = require('../../../shared/utils/hooks/useThrottle/useThrottle.cjs');
 require('../../../shared/consts/index.cjs');
-var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
 var useEventListener = require('../useEventListener/useEventListener.cjs');
+var useWalletConnectorEvent = require('../useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
-const connectedWalletStateReducer = (state, connectedWalletsMap) => {
-    const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;
-    if (isConnectedWalletsMapEmpty && state.didLoad === false) {
-        return state;
-    }
-    return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: true });
-};
+/**
+ * For the given wallet array, this returns an object mapping from each wallet's
+ * identifier to whether its connector recognizes it as currently connected or not.
+ */
+const getConnectedWalletsMap = (wallets) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const newMap = {};
+    yield Promise.all(wallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        newMap[getWalletIdentifier.getWalletIdentifier(wallet)] = yield isWalletConnected.isWalletConnected(wallet);
+    })));
+    return newMap;
+});
 const useWalletsConnectionState = (wallets) => {
-    const [state, setState] = React.useReducer(connectedWalletStateReducer, {
-        connectedWalletsMap: {},
-        didLoad: false,
-    });
-    const refreshKey = wallets.map(({ id }) => id).join('-');
-    const connectors = wallets.map(({ connector }) => connector);
-    const lastCallTimestamp = React.useRef(0);
+    const [connectedWalletsMap, setConnectedWalletsMap] = React.useState({});
+    /**
+     * Whether the connection map has been loaded off of the current wallet array.
+     * Always false for empty wallet arrays.
+     */
+    const didConnectedStateLoad = React.useRef(false);
+    /**
+     * When an accountChanged event is raised, we store the incoming wallet here
+     * until it is finally reflected in the wallets prop.
+     * During this time we do not update the connectedWalletsMap.
+     * This way, we avoid setting the connected state of the primary wallet
+     * to false due to a state transition delay.
+     */
+    const incomingWalletSwitchAddress = React.useRef(undefined);
     const computeConnectedStateForWallets = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const connectedWalletsMap = {};
-        yield Promise.all(wallets.map((wallet) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            connectedWalletsMap[wallet.id] = yield isWalletConnected.isWalletConnected(wallet);
-        })));
-        setState(connectedWalletsMap);
-    }), [wallets]);
-    const handleOnEventUpdate = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!wallets.length)
-            return;
-        const callTimestamp = new Date().getTime();
-        const diffFromLastCall = callTimestamp - lastCallTimestamp.current;
-        lastCallTimestamp.current = callTimestamp;
-        // getConnectedAccounts trigger accountChanged event for Phantom EVM wallets
-        // which causes a loop of calls to this function
-        if (diffFromLastCall < 1000) {
-            logger.logger.warn('computeConnectedStateForWallets: skipping due too many calls.');
+        didConnectedStateLoad.current = false;
+        const newMap = yield getConnectedWalletsMap(wallets);
+        if (Object.values(newMap).length === 0) {
+            setConnectedWalletsMap({});
             return;
         }
-        computeConnectedStateForWallets();
-    }), [computeConnectedStateForWallets, wallets.length]);
-    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
-    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
-    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+        didConnectedStateLoad.current = true;
+        // If there is an incoming account switch and it isn't yet finished,
+        // we don't change the map to avoid setting it to a misleading state
+        if (incomingWalletSwitchAddress.current) {
+            const accountSwitchIsComplete = wallets.some((wallet) => walletConnectorCore.isSameAddress(incomingWalletSwitchAddress.current, wallet.address, wallet.chain));
+            if (accountSwitchIsComplete)
+                incomingWalletSwitchAddress.current = undefined;
+            else
+                return;
+        }
+        setConnectedWalletsMap(newMap);
+    }), [wallets]);
+    /** A string that is unique for each possible value of the wallets prop */
+    const walletsHash = wallets.map(getWalletIdentifier.getWalletIdentifier).join('-');
+    const connectors = wallets.map(({ connector }) => connector);
+    // getConnectedAccounts trigger accountChanged event for Phantom EVM wallets
+    // which causes a loop of calls to this function, so we throttle it
+    const handleEvent = useThrottle.useThrottle(() => {
+        if (walletsHash)
+            computeConnectedStateForWallets();
+    }, 1000);
+    const onAccountChange = ({ accounts }) => {
+        incomingWalletSwitchAddress.current = accounts[0];
+        handleEvent();
+    };
+    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', onAccountChange);
+    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleEvent);
+    useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleEvent);
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, 
     /**
-     * This is using a custom key to force the useEffect to run only when a connector is
-     * added or removed from the connectors list.
+     * This is using a custom key to force the useEffect to run only when the ids of the
+     * wallets change.
      */
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [refreshKey]);
+    [walletsHash]);
     /**
      * This is a workaround to detect when the user switches to another tab/extension
      * and then comes back to the dapp.
      */
     useEventListener.useEventListener('focus', computeConnectedStateForWallets);
     return {
-        connectedWalletMap: state.connectedWalletsMap,
-        didConnectedStateLoad: state.didLoad,
+        connectedWalletsMap,
+        didConnectedStateLoad,
     };
 };
 

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

@@ -1,13 +1,11 @@
+import { MutableRefObject } from 'react';
 import { Wallet } from '../../../shared';
-type ConnectedState = {
-    didLoad: boolean;
-    connectedWalletsMap: {
-        [address: string]: boolean;
-    };
+type ConnectedWalletsMap = {
+    [address: string]: boolean;
 };
 type WalletsConnectionStateHook = (wallets: Wallet[]) => {
-    connectedWalletMap: ConnectedState['connectedWalletsMap'];
-    didConnectedStateLoad: ConnectedState['didLoad'];
+    connectedWalletsMap: ConnectedWalletsMap;
+    didConnectedStateLoad: MutableRefObject<boolean>;
 };
 export declare const useWalletsConnectionState: WalletsConnectionStateHook;
 export {};