@dynamic-labs/sdk-react-core 4.0.0-alpha.10 → 4.0.0-alpha.12

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

@@ -45,6 +45,7 @@ var errors = require('../../../constants/errors.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
+var findPrimaryEmbeddedChain = require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
 var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
@@ -125,7 +126,7 @@ const isConnectorSessionKeyActive = (connector) => {
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const { projectSettings, primaryWallet, user: user$1, environmentId, walletConnectorOptions, } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
@@ -149,13 +150,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _f;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user$1);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, chains);
-        const isManualMode = ((_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _e === void 0 ? void 0 : _e.automaticEmbeddedWalletCreation) === false;
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, chains !== null && chains !== void 0 ? chains : [primaryChain]);
+        const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.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.
@@ -174,14 +176,15 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @param chain - chain parameter to create the wallet for
      * @returns Promise<UserProfile | undefined>
      */
-    const createEmbeddedWalletAccount = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ chain }) {
-        var _g, _h, _j;
+    const createEmbeddedWalletAccount = React.useCallback((_g) => _tslib.__awaiter(void 0, [_g], void 0, function* ({ chain }) {
+        var _h, _j, _k;
         if (!user$1) {
             throw new Error(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1);
-        const turnkeyWalletId = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.turnkeyHDWalletId;
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user$1, [primaryChain]);
+        const turnkeyWalletId = (_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.turnkeyHDWalletId;
         if (!turnkeyWalletId) {
             throw new utils.DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');
         }
@@ -190,14 +193,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
             environmentId,
         });
         if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
+            yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.createOrRestoreSession({
                 ignoreRestore: true,
             }));
         }
         else if (yield shouldInitRecovery()) {
             yield initPasskeyRecoveryProcess('email');
         }
-        const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
+        const signedRequest = yield ((_k = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _k === void 0 ? void 0 : _k.stampCreateWalletAccountRequest({
             request: requestToStamp,
         }));
         const verifiedUser = yield embeddedWallets.createEmbeddedWalletAccount({
@@ -225,7 +228,7 @@ 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 _k, _l, _m, _o, _p, _q;
+        var _l, _m, _o, _p, _q, _r;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
@@ -244,12 +247,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(constants.iframeContainerId);
         // try to restore session if possible
-        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _l === void 0 ? void 0 : _l.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    sessionExpiration: getEmbeddedWalletSessionExpiration.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),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.sessionKeyDuration),
                     user: user$1,
                     wallet: primaryWallet,
                 });
