@dynamic-labs/sdk-react-core 3.0.0-alpha.9 → 3.0.1

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

@@ -9,11 +9,10 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
-import '@dynamic-labs/utils';
+import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -21,11 +20,12 @@ import '../../../context/ErrorContext/ErrorContext.js';
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../store/state/user/user.js';
+import '../../../locale/locale.js';
+import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -34,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';
@@ -44,6 +45,8 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../store/state/environmentId.js';
+import '../../../store/state/walletConnectorOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -63,19 +66,30 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
-import '../../../views/WalletList/WalletList.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-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 '../../../store/state/tokenBalances.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/index.d.ts

@@ -1,3 +1,4 @@
 export { useEmbeddedWallet } from './useEmbeddedWallet';
 export { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet';
 export { useMPCEmbeddedWallet } from './useMPCEmbeddedWallet';
+export { EmbeddedWalletVersion } from './useSecureEnclaveEmbeddedWallet';

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

@@ -5,20 +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');
+var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
-var values = require('../../constants/values.cjs');
-var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
+require('../../constants/values.cjs');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -27,12 +26,13 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmb
 var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../locale/locale.cjs');
 var isTurnkeyEnabled = require('../../functions/isTurnkeyEnabled/isTurnkeyEnabled.cjs');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../store/state/user/user.cjs');
+require('../../../locale/locale.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -42,6 +42,7 @@ var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimary
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');
+require('./useSecureEnclaveEmbeddedWallet/constants.cjs');
 var useMPCEmbeddedWallet = require('./useMPCEmbeddedWallet/useMPCEmbeddedWallet.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
@@ -53,6 +54,8 @@ require('../../../views/CollectUserDataView/useFields.cjs');
 require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../store/state/environmentId.cjs');
+require('../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../components/Alert/Alert.cjs');
@@ -72,19 +75,30 @@ require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
-require('../../../views/WalletList/WalletList.cjs');
+require('../../../context/FooterAnimationContext/index.cjs');
+require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../store/state/sendBalances.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-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');
+require('../../../store/state/tokenBalances.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
@@ -105,10 +119,22 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useEmbeddedWallet = () => {
     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: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: revealCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createEmbeddedWalletAccount, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, getWalletVersion: getTurnkeyWalletVersion, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = WalletContext.useWalletContext();
-    const userHasEmbeddedWallet = () => hasEmbeddedWallet.hasEmbeddedWallet(user);
+    const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user), [user]);
+    const getWalletVersion = React.useCallback(() => {
+        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;
+    }, [getTurnkeyWalletVersion, isTurnkeyWallet, user, userHasEmbeddedWallet]);
     /**
      * Creates Dynamic embedded wallet according to the settings
      * @param chains - array of chains to create the wallet for
@@ -138,25 +164,28 @@ const useEmbeddedWallet = () => {
         if (isTurnkeyWallet) {
             return revealTurnkeyEmbeddedWalletKey(options);
         }
-        return reveaCoinbaseMPCEmbeddedWalletKey();
+        return revealCoinbaseMPCEmbeddedWalletKey();
     });
     const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
-        const hasPrimaryWallet = localStorage.LocalStorage.getFromLS(localStorage$1.PRIMARY_WALLET_ID);
+        const hasPrimaryWallet = utils.StorageService.getItem(localStorage.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 +193,19 @@ 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;
     }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
+        createEmbeddedWalletAccount,
         createOrRestoreSession,
         createPasskey,
         createPassword,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealWalletKey,

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

@@ -1,4 +1,4 @@
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../shared';
 import { UserProfile } from '../../../..';
 /**
@@ -16,9 +16,12 @@ import { UserProfile } from '../../../..';
  * }
  */
 export declare const useEmbeddedWallet: () => {
-    readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
+    readonly createEmbeddedWallet: (chains?: EmbeddedWalletChainEnum[], options?: {
         webAuthnAttestation: import("dist/packages/wallet-connector-core/src").WebAuthnAttestation;
     } | undefined) => Promise<Wallet | undefined>;
+    readonly createEmbeddedWalletAccount: ({ chain }: {
+        chain: EmbeddedWalletChainEnum;
+    }) => Promise<UserProfile | undefined>;
     readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
     } | undefined) => Promise<string | undefined>;
@@ -27,6 +30,7 @@ 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(".").EmbeddedWalletVersion | undefined;
     readonly isLoadingEmbeddedWallet: boolean;
     readonly isSessionActive: boolean;
     readonly revealWalletKey: (options?: {

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

@@ -1,9 +1,9 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
-import { DynamicError } from '@dynamic-labs/utils';
+import { WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
+import { DynamicError, StorageService } 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';
@@ -12,9 +12,8 @@ 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 { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
+import '../../constants/values.js';
+import '../../../store/state/loadingAndLifecycle.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
@@ -23,12 +22,13 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findE
 import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.js';
 import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
+import '../../../config/ApiEndpoint.js';
+import '../../../store/state/user/user.js';
+import '../../../locale/locale.js';
 import { hasEmbeddedWallet } from '../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
+import '../../../store/state/projectSettings/projectSettings.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -38,6 +38,7 @@ import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrima
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';
+import './useSecureEnclaveEmbeddedWallet/constants.js';
 import { useMPCEmbeddedWallet } from './useMPCEmbeddedWallet/useMPCEmbeddedWallet.js';
 import '../../../context/ThemeContext/ThemeContext.js';
 import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
@@ -49,6 +50,8 @@ import '../../../views/CollectUserDataView/useFields.js';
 import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import '../../../store/state/environmentId.js';
+import '../../../store/state/walletConnectorOptions.js';
 import 'react-i18next';
 import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../components/Alert/Alert.js';
@@ -68,19 +71,30 @@ import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
-import '../../../views/WalletList/WalletList.js';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../store/state/sendBalances.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-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 '../../../store/state/tokenBalances.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 // Hook exposed to customers and used internally to trigger embedded wallet creation
@@ -101,10 +115,22 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useEmbeddedWallet = () => {
     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: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: revealCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createEmbeddedWalletAccount, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, getWalletVersion: getTurnkeyWalletVersion, } = useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = useWalletContext();
-    const userHasEmbeddedWallet = () => hasEmbeddedWallet(user);
+    const userHasEmbeddedWallet = useCallback(() => hasEmbeddedWallet(user), [user]);
+    const getWalletVersion = useCallback(() => {
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
+        if (!userHasEmbeddedWallet()) {
+            throw new DynamicError('Embedded wallet not found');
+        }
+        if (isTurnkeyWallet) {
+            return getTurnkeyWalletVersion();
+        }
+        return undefined;
+    }, [getTurnkeyWalletVersion, isTurnkeyWallet, user, userHasEmbeddedWallet]);
     /**
      * Creates Dynamic embedded wallet according to the settings
      * @param chains - array of chains to create the wallet for
@@ -134,25 +160,28 @@ const useEmbeddedWallet = () => {
         if (isTurnkeyWallet) {
             return revealTurnkeyEmbeddedWalletKey(options);
         }
-        return reveaCoinbaseMPCEmbeddedWalletKey();
+        return revealCoinbaseMPCEmbeddedWalletKey();
     });
     const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
-        const hasPrimaryWallet = LocalStorage.getFromLS(PRIMARY_WALLET_ID);
+        const hasPrimaryWallet = StorageService.getItem(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 +189,19 @@ 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;
     }, [projectSettings, setPrimaryWalletId]);
     return {
         createEmbeddedWallet,
+        createEmbeddedWalletAccount,
         createOrRestoreSession,
         createPasskey,
         createPassword,
         getPasskeys,
+        getWalletVersion,
         isLoadingEmbeddedWallet,
         isSessionActive,
         revealWalletKey,

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

@@ -14,35 +14,35 @@ require('../../../../constants/values.cjs');
 var errors = require('../../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 var logger = require('../../../../../shared/logger.cjs');
+require('../../../../constants/colors.cjs');
+require('react-international-phone');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('../../../../constants/colors.cjs');
-require('../../../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../../../shared/utils/classes/storage/sessionStorage.cjs');
 var generateRandomPassword = require('../../../../../shared/utils/functions/generateRandomPassword/generateRandomPassword.cjs');
+require('../../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../../shared/consts/index.cjs');
-require('react-international-phone');
-require('../../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../../locale/locale.cjs');
-var wallets = require('../../../../../data/api/wallets/wallets.cjs');
 var getVerifyArgs = require('../../../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var findCoinbaseMPCWallet = require('../../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
 var getCoinbaseMPCConnectorFetchers = require('../../../../functions/getCoinbaseMPCConnectorFetchers/getCoinbaseMPCConnectorFetchers.cjs');
-var dynamicEvents = require('../../../../../events/dynamicEvents.cjs');
+require('../../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../../context/DynamicContext/DynamicContext.cjs');
-var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
+var dynamicEvents = require('../../../../../events/dynamicEvents.cjs');
 require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
 var ErrorContext = require('../../../../../context/ErrorContext/ErrorContext.cjs');
 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');
+var wallets = require('../../../../../data/api/wallets/wallets.cjs');
 var getSiweStatement = require('../../../../functions/getSiweStatement/getSiweStatement.cjs');
 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');
@@ -53,6 +53,8 @@ require('../../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../../../../../store/state/environmentId.cjs');
+require('../../../../../store/state/walletConnectorOptions.cjs');
 require('react-i18next');
 require('../../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../../components/Alert/Alert.cjs');
@@ -72,19 +74,31 @@ require('../../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
-require('../../../../../views/WalletList/WalletList.cjs');
+require('../../../../../context/FooterAnimationContext/index.cjs');
+require('../../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../../../context/FooterAnimationContext/index.cjs');
-require('../../../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
+require('../../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../../store/state/sendBalances.cjs');
 require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-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');
+require('../../../../../store/state/tokenBalances.cjs');
+var useInternalDynamicContext = require('../../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
@@ -94,15 +108,14 @@ const useCoinbaseMPC = () => {
         var _a;
         connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
-        const coinbaseMPCWallet = {
+        const coinbaseMPCWallet = connector.createWallet({
             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,
+            chain: connector.connectedChain,
             connector,
             id: embeddedWalletVerifiedCredential.id,
+            isAuthenticated: true,
             key: (_a = embeddedWalletVerifiedCredential.walletName) !== null && _a !== void 0 ? _a : connector.key,
-        };
+        });
         return coinbaseMPCWallet;
     }), [setPrimaryWalletId]);
     const linkCoinbaseMPCWallet = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ connector, backupCode, password, source, }) {
@@ -161,15 +174,14 @@ const useCoinbaseMPC = () => {
                 password: initialWalletPassword,
                 source,
             });
-            const coinbaseMPCWallet = {
+            const coinbaseMPCWallet = connector.createWallet({
                 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,
+                chain: connector === null || connector === void 0 ? void 0 : connector.connectedChain,
                 connector,
                 id: newSelectedCredentialWallet.id,
+                isAuthenticated: true,
                 key: (_c = newSelectedCredentialWallet.walletName) !== null && _c !== void 0 ? _c : connector.key,
-            };
+            });
             dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, newSelectedCredentialWallet, updatedUser);
             return coinbaseMPCWallet;
         }
@@ -183,7 +195,7 @@ 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) {
+    const createCoinbaseMPCWallet = React.useCallback((...args_1) => _tslib.__awaiter(void 0, [...args_1], void 0, function* (chains = [sdkApiCore.EmbeddedWalletChainEnum.Evm], password) {
         var _d;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);