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

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

@@ -0,0 +1,268 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { DynamicError, EmailAlreadyExistsError, CustomFieldNotUniqueError, UsernameAlreadyExistsError, TooManyEmailVerificationsError, InvalidPhoneNumberError, NoAccessError, AccountExistsError, UserHasAccountWithEmailError, sleep } from '@dynamic-labs/utils';
+import 'react';
+import '../../../context/DynamicContext/DynamicContext.js';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import '@dynamic-labs/sdk-api-core';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import { AUTH_ONBOARDING_TOKEN } from '../../constants/localStorage.js';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/consts/index.js';
+import '../../../events/dynamicEvents.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../../config/ApiEndpoint.js';
+import '../../../locale/locale.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useVerification } from '../../../context/VerificationContext/VerificationContext.js';
+import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
+import 'react-dom';
+import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
+import '../../../context/WalletContext/WalletContext.js';
+import '../../../context/ThemeContext/ThemeContext.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/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';
+import '../../../components/InlineWidget/InlineWidget.js';
+import '../../../components/Input/Input.js';
+import '../../../components/IsBrowser/IsBrowser.js';
+import '../../../components/MenuList/Dropdown/Dropdown.js';
+import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../components/Popper/Popper/Popper.js';
+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';
+import '@hcaptcha/react-hcaptcha';
+import '../../../context/FooterAnimationContext/index.js';
+import '../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
+import '../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+
+const sleepToShowSuccessMessage = () => sleep(1500);
+const useUserAuth = ({ authMethod, }) => {
+    const { handleLogOut, setOnboardingOnlyJwt, setShowAuthFlow, setCallback, onboardingOnlyJwt, setMultiWalletWidgetState, } = useInternalDynamicContext();
+    const { view, setView, goToInitialView } = useViewContext();
+    const { setLoading } = useLoadingContext();
+    const { setErrorMessage, setError } = useErrorContext();
+    const { setExistentAccountData } = useAccountExistsContext();
+    const { handleVerifiedUserWithJWT } = useHandleVerifiedUser();
+    const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
+    const { displayedDestination: formattedPhone } = useVerification();
+    const { shouldAutoCreateEmbeddedWallet } = useEmbeddedWallet();
+    const initAuth = (_a) => __awaiter(void 0, [_a], void 0, function* ({ isSignIn = true, verifyFunction, onVerifySuccess, onSettled, onError, showSuccessMessage = false, skipDefaultErrorHandling = false, }) {
+        logger.debug('initAuth', { authMethod, isSignIn });
+        try {
+            const { jwt, minifiedJwt } = (yield verifyFunction()) || {};
+            if (!jwt || !minifiedJwt) {
+                yield cancelAuth();
+                throw new DynamicError('No jwt returned from verify function');
+            }
+            const decodedJwt = decodeJwt(jwt);
+            onVerifySuccess === null || onVerifySuccess === void 0 ? void 0 : onVerifySuccess(decodedJwt);
+            if (isSignIn && (decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields.length)) {
+                yield handleOnboarding(jwt, showSuccessMessage, onSettled);
+                return;
+            }
+            setMultiWalletWidgetState('idle');
+            setOnboardingOnlyJwt(undefined);
+            LocalStorage.removeFromLS(AUTH_ONBOARDING_TOKEN);
+            yield handleVerifiedUserWithJWT(jwt);
+            if (showSuccessMessage) {
+                // this timeout is set to make sure that the user will see success message
+                yield sleepToShowSuccessMessage();
+            }
+            yield createUserProfileByJWT(jwt, minifiedJwt);
+            if (isSignIn) {
+                setCallback('authSuccess');
+            }
+            // we should only close auth flow if no wallet is going to be created,
+            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys
+            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
+            if (!shouldCreateWallet) {
+                setShowAuthFlow(false);
+            }
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+        catch (error) {
+            logger.debug(error);
+            if (skipDefaultErrorHandling) {
+                onError === null || onError === void 0 ? void 0 : onError(error);
+                return;
+            }
+            handleError(error, { onError });
+        }
+        finally {
+            setLoading(false);
+            onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+        }
+    });
+    const handleOnboarding = (jwt, showSuccessMessage, onSettled) => __awaiter(void 0, void 0, void 0, function* () {
+        setOnboardingOnlyJwt(jwt);
+        LocalStorage.setToLS(AUTH_ONBOARDING_TOKEN, jwt, true);
+        if (showSuccessMessage) {
+            yield sleepToShowSuccessMessage();
+        }
+        setShowAuthFlow(true);
+        if (authMethod === 'email' || authMethod === 'social') {
+            setView('collect-user-data-login-no-wallet', {
+                userIdentification: 'email',
+            });
+        }
+        else if (authMethod === 'sms') {
+            setView('collect-user-data-login-no-wallet', {
+                userIdentification: 'phoneNumber',
+                userIdentificationOverride: formattedPhone,
+            });
+        }
+        else if (authMethod === 'wallet') {
+            setView('collect-user-data');
+        }
+        onSettled === null || onSettled === void 0 ? void 0 : onSettled();
+    });
+    const handleError = (error, { options = {}, onError, }) => {
+        // these get caught in onboarding form and handled there
+        if (error instanceof EmailAlreadyExistsError ||
+            error instanceof CustomFieldNotUniqueError ||
+            error instanceof UsernameAlreadyExistsError ||
+            error instanceof TooManyEmailVerificationsError ||
+            error instanceof InvalidPhoneNumberError)
+            throw error;
+        if (error instanceof NoAccessError) {
+            setView('no-access');
+            return;
+        }
+        if (error instanceof AccountExistsError) {
+            setExistentAccountData(error.errorPayload);
+            setView('account-exists');
+            return;
+        }
+        // Handle the case where the user has already an account with the email
+        if (error instanceof UserHasAccountWithEmailError) {
+            setView('merge-user-accounts-with-same-email', {
+                returnToView: options.isEmailRecoveryFlow
+                    ? 'passkey-recovery-add-email'
+                    : undefined,
+            });
+            return;
+        }
+        if (onError) {
+            onError === null || onError === void 0 ? void 0 : onError(error);
+            return;
+        }
+        if (error.code) {
+            setErrorMessage(error.code);
+        }
+        else {
+            setError(error.message);
+        }
+    };
+    const handleVerifyMissingFields = (_b) => __awaiter(void 0, [_b], void 0, function* ({ missingFields, isEmailVerificationRequired, isSmsVerificationRequired, }) {
+        if (isEmailVerificationRequired &&
+            missingFields.find((field) => field.name === 'email')) {
+            setView('verify-email');
+            return;
+        }
+        if (isSmsVerificationRequired &&
+            missingFields.find((field) => field.name === 'phoneNumber')) {
+            setView('verify-sms');
+            return;
+        }
+        setView(view.type);
+    });
+    const completeAuth = (_c) => __awaiter(void 0, [_c], void 0, function* ({ completeSignInFlow, updateJwtFunction, onValidUpdatedJwt, options = {}, }) {
+        logger.debug('completeAuth', { authMethod });
+        try {
+            const { updateUserProfileResponse, isSmsVerificationRequired, isEmailVerificationRequired, missingFields, } = yield updateJwtFunction();
+            onValidUpdatedJwt === null || onValidUpdatedJwt === void 0 ? void 0 : onValidUpdatedJwt();
+            setOnboardingOnlyJwt(updateUserProfileResponse.jwt);
+            LocalStorage.setToLS(AUTH_ONBOARDING_TOKEN, updateUserProfileResponse.minifiedJwt, true);
+            if (missingFields.length > 0) {
+                yield handleVerifyMissingFields({
+                    isEmailVerificationRequired,
+                    isSmsVerificationRequired,
+                    missingFields,
+                });
+                return;
+            }
+            // no more onboarding needed, clean up onboarding jwt
+            if (onboardingOnlyJwt) {
+                yield handleVerifiedUserWithJWT(updateUserProfileResponse.jwt);
+                setOnboardingOnlyJwt(undefined);
+                LocalStorage.removeFromLS(AUTH_ONBOARDING_TOKEN);
+                setCallback('authSuccess');
+            }
+            if (completeSignInFlow) {
+                const shouldReturn = yield completeSignInFlow(updateUserProfileResponse);
+                if (shouldReturn) {
+                    return;
+                }
+            }
+            // we should only close auth flow if no wallet is going to be created,
+            // otherwise there will be a glitch with auth flow closing and then reopening for passkeys
+            const shouldCreateWallet = shouldAutoCreateEmbeddedWallet();
+            if (!shouldCreateWallet) {
+                setShowAuthFlow(false);
+            }
+        }
+        catch (error) {
+            logger.debug(error);
+            handleError(error, { options });
+        }
+        finally {
+            setLoading(false);
+        }
+    });
+    const cancelAuth = () => __awaiter(void 0, void 0, void 0, function* () {
+        logger.debug('cancelAuth', { authMethod });
+        yield handleLogOut();
+        goToInitialView();
+    });
+    return {
+        cancelAuth,
+        completeAuth,
+        initAuth,
+    };
+};
+
+export { useUserAuth };

package/src/lib/utils/hooks/useUserAuth/useUserAuth.types.d.ts

@@ -0,0 +1,87 @@
+import { ProviderEnum, UpdateSelfResponse, VerifyResponse } from '@dynamic-labs/sdk-api-core';
+import { WalletConnector } from '../../../..';
+import { decodeJwt } from '../../../shared';
+import { UpdateUserReturnPayload } from '../useUserUpdateRequest';
+export type AuthOptions = {
+    email: EmailOptions;
+    sms: SmsOptions;
+    social: SocialOptions;
+    wallet: WalletOptions;
+};
+export type AuthMethod = keyof AuthOptions;
+export type EmailOptions = {
+    email?: string;
+    isEmailRecoveryFlow?: boolean;
+};
+export type SmsOptions = {
+    phone?: string;
+};
+export type SocialOptions = {
+    provider?: ProviderEnum;
+};
+export type WalletOptions = {
+    walletAddress?: string;
+    walletConnector?: WalletConnector;
+};
+export type OnErrorCallback = (error: unknown) => void;
+export type OnSettledCallback = () => void;
+export type UseUserAuthProps<T extends AuthMethod> = {
+    authMethod?: T;
+};
+export type InitUserAuthProps<T extends AuthMethod> = {
+    /**
+     * Mainly used for wallet auth.
+     * Indicates if the user is signing in or just linking.
+     */
+    isSignIn?: boolean;
+    /**
+     * Api call that will be made to verify the user.
+     */
+    verifyFunction: () => Promise<VerifyResponse | undefined>;
+    /**
+     * Otional callback that will be called with the new jwt right after the user is verified.
+     */
+    onVerifySuccess?: (jwt?: ReturnType<typeof decodeJwt>) => void;
+    /**
+     * Otional callback that will be called whenever initAuth finishes (either successfully or not).
+     */
+    onSettled?: OnSettledCallback;
+    /**
+     * Otional callback that will be called whenever there is an error with initAuth.
+     */
+    onError?: OnErrorCallback;
+    /**
+     * Whether to show a success message after the user is verified or not.
+     * If true, it will wait for 2 seconds before hidding the success message and continuing.
+     */
+    showSuccessMessage?: boolean;
+    /**
+     * If true, it will skip the default error handling and just call the onError callback.
+     */
+    skipDefaultErrorHandling?: boolean;
+    /**
+     * Props specific to the auth method.
+     * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
+     */
+    options?: AuthOptions[T];
+};
+export type CompleteUserAuthProps<T extends AuthMethod> = {
+    /**
+     * Optional function specific to each auth method that should be called to complete the auth flow
+     * after onboarding is completed.
+     */
+    completeSignInFlow?: (updateUserProfileResponse: UpdateSelfResponse) => Promise<boolean>;
+    /**
+     * Api call that will be made to update the user to complete the auth and return a UpdateUserReturnPayload.
+     */
+    updateJwtFunction: () => Promise<UpdateUserReturnPayload>;
+    /**
+     * Optional callback that will be called whenever updateJwtFunction completes successfuly.
+     */
+    onValidUpdatedJwt?: () => void;
+    /**
+     * Props specific to the auth method.
+     * (e.g. isRecoveryFlow for email auth, provider for social auth, etc.)
+     */
+    options?: AuthOptions[T];
+};

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

@@ -40,11 +40,15 @@ 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('../../../../context/MockContext/MockContext.cjs');
-require('react-i18next');
-var FieldsStateContext = require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('../../../../views/CollectUserDataView/useFields.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');
@@ -62,11 +66,11 @@ require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
 require('qrcode');
 require('formik');
+var FieldsStateContext = require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 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');
@@ -101,16 +105,20 @@ const userFieldsSchema = yup.object().shape({
     username: yup.string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    const { minAuthToken, onboardingOnlyJwt, environmentId, decodedOnboardingOnlyToken, } = useInternalDynamicContext.useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || minAuthToken;
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const { setRetryData } = VerificationContext.useVerification();
     const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
     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;
+        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({}, decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata), metadata) : decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.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,
         });
