@redneckz/wildless-cms-uni-blocks 0.14.656 → 0.14.658

package/mobile/src/ui-kit/FormField/Fields/AddressField.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -39,23 +38,11 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
     });
   }, []);
 
-  const isDisabled = [
-    fieldName === 'addressRegistration',
-    input?.filledByEsia,
-    isEsiaAuthorize(field),
-  ].every(Boolean);
-
   return (
     <InputControl
-      disabled={isDisabled}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
       label="Адрес"
-      {...getValidation(
-        field(fieldName),
-        validatorObj[fieldName],
-        input?.name === 'organizationAddress'
-          ? calculateIsRequired(field, input?.required)
-          : input?.required,
-      )}
+      {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
       value={fieldValue.fullAddress}
       onChange={onChange}
       {...input}

package/mobile/src/ui-kit/FormField/Fields/AddressMatchField.tsx

@@ -4,11 +4,11 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const AddressMatchField = JSX<CustomFieldProps>(({ field }) => {
+export const AddressMatchField = JSX<CustomFieldProps>(({ field, input }) => {
   return (
     <CheckboxWithError
       text="Адрес фактического места жительства совпадает с адресом регистрации"
-      {...getValidation(field('addressMatch'), validatorObj.addressMatch)}
+      {...getValidation(field('addressMatch'), validatorObj.addressMatch, input?.required)}
     />
   );
 });

package/mobile/src/ui-kit/FormField/Fields/ArmyIdFlgField.tsx

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const ArmyIdFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const ArmyIdFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Наличие военного билета"
-    {...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg)}
+    {...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/BankruptcyFlgField.tsx

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const BankruptcyFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const BankruptcyFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="В отношении меня ведётся производство по делу о банкротстве"
-    {...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg)}
+    {...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/BeginDateField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../DatePicker/DatePickerControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -8,11 +7,7 @@ import { getValidation } from '../getValidation';
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
-    {...getValidation(
-      field('beginDate'),
-      validatorObj.beginDate,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('beginDate'), validatorObj.beginDate, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/BirthPlaceField.tsx

@@ -3,11 +3,15 @@ import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
+
+const FIELD_NAME = 'birthPlace';
 
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Место рождения"
     {...getValidation(field('birthPlace'), validatorObj.birthPlace, input?.required)}
     {...input}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/BirthdayField.tsx

@@ -3,6 +3,7 @@ import { DatePickerControl } from '../../DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
 const MIN_AGE = 23;
 const MAX_AGE = 75;
@@ -12,14 +13,17 @@ interface BirthdayFieldProps extends CustomFieldProps {
   isRetailForm?: boolean;
 }
 
+const FIELD_NAME = 'birthday';
+
 export const BirthdayField = JSX<BirthdayFieldProps>(({ field, input, isRetailForm = false }) => {
-  const { value } = field('birthday');
+  const { value } = field(FIELD_NAME);
 
   return (
     <DatePickerControl
       label="Дата рождения"
-      {...getValidation(field('birthday'), validatorObj.birthday, input?.required)}
+      {...getValidation(field(FIELD_NAME), validatorObj.birthday, input?.required)}
       error={isRetailForm && value && !birthdayValidate(value as Date) ? AGE_ERROR_MESSAGE : ''}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
     />
   );
 });

package/mobile/src/ui-kit/FormField/Fields/DependentsField.tsx

@@ -9,7 +9,7 @@ export const DependentsField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Количество иждивенцев"
     placeholder="За исключение детей до 18 лет"
     type="number"
-    inputLength={2}
+    maxLength={2}
     {...getValidation(field('dependents'), validatorObj.dependents, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/FormField/Fields/DisablePeopleFlgField.tsx

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const DisablePeopleFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const DisablePeopleFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Являюсь инвалидом"
-    {...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg)}
+    {...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/DulIssueDateField.tsx

@@ -5,10 +5,12 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulIssueDateField';
+
 export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата выдачи"
-    {...getValidation(field('dulIssueDateField'), validatorObj.dulIssueDateField, input?.required)}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    {...getValidation(field(FIELD_NAME), validatorObj.dulIssueDateField, input?.required)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/DulIssuedByField.tsx

@@ -7,6 +7,8 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulIssuedBy';
+
 export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } =
     field('dulSubdivisionCode');
@@ -17,10 +19,10 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <InputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
       label="Кем выдан"
       {...input}
-      {...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required)}
+      {...getValidation(field(FIELD_NAME), validatorObj.dulIssuedBy, input?.required)}
       onDaDataChange={onDaDataChange}
       daDataQueryPrefix={dulSubdivisionCode}
     />

package/mobile/src/ui-kit/FormField/Fields/DulNumberField.tsx

@@ -5,12 +5,14 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulNumber';
+
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
     label="Номер документа"
     type="number"
-    inputLength={6}
+    maxLength={6}
     {...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/DulSerieField.tsx

@@ -5,12 +5,14 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulSerie';
+
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
     label="Серия документа"
     type="number"
-    inputLength={4}
+    maxLength={4}
     {...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/DulSubdivisionCodeField.tsx

@@ -7,6 +7,8 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'dulSubdivisionCode';
+
 export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input }) => {
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
@@ -14,16 +16,12 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
 
   return (
     <InputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
       label="Код подразделения"
       type="number"
-      inputLength={6}
+      maxLength={6}
       {...input}
-      {...getValidation(
-        field('dulSubdivisionCode'),
-        validatorObj.dulSubdivisionCode,
-        input?.required,
-      )}
+      {...getValidation(field(FIELD_NAME), validatorObj.dulSubdivisionCode, input?.required)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
     label="Стаж"
     placeholder="За последние 5 лет"
     type="number"
-    inputLength={2}
-    {...getValidation(
-      field('experience5Years'),
-      validatorObj.experience5Years,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/FamilyMembersField.tsx

@@ -5,14 +5,15 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const FamilyMembersField = JSX<CustomFieldProps>(({ field }) => {
   const { value, onChange } = field('familyMembers');
-  const adultsCount = field('familyStatus')?.value?.key === 'В браке' ? 2 : 1;
+  const familyStatusKey = field('familyStatus')?.value?.key;
+  const adultsCount = familyStatusKey === 'MARRIED' ? 2 : 1;
   const childrenCount = Number(field('children')?.value);
   const dependentsCount = Number(field('dependents')?.value);
   const totalCount = adultsCount + childrenCount + dependentsCount;
 
   useEffect(() => {
     field?.('familyMembers')?.onChange?.(totalCount);
-  }, [field('familyStatus')?.value?.key, childrenCount, dependentsCount]);
+  }, [familyStatusKey, childrenCount, dependentsCount]);
 
   return (
     <InputControl

package/mobile/src/ui-kit/FormField/Fields/GeneralSeniorityField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -9,13 +8,9 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
   <InputControl
     label="Общий стаж"
     type="number"
-    inputLength={2}
+    maxLength={2}
     placeholder="Количество лет"
-    {...getValidation(
-      field('generalSeniority'),
-      validatorObj.generalSeniority,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/InnField.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -17,13 +16,9 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       label="ИНН"
       type="number"
-      inputLength={12}
+      maxLength={12}
       {...input}
-      {...getValidation(
-        field('inn'),
-        validatorObj.inn,
-        calculateIsRequired(field, input?.required),
-      )}
+      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/JobsNumberField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
     type="number"
-    inputLength={2}
-    {...getValidation(
-      field('jobsNumber'),
-      validatorObj.jobsNumber,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LastJobExperienceField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     label="Стаж на последнем рабочем месте"
     placeholder="Количество лет"
     type="number"
-    inputLength={2}
-    {...getValidation(
-      field('lastJobExperience'),
-      validatorObj.lastJobExperience,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LegalFormField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -9,11 +8,7 @@ export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(
-      field('legalForm'),
-      validatorObj.legalForm,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/MiddleNameField.tsx

@@ -5,12 +5,14 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'middleName';
+
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Отчество (Обязательно, при наличии)"
-    inputLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
-    {...getValidation(field('middleName'), validatorObj.middleName)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/NameField.tsx

@@ -8,8 +8,8 @@ import { isEsiaAuthorize } from '../isEsiaAuthorize';
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Имя"
-    inputLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...getValidation(field('name'), validatorObj.name, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -17,11 +16,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(
-        field('organizationName'),
-        validatorObj.organizationName,
-        calculateIsRequired(field, input?.required),
-      )}
+      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -11,11 +10,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
   const isBusinessOwner = field('positionOrganization')?.value?.key === 'BUSINESS_OWNER';
 
   const partInBusinessField = {
-    ...getValidation(
-      field('partInBusiness'),
-      validatorObj.partInBusiness,
-      calculateIsRequired(field, isBusinessOwner && input?.required),
-    ),
+    ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
   };
 
   const handleChange = (value: string) =>
@@ -29,7 +24,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
       label="Доля участия в бизнесе"
       placeholder="в %"
       type="number"
-      inputLength={3}
+      maxLength={3}
       {...partInBusinessField}
       {...input}
       onChange={handleChange}

package/mobile/src/ui-kit/FormField/Fields/PhoneField.tsx

@@ -1,20 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputPhoneControl
-    label="Телефон"
-    {...getValidation(
-      field(input?.name || 'phone'),
-      validatorObj.phone,
-      input?.name === 'organizationPhone'
-        ? calculateIsRequired(field, input?.required)
-        : input?.required,
-    )}
-    {...input}
-  />
-));
+export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => {
+  const fieldName = input?.name || 'phone';
+
+  return (
+    <InputPhoneControl
+      label="Телефон"
+      {...getValidation(field(fieldName), validatorObj.phone, input?.required)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
+      {...input}
+    />
+  );
+});

package/mobile/src/ui-kit/FormField/Fields/ShareholderFlgField.tsx

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const ShareholderFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const ShareholderFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Я являюсь акционером / участником / членом / пайщиком / вкладчиком с долей участия более 20% уставного капитала юридического лица"
-    {...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg)}
+    {...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/SurnameField.tsx

@@ -5,11 +5,13 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'surname';
+
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Фамилия"
-    inputLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
     {...getValidation(field('surname'), validatorObj.surname, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -84,8 +84,6 @@ export const validatorObj: Record<string, Validator> = {
   sex: defaultValidator('Укажите свой пол'),
   addressRegistration: addressDaDataValidator(),
   organizationAddress: addressDaDataValidator(),
-  deliveryDate: defaultValidator('Укажите дату доставки'),
-  addressCourier: addressDaDataValidator(),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
@@ -100,15 +98,16 @@ export const validatorObj: Record<string, Validator> = {
   regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
-  codeWord: codeWordValidator('Необходимо ввести кодовое слово латиницей'),
-  currency: defaultValidator(),
-  paymentSystem: defaultValidator(),
-  cardCategory: defaultSelectValidator(),
+  codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
   confirmationIncome: defaultValidator(),
+  deliveryDate: defaultValidator('Укажите дату доставки'),
+  addressCourier: addressDaDataValidator(),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {
   const requiredInputs = getNamesFromInput(inputs.filter((_: FieldDef) => Boolean(_?.required)));
 
-  return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]));
+  return Object.fromEntries(
+    requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator),
+  );
 };

package/mobile/src/ui-kit/FormField/getValidation.tsx

@@ -3,4 +3,4 @@ import { type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
 
 export const getValidation = (field: FieldProps<any>, validator: Validator, required = false) =>
-  required ? withValidator(field, validator) : field;
+  required && validator ? withValidator(field, validator) : field;

package/mobile/src/ui-kit/FormField/isEsiaAuthorize.ts

@@ -2,5 +2,5 @@ import { type FormFieldRegisterer } from '../../hooks/useForm';
 
 const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
 
-export const isEsiaAuthorize = (field: FormFieldRegisterer<any>) =>
-  Boolean(field(ESIA_FIELD_NAME)?.value?.key);
+export const isEsiaAuthorize = (field: FormFieldRegisterer<any>, name: string) =>
+  Boolean(field(ESIA_FIELD_NAME)?.value?.key) && field(name).value;

package/mobile/src/ui-kit/Input/InputControl.tsx

@@ -25,7 +25,7 @@ export const InputControl = JSX<InputProps>(
     type,
     name = '',
     daDataQueryPrefix,
-    inputLength,
+    maxLength,
     dadata = false,
     disabled = false,
   }) => {
@@ -33,7 +33,7 @@ export const InputControl = JSX<InputProps>(
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
     const handleChange = useCallback(
-      (v: string) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)),
+      (v: string) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)),
       [onChange],
     );