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

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

@@ -19,6 +19,8 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
+require('@dynamic-labs/multi-wallet');
+var getWalletIdentifier = require('../../functions/getWalletIdentifier/getWalletIdentifier.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
 var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var updateUserWalletsFromLinkedWallets = require('./utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.cjs');
@@ -65,12 +67,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         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 wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier.getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = UserWalletsContext.useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     React.useEffect(() => {
-        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+        setUserWallets((userWallets) => didConnectedStateLoad
+            ? updateUserWalletsFromLinkedWallets.updateUserWalletsFromLinkedWallets(userWallets, wallets)
+            : userWallets);
+    }, [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)

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

@@ -15,6 +15,8 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
 import { useWalletsConnectionState } from '../useWalletsConnectionState/useWalletsConnectionState.js';
+import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { reconnectSocialWallet } from './reconnectSocialWallet.js';
 import { createLinkedWalletsFromWalletOptions } from './utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js';
 import { updateUserWalletsFromLinkedWallets } from './utils/updateUserWalletsFromLinkedWallets/updateUserWalletsFromLinkedWallets.js';
@@ -61,12 +63,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConn
         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 wallets = useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[getWalletIdentifier(wallet)]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
     const { setUserWallets } = useInternalUserWallets();
     // Keep userWallets in sync whenever linkedWallets changes
     useEffect(() => {
-        setUserWallets((userWallets) => updateUserWalletsFromLinkedWallets(userWallets, wallets));
-    }, [setUserWallets, wallets]);
+        setUserWallets((userWallets) => didConnectedStateLoad
+            ? updateUserWalletsFromLinkedWallets(userWallets, wallets)
+            : userWallets);
+    }, [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)

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

@@ -16,15 +16,18 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('@dynamic-labs/utils');
 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;
+    // When setting to empty, unset load flag
+    if (Object.values(connectedWalletsMap).length === 0) {
+        if (state.didLoad === false)
+            return state;
+        return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: false });
     }
     return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: true });
 };
@@ -33,13 +36,13 @@ const useWalletsConnectionState = (wallets) => {
         connectedWalletsMap: {},
         didLoad: false,
     });
-    const refreshKey = wallets.map(({ id }) => id).join('-');
     const connectors = wallets.map(({ connector }) => connector);
     const lastCallTimestamp = React.useRef(0);
     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);
+            connectedWalletsMap[getWalletIdentifier.getWalletIdentifier(wallet)] =
+                yield isWalletConnected.isWalletConnected(wallet);
         })));
         setState(connectedWalletsMap);
     }), [wallets]);
@@ -60,6 +63,7 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
     useWalletConnectorEvent.useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+    const refreshKey = wallets.map(getWalletIdentifier.getWalletIdentifier).join('-');
     React.useEffect(() => {
         computeConnectedStateForWallets();
     }, 

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

@@ -12,15 +12,18 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
-import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
 import '@dynamic-labs/multi-wallet';
+import { getWalletIdentifier } from '../../functions/getWalletIdentifier/getWalletIdentifier.js';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
 import { useEventListener } from '../useEventListener/useEventListener.js';
+import { useWalletConnectorEvent } from '../useWalletConnectorEvent/useWalletConnectorEvent.js';
 
 const connectedWalletStateReducer = (state, connectedWalletsMap) => {
-    const isConnectedWalletsMapEmpty = Object.values(connectedWalletsMap).length === 0;
-    if (isConnectedWalletsMapEmpty && state.didLoad === false) {
-        return state;
+    // When setting to empty, unset load flag
+    if (Object.values(connectedWalletsMap).length === 0) {
+        if (state.didLoad === false)
+            return state;
+        return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: false });
     }
     return Object.assign(Object.assign({}, state), { connectedWalletsMap, didLoad: true });
 };
@@ -29,13 +32,13 @@ const useWalletsConnectionState = (wallets) => {
         connectedWalletsMap: {},
         didLoad: false,
     });
-    const refreshKey = wallets.map(({ id }) => id).join('-');
     const connectors = wallets.map(({ connector }) => connector);
     const lastCallTimestamp = useRef(0);
     const computeConnectedStateForWallets = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         const connectedWalletsMap = {};
         yield Promise.all(wallets.map((wallet) => __awaiter(void 0, void 0, void 0, function* () {
-            connectedWalletsMap[wallet.id] = yield isWalletConnected(wallet);
+            connectedWalletsMap[getWalletIdentifier(wallet)] =
+                yield isWalletConnected(wallet);
         })));
         setState(connectedWalletsMap);
     }), [wallets]);
