@redneckz/wildless-cms-uni-blocks 0.14.825 → 0.14.827

package/mobile/src/components/CreditForm/CreditFormStep.tsx

@@ -4,11 +4,8 @@ import { useForm } from '../../hooks/useForm/useForm';
 import { useRetailFormStore } from '../../retail/hooks/useRetailFormStore';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
-import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
-import { validatorObj } from '../../retail/validator/validatorObj';
-import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { getRetailFormValidator } from '../../retail/validator/getRetailFormValidator';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditFormAPI } from './useCreditFormAPI';
@@ -24,11 +21,6 @@ export interface CreditFormStepProps {
 
 const PRODUCT_TYPE = 'credit';
 
-const extendedValidatorObj = {
-  ...validatorObj,
-  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
-
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
@@ -41,11 +33,12 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
 
     const formValidator = useCallback(
       (formState: LeadFormState) =>
-        // TODO Слишком сложно
-        getFormValidator(
-          calculateInputs((_) => formState[_])(inputs, step),
-          extendedValidatorObj,
-        )(formState),
+        getRetailFormValidator({
+          formState,
+          inputs,
+          step,
+          productType: PRODUCT_TYPE,
+        }),
       [inputs],
     );
 

package/mobile/src/components/DebitForm/DebitFormStep.tsx

@@ -3,11 +3,8 @@ import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
-import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
-import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
-import { validatorObj } from '../../retail/validator/validatorObj';
-import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { getRetailFormValidator } from '../../retail/validator/getRetailFormValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useDebitFormAPI } from './useDebitFormAPI';
 
@@ -21,11 +18,6 @@ export interface DebitFormStepProps {
 
 const PRODUCT_TYPE = 'debitCard';
 
-const extendedValidatorObj = {
-  ...validatorObj,
-  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
-
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -35,11 +27,12 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
 
     const formValidator = useCallback(
       (formState: LeadFormState) =>
-        // TODO Слишком сложно
-        getFormValidator(
-          calculateInputs((_) => formState[_])(inputs, step),
-          extendedValidatorObj,
-        )(formState),
+        getRetailFormValidator({
+          formState,
+          inputs,
+          step,
+          productType: PRODUCT_TYPE,
+        }),
       [inputs],
     );
 

package/mobile/src/retail/api/checkCode.ts

@@ -16,7 +16,7 @@ export type CheckCodeResponse = {
 export const checkCode = async (body: CheckCodeBody) =>
   fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
 
-const saveToken = (data: CheckCodeResponse | null) => {
+export const saveToken = (data: CheckCodeResponse | null) => {
   if (data) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);

package/mobile/src/retail/api/{updateProfileEsia.ts → esiaRequestProfile.ts}

@@ -1,13 +1,14 @@
+import { saveToken, type CheckCodeResponse } from './checkCode';
 import { fetchRetailJSON } from './doRequest';
 
-export type UpdateProfileEsiaBody = {
+export type EsiaRequestProfileBody = {
   code: string;
-  profileId: string;
+  authorize: boolean;
   state: string;
   redirectUri: string;
 };
 
-export type UpdateProfileEsiaResponse = {
+export type EsiaRequestProfileResponse = CheckCodeResponse & {
   profile: {
     id: number;
     esiaId: string;
@@ -75,8 +76,18 @@ export type UpdateProfileEsiaResponse = {
     workLengthLastJob: number;
     pdfFileWorkbook: string;
     pdfFilePayout: string;
+    pdfFileSigPayout: string;
+    pdfFileSigWorkbook: string;
+    xmlFilePayout: string;
+    xmlFileSigPayout: string;
+    xmlFileSigWorkbook: string;
+    xmlFileWorkbook: string;
   };
 };
 
-export const updateProfileEsia = (body: UpdateProfileEsiaBody) =>
-  fetchRetailJSON<UpdateProfileEsiaResponse>('/esia/updateProfileEsia', 'POST', body);
+export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
+  fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
+    saveToken(res);
+
+    return res;
+  });

package/mobile/src/retail/api/updateUserTask.ts

@@ -52,6 +52,7 @@ export type Participant = {
   surname?: string;
   profile?: {
     id: number;
+    esiaAccountTypeCd?: Option;
   };
   armyIdFlg?: boolean;
   birthPlace?: string;

package/mobile/src/retail/api/uploadFile.ts

@@ -5,13 +5,12 @@ export type DocumentCategory = 'CONFIRMING_EMPLOYMENT_DOC' | 'CONFIRMING_INCOME_
 
 export const uploadFile = async (
   file: Blob,
-  taskId: string,
   documentCategory: DocumentCategory,
+  isPDF = false,
 ): Promise<File> => {
   const fd = new FormData();
-  fd.append('taskId', taskId);
   fd.append('documentCategory', documentCategory);
-  fd.append('file', file, 'file.pdf');
+  fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
 
   const res = await globalThis
     ?.fetch?.(`/light-api-cash/v1/file`, {

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -68,6 +68,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
     incomeCertificateCd,
+    profile,
   } = participant;
 
   return {
@@ -121,6 +122,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
       monthsValue,
       isAnnuity: paymentTypeCd?.key === 'ANNUITY',
     },
+    esiaAccountTypeCd: profile?.esiaAccountTypeCd,
     ...getParticipantIncomes(participantIncomes),
     ...getParticipantAddresses(participantAddresses),
     ...getParticipantContacts(participantContacts),

package/mobile/src/retail/components/Fields/AddressField.tsx

@@ -35,7 +35,7 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
+      disabled={isEsiaAuthorize(field, input, fieldName)}
       label="Адрес"
       {...field(fieldName)}
       value={fieldValue?.fullAddress}

package/mobile/src/retail/components/Fields/BeginDateField.tsx

@@ -1,11 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/BirthPlaceField.tsx

@@ -3,13 +3,11 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-const FIELD_NAME = 'birthPlace';
-
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
     label="Место рождения"
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/ConfirmationIncomeField.tsx

@@ -1,18 +1,27 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { InfoCard } from '../../../ui-kit/InfoCard/InfoCard';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { SelectField } from './SelectField';
 
 export const ConfirmationIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
+  const filledByEsia = isEsiaAuthorize(field, input);
 
   return (
-    <SelectField
-      field={field}
-      source={confirmationIncome}
-      label="Способ подтверждения дохода"
-      fieldName="confirmationIncome"
-      input={input}
-    />
+    <div className="space-y-xl">
+      {filledByEsia ? (
+        <InfoCard __html="Для выбора иного способа подтверждения дохода, оформите новую заявку на кредит без авторизации на портале Госуслуги" />
+      ) : null}
+      <SelectField
+        field={field}
+        source={confirmationIncome}
+        label="Способ подтверждения дохода"
+        fieldName="confirmationIncome"
+        input={input}
+        disabled={filledByEsia}
+      />
+    </div>
   );
 });

package/mobile/src/retail/components/Fields/DaDataInnField.tsx

@@ -4,6 +4,7 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -41,6 +42,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
+      disabled={isEsiaAuthorize(field, input)}
     />
   );
 });

package/mobile/src/retail/components/Fields/DulIssueDateField.tsx

@@ -7,7 +7,7 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
   const birthDate = field('limitedBirthday')?.value as Date;
   const startDulIssueDate = useMemo(
-    () => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()),
+    () => new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()),
     [birthDate],
   );
 
@@ -15,7 +15,7 @@ export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
     <DatePickerControl
       label="Дата выдачи"
       {...field(input?.name ?? '')}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       minDate={startDulIssueDate}
     />
   );

package/mobile/src/retail/components/Fields/DulIssuedByField.tsx

@@ -15,7 +15,7 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       label="Кем выдан"
       {...input}
       {...field(input?.name ?? '')}

package/mobile/src/retail/components/Fields/DulNumberField.tsx

@@ -5,7 +5,7 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
     label="Номер документа"
     isInteger={true}
     maxLength={6}

package/mobile/src/retail/components/Fields/DulSerieField.tsx

@@ -5,7 +5,7 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
     label="Серия документа"
     isInteger={true}
     maxLength={4}

package/mobile/src/retail/components/Fields/DulSubdivisionCodeField.tsx

@@ -12,7 +12,7 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       label="Код подразделения"
       isInteger={true}
       maxLength={6}

package/mobile/src/retail/components/Fields/Experience5YearsField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { clamp } from '../../../utils/clamp';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const MAX_YEARS = 5;
@@ -22,6 +23,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
+      disabled={isEsiaAuthorize(field, input)}
     />
   );
 });

