@dynamic-labs/sdk-react-core 2.0.0-alpha.9 → 2.0.1

package/src/lib/views/{TransactionConfirmationView/hooks/useTransactionGas/useTransactionGas.cjs → CollectUserDataView/UserDataFields/UserPhoneField/UserPhoneField.cjs}

@@ -2,103 +2,90 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 require('../../../../events/dynamicEvents.cjs');
+require('../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/utils');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/sdk-api-core');
 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('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('viem');
 require('../../../../shared/consts/index.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
+var getCustomCountries = require('../../../../utils/functions/getCustomCountries/getCustomCountries.cjs');
+require('viem');
 require('viem/chains');
 require('../../../../config/ApiEndpoint.cjs');
+require('../../../../locale/locale.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../context/WalletContext/WalletContext.cjs');
-var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
-var useTransactionEstimatedGas = require('../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.cjs');
 require('yup');
 require('react-i18next');
+var FieldsStateContext = require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../../components/Alert/Alert.cjs');
+var Typography = require('../../../../components/Typography/Typography.cjs');
+require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../../components/IconButton/IconButton.cjs');
-require('../../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../../components/Input/Input.cjs');
-require('../../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
+require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
+require('react-focus-lock');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
+require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
+require('../../../../components/IconButton/IconButton.cjs');
+require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
+require('formik');
+require('../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../../components/Alert/Alert.cjs');
+require('../../../../components/Input/Input.cjs');
 require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../../context/PasskeyContext/PasskeyContext.cjs');
+require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../../components/IsBrowser/IsBrowser.cjs');
+var PhoneNumberField = require('../../../../components/PhoneNumberField/PhoneNumberField.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('formik');
 require('qrcode');
 require('../../../WalletList/WalletList.cjs');
-require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('i18next');
 require('@hcaptcha/react-hcaptcha');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
-require('../../../../context/FooterAnimationContext/index.cjs');
-require('../../../LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.cjs');
-require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
-require('../../helpers/transactionErrorMessage.cjs');
-require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
+require('../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
 
-const useTransactionGas = ({ provider, transaction, getGasPrice, }) => {
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas.useTransactionEstimatedGas(provider, transaction);
-    const { data: gasPrice, isLoading: isLoadingGasPrice } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (transaction.gasPrice) {
-            const { gasPrice } = transaction;
-            return gasPrice;
-        }
-        if (getGasPrice) {
-            return getGasPrice(transaction);
-        }
-        if (provider.getGasPrice) {
-            return provider.getGasPrice();
-        }
-        return BigInt(0);
-    }), {
-        deps: [transaction.gasPrice, getGasPrice, provider],
-    });
-    const gasTotalPrice = React.useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
-    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
-    return {
-        gasTotalPrice,
-        isGasEstimated,
-        isLoading,
+const UserPhoneField = ({ onChange, value: phone, onBlur, disabled, label, required, error, name, verify, }) => {
+    const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
+    const handleUpdate = ({ country, phone: newPhone }) => {
+        selectedPhoneCountry.current = country;
+        if (newPhone !== phone)
+            onChange({
+                target: { name, value: newPhone },
+            });
     };
+    const countries = React.useMemo(() => getCustomCountries.getCustomCountries(verify), [verify]);
+    return (jsxRuntime.jsx(PhoneNumberField.PhoneNumberField, { countries: countries, initialPhone: phone, disabled: disabled, onUpdate: handleUpdate, onBlur: onBlur, label: label, appendRight: !disabled && !required ? (jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', className: 'user-phone-field__optional-label', children: "Optional" })) : undefined, error: error }));
 };
 
-exports.useTransactionGas = useTransactionGas;
+exports.UserPhoneField = UserPhoneField;

package/src/lib/views/CollectUserDataView/UserDataFields/UserPhoneField/UserPhoneField.d.ts

@@ -0,0 +1,13 @@
+import { ChangeEventHandler, FC, FocusEventHandler } from 'react';
+export type UserPhoneFieldProps = {
+    onChange: ChangeEventHandler<HTMLInputElement>;
+    value: string;
+    onBlur: FocusEventHandler<HTMLDivElement>;
+    disabled: boolean;
+    label: string;
+    required: boolean;
+    verify: boolean;
+    error: string;
+    name: string;
+};
+export declare const UserPhoneField: FC<UserPhoneFieldProps>;

package/src/lib/views/{TransactionConfirmationView/hooks/useTransactionGas/useTransactionGas.js → CollectUserDataView/UserDataFields/UserPhoneField/UserPhoneField.js}

@@ -1,100 +1,87 @@
-import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import '../../../../events/dynamicEvents.js';
+import '../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/utils';
 import '../../../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/sdk-api';
+import '@dynamic-labs/sdk-api-core';
 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 '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
-import 'viem';
 import '../../../../shared/consts/index.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import { getCustomCountries } from '../../../../utils/functions/getCustomCountries/getCustomCountries.js';
+import 'viem';
 import 'viem/chains';
 import '../../../../config/ApiEndpoint.js';
+import '../../../../locale/locale.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../context/WalletContext/WalletContext.js';
-import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
-import { useTransactionEstimatedGas } from '../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.js';
 import 'yup';
 import 'react-i18next';
+import { useFieldsState } from '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/MockContext/MockContext.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../../components/Alert/Alert.js';
+import { Typography } from '../../../../components/Typography/Typography.js';
+import '../../../../context/FooterAnimationContext/index.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 '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import 'react-focus-lock';
+import '../../../../context/LoadingContext/LoadingContext.js';
+import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
+import '../../../../components/IconButton/IconButton.js';
+import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import 'formik';
+import '../../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../../components/Alert/Alert.js';
+import '../../../../components/Input/Input.js';
 import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../../components/InlineWidget/InlineWidget.js';
+import '../../../../components/IsBrowser/IsBrowser.js';
+import { PhoneNumberField } from '../../../../components/PhoneNumberField/PhoneNumberField.js';
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
-import 'formik';
 import 'qrcode';
 import '../../../WalletList/WalletList.js';
-import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import 'i18next';
 import '@hcaptcha/react-hcaptcha';
-import '../../../../context/LoadingContext/LoadingContext.js';
-import '../../../../context/FooterAnimationContext/index.js';
-import '../../../LoginView/sections/PhoneNumberSignInSection/usePhoneInputLogic/usePhoneInputLogic.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 '../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
-import '../../helpers/transactionErrorMessage.js';
-import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import '../../../LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.js';
 
-const useTransactionGas = ({ provider, transaction, getGasPrice, }) => {
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas(provider, transaction);
-    const { data: gasPrice, isLoading: isLoadingGasPrice } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (transaction.gasPrice) {
-            const { gasPrice } = transaction;
-            return gasPrice;
-        }
-        if (getGasPrice) {
-            return getGasPrice(transaction);
-        }
-        if (provider.getGasPrice) {
-            return provider.getGasPrice();
-        }
-        return BigInt(0);
-    }), {
-        deps: [transaction.gasPrice, getGasPrice, provider],
-    });
-    const gasTotalPrice = useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
-    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
-    return {
-        gasTotalPrice,
-        isGasEstimated,
-        isLoading,
+const UserPhoneField = ({ onChange, value: phone, onBlur, disabled, label, required, error, name, verify, }) => {
+    const { selectedPhoneCountry } = useFieldsState();
+    const handleUpdate = ({ country, phone: newPhone }) => {
+        selectedPhoneCountry.current = country;
+        if (newPhone !== phone)
+            onChange({
+                target: { name, value: newPhone },
+            });
     };
+    const countries = useMemo(() => getCustomCountries(verify), [verify]);
+    return (jsx(PhoneNumberField, { countries: countries, initialPhone: phone, disabled: disabled, onUpdate: handleUpdate, onBlur: onBlur, label: label, appendRight: !disabled && !required ? (jsx(Typography, { variant: 'body_small', color: 'secondary', className: 'user-phone-field__optional-label', children: "Optional" })) : undefined, error: error }));
 };
 
-export { useTransactionGas };
+export { UserPhoneField };

package/src/lib/views/CollectUserDataView/UserDataFields/UserPhoneField/index.d.ts

@@ -0,0 +1 @@
+export * from './UserPhoneField';

package/src/lib/views/CollectUserDataView/UserDataFields/index.d.ts

@@ -1,11 +1 @@
-import { ReactNode } from 'react';
-import { FormikErrors, FormikTouched } from 'formik';
-import { ProjectSettingsKyc } from '@dynamic-labs/sdk-api';
-type UserDataFieldsProps = {
-    errors: FormikErrors<Record<string, string>>;
-    fields?: ProjectSettingsKyc[];
-    policiesConsentInnerComponentArray?: ReactNode[];
-    touched: FormikTouched<Record<string, string>>;
-};
-export declare const UserDataFields: ({ errors, policiesConsentInnerComponentArray, fields, touched, }: UserDataFieldsProps) => JSX.Element;
-export {};
+export * from './UserDataFields';

package/src/lib/views/CollectUserDataView/useFields.cjs

@@ -2,26 +2,36 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var React = require('react');
 var reactI18next = require('react-i18next');
 var yup = require('yup');
-require('@dynamic-labs/sdk-api');
+var FieldsStateContext = require('../../context/FieldsStateContext/FieldsStateContext.cjs');
+require('@dynamic-labs/sdk-api-core');
 require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../context/ViewContext/ViewContext.cjs');
-require('react');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
+var fields = require('../../utils/constants/fields.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
-require('viem');
 require('@dynamic-labs/utils');
 var index = require('../../shared/consts/index.cjs');
+require('../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+var validatePhoneLength = require('../../utils/functions/validatePhoneLength/validatePhoneLength.cjs');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+require('../../config/ApiEndpoint.cjs');
+require('../../locale/locale.cjs');
 
 const useFields = () => {
     const { t } = reactI18next.useTranslation();
-    const fieldsConfig = {
+    const { selectedPhoneCountry } = FieldsStateContext.useFieldsState();
+    const fieldsConfig = React.useMemo(() => ({
         alias: {
             key: 'dyn_collect_user_data.fields.alias.label',
             label: t('dyn_collect_user_data.fields.alias.label'),
@@ -62,7 +72,18 @@ const useFields = () => {
             key: 'dyn_collect_user_data.fields.phone_number.label',
             label: t('dyn_collect_user_data.fields.phone_number.label'),
             type: 'string',
-            validation: yup.string().matches(/^((\\+[1-9]{1,4}[ \\-]*)|(\\([0-9]{2,3}\\)[ \\-]*)|([0-9]{2,4})[ \\-]*)*?[0-9]{3,4}?[ \\-]*[0-9]{3,4}?$/, t('dyn_collect_user_data.fields.phone_number.validation')),
+            validation: yup.string()
+                // Validate length
+                .test('length', t('dyn_collect_user_data.fields.phone_number.too_short'), (phone) => {
+                if (!selectedPhoneCountry.current)
+                    return true;
+                // Either it's the full length of a phone number, or empty
+                return (phone === undefined ||
+                    phone.length === 0 ||
+                    validatePhoneLength.validatePhoneLength(phone, selectedPhoneCountry.current));
+            })
+                // Validate format
+                .matches(fields.PHONE_NUMBER_REGEX, t('dyn_collect_user_data.fields.phone_number.validation')),
         },
         policiesConsent: {
             key: 'dyn_collect_user_data.fields.policies_consent.label',
@@ -92,7 +113,7 @@ const useFields = () => {
             // - string cannot contain consecutive symbols
             validation: yup.string().matches(/^(?!.*([$!#%?])\1)[A-Za-z0-9$!#%?]{3,20}$/, t('dyn_collect_user_data.fields.username.validation')),
         },
-    };
+    }), [selectedPhoneCountry, t]);
     return { fieldsConfig };
 };
 

package/src/lib/views/CollectUserDataView/useFields.d.ts

@@ -1,70 +1,77 @@
+import { BooleanSchema, StringSchema } from 'yup';
+export type FieldConfig = {
+    label: string;
+    key: string;
+    type: string;
+    validation: StringSchema | BooleanSchema;
+};
 export declare const useFields: () => {
     fieldsConfig: {
         alias: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         country: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         email: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         firstName: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         jobTitle: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         lastName: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         phoneNumber: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         policiesConsent: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
+            validation: BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
         };
         tShirtSize: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         team: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
         username: {
             key: string;
             label: string;
             type: string;
-            validation: import("yup").StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+            validation: StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
         };
     };
 };

package/src/lib/views/CollectUserDataView/useFields.js

@@ -1,23 +1,33 @@
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { string, boolean } from 'yup';
-import '@dynamic-labs/sdk-api';
+import { useFieldsState } from '../../context/FieldsStateContext/FieldsStateContext.js';
+import '@dynamic-labs/sdk-api-core';
 import '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../context/ViewContext/ViewContext.js';
-import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
+import { PHONE_NUMBER_REGEX } from '../../utils/constants/fields.js';
 import '../../shared/utils/classes/storage/localStorage.js';
-import 'viem';
 import '@dynamic-labs/utils';
 import { countryCodes, tShirtSizes, teamNames } from '../../shared/consts/index.js';
+import '../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import { validatePhoneLength } from '../../utils/functions/validatePhoneLength/validatePhoneLength.js';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import '../../config/ApiEndpoint.js';
+import '../../locale/locale.js';
 
 const useFields = () => {
     const { t } = useTranslation();
-    const fieldsConfig = {
+    const { selectedPhoneCountry } = useFieldsState();
+    const fieldsConfig = useMemo(() => ({
         alias: {
             key: 'dyn_collect_user_data.fields.alias.label',
             label: t('dyn_collect_user_data.fields.alias.label'),
@@ -58,7 +68,18 @@ const useFields = () => {
             key: 'dyn_collect_user_data.fields.phone_number.label',
             label: t('dyn_collect_user_data.fields.phone_number.label'),
             type: 'string',
-            validation: string().matches(/^((\\+[1-9]{1,4}[ \\-]*)|(\\([0-9]{2,3}\\)[ \\-]*)|([0-9]{2,4})[ \\-]*)*?[0-9]{3,4}?[ \\-]*[0-9]{3,4}?$/, t('dyn_collect_user_data.fields.phone_number.validation')),
+            validation: string()
+                // Validate length
+                .test('length', t('dyn_collect_user_data.fields.phone_number.too_short'), (phone) => {
+                if (!selectedPhoneCountry.current)
+                    return true;
+                // Either it's the full length of a phone number, or empty
+                return (phone === undefined ||
+                    phone.length === 0 ||
+                    validatePhoneLength(phone, selectedPhoneCountry.current));
+            })
+                // Validate format
+                .matches(PHONE_NUMBER_REGEX, t('dyn_collect_user_data.fields.phone_number.validation')),
         },
         policiesConsent: {
             key: 'dyn_collect_user_data.fields.policies_consent.label',
@@ -88,7 +109,7 @@ const useFields = () => {
             // - string cannot contain consecutive symbols
             validation: string().matches(/^(?!.*([$!#%?])\1)[A-Za-z0-9$!#%?]{3,20}$/, t('dyn_collect_user_data.fields.username.validation')),
         },
-    };
+    }), [selectedPhoneCountry, t]);
     return { fieldsConfig };
 };