@dynamic-labs/sdk-react-core 2.1.0-alpha.19 → 2.1.0-alpha.20

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

@@ -25,7 +25,6 @@ require('../../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 var findTurnkeyWallet = require('../../../functions/findTurnkeyWallet/findTurnkeyWallet.cjs');
 require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
 var getUserWalletsFromVerifiedCredentials = require('../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.cjs');
 var addPasskeyIdentifierToWalletConnector = require('../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.cjs');
@@ -46,11 +45,10 @@ require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var useElementById = require('../../useElementById/useElementById.cjs');
+var errors = require('../../../constants/errors.cjs');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
 var useIsTurnkeyWallet = require('../../useIsTurnkeyWallet/useIsTurnkeyWallet.cjs');
-var validateUserIsLoggedIn = require('../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.cjs');
 var validateTurnkeyProviderEnabled = require('../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.cjs');
-var errors = require('../../../constants/errors.cjs');
 var passkeyRecovery = require('../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.cjs');
 var turnkeyExport = require('../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.cjs');
 var useTurnkey = require('./useTurnkey/useTurnkey.cjs');
@@ -60,11 +58,14 @@ require('@dynamic-labs/types');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
-require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
@@ -82,6 +83,7 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../views/WalletList/WalletList.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
@@ -113,17 +115,13 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  */
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d;
-    const { projectSettings, authToken, onboardingOnlyJwt, primaryWallet, user, environmentId, walletConnectorOptions, setUser, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, authToken, primaryWallet, user, environmentId, walletConnectorOptions, setUser, } = useInternalDynamicContext.useInternalDynamicContext();
     const { createTurnkeyWallet } = useTurnkey.useTurnkey();
     const { hasRecoveryEmail } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const { createRootElement } = useElementById.useElementById();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = WalletContext.useWalletContext();
     const wallet = getEOAWallet.getEOAWallet(primaryWallet, (user === null || user === void 0 ? void 0 : user.verifiedCredentials) || []);
-    /**
-     * Checks if the user has a secure enclave embedded wallet or not
-     * @returns boolean
-     */
-    const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(getAuthToken.getAuthToken() || onboardingOnlyJwt, 'turnkey'), [onboardingOnlyJwt]);
+    const userHasEmbeddedWallet = React.useCallback(() => hasEmbeddedWallet.hasEmbeddedWallet(user, 'turnkey'), [user]);
     /**
      * Creates a new secure enclave embedded wallet according to the settings from the dashboard
      * @param chain - optional chain parameter to create the wallet for
@@ -131,16 +129,17 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
-        const jwt = (_e = getAuthToken.getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn.validateUserIsLoggedIn(jwt);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
-        const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation) === false;
+        var _e;
+        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;
         // 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.
-        if ((userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) &&
+        if ((userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) &&
             !embeddedWalletVerifiedCredential &&
             !isManualMode) {
             throw new utils.DynamicError('Manual mode must be enabled to create an embedded wallet for this user');
@@ -148,13 +147,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
         // TEMP: immediately disable loading state
         setIsLoadingEmbeddedWallet(false);
-        return createTurnkeyWallet(jwt, decodedJwt, chains, options);
-    }), [
-        createTurnkeyWallet,
-        onboardingOnlyJwt,
-        projectSettings,
-        setIsLoadingEmbeddedWallet,
-    ]);
+        return createTurnkeyWallet(chains, options);
+    }), [createTurnkeyWallet, projectSettings, setIsLoadingEmbeddedWallet, user]);
     /**
      * Creates or restores a secure enclave embedded wallet session
      * If it detects that the session is possible to be restored, it will restore it
@@ -162,22 +156,23 @@ 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 _g, _h, _j, _k, _l, _m, _o;
-        const jwt = (_g = getAuthToken.getAuthToken()) !== null && _g !== void 0 ? _g : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn.validateUserIsLoggedIn(jwt);
+        var _f, _g, _h, _j, _k, _l;
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
         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((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
+        if (passkeyRecovery.canRestoreEmbeddedWalletSession((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield passkeyRecovery.restoreEmbeddedWalletSession({
-                    authToken: jwt,
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId: constants.iframeElementId,
-                    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),
+                    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),
+                    user,
                     wallet: primaryWallet,
                 });
                 if (sessionRestored)
@@ -195,7 +190,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 = (_o = (_m = (_l = decodedJwt.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;
+        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;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -206,8 +201,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return errors.SESSION_CREATED;
     }), [
         createRootElement,
+        user,
         hasRecoveryEmail,
-        onboardingOnlyJwt,
         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,
         userHasEmbeddedWallet,
@@ -219,10 +214,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = React.useCallback((options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _p, _q;
-        const { decodedJwt } = validateUserIsLoggedIn.validateUserIsLoggedIn(getAuthToken.getAuthToken() || onboardingOnlyJwt);
+        var _m, _o;
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
         validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, decodedJwt.verifiedCredentials);
+        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);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new utils.DynamicError('Wallet connector not found', errors.INVALID_WALLET_DATA);
         }
@@ -231,14 +228,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (user && !(user === null || user === void 0 ? void 0 : user.email)) {
             addPasskeyIdentifierToWalletConnector.addPasskeyIdentifierToWalletConnector(walletConnector, user);
         }
-        const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(decodedJwt, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
+        const hasEmailVC = getUserVerifiedCredentialType.getUserVerifiedCredentialType(user, sdkApiCore.JwtVerifiedCredentialFormatEnum.Email);
         // return a new passkey if the user doesn't have a wallet yet or
         // none of the requirements to add a passkey to an existing wallet are met
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const organizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
-        if (!organizationId) {
+        const turnkeySubOrganizationId = (_o = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        if (!turnkeySubOrganizationId) {
             throw new utils.DynamicError('No sub organization id found for the wallet', errors.INVALID_WALLET_DATA);
         }
         const turnkAuthenticatorHandler = getEmbeddedWalletAuthHandler.getEmbeddedWalletAuthHandler(walletConnector);
@@ -248,7 +245,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         yield turnkAuthenticatorHandler.addPasskeyAuthenticator({
             attestation,
             challenge,
-            organizationId,
+            turnkeySubOrganizationId,
         });
         const passkeyResponse = yield embeddedWallets.completePasskeyRecovery({
             attestation: attestation,
@@ -262,7 +259,6 @@ const useSecureEnclaveEmbeddedWallet = () => {
     }), [
         createOrRestoreSession,
         environmentId,
-        onboardingOnlyJwt,
         projectSettings,
         setUser,
         user,
@@ -273,13 +269,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Passkey[]>
      */
     const getPasskeys = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _r;
