@dynamic-labs/sdk-react-core 2.1.0-alpha.3 → 2.1.0-alpha.30

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var yup = require('yup');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
-require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -31,25 +31,59 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
     const { fieldsConfig } = useFields.useFields();
     const enforcePolicies = shouldEnforcePolicies &&
         ((_a = fields.find((setting) => setting.name === 'policiesConsent')) === null || _a === void 0 ? void 0 : _a.enabled);
-    const formikValidationSchema = React.useMemo(() => yup.object().shape(Object.fromEntries(fields.map(({ name, required }) => [
-        name,
-        required
-            ? index.getValueByKey(fieldsConfig, name).validation.required('required')
-            : index.getValueByKey(fieldsConfig, name).validation,
-    ]))), [fields]);
-    const formikInitialValues = React.useMemo(() => Object.fromEntries(fields.map(({ name }) => {
-        var _a, _b, _c;
+    const requiredTitleCase = (name) => `${name.charAt(0).toUpperCase() + name.slice(1)} is required`;
+    const formikValidationSchema = React.useMemo(() => yup.object().shape(Object.fromEntries(fields.map(({ name, required, type, validationType, validationRules }) => {
+        let schema = type === sdkApiCore.KycFieldType.Custom
+            ? index.getValueByKey(useFields.customFieldValidationMap, validationType)
+            : index.getValueByKey(fieldsConfig, name).validation;
+        if (type === sdkApiCore.KycFieldType.Custom &&
+            validationRules &&
+            (validationType === sdkApiCore.CustomFieldType.Select ||
+                validationType === sdkApiCore.CustomFieldType.Text)) {
+            schema = schema;
+            if (validationRules.validOptions) {
+                schema = schema.oneOf(validationRules.validOptions.map((option) => option.label), 'Select a valid option');
+            }
+            else if (validationRules.regex) {
+                schema = schema.matches(new RegExp(validationRules.regex), 'Invalid field format');
+            }
+        }
+        return [
+            name,
+            required ? schema.required(requiredTitleCase(name)) : schema,
+        ];
+    }))), [fields]);
+    const formikInitialValues = React.useMemo(() => Object.fromEntries(fields.map(({ name, type, validationRules, validationType }) => {
+        var _a, _b, _c, _d;
         const info = (userProfile !== null && userProfile !== void 0 ? userProfile : {});
+        if (type === sdkApiCore.KycFieldType.Custom) {
+            let defaultValue = '';
+            if (validationType === sdkApiCore.CustomFieldType.Select &&
+                (validationRules === null || validationRules === void 0 ? void 0 : validationRules.validOptions))
+                defaultValue = (_a = validationRules.validOptions[0].label) !== null && _a !== void 0 ? _a : '';
+            return [
+                name,
+                (() => {
+                    var _a;
+                    const value = index.getValueByKey(info.metadata, name);
+                    return Array.isArray(value)
+                        ? value
+                        : (_a = value === null || value === void 0 ? void 0 : value.toString()) !== null && _a !== void 0 ? _a : defaultValue;
+                })(),
+            ];
+        }
         const mapNameToDefaultValue = {
             country: index$1.countryCodes[0].code,
             policiesConsent: false,
             tShirtSize: index$1.tShirtSizes[0],
             team: index$1.teamNames[0],
         };
-        const defaultValue = (_a = mapNameToDefaultValue[name]) !== null && _a !== void 0 ? _a : '';
-        return [name, (_c = (_b = index.getValueByKey(info, name)) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : defaultValue];
+        const defaultValue = (_b = mapNameToDefaultValue[name]) !== null && _b !== void 0 ? _b : '';
+        return [name, (_d = (_c = index.getValueByKey(info, name)) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : defaultValue];
     })) || {}, [fields, userProfile]);
     const onFormSubmit = React.useCallback((values, formikHelper) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const metadata = {};
+        const uniqueMetadata = {};
         if (mockedSDK)
             return;
         try {
@@ -57,6 +91,18 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 throw new utils.DynamicError('Invalid environment ID');
             setFetch(true);
             let updatedUserFields = values;
+            // all kyc fields including custom are in the object, move custom fields to the object.metadata
+            Object.entries(updatedUserFields).forEach(([fieldName, fieldValue]) => {
+                const field = fields.find((f) => f.name === fieldName && f.type === sdkApiCore.KycFieldType.Custom);
+                if (field) {
+                    metadata[fieldName] = fieldValue;
+                    delete updatedUserFields[fieldName];
+                    if (field.unique)
+                        uniqueMetadata[fieldName] = fieldValue;
+                }
+            });
+            if (Object.keys(metadata).length > 0)
+                updatedUserFields.metadata = metadata;
             if (enforcePolicies) {
                 updatedUserFields = Object.assign(Object.assign({}, updatedUserFields), { policiesConsent: true });
                 delete updatedUserFields.policiesConsentArray;
@@ -69,6 +115,18 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             if (e instanceof utils.EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
+            else if (e instanceof utils.CustomFieldNotUniqueError) {
+                // clear all non error fields because user has to edit them anyways for the validation to pass, not sure why
+                formikHelper.setFormikState((state) => (Object.assign(Object.assign({}, state), { errors: Object.fromEntries(Object.entries(uniqueMetadata).map(([customFieldName]) => [
+                        customFieldName,
+                        Object.entries(uniqueMetadata).length > 1
+                            ? 'One or more fields are already tied to another user'
+                            : `${customFieldName} is already tied to another user`,
+                    ])), touched: Object.fromEntries(Object.entries(uniqueMetadata).map(([fieldName]) => [
+                        fieldName,
+                        true,
+                    ])), values: Object.assign(Object.assign({}, formikInitialValues), uniqueMetadata) })));
+            }
             else if (e instanceof utils.TooManyEmailVerificationsError) {
                 formikHelper.setErrors({
                     email: 'Too many email verification attempts.',
@@ -78,7 +136,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else if (e instanceof utils.InvalidPhoneNumberError) {
-                formikHelper.setErrors({ phoneNumber: 'Invalid phone number' });
+                formikHelper.setErrors({ phoneNumber: e.message });
             }
             else {
                 formikHelper.setErrors({
@@ -89,7 +147,15 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         finally {
             setFetch(false);
         }
-    }), [mockedSDK, userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId, enforcePolicies, onSubmit, onError]);
+    }), [
+        mockedSDK,
+        userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId,
+        enforcePolicies,
+        onSubmit,
+        fields,
+        onError,
+        formikInitialValues,
+    ]);
     return {
         enforcePolicies,
         fetch,

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

@@ -1,3 +1,4 @@
+import { StringSchema } from 'yup';
 import { FormikHelpers } from 'formik';
 import { ProjectSettingsKyc } from '@dynamic-labs/sdk-api-core';
 import { UserProfile } from '@dynamic-labs/types';
@@ -6,6 +7,7 @@ export type UserDataFormValues = {
     policiesConsent?: boolean;
     policiesConsentArray?: [];
     username?: string;
+    metadata?: object;
 };
 export type UseUserDataFormProps = {
     fields: ProjectSettingsKyc[];
@@ -21,17 +23,18 @@ export declare const useUserDataForm: ({ onSubmit, onError, userProfile, shouldE
         [k: string]: string;
     };
     formikValidationSchema: import("yup").ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        [k: string]: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
+        [k: string]: import("yup/lib/array").OptionalArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined> | StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined> | import("yup/lib/array").RequiredArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
     }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        [k: string]: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
+        [k: string]: import("yup/lib/array").OptionalArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined> | StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined> | import("yup/lib/array").RequiredArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
     }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-        [k: string]: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
+        [k: string]: import("yup/lib/array").OptionalArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined> | StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined> | import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined> | import("yup/lib/array").RequiredArraySchema<import("yup").AnySchema, import("yup/lib/types").AnyObject, any[] | undefined>;
     }>>>;
     onFormSubmit: (values: {
         email?: string;
         policiesConsent?: boolean;
         policiesConsentArray?: [];
         username?: string;
+        metadata?: object;
     }, formikHelper: FormikHelpers<{
         api?: string;
         email?: string;

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

@@ -2,9 +2,9 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useCallback } from 'react';
 import { object } from 'yup';
-import { DynamicError, EmailAlreadyExistsError, TooManyEmailVerificationsError, UsernameAlreadyExistsError, InvalidPhoneNumberError } from '@dynamic-labs/utils';
+import { KycFieldType, CustomFieldType } from '@dynamic-labs/sdk-api-core';
+import { DynamicError, EmailAlreadyExistsError, CustomFieldNotUniqueError, TooManyEmailVerificationsError, UsernameAlreadyExistsError, InvalidPhoneNumberError } from '@dynamic-labs/utils';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
-import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -16,7 +16,7 @@ import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import { countryCodes, tShirtSizes, teamNames } from '../../../shared/consts/index.js';
-import { useFields } from '../../../views/CollectUserDataView/useFields.js';
+import { useFields, customFieldValidationMap } from '../../../views/CollectUserDataView/useFields.js';
 
 // Hook that returns the prepared data to work with the formik
 // In order to update or display user information
@@ -27,25 +27,59 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
     const { fieldsConfig } = useFields();
     const enforcePolicies = shouldEnforcePolicies &&
         ((_a = fields.find((setting) => setting.name === 'policiesConsent')) === null || _a === void 0 ? void 0 : _a.enabled);
-    const formikValidationSchema = useMemo(() => object().shape(Object.fromEntries(fields.map(({ name, required }) => [
-        name,
-        required
-            ? getValueByKey(fieldsConfig, name).validation.required('required')
-            : getValueByKey(fieldsConfig, name).validation,
-    ]))), [fields]);
-    const formikInitialValues = useMemo(() => Object.fromEntries(fields.map(({ name }) => {
-        var _a, _b, _c;
+    const requiredTitleCase = (name) => `${name.charAt(0).toUpperCase() + name.slice(1)} is required`;
+    const formikValidationSchema = useMemo(() => object().shape(Object.fromEntries(fields.map(({ name, required, type, validationType, validationRules }) => {
+        let schema = type === KycFieldType.Custom
+            ? getValueByKey(customFieldValidationMap, validationType)
+            : getValueByKey(fieldsConfig, name).validation;
+        if (type === KycFieldType.Custom &&
+            validationRules &&
+            (validationType === CustomFieldType.Select ||
+                validationType === CustomFieldType.Text)) {
+            schema = schema;
+            if (validationRules.validOptions) {
+                schema = schema.oneOf(validationRules.validOptions.map((option) => option.label), 'Select a valid option');
+            }
+            else if (validationRules.regex) {
+                schema = schema.matches(new RegExp(validationRules.regex), 'Invalid field format');
+            }
+        }
+        return [
+            name,
+            required ? schema.required(requiredTitleCase(name)) : schema,
+        ];
+    }))), [fields]);
+    const formikInitialValues = useMemo(() => Object.fromEntries(fields.map(({ name, type, validationRules, validationType }) => {
+        var _a, _b, _c, _d;
         const info = (userProfile !== null && userProfile !== void 0 ? userProfile : {});
+        if (type === KycFieldType.Custom) {
+            let defaultValue = '';
+            if (validationType === CustomFieldType.Select &&
+                (validationRules === null || validationRules === void 0 ? void 0 : validationRules.validOptions))
+                defaultValue = (_a = validationRules.validOptions[0].label) !== null && _a !== void 0 ? _a : '';
+            return [
+                name,
+                (() => {
+                    var _a;
+                    const value = getValueByKey(info.metadata, name);
+                    return Array.isArray(value)
+                        ? value
+                        : (_a = value === null || value === void 0 ? void 0 : value.toString()) !== null && _a !== void 0 ? _a : defaultValue;
+                })(),
+            ];
+        }
         const mapNameToDefaultValue = {
             country: countryCodes[0].code,
             policiesConsent: false,
             tShirtSize: tShirtSizes[0],
             team: teamNames[0],
         };
-        const defaultValue = (_a = mapNameToDefaultValue[name]) !== null && _a !== void 0 ? _a : '';
-        return [name, (_c = (_b = getValueByKey(info, name)) === null || _b === void 0 ? void 0 : _b.toString()) !== null && _c !== void 0 ? _c : defaultValue];
+        const defaultValue = (_b = mapNameToDefaultValue[name]) !== null && _b !== void 0 ? _b : '';
+        return [name, (_d = (_c = getValueByKey(info, name)) === null || _c === void 0 ? void 0 : _c.toString()) !== null && _d !== void 0 ? _d : defaultValue];
     })) || {}, [fields, userProfile]);
     const onFormSubmit = useCallback((values, formikHelper) => __awaiter(void 0, void 0, void 0, function* () {
+        const metadata = {};
+        const uniqueMetadata = {};
         if (mockedSDK)
             return;
         try {
@@ -53,6 +87,18 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 throw new DynamicError('Invalid environment ID');
             setFetch(true);
             let updatedUserFields = values;
+            // all kyc fields including custom are in the object, move custom fields to the object.metadata
+            Object.entries(updatedUserFields).forEach(([fieldName, fieldValue]) => {
+                const field = fields.find((f) => f.name === fieldName && f.type === KycFieldType.Custom);
+                if (field) {
+                    metadata[fieldName] = fieldValue;
+                    delete updatedUserFields[fieldName];
+                    if (field.unique)
+                        uniqueMetadata[fieldName] = fieldValue;
+                }
+            });
+            if (Object.keys(metadata).length > 0)
+                updatedUserFields.metadata = metadata;
             if (enforcePolicies) {
                 updatedUserFields = Object.assign(Object.assign({}, updatedUserFields), { policiesConsent: true });
                 delete updatedUserFields.policiesConsentArray;
@@ -65,6 +111,18 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             if (e instanceof EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
+            else if (e instanceof CustomFieldNotUniqueError) {
+                // clear all non error fields because user has to edit them anyways for the validation to pass, not sure why
+                formikHelper.setFormikState((state) => (Object.assign(Object.assign({}, state), { errors: Object.fromEntries(Object.entries(uniqueMetadata).map(([customFieldName]) => [
+                        customFieldName,
+                        Object.entries(uniqueMetadata).length > 1
+                            ? 'One or more fields are already tied to another user'
+                            : `${customFieldName} is already tied to another user`,
+                    ])), touched: Object.fromEntries(Object.entries(uniqueMetadata).map(([fieldName]) => [
+                        fieldName,
+                        true,
+                    ])), values: Object.assign(Object.assign({}, formikInitialValues), uniqueMetadata) })));
+            }
             else if (e instanceof TooManyEmailVerificationsError) {
                 formikHelper.setErrors({
                     email: 'Too many email verification attempts.',
@@ -74,7 +132,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else if (e instanceof InvalidPhoneNumberError) {
-                formikHelper.setErrors({ phoneNumber: 'Invalid phone number' });
+                formikHelper.setErrors({ phoneNumber: e.message });
             }
             else {
                 formikHelper.setErrors({
@@ -85,7 +143,15 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         finally {
             setFetch(false);
         }
-    }), [mockedSDK, userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId, enforcePolicies, onSubmit, onError]);
+    }), [
+        mockedSDK,
+        userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId,
+        enforcePolicies,
+        onSubmit,
+        fields,
+        onError,
+        formikInitialValues,
+    ]);
     return {
         enforcePolicies,
         fetch,

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -5,9 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var yup = require('yup');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
-var decodeJwt = require('../../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -28,23 +26,27 @@ require('react-international-phone');
 require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
 require('../../../../locale/locale.cjs');
 var user = require('../../../../data/api/user/user.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var VerificationContext = require('../../../../context/VerificationContext/VerificationContext.cjs');
-var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 var useHandleVerificationRequired = require('../../useHandleVerificationRequired/useHandleVerificationRequired.cjs');
 require('@dynamic-labs/types');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
+require('yup');
 require('../../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
+require('../../../../views/CollectUserDataView/useFields.cjs');
 var FieldsStateContext = require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+var userFieldsSchema = require('./userFieldsSchema.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
+require('react-i18next');
 require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
@@ -66,10 +68,11 @@ require('../../../../views/WalletList/WalletList.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 require('@hcaptcha/react-hcaptcha');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 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');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
@@ -77,41 +80,21 @@ require('../../../../views/TransactionConfirmationView/helpers/transactionErrorM
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
-// User Fields Schema without captchaToken and policiesConsent properties
-const userFieldsSchema = yup.object().shape({
-    alias: yup.string(),
-    btcWallet: yup.string(),
-    ckbWallet: yup.string(),
-    country: yup.string(),
-    discordNotification: yup.boolean(),
-    dogeWallet: yup.string(),
-    email: yup.string(),
-    emailNotification: yup.boolean(),
-    firstName: yup.string(),
-    jobTitle: yup.string(),
-    kasWallet: yup.string(),
-    kdaWallet: yup.string(),
-    lastName: yup.string(),
-    ltcWallet: yup.string(),
-    metadata: yup.object(),
-    newsletterNotification: yup.boolean(),
-    phoneNumber: yup.string(),
-    tShirtSize: yup.string(),
-    team: yup.string(),
-    username: yup.string(),
-});
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || minAuthToken;
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
+    const { environmentId, unauthenticatedUser, setCallback } = useInternalDynamicContext.useInternalDynamicContext();
     const { setRetryData } = VerificationContext.useVerification();
     const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
+    const handleVerificationRequired = useHandleVerificationRequired.useHandleVerificationRequired();
     const updateUser = React.useCallback((userFields, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
-        const { metadata } = userFields;
-        const validatedUserFields = yield userFieldsSchema.validate(userFields, {
+        let { metadata } = userFields;
+        // when a user has already logged in but a custom field was added to env, in order to not clear the old fields
+        metadata = metadata
+            ? Object.assign(Object.assign({}, unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata), metadata) : unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata;
+        // we dont add user.metadata from edit profile because it is already in the metadata request for updateUser
+        const validatedUserFields = yield userFieldsSchema.userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
         // If there is a phone number, store it in the retry verification data
@@ -124,19 +107,17 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
                 iso2: selectedPhoneCountry.current.iso2,
                 phone: validatedUserFields.phoneNumber,
             });
-        const updateUserProfileResponse = yield user.updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.jwtOverride) !== null && _a !== void 0 ? _a : jwtToken, (_b = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _b !== void 0 ? _b : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
+        const updateUserProfileResponse = yield user.updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _a !== void 0 ? _a : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
-        const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
-        const missingFields = (_c = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _c !== void 0 ? _c : [];
-        const requiredVerificationDestination = useHandleVerificationRequired.isVerificationRequired(updateUserProfileResponse);
-        if (requiredVerificationDestination && handleVerificationRequired.current)
-            return handleVerificationRequired.current({
+        const missingFields = (_b = updateUserProfileResponse.user.missingFields) !== null && _b !== void 0 ? _b : [];
+        const requiredVerificationDestination = useHandleVerificationRequired.getVerificationDestination(updateUserProfileResponse.nextView);
+        if (requiredVerificationDestination)
+            return handleVerificationRequired({
                 destination: requiredVerificationDestination,
                 missingFields,
                 updateUserProfileResponse,
             });
-        // If verification is not needed then we can update the user profile immediately.
-        yield updateUserProfileByJWT(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt);
+        setCallback('userProfileUpdate');
         return {
             isEmailVerificationRequired: false,
             isSmsVerificationRequired: false,
@@ -144,17 +125,14 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             updateUserProfileResponse,
         };
     }), [
+        unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata,
         validationSchemaStripUnknown,
         selectedPhoneCountry,
-        jwtToken,
-        environmentId,
-        updateUserProfileByJWT,
         setRetryData,
+        environmentId,
+        handleVerificationRequired,
+        setCallback,
     ]);
-    // This is necessary to avoid a circular declaration issue
-    const handleVerificationRequired = React.useRef(undefined);
-    handleVerificationRequired.current =
-        useHandleVerificationRequired.useHandleVerificationRequired(updateUser);
     return updateUser;
 };
 

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js

@@ -1,9 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { useCallback, useRef } from 'react';
-import { object, string, boolean } from 'yup';
+import { useCallback } from 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
-import { decodeJwt } from '../../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -24,23 +22,27 @@ import 'react-international-phone';
 import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
 import '../../../../locale/locale.js';
 import { updateUserProfileFields } from '../../../../data/api/user/user.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useVerification } from '../../../../context/VerificationContext/VerificationContext.js';
-import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
-import { useHandleVerificationRequired, isVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
+import { useHandleVerificationRequired, getVerificationDestination } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
+import 'yup';
 import '../../../../context/MockContext/MockContext.js';
-import 'react-i18next';
+import '../../../../views/CollectUserDataView/useFields.js';
 import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import { userFieldsSchema } from './userFieldsSchema.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
+import 'react-i18next';
 import '../../../../components/Alert/Alert.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/IconButton/IconButton.js';
@@ -62,10 +64,11 @@ import '../../../../views/WalletList/WalletList.js';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 import '@hcaptcha/react-hcaptcha';
-import '../../../../context/LoadingContext/LoadingContext.js';
 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';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
@@ -73,40 +76,20 @@ import '../../../../views/TransactionConfirmationView/helpers/transactionErrorMe
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
-// User Fields Schema without captchaToken and policiesConsent properties
-const userFieldsSchema = object().shape({
-    alias: string(),
-    btcWallet: string(),
-    ckbWallet: string(),
-    country: string(),
-    discordNotification: boolean(),
-    dogeWallet: string(),
-    email: string(),
-    emailNotification: boolean(),
-    firstName: string(),
-    jobTitle: string(),
-    kasWallet: string(),
-    kdaWallet: string(),
-    lastName: string(),
-    ltcWallet: string(),
-    metadata: object(),
-    newsletterNotification: boolean(),
-    phoneNumber: string(),
-    tShirtSize: string(),
-    team: string(),
-    username: string(),
-});
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
-    const jwtToken = onboardingOnlyJwt || minAuthToken;
-    const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
+    const { environmentId, unauthenticatedUser, setCallback } = useInternalDynamicContext();
     const { setRetryData } = useVerification();
     const { selectedPhoneCountry } = useFieldsState();
+    const handleVerificationRequired = useHandleVerificationRequired();
     const updateUser = useCallback((userFields, options) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b;
         // `stripUnknown: true` will automatically strip out any values in the metadata object
         // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
-        const { metadata } = userFields;
+        let { metadata } = userFields;
+        // when a user has already logged in but a custom field was added to env, in order to not clear the old fields
+        metadata = metadata
+            ? Object.assign(Object.assign({}, unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata), metadata) : unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata;
+        // we dont add user.metadata from edit profile because it is already in the metadata request for updateUser
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
@@ -120,19 +103,17 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
                 iso2: selectedPhoneCountry.current.iso2,
                 phone: validatedUserFields.phoneNumber,
             });
-        const updateUserProfileResponse = yield updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.jwtOverride) !== null && _a !== void 0 ? _a : jwtToken, (_b = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _b !== void 0 ? _b : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
+        const updateUserProfileResponse = yield updateUserProfileFields((_a = options === null || options === void 0 ? void 0 : options.userEnvironmentId) !== null && _a !== void 0 ? _a : environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
-        const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
-        const missingFields = (_c = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _c !== void 0 ? _c : [];
-        const requiredVerificationDestination = isVerificationRequired(updateUserProfileResponse);
-        if (requiredVerificationDestination && handleVerificationRequired.current)
-            return handleVerificationRequired.current({
+        const missingFields = (_b = updateUserProfileResponse.user.missingFields) !== null && _b !== void 0 ? _b : [];
+        const requiredVerificationDestination = getVerificationDestination(updateUserProfileResponse.nextView);
+        if (requiredVerificationDestination)
+            return handleVerificationRequired({
                 destination: requiredVerificationDestination,
                 missingFields,
                 updateUserProfileResponse,
             });
-        // If verification is not needed then we can update the user profile immediately.
-        yield updateUserProfileByJWT(updateUserProfileResponse.jwt, updateUserProfileResponse.minifiedJwt);
+        setCallback('userProfileUpdate');
         return {
             isEmailVerificationRequired: false,
             isSmsVerificationRequired: false,
@@ -140,17 +121,14 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
             updateUserProfileResponse,
         };
     }), [
+        unauthenticatedUser === null || unauthenticatedUser === void 0 ? void 0 : unauthenticatedUser.metadata,
         validationSchemaStripUnknown,
         selectedPhoneCountry,
-        jwtToken,
-        environmentId,
-        updateUserProfileByJWT,
         setRetryData,
+        environmentId,
+        handleVerificationRequired,
+        setCallback,
     ]);
-    // This is necessary to avoid a circular declaration issue
-    const handleVerificationRequired = useRef(undefined);
-    handleVerificationRequired.current =
-        useHandleVerificationRequired(updateUser);
     return updateUser;
 };