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

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -25,8 +25,6 @@ require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var index = require('../../../functions/storeAuthToken/index.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var useEmailVerificationRequest = require('../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
@@ -56,14 +54,13 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = EmailVerificationContext.useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest.useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     return React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -75,25 +72,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired.isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            index.storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -104,8 +82,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -21,8 +21,6 @@ import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { storeAuthToken } from '../../../functions/storeAuthToken/index.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useEmailVerificationRequest } from '../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
@@ -52,14 +50,13 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { authToken, onboardingOnlyJwt, environmentId, projectSettings, primaryWallet, } = useInternalDynamicContext();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
+    const { authToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || authToken;
     const { setVerificationUUID, setEmail } = useEmailVerificationContext();
     const { verifyEmail } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     return useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
         const { metadata } = userFields;
@@ -71,25 +68,6 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];
         const _isEmailVerificationRequired = isEmailVerificationRequired(updateUserProfileResponse);
-        // This is to handle properly the embedded wallet creation.
-        // In that case we shouldn't create a user. Only store the JWT in the localstorage
-        // The user will be created after generating the wallet.
-        // This should be called only when:
-        // Turnkey is enabled
-        // automaticEmbeddedWalletCreation is set to true
-        // there is no emailVerificationRequired -> it's already verified
-        // there is no primaryWallet -> it means that the user is already logged in
-        if (isTurnkeyProviderEnabled &&
-            ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) &&
-            !_isEmailVerificationRequired &&
-            !primaryWallet) {
-            storeAuthToken(updateUserProfileResponse.jwt);
-            return {
-                isEmailVerificationRequired: false,
-                missingFields,
-                updateUserProfileResponse,
-            };
-        }
         if (!_isEmailVerificationRequired) {
             // If email verification is not needed then we can update the user profile immediately.
             yield updateUserProfileByJWT(updateUserProfileResponse.jwt);
@@ -100,8 +78,8 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             };
         }
         // We update EmailContext to use this information in the Email Verification view