-        validateUserIsLoggedIn.validateUserIsLoggedIn((_r = getAuthToken.getAuthToken()) !== null && _r !== void 0 ? _r : onboardingOnlyJwt);
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
         const data = yield embeddedWallets.getUserPasskeys({
             environmentId: environmentId,
         });
         return data.passkeys;
-    }), [environmentId, onboardingOnlyJwt]);
+    }), [user, environmentId]);
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
@@ -293,16 +290,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 = (_s) => _tslib.__awaiter(void 0, [_s], void 0, function* ({ type, htmlContainerId, }) {
-        var _t, _u;
+    const revealEmbeddedWalletKey = (_p) => _tslib.__awaiter(void 0, [_p], void 0, function* ({ type, htmlContainerId, }) {
+        var _q, _r;
         if (!user) {
             throw new utils.DynamicError('User is not logged in', errors.USER_NOT_LOGGED_IN);
         }
         yield turnkeyExport.cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_u = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _u === void 0 ? void 0 : _u.turnkeyHDWalletId;
+        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;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -332,10 +329,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _v, _w, _x;
-        const { decodedJwt } = validateUserIsLoggedIn.validateUserIsLoggedIn((_v = getAuthToken.getAuthToken()) !== null && _v !== void 0 ? _v : onboardingOnlyJwt);
-        validateTurnkeyProviderEnabled.validateTurnkeyProviderEnabled(projectSettings);
-        const targetTurnkeyWallet = findTurnkeyWallet.findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_w = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _w === void 0 ? void 0 : _w.chainConfigurations, decodedJwt.verifiedCredentials);
+        var _s, _t;
+        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);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new utils.DynamicError('User does not have a valid secure enclave wallet', errors.INVALID_WALLET_DATA);
         }
@@ -346,7 +344,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((_x = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _x === void 0 ? void 0 : _x.sessionKeyDuration));
+        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));
         if (!publicKey) {
             throw new utils.DynamicError(errors.ERROR_SENDING_CODE);
         }
