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

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

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { JwtVerifiedCredentialFormatEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError, EmbeddedWalletException } from '@dynamic-labs/utils';
 import { isSessionKeyCompatibleWalletConnector } from '@dynamic-labs/wallet-connector-core';
@@ -30,7 +30,6 @@ import '../../../../locale/locale.js';
 import { refreshUserJwt } from '../../../../data/api/user/user.js';
 import { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { addPasskeyIdentifierToWalletConnector } from '../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.js';
-import { getEOAWallet } from '../../../functions/getEOAWallet/getEOAWallet.js';
 import { getUserVerifiedCredentialType } from '../../../functions/getUserVerifiedCredentialType/getUserVerifiedCredentialType.js';
 import { hasEmbeddedWallet } from '../../../functions/hasEmbeddedWallet/hasEmbeddedWallet.js';
 import { getEmbeddedWalletAuthHandler } from '../../../functions/getEmbeddedWalletAuthHandler/getEmbeddedWalletAuthHandler.js';
@@ -44,12 +43,13 @@ import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
-import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
-import { canRestoreEmbeddedWalletSession, restoreEmbeddedWalletSession } from '../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.js';
 import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
+import { canRestoreEmbeddedWalletSession, restoreEmbeddedWalletSession } from '../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.js';
+import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
 import { usePasskeyRecovery } from '../../usePasskeyRecovery/usePasskeyRecovery.js';
-import { useTurnkey } from './useTurnkey/useTurnkey.js';
+import { useSmartWallets } from '../../useSmartWallets/useSmartWallets.js';
 import { EmbeddedWalletVersion, iframeContainerId, iframeElementId, revealIframeElementId, revealIframeContainerId } from './constants.js';
+import { useTurnkey } from './useTurnkey/useTurnkey.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
@@ -105,6 +105,12 @@ import '../../../../context/ConnectWithOtpContext/constants.js';
 import '../../../../context/ReinitializeContext/ReinitializeContextProvider.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
+const isConnectorSessionKeyActive = (connector) => {
+    var _a;
+    if (!connector || !isSessionKeyCompatibleWalletConnector(connector))
+        return false;
+    return Boolean((_a = connector.sessionKeys) === null || _a === void 0 ? void 0 : _a.publicKey);
+};
 // Hook exposed to customers
 /**
  *
@@ -121,21 +127,21 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d;
     const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet();
     const { createRootElement } = useElementById();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = useWalletContext();
-    const wallet = getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-    const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+    const { getEOAWallet } = useSmartWallets();
+    const wallet = (_a = (primaryWallet && getEOAWallet(primaryWallet))) !== null && _a !== void 0 ? _a : primaryWallet;
     const userHasEmbeddedWallet = useCallback(() => hasEmbeddedWallet(user, 'turnkey'), [user]);
-    const getWalletVersion = () => {
+    const getWalletVersion = useCallback(() => {
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
             return EmbeddedWalletVersion.V2;
         }
         return EmbeddedWalletVersion.V1;
-    };
+    }, [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
     const { shouldInitRecovery, initPasskeyRecoveryProcess } = usePasskeyRecovery();
     /**
      * Creates a new secure enclave embedded wallet according to the settings from the dashboard
@@ -144,13 +150,13 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _l;
+        var _e;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
-        const isManualMode = ((_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _l === void 0 ? void 0 : _l.automaticEmbeddedWalletCreation) === false;
+        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.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.
@@ -169,14 +175,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @param chain - chain parameter to create the wallet for
      * @returns Promise<UserProfile | undefined>
      */
-    const createEmbeddedWalletAccount$1 = useCallback((_m) => __awaiter(void 0, [_m], void 0, function* ({ chain }) {
-        var _o, _p, _q;
+    const createEmbeddedWalletAccount$1 = useCallback((_f) => __awaiter(void 0, [_f], void 0, function* ({ chain }) {
+        var _g, _h, _j;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
         const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user);
-        const turnkeyWalletId = (_o = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeyHDWalletId;
+        const turnkeyWalletId = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.turnkeyHDWalletId;
         if (!turnkeyWalletId) {
             throw new DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');
         }
@@ -185,14 +191,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
             environmentId,
         });
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_p = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _p === void 0 ? void 0 : _p.createOrRestoreSession({
+            yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
                 ignoreRestore: true,
             }));
         }
         else if (yield shouldInitRecovery()) {
             yield initPasskeyRecoveryProcess('email');
         }
-        const signedRequest = yield ((_q = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _q === void 0 ? void 0 : _q.stampCreateWalletAccountRequest({
+        const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
             request: requestToStamp,
         }));
         yield createEmbeddedWalletAccount({
@@ -202,11 +208,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return refreshUserJwt({ environmentId });
     }), [
         environmentId,
+        wallet === null || wallet === void 0 ? void 0 : wallet.connector,
         initPasskeyRecoveryProcess,
         projectSettings,
         shouldInitRecovery,
         user,
-        wallet === null || wallet === void 0 ? void 0 : wallet.connector,
     ]);
     /**
      * Creates or restores a secure enclave embedded wallet session
@@ -215,18 +221,18 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'session_created' | 'session_restored'> - returns a string indicating the status of the session
      */
     const createOrRestoreSession = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _r, _s, _t, _u, _v, _w, _x, _y, _z;
+        var _k, _l, _m, _o, _p, _q;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const isSessionKeyCompatibleAAConnector = ((_r = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _r === void 0 ? void 0 : _r.key) === 'zerodev'
-            ? isSessionKeyCompatibleWalletConnector((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector).getEOAConnector())
-            : false;
-        if (isSessionKeyCompatibleWalletConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) {
-            return yield ((_s = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) === null || _s === void 0 ? void 0 : _s.createOrRestoreSession());
+        const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
+        if (primaryConnector &&
+            isSessionKeyCompatibleWalletConnector(primaryConnector)) {
+            return primaryConnector.createOrRestoreSession();
         }
-        else if (isSessionKeyCompatibleAAConnector) {
-            return yield ((_t = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector).getEOAConnector()) === null || _t === void 0 ? void 0 : _t.createOrRestoreSession());
+        const eoaConnector = wallet === null || wallet === void 0 ? void 0 : wallet.connector;
+        if (eoaConnector && isSessionKeyCompatibleWalletConnector(eoaConnector)) {
+            return eoaConnector.createOrRestoreSession();
         }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
@@ -234,12 +240,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
         // try to restore session if possible
-        if (canRestoreEmbeddedWalletSession((_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.sessionKeyDuration)) {
+        if (canRestoreEmbeddedWalletSession((_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration((_w = (_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _v === void 0 ? void 0 : _v.embeddedWallets) === null || _w === void 0 ? void 0 : _w.sessionKeyDuration),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration((_m = (_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _l === void 0 ? void 0 : _l.embeddedWallets) === null || _m === void 0 ? void 0 : _m.sessionKeyDuration),
                     user,
                     wallet: primaryWallet,
                 });
@@ -258,7 +264,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!userHasEmbeddedWallet() || !hasRecoveryEmail) {
             throw new DynamicError('User does not have a secure enclave wallet or a verified email', INVALID_WALLET_DATA);
         }
-        const organizationId = (_z = (_y = (_x = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _x === void 0 ? void 0 : _x.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _y === void 0 ? void 0 : _y.walletProperties) === null || _z === void 0 ? void 0 : _z.turnkeySubOrganizationId;
+        const organizationId = (_q = (_p = (_o = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _o === void 0 ? void 0 : _o.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _p === void 0 ? void 0 : _p.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -272,7 +278,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         user,
         hasRecoveryEmail,
         primaryWallet,
-        (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.sessionKeyDuration,
+        (_c = (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.embeddedWallets) === null || _c === void 0 ? void 0 : _c.sessionKeyDuration,
         userHasEmbeddedWallet,
         wallet === null || wallet === void 0 ? void 0 : wallet.connector,
     ]);
@@ -282,12 +288,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _0, _1;
+        var _r, _s;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_0 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _0 === void 0 ? void 0 : _0.chainConfigurations, user.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_r = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _r === void 0 ? void 0 : _r.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new DynamicError('Wallet connector not found', INVALID_WALLET_DATA);
         }
@@ -302,7 +308,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_1 = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _1 === void 0 ? void 0 : _1.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_s = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new DynamicError('No sub organization id found for the wallet', INVALID_WALLET_DATA);
         }
@@ -345,18 +351,17 @@ 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(wallet.connector)) === null || _c === void 0 ? void 0 : _c.isSessionActive()))) !== null && _d !== void 0 ? _d : false;
-    const isSessionKeySessionAAActive = ((_e = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _e === void 0 ? void 0 : _e.key) === 'zerodev' &&
-        isSessionKeyCompatibleWalletConnector((wallet === null || wallet === void 0 ? void 0 : wallet.connector).getEOAConnector()) &&
-        ((_h = (_g = (_f = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _f === void 0 ? void 0 : _f.getEOAConnector()) === null || _g === void 0 ? void 0 : _g.sessionKeys) === null || _h === void 0 ? void 0 : _h.publicKey);
-    const isSessionKeySessionActive = (_k = Boolean(primaryConnector &&
-        isSessionKeyCompatibleWalletConnector(primaryConnector) &&
-        ((_j = primaryConnector.sessionKeys) === null || _j === void 0 ? void 0 : _j.publicKey))) !== null && _k !== void 0 ? _k : false;
+    const isEmailAuthSessionActive = useMemo(() => {
+        var _a;
+        const eoaConnector = wallet === null || wallet === void 0 ? void 0 : wallet.connector;
+        if (!eoaConnector || !('getAuthenticatorHandler' in eoaConnector))
+            return false;
+        return (_a = getEmbeddedWalletAuthHandler(eoaConnector)) === null || _a === void 0 ? void 0 : _a.isSessionActive();
+    }, [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
+    const isSessionKeySessionAAActive = useMemo(() => isConnectorSessionKeyActive(wallet === null || wallet === void 0 ? void 0 : wallet.connector), [wallet === null || wallet === void 0 ? void 0 : wallet.connector]);
+    const isSessionKeySessionActive = useMemo(() => isConnectorSessionKeyActive(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector), [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
     /**
      * Checks if the embedded wallet session is active
-     * @returns boolean
      */
     const isSessionActive = isEmailAuthSessionActive ||
         isSessionKeySessionActive ||
@@ -367,16 +372,16 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * and the html container id to render the iframe into
      * @returns Promise<string> - returns the embedded wallet recovery phrase or private key
      */
-    const revealEmbeddedWalletKey = (_2) => __awaiter(void 0, [_2], void 0, function* ({ type, htmlContainerId, }) {
-        var _3, _4, _5, _6, _7, _8;
+    const revealEmbeddedWalletKey = useCallback((_t) => __awaiter(void 0, [_t], void 0, function* ({ type, htmlContainerId, }) {
+        var _u, _v, _w, _x, _y, _z;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         yield cleanupExport({
-            wallet,
+            wallet: wallet,
         });
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_3 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _3 === void 0 ? void 0 : _3.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_4 = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _4 === void 0 ? void 0 : _4.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
+        const turnkeyHDWalletId = (_v = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -385,26 +390,26 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // since it will show unrelated turnkey content
         iframeContainerElement.current.style.display = 'none';
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_5 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _5 === void 0 ? void 0 : _5.createOrRestoreSession());
+            yield ((_w = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _w === void 0 ? void 0 : _w.createOrRestoreSession());
         }
         yield initExport({
             iframeContainer: iframeContainerElement.current,
             iframeElementId: revealIframeElementId,
-            wallet,
+            wallet: wallet,
         });
         try {
             yield exportCredential({
                 address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
                 environmentId,
                 user,
-                wallet,
+                wallet: wallet,
             });
         }
-        catch (_9) {
+        catch (_0) {
             if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-                ((_6 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _6 === void 0 ? void 0 : _6.removeSessionKeys)) {
-                yield ((_7 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _7 === void 0 ? void 0 : _7.removeSessionKeys());
-                yield ((_8 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _8 === void 0 ? void 0 : _8.createOrRestoreSession({
+                ((_x = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _x === void 0 ? void 0 : _x.removeSessionKeys)) {
+                yield ((_y = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _y === void 0 ? void 0 : _y.removeSessionKeys());
+                yield ((_z = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _z === void 0 ? void 0 : _z.createOrRestoreSession({
                     ignoreRestore: true,
                 }));
             }
@@ -412,24 +417,31 @@ const useSecureEnclaveEmbeddedWallet = () => {
                 address: type === 'privateKey' ? wallet === null || wallet === void 0 ? void 0 : wallet.address : undefined,
                 environmentId,
                 user,
-                wallet,
+                wallet: wallet,
             });
         }
         // show the iframe container after the export is done
         // to show the exported content only
         iframeContainerElement.current.style.display = 'block';
         return true;
-    });
+    }), [
+        createRootElement,
+        environmentId,
+        wallet,
+        (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.chainConfigurations,
+        user,
+        walletConnectorOptions,
+    ]);
     /**
      * Sends a one-time code to the user so they can create a session or add a new passkey
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _10, _11;
+        var _1, _2;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_10 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _10 === void 0 ? void 0 : _10.chainConfigurations, user.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_1 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _1 === void 0 ? void 0 : _1.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -440,7 +452,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
             throw new DynamicError('Session is active. No need to create a new one', ACTIVE_SESSION);
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
-        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_11 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _11 === void 0 ? void 0 : _11.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }
@@ -459,7 +471,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         projectSettings,
         walletConnectorOptions,
     ]);
-    return {
+    return useMemo(() => ({
         createEmbeddedWallet,
         createEmbeddedWalletAccount: createEmbeddedWalletAccount$1,
         createOrRestoreSession,
@@ -471,7 +483,19 @@ const useSecureEnclaveEmbeddedWallet = () => {
         revealEmbeddedWalletKey,
         sendOneTimeCode,
         userHasEmbeddedWallet,
-    };
+    }), [
+        createEmbeddedWallet,
+        createEmbeddedWalletAccount$1,
+        createOrRestoreSession,
+        createPasskey,
+        getPasskeys,
+        getWalletVersion,
+        isLoadingEmbeddedWallet,
+        isSessionActive,
+        revealEmbeddedWalletKey,
+        sendOneTimeCode,
+        userHasEmbeddedWallet,
+    ]);
 };
 
-export { useSecureEnclaveEmbeddedWallet };
+export { isConnectorSessionKeyActive, useSecureEnclaveEmbeddedWallet };

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

@@ -7,6 +7,7 @@ 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('react/jsx-runtime');
@@ -18,7 +19,6 @@ require('../../../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 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');
@@ -39,10 +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');
-var findPasskeyEmailWalletConnector = require('../../../../../views/Passkey/utils/findPasskeyEmailWalletConnector/findPasskeyEmailWalletConnector.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');
@@ -102,8 +103,8 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 const useTurnkey = () => {
     const { projectSettings, setPrimaryWalletId, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
-    const walletConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     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,
@@ -145,7 +146,7 @@ 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;
@@ -169,28 +170,29 @@ const useTurnkey = () => {
             setPrimaryWalletId(newPrimaryWalletId);
         /** It's not authenticated if it still hasn't created a passkey */
         const isAuthenticated = Boolean((_b = embeddedWalletVerifiedCredential.walletProperties) === null || _b === void 0 ? void 0 : _b.isAuthenticatorAttached);
-        const passkeyWallet = new walletConnectorCore.Wallet({
-            address: (yield ((_c = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _c === void 0 ? void 0 : _c.getAddress())) || '',
-            chain: ((_d = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _d === void 0 ? void 0 : _d.connectedChain) || '',
-            connector: (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) || {},
+        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,
             isAuthenticated,
-            isPrimary: newPrimaryWalletId === embeddedWalletVerifiedCredential.id,
-            key: embeddedWalletVerifiedCredential.walletName ||
-                (turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector.key) ||
-                '',
+            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 isSessionKeyCompatibleWallet = walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector) ||
-            ((walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.key) === 'zerodev' &&
-                walletConnectorCore.isSessionKeyCompatibleWalletConnector(walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getEOAConnector()));
+        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
@@ -200,10 +202,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) ||
-                isSessionKeyCompatibleWallet) {
+                isSessionKeyCompatible) {
                 // create embedded wallet fully headless
                 return startHeadlessEmbeddedWalletCreationFlow(chains, options);
             }
@@ -217,19 +219,18 @@ 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 = new walletConnectorCore.Wallet({
+                const wallet = walletConnector.createWallet({
                     address: (yield walletConnector.getAddress()) || '',
-                    chain: walletConnector.connectedChain || '',
+                    chain: walletConnector.connectedChain,
                     connector: walletConnector,
                     id: embeddedWalletVerifiedCredential.id,
-                    isAuthenticated: Boolean((_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.isAuthenticatorAttached),
-                    isPrimary: true,
-                    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);
@@ -245,13 +246,14 @@ const useTurnkey = () => {
     }), [
         user,
         projectSettings,
-        returnEmbeddedWallet,
-        setPrimaryWalletId,
+        primaryWallet,
+        getEOAWallet,
         setShowAuthFlow,
+        returnEmbeddedWallet,
         startHeadlessEmbeddedWalletCreationFlow,
         startPasskeyEmbeddedWalletCreationFlow,
         walletConnectorOptions,
-        walletConnector,
+        setPrimaryWalletId,
     ]);
     return {
         createTurnkeyWallet,

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

@@ -1,5 +1,5 @@
 import { EmbeddedWalletChainEnum } from '@dynamic-labs/sdk-api-core';
-import { WebAuthnAttestation, Wallet } from '@dynamic-labs/wallet-connector-core';
+import { Wallet, WebAuthnAttestation } from '@dynamic-labs/wallet-connector-core';
 export declare const useTurnkey: () => {
     readonly createTurnkeyWallet: (chains?: EmbeddedWalletChainEnum[], options?: {
         webAuthnAttestation: WebAuthnAttestation;