@dynamic-labs/sdk-react-core 2.1.0-alpha.23 → 2.1.0-alpha.25

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

@@ -22,8 +22,8 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
-import '../../../locale/locale.js';
 import '@dynamic-labs/store';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -31,12 +31,13 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
@@ -57,7 +58,6 @@ 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';
@@ -65,6 +65,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';

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

@@ -6,30 +6,30 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-require('@dynamic-labs/wallet-connector-core');
-require('../../constants/values.cjs');
-require('@dynamic-labs/utils');
-require('@dynamic-labs/multi-wallet');
-var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+var balances = require('../../../data/api/chains/balances.cjs');
+require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+require('../../../events/dynamicEvents.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../context/ErrorContext/ErrorContext.cjs');
+var errors = require('../../constants/errors.cjs');
+require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../locale/locale.cjs');
 require('@dynamic-labs/store');
-var balances = require('../../../data/api/chains/balances.cjs');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../events/dynamicEvents.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -37,12 +37,13 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
-require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
@@ -63,7 +64,6 @@ 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');
@@ -71,6 +71,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -84,14 +85,13 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.Ch
     const [tokenBalancesData, setTokenBalancesData] = React.useState(undefined);
     const [isLoading, setIsLoading] = React.useState(false);
     const [error, setError] = React.useState(undefined);
-    const { primaryWallet, environmentId, network, walletConnector } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, environmentId, network, walletConnector, user } = useInternalDynamicContext.useInternalDynamicContext();
     const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;
     const fetchAccountBalances = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const jwt = getAuthToken.getAuthToken();
