@dynamic-labs/sdk-react-core 3.0.0-alpha.3 → 3.0.0-alpha.31

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

@@ -26,14 +26,13 @@ import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -78,6 +77,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useEmailProvider = ({ emailWalletConnector }) => {

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

@@ -29,8 +29,6 @@ require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('viem');
-require('viem/chains');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -40,6 +38,7 @@ require('react-dom');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -82,6 +81,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded reveal

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

@@ -25,8 +25,6 @@ import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -36,6 +34,7 @@ import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
+import '../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -78,6 +77,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded reveal

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

@@ -5,18 +5,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 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('../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
-var values = require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../constants/values.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
@@ -30,8 +31,6 @@ require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
-require('viem');
-require('viem/chains');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -86,6 +85,17 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../polyfills.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../context/FundingContext/FundingContext.cjs');
+require('../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
@@ -104,12 +114,24 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId, setPrimaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
-    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, getWalletVersion: getTurnkeyWalletVersion, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = WalletContext.useWalletContext();
     const userHasEmbeddedWallet = () => hasEmbeddedWallet.hasEmbeddedWallet(user);
+    const getWalletVersion = () => {
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new utils.DynamicError('Embedded wallet not found');
+        }
+        if (isTurnkeyWallet) {
+            return getTurnkeyWalletVersion();
+        }
+        return undefined;
+    };
     /**
      * Creates Dynamic embedded wallet according to the settings
      * @param chains - array of chains to create the wallet for
@@ -142,21 +164,25 @@ const useEmbeddedWallet = () => {
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
     const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
-            const verifiedCredentialChain = values.ChainEnumToVerifiedCredentialName[primaryEmbeddedChain];
-            const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
-                verifiedCredentialChain,
-            ]);
-            if (embeddedWalletVerifiedCredential) {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            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) {
+                setPrimaryWalletId(targetPrimaryWalletId);
                 return false;
             }
         }
@@ -164,17 +190,18 @@ const useEmbeddedWallet = () => {
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings) &&
             isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) &&
-            !((_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)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,
         createPasskey,
         createPassword,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealWalletKey,

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

@@ -27,8 +27,9 @@ export declare const useEmbeddedWallet: () => {
     } | undefined) => Promise<import("dist/packages/wallet-connector-core/src").WebAuthnAttestation>;
     readonly createPassword: (showIntro?: boolean | undefined) => Promise<string>;
     readonly getPasskeys: () => Promise<import("@dynamic-labs/sdk-api-core").UserPasskey[]>;
+    readonly getWalletVersion: () => import("./useSecureEnclaveEmbeddedWallet/constants").EmbeddedWalletVersion | undefined;
     readonly isLoadingEmbeddedWallet: boolean;
-    readonly isSessionActive: boolean;
+    readonly isSessionActive: string | boolean | undefined;
     readonly revealWalletKey: (options?: {
         type: "recoveryPhrase" | "privateKey";
         htmlContainerId?: string | undefined;

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

@@ -1,18 +1,19 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
 import '../../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
-import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../constants/values.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
@@ -26,8 +27,6 @@ import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
 import { hasEmbeddedWallet } from '../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
@@ -82,6 +81,17 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../polyfills.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryBase.js';
+import '../../../context/ErrorBoundary/ErrorBoundaryContext.js';
+import '../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.js';
+import '../../../context/WidgetRegistry/WidgetRegistryContextProvider.js';
+import '../../../context/FundingContext/FundingContext.js';
+import '../../../context/SendBalanceContext/SendBalanceContext.js';
+import '../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../context/ConnectWithOtpContext/constants.js';
+import '../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
@@ -100,12 +110,24 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId, setPrimaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings, setPrimaryWalletId } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
-    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, getWalletVersion: getTurnkeyWalletVersion, } = useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = useWalletContext();
     const userHasEmbeddedWallet = () => hasEmbeddedWallet(user);
+    const getWalletVersion = () => {
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new DynamicError('Embedded wallet not found');
+        }
+        if (isTurnkeyWallet) {
+            return getTurnkeyWalletVersion();
+        }
+        return undefined;
+    };
     /**
      * Creates Dynamic embedded wallet according to the settings
      * @param chains - array of chains to create the wallet for
@@ -138,21 +160,25 @@ const useEmbeddedWallet = () => {
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
     const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        if (!hasEmbeddedWalletProviderEnabled || primaryWalletId) {
+        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
+        if (!hasEmbeddedWalletProviderEnabled || hasPrimaryWallet) {
             return false;
         }
         // Turnkey specific rules
         if (verifiedUser) {
             const primaryEmbeddedChain = findPrimaryEmbeddedChain(projectSettings);
-            const verifiedCredentialChain = ChainEnumToVerifiedCredentialName[primaryEmbeddedChain];
-            const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(verifiedUser, [
-                verifiedCredentialChain,
-            ]);
-            if (embeddedWalletVerifiedCredential) {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+            const embeddedWalletVerifiedCredentialId = (_a = 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 === WalletProviderEnum.SmartContractWallet)) === null || _c === void 0 ? void 0 : _c.id;
+            const targetPrimaryWalletId = AAWalletCredentialId
+                ? AAWalletCredentialId
+                : embeddedWalletVerifiedCredentialId;
+            if (targetPrimaryWalletId) {
+                setPrimaryWalletId(targetPrimaryWalletId);
                 return false;
             }
         }
@@ -160,17 +186,18 @@ const useEmbeddedWallet = () => {
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled(projectSettings) &&
             isTurnkeyEnabled(projectSettings) &&
-            !((_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)) {
+            !((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
             return false;
         }
         return true;
-    }, [primaryWalletId, projectSettings]);
+    }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
         createOrRestoreSession,
         createPasskey,
         createPassword,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealWalletKey,

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

@@ -13,7 +13,6 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/f
 require('../../../../constants/values.cjs');
 var errors = require('../../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../../functions/getAuthToken/getAuthToken.cjs');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
@@ -30,12 +29,11 @@ require('@dynamic-labs/store');
 require('../../../../../locale/locale.cjs');
 var wallets = require('../../../../../data/api/wallets/wallets.cjs');
 var getVerifyArgs = require('../../../../functions/getVerifyArgs/getVerifyArgs.cjs');
-require('viem');
-require('viem/chains');
 var findCoinbaseMPCWallet = require('../../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
 var getCoinbaseMPCConnectorFetchers = require('../../../../functions/getCoinbaseMPCConnectorFetchers/getCoinbaseMPCConnectorFetchers.cjs');
-require('../../../../../context/DynamicContext/DynamicContext.cjs');
 var dynamicEvents = require('../../../../../events/dynamicEvents.cjs');
+require('../../../../../context/DynamicContext/DynamicContext.cjs');
+var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
@@ -45,6 +43,7 @@ var getSiweStatement = require('../../../../functions/getSiweStatement/getSiweSt
 require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../../context/WalletContext/WalletContext.cjs');
+require('../../useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -87,26 +86,37 @@ require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyn
 require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+require('../../../../../../polyfills.cjs');
+require('../../../../../context/ErrorBoundary/ErrorBoundaryBase.cjs');
+require('../../../../../context/ErrorBoundary/ErrorBoundaryContext.cjs');
+require('../../../../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
+require('../../../../../widgets/DynamicWidget/components/DynamicWidgetCard/DynamicWidgetCard.cjs');
+require('../../../../../context/WidgetRegistry/WidgetRegistryContextProvider.cjs');
+require('../../../../../context/FundingContext/FundingContext.cjs');
+require('../../../../../context/SendBalanceContext/SendBalanceContext.cjs');
+require('../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../../../context/ConnectWithOtpContext/constants.cjs');
+require('../../../../../context/ReinitializeContext/ReinitializeContextProvider.cjs');
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
     const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setError } = ErrorContext.useErrorContext();
     const returnExistingCoinbaseMPCWallet = React.useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-        const coinbaseMPCWallet = {
+        const coinbaseMPCWallet = new walletConnectorCore.Wallet({
             address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-            authenticated: true,
             chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
-            connected: true,
             connector,
             id: embeddedWalletVerifiedCredential.id,
-        };
+            isAuthenticated: true,
+            key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
+        });
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
-    const linkCoinbaseMPCWallet = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ connector, backupCode, password, source, }) {
+    const linkCoinbaseMPCWallet = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
         const nonce = consumeNonce();
         if (nonce === undefined)
             throw new utils.DynamicError('Missing nonce');
@@ -147,6 +157,7 @@ const useCoinbaseMPC = () => {
         siweStatement,
     ]);
     const createNewCoinbaseMPCWallet = React.useCallback((connector, password) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        var _c;
         const initialWalletPassword = password
             ? password
             : generateRandomPassword.generateRandomPassword(DYNAMIC_PASSWORD_LENGTH);
@@ -161,15 +172,15 @@ const useCoinbaseMPC = () => {
                 password: initialWalletPassword,
                 source,
             });
-            const coinbaseMPCWallet = {
+            const coinbaseMPCWallet = new walletConnectorCore.Wallet({
                 address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
-                authenticated: true,
                 chain: (connector === null || connector === void 0 ? void 0 : connector.connectedChain) || '',
-                connected: true,
                 connector,
                 id: newSelectedCredentialWallet.id,
-            };
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, getAuthToken.getAuthToken(), updatedUser);
+                isAuthenticated: true,
+                key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
+            });
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
         catch (error) {
@@ -183,11 +194,11 @@ const useCoinbaseMPC = () => {
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
     const createCoinbaseMPCWallet = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (chains = [sdkApiCore.ChainEnum.Evm], password) {
-        var _b;
+        var _d;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
+        const connector = (_d = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _d === void 0 ? void 0 : _d.walletConnector;
         if (!connector || !walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
             const error = new utils.DynamicError('CoinbaseWaaSWalletConnectors not found');
             logger.logger.error('Failed to create embedded wallet', error);

package/src/lib/utils/hooks/useEmbeddedWallet/useMPCEmbeddedWallet/useCoinbaseMPC/useCoinbaseMPC.d.ts

@@ -1,5 +1,5 @@
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { Wallet } from '../../../../../shared';
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
 export declare const useCoinbaseMPC: () => {
     createCoinbaseMPCWallet: (chains?: ChainEnum[], password?: string) => Promise<Wallet | undefined>;
 };