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

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

@@ -6,19 +6,18 @@ 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 walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+require('../../../../../context/DynamicContext/DynamicContext.cjs');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../../../constants/colors.cjs');
 require('../../../../constants/values.cjs');
-require('../../../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('@dynamic-labs/utils');
+require('../../../../../store/state/loadingAndLifecycle.cjs');
 require('../../../../../shared/consts/index.cjs');
-require('../../../../../context/DynamicContext/DynamicContext.cjs');
 var dynamicEvents = require('../../../../../events/dynamicEvents.cjs');
 require('../../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../../context/ErrorContext/ErrorContext.cjs');
@@ -26,11 +25,12 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/f
 var findTurnkeyWallet = require('../../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+var getUserWalletsFromVerifiedCredentials = require('../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 require('../../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
+require('../../../../../store/state/user/user.cjs');
 require('../../../../../locale/locale.cjs');
-var getUserWalletsFromVerifiedCredentials = require('../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 var getUserVerifiedCredentialType = require('../../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
+require('../../../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -39,9 +39,11 @@ require('../../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useCreateDynamicEmbeddedWalletMutation = require('../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.cjs');
 require('../../../../../context/WalletContext/WalletContext.cjs');
+var useSmartWallets = require('../../../useSmartWallets/useSmartWallets.cjs');
 var findPrimaryEmbeddedChain = require('../../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
-var smartWallet = require('../../../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
+require('../constants.cjs');
 var findPasskeyEmailWalletConnector = require('../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.cjs');
+var smartWallet = require('../../../useWalletConnectors/utils/smartWallet/smartWallet.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -52,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');
@@ -71,26 +75,38 @@ 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
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
+    const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         yield createDynamicEmbeddedWalletMutation({
             chains,
@@ -132,9 +148,10 @@ const useTurnkey = () => {
         });
     }), [setShowAuthFlow, setView]);
     const returnEmbeddedWallet = React.useCallback((embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -145,33 +162,39 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet$1.id);
+                newPrimaryWalletId = smartWallet$1.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
-        const authenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = {
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            authenticated,
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connected: true,
-            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+        const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
+        if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
+            throw new Error('Could not find the embedded wallet connector');
+        }
+        const connector = turnkeyWallet.walletConnector;
+        const passkeyWallet = connector.createWallet({
+            address: (yield connector.getAddress()) || '',
+            chain: connector.connectedChain,
+            connector,
             id: embeddedWalletVerifiedCredential.id,
-            key: embeddedWalletVerifiedCredential.walletName ||
-                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
-                '',
-        };
+            isAuthenticated,
+            key: embeddedWalletVerifiedCredential.walletName || connector.key || '',
+        });
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _c, _d, _e, _f, _g;
         if (!user) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
         }
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
+        const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+        const isSessionKeyCompatible = (primaryWallet && walletConnectorCore.isSessionKeyCompatibleWallet(primaryWallet)) ||
+            (eoaWallet && walletConnectorCore.isSessionKeyCompatibleWallet(eoaWallet));
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
@@ -181,9 +204,10 @@ const useTurnkey = () => {
         if (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) ||
             (!embeddedWalletVerifiedCredential && isManualMode)) {
             const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
-            if ((!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
+            if ((!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup) &&
                 hasEmailVC) ||
-                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation)) {
+                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation) ||
+                isSessionKeyCompatible) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -197,20 +221,19 @@ const useTurnkey = () => {
             // backend if this called as part of a new user sign up.
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
-                ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
+                ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
                 const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings));
                 if (!walletConnector) {
-                    throw new Error('Could not find the Embedded wallet connector');
+                    throw new Error('Could not find the embedded wallet connector');
                 }
-                const wallet = {
+                const wallet = walletConnector.createWallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    chain: walletConnector.connectedChain || '',
-                    connected: true,
+                    chain: walletConnector.connectedChain,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
-                };
+                    isAuthenticated: Boolean((_f = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _f === void 0 ? void 0 : _f.isAuthenticatorAttached),
+                    key: (_g = embeddedWalletVerifiedCredential.walletName) !== null && _g !== void 0 ? _g : walletConnector.key,
+                });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
@@ -225,12 +248,14 @@ const useTurnkey = () => {
     }), [
         user,
         projectSettings,
-        returnEmbeddedWallet,
-        setPrimaryWalletId,
+        primaryWallet,
+        getEOAWallet,
         setShowAuthFlow,
+        returnEmbeddedWallet,
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
+        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -1,8 +1,7 @@
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
-import { WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
-import { Wallet } from '../../../../../shared';
+import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
+import { Wallet, WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
 export declare const useTurnkey: () => {
-    readonly createTurnkeyWallet: (chains?: ChainEnum[], options?: {
+    readonly createTurnkeyWallet: (chains?: EmbeddedWalletChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;
     }) => Promise<Wallet | undefined>;
 };

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

@@ -2,19 +2,18 @@
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
+import { isSessionKeyCompatibleWallet } from '@dynamic-labs/wallet-connector-core';
+import '../../../../../context/DynamicContext/DynamicContext.js';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 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 '../../../../../context/DynamicContext/DynamicContext.js';
 import { dynamicEvents } from '../../../../../events/dynamicEvents.js';
 import '../../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../../context/ErrorContext/ErrorContext.js';
@@ -22,11 +21,12 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions
 import { findTurnkeyWalletByChain } from '../../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import { getUserWalletsFromVerifiedCredentials } from '../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import '../../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
+import '../../../../../store/state/user/user.js';
 import '../../../../../locale/locale.js';
-import { getUserWalletsFromVerifiedCredentials } from '../../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { getUserVerifiedCredentialType } from '../../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
+import '../../../../../store/state/projectSettings/projectSettings.js';
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -35,9 +35,11 @@ import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useCreateDynamicEmbeddedWalletMutation } from '../../../useCreateDynamicEmbeddedWalletMutation/useCreateDynamicEmbeddedWalletMutation.js';
 import '../../../../../context/WalletContext/WalletContext.js';
+import { useSmartWallets } from '../../../useSmartWallets/useSmartWallets.js';
 import { findPrimaryEmbeddedChain } from '../../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
-import { findSmartWallet, initializeSmartWallet } from '../../../useWalletConnectors/utils/smartWallet/smartWallet.js';
+import '../constants.js';
 import { findPasskeyEmailWalletConnector } from '../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.js';
+import { findSmartWallet, initializeSmartWallet } from '../../../useWalletConnectors/utils/smartWallet/smartWallet.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '../../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -48,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';
@@ -67,26 +71,38 @@ 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
 const useTurnkey = () => {
-    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, } = useInternalDynamicContext();
+    const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
+    const { getEOAWallet } = useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
         yield createDynamicEmbeddedWalletMutation({
             chains,
@@ -128,9 +144,10 @@ const useTurnkey = () => {
         });
     }), [setShowAuthFlow, setView]);
     const returnEmbeddedWallet = useCallback((embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const { chain } = embeddedWalletVerifiedCredential;
         const turnkeyWallet = findTurnkeyWalletByChain(walletConnectorOptions, chain);
+        let newPrimaryWalletId = null;
         // if user already has embedded wallet, set it as primary wallet
         if (user) {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
@@ -141,33 +158,39 @@ const useTurnkey = () => {
                     verifiedCredentials: user.verifiedCredentials,
                     walletConnectorOptions,
                 });
-                setPrimaryWalletId(smartWallet.id);
+                newPrimaryWalletId = smartWallet.id;
             }
             else {
-                setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
+                newPrimaryWalletId = embeddedWalletVerifiedCredential.id;
             }
         }
+        if (newPrimaryWalletId)
+            setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
-        const authenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = {
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            authenticated,
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connected: true,
-            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+        const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
+        if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
+            throw new Error('Could not find the embedded wallet connector');
+        }
+        const connector = turnkeyWallet.walletConnector;
+        const passkeyWallet = connector.createWallet({
+            address: (yield connector.getAddress()) || '',
+            chain: connector.connectedChain,
+            connector,
             id: embeddedWalletVerifiedCredential.id,
-            key: embeddedWalletVerifiedCredential.walletName ||
-                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
-                '',
-        };
+            isAuthenticated,
+            key: embeddedWalletVerifiedCredential.walletName || connector.key || '',
+        });
         return Promise.resolve(passkeyWallet);
     }), [setPrimaryWalletId, walletConnectorOptions, user]);
     const createTurnkeyWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f, _g, _h, _j;