@@ -268,7 +271,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 = (_q = (_p = (_o = user$1 === null || user$1 === void 0 ? void 0 : user$1.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;
+        const organizationId = (_r = (_q = (_p = user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -292,12 +295,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _r, _s;
+        var _s, _t;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_r = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _r === void 0 ? void 0 : _r.chainConfigurations, user$1.verifiedCredentials);
+        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$1.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
@@ -312,7 +315,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_s = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_t = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _t === void 0 ? void 0 : _t.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
@@ -376,16 +379,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 = React.useCallback((_t) => _tslib.__awaiter(void 0, [_t], void 0, function* ({ type, htmlContainerId, }) {
-        var _u, _v, _w, _x, _y, _z;
+    const revealEmbeddedWalletKey = React.useCallback((_u) => _tslib.__awaiter(void 0, [_u], void 0, function* ({ type, htmlContainerId, }) {
+        var _v, _w, _x, _y, _z, _0;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
             wallet: wallet,
         });
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_u = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _u === void 0 ? void 0 : _u.chainConfigurations, user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials);
-        const turnkeyHDWalletId = (_v = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _v === void 0 ? void 0 : _v.turnkeyHDWalletId;
+        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.chainConfigurations, user$1 === null || user$1 === void 0 ? void 0 : user$1.verifiedCredentials);
+        const turnkeyHDWalletId = (_w = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _w === void 0 ? void 0 : _w.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -394,7 +397,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         // since it will show unrelated turnkey content
         iframeContainerElement.current.style.display = 'none';
         if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_w = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _w === void 0 ? void 0 : _w.createOrRestoreSession());
+            yield ((_x = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _x === void 0 ? void 0 : _x.createOrRestoreSession());
         }
         yield turnkeyExport.initExport({
             iframeContainer: iframeContainerElement.current,
@@ -409,11 +412,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
                 wallet: wallet,
             });
         }
-        catch (_0) {
+        catch (_1) {
             if (walletConnectorCore.isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-                ((_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({
+                ((_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.removeSessionKeys());
+                yield ((_0 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _0 === void 0 ? void 0 : _0.createOrRestoreSession({
                     ignoreRestore: true,
                 }));
             }
@@ -432,7 +435,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         createRootElement,
         environmentId,
         wallet,
-        (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.chainConfigurations,
+        (_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.chainConfigurations,
         user$1,
         walletConnectorOptions,
     ]);
@@ -441,11 +444,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _1, _2;
+        var _2, _3;
         if (!user$1) {
             throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         }
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_1 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _1 === void 0 ? void 0 : _1.chainConfigurations, user$1.verifiedCredentials);
+        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.chainConfigurations, user$1.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -456,7 +459,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((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, constants.iframeElementId, getEmbeddedWalletSessionExpiration.getEmbeddedWalletSessionExpiration((_3 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _3 === void 0 ? void 0 : _3.sessionKeyDuration));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }

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

@@ -41,6 +41,7 @@ import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST,
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
+import { findPrimaryEmbeddedChain } from '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
 import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
@@ -121,7 +122,7 @@ const isConnectorSessionKeyActive = (connector) => {
  * }
  */
 const useSecureEnclaveEmbeddedWallet = () => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const { projectSettings, primaryWallet, user, environmentId, walletConnectorOptions, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const { createTurnkeyWallet } = useTurnkey();
@@ -145,13 +146,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e;
+        var _f;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
-        const embeddedWalletVerifiedCredential = 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 primaryChain = findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains !== null && chains !== void 0 ? chains : [primaryChain]);
+        const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.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.
@@ -170,14 +172,15 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @param chain - chain parameter to create the wallet for
      * @returns Promise<UserProfile | undefined>
      */
-    const createEmbeddedWalletAccount$1 = useCallback((_f) => __awaiter(void 0, [_f], void 0, function* ({ chain }) {
-        var _g, _h, _j;
+    const createEmbeddedWalletAccount$1 = useCallback((_g) => __awaiter(void 0, [_g], void 0, function* ({ chain }) {
+        var _h, _j, _k;
         if (!user) {
             throw new Error(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user);
-        const turnkeyWalletId = (_g = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _g === void 0 ? void 0 : _g.turnkeyHDWalletId;
+        const primaryChain = findPrimaryEmbeddedChain(projectSettings);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, [primaryChain]);
+        const turnkeyWalletId = (_h = embeddedWalletVerifiedCredential === null || embeddedWalletVerifiedCredential === void 0 ? void 0 : embeddedWalletVerifiedCredential.walletProperties) === null || _h === void 0 ? void 0 : _h.turnkeyHDWalletId;
         if (!turnkeyWalletId) {
             throw new DynamicError('No HD wallet was found for this user to derive a wallet account. Use createEmbeddedWallet first', 'NoHdWalletFound');
         }
@@ -186,14 +189,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
             environmentId,
         });
         if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector)) {
-            yield ((_h = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _h === void 0 ? void 0 : _h.createOrRestoreSession({
+            yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.createOrRestoreSession({
                 ignoreRestore: true,
             }));
         }
         else if (yield shouldInitRecovery()) {
             yield initPasskeyRecoveryProcess('email');
         }
-        const signedRequest = yield ((_j = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _j === void 0 ? void 0 : _j.stampCreateWalletAccountRequest({
+        const signedRequest = yield ((_k = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _k === void 0 ? void 0 : _k.stampCreateWalletAccountRequest({
             request: requestToStamp,
         }));
         const verifiedUser = yield createEmbeddedWalletAccount({
@@ -221,7 +224,7 @@ 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 _k, _l, _m, _o, _p, _q;
+        var _l, _m, _o, _p, _q, _r;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
@@ -240,12 +243,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
         // try to restore session if possible
-        if (canRestoreEmbeddedWalletSession((_k = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _k === void 0 ? void 0 : _k.sessionKeyDuration)) {
+        if (canRestoreEmbeddedWalletSession((_l = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _l === void 0 ? void 0 : _l.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield restoreEmbeddedWalletSession({
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId,
-                    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),
+                    sessionExpiration: getEmbeddedWalletSessionExpiration((_o = (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _m === void 0 ? void 0 : _m.embeddedWallets) === null || _o === void 0 ? void 0 : _o.sessionKeyDuration),
                     user,
                     wallet: primaryWallet,
                 });
@@ -264,7 +267,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 = (_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;
+        const organizationId = (_r = (_q = (_p = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _p === void 0 ? void 0 : _p.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _q === void 0 ? void 0 : _q.walletProperties) === null || _r === void 0 ? void 0 : _r.turnkeySubOrganizationId;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -288,12 +291,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _r, _s;
+        var _s, _t;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         validateTurnkeyProviderEnabled(projectSettings);
-        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);
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new DynamicError('Wallet connector not found', INVALID_WALLET_DATA);
         }
@@ -308,7 +311,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const turnkeySubOrganizationId = (_s = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _s === void 0 ? void 0 : _s.turnkeySubOrganizationId;
+        const turnkeySubOrganizationId = (_t = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _t === void 0 ? void 0 : _t.turnkeySubOrganizationId;
         if (!turnkeySubOrganizationId) {
             throw new DynamicError('No sub organization id found for the wallet', INVALID_WALLET_DATA);
         }
@@ -372,16 +375,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 = useCallback((_t) => __awaiter(void 0, [_t], void 0, function* ({ type, htmlContainerId, }) {
-        var _u, _v, _w, _x, _y, _z;
+    const revealEmbeddedWalletKey = useCallback((_u) => __awaiter(void 0, [_u], void 0, function* ({ type, htmlContainerId, }) {
+        var _v, _w, _x, _y, _z, _0;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
         yield cleanupExport({
             wallet: wallet,
         });
-        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;
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_v = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _v === void 0 ? void 0 : _v.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
+        const turnkeyHDWalletId = (_w = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _w === void 0 ? void 0 : _w.turnkeyHDWalletId;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -390,7 +393,7 @@ 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 ((_w = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _w === void 0 ? void 0 : _w.createOrRestoreSession());
+            yield ((_x = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _x === void 0 ? void 0 : _x.createOrRestoreSession());
         }
         yield initExport({
             iframeContainer: iframeContainerElement.current,
@@ -405,11 +408,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
                 wallet: wallet,
             });
         }
-        catch (_0) {
+        catch (_1) {
             if (isSessionKeyCompatibleWalletConnector(wallet === null || wallet === void 0 ? void 0 : wallet.connector) &&
-                ((_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({
+                ((_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.removeSessionKeys());
+                yield ((_0 = wallet === null || wallet === void 0 ? void 0 : wallet.connector) === null || _0 === void 0 ? void 0 : _0.createOrRestoreSession({
                     ignoreRestore: true,
                 }));
             }
@@ -428,7 +431,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         createRootElement,
         environmentId,
         wallet,
-        (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.chainConfigurations,
+        (_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.embeddedWallets) === null || _e === void 0 ? void 0 : _e.chainConfigurations,
         user,
         walletConnectorOptions,
     ]);
@@ -437,11 +440,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _1, _2;
+        var _2, _3;
         if (!user) {
             throw new DynamicError(USER_NOT_LOGGED_IN);
         }
-        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);
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -452,7 +455,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((_2 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _2 === void 0 ? void 0 : _2.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_3 = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _3 === void 0 ? void 0 : _3.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }

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

@@ -99,17 +99,26 @@ const useTurnkey = () => {
     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,
-            environmentId,
-            options,
-            walletConnectorOptions,
-            withAuthenticator: false,
-        });
-        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
-            dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            // register the event listeners before calling create embedded wallet
+            // as the event might fire before the listeners are registered.
+            dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => {
+                resolve(wallet);
+            });
             dynamicEvents.dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
+            createDynamicEmbeddedWalletMutation({
+                chains,
+                environmentId,
+                options,
+                walletConnectorOptions,
+                withAuthenticator: false,
+            })
+                .then(() => {
+                setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
+            })
+                .catch((error) => {
+                reject(error);
+            });
         });
     }), [
         createDynamicEmbeddedWalletMutation,
@@ -185,7 +194,10 @@ const useTurnkey = () => {
         const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
         const shouldCreateV2WalletsByDefault = ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.defaultWalletVersion) ===
             sdkApiCore.EmbeddedWalletVersionEnum.V2;
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const primaryChain = findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings);
+        // if embedded wallet already exists
+        // get the one with the primary chain if `chains` is undefined
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains !== null && chains !== void 0 ? chains : [primaryChain]);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
         // Mode, we should attempt to create a new wallet. Note that if in manual
@@ -212,7 +224,7 @@ const useTurnkey = () => {
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
                 ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
-                const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain.findPrimaryEmbeddedChain(projectSettings));
+                const walletConnector = findPasskeyEmailWalletConnector.findPasskeyEmailWalletConnector(walletConnectorOptions, primaryChain);
                 if (!walletConnector) {
                     throw new Error('Could not find the embedded wallet connector');
                 }

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

@@ -95,17 +95,26 @@ const useTurnkey = () => {
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const { getEOAWallet } = useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        yield createDynamicEmbeddedWalletMutation({
-            chains,
-            environmentId,
-            options,
-            walletConnectorOptions,
-            withAuthenticator: false,
-        });
-        setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
         return new Promise((resolve, reject) => {
-            dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
+            // register the event listeners before calling create embedded wallet
+            // as the event might fire before the listeners are registered.
+            dynamicEvents.once('embeddedWalletCreated', (wallet) => {
+                resolve(wallet);
+            });
             dynamicEvents.once('embeddedWalletFailed', (error) => reject(error));
+            createDynamicEmbeddedWalletMutation({
+                chains,
+                environmentId,
+                options,
+                walletConnectorOptions,
+                withAuthenticator: false,
+            })
+                .then(() => {
+                setShowAuthFlow(false, { performMultiWalletChecks: false }); // close email otp pin modal
+            })
+                .catch((error) => {
+                reject(error);
+            });
         });
     }), [
         createDynamicEmbeddedWalletMutation,
@@ -181,7 +190,10 @@ const useTurnkey = () => {
         const isManualMode = ((_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _c === void 0 ? void 0 : _c.automaticEmbeddedWalletCreation) === false;
         const shouldCreateV2WalletsByDefault = ((_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _d === void 0 ? void 0 : _d.defaultWalletVersion) ===
             EmbeddedWalletVersionEnum.V2;
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const primaryChain = findPrimaryEmbeddedChain(projectSettings);
+        // if embedded wallet already exists
+        // get the one with the primary chain if `chains` is undefined
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains !== null && chains !== void 0 ? chains : [primaryChain]);
         const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
         // If the user doesn't have a wallet, or if the customer is in Manual
         // Mode, we should attempt to create a new wallet. Note that if in manual
@@ -208,7 +220,7 @@ const useTurnkey = () => {
             if (embeddedWalletVerifiedCredential &&
                 user.newUser &&
                 ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation)) {
-                const walletConnector = findPasskeyEmailWalletConnector(walletConnectorOptions, findPrimaryEmbeddedChain(projectSettings));
+                const walletConnector = findPasskeyEmailWalletConnector(walletConnectorOptions, primaryChain);
                 if (!walletConnector) {
                     throw new Error('Could not find the embedded wallet connector');
                 }

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

@@ -89,15 +89,12 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 // Hook exposed to customers and used internally to handle social account linking
-const useSocialAccounts = ({ sessionTimeout } = {
-    sessionTimeout: 20000,
-}) => {
+const useSocialAccounts = () => {
     var _a;
     const { environmentId, user, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { handleError, setError, setIsProcessing, checkValidProvider, error, isProcessing, connectSocialAccount, } = useSocialAuth.useSocialAuth({
         onFarcasterUrl: (url) => setView('farcaster-connect-view', { url }),
-        sessionTimeout,
     });
     const verifiedOAuthCredentialsMap = React.useMemo(() => {
         var _a, _b;
@@ -137,7 +134,7 @@ const useSocialAccounts = ({ sessionTimeout } = {
         });
     }), [checkValidOAuthLinking, connectSocialAccount]);
     const unlinkSocialAccount = React.useCallback((provider) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+        var _b, _c;
         setError(undefined);
         setIsProcessing(true);
         if (!checkValidProvider(provider, 'unlink')) {
@@ -149,11 +146,11 @@ const useSocialAccounts = ({ sessionTimeout } = {
             return;
         }
         try {
-            const primaryWalletId = utils.StorageService.getItem(localStorage.PRIMARY_WALLET_ID);
+            const primaryWalletId = (_b = utils.StorageService.getItem(localStorage.PRIMARY_WALLET_ID)) !== null && _b !== void 0 ? _b : undefined;
             const response = yield oauth.unlinkOAuth({
                 environmentId,
                 primaryWalletId,
-                verifiedCrentialId: (_b = verifiedCredential.id) !== null && _b !== void 0 ? _b : '',
+                verifiedCrentialId: (_c = verifiedCredential.id) !== null && _c !== void 0 ? _c : '',
             });
             if (!response) {
                 handleError(provider, types.SocialOAuthErrorCode.UNLINK_ERROR, `Failed to unlink social account: ${provider} | ${verifiedCredential.id}`, { raiseAuthFailure: false });

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

@@ -1,15 +1,12 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { SocialAccountInformation } from '@dynamic-labs/types';
-type UseSocialAccountsProps = {
-    sessionTimeout: number;
-};
 type ConnectSocialProps = {
     /**
      * Overrides the redirectUrl provided by DynamicContextProvider
      */
     redirectUrl?: string;
 };
-export declare const useSocialAccounts: ({ sessionTimeout }?: UseSocialAccountsProps) => {
+export declare const useSocialAccounts: () => {
     readonly error: import("@dynamic-labs/types").SocialOAuthError | undefined;
     readonly getLinkedAccountInformation: (provider: ProviderEnum) => SocialAccountInformation | undefined;
     readonly isLinked: (provider: ProviderEnum) => boolean;