@dynamic-labs/sdk-react-core 2.1.0-alpha.2 → 2.1.0-alpha.4

package/src/lib/utils/constants/errors.cjs

@@ -10,7 +10,6 @@ const ERROR_SENDING_CODE = 'error_sending_code';
 const INVALID_REQUEST = 'invalid_request';
 const INVALID_WALLET_DATA = 'invalid_wallet';
 const SECURE_ENCLAVE_PROVIDER_NOT_ENABLED = 'secure_enclave_provider_not_enabled';
-const NO_SECURE_ENCLAVE_WALLET_FOUND = 'no_secure_enclave_wallet_found';
 const USER_NOT_LOGGED_IN = 'user_not_logged_in';
 const CODE_SENT = 'code_sent';
 const SESSION_CREATED = 'session_created';
@@ -22,7 +21,6 @@ exports.ERROR_SENDING_CODE = ERROR_SENDING_CODE;
 exports.INVALID_REQUEST = INVALID_REQUEST;
 exports.INVALID_WALLET_DATA = INVALID_WALLET_DATA;
 exports.MISSING_ADDRESS_ERROR = MISSING_ADDRESS_ERROR;
-exports.NO_SECURE_ENCLAVE_WALLET_FOUND = NO_SECURE_ENCLAVE_WALLET_FOUND;
 exports.SECURE_ENCLAVE_PROVIDER_NOT_ENABLED = SECURE_ENCLAVE_PROVIDER_NOT_ENABLED;
 exports.SESSION_CREATED = SESSION_CREATED;
 exports.SESSION_RESTORED = SESSION_RESTORED;

package/src/lib/utils/constants/errors.js

@@ -6,10 +6,9 @@ const ERROR_SENDING_CODE = 'error_sending_code';
 const INVALID_REQUEST = 'invalid_request';
 const INVALID_WALLET_DATA = 'invalid_wallet';
 const SECURE_ENCLAVE_PROVIDER_NOT_ENABLED = 'secure_enclave_provider_not_enabled';
-const NO_SECURE_ENCLAVE_WALLET_FOUND = 'no_secure_enclave_wallet_found';
 const USER_NOT_LOGGED_IN = 'user_not_logged_in';
 const CODE_SENT = 'code_sent';
 const SESSION_CREATED = 'session_created';
 const SESSION_RESTORED = 'SESSION_RESTORED';
 
-export { ACTIVE_SESSION, CODE_SENT, ERROR_SENDING_CODE, INVALID_REQUEST, INVALID_WALLET_DATA, MISSING_ADDRESS_ERROR, NO_SECURE_ENCLAVE_WALLET_FOUND, SECURE_ENCLAVE_PROVIDER_NOT_ENABLED, SESSION_CREATED, SESSION_RESTORED, USER_NOT_LOGGED_IN };
+export { ACTIVE_SESSION, CODE_SENT, ERROR_SENDING_CODE, INVALID_REQUEST, INVALID_WALLET_DATA, MISSING_ADDRESS_ERROR, SECURE_ENCLAVE_PROVIDER_NOT_ENABLED, SESSION_CREATED, SESSION_RESTORED, USER_NOT_LOGGED_IN };

package/src/lib/utils/functions/findTurnkeyWallet/findTurnkeyWallet.cjs

@@ -3,9 +3,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utils = require('@dynamic-labs/utils');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+require('@dynamic-labs/utils');
 var values = require('../../constants/values.cjs');