package/mobile/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/JobsNumberField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/LastJobExperienceField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/LimitedBirthdayField.tsx

@@ -7,6 +7,6 @@ export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) =>
   <DatePickerControl
     label="Дата рождения"
     {...field(input?.name ?? '')}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/MiddleNameField.tsx

@@ -19,7 +19,7 @@ export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Отчество (Обязательно, при наличии)"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/NameField.tsx

@@ -19,7 +19,7 @@ export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Имя"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/OrganizationNameField.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -19,6 +20,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/retail/components/Fields/SurnameField.tsx

@@ -5,8 +5,6 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-const FIELD_NAME = 'surname';
-
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
@@ -21,7 +19,7 @@ export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Фамилия"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/WagesField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -9,5 +10,6 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/content.tsx

@@ -139,7 +139,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label: 'Телефон работодателя',
         required: true,
       },
-      { name: 'beginDate', required: true },
+      { name: 'beginDate', required: true, filledByEsia: true },
     ],
   },
   {
@@ -181,16 +181,22 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
     title: 'Совокупный доход',
   },
   {
+    columns: 1,
     inputs: [
       {
-        name: 'infoCard',
-        label: 'Сумма основного и дополнительных доходов после вычета налога',
+        name: 'confirmationIncome',
+        required: true,
+        filledByEsia: true,
       },
     ],
   },
   {
-    columns: 1,
-    inputs: [{ name: 'confirmationIncome', required: true }],
+    inputs: [
+      {
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
+      },
+    ],
   },
   {
     columns: 1,

package/mobile/src/retail/inputs.tsx

@@ -108,7 +108,6 @@ export const InputsRetailMap = {
   addressRetail: AddressRetailField,
   addressMatch: AddressMatchField,
   sex: SexField,
-  limitedBirthday: LimitedBirthdayField,
   birthPlace: BirthPlaceField,
   education: EducationField,
   housing: HousingField,
@@ -147,6 +146,7 @@ export const InputsRetailMap = {
   calculator: CreditCalcField,
   confirmationIncome: ConfirmationIncomeField,
   inn: DaDataInnField,
+  ...InputsApplicationLeadMap,
 };
 
 export const InputRetailCardMap = {

package/mobile/src/retail/model/NameFieldDef.ts

@@ -86,6 +86,7 @@ type NameFieldRetailDef =
   | 'calculator'
   | 'infoCard'
   | 'deliveryTime'
+  | 'esiaAccountTypeCd'
   | 'comment';
 
 export type NameFieldDef =

package/mobile/src/retail/utils/isEsiaAuthorize.ts

@@ -1,6 +1,9 @@
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 
 const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
 
-export const isEsiaAuthorize = (field: FormFieldRegisterer<any>, name: string) =>
-  Boolean(field(ESIA_FIELD_NAME)?.value?.key) && field(name).value;
+export const isEsiaAuthorize = (field: FormFieldRegisterer<any>, input?: FieldDef, name = '') =>
+  input?.filledByEsia &&
+  Boolean(field(ESIA_FIELD_NAME)?.value?.key) &&
+  field(input?.name ?? name).value;

package/mobile/src/retail/utils/mainFormStateMap.ts

@@ -56,6 +56,7 @@ export const mainFormStateMap: Partial<LeadFormState>[] = [
     mandatoryPayments: undefined,
     snils: '',
     armyIdFlg: false,
+    esiaAccountTypeCd: { key: '', text: '' },
   },
   {
     bankruptcyFlg: false,

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -0,0 +1,27 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { type LeadFormState } from '../model/LeadFormState';
+import { type FieldRetailDef } from '../model/RetailFormContent';
+import { calculateInputs } from '../utils/calculateInputs';
+import { getLimitedBirthdayValidation } from './getLimitedBirthdayValidation';
+import { validatorObj } from './validatorObj';
+import { passportValidator } from './validators';
+
+type getRetailFormValidatorProps = {
+  formState: LeadFormState;
+  inputs: FieldRetailDef[];
+  step: number;
+  productType: ProductType;
+};
+
+export const getRetailFormValidator = ({
+  formState,
+  inputs,
+  step,
+  productType,
+}: getRetailFormValidatorProps) =>
+  getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+    ...validatorObj,
+    limitedBirthday: getLimitedBirthdayValidation(productType),
+    dulIssueDate: passportValidator(formState.limitedBirthday as Date),
+  })(formState);

package/mobile/src/retail/validator/validatorObj.ts

@@ -9,6 +9,7 @@ import {
   addressDaDataValidator,
   addressOrganizationValidator,
   codeWordValidator,
+  deliveryDateValidator,
   jobNumberValidator,
   lengthStringValidator,
   nameRetailValidator,
@@ -34,7 +35,7 @@ const validatorCreditCardObj: Record<string, Validator> = {
   codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
   confirmationIncome: defaultSelectValidator(),
   methodObtain: defaultValidator(),
-  deliveryDate: defaultValidator('Укажите дату доставки'),
+  deliveryDate: deliveryDateValidator('Укажите дату доставки'),
 };
 
 const validatorRetailObj: Record<string, Validator> = {
@@ -72,7 +73,6 @@ const validatorRetailObj: Record<string, Validator> = {
   armyIdFlg: agreementValidator,
   dulSerie: serieValidator('Укажите серию паспорта'),
   dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),

package/mobile/src/retail/validator/validators.ts

@@ -66,6 +66,25 @@ const limitedBirthdayValidate =
 export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
   validator(limitedBirthdayValidate(params))(params.errorMessage);
 
+export const passportValidator = (birthDate?: Date) =>
+  validator((_) => {
+    if (_ && birthDate) {
+      return (
+        _.getTime() >=
+        new Date(
+          birthDate?.getFullYear() + 14,
+          birthDate?.getMonth(),
+          birthDate?.getDate(),
+        ).getTime()
+      );
+    }
+
+    return false;
+  })('Укажите дату выдачи паспорта');
+
+export const deliveryDateValidator = (errorMsg: string) =>
+  validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
+
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);