-        setEmail((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.email);
-        setVerificationUUID((_d = updateUserProfileResponse.emailVerification) === null || _d === void 0 ? void 0 : _d.verificationUUID);
+        setEmail((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.email);
+        setVerificationUUID((_c = updateUserProfileResponse.emailVerification) === null || _c === void 0 ? void 0 : _c.verificationUUID);
         // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
         // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
         // setEmail and setVerificationUUID in the above lines will are not visible in this promise.

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/EmailVerification/EmailVerification.cjs

@@ -27,8 +27,6 @@ var useEffectOnce = require('../../shared/utils/hooks/useEffectOnce/useEffectOnc
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var isTurnkeyEnabled = require('../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-var index = require('../../utils/functions/storeAuthToken/index.cjs');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var AccountExistsContext = require('../../context/AccountExistsContext/AccountExistsContext.cjs');
 var api = require('../../data/api.cjs');
@@ -102,7 +100,6 @@ const EmailVerification = () => {
     const { loading, setLoading } = LoadingContext.useLoadingContext();
     const { t } = reactI18next.useTranslation();
     const { createEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
     const { remainingSeconds, startCountdown } = useCountdown.useCountdown({
         callback: () => setRetried(false),
         seconds: SECONDS_TO_RETRY,
@@ -135,7 +132,7 @@ const EmailVerification = () => {
             return;
         }
         try {
-            const { nextView, jwt } = yield verifyEmail(verificationToken, verificationUUID);
+            const { nextView } = yield verifyEmail(verificationToken, verificationUUID);
             if (onboardingOnlyJwt) {
                 setOnboardingOnlyJwt(undefined);
                 setCallback('authSuccess');
@@ -144,20 +141,18 @@ const EmailVerification = () => {
             if (nextView === 'verified-and-transferred') {
                 setShowTransferMessage(true);
             }
-            if (isTurnkeyProviderEnabled &&
-                ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
-                try {
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    setShowAuthFlow(false);
-                }
+            if (!((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             logger.logger.debug(error);
@@ -185,8 +180,8 @@ const EmailVerification = () => {
         (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setShowAuthFlow,
+        setErrorMessage,
         setView,
-        isTurnkeyProviderEnabled,
     ]);
     const handleEmailLogin = React.useCallback((verificationToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _d;
@@ -219,24 +214,19 @@ const EmailVerification = () => {
             setCallback('authSuccess');
             // this timeout is set to make sure that the user will see success message
             yield sleepToShowSuccessMessage();
-            if (isTurnkeyProviderEnabled &&
-                ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
-                try {
-                    // Store the auth token in local storage so it can be used during embedded wallet creation
-                    index.storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            // If not creating embedded wallet automatically, create user profile
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             if (error instanceof utils.NoAccessError) {
@@ -268,7 +258,6 @@ const EmailVerification = () => {
         setShowAuthFlow,
         setErrorMessage,
         setExistentAccountData,
-        isTurnkeyProviderEnabled,
     ]);
     const handleRetry = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -23,8 +23,6 @@ import { useEffectOnce } from '../../shared/utils/hooks/useEffectOnce/useEffectO
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { isTurnkeyEnabled } from '../../utils/functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import { storeAuthToken } from '../../utils/functions/storeAuthToken/index.js';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useAccountExistsContext } from '../../context/AccountExistsContext/AccountExistsContext.js';
 import { signInWithEmailVerification, retryEmailVerification } from '../../data/api.js';
@@ -98,7 +96,6 @@ const EmailVerification = () => {
     const { loading, setLoading } = useLoadingContext();
     const { t } = useTranslation();
     const { createEmbeddedWallet } = useEmbeddedWallet();
-    const isTurnkeyProviderEnabled = isTurnkeyEnabled(projectSettings);
     const { remainingSeconds, startCountdown } = useCountdown({
         callback: () => setRetried(false),
         seconds: SECONDS_TO_RETRY,
@@ -131,7 +128,7 @@ const EmailVerification = () => {
             return;
         }
         try {
-            const { nextView, jwt } = yield verifyEmail(verificationToken, verificationUUID);
+            const { nextView } = yield verifyEmail(verificationToken, verificationUUID);
             if (onboardingOnlyJwt) {
                 setOnboardingOnlyJwt(undefined);
                 setCallback('authSuccess');
@@ -140,20 +137,18 @@ const EmailVerification = () => {
             if (nextView === 'verified-and-transferred') {
                 setShowTransferMessage(true);
             }
-            if (isTurnkeyProviderEnabled &&
-                ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
-                try {
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    setShowAuthFlow(false);
-                }
+            if (!((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             logger.debug(error);
@@ -181,8 +176,8 @@ const EmailVerification = () => {
         (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.automaticEmbeddedWalletCreation,
         createEmbeddedWallet,
         setShowAuthFlow,
+        setErrorMessage,
         setView,
-        isTurnkeyProviderEnabled,
     ]);
     const handleEmailLogin = useCallback((verificationToken) => __awaiter(void 0, void 0, void 0, function* () {
         var _d;
@@ -215,24 +210,19 @@ const EmailVerification = () => {
             setCallback('authSuccess');
             // this timeout is set to make sure that the user will see success message
             yield sleepToShowSuccessMessage();
-            if (isTurnkeyProviderEnabled &&
-                ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
-                try {
-                    // Store the auth token in local storage so it can be used during embedded wallet creation
-                    storeAuthToken(jwt);
-                    // this function will check turnkey wallet enabled and create wallet if needed
-                    // if not enabled, it will throw an error.
-                    yield createEmbeddedWallet();
-                }
-                catch (e) {
-                    yield createUserProfileByJWT(jwt);
-                    setShowAuthFlow(false);
-                }
+            yield createUserProfileByJWT(jwt);
+            if (!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.automaticEmbeddedWalletCreation)) {
+                setShowAuthFlow(false);
                 return;
             }
-            // If not creating embedded wallet automatically, create user profile
-            yield createUserProfileByJWT(jwt);
-            setShowAuthFlow(false);
+            try {
+                // this function will check turnkey wallet enabled and create wallet if needed
+                // if not enabled, it will throw an error.
+                yield createEmbeddedWallet();
+            }
+            catch (e) {
+                setShowAuthFlow(false);
+            }
         }
         catch (error) {
             if (error instanceof NoAccessError) {
@@ -264,7 +254,6 @@ const EmailVerification = () => {
         setShowAuthFlow,
         setErrorMessage,
         setExistentAccountData,
-        isTurnkeyProviderEnabled,
     ]);
     const handleRetry = () => __awaiter(void 0, void 0, void 0, function* () {
         try {