@@ -56,6 +59,7 @@ const useWalletsConnectionState = (wallets) => {
     useWalletConnectorEvent(connectors, 'accountChange', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'disconnect', handleOnEventUpdate);
     useWalletConnectorEvent(connectors, 'chainChange', handleOnEventUpdate);
+    const refreshKey = wallets.map(getWalletIdentifier).join('-');
     useEffect(() => {
         computeConnectedStateForWallets();
     }, 

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.cjs

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

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.js

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

package/src/lib/views/LoginView/useLoginView.cjs

@@ -7,9 +7,9 @@ var reactI18next = require('react-i18next');
 var sdkApi = require('@dynamic-labs/sdk-api');
 var useInternalDynamicContext = require('../../context/DynamicContext/useInternalDynamicContext.cjs');
 var SocialRedirectContext = require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 var logger = 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/views/LoginView/useLoginView.js

@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next';
 import { SdkViewSectionType, SdkViewType } from '@dynamic-labs/sdk-api';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
 import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import { logger } from '../../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/views/Passkey/PasskeyIntroView/PasskeyIntroView.cjs

@@ -25,6 +25,7 @@ require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 require('@dynamic-labs/sdk-api');
+var isPasskeyEnabled = require('../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
@@ -71,7 +72,6 @@ require('../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
-var isPasskeyEnabled = require('../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.cjs');
 var PasskeyDeviceIcon = require('../PasskeyDeviceIcon/PasskeyDeviceIcon.cjs');
 
 const PasskeyIntroView = () => {

package/src/lib/views/Passkey/PasskeyIntroView/PasskeyIntroView.js

@@ -21,6 +21,7 @@ import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import '@dynamic-labs/sdk-api';
+import { isPasskeyEnabled } from '../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../config/ApiEndpoint.js';
@@ -67,7 +68,6 @@ import '../../../components/MenuList/Dropdown/Dropdown.js';
 import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
-import { isPasskeyEnabled } from '../../../utils/functions/isPasskeyEnabled/isPasskeyEnabled.js';
 import { PasskeyDeviceIcon } from '../PasskeyDeviceIcon/PasskeyDeviceIcon.js';
 
 const PasskeyIntroView = () => {

package/src/lib/views/Passkey/PasskeyRecovery/BundleValidation/PasskeyBundleRecovery.cjs

@@ -22,9 +22,9 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../../shared/consts/index.cjs');
+var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 var isAccountAbstractionWallet = require('../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.cjs');
-var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../config/ApiEndpoint.cjs');

package/src/lib/views/Passkey/PasskeyRecovery/BundleValidation/PasskeyBundleRecovery.js

@@ -18,9 +18,9 @@ import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../shared/consts/index.js';
+import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import '@dynamic-labs/multi-wallet';
 import { isAccountAbstractionWallet } from '../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.js';
-import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../config/ApiEndpoint.js';

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.cjs

@@ -21,11 +21,11 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../../shared/consts/index.cjs');
+var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
 var createUserProfile = require('../../../../utils/functions/createUserProfile/createUserProfile.cjs');
 require('@dynamic-labs/multi-wallet');
-var index = require('../../../../utils/functions/storeAuthToken/index.cjs');
 var isAccountAbstractionWallet = require('../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.cjs');
-var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
+var index = require('../../../../utils/functions/storeAuthToken/index.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../config/ApiEndpoint.cjs');

package/src/lib/views/Passkey/PasskeyRecovery/CompleteRecovery/PasskeyCompleteRecovery.js

@@ -17,11 +17,11 @@ import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../shared/consts/index.js';
+import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import { createUserProfile } from '../../../../utils/functions/createUserProfile/createUserProfile.js';
 import '@dynamic-labs/multi-wallet';
-import { storeAuthToken } from '../../../../utils/functions/storeAuthToken/index.js';
 import { isAccountAbstractionWallet } from '../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.js';
-import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
+import { storeAuthToken } from '../../../../utils/functions/storeAuthToken/index.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../config/ApiEndpoint.js';

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.cjs

@@ -22,9 +22,9 @@ require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../../shared/consts/index.cjs');
+var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 var isAccountAbstractionWallet = require('../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.cjs');
-var createOwnerWallet = require('../../../../utils/functions/createOwnerWallet/createOwnerWallet.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../config/ApiEndpoint.cjs');

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.js

@@ -18,9 +18,9 @@ import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../../shared/consts/index.js';
+import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import '@dynamic-labs/multi-wallet';
 import { isAccountAbstractionWallet } from '../../../../utils/functions/isAccountAbstractionWallet/isAccountAbstractionWallet.js';
-import { createOwnerWallet } from '../../../../utils/functions/createOwnerWallet/createOwnerWallet.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../config/ApiEndpoint.js';

package/src/lib/views/QrCodeView/QrCodeView.cjs

@@ -7,10 +7,10 @@ var walletBook = require('@dynamic-labs/wallet-book');
 var ThemeContext = require('../../context/ThemeContext/ThemeContext.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useInternalDynamicContext.cjs');
 var QrCodeContext = require('../../context/QrCodeContext/QrCodeContext.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('../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('../../utils/constants/colors.cjs');

package/src/lib/views/QrCodeView/QrCodeView.js

@@ -3,10 +3,10 @@ import { useWalletBookContext, WalletIcon, getWalletPrimaryColor } from '@dynami
 import { useThemeContext } from '../../context/ThemeContext/ThemeContext.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
 import { useQrCodeContext } from '../../context/QrCodeContext/QrCodeContext.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 '../../context/ViewContext/ViewContext.js';
 import 'react';
 import '../../utils/constants/colors.js';