@dynamic-labs/sdk-react-core 4.9.2 → 4.9.4

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -57,6 +57,7 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/loadingAndLifecycle.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -53,6 +53,7 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/loadingAndLifecycle.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -57,6 +57,7 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/loadingAndLifecycle.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -53,6 +53,7 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/loadingAndLifecycle.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -51,6 +51,7 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/loadingAndLifecycle.cjs');
+require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -47,6 +47,7 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/loadingAndLifecycle.js';
+import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';

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

@@ -162,23 +162,23 @@ const useEmbeddedWallet = () => {
     const shouldPromptForKeyExport = React.useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
     const embeddedWalletSettingVersion = React.useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
-        const defaultWalletVersion = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion;
         const hasPrimaryWallet = primaryWalletId.getPrimaryWalletId();
-        if (defaultWalletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V3) {
+        if (embeddedWalletSettingVersion() === sdkApiCore.EmbeddedWalletVersionEnum.V3 &&
+            !verifiedUser) {
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
-        // Turnkey specific rules
+        // Turnkey and WAAS specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
-            const embeddedWalletVerifiedCredentialId = (_b = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+            const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
                 primaryEmbeddedChain,
-            ])) === null || _b === void 0 ? void 0 : _b.id;
-            const AAWalletCredentialId = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet)) === null || _d === void 0 ? void 0 : _d.id;
+            ])) === null || _a === void 0 ? void 0 : _a.id;
+            const AAWalletCredentialId = (_c = (_b = verifiedUser.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((vc) => vc.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet)) === null || _c === void 0 ? void 0 : _c.id;
             const targetPrimaryWalletId = AAWalletCredentialId
                 ? AAWalletCredentialId
                 : embeddedWalletVerifiedCredentialId;
@@ -188,7 +188,7 @@ const useEmbeddedWallet = () => {
             }
         }
         if (isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) &&
-            !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;

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

@@ -158,23 +158,23 @@ const useEmbeddedWallet = () => {
     const shouldPromptForKeyExport = useCallback(() => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.promptForKeyExport); }, [projectSettings]);
     const embeddedWalletSettingVersion = useCallback(() => { var _a; return (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion; }, [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings);
-        const defaultWalletVersion = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.defaultWalletVersion;
         const hasPrimaryWallet = getPrimaryWalletId();
-        if (defaultWalletVersion === EmbeddedWalletVersionEnum.V3) {
+        if (embeddedWalletSettingVersion() === EmbeddedWalletVersionEnum.V3 &&
+            !verifiedUser) {
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
-        // Turnkey specific rules
+        // Turnkey and WAAS specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
-            const embeddedWalletVerifiedCredentialId = (_b = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
+            const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
                 primaryEmbeddedChain,
-            ])) === null || _b === void 0 ? void 0 : _b.id;
-            const AAWalletCredentialId = (_d = (_c = verifiedUser.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.find((vc) => vc.walletProvider === WalletProviderEnum.SmartContractWallet)) === null || _d === void 0 ? void 0 : _d.id;
+            ])) === null || _a === void 0 ? void 0 : _a.id;
+            const AAWalletCredentialId = (_c = (_b = verifiedUser.verifiedCredentials) === null || _b === void 0 ? void 0 : _b.find((vc) => vc.walletProvider === WalletProviderEnum.SmartContractWallet)) === null || _c === void 0 ? void 0 : _c.id;
             const targetPrimaryWalletId = AAWalletCredentialId
                 ? AAWalletCredentialId
                 : embeddedWalletVerifiedCredentialId;
@@ -184,7 +184,7 @@ const useEmbeddedWallet = () => {
             }
         }
         if (isTurnkeyEnabled(projectSettings) &&
-            !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.cjs

@@ -8,19 +8,17 @@ var dynamicContextProps = require('../../../../store/state/dynamicContextProps/d
 
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
 const handleStoreAndEnvironmentMismatch = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, }) {
     const storeEnvId = dynamicContextProps.getEnvironmentId();
     if (!storeEnvId || environmentId === storeEnvId) {
-        return true;
+        return;
     }
     yield logout('store and environment are out of sync', {
         currentEnvId: environmentId,
         storedEnvId: storeEnvId,
     });
     dynamicContextProps.setEnvironmentId(environmentId);
-    return false;
 });
 
 exports.handleStoreAndEnvironmentMismatch = handleStoreAndEnvironmentMismatch;

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.d.ts