@@ -124,10 +132,10 @@ 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 missingFields = (_b = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _b !== void 0 ? _b : [];
         const requiredVerificationDestination = useHandleVerificationRequired.isVerificationRequired(updateUserProfileResponse);
         if (requiredVerificationDestination && handleVerificationRequired.current)
             return handleVerificationRequired.current({
@@ -150,6 +158,7 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         environmentId,
         updateUserProfileByJWT,
         setRetryData,
+        decodedOnboardingOnlyToken,
     ]);
     // This is necessary to avoid a circular declaration issue
     const handleVerificationRequired = React.useRef(undefined);

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

@@ -36,11 +36,15 @@ import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import { useHandleVerificationRequired, isVerificationRequired } from '../../useHandleVerificationRequired/useHandleVerificationRequired.js';
 import '@dynamic-labs/types';
+import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/MockContext/MockContext.js';
-import 'react-i18next';
-import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../../views/CollectUserDataView/useFields.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';
@@ -58,11 +62,11 @@ import '../../../../components/Popper/PopperContext/PopperContext.js';
 import 'react-focus-lock';
 import 'qrcode';
 import 'formik';
+import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsStateContext.js';
 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';
@@ -97,16 +101,20 @@ const userFieldsSchema = object().shape({
     username: string(),
 });
 const useUpdateUser = (validationSchemaStripUnknown) => {
-    const { minAuthToken, onboardingOnlyJwt, environmentId } = useInternalDynamicContext();
+    const { minAuthToken, onboardingOnlyJwt, environmentId, decodedOnboardingOnlyToken, } = useInternalDynamicContext();
     const jwtToken = onboardingOnlyJwt || minAuthToken;
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const { setRetryData } = useVerification();
     const { selectedPhoneCountry } = useFieldsState();
     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({}, decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.metadata), metadata) : decodedOnboardingOnlyToken === null || decodedOnboardingOnlyToken === void 0 ? void 0 : decodedOnboardingOnlyToken.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,10 +128,10 @@ 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 missingFields = (_b = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _b !== void 0 ? _b : [];
         const requiredVerificationDestination = isVerificationRequired(updateUserProfileResponse);
         if (requiredVerificationDestination && handleVerificationRequired.current)
             return handleVerificationRequired.current({
@@ -146,6 +154,7 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
         environmentId,
         updateUserProfileByJWT,
         setRetryData,
+        decodedOnboardingOnlyToken,
     ]);
     // This is necessary to avoid a circular declaration issue
     const handleVerificationRequired = useRef(undefined);

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

@@ -35,14 +35,18 @@ require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 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('../useUpdateUser/useUpdateUser.cjs');
 var UserFieldEditorContext = require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 var validateUpdateRequest = require('./validateUpdateRequest/validateUpdateRequest.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');
@@ -60,11 +64,11 @@ 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');
 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');

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

@@ -31,14 +31,18 @@ import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 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 '../useUpdateUser/useUpdateUser.js';
 import { UserFieldEditorContext } from '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import { validateUpdateRequest } from './validateUpdateRequest/validateUpdateRequest.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';
@@ -56,11 +60,11 @@ 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';
 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';

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

@@ -17,8 +17,19 @@ require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../../config/ApiEndpoint.cjs');
+require('../../../locale/locale.cjs');
+var userActions = require('../../../store/actions/userActions/userActions.cjs');
+require('zustand');
+require('zustand/middleware');
+require('zustand/react/shallow');
 
-const useValidateSession = ({ handleLogOut, user, authToken, }) => {
+const useValidateSession = ({ handleLogOut }) => {
     const [hasLoggedOut, setHasLoggedOut] = React.useState(false);
     const logout = (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         setHasLoggedOut(true);
@@ -26,6 +37,8 @@ const useValidateSession = ({ handleLogOut, user, authToken, }) => {
         yield handleLogOut();
     });
     const handleUserDataOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const authToken = getAuthToken.getAuthToken();
+        const user = userActions.getUser();
         if (authToken || !user) {
             return;
         }

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

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-import { UserProfile } from '@dynamic-labs/types';
 type Props = {
     handleLogOut: () => Promise<void>;
-    user: UserProfile | undefined;
-    authToken: string | undefined;
 };
-export declare const useValidateSession: ({ handleLogOut, user, authToken, }: Props) => {
+export declare const useValidateSession: ({ handleLogOut }: Props) => {
     setHasLoggedOut: import("react").Dispatch<import("react").SetStateAction<boolean>>;
 };
 export {};