-var errors = require('../../constants/errors.cjs');
 
 const findTurnkeyWalletByChain = (walletOptions, chainName) => {
     const chain = chainName
@@ -13,14 +13,16 @@ const findTurnkeyWalletByChain = (walletOptions, chainName) => {
         : undefined;
     return walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.find(({ key, walletConnector }) => key.startsWith('turnkey') && (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === chain);
 };
-const findTurnkeyWalletByAddress = (verifiedCredentials, address) => {
-    const turnkeyVCs = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.filter(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
-    const targetTurnkeyWallet = turnkeyVCs === null || turnkeyVCs === void 0 ? void 0 : turnkeyVCs.find((vc) => { var _a; return ((_a = vc.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === address.toLowerCase(); });
-    if (!targetTurnkeyWallet) {
-        throw new utils.DynamicError('User does not have a secure enclave wallet', errors.NO_SECURE_ENCLAVE_WALLET_FOUND);
+const findTurnkeyWalletByPrimaryChain = (walletOptions, chainConfigurations, verifiedCredentials) => {
+    var _a;
+    const primaryEmbeddedChain = ((_a = chainConfigurations === null || chainConfigurations === void 0 ? void 0 : chainConfigurations.find((chain) => chain.primary)) === null || _a === void 0 ? void 0 : _a.name) || sdkApiCore.ChainEnum.Evm;
+    const walletConnector = findTurnkeyWalletByChain(walletOptions, values.ChainEnumToVerifiedCredentialName[primaryEmbeddedChain]);
+    const turnkeyVC = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ walletName, chain }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && chain === primaryEmbeddedChain);
+    if (!turnkeyVC || !walletConnector) {
+        return undefined;
     }
-    return targetTurnkeyWallet;
+    return Object.assign(Object.assign({}, turnkeyVC), walletConnector);
 };
 
-exports.findTurnkeyWalletByAddress = findTurnkeyWalletByAddress;
 exports.findTurnkeyWalletByChain = findTurnkeyWalletByChain;
+exports.findTurnkeyWalletByPrimaryChain = findTurnkeyWalletByPrimaryChain;

package/src/lib/utils/functions/findTurnkeyWallet/findTurnkeyWallet.d.ts

@@ -1,4 +1,8 @@
-import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+import { ChainConfiguration, JwtVerifiedCredential } from '@dynamic-labs/sdk-api-core';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { WalletOption } from '../../../shared';
 export declare const findTurnkeyWalletByChain: (walletOptions: WalletOption[] | undefined, chainName: string | undefined) => WalletOption | undefined;
-export declare const findTurnkeyWalletByAddress: (verifiedCredentials: JwtVerifiedCredential[], address: string) => JwtVerifiedCredential;
+export declare const findTurnkeyWalletByPrimaryChain: (walletOptions: WalletOption[] | undefined, chainConfigurations: ChainConfiguration[] | undefined, verifiedCredentials: JwtVerifiedCredential[]) => (JwtVerifiedCredential & WalletOption) | undefined;
+export declare const findTurnkeyWalletByAddress: (walletOptions: WalletOption[] | undefined, verifiedCredentials: JwtVerifiedCredential[], address: string | undefined) => (JwtVerifiedCredential & {
+    walletConnector?: WalletConnector;
+}) | undefined;

package/src/lib/utils/functions/findTurnkeyWallet/findTurnkeyWallet.js

@@ -1,7 +1,7 @@
 'use client'
-import { DynamicError } from '@dynamic-labs/utils';
-import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
-import { NO_SECURE_ENCLAVE_WALLET_FOUND } from '../../constants/errors.js';
+import { ChainEnum } from '@dynamic-labs/sdk-api-core';
+import '@dynamic-labs/utils';
+import { VerifiedCredentialNameToChainEnum, ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
 
 const findTurnkeyWalletByChain = (walletOptions, chainName) => {
     const chain = chainName
@@ -9,13 +9,15 @@ const findTurnkeyWalletByChain = (walletOptions, chainName) => {
         : undefined;
     return walletOptions === null || walletOptions === void 0 ? void 0 : walletOptions.find(({ key, walletConnector }) => key.startsWith('turnkey') && (walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain) === chain);
 };
-const findTurnkeyWalletByAddress = (verifiedCredentials, address) => {
-    const turnkeyVCs = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.filter(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'));
-    const targetTurnkeyWallet = turnkeyVCs === null || turnkeyVCs === void 0 ? void 0 : turnkeyVCs.find((vc) => { var _a; return ((_a = vc.address) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === address.toLowerCase(); });
-    if (!targetTurnkeyWallet) {
-        throw new DynamicError('User does not have a secure enclave wallet', NO_SECURE_ENCLAVE_WALLET_FOUND);
+const findTurnkeyWalletByPrimaryChain = (walletOptions, chainConfigurations, verifiedCredentials) => {
+    var _a;
+    const primaryEmbeddedChain = ((_a = chainConfigurations === null || chainConfigurations === void 0 ? void 0 : chainConfigurations.find((chain) => chain.primary)) === null || _a === void 0 ? void 0 : _a.name) || ChainEnum.Evm;
+    const walletConnector = findTurnkeyWalletByChain(walletOptions, ChainEnumToVerifiedCredentialName[primaryEmbeddedChain]);
+    const turnkeyVC = verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ walletName, chain }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) && chain === primaryEmbeddedChain);
+    if (!turnkeyVC || !walletConnector) {
+        return undefined;
     }
-    return targetTurnkeyWallet;
+    return Object.assign(Object.assign({}, turnkeyVC), walletConnector);
 };
 
-export { findTurnkeyWalletByAddress, findTurnkeyWalletByChain };
+export { findTurnkeyWalletByChain, findTurnkeyWalletByPrimaryChain };

package/src/lib/utils/functions/findTurnkeyWallet/index.d.ts

@@ -1 +1 @@
-export { findTurnkeyWalletByChain, findTurnkeyWalletByAddress, } from './findTurnkeyWallet';
+export { findTurnkeyWalletByChain, findTurnkeyWalletByPrimaryChain, findTurnkeyWalletByAddress, } from './findTurnkeyWallet';

package/src/lib/utils/functions/index.d.ts

@@ -72,3 +72,4 @@ export * from './getUserVerifiedCredentialType';
 export * from './hasEmbeddedWallet';
 export * from './getEmbeddedWalletAuthHandler';
 export * from './getEmbeddedWalletSessionExpiration';
+export * from './serializeWalletConnectors';

package/src/lib/utils/functions/serializeWalletConnectors/index.d.ts

@@ -0,0 +1 @@
+export { serializeWalletConnectors } from './serializeWalletConnectors';

package/src/lib/utils/functions/serializeWalletConnectors/serializeWalletConnectors.cjs

@@ -0,0 +1,32 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/sdk-api-core');
+var logger = require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+
+const serializeWalletConnectors = (walletConnectors) => {
+    try {
+        if (!walletConnectors)
+            return undefined;
+        return walletConnectors.map((connector) => connector.name);
+    }
+    catch (error) {
+        logger.logger.error('error serializing walletConnectors', error);
+        return undefined;
+    }
+};
+
+exports.serializeWalletConnectors = serializeWalletConnectors;

package/src/lib/utils/functions/serializeWalletConnectors/serializeWalletConnectors.d.ts

@@ -0,0 +1,2 @@
+import { WalletConnectorsMethod } from '@dynamic-labs/wallet-connector-core';
+export declare const serializeWalletConnectors: (walletConnectors?: WalletConnectorsMethod[]) => string[] | undefined;

package/src/lib/utils/functions/serializeWalletConnectors/serializeWalletConnectors.js

@@ -0,0 +1,28 @@
+'use client'
+import '@dynamic-labs/sdk-api-core';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+
+const serializeWalletConnectors = (walletConnectors) => {
+    try {
+        if (!walletConnectors)
+            return undefined;
+        return walletConnectors.map((connector) => connector.name);
+    }
+    catch (error) {
+        logger.error('error serializing walletConnectors', error);
+        return undefined;
+    }
+};
+
+export { serializeWalletConnectors };

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

@@ -52,3 +52,4 @@ export { useSendDynamicProps } from './useSendDynamicProps';
 export { useNetworkNotSupported } from './useNetworkNotSupported';
 export { useHandleVerifiedUser } from './useHandleVerifiedUser';
 export { useMfa } from './useMfa';
+export { useMergeUserAccounts } from './useMergeUserAccounts';

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

@@ -165,7 +165,9 @@ const useAuthLayoutChecks = () => {
             view.type === 'qr-code' ||
             view.type === 'wallet-used' ||
             view.type === 'email-wallet-otp-verification-view' ||
-            view.type === 'farcaster-connect-view');
+            view.type === 'farcaster-connect-view' ||
+            view.type === 'merge-user-accounts' ||
+            view.type === 'merge-user-accounts-conflicts');
     const showCloseButton = view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
         view.type !== 'login-with-email-verification' &&
         view.type !== 'login-with-sms-verification' &&
@@ -189,6 +191,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'passkey-intro' ||
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
+        view.type === 'merge-user-accounts-conflicts' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;

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

@@ -161,7 +161,9 @@ const useAuthLayoutChecks = () => {
             view.type === 'qr-code' ||
             view.type === 'wallet-used' ||
             view.type === 'email-wallet-otp-verification-view' ||
-            view.type === 'farcaster-connect-view');
+            view.type === 'farcaster-connect-view' ||
+            view.type === 'merge-user-accounts' ||
+            view.type === 'merge-user-accounts-conflicts');
     const showCloseButton = view.type !== 'login-with-email-or-wallet-full-wallet-list' &&
         view.type !== 'login-with-email-verification' &&
         view.type !== 'login-with-sms-verification' &&
@@ -185,6 +187,7 @@ const useAuthLayoutChecks = () => {
         view.type === 'passkey-intro' ||
         view.type === 'qr-code' ||
         view.type === 'farcaster-connect-view' ||
+        view.type === 'merge-user-accounts-conflicts' ||
         (view.type === 'merge-user-accounts-with-same-email' && !user);
     const showDefaultFooter = !showConnectedWalletProgress && !showDynamicFooter && !showToSFooter;
     const shouldHideDynamicFooterSeparator = showDynamicFooter && showToSFooter;

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

@@ -132,7 +132,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             setUser(updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(signersResponse.jwt, signersResponse.minifiedJwt));
             setShowAuthFlow(false, { performMultiWalletChecks: false });
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, authToken);
         }
         catch (err) {
             setError(err);

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

@@ -128,7 +128,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
             }
             setUser(updateJWTAndCreateUserProfile(signersResponse.jwt, signersResponse.minifiedJwt));
             setShowAuthFlow(false, { performMultiWalletChecks: false });
-            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials);
+            dynamicEvents.emit('embeddedWalletCreated', passkeyWallet, turnkeyVerifiedCredentials, authToken);
         }
         catch (err) {
             setError(err);

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

@@ -97,6 +97,14 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
             copykey: 'dyn_login.title.wallet_only',
             heading: t('dyn_login.title.wallet_only'),
         },
+        'merge-user-accounts': {
+            copykey: 'dyn_merge_user_accounts.same_wallet.title',
+            heading: t('dyn_merge_user_accounts.same_wallet.title'),
+        },
+        'merge-user-accounts-conflicts': {
+            copykey: 'dyn_merge_user_accounts_conflicts.title',
+            heading: t('dyn_merge_user_accounts_conflicts.title'),
+        },
         'mfa-choose-device': {
             copykey: 'dyn_mfa.choose_device_view.title',
             heading: t('dyn_mfa.choose_device_view.title'),

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

@@ -93,6 +93,14 @@ const useDynamicLayoutData = ({ view, authMode, }) => {
             copykey: 'dyn_login.title.wallet_only',
             heading: t('dyn_login.title.wallet_only'),
         },
+        'merge-user-accounts': {
+            copykey: 'dyn_merge_user_accounts.same_wallet.title',
+            heading: t('dyn_merge_user_accounts.same_wallet.title'),
+        },
+        'merge-user-accounts-conflicts': {
+            copykey: 'dyn_merge_user_accounts_conflicts.title',
+            heading: t('dyn_merge_user_accounts_conflicts.title'),
+        },
         'mfa-choose-device': {
             copykey: 'dyn_mfa.choose_device_view.title',
             heading: t('dyn_mfa.choose_device_view.title'),

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

@@ -35,7 +35,6 @@ require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
-var useEmbeddedWalletPassword = require('../useEmbeddedWalletPassword/useEmbeddedWalletPassword.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');
 var useMPCEmbeddedWallet = require('./useMPCEmbeddedWallet/useMPCEmbeddedWallet.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
@@ -90,15 +89,10 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  */
 const useEmbeddedWallet = () => {
     const { onboardingOnlyJwt } = useInternalDynamicContext.useInternalDynamicContext();
-    const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword.useEmbeddedWalletPassword();
-    const { createEmbeddedWallet: createCoinbaseMPCWallet, canCreateMPCWallet } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
-    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
+    const { createEmbeddedWallet: createCoinbaseMPCWallet, canCreateMPCWallet, createPassword, } = useMPCEmbeddedWallet.useMPCEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet.useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = WalletContext.useWalletContext();
     const userHasEmbeddedWallet = () => hasEmbeddedWallet.hasEmbeddedWallet(getAuthToken.getAuthToken() || onboardingOnlyJwt);
-    /**
-     *  @deprecated - Use this from the useMPCEmbeddedWallet hook instead.
-     */
-    const createPassword = React.useCallback((showIntro) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const createEmbeddedWallet = React.useCallback((chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (yield canCreateMPCWallet(chain)) {
             const wallet = yield createCoinbaseMPCWallet(chain);
@@ -109,8 +103,13 @@ const useEmbeddedWallet = () => {
     }), [canCreateMPCWallet, createCoinbaseMPCWallet, createTurnkeyEmbeddedWallet]);
     return {
         createEmbeddedWallet,
+        createOrRestoreSession,
+        createPasskey,
         createPassword,
+        getPasskeys,
         isLoadingEmbeddedWallet,
+        isSessionActive,
+        sendOneTimeCode,
         userHasEmbeddedWallet,
     };
 };

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

@@ -10,7 +10,16 @@ import { Wallet } from '../../../shared';
  */
 export declare const useEmbeddedWallet: () => {
     readonly createEmbeddedWallet: (chain?: ChainEnum) => Promise<Wallet | undefined>;
-    readonly createPassword: (showIntro?: boolean) => Promise<string>;
+    readonly createOrRestoreSession: ({ oneTimeCode }: {
+        oneTimeCode?: string | undefined;
+    }) => Promise<string>;
+    readonly createPasskey: ({ oneTimeCode }: {
+        oneTimeCode?: string | 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 isLoadingEmbeddedWallet: boolean;
+    readonly isSessionActive: boolean;
+    readonly sendOneTimeCode: () => Promise<string>;
     readonly userHasEmbeddedWallet: () => boolean;
 };

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

@@ -31,7 +31,6 @@ import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
-import { useEmbeddedWalletPassword } from '../useEmbeddedWalletPassword/useEmbeddedWalletPassword.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';
 import { useMPCEmbeddedWallet } from './useMPCEmbeddedWallet/useMPCEmbeddedWallet.js';
 import '../../../context/ThemeContext/ThemeContext.js';
@@ -86,15 +85,10 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  */
 const useEmbeddedWallet = () => {
     const { onboardingOnlyJwt } = useInternalDynamicContext();
-    const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword();
-    const { createEmbeddedWallet: createCoinbaseMPCWallet, canCreateMPCWallet } = useMPCEmbeddedWallet();
-    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet } = useSecureEnclaveEmbeddedWallet();
+    const { createEmbeddedWallet: createCoinbaseMPCWallet, canCreateMPCWallet, createPassword, } = useMPCEmbeddedWallet();
+    const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
     const { isLoadingEmbeddedWallet } = useWalletContext();
     const userHasEmbeddedWallet = () => hasEmbeddedWallet(getAuthToken() || onboardingOnlyJwt);
-    /**
-     *  @deprecated - Use this from the useMPCEmbeddedWallet hook instead.
-     */
-    const createPassword = useCallback((showIntro) => __awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const createEmbeddedWallet = useCallback((chain) => __awaiter(void 0, void 0, void 0, function* () {
         if (yield canCreateMPCWallet(chain)) {
             const wallet = yield createCoinbaseMPCWallet(chain);
@@ -105,8 +99,13 @@ const useEmbeddedWallet = () => {
     }), [canCreateMPCWallet, createCoinbaseMPCWallet, createTurnkeyEmbeddedWallet]);
     return {
         createEmbeddedWallet,
+        createOrRestoreSession,
+        createPasskey,
         createPassword,
+        getPasskeys,
         isLoadingEmbeddedWallet,
+        isSessionActive,
+        sendOneTimeCode,
         userHasEmbeddedWallet,
     };
 };

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

@@ -162,7 +162,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: jwtVerifiedCredential.id,
             };
-            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential);
+            dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential, jwt);
             return coinbaseMPCWallet;
         }
         catch (error) {

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

@@ -158,7 +158,7 @@ const useCoinbaseMPC = () => {
                 connector,
                 id: jwtVerifiedCredential.id,
             };
-            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential);
+            dynamicEvents.emit('embeddedWalletCreated', coinbaseMPCWallet, jwtVerifiedCredential, jwt);
             return coinbaseMPCWallet;
         }
         catch (error) {

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

@@ -40,9 +40,9 @@ require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
-var useEmbeddedWalletPassword = require('../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.cjs');
 var validateUserIsLoggedIn = require('../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.cjs');
 var validateMPCProviderEnabled = require('../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.cjs');
+var useEmbeddedWalletPassword = require('../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.cjs');
 var useCoinbaseMPC = require('./useCoinbaseMPC/useCoinbaseMPC.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');

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

@@ -36,9 +36,9 @@ import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
-import { useEmbeddedWalletPassword } from '../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.js';
 import { validateUserIsLoggedIn } from '../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.js';
 import { validateMPCProviderEnabled } from '../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.js';
+import { useEmbeddedWalletPassword } from '../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.js';
 import { useCoinbaseMPC } from './useCoinbaseMPC/useCoinbaseMPC.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';