+        var _c, _d, _e, _f, _g;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
+        const eoaWallet = primaryWallet && getEOAWallet(primaryWallet);
+        const isSessionKeyCompatible = (primaryWallet && isSessionKeyCompatibleWallet(primaryWallet)) ||
+            (eoaWallet && isSessionKeyCompatibleWallet(eoaWallet));
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
@@ -177,9 +200,10 @@ const useTurnkey = () => {
         if (!(userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) ||
             (!embeddedWalletVerifiedCredential && isManualMode)) {
             const hasEmailVC = getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email);
-            if ((!((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.forceAuthenticatorAtSignup) &&
+            if ((!((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.forceAuthenticatorAtSignup) &&
                 hasEmailVC) ||
-                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation)) {
+                (options === null || options === void 0 ? void 0 : options.webAuthnAttestation) ||
+                isSessionKeyCompatible) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -193,20 +217,19 @@ const useTurnkey = () => {
             // backend if this called as part of a new user sign up.
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
-                ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation)) {
+                ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation)) {
                 const walletConnector = findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain(projectSettings));
                 if (!walletConnector) {
-                    throw new Error('Could not find the Embedded wallet connector');
+                    throw new Error('Could not find the embedded wallet connector');
                 }
-                const wallet = {
+                const wallet = walletConnector.createWallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    authenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    chain: walletConnector.connectedChain || '',
-                    connected: true,
+                    chain: walletConnector.connectedChain,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                    key: (_j = embeddedWalletVerifiedCredential.walletName) !== null && _j !== void 0 ? _j : walletConnector.key,
-                };
+                    isAuthenticated: Boolean((_f = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _f === void 0 ? void 0 : _f.isAuthenticatorAttached),
+                    key: (_g = embeddedWalletVerifiedCredential.walletName) !== null && _g !== void 0 ? _g : walletConnector.key,
+                });
                 setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
                 dynamicEvents.emit('embeddedWalletCreated', wallet, embeddedWalletVerifiedCredential, user);
             }