@@ -4,6 +4,5 @@ export type HandleStoreAndEnvironmentMismatchParams = {
 };
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
-export declare const handleStoreAndEnvironmentMismatch: ({ environmentId, logout, }: HandleStoreAndEnvironmentMismatchParams) => Promise<boolean>;
+export declare const handleStoreAndEnvironmentMismatch: ({ environmentId, logout, }: HandleStoreAndEnvironmentMismatchParams) => Promise<void>;

package/src/lib/utils/hooks/useValidateSession/handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.js

@@ -4,19 +4,17 @@ import { getEnvironmentId, setEnvironmentId } from '../../../../store/state/dyna
 
 /**
  * Detects envId mismtach with store.
- * @returns true if there is no mismatch.
  */
 const handleStoreAndEnvironmentMismatch = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, }) {
     const storeEnvId = getEnvironmentId();
     if (!storeEnvId || environmentId === storeEnvId) {
-        return true;
+        return;
     }
     yield logout('store and environment are out of sync', {
         currentEnvId: environmentId,
         storedEnvId: storeEnvId,
     });
     setEnvironmentId(environmentId);
-    return false;
 });
 
 export { handleStoreAndEnvironmentMismatch };

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.cjs

@@ -14,14 +14,13 @@ var getAuthToken = require('../../../functions/getAuthToken/getAuthToken.cjs');
 
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
 const handleUserDataOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, projectSettings, }) {
     const cookieEnabled = isCookieEnabled.isCookieEnabled(projectSettings);
     const authToken = getAuthToken.getAuthToken();
     const user$2 = user.getUser();
     if (authToken || !user$2) {
-        return true;
+        return;
     }
     if (user$2 && !authToken && cookieEnabled) {
         try {
@@ -33,16 +32,15 @@ const handleUserDataOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, f
                     authToken,
                     user: user$2,
                 });
-                return false;
+                return;
             }
         }
-        return true;
+        return;
     }
     yield logout('user data out of sync', {
         authToken,
         user: user$2,
     });
-    return false;
 });
 
 exports.handleUserDataOutOfSync = handleUserDataOutOfSync;

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.d.ts

@@ -6,6 +6,5 @@ export type HandleUserDataOutOfSyncParams = {
 };
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
-export declare const handleUserDataOutOfSync: ({ environmentId, logout, projectSettings, }: HandleUserDataOutOfSyncParams) => Promise<boolean>;
+export declare const handleUserDataOutOfSync: ({ environmentId, logout, projectSettings, }: HandleUserDataOutOfSyncParams) => Promise<void>;

package/src/lib/utils/hooks/useValidateSession/handleUserDataOutOfSync/handleUserDataOutOfSync.js

@@ -10,14 +10,13 @@ import { getAuthToken } from '../../../functions/getAuthToken/getAuthToken.js';
 
 /**
  * Detects mismatch between user and auth token.
- * @returns true if there is no mismatch.
  */
 const handleUserDataOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, function* ({ environmentId, logout, projectSettings, }) {
     const cookieEnabled = isCookieEnabled(projectSettings);
     const authToken = getAuthToken();
     const user = getUser();
     if (authToken || !user) {
-        return true;
+        return;
     }
     if (user && !authToken && cookieEnabled) {
         try {
@@ -29,16 +28,15 @@ const handleUserDataOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, function
                     authToken,
                     user,
                 });
-                return false;
+                return;
             }
         }
-        return true;
+        return;
     }
     yield logout('user data out of sync', {
         authToken,
         user,
     });
-    return false;
 });
 
 export { handleUserDataOutOfSync };

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.cjs