@@ -360,8 +358,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return errors.CODE_SENT;
     }), [
         createRootElement,
+        user,
         environmentId,
-        onboardingOnlyJwt,
         projectSettings,
         walletConnectorOptions,
     ]);

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

@@ -21,7 +21,6 @@ import '../../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import { findTurnkeyWalletByPrimaryChain } from '../../../functions/findTurnkeyWallet/findTurnkeyWallet.js';
 import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
 import { getUserWalletsFromVerifiedCredentials } from '../../../functions/getUserWalletsFromVerifiedCredentials/getUserWalletsFromVerifiedCredentials.js';
 import { addPasskeyIdentifierToWalletConnector } from '../../../functions/addPasskeyIdentifierToWalletConnector/addPasskeyIdentifierToWalletConnector.js';
@@ -42,11 +41,10 @@ import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useElementById } from '../../useElementById/useElementById.js';
+import { USER_NOT_LOGGED_IN, ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST, INVALID_WALLET_DATA, SESSION_CREATED, ERROR_SENDING_CODE, CODE_SENT } from '../../../constants/errors.js';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
 import { useIsTurnkeyWallet } from '../../useIsTurnkeyWallet/useIsTurnkeyWallet.js';
-import { validateUserIsLoggedIn } from '../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.js';
 import { validateTurnkeyProviderEnabled } from '../../../validations/validateTurnkeyProviderEnabled/validateTurnkeyProviderEnabled.js';
-import { ACTIVE_SESSION, SESSION_RESTORED, INVALID_REQUEST, INVALID_WALLET_DATA, SESSION_CREATED, USER_NOT_LOGGED_IN, ERROR_SENDING_CODE, CODE_SENT } from '../../../constants/errors.js';
 import { canRestoreEmbeddedWalletSession, restoreEmbeddedWalletSession } from '../../../../views/Passkey/utils/passkeyRecovery/passkeyRecovery.js';
 import { cleanupExport, initExport, exportCredential } from '../../../../views/EmbeddedReveal/utils/turnkeyExport/turnkeyExport.js';
 import { useTurnkey } from './useTurnkey/useTurnkey.js';
@@ -56,11 +54,14 @@ import '@dynamic-labs/types';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import 'react-i18next';
-import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../../views/CollectUserDataView/useFields.js';
 import '../../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import 'zustand';
+import 'zustand/middleware';
+import 'zustand/react/shallow';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/IconButton/IconButton.js';
@@ -78,6 +79,7 @@ import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
@@ -109,17 +111,13 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  */
 const useSecureEnclaveEmbeddedWallet = () => {
     var _a, _b, _c, _d;
-    const { projectSettings, authToken, onboardingOnlyJwt, primaryWallet, user, environmentId, walletConnectorOptions, setUser, } = useInternalDynamicContext();
+    const { projectSettings, authToken, primaryWallet, user, environmentId, walletConnectorOptions, setUser, } = 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) || []);
-    /**
-     * Checks if the user has a secure enclave embedded wallet or not
-     * @returns boolean
-     */
-    const userHasEmbeddedWallet = useCallback(() => hasEmbeddedWallet(getAuthToken() || onboardingOnlyJwt, 'turnkey'), [onboardingOnlyJwt]);
+    const userHasEmbeddedWallet = useCallback(() => hasEmbeddedWallet(user, 'turnkey'), [user]);
     /**
      * Creates a new secure enclave embedded wallet according to the settings from the dashboard
      * @param chain - optional chain parameter to create the wallet for
@@ -127,16 +125,17 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Wallet | undefined>
      */
     const createEmbeddedWallet = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _e, _f;
-        const jwt = (_e = getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn(jwt);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
-        const isManualMode = ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.automaticEmbeddedWalletCreation) === false;
+        var _e;
+        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;
         // 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.
