@dynamic-labs/sdk-react-core 4.29.4 → 4.29.5

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useCallback, useMemo } from 'react';
+import { useRef, useCallback, useMemo } from 'react';
 import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import { logger } from '@dynamic-labs/wallet-connector-core';
@@ -27,6 +27,8 @@ import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
 import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
+import '../../../locale/locale.js';
+import { softDeleteEmbeddedWallet, restoreEmbeddedWallet } from '../../../data/api/wallets/wallets.js';
 import { useOnboardingCompleteUserProfile } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
@@ -35,8 +37,6 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../locale/locale.js';
-import { softDeleteEmbeddedWallet, restoreEmbeddedWallet } from '../../../data/api/wallets/wallets.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -92,6 +92,11 @@ import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/MfaChooseDeviceView/getMfaOptions/getMfaOptions.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../context/OnrampContext/OnrampContext.js';
+import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
+import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
+import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
+import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
+import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_ERROR, NO_ENABLED_CHAINS_ERROR, INVALID_CHAINS_ERROR, WALLET_CREATION_FAILED_ERROR } from './constants.js';
 import '../../../store/state/sendBalances.js';
 import '../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
@@ -100,11 +105,6 @@ import '../../../views/TransactionConfirmationView/TransactionConfirmationView.j
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../../index.js';
 import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
-import { DEFAULT_WAAS_API_URL } from '../../constants/waas/apiUrl.js';
-import { useClientSessionKeys } from '../useClientSessionKeys/useClientSessionKeys.js';
-import { useRefreshUser } from '../useRefreshUser/useRefreshUser.js';
-import { useGetMfaToken } from '../useGetMfaToken/useGetMfaToken.js';
-import { DYNAMIC_WAAS_CONNECTOR_NOT_FOUND_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';
@@ -151,6 +151,7 @@ const useDynamicWaas = () => {
     const { getSignedSessionId } = useClientSessionKeys();
     const getMfaToken = useGetMfaToken();
     const isCookieAuthEnabled = projectSettings && isCookieEnabled(projectSettings);
+    const isUpgrading = useRef(false);
     const getWalletConnector = useCallback((chainName) => {
         var _a;
         if (!isCookieAuthEnabled && !authToken) {
@@ -186,6 +187,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, password) => __awaiter(void 0, void 0, void 0, function* () {
+        if (isUpgrading.current) {
+            return;
+        }
         if (!(enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.length)) {
             throw new DynamicError(NO_ENABLED_CHAINS_ERROR);
         }
@@ -268,15 +272,7 @@ const useDynamicWaas = () => {
         }
         setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return createdWalletAccounts;
-    }), [
-        getWalletConnector,
-        primaryChain,
-        enabledChainNames,
-        refresh,
-        setShowAuthFlow,
-        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
-        addedWalletsIds,
-    ]);
+    }), [getWalletConnector, primaryChain, enabledChainNames, setShowAuthFlow]);
     const needsAutoCreateWalletChains = useMemo(() => {
         if (!user ||
             !dynamicWaasIsEnabled ||
@@ -316,41 +312,45 @@ const useDynamicWaas = () => {
         });
         yield refresh();
     });
