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

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

@@ -10,6 +10,7 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
 require('../../../../constants/values.cjs');
+var errors = require('../../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 var logger = require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -46,11 +47,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');
@@ -68,6 +72,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');
@@ -84,10 +89,10 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
-    const { setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, setUser, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, setUser, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setError } = ErrorContext.useErrorContext();
-    const returnExistingCoinbaseMPCWallet = React.useCallback((connector, decodedJwt, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    const returnExistingCoinbaseMPCWallet = React.useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
             address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
@@ -175,8 +180,11 @@ const useCoinbaseMPC = () => {
         }
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
-    const createCoinbaseMPCWallet = React.useCallback((jwt_1, decodedJwt_1, ...args_1) => _tslib.__awaiter(void 0, [jwt_1, decodedJwt_1, ...args_1], void 0, function* (jwt, decodedJwt, chains = [sdkApiCore.ChainEnum.Evm], password) {
+    const createCoinbaseMPCWallet = React.useCallback((jwt_1, ...args_1) => _tslib.__awaiter(void 0, [jwt_1, ...args_1], void 0, function* (jwt, chains = [sdkApiCore.ChainEnum.Evm], password) {
         var _b;
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
         const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
         if (!connector || !walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
             const error = new utils.DynamicError('CoinbaseWaaSWalletConnectors not found');
@@ -192,10 +200,10 @@ const useCoinbaseMPC = () => {
         if (fetchAuthToken) {
             connector.setAuthTokenFetcher(fetchAuthToken);
         }
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
         // if user already has embedded wallet, set it as primary wallet and return
         if (embeddedWalletVerifiedCredential) {
-            return returnExistingCoinbaseMPCWallet(connector, decodedJwt, embeddedWalletVerifiedCredential);
+            return returnExistingCoinbaseMPCWallet(user, connector, embeddedWalletVerifiedCredential);
         }
         return createNewCoinbaseMPCWallet(connector, jwt, password);
     }), [

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

@@ -1,5 +1,5 @@
-import { ChainEnum, DynamicJwt } from '@dynamic-labs/sdk-api-core';
+import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import { Wallet } from '../../../../../shared';
 export declare const useCoinbaseMPC: () => {
-    createCoinbaseMPCWallet: (jwt: string, decodedJwt: DynamicJwt, chains?: ChainEnum[], password?: string) => Promise<Wallet | undefined>;
+    createCoinbaseMPCWallet: (jwt: string, chains?: ChainEnum[], password?: string) => Promise<Wallet | undefined>;
 };

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

@@ -6,6 +6,7 @@ import { isCoinbaseMpcWalletConnector } from '@dynamic-labs/wallet-connector-cor
 import { DynamicError } from '@dynamic-labs/utils';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
 import '../../../../constants/values.js';
+import { USER_NOT_LOGGED_IN } from '../../../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import { logger } from '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -42,11 +43,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';
@@ -64,6 +68,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';
@@ -80,10 +85,10 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 
 const DYNAMIC_PASSWORD_LENGTH = 20;
 const useCoinbaseMPC = () => {
-    const { setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, setUser, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, setPrimaryWalletId, walletConnectorOptions, environmentId, consumeNonce, displaySiweStatement, appName, siweStatement, setUser, handleLogOut, setShowAuthFlow, } = useInternalDynamicContext();
     const { setError } = useErrorContext();
-    const returnExistingCoinbaseMPCWallet = useCallback((connector, decodedJwt, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
-        connector.setVerifiedCredentials(decodedJwt.verifiedCredentials);
+    const returnExistingCoinbaseMPCWallet = useCallback((validatedUser, connector, embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
+        connector.setVerifiedCredentials(validatedUser.verifiedCredentials);
         setPrimaryWalletId(embeddedWalletVerifiedCredential.id);
         const coinbaseMPCWallet = {
             address: (yield (connector === null || connector === void 0 ? void 0 : connector.getAddress())) || '',
@@ -171,8 +176,11 @@ const useCoinbaseMPC = () => {
         }
         return undefined;
     }), [linkCoinbaseMPCWallet, handleLogOut, setError]);
-    const createCoinbaseMPCWallet = useCallback((jwt_1, decodedJwt_1, ...args_1) => __awaiter(void 0, [jwt_1, decodedJwt_1, ...args_1], void 0, function* (jwt, decodedJwt, chains = [ChainEnum.Evm], password) {
+    const createCoinbaseMPCWallet = useCallback((jwt_1, ...args_1) => __awaiter(void 0, [jwt_1, ...args_1], void 0, function* (jwt, chains = [ChainEnum.Evm], password) {
         var _b;
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
         const connector = (_b = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
         if (!connector || !isCoinbaseMpcWalletConnector(connector)) {
             const error = new DynamicError('CoinbaseWaaSWalletConnectors not found');
@@ -188,10 +196,10 @@ const useCoinbaseMPC = () => {
         if (fetchAuthToken) {
             connector.setAuthTokenFetcher(fetchAuthToken);
         }
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
         // if user already has embedded wallet, set it as primary wallet and return
         if (embeddedWalletVerifiedCredential) {
-            return returnExistingCoinbaseMPCWallet(connector, decodedJwt, embeddedWalletVerifiedCredential);
+            return returnExistingCoinbaseMPCWallet(user, connector, embeddedWalletVerifiedCredential);
         }
         return createNewCoinbaseMPCWallet(connector, jwt, password);
     }), [

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

@@ -22,6 +22,7 @@ require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 var findEmbeddedWalletFromVerifiedCredentials = require('../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.cjs');
+var errors = require('../../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../functions/getAuthToken/getAuthToken.cjs');
 require('react-international-phone');
@@ -40,7 +41,6 @@ require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 var WalletContext = require('../../../../context/WalletContext/WalletContext.cjs');
-var validateUserIsLoggedIn = require('../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.cjs');
 var validateMPCProviderEnabled = require('../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.cjs');
 var useEmbeddedWalletPassword = require('../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.cjs');
 var useCoinbaseMPC = require('./useCoinbaseMPC/useCoinbaseMPC.cjs');
@@ -49,11 +49,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');
@@ -71,6 +74,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');
@@ -95,37 +99,37 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
  * }
  */
 const useMPCEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, walletConnectorOptions } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, walletConnectorOptions, user } = useInternalDynamicContext.useInternalDynamicContext();
     const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword.useEmbeddedWalletPassword();
     const { createCoinbaseMPCWallet } = useCoinbaseMPC.useCoinbaseMPC();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = WalletContext.useWalletContext();
-    const userHasEmbeddedWallet = () => hasEmbeddedWallet.hasEmbeddedWallet(getAuthToken.getAuthToken() || onboardingOnlyJwt, 'coinbase');
+    const userHasEmbeddedWallet = () => hasEmbeddedWallet.hasEmbeddedWallet(user, 'coinbase');
     const createPassword = React.useCallback((showIntro) => _tslib.__awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const prepareToCreateMPCWallet = React.useCallback((chains) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const jwt = (_a = getAuthToken.getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn.validateUserIsLoggedIn(jwt);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(jwt);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
-        const isManualMode = ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) === false;
+        var _a, _b, _c;
+        if (!user) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
+        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials.getUserWalletsFromVerifiedCredentials(user);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const isManualMode = ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.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 Error('Manual mode must be enabled to create an embedded wallet for this user');
         }
         validateMPCProviderEnabled.validateMPCProviderEnabled(projectSettings);
-        const connector = (_c = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _c === void 0 ? void 0 : _c.walletConnector;
+        const connector = (_b = findCoinbaseMPCWallet.findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
         if (!walletConnectorCore.isCoinbaseMpcWalletConnector(connector)) {
             throw new Error('Coinbase MPC wallet connector not found');
         }
         // since we can dynamically change the settings from demov2, we need to set
         // requires password prop here in case the connector has already been initialized with a different value
-        connector.setRequiredPassword((_d = requiresPasswordForEmbeddedWallet.requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _d !== void 0 ? _d : false);
-        return { decodedJwt, embeddedWalletVerifiedCredential, jwt };
-    }), [onboardingOnlyJwt, projectSettings, walletConnectorOptions]);
+        connector.setRequiredPassword((_c = requiresPasswordForEmbeddedWallet.requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _c !== void 0 ? _c : false);
+    }), [user, projectSettings, walletConnectorOptions]);
     const canCreateMPCWallet = React.useCallback((chains) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
             yield prepareToCreateMPCWallet(chains);
@@ -136,17 +140,23 @@ const useMPCEmbeddedWallet = () => {
         }
     }), [prepareToCreateMPCWallet]);
     const createEmbeddedWallet = React.useCallback((chains) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const { decodedJwt, embeddedWalletVerifiedCredential, jwt } = yield prepareToCreateMPCWallet(chains);
+        const jwt = yield getAuthToken.getAuthToken();
+        if (!user || !jwt) {
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
+        }
+        yield prepareToCreateMPCWallet(chains);
         setIsLoadingEmbeddedWallet(true);
         let password;
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials.findEmbeddedWalletFromVerifiedCredentials(user, chains);
         if (!embeddedWalletVerifiedCredential &&
             requiresPasswordForEmbeddedWalletOnSignup.requiresPasswordForEmbeddedWalletOnSignup(projectSettings)) {
             password = yield internalCreatePassword(false, true);
         }
-        const wallet = yield createCoinbaseMPCWallet(jwt, decodedJwt, chains, password);
+        const wallet = yield createCoinbaseMPCWallet(jwt, chains, password);
         setIsLoadingEmbeddedWallet(false);
         return wallet;
     }), [
+        user,
         createCoinbaseMPCWallet,
         internalCreatePassword,
         prepareToCreateMPCWallet,

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

@@ -18,6 +18,7 @@ import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import { findEmbeddedWalletFromVerifiedCredentials } from '../../../functions/findEmbeddedWalletFromVerifiedCredentials/findEmbeddedWalletFromVerifiedCredentials.js';
+import { USER_NOT_LOGGED_IN } from '../../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../functions/getAuthToken/getAuthToken.js';
 import 'react-international-phone';
@@ -36,7 +37,6 @@ import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import { useWalletContext } from '../../../../context/WalletContext/WalletContext.js';
-import { validateUserIsLoggedIn } from '../../../validations/validateUserIsLoggedIn/validateUserIsLoggedIn.js';
 import { validateMPCProviderEnabled } from '../../../validations/validateMPCProviderEnabled/validateMPCProviderEnabled.js';
 import { useEmbeddedWalletPassword } from '../../useEmbeddedWalletPassword/useEmbeddedWalletPassword.js';
 import { useCoinbaseMPC } from './useCoinbaseMPC/useCoinbaseMPC.js';
@@ -45,11 +45,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';
@@ -67,6 +70,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';
@@ -91,37 +95,37 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
  * }
  */
 const useMPCEmbeddedWallet = () => {
-    const { projectSettings, onboardingOnlyJwt, walletConnectorOptions } = useInternalDynamicContext();
+    const { projectSettings, walletConnectorOptions, user } = useInternalDynamicContext();
     const { createPassword: internalCreatePassword } = useEmbeddedWalletPassword();
     const { createCoinbaseMPCWallet } = useCoinbaseMPC();
     const { isLoadingEmbeddedWallet, setIsLoadingEmbeddedWallet } = useWalletContext();
-    const userHasEmbeddedWallet = () => hasEmbeddedWallet(getAuthToken() || onboardingOnlyJwt, 'coinbase');
+    const userHasEmbeddedWallet = () => hasEmbeddedWallet(user, 'coinbase');
     const createPassword = useCallback((showIntro) => __awaiter(void 0, void 0, void 0, function* () { return internalCreatePassword(showIntro); }), [internalCreatePassword]);
     const prepareToCreateMPCWallet = useCallback((chains) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const jwt = (_a = getAuthToken()) !== null && _a !== void 0 ? _a : onboardingOnlyJwt;
-        const { decodedJwt } = validateUserIsLoggedIn(jwt);
-        const userWaletsCredentials = getUserWalletsFromVerifiedCredentials(jwt);
-        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(jwt, chains);
-        const isManualMode = ((_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _b === void 0 ? void 0 : _b.automaticEmbeddedWalletCreation) === false;
+        var _a, _b, _c;
+        if (!user) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
+        const userWalletsCredentials = getUserWalletsFromVerifiedCredentials(user);
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
+        const isManualMode = ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets) === null || _a === void 0 ? void 0 : _a.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 Error('Manual mode must be enabled to create an embedded wallet for this user');
         }
         validateMPCProviderEnabled(projectSettings);
-        const connector = (_c = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _c === void 0 ? void 0 : _c.walletConnector;
+        const connector = (_b = findCoinbaseMPCWallet(walletConnectorOptions)) === null || _b === void 0 ? void 0 : _b.walletConnector;
         if (!isCoinbaseMpcWalletConnector(connector)) {
             throw new Error('Coinbase MPC wallet connector not found');
         }
         // since we can dynamically change the settings from demov2, we need to set
         // requires password prop here in case the connector has already been initialized with a different value
-        connector.setRequiredPassword((_d = requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _d !== void 0 ? _d : false);
-        return { decodedJwt, embeddedWalletVerifiedCredential, jwt };
-    }), [onboardingOnlyJwt, projectSettings, walletConnectorOptions]);
+        connector.setRequiredPassword((_c = requiresPasswordForEmbeddedWallet(projectSettings)) !== null && _c !== void 0 ? _c : false);
+    }), [user, projectSettings, walletConnectorOptions]);
     const canCreateMPCWallet = useCallback((chains) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             yield prepareToCreateMPCWallet(chains);
@@ -132,17 +136,23 @@ const useMPCEmbeddedWallet = () => {
         }
     }), [prepareToCreateMPCWallet]);
     const createEmbeddedWallet = useCallback((chains) => __awaiter(void 0, void 0, void 0, function* () {
-        const { decodedJwt, embeddedWalletVerifiedCredential, jwt } = yield prepareToCreateMPCWallet(chains);
+        const jwt = yield getAuthToken();
+        if (!user || !jwt) {
+            throw new DynamicError(USER_NOT_LOGGED_IN);
+        }
+        yield prepareToCreateMPCWallet(chains);
         setIsLoadingEmbeddedWallet(true);
         let password;
+        const embeddedWalletVerifiedCredential = findEmbeddedWalletFromVerifiedCredentials(user, chains);
         if (!embeddedWalletVerifiedCredential &&
             requiresPasswordForEmbeddedWalletOnSignup(projectSettings)) {
             password = yield internalCreatePassword(false, true);
         }
-        const wallet = yield createCoinbaseMPCWallet(jwt, decodedJwt, chains, password);
+        const wallet = yield createCoinbaseMPCWallet(jwt, chains, password);
         setIsLoadingEmbeddedWallet(false);
         return wallet;
     }), [
+        user,
         createCoinbaseMPCWallet,
         internalCreatePassword,
         prepareToCreateMPCWallet,