-        if ((userWaletsCredentials === null || userWaletsCredentials === void 0 ? void 0 : userWaletsCredentials.length) &&
+        if ((userWalletsCredentials === null || userWalletsCredentials === void 0 ? void 0 : userWalletsCredentials.length) &&
             !embeddedWalletVerifiedCredential &&
             !isManualMode) {
             throw new DynamicError('Manual mode must be enabled to create an embedded wallet for this user');
@@ -144,13 +143,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         validateTurnkeyProviderEnabled(projectSettings);
         // TEMP: immediately disable loading state
         setIsLoadingEmbeddedWallet(false);
-        return createTurnkeyWallet(jwt, decodedJwt, chains, options);
-    }), [
-        createTurnkeyWallet,
-        onboardingOnlyJwt,
-        projectSettings,
-        setIsLoadingEmbeddedWallet,
-    ]);
+        return createTurnkeyWallet(chains, options);
+    }), [createTurnkeyWallet, projectSettings, setIsLoadingEmbeddedWallet, user]);
     /**
      * Creates or restores a secure enclave embedded wallet session
      * If it detects that the session is possible to be restored, it will restore it
@@ -158,22 +152,23 @@ 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 _g, _h, _j, _k, _l, _m, _o;
-        const jwt = (_g = getAuthToken()) !== null && _g !== void 0 ? _g : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn(jwt);
+        var _f, _g, _h, _j, _k, _l;
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
         const turnkeyRecoveryHandler = getEmbeddedWalletAuthHandler(wallet === null || wallet === void 0 ? void 0 : wallet.connector);
         if (turnkeyRecoveryHandler.isSessionActive()) {
             return ACTIVE_SESSION;
         }
         const turnkeyAuthIframeContainerRef = createRootElement(iframeContainerId);
         // try to restore session if possible
-        if (canRestoreEmbeddedWalletSession((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _h === void 0 ? void 0 : _h.sessionKeyDuration)) {
+        if (canRestoreEmbeddedWalletSession((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _f === void 0 ? void 0 : _f.sessionKeyDuration)) {
             try {
                 const sessionRestored = yield restoreEmbeddedWalletSession({
-                    authToken: jwt,
                     iframeContainer: turnkeyAuthIframeContainerRef.current,
                     iframeElementId,
-                    sessionExpiration: 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),
+                    sessionExpiration: 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),
+                    user,
                     wallet: primaryWallet,
                 });
                 if (sessionRestored)
@@ -191,7 +186,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 = (_o = (_m = (_l = decodedJwt.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;
+        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;
         yield turnkeyRecoveryHandler.verifyRecoveryCode(options.oneTimeCode, organizationId);
         const sessionSettings = {
             createdAt: new Date().getTime(),
@@ -202,8 +197,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return SESSION_CREATED;
     }), [
         createRootElement,
+        user,
         hasRecoveryEmail,
-        onboardingOnlyJwt,
         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,
         userHasEmbeddedWallet,
@@ -215,10 +210,12 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<WebAuthnAttestation>
      */
     const createPasskey = useCallback((options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _p, _q;
-        const { decodedJwt } = validateUserIsLoggedIn(getAuthToken() || onboardingOnlyJwt);
+        var _m, _o;
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
         validateTurnkeyProviderEnabled(projectSettings);
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_p = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _p === void 0 ? void 0 : _p.chainConfigurations, decodedJwt.verifiedCredentials);
+        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_m = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _m === void 0 ? void 0 : _m.chainConfigurations, user.verifiedCredentials);
         if (!(turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector)) {
             throw new DynamicError('Wallet connector not found', INVALID_WALLET_DATA);
         }
@@ -227,14 +224,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
         if (user && !(user === null || user === void 0 ? void 0 : user.email)) {
             addPasskeyIdentifierToWalletConnector(walletConnector, user);
         }
-        const hasEmailVC = getUserVerifiedCredentialType(decodedJwt, JwtVerifiedCredentialFormatEnum.Email);
+        const hasEmailVC = getUserVerifiedCredentialType(user, JwtVerifiedCredentialFormatEnum.Email);
         // return a new passkey if the user doesn't have a wallet yet or
         // none of the requirements to add a passkey to an existing wallet are met
         if (!('id' in turnkeyWallet) || !hasEmailVC) {
             return walletConnector.getWebAuthnAttestation();
         }