-    const upgradeToDynamicWaas = useCallback((_e) => __awaiter(void 0, [_e], void 0, function* ({ privateKey }) {
+    const upgradeToDynamicWaas = useCallback((_e) => __awaiter(void 0, [_e], void 0, function* ({ privateKey, wallet, }) {
+        isUpgrading.current = true;
         if (!primaryWallet) {
             throw new DynamicError('Primary wallet not found');
         }
-        const chainName = primaryWallet.chain;
-        const walletId = primaryWallet.id;
+        const chainName = wallet.chain;
+        const walletId = wallet.id;
         const walletConnector = getWalletConnector(chainName);
         if (!walletConnector) {
             throw new DynamicError('Wallet connector not found');
         }
         let softDeleteSucceeded = false;
+        // 7702 wallets have a -zerodev suffix because it's a credential created on the fly
+        const normalizedWalletId = (walletId === null || walletId === void 0 ? void 0 : walletId.replace('-zerodev', '')) || walletId;
         try {
             yield softDeleteEmbeddedWallet({
                 environmentId,
-                walletId,
+                walletId: normalizedWalletId,
             });
             softDeleteSucceeded = true;
             yield walletConnector.importPrivateKey({
                 chainName,
                 privateKey,
             });
-            yield refresh();
+            isUpgrading.current = false;
         }
         catch (error) {
             // If soft delete succeeded but import failed, try to restore the wallet
             if (softDeleteSucceeded) {
                 yield restoreEmbeddedWallet({
                     environmentId,
-                    walletId,
+                    walletId: normalizedWalletId,
                 });
                 yield refresh();
             }
+            isUpgrading.current = false;
             throw error instanceof DynamicError
                 ? error
-                : new DynamicError('Upgrade failed');
+                : new DynamicError('Upgrade failed, please try again.');
         }
     }), [environmentId, getWalletConnector, primaryWallet, refresh]);
     const delegateKeyShares = useCallback((_f) => __awaiter(void 0, [_f], void 0, function* ({ chainName, accountAddress, }) {

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

@@ -8,22 +8,23 @@ var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
 var client = require('../../../client/client.cjs');
-require('@dynamic-labs-sdk/client/core');
-require('@dynamic-labs-sdk/client');
-require('../../../config/ApiEndpoint.cjs');
-var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
-require('../../constants/values.cjs');
-var errors = require('../../constants/errors.cjs');
-require('@dynamic-labs/multi-wallet');
+require('../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../shared/logger.cjs');
-require('../../constants/colors.cjs');
-require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+var errors = require('../../constants/errors.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
@@ -31,22 +32,19 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 var primaryWalletId = require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('@dynamic-labs-sdk/client');
+require('../../../config/ApiEndpoint.cjs');
 require('../../../store/state/projectSettings/projectSettings.cjs');
-var convertSdkUserToUserProfile = require('../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../functions/compareChains/compareChains.cjs');
-var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
@@ -55,6 +53,7 @@ require('@dynamic-labs/types');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
+var findPrimaryWalletVCForUser = require('../../functions/findPrimaryWalletVCForUser/findPrimaryWalletVCForUser.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');
 require('./useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('yup');
@@ -168,22 +167,7 @@ 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 setPrimaryWalletIdIfAvailable = React.useCallback((user) => {
-        var _a, _b, _c;
-        if (!user)
-            return false;
-        const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
-        const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(convertSdkUserToUserProfile.convertSdkUserToUserProfile(user), [primaryEmbeddedChain])) === null || _a === void 0 ? void 0 : _a.id;
-        const AAWalletCredentialId = (_c = (_b = user.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;
-        if (targetPrimaryWalletId) {
-            updatePrimaryWalletId.updatePrimaryWalletId(targetPrimaryWalletId);
-            return true;
-        }
-        return false;
-    }, [projectSettings]);
+    const findPrimaryWalletVCForUserCallback = React.useCallback((user) => findPrimaryWalletVCForUser.findPrimaryWalletVCForUser(user, projectSettings, true), [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
@@ -191,7 +175,10 @@ const useEmbeddedWallet = () => {
         const hasPrimaryWallet = primaryWalletId.getPrimaryWalletId();
         // If V3 wallets are enabled, never create V1/V2 wallets - they should be handled by WAAS flow
         if (embeddedWalletSettingVersion() === sdkApiCore.EmbeddedWalletVersionEnum.V3) {
-            !primaryWalletId.getPrimaryWalletId() && setPrimaryWalletIdIfAvailable(user);
+            const primaryWalletVC = findPrimaryWalletVCForUserCallback(user);
+            if (primaryWalletVC && !hasPrimaryWallet) {
+                updatePrimaryWalletId.updatePrimaryWalletId(primaryWalletVC.id);
+            }
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
@@ -199,7 +186,9 @@ const useEmbeddedWallet = () => {
         }
         // Turnkey and WAAS specific rules
         if (user) {
-            if (setPrimaryWalletIdIfAvailable(user)) {
+            const primaryWalletVC = findPrimaryWalletVCForUserCallback(user);
+            if (primaryWalletVC) {
+                updatePrimaryWalletId.updatePrimaryWalletId(primaryWalletVC.id);
                 return false;
             }
         }
@@ -211,7 +200,7 @@ const useEmbeddedWallet = () => {
     }, [
         projectSettings,
         embeddedWalletSettingVersion,
-        setPrimaryWalletIdIfAvailable,
+        findPrimaryWalletVCForUserCallback,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -1,25 +1,26 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { WalletProviderEnum, EmbeddedWalletVersionEnum } from '@dynamic-labs/sdk-api-core';
+import { EmbeddedWalletVersionEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import { getDynamicClient } from '../../../client/client.js';
-import '@dynamic-labs-sdk/client/core';
-import '@dynamic-labs-sdk/client';
-import '../../../config/ApiEndpoint.js';
-import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
-import '../../constants/values.js';
-import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
-import '@dynamic-labs/multi-wallet';
+import '../../../context/DynamicContext/DynamicContext.js';
+import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../shared/logger.js';
-import '../../constants/colors.js';
-import 'react-international-phone';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { hasEmbeddedWallet } from '../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
@@ -27,22 +28,19 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import { getPrimaryWalletId } from '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client/core';
+import '@dynamic-labs-sdk/client';
+import '../../../config/ApiEndpoint.js';
 import '../../../store/state/projectSettings/projectSettings.js';
-import { convertSdkUserToUserProfile } from '../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.js';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../locale/locale.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../functions/compareChains/compareChains.js';
-import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
@@ -51,6 +49,7 @@ import '@dynamic-labs/types';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../context/LoadingContext/LoadingContext.js';
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
+import { findPrimaryWalletVCForUser } from '../../functions/findPrimaryWalletVCForUser/findPrimaryWalletVCForUser.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';
 import './useSecureEnclaveEmbeddedWallet/constants.js';
 import 'yup';
@@ -164,22 +163,7 @@ 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 setPrimaryWalletIdIfAvailable = useCallback((user) => {
-        var _a, _b, _c;
-        if (!user)
-            return false;
-        const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
-        const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials(convertSdkUserToUserProfile(user), [primaryEmbeddedChain])) === null || _a === void 0 ? void 0 : _a.id;
-        const AAWalletCredentialId = (_c = (_b = user.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;
-        if (targetPrimaryWalletId) {
-            updatePrimaryWalletId(targetPrimaryWalletId);
-            return true;
-        }
-        return false;
-    }, [projectSettings]);
+    const findPrimaryWalletVCForUserCallback = useCallback((user) => findPrimaryWalletVCForUser(user, projectSettings, true), [projectSettings]);
     const shouldAutoCreateEmbeddedWallet = useCallback(() => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings);
@@ -187,7 +171,10 @@ const useEmbeddedWallet = () => {
         const hasPrimaryWallet = getPrimaryWalletId();
         // If V3 wallets are enabled, never create V1/V2 wallets - they should be handled by WAAS flow
         if (embeddedWalletSettingVersion() === EmbeddedWalletVersionEnum.V3) {
-            !getPrimaryWalletId() && setPrimaryWalletIdIfAvailable(user);
+            const primaryWalletVC = findPrimaryWalletVCForUserCallback(user);
+            if (primaryWalletVC && !hasPrimaryWallet) {
+                updatePrimaryWalletId(primaryWalletVC.id);
+            }
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
@@ -195,7 +182,9 @@ const useEmbeddedWallet = () => {
         }
         // Turnkey and WAAS specific rules
         if (user) {
-            if (setPrimaryWalletIdIfAvailable(user)) {
+            const primaryWalletVC = findPrimaryWalletVCForUserCallback(user);
+            if (primaryWalletVC) {
+                updatePrimaryWalletId(primaryWalletVC.id);
                 return false;
             }
         }
@@ -207,7 +196,7 @@ const useEmbeddedWallet = () => {
     }, [
         projectSettings,
         embeddedWalletSettingVersion,
-        setPrimaryWalletIdIfAvailable,
+        findPrimaryWalletVCForUserCallback,
     ]);
     return {
         createEmbeddedWallet,

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

@@ -44,11 +44,12 @@ var user = require('../../../../data/api/user/user.cjs');
 require('../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
+var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
+var errors = require('../../../constants/errors.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../../context/UserWalletsContext/UserWalletsContext.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');
@@ -65,7 +66,6 @@ require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 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 getNewVerifiedCredentialsFromDiff = require('../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.cjs');
 var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');

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

@@ -40,11 +40,12 @@ import { refreshUserJwt } from '../../../../data/api/user/user.js';
 import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
+import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.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/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.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';
@@ -61,7 +62,6 @@ import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 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 { getNewVerifiedCredentialsFromDiff } from '../../../functions/getNewVerifiedCredentialsFromDiff/getNewVerifiedCredentialsFromDiff.js';
 import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';

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

@@ -32,17 +32,17 @@ var updatePrimaryWalletId = require('../../../../functions/updatePrimaryWalletId
 require('../../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('../../../../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../../../../config/ApiEndpoint.cjs');
 require('../../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../../locale/locale.cjs');
-require('../../../../../store/state/authMode/authMode.cjs');
 var errors = require('../../../../constants/errors.cjs');
+require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../../../store/state/authMode/authMode.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

@@ -28,17 +28,17 @@ import { updatePrimaryWalletId } from '../../../../functions/updatePrimaryWallet
 import '../../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '@dynamic-labs-sdk/client/core';
 import '../../../../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../../../../config/ApiEndpoint.js';
 import '../../../../../store/state/projectSettings/projectSettings.js';
 import '../../../../../locale/locale.js';
-import '../../../../../store/state/authMode/authMode.js';
 import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
+import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../../../store/state/authMode/authMode.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';

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

@@ -18,6 +18,7 @@ require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/consts/index.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
+var useGetUserMfaMethods = require('../useGetUserMfaMethods/useGetUserMfaMethods.cjs');
 
 /**
  * Get MFA token
@@ -38,27 +39,46 @@ var projectSettings = require('../../../store/state/projectSettings/projectSetti
  *  );
  * }
  */
-const useGetMfaToken = () => React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ mfaAction } = {}) {
-    var _a, _b, _c;
-    const projectSettings$1 = projectSettings.getProjectSettings();
-    const isMfaRequiredForAction = (_c = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.security) === null || _a === void 0 ? void 0 : _a.mfa) === null || _b === void 0 ? void 0 : _b.actions) === null || _c === void 0 ? void 0 : _c.some((action) => action.action === mfaAction && action.required);
-    if (mfaAction && !isMfaRequiredForAction) {
-        // if mfa token is not required, return undefined
-        return;
-    }
-    try {
-        const mfaToken = client.consumeMfaToken();
-        return mfaToken;
-    }
-    catch (error) {
+const useGetMfaToken = () => {
+    const getUserMfaMethods = useGetUserMfaMethods.useGetUserMfaMethods();
+    const shouldConsumeMfaToken = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* ({ mfaAction } = {}) {
+        var _a, _b, _c, _d, _e;
         if (!mfaAction) {
-            logger.logger.warn('No MFA token found', error);
+            return true;
+        }
+        const projectSettings$1 = projectSettings.getProjectSettings();
+        const isMfaRequiredForAction = (_c = (_b = (_a = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.security) === null || _a === void 0 ? void 0 : _a.mfa) === null || _b === void 0 ? void 0 : _b.actions) === null || _c === void 0 ? void 0 : _c.some((action) => action.action === mfaAction && action.required);
+        // if mfa token is not required for this action, no need to consume it
+        if (!isMfaRequiredForAction) {
+            return false;
+        }
+        const isMfaMethodRequired = (_e = (_d = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.security) === null || _d === void 0 ? void 0 : _d.mfa) === null || _e === void 0 ? void 0 : _e.required;
+        if (isMfaMethodRequired) {
+            return true;
+        }
+        const methods = yield getUserMfaMethods();
+        // if mfa is not required and user has no methods registered, no need to consume the token
+        return methods.userHasVerifiedMfaMethods;
+    }), [getUserMfaMethods]);
+    return React.useCallback((...args_2) => _tslib.__awaiter(void 0, [...args_2], void 0, function* ({ mfaAction } = {}) {
+        const shouldConsume = yield shouldConsumeMfaToken({ mfaAction });
+        if (!shouldConsume) {
             return;
         }
-        const errorMessage = `MFA Token required for this action: ${mfaAction}`;
-        logger.logger.error(errorMessage, error);
-        throw new utils.DynamicError(errorMessage);
-    }
-}), []);
+        try {
+            const mfaToken = client.consumeMfaToken();
+            return mfaToken;
+        }
+        catch (error) {
+            if (!mfaAction) {
+                logger.logger.warn('No MFA token found', error);
+                return;
+            }
+            const errorMessage = `MFA Token required for this action: ${mfaAction}`;
+            logger.logger.error(errorMessage, error);
+            throw new utils.DynamicError(errorMessage);
+        }
+    }), [shouldConsumeMfaToken]);
+};
 
 exports.useGetMfaToken = useGetMfaToken;