@dynamic-labs/sdk-react-core 4.25.4 → 4.25.6

package/CHANGELOG.md

@@ -1,4 +1,26 @@
 
+### [4.25.6](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.5...v4.25.6) (2025-07-28)
+
+
+### Bug Fixes
+
+* don't create a new user when linking a wallet to a user with no wallets ([#9252](https://github.com/dynamic-labs/dynamic-auth/issues/9252)) ([30f846e](https://github.com/dynamic-labs/dynamic-auth/commit/30f846e89f2dffd112e656201bfa1cc24b787f03))
+* Nufi EVM wallet showing up twice in wallet list ([#9256](https://github.com/dynamic-labs/dynamic-auth/issues/9256)) ([213488e](https://github.com/dynamic-labs/dynamic-auth/commit/213488e2226ef55965e12a1a548845cb100e859f))
+
+### [4.25.5](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.4...v4.25.5) (2025-07-27)
+
+
+### Features
+
+* add pending account switch copykey ([#9219](https://github.com/dynamic-labs/dynamic-auth/issues/9219)) ([1d88bf2](https://github.com/dynamic-labs/dynamic-auth/commit/1d88bf27c685f122d94cdf66541365eae7e11a64))
+
+
+### Bug Fixes
+
+* logout user if last wallet removed in connect-only ([#9234](https://github.com/dynamic-labs/dynamic-auth/issues/9234)) ([42ea1ad](https://github.com/dynamic-labs/dynamic-auth/commit/42ea1ad331cd635a1c17fac0dcbf213fa045586d))
+* prevent waas wallet from being created when embedded wallet option is turned on and then off ([#9237](https://github.com/dynamic-labs/dynamic-auth/issues/9237)) ([004a350](https://github.com/dynamic-labs/dynamic-auth/commit/004a350eb0d88d7ad6d3ceea7eb0d889f7d4a6bf))
+* stop generating session keys on wallet linking ([#9244](https://github.com/dynamic-labs/dynamic-auth/issues/9244)) ([7176be9](https://github.com/dynamic-labs/dynamic-auth/commit/7176be93e31ba55dda264e0365c84376272ee945))
+
 ### [4.25.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.3...v4.25.4) (2025-07-25)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.25.4";
+var version = "4.25.6";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.728",
 	"@dynamic-labs-sdk/client": "0.0.1-alpha.19",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.25.4";
+var version = "4.25.6";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.728",
 	"@dynamic-labs-sdk/client": "0.0.1-alpha.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.25.4",
+  "version": "4.25.6",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.728",
     "@dynamic-labs-sdk/client": "0.0.1-alpha.19",
@@ -15,16 +15,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.5.0",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.25.4",
-    "@dynamic-labs/iconic": "4.25.4",
-    "@dynamic-labs/logger": "4.25.4",
-    "@dynamic-labs/multi-wallet": "4.25.4",
-    "@dynamic-labs/rpc-providers": "4.25.4",
-    "@dynamic-labs/store": "4.25.4",
-    "@dynamic-labs/types": "4.25.4",
-    "@dynamic-labs/utils": "4.25.4",
-    "@dynamic-labs/wallet-book": "4.25.4",
-    "@dynamic-labs/wallet-connector-core": "4.25.4",
+    "@dynamic-labs/assert-package-version": "4.25.6",
+    "@dynamic-labs/iconic": "4.25.6",
+    "@dynamic-labs/logger": "4.25.6",
+    "@dynamic-labs/multi-wallet": "4.25.6",
+    "@dynamic-labs/rpc-providers": "4.25.6",
+    "@dynamic-labs/store": "4.25.6",
+    "@dynamic-labs/types": "4.25.6",
+    "@dynamic-labs/utils": "4.25.6",
+    "@dynamic-labs/wallet-book": "4.25.6",
+    "@dynamic-labs/wallet-connector-core": "4.25.6",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/DynamicContext/hooks/useRemoveWallet/useRemoveWallet.cjs

@@ -37,10 +37,6 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
     const { removedWalletsIds, userWallets } = UserWalletsContext.useInternalUserWallets();
     const connectedWalletsInfo$1 = connectedWalletsInfo.useConnectedWalletsInfo();
     const nextWalletId = React.useMemo(() => (secondaryWallets[0] ? secondaryWallets[0].id : undefined), [secondaryWallets]);
-    const onLastWalletRemoved = React.useCallback((clearStackAndPushInitialView) => {
-        primaryWalletId.resetPrimaryWalletId();
-        clearStackAndPushInitialView === null || clearStackAndPushInitialView === void 0 ? void 0 : clearStackAndPushInitialView();
-    }, []);
     const callback = React.useCallback((walletId, clearStackAndPushInitialView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const wallet = userWallets.find((w) => w.id === walletId);
@@ -76,9 +72,10 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         if (isUnlinkingPrimaryWallet && nextWalletId) {
             setPrimaryWallet(nextWalletId);
         }
-        // If there are no wallets left and no user, we need to reset the primary wallet and clear the view stack
-        if (!nextWalletId) {
-            onLastWalletRemoved(clearStackAndPushInitialView);
+        // If there are no wallets left and no user (connect-only), we need to log out
+        if (!user && !nextWalletId) {
+            handleLogOut();
+            return;
         }
         const numberOfWalletsWithSameConnector = userWallets.filter(({ connector }) => connector.key === wallet.connector.key).length;
         // If there's only 1, it's the one being removed and we can kill the session
@@ -91,7 +88,7 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         nextWalletId,
         removedWalletsIds,
         setPrimaryWallet,
-        onLastWalletRemoved,
+        handleLogOut,
     ]);
     return callback;
 };

package/src/lib/context/DynamicContext/hooks/useRemoveWallet/useRemoveWallet.js

@@ -19,7 +19,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../../shared/consts/index.js';
 import '../../../../store/state/nonce/nonce.js';
 import { getEnvironmentId } from '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import { resetPrimaryWalletId, getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import { useConnectedWalletsInfo, setConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
@@ -33,10 +33,6 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
     const { removedWalletsIds, userWallets } = useInternalUserWallets();
     const connectedWalletsInfo = useConnectedWalletsInfo();
     const nextWalletId = useMemo(() => (secondaryWallets[0] ? secondaryWallets[0].id : undefined), [secondaryWallets]);
-    const onLastWalletRemoved = useCallback((clearStackAndPushInitialView) => {
-        resetPrimaryWalletId();
-        clearStackAndPushInitialView === null || clearStackAndPushInitialView === void 0 ? void 0 : clearStackAndPushInitialView();
-    }, []);
     const callback = useCallback((walletId, clearStackAndPushInitialView) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const wallet = userWallets.find((w) => w.id === walletId);
@@ -72,9 +68,10 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         if (isUnlinkingPrimaryWallet && nextWalletId) {
             setPrimaryWallet(nextWalletId);
         }
-        // If there are no wallets left and no user, we need to reset the primary wallet and clear the view stack
-        if (!nextWalletId) {
-            onLastWalletRemoved(clearStackAndPushInitialView);
+        // If there are no wallets left and no user (connect-only), we need to log out
+        if (!user && !nextWalletId) {
+            handleLogOut();
+            return;
         }
         const numberOfWalletsWithSameConnector = userWallets.filter(({ connector }) => connector.key === wallet.connector.key).length;
         // If there's only 1, it's the one being removed and we can kill the session
@@ -87,7 +84,7 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         nextWalletId,
         removedWalletsIds,
         setPrimaryWallet,
-        onLastWalletRemoved,
+        handleLogOut,
     ]);
     return callback;
 };

package/src/lib/locale/en/translation.cjs

@@ -2428,6 +2428,18 @@ const translation = {
         title: 'Transfer this wallet?'
       }
      */
+    /**
+     * @description copy keys for pending account switch to link modal
+     * @default
+     * {
+        title: 'Wallet is already linked, switch wallet in {{walletName}}',
+        description: 'To link a new wallet, open {{walletName}} and switch to the account you want to link.',
+      }
+     */
+    dyn_pending_account_switch_to_link: {
+        title: 'Wallet is already linked, switch wallet in {{walletName}}',
+        description: 'To link a new wallet, open {{walletName}} and switch to the account you want to link.',
+    },
     dyn_wallet_link: {
         cannot_link: {
             cancel_button: 'Cancel',

package/src/lib/locale/en/translation.d.ts

@@ -2424,6 +2424,18 @@ export declare const translation: {
         title: 'Transfer this wallet?'
       }
      */
+    /**
+     * @description copy keys for pending account switch to link modal
+     * @default
+     * {
+        title: 'Wallet is already linked, switch wallet in {{walletName}}',
+        description: 'To link a new wallet, open {{walletName}} and switch to the account you want to link.',
+      }
+     */
+    dyn_pending_account_switch_to_link: {
+        title: string;
+        description: string;
+    };
     dyn_wallet_link: {
         cannot_link: {
             cancel_button: string;

package/src/lib/locale/en/translation.js

@@ -2424,6 +2424,18 @@ const translation = {
         title: 'Transfer this wallet?'
       }
      */
+    /**
+     * @description copy keys for pending account switch to link modal
+     * @default
+     * {
+        title: 'Wallet is already linked, switch wallet in {{walletName}}',
+        description: 'To link a new wallet, open {{walletName}} and switch to the account you want to link.',
+      }
+     */
+    dyn_pending_account_switch_to_link: {
+        title: 'Wallet is already linked, switch wallet in {{walletName}}',
+        description: 'To link a new wallet, open {{walletName}} and switch to the account you want to link.',
+    },
     dyn_wallet_link: {
         cannot_link: {
             cancel_button: 'Cancel',

package/src/lib/utils/hooks/useDynamicWaas/constants.cjs

@@ -7,8 +7,10 @@ const NO_ENABLED_CHAINS_ERROR = 'No enabled embedded wallet chains. Please go to
 const DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR = 'Dynamic Waas connector not found';
 const INVALID_CHAINS_ERROR = 'The following chains are not enabled for embedded wallets';
 const WALLET_CREATION_FAILED_ERROR = 'Failed to create wallet account for the following chains';
+const EMBEDDED_WALLET_NOT_ENABLED_ERROR = 'Embedded wallet is not enabled, if this is unintended, go to the dashboard and make sure embedded wallet option is enabled.';
 
 exports.DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR = DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR;
+exports.EMBEDDED_WALLET_NOT_ENABLED_ERROR = EMBEDDED_WALLET_NOT_ENABLED_ERROR;
 exports.INVALID_CHAINS_ERROR = INVALID_CHAINS_ERROR;
 exports.NO_ENABLED_CHAINS_ERROR = NO_ENABLED_CHAINS_ERROR;
 exports.WALLET_CREATION_FAILED_ERROR = WALLET_CREATION_FAILED_ERROR;

package/src/lib/utils/hooks/useDynamicWaas/constants.d.ts

@@ -2,3 +2,4 @@ export declare const NO_ENABLED_CHAINS_ERROR = "No enabled embedded wallet chain
 export declare const DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR = "Dynamic Waas connector not found";
 export declare const INVALID_CHAINS_ERROR = "The following chains are not enabled for embedded wallets";
 export declare const WALLET_CREATION_FAILED_ERROR = "Failed to create wallet account for the following chains";
+export declare const EMBEDDED_WALLET_NOT_ENABLED_ERROR = "Embedded wallet is not enabled, if this is unintended, go to the dashboard and make sure embedded wallet option is enabled.";

package/src/lib/utils/hooks/useDynamicWaas/constants.js

@@ -3,5 +3,6 @@ const NO_ENABLED_CHAINS_ERROR = 'No enabled embedded wallet chains. Please go to
 const DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR = 'Dynamic Waas connector not found';
 const INVALID_CHAINS_ERROR = 'The following chains are not enabled for embedded wallets';
 const WALLET_CREATION_FAILED_ERROR = 'Failed to create wallet account for the following chains';
+const EMBEDDED_WALLET_NOT_ENABLED_ERROR = 'Embedded wallet is not enabled, if this is unintended, go to the dashboard and make sure embedded wallet option is enabled.';
 
-export { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, INVALID_CHAINS_ERROR, NO_ENABLED_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR };
+export { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, EMBEDDED_WALLET_NOT_ENABLED_ERROR, INVALID_CHAINS_ERROR, NO_ENABLED_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR };

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

@@ -24,6 +24,7 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
+var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
@@ -107,6 +108,7 @@ require('../../../../index.cjs');
 var apiUrl = require('../../constants/waas/apiUrl.cjs');
 var useClientSessionKeys = require('../useClientSessionKeys/useClientSessionKeys.cjs');
 var useRefreshUser = require('../useRefreshUser/useRefreshUser.cjs');
+var useGetMfaToken = require('../useGetMfaToken/useGetMfaToken.cjs');
 var constants = require('./constants.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
@@ -114,13 +116,14 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, getMfaToken, }) => {
     var _a;
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl((_a = (apiBaseUrl || apiUrl.DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
     walletConnector.setGetSignedSessionIdFunction(getSignedSessionId);
     walletConnector.setRelayUrl(relayUrl);
+    walletConnector.setGetMfaTokenFunction(getMfaToken);
     return walletConnector;
 };
 const useDynamicWaas = () => {
@@ -136,6 +139,7 @@ const useDynamicWaas = () => {
     const relayUrl = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
     const embeddedWalletSettings = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
+    const isEmbeddedWalletEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings$1);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
     const enabledChainNames = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.map((chain) => chain.name);
     const automaticEmbeddedWalletCreationEnabled = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.automaticEmbeddedWalletCreation;
@@ -144,6 +148,7 @@ const useDynamicWaas = () => {
     const dynamicWaasIsEnabled = defaultWalletVersion === sdkApiCore.EmbeddedWalletVersionEnum.V3;
     const authToken = getMinAuthToken.getMinAuthToken();
     const { getSignedSessionId } = useClientSessionKeys.useClientSessionKeys();
+    const getMfaToken = useGetMfaToken.useGetMfaToken();
     const isCookieAuthEnabled = projectSettings$1 && isCookieEnabled.isCookieEnabled(projectSettings$1);
     const getWalletConnector = React.useCallback((chainName) => {
         var _a;
@@ -161,6 +166,7 @@ const useDynamicWaas = () => {
             apiBaseUrl: apiBaseUrl || apiUrl.DEFAULT_WAAS_API_URL,
             authToken,
             environmentId,
+            getMfaToken,
             getSignedSessionId,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
@@ -178,6 +184,9 @@ const useDynamicWaas = () => {
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
     const createWalletAccount = React.useCallback((chainNames) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!isEmbeddedWalletEnabled) {
+            throw new utils.DynamicError(constants.EMBEDDED_WALLET_NOT_ENABLED_ERROR);
+        }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new utils.DynamicError(constants.NO_ENABLED_CHAINS_ERROR);
         }
@@ -265,11 +274,13 @@ const useDynamicWaas = () => {
         setShowAuthFlow,
         user === null || user === void 0 ? void 0 : user.verifiedCredentials,
         addedWalletsIds,
+        isEmbeddedWalletEnabled,
     ]);
     const needsAutoCreateWalletChains = React.useMemo(() => {
         if (!user ||
             !dynamicWaasIsEnabled ||
-            !automaticEmbeddedWalletCreationEnabled) {
+            !automaticEmbeddedWalletCreationEnabled ||
+            !isEmbeddedWalletEnabled) {
             return [];
         }
         // check if user have any wallet (V1, V2, or V3/dynamicwaas) for this chain
@@ -294,6 +305,7 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationEnabled,
         automaticEmbeddedWalletCreationForExternalEnabled,
         enabledChainNames,
+        isEmbeddedWalletEnabled,
     ]);
     const importPrivateKey = (_d) => _tslib.__awaiter(void 0, [_d], void 0, function* ({ chainName, privateKey, }) {
         const walletConnector = getWalletConnector(chainName);

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

@@ -1,12 +1,15 @@
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+import { ChainEnum, MFAAction } from '@dynamic-labs/sdk-api-core';
 import { IDynamicWaasConnector } from '@dynamic-labs/wallet-connector-core';
-export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, }: {
+export declare const configWaasWalletConnector: ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, getMfaToken, }: {
     walletConnector: IDynamicWaasConnector;
     environmentId: string;
     apiBaseUrl: string;
     authToken: string | undefined;
     relayUrl: string;
     getSignedSessionId: () => Promise<string>;
+    getMfaToken: (props?: {
+        mfaAction?: MFAAction;
+    }) => Promise<string | undefined>;
 }) => IDynamicWaasConnector;
 export declare const useDynamicWaas: () => {
     createWalletAccount: (chainNames: ChainEnum[]) => Promise<({

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

@@ -20,6 +20,7 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
@@ -103,20 +104,22 @@ import '../../../../index.js';
 import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
 import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
 import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
-import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR } from './constants.js';
+import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
+import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, EMBEDDED_WALLET_NOT_ENABLED_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR } from './constants.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 
 const dynamicWaasKey = 'dynamicwaas';
-const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, }) => {
+const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl, authToken, relayUrl, getSignedSessionId, getMfaToken, }) => {
     var _a;
     walletConnector.setEnvironmentId(environmentId);
     walletConnector.setBaseApiUrl((_a = (apiBaseUrl || DEFAULT_WAAS_API_URL)) === null || _a === void 0 ? void 0 : _a.replace('/api/v0', ''));
     walletConnector.setGetAuthTokenFunction(() => authToken !== null && authToken !== void 0 ? authToken : '');
     walletConnector.setGetSignedSessionIdFunction(getSignedSessionId);
     walletConnector.setRelayUrl(relayUrl);
+    walletConnector.setGetMfaTokenFunction(getMfaToken);
     return walletConnector;
 };
 const useDynamicWaas = () => {
@@ -132,6 +135,7 @@ const useDynamicWaas = () => {
     const relayUrl = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.waas) === null || _b === void 0 ? void 0 : _b.relayUrl;
     const embeddedWalletSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
     const enabledChains = (_c = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.chainConfigurations) === null || _c === void 0 ? void 0 : _c.filter((c) => c.enabled);
+    const isEmbeddedWalletEnabled = isTurnkeyEnabled(projectSettings);
     const primaryChain = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.find((chain) => chain.primary);
     const enabledChainNames = enabledChains === null || enabledChains === void 0 ? void 0 : enabledChains.map((chain) => chain.name);
     const automaticEmbeddedWalletCreationEnabled = embeddedWalletSettings === null || embeddedWalletSettings === void 0 ? void 0 : embeddedWalletSettings.automaticEmbeddedWalletCreation;
@@ -140,6 +144,7 @@ const useDynamicWaas = () => {
     const dynamicWaasIsEnabled = defaultWalletVersion === EmbeddedWalletVersionEnum.V3;
     const authToken = getMinAuthToken();
     const { getSignedSessionId } = useClientSessionKeys();
+    const getMfaToken = useGetMfaToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled(projectSettings);
     const getWalletConnector = useCallback((chainName) => {
         var _a;
@@ -157,6 +162,7 @@ const useDynamicWaas = () => {
             apiBaseUrl: apiBaseUrl || DEFAULT_WAAS_API_URL,
             authToken,
             environmentId,
+            getMfaToken,
             getSignedSessionId,
             relayUrl: relayUrl !== null && relayUrl !== void 0 ? relayUrl : '',
             walletConnector,
@@ -174,6 +180,9 @@ const useDynamicWaas = () => {
     // If no chain names are provided, filter out chains that already have a wallet
     // and make a wallet for each enabled chain
     const createWalletAccount = useCallback((chainNames) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!isEmbeddedWalletEnabled) {
+            throw new DynamicError(EMBEDDED_WALLET_NOT_ENABLED_ERROR);
+        }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new DynamicError(NO_ENABLED_CHAINS_ERROR);
         }
@@ -261,11 +270,13 @@ const useDynamicWaas = () => {
         setShowAuthFlow,
         user === null || user === void 0 ? void 0 : user.verifiedCredentials,
         addedWalletsIds,
+        isEmbeddedWalletEnabled,
     ]);
     const needsAutoCreateWalletChains = useMemo(() => {
         if (!user ||
             !dynamicWaasIsEnabled ||
-            !automaticEmbeddedWalletCreationEnabled) {
+            !automaticEmbeddedWalletCreationEnabled ||
+            !isEmbeddedWalletEnabled) {
             return [];
         }
         // check if user have any wallet (V1, V2, or V3/dynamicwaas) for this chain
@@ -290,6 +301,7 @@ const useDynamicWaas = () => {
         automaticEmbeddedWalletCreationEnabled,
         automaticEmbeddedWalletCreationForExternalEnabled,
         enabledChainNames,
+        isEmbeddedWalletEnabled,
     ]);
     const importPrivateKey = (_d) => __awaiter(void 0, [_d], void 0, function* ({ chainName, privateKey, }) {
         const walletConnector = getWalletConnector(chainName);

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

@@ -47,8 +47,8 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
-var errors = require('../../../constants/errors.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
+var errors = require('../../../constants/errors.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
@@ -67,8 +67,8 @@ var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs
 var useIsTurnkeyWallet = require('../../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
 var passkeyRecovery = require('../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs');
-var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
 var getNewVerifiedCredentialsFromDiff = require('../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs');
+var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
 var constants = require('./constants.cjs');
 var useTurnkey = require('./useTurnkey/useTurnkey.cjs');
 require('yup');
@@ -436,13 +436,18 @@ const useSecureEnclaveEmbeddedWallet = () => {
                 wallet: wallet,
             });
         }
-        catch (_1) {
+        catch (err) {
             if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
                 ((_y = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _y === void 0 ? void 0 : _y.removeSessionKeys)) {
                 yield ((_z = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _z === void 0 ? void 0 : _z.removeSessionKeys());
                 yield ((_0 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _0 === void 0 ? void 0 : _0.createOrRestoreSession({
                     ignoreRestore: true,
                 }));
+                logger.logger.error('[TK - removeSessionKeys] failed to perform revealEmbeddedWalletKey activity', {
+                    address: wallet === null || wallet === void 0 ? void 0 : wallet.address,
+                    err,
+                    userId: user$1 === null || user$1 === void 0 ? void 0 : user$1.userId,
+                });
             }
             yield turnkeyExport.exportCredential({
                 address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
@@ -468,11 +473,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _2, _3;
+        var _1, _2;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.chainConfigurations, user$1.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_1 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _1 === void 0 ? void 0 : _1.chainConfigurations, user$1.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -483,7 +488,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new utils.DynamicError('Session is active. No need to create a new one', errors.ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_3 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _3 === void 0 ? void 0 : _3.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }

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

@@ -43,8 +43,8 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
-import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST, INVALID_WALLET_DATA, SESSION_CREATED, ERROR_SENDING_CODE, CODE_SENT } from '../../../constants/errors.js';
 import '../../../../store/state/authMode/authMode.js';
+import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST, INVALID_WALLET_DATA, SESSION_CREATED, ERROR_SENDING_CODE, CODE_SENT } from '../../../constants/errors.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
@@ -63,8 +63,8 @@ import { useWalletContext } from '../../../../context/WalletContext/WalletContex
 import { useIsTurnkeyWallet } from '../../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
 import { canRestoreEmbeddedWalletSession, restoreEmbeddedWalletSession } from '../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.js';
-import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
 import { getNewVerifiedCredentialsFromDiff } from '../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js';
+import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
 import { EmbeddedWalletVersion, iframeContainerId, iframeElementId, revealIframeElementId, revealIframeContainerId } from './constants.js';
 import { useTurnkey } from './useTurnkey/useTurnkey.js';
 import 'yup';
@@ -432,13 +432,18 @@ const useSecureEnclaveEmbeddedWallet = () => {
                 wallet: wallet,
             });
         }
-        catch (_1) {
+        catch (err) {
             if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
                 ((_y = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _y === void 0 ? void 0 : _y.removeSessionKeys)) {
                 yield ((_z = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _z === void 0 ? void 0 : _z.removeSessionKeys());
                 yield ((_0 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _0 === void 0 ? void 0 : _0.createOrRestoreSession({
                     ignoreRestore: true,
                 }));
+                logger.error('[TK - removeSessionKeys] failed to perform revealEmbeddedWalletKey activity', {
+                    address: wallet === null || wallet === void 0 ? void 0 : wallet.address,
+                    err,
+                    userId: user === null || user === void 0 ? void 0 : user.userId,
+                });
             }
             yield exportCredential({
                 address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
@@ -464,11 +469,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _2, _3;
+        var _1, _2;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_1 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _1 === void 0 ? void 0 : _1.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -479,7 +484,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new DynamicError('Session is active. No need to create a new one', ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_3 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _3 === void 0 ? void 0 : _3.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }

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

@@ -41,8 +41,8 @@ require('../../../../../client/client.cjs');
 require('../../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../../config/ApiEndpoint.cjs');
 require('../../../../../locale/locale.cjs');
-var errors = require('../../../../constants/errors.cjs');
 require('../../../../../store/state/authMode/authMode.cjs');
+var errors = require('../../../../constants/errors.cjs');
 require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useCreateDynamicEmbeddedWalletMutation = require('../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');

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

@@ -37,8 +37,8 @@ import '../../../../../client/client.js';
 import '../../../../../store/state/projectSettings/projectSettings.js';
 import '../../../../../config/ApiEndpoint.js';
 import '../../../../../locale/locale.js';
-import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
 import '../../../../../store/state/authMode/authMode.js';
+import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';