@@ -0,0 +1,37 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var user = require('../../../../store/state/user/user.cjs');
+require('@dynamic-labs/utils');
+require('../../../constants/values.cjs');
+require('@dynamic-labs/sdk-api-core');
+require('../../../../store/state/projectSettings/projectSettings.cjs');
+var primaryWalletId = require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
+var connectedWalletsInfo = require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+
+/**
+ * Detects mismatch between wallet info.
+ * If there is primary wallet id, but no user or connected wallets info,
+ * it means it's in a bad state and we should log out.
+ */
+const handleWalletInfoOutOfSync = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ logout, }) {
+    const primaryWalletId$1 = primaryWalletId.getPrimaryWalletId();
+    if (!primaryWalletId$1) {
+        return;
+    }
+    const user$1 = user.getUser();
+    const connectedWallets = connectedWalletsInfo.getConnectedWalletsInfo();
+    if (user$1 || connectedWallets.length > 0) {
+        return;
+    }
+    yield logout('wallet info is out of sync', {
+        connectedWallets,
+        primaryWalletId: primaryWalletId$1,
+        user: user$1,
+    });
+});
+
+exports.handleWalletInfoOutOfSync = handleWalletInfoOutOfSync;

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.d.ts

@@ -0,0 +1,9 @@
+export type HandleWalletInfoOutOfSyncParams = {
+    logout: (reason: string, params: any) => Promise<void>;
+};
+/**
+ * Detects mismatch between wallet info.
+ * If there is primary wallet id, but no user or connected wallets info,
+ * it means it's in a bad state and we should log out.
+ */
+export declare const handleWalletInfoOutOfSync: ({ logout, }: HandleWalletInfoOutOfSyncParams) => Promise<void>;

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.js

@@ -0,0 +1,33 @@
+'use client'
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { getUser } from '../../../../store/state/user/user.js';
+import '@dynamic-labs/utils';
+import '../../../constants/values.js';
+import '@dynamic-labs/sdk-api-core';
+import '../../../../store/state/projectSettings/projectSettings.js';
+import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import { getConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+
+/**
+ * Detects mismatch between wallet info.
+ * If there is primary wallet id, but no user or connected wallets info,
+ * it means it's in a bad state and we should log out.
+ */
+const handleWalletInfoOutOfSync = (_a) => __awaiter(void 0, [_a], void 0, function* ({ logout, }) {
+    const primaryWalletId = getPrimaryWalletId();
+    if (!primaryWalletId) {
+        return;
+    }
+    const user = getUser();
+    const connectedWallets = getConnectedWalletsInfo();
+    if (user || connectedWallets.length > 0) {
+        return;
+    }
+    yield logout('wallet info is out of sync', {
+        connectedWallets,
+        primaryWalletId,
+        user,
+    });
+});
+
+export { handleWalletInfoOutOfSync };

package/src/lib/utils/hooks/useValidateSession/handleWalletInfoOutOfSync/index.d.ts

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

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

@@ -7,10 +7,10 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var logger = require('../../../shared/logger.cjs');
 var loadingAndLifecycle = require('../../../store/state/loadingAndLifecycle.cjs');
-var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 var handleStoreAndEnvironmentMismatch = require('./handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.cjs');
 var handleUserDataOutOfSync = require('./handleUserDataOutOfSync/handleUserDataOutOfSync.cjs');
+var handleWalletInfoOutOfSync = require('./handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.cjs');
 
 const useValidateSession = ({ environmentId, handleLogOut }) => {
     const didRunRef = React.useRef(false);
@@ -30,6 +30,7 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         yield Promise.all([
             handleStoreAndEnvironmentMismatch.handleStoreAndEnvironmentMismatch(params),
             handleUserDataOutOfSync.handleUserDataOutOfSync(params),
+            handleWalletInfoOutOfSync.handleWalletInfoOutOfSync(params),
         ]);
         // Regardless of whether we logged out or not, session validation is now complete
         loadingAndLifecycle.setLoadingAndLifecycle({ sessionValidation: true });
@@ -40,11 +41,6 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         didRunRef.current = true;
         validateSession(projectSettings$1);
     }, [validateSession, projectSettings$1]);