-        if (!jwt) {
-            setError('User is not logged in');
+        if (!user) {
+            setError(errors.USER_NOT_LOGGED_IN);
             return;
         }
         if (requestChainName !== sdkApiCore.ChainEnum.Evm) {
@@ -123,10 +123,11 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = sdkApiCore.Ch
             });
         }
     }), [
+        user,
+        requestChainName,
         isLoading,
         requestAccount,
         requestNetwork,
-        requestChainName,
         environmentId,
     ]);
     React.useEffect(() => {

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

@@ -2,30 +2,30 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { ChainEnum, GetAccountBalancesNetworkIdEnum } from '@dynamic-labs/sdk-api-core';
-import '@dynamic-labs/wallet-connector-core';
-import '../../constants/values.js';
-import '@dynamic-labs/utils';
-import '@dynamic-labs/multi-wallet';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
+import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
+import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
+import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
-import '../../../locale/locale.js';
 import '@dynamic-labs/store';
-import { getAccountTokenBalances } from '../../../data/api/chains/balances.js';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '../../../events/dynamicEvents.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -33,12 +33,13 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
@@ -59,7 +60,6 @@ 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';
@@ -67,6 +67,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -80,14 +81,13 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
     const [tokenBalancesData, setTokenBalancesData] = useState(undefined);
     const [isLoading, setIsLoading] = useState(false);
     const [error, setError] = useState(undefined);
-    const { primaryWallet, environmentId, network, walletConnector } = useInternalDynamicContext();
+    const { primaryWallet, environmentId, network, walletConnector, user } = useInternalDynamicContext();
     const requestChainName = chainName !== null && chainName !== void 0 ? chainName : walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.connectedChain;
     const requestAccount = accountAddress !== null && accountAddress !== void 0 ? accountAddress : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
     const requestNetwork = networkId !== null && networkId !== void 0 ? networkId : network;
     const fetchAccountBalances = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        const jwt = getAuthToken();
-        if (!jwt) {
-            setError('User is not logged in');
+        if (!user) {
+            setError(USER_NOT_LOGGED_IN);
             return;
         }
         if (requestChainName !== ChainEnum.Evm) {
@@ -119,10 +119,11 @@ const useTokenBalances = ({ accountAddress, networkId, chainName = ChainEnum.Evm
             });
         }
     }), [
+        user,
+        requestChainName,
         isLoading,
         requestAccount,
         requestNetwork,
-        requestChainName,
         environmentId,
     ]);
     useEffect(() => {

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

@@ -21,16 +21,16 @@ require('../../../shared/consts/index.cjs');
 require('../../../events/dynamicEvents.cjs');
 require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+var errors = require('../../constants/errors.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
+var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
 require('../../../locale/locale.cjs');
-require('@dynamic-labs/store');
 var wallets = require('../../../data/api/wallets/wallets.cjs');
-var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
@@ -39,13 +39,15 @@ require('../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
 require('../../../context/LoadingContext/LoadingContext.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
-require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
+require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
 require('react-i18next');
 require('../../../components/Alert/Alert.cjs');
@@ -65,7 +67,6 @@ 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');
@@ -73,6 +74,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -82,7 +84,7 @@ require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCa
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useTransferWallet = () => {
-    const { displaySiweStatement, environmentId, authToken, setUser, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { displaySiweStatement, environmentId, user, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
     const updatePrimaryWalletId = React.useCallback((walletConnector, user) => {
         const newWalletKey = walletConnector.key;
@@ -104,8 +106,8 @@ const useTransferWallet = () => {
         }
     }, [primaryWallet, setPrimaryWalletId]);
     return React.useCallback((props) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!authToken)
-            throw new utils.DynamicError('User must be authenticated');
+        if (!user)
+            throw new utils.DynamicError(errors.USER_NOT_LOGGED_IN);
         const { overrideSiweStatement, walletConnector } = props;
         const args = 'nonce' in props
             ? Object.assign(Object.assign({}, props), { displaySiweStatement,
@@ -116,20 +118,21 @@ const useTransferWallet = () => {
             nonce: '', siweStatement: props.overrideSiweStatement, walletProvider: getWalletProvider.getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs.getVerifyArgs(args);
         const response = yield wallets.transferWallet(environmentId, verifyArgs);
-        const userProfile = updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        if (!response) {
+            throw new utils.DynamicError('Error transferring wallet.');
+        }
+        const userProfile = storeAuthTokenAndUser.storeAuthTokenAndUser(response);
         updatePrimaryWalletId(walletConnector, userProfile);
-        setUser(userProfile);
         const walletId = userProfile.lastVerifiedCredentialId;
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
     }), [
         addedWalletsIds,
-        authToken,
         displaySiweStatement,
         environmentId,
-        setUser,
         updatePrimaryWalletId,
+        user,
     ]);
 };
 

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

@@ -17,16 +17,16 @@ import '../../../shared/consts/index.js';
 import '../../../events/dynamicEvents.js';
 import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import { USER_NOT_LOGGED_IN } from '../../constants/errors.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
+import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
 import '../../../locale/locale.js';
-import '@dynamic-labs/store';
 import { transferWallet } from '../../../data/api/wallets/wallets.js';
-import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
@@ -35,13 +35,15 @@ import '../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import '../../../context/LoadingContext/LoadingContext.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
 import 'react-i18next';
 import '../../../components/Alert/Alert.js';
@@ -61,7 +63,6 @@ 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';
@@ -69,6 +70,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -78,7 +80,7 @@ import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCar
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useTransferWallet = () => {
-    const { displaySiweStatement, environmentId, authToken, setUser, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext();
+    const { displaySiweStatement, environmentId, user, primaryWallet, setPrimaryWalletId, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
     const updatePrimaryWalletId = useCallback((walletConnector, user) => {
         const newWalletKey = walletConnector.key;
@@ -100,8 +102,8 @@ const useTransferWallet = () => {
         }
     }, [primaryWallet, setPrimaryWalletId]);
     return useCallback((props) => __awaiter(void 0, void 0, void 0, function* () {
-        if (!authToken)
-            throw new DynamicError('User must be authenticated');
+        if (!user)
+            throw new DynamicError(USER_NOT_LOGGED_IN);
         const { overrideSiweStatement, walletConnector } = props;
         const args = 'nonce' in props
             ? Object.assign(Object.assign({}, props), { displaySiweStatement,
@@ -112,20 +114,21 @@ const useTransferWallet = () => {
             nonce: '', siweStatement: props.overrideSiweStatement, walletProvider: getWalletProvider(walletConnector) });
         const verifyArgs = yield getVerifyArgs(args);
         const response = yield transferWallet(environmentId, verifyArgs);
-        const userProfile = updateJWTAndCreateUserProfile(response === null || response === void 0 ? void 0 : response.jwt, response === null || response === void 0 ? void 0 : response.minifiedJwt);
+        if (!response) {
+            throw new DynamicError('Error transferring wallet.');
+        }
+        const userProfile = storeAuthTokenAndUser(response);
         updatePrimaryWalletId(walletConnector, userProfile);
-        setUser(userProfile);
         const walletId = userProfile.lastVerifiedCredentialId;
         if (walletId) {
             addedWalletsIds.current.push(walletId);
         }
     }), [
         addedWalletsIds,
-        authToken,
         displaySiweStatement,
         environmentId,
-        setUser,
         updatePrimaryWalletId,
+        user,
     ]);
 };
 

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

@@ -28,9 +28,8 @@ require('viem');
 require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 var mfa = require('../../../data/api/mfa/mfa.cjs');
-require('../../../locale/locale.cjs');
 var storeAuthTokenAndUser = require('../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.cjs');
-var updateJWTAndCreateUserProfile = require('../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.cjs');
+require('../../../locale/locale.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var VerificationContext = require('../../../context/VerificationContext/VerificationContext.cjs');
@@ -38,13 +37,14 @@ require('react-dom');
 var useEmbeddedWallet = require('../useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('../../../context/WalletContext/WalletContext.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');
+require('../useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 require('@dynamic-labs/types');
 var LoadingContext = require('../../../context/LoadingContext/LoadingContext.cjs');
 var useHandleVerifiedUser = require('../useHandleVerifiedUser/useHandleVerifiedUser.cjs');
 require('yup');
 require('../../../context/MockContext/MockContext.cjs');
 require('../../../views/CollectUserDataView/useFields.cjs');
-require('../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
+require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/store');
 require('@dynamic-labs/rpc-providers');
@@ -66,7 +66,6 @@ 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');
@@ -74,6 +73,7 @@ require('@hcaptcha/react-hcaptcha');
 require('../../../context/FooterAnimationContext/index.cjs');
 require('../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
 require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
@@ -92,26 +92,31 @@ const useUserAuth = ({ authMethod, }) => {
     const handleVerifiedUser = useHandleVerifiedUser.useHandleVerifiedUser();
     const { displayedDestination: formattedPhone } = VerificationContext.useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
+    const isVerifyResponse = (response) => response.user;
     const initAuth = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
         var _b, _c;
         logger.logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
-            if (!user) {
+            // TODO: change this logic to const verifiedUser = await verifyFunction();
+            // once all verify functions are updated to return UserProfile instead of VerifyResponse
+            const verifyResponse = yield verifyFunction();
+            if (!verifyResponse) {
                 yield cancelAuth();
                 throw new utils.DynamicError('No user returned from verify function');
             }
-            const userProfile = storeAuthTokenAndUser.storeAuthTokenAndUser({ jwt, minifiedJwt, user });
-            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
-            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
+            let verifiedUser;
+            if (isVerifyResponse(verifyResponse)) {
+                verifiedUser = storeAuthTokenAndUser.storeAuthTokenAndUser(verifyResponse);
+            }
+            else {
+                verifiedUser = verifyResponse;
+            }
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            if (isSignIn && ((_b = verifiedUser.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
                 yield handleOnboarding(showSuccessMessage, onSettled);
                 return;
             }
-            if ((_c = user.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
-                // this is needed because useMfa relies on the jwt being available in LS
-                // this function only stores the jwt and creates the user, but does not set
-                // the user state
-                updateJWTAndCreateUserProfile.updateJWTAndCreateUserProfile(jwt, minifiedJwt);
+            if ((_c = verifiedUser.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
                 const devices = yield mfa.getUserMfaDevices({ environmentId });
                 if (devices.length === 0) {
                     setView('mfa-choose-device');
@@ -122,7 +127,7 @@ const useUserAuth = ({ authMethod, }) => {
                 return;
             }
             setMultiWalletWidgetState('idle');
-            yield handleVerifiedUser(userProfile);
+            yield handleVerifiedUser(verifiedUser);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();

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

@@ -24,9 +24,8 @@ import 'viem';
 import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import { getUserMfaDevices } from '../../../data/api/mfa/mfa.js';
-import '../../../locale/locale.js';
 import { storeAuthTokenAndUser } from '../../../store/utils/storeAuthTokenAndUser/storeAuthTokenAndUser.js';
-import { updateJWTAndCreateUserProfile } from '../../functions/updateJWTAndCreateUserProfile/updateJWTAndCreateUserProfile.js';
+import '../../../locale/locale.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
@@ -34,13 +33,14 @@ import 'react-dom';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
 import '../../../context/WalletContext/WalletContext.js';
 import '../../../context/ThemeContext/ThemeContext.js';
+import '../useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import '@dynamic-labs/types';
 import { useLoadingContext } from '../../../context/LoadingContext/LoadingContext.js';
 import { useHandleVerifiedUser } from '../useHandleVerifiedUser/useHandleVerifiedUser.js';
 import 'yup';
 import '../../../context/MockContext/MockContext.js';
 import '../../../views/CollectUserDataView/useFields.js';
-import '../useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
+import '../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/store';
 import '@dynamic-labs/rpc-providers';
@@ -62,7 +62,6 @@ 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';
@@ -70,6 +69,7 @@ import '@hcaptcha/react-hcaptcha';
 import '../../../context/FooterAnimationContext/index.js';
 import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
 import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
@@ -88,26 +88,31 @@ const useUserAuth = ({ authMethod, }) => {
     const handleVerifiedUser = useHandleVerifiedUser();
     const { displayedDestination: formattedPhone } = useVerification();
     const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet();
+    const isVerifyResponse = (response) => response.user;
     const initAuth = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
         var _b, _c;
         logger.debug('initAuth', { authMethod, isSignIn });
         try {
-            const { jwt, minifiedJwt, user } = (yield verifyFunction()) || {};
-            if (!user) {
+            // TODO: change this logic to const verifiedUser = await verifyFunction();
+            // once all verify functions are updated to return UserProfile instead of VerifyResponse
+            const verifyResponse = yield verifyFunction();
+            if (!verifyResponse) {
                 yield cancelAuth();
                 throw new DynamicError('No user returned from verify function');
             }
-            const userProfile = storeAuthTokenAndUser({ jwt, minifiedJwt, user });
-            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(userProfile);
-            if (isSignIn && ((_b = userProfile.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
+            let verifiedUser;
+            if (isVerifyResponse(verifyResponse)) {
+                verifiedUser = storeAuthTokenAndUser(verifyResponse);
+            }
+            else {
+                verifiedUser = verifyResponse;
+            }
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(verifiedUser);
+            if (isSignIn && ((_b = verifiedUser.missingFields) === null || _b === void 0 ? void 0 : _b.length)) {
                 yield handleOnboarding(showSuccessMessage, onSettled);
                 return;
             }
-            if ((_c = user.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
-                // this is needed because useMfa relies on the jwt being available in LS
-                // this function only stores the jwt and creates the user, but does not set
-                // the user state
-                updateJWTAndCreateUserProfile(jwt, minifiedJwt);
+            if ((_c = verifiedUser.scope) === null || _c === void 0 ? void 0 : _c.includes('requiresAdditionalAuth')) {
                 const devices = yield getUserMfaDevices({ environmentId });
                 if (devices.length === 0) {
                     setView('mfa-choose-device');
@@ -118,7 +123,7 @@ const useUserAuth = ({ authMethod, }) => {
                 return;
             }
             setMultiWalletWidgetState('idle');
-            yield handleVerifiedUser(userProfile);
+            yield handleVerifiedUser(verifiedUser);
             if (showSuccessMessage) {
                 // this timeout is set to make sure that the user will see success message
                 yield sleepToShowSuccessMessage();