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

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

@@ -12,6 +12,7 @@ import '@dynamic-labs/wallet-book';
 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 '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -19,14 +20,14 @@ import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
-import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
-import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
-import 'viem';
-import 'viem/chains';
 import { getEmailProvider, createEmailVerification } from '../../../data/api/email/email.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import { isProviderEnabled } from '../../functions/isProviderEnabled/isProviderEnabled.js';
+import { isTurnkeyEnabled } from '../../functions/isTurnkeyEnabled/isTurnkeyEnabled.js';
+import 'viem';
+import 'viem/chains';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -16,6 +16,7 @@ require('@dynamic-labs/wallet-book');
 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('../../../shared/consts/index.cjs');
 var dynamicEvents = require('../../../events/dynamicEvents.cjs');
@@ -24,13 +25,13 @@ require('../../../context/ErrorContext/ErrorContext.cjs');
 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');
 require('viem');
 require('viem/chains');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');

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

@@ -12,6 +12,7 @@ import '@dynamic-labs/wallet-book';
 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 '../../../shared/consts/index.js';
 import { dynamicEvents } from '../../../events/dynamicEvents.js';
@@ -20,13 +21,13 @@ 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 'viem';
 import 'viem/chains';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';

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

@@ -15,28 +15,31 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
-require('../../constants/values.cjs');
+var values = require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+var findEmbeddedWalletFromVerifiedCredentials = require('../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 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');
 require('viem');
 require('viem/chains');
 var isCoinbaseWaasEnabled = require('../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.cjs');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../locale/locale.cjs');
 var hasEmbeddedWallet = require('../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+var findPrimaryEmbeddedChain = require('../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 var WalletContext = require('../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var useSecureEnclaveEmbeddedWallet = require('./useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs');
@@ -101,7 +104,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, projectSettings, primaryWalletId, 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();
@@ -138,7 +141,7 @@ const useEmbeddedWallet = () => {
         }
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
-    const shouldAutoCreateEmbeddedWallet = React.useCallback(() => {
+    const shouldAutoCreateEmbeddedWallet = React.useCallback((verifiedUser) => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled.isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings);
@@ -146,6 +149,17 @@ const useEmbeddedWallet = () => {
             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);
+                return false;
+            }
+        }
         if (
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled.isCoinbaseWaasEnabled(projectSettings) &&

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

@@ -1,5 +1,6 @@
 import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../shared';
+import { UserProfile } from '../../../..';
 /**
  * @returns {
  *  createEmbeddedWallet, - creates Dynamic embedded wallet according to the settings
@@ -18,9 +19,9 @@ export declare const useEmbeddedWallet: () => {
     readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
         webAuthnAttestation: import("dist/packages/wallet-connector-core/src").WebAuthnAttestation;
     } | undefined) => Promise<Wallet | undefined>;
-    readonly createOrRestoreSession: (options: {
+    readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
-    } | undefined) => Promise<string>;
+    } | undefined) => Promise<string | undefined>;
     readonly createPasskey: (options: {
         oneTimeCode: string;
     } | undefined) => Promise<import("dist/packages/wallet-connector-core/src").WebAuthnAttestation>;
@@ -33,6 +34,6 @@ export declare const useEmbeddedWallet: () => {
         htmlContainerId?: string | undefined;
     } | undefined) => Promise<boolean>;
     readonly sendOneTimeCode: () => Promise<string>;
-    readonly shouldAutoCreateEmbeddedWallet: () => boolean;
+    readonly shouldAutoCreateEmbeddedWallet: (verifiedUser?: UserProfile) => boolean;
     readonly userHasEmbeddedWallet: () => boolean;
 };

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

@@ -11,28 +11,31 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
-import '../../constants/values.js';
+import { ChainEnumToVerifiedCredentialName } from '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { findEmbeddedWalletFromVerifiedCredentials } from '../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.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 'viem';
 import 'viem/chains';
 import { isCoinbaseWaasEnabled } from '../../functions/isCoinbaseWaasEnabled/isCoinbaseWaasEnabled.js';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.js';
 import { hasEmbeddedWallet } from '../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
+import { findPrimaryEmbeddedChain } from '../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import { useWalletContext } from '../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { useSecureEnclaveEmbeddedWallet } from './useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js';
@@ -97,7 +100,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * }
  */
 const useEmbeddedWallet = () => {
-    const { user, projectSettings, primaryWalletId } = useInternalDynamicContext();
+    const { user, projectSettings, primaryWalletId, setPrimaryWalletId } = useInternalDynamicContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const { createEmbeddedWallet: createMPCWallet, canCreateMPCWallet, createPassword, revealEmbeddedWalletKey: reveaCoinbaseMPCEmbeddedWalletKey, } = useMPCEmbeddedWallet();
     const { createEmbeddedWallet: createTurnkeyEmbeddedWallet, createOrRestoreSession, createPasskey, revealEmbeddedWalletKey: revealTurnkeyEmbeddedWalletKey, getPasskeys, isSessionActive, sendOneTimeCode, } = useSecureEnclaveEmbeddedWallet();
@@ -134,7 +137,7 @@ const useEmbeddedWallet = () => {
         }
         return reveaCoinbaseMPCEmbeddedWalletKey();
     });
-    const shouldAutoCreateEmbeddedWallet = useCallback(() => {
+    const shouldAutoCreateEmbeddedWallet = useCallback((verifiedUser) => {
         var _a, _b;
         const hasEmbeddedWalletProviderEnabled = isTurnkeyEnabled(projectSettings) ||
             isCoinbaseWaasEnabled(projectSettings);
@@ -142,6 +145,17 @@ const useEmbeddedWallet = () => {
             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);
+                return false;
+            }
+        }
         if (
         // if coinbase is enabled it should still call createWallet, despite the turnkey rules
         !isCoinbaseWaasEnabled(projectSettings) &&

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

@@ -21,9 +21,14 @@ 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('../../../../../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');
 require('viem');
 require('viem/chains');
@@ -36,10 +41,6 @@ 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('@dynamic-labs/store');
-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');

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

@@ -17,9 +17,14 @@ import '../../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../constants/colors.js';
 import '../../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../../shared/utils/classes/storage/sessionStorage.js';
 import { generateRandomPassword } from '../../../../../shared/utils/functions/generateRandomPassword/generateRandomPassword.js';
 import '../../../../../shared/consts/index.js';
 import 'react-international-phone';
+import '../../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../../../locale/locale.js';
+import { linkWallet } from '../../../../../data/api/wallets/wallets.js';
 import { getVerifyArgs } from '../../../../functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
@@ -32,10 +37,6 @@ import { useErrorContext } from '../../../../../context/ErrorContext/ErrorContex
 import '../../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../../locale/locale.js';
-import { linkWallet } from '../../../../../data/api/wallets/wallets.js';
 import { getSiweStatement } from '../../../../functions/getSiweStatement/getSiweStatement.js';
 import '../../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';

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

@@ -17,6 +17,7 @@ require('@dynamic-labs/wallet-book');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -25,15 +26,15 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/find
 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 getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 require('viem');
 require('viem/chains');
 var findCoinbaseMPCWallet = require('../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.cjs');
 var requiresPasswordForEmbeddedWallet = require('../../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
 var requiresPasswordForEmbeddedWalletOnSignup = require('../../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.cjs');
-require('../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../locale/locale.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');

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

@@ -13,6 +13,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
@@ -21,15 +22,15 @@ import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/fi
 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 { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import 'viem';
 import 'viem/chains';
 import { findCoinbaseMPCWallet } from '../../../functions/findCoinbaseMPCWallet/findCoinbaseMPCWallet.js';
 import { requiresPasswordForEmbeddedWallet } from '../../../functions/requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
 import { requiresPasswordForEmbeddedWalletOnSignup } from '../../../functions/requiresPasswordForEmbeddedWalletOnSignup/requiresPasswordForEmbeddedWalletOnSignup.js';
-import '../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../locale/locale.js';
 import { hasEmbeddedWallet } from '../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';

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

@@ -7,10 +7,10 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
+var 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');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -18,6 +18,7 @@ var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
@@ -26,15 +27,15 @@ var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/find
 var findTurnkeyWallet = require('../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+require('../../../../config/ApiEndpoint.cjs');
+var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
+require('@dynamic-labs/store');
+require('../../../../locale/locale.cjs');
 var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
 require('viem');
 require('viem/chains');
 var getEOAWallet = require('../../../functions/getEOAWallet/getEOAWallet.cjs');
-require('../../../../config/ApiEndpoint.cjs');
-var embeddedWallets = require('../../../../data/api/embeddedWallets/embeddedWallets.cjs');
-require('@dynamic-labs/store');
-require('../../../../locale/locale.cjs');
 var getUserVerifiedCredentialType = require('../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.cjs');
 var hasEmbeddedWallet = require('../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.cjs');
 var getEmbeddedWalletAuthHandler = require('../../../functions/getEmbeddedWalletAuthHandler/getEmbeddedWalletAuthHandler.cjs');
@@ -113,8 +114,8 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d;
-    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
+    var _a, _b, _c, _d, _e, _f;
+    const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, walletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
@@ -128,13 +129,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _g;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _g === void 0 ? void 0 : _g.automaticEmbeddedWalletCreation) === false;
         // if user has a wallet and it's not embedded,
         // throw error to follow another flow and set up the right wallet
         // However, if the user is in manual mode continue.
@@ -155,22 +156,26 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'session_created' | 'session_restored'> - returns a string indicating the status of the session
      */
     const createOrRestoreSession = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _f, _g, _h, _j, _k, _l;
+        var _h, _j, _k, _l, _m, _o;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
+        if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector)) {
+            const publicKey = yield walletConnector.createOrRestoreSession();
+            return publicKey;
+        }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
             return errors.ACTIVE_SESSION;
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
         // try to restore session if possible
-        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_h = (_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _g === void 0 ? void 0 : _g.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_k = (_j = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _j === void 0 ? void 0 : _j.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration),
                     user,
                     wallet: primaryWallet,
                 });
@@ -189,7 +194,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new utils.DynamicError('User does not have a secure enclave wallet or a verified email', errors.INVALID_WALLET_DATA);
         }
-        const organizationId = (_l = (_k = (_j = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _j === void 0 ? void 0 : _j.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _k === void 0 ? void 0 : _k.walletProperties) === null || _l === void 0 ? void 0 : _l.turnkeySubOrganizationId;
+        const organizationId = (_o = (_m = (_l = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _l === void 0 ? void 0 : _l.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _m === void 0 ? void 0 : _m.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -213,12 +218,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _m, _o;
+        var _p, _q;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _m === void 0 ? void 0 : _m.chainConfigurations, user.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
@@ -233,7 +238,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_o = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
@@ -276,29 +281,33 @@ const useSecureEnclaveEmbeddedWallet = () => {
         });
         return data.passkeys;
     }), [user, environmentId]);
+    const isEmailAuthSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
+        'getAuthenticatorHandler' in wallet.connector &&
+        ((_c = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
+    const isSessionKeySessionActive = (_f = Boolean(walletConnector &&
+        walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) &&
+        ((_e = walletConnector.sessionKeys) === null || _e === void 0 ? void 0 : _e.publicKey))) !== null && _f !== void 0 ? _f : false;
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
      */
-    const isSessionActive = (_d = ((wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-        'getAuthenticatorHandler' in wallet.connector &&
-        ((_c = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
+    const isSessionActive = isEmailAuthSessionActive || isSessionKeySessionActive;
     /**
      * export the recovery phrase or private key of the embedded wallet
      * @param options - optional parameter object containing the type of key to reveal 'recoveryPhrase' | 'privateKey'
      * and the html container id to render the iframe into
      * @returns Promise<string> - returns the embedded wallet recovery phrase or private key
      */
-    const revealEmbeddedWalletKey = (_p) => _tslib.__awaiter(void 0, [_p], void 0, function* ({ type, htmlContainerId, }) {
-        var _q, _r;
+    const revealEmbeddedWalletKey = (_r) => _tslib.__awaiter(void 0, [_r], void 0, function* ({ type, htmlContainerId, }) {
+        var _s, _t;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_q = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _q === void 0 ? void 0 : _q.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_r = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
+        const turnkeyHDWalletId = (_t = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _t === void 0 ? void 0 : _t.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -327,11 +336,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _s, _t;
+        var _u, _v;
         if (!user) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -342,7 +351,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new utils.DynamicError('Session is active. No need to create a new one', errors.ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }

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

@@ -19,9 +19,9 @@ export declare const useSecureEnclaveEmbeddedWallet: () => {
     readonly createEmbeddedWallet: (chains?: ChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;
     }) => Promise<Wallet | undefined>;
-    readonly createOrRestoreSession: (options: {
+    readonly createOrRestoreSession: (options?: {
         oneTimeCode: string;
-    } | undefined) => Promise<string>;
+    } | undefined) => Promise<string | undefined>;
     readonly createPasskey: (options: {
         oneTimeCode: string;
     } | undefined) => Promise<WebAuthnAttestation>;