-    useDynamicEvents.useInternalDynamicEvents('triggerSessionValidation', () => {
-        if (!projectSettings$1)
-            return;
-        validateSession(projectSettings$1);
-    });
 };
 
 exports.useValidateSession = useValidateSession;

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

@@ -3,10 +3,10 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useRef, useCallback, useEffect } from 'react';
 import { logger } from '../../../shared/logger.js';
 import { setLoadingAndLifecycle } from '../../../store/state/loadingAndLifecycle.js';
-import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import { handleStoreAndEnvironmentMismatch } from './handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.js';
 import { handleUserDataOutOfSync } from './handleUserDataOutOfSync/handleUserDataOutOfSync.js';
+import { handleWalletInfoOutOfSync } from './handleWalletInfoOutOfSync/handleWalletInfoOutOfSync.js';
 
 const useValidateSession = ({ environmentId, handleLogOut }) => {
     const didRunRef = useRef(false);
@@ -26,6 +26,7 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         yield Promise.all([
             handleStoreAndEnvironmentMismatch(params),
             handleUserDataOutOfSync(params),
+            handleWalletInfoOutOfSync(params),
         ]);
         // Regardless of whether we logged out or not, session validation is now complete
         setLoadingAndLifecycle({ sessionValidation: true });
@@ -36,11 +37,6 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         didRunRef.current = true;
         validateSession(projectSettings);
     }, [validateSession, projectSettings]);
-    useInternalDynamicEvents('triggerSessionValidation', () => {
-        if (!projectSettings)
-            return;
-        validateSession(projectSettings);
-    });
 };
 
 export { useValidateSession };

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

@@ -74,6 +74,7 @@ require('react-focus-lock');
 require('qrcode');
 require('formik');
 require('../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
+var useWalletList = require('../../../utils/hooks/useWalletList/useWalletList.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
@@ -103,21 +104,15 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
     const loginView = useViewSettings.useViewSettings(sdkApiCore.SdkViewType.Login);
-    const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, walletConnectorOptions, walletsFilter, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, walletsFilter, } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
     const { enabledSocialProviders } = SocialRedirectContext.useSocialRedirectContext();
+    const { numberOfWallets } = useWalletList.useWalletList({
+        viewWalletsFilter: walletsFilter,
+    });
     const hasSocialProvidersEnabled = Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length);
     const hasEmailProviderEnabled = isEmailProviderEnabled.isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const hasPhoneProviderEnabled = isPhoneNumberProviderEnabled.isPhoneNumberProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
-    /** Takes from wallets only those that can be selected in the wallet list by the user.
-     * Should filter out embedded wallets
-     * WHY: when we decide whether to show wallets or not, we need to know how many wallets
-     * will actually be rendered. It would be especially bad to only have for ex "turnkey" in
-     * wallets and then display an empty wallet list (since turnkey doesn't render)
-     */
-    const selectableWallets = (walletsFilter
-        ? walletsFilter(walletConnectorOptions)
-        : walletConnectorOptions).filter(({ key }) => key !== 'turnkey');
     const isWalletOnly = React.useMemo(() => {
         var _a;
         if (!projectSettings) {
@@ -158,11 +153,11 @@ const useLoginView = () => {
             sections.find((section) => section.type === 'wallet')) {
             logger.logger.error('Failed to render WalletSignInSection - no chains enabled');
         }
-        if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
+        if (numberOfWallets > 0) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
-    }, [selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.chains]);
+    }, [numberOfWallets, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.chains]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
@@ -185,8 +180,7 @@ const useLoginView = () => {
             showPhone: hasPhoneProviderEnabled,
             showSocial: Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length),
             // is email only is set in the project settings when the "Email (Web2) only" is toggled on in the dashboard