@@ -221,12 +244,14 @@ const useTurnkey = () => {
     }), [
         user,
         projectSettings,
-        returnEmbeddedWallet,
-        setPrimaryWalletId,
+        primaryWallet,
+        getEOAWallet,
         setShowAuthFlow,
+        returnEmbeddedWallet,
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
+        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -14,11 +14,10 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('@dynamic-labs/utils');
+require('../../../store/state/loadingAndLifecycle.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -26,14 +25,16 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
+require('../../../store/state/user/user.cjs');
 require('../../../locale/locale.cjs');
+require('../../../store/state/projectSettings/projectSettings.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
+require('../useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
 require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
@@ -44,6 +45,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');
@@ -63,19 +66,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');
 
 const useEmbeddedWalletAuthenticator = () => {

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

@@ -1,5 +1,5 @@
 import { AuthenticatorType } from '@dynamic-labs/wallet-connector-core';
 export declare const useEmbeddedWalletAuthenticator: () => {
     addEmbeddedWalletRecoveryEmail: () => Promise<void>;
-    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("../../../shared").Wallet | undefined>;
+    createOrRefreshAuthenticatorSession: (authenticatorType?: AuthenticatorType) => Promise<import("@dynamic-labs/wallet-connector-core").Wallet<import("@dynamic-labs/wallet-connector-core").WalletConnectorCore.WalletConnector> | undefined>;
 };