@dynamic-labs/sdk-react-core 4.20.7 → 4.20.9

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

@@ -23,9 +23,11 @@ import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -25,7 +25,6 @@ var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
@@ -34,7 +33,10 @@ require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');

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

@@ -21,7 +21,6 @@ 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 '../../../store/state/projectSettings/projectSettings.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
@@ -30,7 +29,10 @@ import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
+import '../../../store/state/projectSettings/projectSettings.js';
+import '@dynamic-labs-sdk/client/core';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../locale/locale.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';

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

@@ -20,10 +20,13 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -16,10 +16,13 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';
+import '@dynamic-labs-sdk/client/core';
+import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -20,9 +20,12 @@ require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../../../client/client.cjs');
+require('../../../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../../../config/ApiEndpoint.cjs');
-require('../../../../../store/state/user/user.cjs');
 require('../../../../../locale/locale.cjs');
 require('../../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../../store/state/primaryWalletId/primaryWalletId.cjs');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -16,9 +16,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../../../store/state/projectSettings/projectSettings.js';
+import '../../../../../client/client.js';
+import '../../../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client';
 import '../../../../../config/ApiEndpoint.js';
-import '../../../../../store/state/user/user.js';
 import '../../../../../locale/locale.js';
 import '../../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../../store/state/primaryWalletId/primaryWalletId.js';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -20,9 +20,12 @@ require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');
 var isProviderEnabled = require('../../../../functions/isProviderEnabled/isProviderEnabled.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../../../client/client.cjs');
+require('../../../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../../../config/ApiEndpoint.cjs');
-require('../../../../../store/state/user/user.cjs');
 require('../../../../../locale/locale.cjs');
 require('../../../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../../../store/state/primaryWalletId/primaryWalletId.cjs');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -16,9 +16,12 @@ import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';
 import { isProviderEnabled } from '../../../../functions/isProviderEnabled/isProviderEnabled.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../../../store/state/projectSettings/projectSettings.js';
+import '../../../../../client/client.js';
+import '../../../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client';
 import '../../../../../config/ApiEndpoint.js';