-            showWallets: Boolean(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) &&
-                !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _e === void 0 ? void 0 : _e.modal) === null || _f === void 0 ? void 0 : _f.emailOnly),
+            showWallets: numberOfWallets > 0 && !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _e === void 0 ? void 0 : _e.modal) === null || _f === void 0 ? void 0 : _f.emailOnly),
             socialAboveEmail,
             splitEmailAndSocial,
             web3Layout: authorizationViewDisplayOrder === 'web3',
@@ -216,7 +210,7 @@ const useLoginView = () => {
         hasPhoneProviderEnabled,
         loginView === null || loginView === void 0 ? void 0 : loginView.sections,
         projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal,
-        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
+        numberOfWallets,
         t,
     ]);
     return {

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

@@ -70,6 +70,7 @@ import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
 import '../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
+import { useWalletList } from '../../../utils/hooks/useWalletList/useWalletList.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
@@ -99,21 +100,15 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const NUMBER_OF_WALLETS = 3;
 const useLoginView = () => {
     const loginView = useViewSettings(SdkViewType.Login);
-    const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, walletConnectorOptions, walletsFilter, } = useInternalDynamicContext();
+    const { projectSettings, authorizationViewDisplayOrder, loginWithEmail, walletsFilter, } = useInternalDynamicContext();
     const { t } = useTranslation();
     const { enabledSocialProviders } = useSocialRedirectContext();
+    const { numberOfWallets } = useWalletList({
+        viewWalletsFilter: walletsFilter,
+    });
     const hasSocialProvidersEnabled = Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length);
     const hasEmailProviderEnabled = isEmailProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
     const hasPhoneProviderEnabled = isPhoneNumberProviderEnabled(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers);
-    /** Takes from wallets only those that can be selected in the wallet list by the user.
-     * Should filter out embedded wallets
-     * WHY: when we decide whether to show wallets or not, we need to know how many wallets
-     * will actually be rendered. It would be especially bad to only have for ex "turnkey" in
-     * wallets and then display an empty wallet list (since turnkey doesn't render)
-     */
-    const selectableWallets = (walletsFilter
-        ? walletsFilter(walletConnectorOptions)
-        : walletConnectorOptions).filter(({ key }) => key !== 'turnkey');
     const isWalletOnly = useMemo(() => {
         var _a;
         if (!projectSettings) {
@@ -154,11 +149,11 @@ const useLoginView = () => {
             sections.find((section) => section.type === 'wallet')) {
             logger.error('Failed to render WalletSignInSection - no chains enabled');
         }
-        if (selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) {
+        if (numberOfWallets > 0) {
             return sections;
         }
         return sections.filter((section) => section.type !== 'wallet');
-    }, [selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.chains]);
+    }, [numberOfWallets, projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.chains]);
     /**
      * returns the login view sections to be displayed in order from projectSettings?.sdk?.views
      * and has backwards compatibility with project settings design.modal props
@@ -181,8 +176,7 @@ const useLoginView = () => {
             showPhone: hasPhoneProviderEnabled,
             showSocial: Boolean(enabledSocialProviders === null || enabledSocialProviders === void 0 ? void 0 : enabledSocialProviders.length),
             // is email only is set in the project settings when the "Email (Web2) only" is toggled on in the dashboard
-            showWallets: Boolean(selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length) &&
-                !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _e === void 0 ? void 0 : _e.modal) === null || _f === void 0 ? void 0 : _f.emailOnly),
+            showWallets: numberOfWallets > 0 && !((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _e === void 0 ? void 0 : _e.modal) === null || _f === void 0 ? void 0 : _f.emailOnly),
             socialAboveEmail,
             splitEmailAndSocial,
             web3Layout: authorizationViewDisplayOrder === 'web3',
@@ -212,7 +206,7 @@ const useLoginView = () => {
         hasPhoneProviderEnabled,
         loginView === null || loginView === void 0 ? void 0 : loginView.sections,
         projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design.modal,
-        selectableWallets === null || selectableWallets === void 0 ? void 0 : selectableWallets.length,
+        numberOfWallets,
         t,
     ]);
     return {