-        const organizationId = (_q = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _q === void 0 ? void 0 : _q.turnkeySubOrganizationId;
-        if (!organizationId) {
+        const turnkeySubOrganizationId = (_o = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _o === void 0 ? void 0 : _o.turnkeySubOrganizationId;
+        if (!turnkeySubOrganizationId) {
             throw new DynamicError('No sub organization id found for the wallet', INVALID_WALLET_DATA);
         }
         const turnkAuthenticatorHandler = getEmbeddedWalletAuthHandler(walletConnector);
@@ -244,7 +241,7 @@ const useSecureEnclaveEmbeddedWallet = () => {
         yield turnkAuthenticatorHandler.addPasskeyAuthenticator({
             attestation,
             challenge,
-            organizationId,
+            turnkeySubOrganizationId,
         });
         const passkeyResponse = yield completePasskeyRecovery({
             attestation: attestation,
@@ -258,7 +255,6 @@ const useSecureEnclaveEmbeddedWallet = () => {
     }), [
         createOrRestoreSession,
         environmentId,
-        onboardingOnlyJwt,
         projectSettings,
         setUser,
         user,
@@ -269,13 +265,14 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<Passkey[]>
      */
     const getPasskeys = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _r;
-        validateUserIsLoggedIn((_r = getAuthToken()) !== null && _r !== void 0 ? _r : onboardingOnlyJwt);
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
         const data = yield getUserPasskeys({
             environmentId: environmentId,
         });
         return data.passkeys;
-    }), [environmentId, onboardingOnlyJwt]);
+    }), [user, environmentId]);
     /**
      * Checks if the embedded wallet session is active
      * @returns boolean
@@ -289,16 +286,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 = (_s) => __awaiter(void 0, [_s], void 0, function* ({ type, htmlContainerId, }) {
-        var _t, _u;
+    const revealEmbeddedWalletKey = (_p) => __awaiter(void 0, [_p], void 0, function* ({ type, htmlContainerId, }) {
+        var _q, _r;
         if (!user) {
             throw new DynamicError('User is not logged in', USER_NOT_LOGGED_IN);
         }
         yield cleanupExport({
             wallet,
         });
-        const turnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.chainConfigurations, user === null || user === void 0 ? void 0 : user.verifiedCredentials);
-        const turnkeyHDWalletId = (_u = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletProperties) === null || _u === void 0 ? void 0 : _u.turnkeyHDWalletId;
+        const turnkeyWallet = 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;
         if (type === 'recoveryPhrase' && !turnkeyHDWalletId) {
             type = 'privateKey';
         }
@@ -328,10 +325,11 @@ const useSecureEnclaveEmbeddedWallet = () => {
      * @returns Promise<'code_sent'>
      */
     const sendOneTimeCode = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _v, _w, _x;
-        const { decodedJwt } = validateUserIsLoggedIn((_v = getAuthToken()) !== null && _v !== void 0 ? _v : onboardingOnlyJwt);
-        validateTurnkeyProviderEnabled(projectSettings);
-        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_w = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _w === void 0 ? void 0 : _w.chainConfigurations, decodedJwt.verifiedCredentials);
+        var _s, _t;
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
+        const targetTurnkeyWallet = findTurnkeyWalletByPrimaryChain(walletConnectorOptions, (_s = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _s === void 0 ? void 0 : _s.chainConfigurations, user.verifiedCredentials);
         if (!targetTurnkeyWallet || !('id' in targetTurnkeyWallet)) {
             throw new DynamicError('User does not have a valid secure enclave wallet', INVALID_WALLET_DATA);
         }
@@ -342,7 +340,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((_x = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _x === void 0 ? void 0 : _x.sessionKeyDuration));
+        const publicKey = yield turnkeyAuthenticatorHandler.initRecovery('email', turnkeyAuthIframeContainerRef.current, iframeElementId, getEmbeddedWalletSessionExpiration((_t = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _t === void 0 ? void 0 : _t.sessionKeyDuration));
         if (!publicKey) {
             throw new DynamicError(ERROR_SENDING_CODE);
         }
@@ -356,8 +354,8 @@ const useSecureEnclaveEmbeddedWallet = () => {
         return CODE_SENT;
     }), [
         createRootElement,
+        user,
         environmentId,
-        onboardingOnlyJwt,
         projectSettings,
         walletConnectorOptions,
     ]);