-import '../../../../../store/state/user/user.js';
 import '../../../../../locale/locale.js';
 import '../../../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -21,15 +21,17 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('../../../client/client.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../locale/locale.cjs');
 var user = require('../../../data/api/user/user.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
-require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');

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

@@ -17,15 +17,17 @@ import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-sdk/client/core';
+import '../../../client/client.js';
+import '../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client';
 import { useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../store/state/user/user.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../locale/locale.js';
 import { hardDeleteUser } from '../../../data/api/user/user.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
-import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';

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

@@ -26,9 +26,11 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -22,9 +22,11 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -24,10 +24,12 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var isAllowedToLinkWallet = require('../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.cjs');
+require('@dynamic-labs-sdk/client/core');
+require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -20,10 +20,12 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import '../../../store/state/projectSettings/projectSettings.js';
 import { isAllowedToLinkWallet } from '../../functions/isAllowedToLinkWallet/isAllowedToLinkWallet.js';
+import '@dynamic-labs-sdk/client/core';
+import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -24,9 +24,11 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -20,9 +20,11 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -7,6 +7,14 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
+require('@dynamic-labs-sdk/client/core');
+var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../constants/values.cjs');
+var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
+require('../../../client/client.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
+var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../shared/logger.cjs');
@@ -16,17 +24,13 @@ 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');
 require('@dynamic-labs/multi-wallet');
 var getMinAuthToken = require('../../functions/getMinAuthToken/getMinAuthToken.cjs');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
-var isCookieEnabled = require('../../functions/isCookieEnabled/isCookieEnabled.cjs');
-var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
@@ -35,7 +39,6 @@ require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
-var user = require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -119,8 +122,8 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
 const useDynamicWaas = () => {
     var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
-    const { user: user$1 } = user.useUser();
     const { addedWalletsIds, userWallets } = UserWalletsContext.useInternalUserWallets();
+    const user = useOnboardingCompleteUser.useOnboardingCompleteUserProfile();
     const apiBaseUrl = dynamicContextProps.useApiBaseUrl();
     const projectSettings$1 = projectSettings.useProjectSettings();
     const environmentId = dynamicContextProps.useEnvironmentId();
@@ -177,7 +180,7 @@ const useDynamicWaas = () => {
         if (invalidChains && invalidChains.length) {
             throw new utils.DynamicError(`${constants.INVALID_CHAINS_ERROR}: ${invalidChains.join(', ')}`);
         }
-        const previousVerifiedCredentials = (user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) || [];
+        const previousVerifiedCredentials = (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || [];
         const results = yield Promise.allSettled(chainNames.map((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
             const walletConnector = getWalletConnector(chain);
             if (!walletConnector)
@@ -235,11 +238,11 @@ const useDynamicWaas = () => {
         enabledChainNames,
         refresh,
         setShowAuthFlow,
-        user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials,
+        user === null || user === void 0 ? void 0 : user.verifiedCredentials,
         addedWalletsIds,
     ]);
     const needsAutoCreateWalletChains = React.useMemo(() => {
-        if (!user$1 ||
+        if (!user ||
             !dynamicWaasIsEnabled ||
             !automaticEmbeddedWalletCreationEnabled) {
             return [];
@@ -247,21 +250,21 @@ const useDynamicWaas = () => {
         // check if user have any wallet (V1, V2, or V3/dynamicwaas) for this chain
         const hasEmbeddedWalletForChain = (chain) => {
             var _a;
-            return (_a = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials.some((wallet) => wallet.chain &&
+            return (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((wallet) => wallet.chain &&
                 compareChains.compareChains(wallet.chain, chain) &&
                 wallet.walletProvider === sdkApiCore.WalletProviderEnum.EmbeddedWallet)) !== null && _a !== void 0 ? _a : false;
         };
         // For each enabled chain, if user does NOT have a V3 wallet and does NOT have a V1/V2 wallet, add to missing
         const missingChains = enabledChainNames === null || enabledChainNames === void 0 ? void 0 : enabledChainNames.filter((chain) => !hasEmbeddedWalletForChain(chain));
         // If user has an external wallet, only create if automaticEmbeddedWalletCreationForExternalEnabled is true
-        const hasExternalWallet = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials.some((vc) => vc.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain &&
+        const hasExternalWallet = user === null || user === void 0 ? void 0 : user.verifiedCredentials.some((vc) => vc.format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain &&
             vc.walletProvider !== sdkApiCore.WalletProviderEnum.EmbeddedWallet);
         const shouldCreateDynamicWaasWallet = hasExternalWallet
             ? automaticEmbeddedWalletCreationForExternalEnabled
             : true;
         return shouldCreateDynamicWaasWallet ? missingChains : [];
     }, [
-        user$1,
+        user,
         dynamicWaasIsEnabled,
         automaticEmbeddedWalletCreationEnabled,
         automaticEmbeddedWalletCreationForExternalEnabled,

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

@@ -3,6 +3,14 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import '@dynamic-labs-sdk/client/core';
+import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
+import '../../constants/values.js';
+import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
+import '../../../client/client.js';
+import '../../../events/dynamicEvents.js';
+import '@dynamic-labs-sdk/client';
+import { useOnboardingCompleteUserProfile } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '../../../shared/logger.js';
@@ -12,17 +20,13 @@ 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 '@dynamic-labs/multi-wallet';
 import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
-import { isCookieEnabled } from '../../functions/isCookieEnabled/isCookieEnabled.js';
-import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/updatePrimaryWalletId.js';
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
@@ -31,7 +35,6 @@ import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../config/ApiEndpoint.js';
-import { useUser } from '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/authMode/authMode.js';
 import '../../../context/VerificationContext/VerificationContext.js';
@@ -115,8 +118,8 @@ const configWaasWalletConnector = ({ walletConnector, environmentId, apiBaseUrl,
 const useDynamicWaas = () => {
     var _a, _b, _c;
     const { setShowAuthFlow } = useInternalDynamicContext();
-    const { user } = useUser();
     const { addedWalletsIds, userWallets } = useInternalUserWallets();
+    const user = useOnboardingCompleteUserProfile();
     const apiBaseUrl = useApiBaseUrl();
     const projectSettings = useProjectSettings();
     const environmentId = useEnvironmentId();

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

@@ -24,9 +24,11 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -20,9 +20,11 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -26,9 +26,11 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
+require('@dynamic-labs-sdk/client/core');
 require('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../../client/client.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');

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

@@ -22,9 +22,11 @@ import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import '../../../store/state/nonce/nonce.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import '@dynamic-labs-sdk/client/core';
 import '../../../store/state/projectSettings/projectSettings.js';
+import '../../../client/client.js';
+import '@dynamic-labs-sdk/client';
 import '../../../config/ApiEndpoint.js';
-import '../../../store/state/user/user.js';
 import '../../../locale/locale.js';
 import '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';

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

@@ -7,6 +7,13 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 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('../../../store/state/projectSettings/projectSettings.cjs');
+require('../../constants/values.cjs');
+var convertSdkUserToUserProfile = require('../../../client/extension/user/convertSdkUserToUserProfile/convertSdkUserToUserProfile.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('@dynamic-labs-sdk/client');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('../../../shared/logger.cjs');
@@ -16,9 +23,7 @@ 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 findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
@@ -27,7 +32,6 @@ require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../store/state/nonce/nonce.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('../../../store/state/projectSettings/projectSettings.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updatePrimaryWalletId.cjs');
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
@@ -37,7 +41,6 @@ require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
 require('../../../store/state/authMode/authMode.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -162,38 +165,51 @@ 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;
+    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 shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
+        var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings);
+        const { user } = client.getDynamicClient();
         const hasPrimaryWallet = primaryWalletId.getPrimaryWalletId();
-        if (embeddedWalletSettingVersion() === sdkApiCore.EmbeddedWalletVersionEnum.V3 &&
-            !verifiedUser) {
+        // 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);
             return false;
         }
         if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey and WAAS specific rules
-        if (verifiedUser) {
-            const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
-            const embeddedWalletVerifiedCredentialId = (_a = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
-                primaryEmbeddedChain,
-            ])) === 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;
-            if (targetPrimaryWalletId) {
-                updatePrimaryWalletId.updatePrimaryWalletId(targetPrimaryWalletId);
+        if (user) {
+            if (setPrimaryWalletIdIfAvailable(user)) {
                 return false;
             }
         }
         if (isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) &&
-            !((_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)) {
+            !((_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;
-    }, [projectSettings]);
+    }, [
+        projectSettings,
+        embeddedWalletSettingVersion,
+        setPrimaryWalletIdIfAvailable,
+    ]);
     return {
         createEmbeddedWallet,
         createEmbeddedWalletAccount,