@redneckz/wildless-cms-uni-blocks 0.14.820 → 0.14.822

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,9 +1,11 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { locationNavigator } from '../../external/locationNavigator';
 import { useSetter } from '../../hooks/useSetter';
-import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
+import { updateProfileEsia } from '../../retail/api/updateProfileEsia';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
-import { EsiaStatuses } from './ApplicationLeadForm';
+import { safeJsonParse } from '../../utils/safeJsonParse';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -13,62 +15,76 @@ type InitApplicationLeadProps = {
   inputs: FieldRetailDef[];
   nextStepLink: string;
   productType: ProductType;
-  setEsiaStatus: (status: EsiaStatuses) => void;
-  esiaAuthSuccess: boolean;
+  setEsiaError: () => void;
 };
 
 export const useInitApplicationLead = ({
   inputs,
+  nextStepLink,
   productType,
-  setEsiaStatus,
-  esiaAuthSuccess,
-}: InitApplicationLeadProps): LeadFormState => {
+  setEsiaError,
+}: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
+  const navigator = locationNavigator();
+  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const initialFormState = useMemo(
-    () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
+    () => getInitialFormState(inputs, leadFormStore.leadForm),
     [inputs, leadFormStore.leadForm],
   );
 
-  const requestEsiaProfile = useCallback(async (code: string, state: string) => {
-    setEsiaStatus(EsiaStatuses.Pending);
-    try {
-      const data = await esiaRequestProfile({
-        code,
-        state,
-        redirectUri: globalThis.location?.href,
-        authorize: true,
-      });
+  const updateEsiaProfile = useCallback(
+    async (profileId: string, code: string, state: string) => {
+      startLoading();
+      try {
+        const data = await updateProfileEsia({
+          profileId,
+          code,
+          state,
+          redirectUri: globalThis.location?.href,
+        });
+
+        if (data && leadFormStore?.taskId) {
+          const parsedData = await parseEsiaProfile(
+            data,
+            leadFormStore.taskId.toString(),
+            productType === 'debitCard',
+          );
 
-      if (data) {
-        const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
+          saveForm((_) => ({
+            ..._,
+            ...parsedData,
+          }));
+        }
 
-        saveForm((_) => ({
-          ..._,
-          ...parsedData,
-        }));
-        setEsiaStatus(EsiaStatuses.Success);
+        navigator.assign(nextStepLink);
+      } catch {
+        setEsiaError();
+      } finally {
+        endLoading();
       }
-    } catch {
-      setEsiaStatus(EsiaStatuses.Error);
-    }
-  }, []);
+    },
+    [nextStepLink],
+  );
 
   useEffect(() => {
     leadFormStore.productType = productType;
-
+    const profileId: string = <string>(
+      safeJsonParse(globalThis.localStorage?.getItem('profileId') ?? '')
+    );
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
 
-    if (code && state) {
-      requestEsiaProfile(code, state);
+    if (profileId && code && state) {
+      updateEsiaProfile(profileId, code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }
   }, []);
 
-  return initialFormState;
+  return [initialFormState, { isLoading }];
 };

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,6 +5,7 @@ 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 { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface CreditCardFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'creditCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/CreditForm/CreditFormStep.tsx

@@ -6,6 +6,7 @@ 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 { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -21,6 +22,13 @@ export interface CreditFormStepProps {
   onFinish?: () => void;
 }
 
+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();
@@ -30,12 +38,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
+
     const formValidator = useCallback(
       (formState: LeadFormState) =>
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/DebitForm/DebitFormStep.tsx

@@ -5,6 +5,7 @@ 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 { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface DebitFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'debitCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/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);
 
-export const saveToken = (data: CheckCodeResponse | null) => {
+const saveToken = (data: CheckCodeResponse | null) => {
   if (data) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);

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

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

package/src/retail/api/updateUserTask.ts

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

package/src/retail/api/uploadFile.ts

@@ -5,12 +5,13 @@ 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.${isPDF ? 'pdf' : 'xml'}`);
+  fd.append('file', file, 'file.pdf');
 
   const res = await globalThis
     ?.fetch?.(`/light-api-cash/v1/file`, {

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

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

package/src/retail/components/EsiaLoginDialog/EsiaLoginDialog.fixture.tsx

@@ -0,0 +1,7 @@
+import '../../../setup-fixture';
+
+import { EsiaLoginDialog } from './EsiaLoginDialog';
+
+export default {
+  default: <EsiaLoginDialog />,
+};

package/src/retail/components/EsiaLoginDialog/EsiaLoginDialog.tsx

@@ -0,0 +1,65 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { locationNavigator } from '../../../external/locationNavigator';
+import { Button } from '../../../ui-kit/Button/Button';
+import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
+import { Img } from '../../../ui-kit/Img/Img';
+import { getLink } from '../../api/getLink';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+
+export interface EsiaLoginDialogProps {
+  onClose?: () => void;
+}
+
+export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
+  const navigator = locationNavigator();
+  const retailFormStore = useRetailFormStore();
+
+  const handleAuth = useCallback(async () => {
+    const resp = await getLink({
+      redirectUri: globalThis.location.origin + globalThis.location.pathname,
+    });
+
+    if (resp?.link) {
+      navigator.assign(resp.link);
+      globalThis.location.href = resp.link;
+    }
+  }, []);
+
+  const handleClose = useCallback(() => {
+    if (retailFormStore.leadForm) {
+      const leadForm = { ...retailFormStore.leadForm };
+      delete leadForm.esiaAccountTypeCd;
+      retailFormStore.leadForm = leadForm;
+    }
+    onClose?.();
+  }, []);
+
+  return (
+    <Dialog className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg" onClose={handleClose}>
+      <div className="flex flex-col gap-lg items-center rounded-md">
+        <div className="flex items-center justify-around w-full px-m">
+          <ul className="list-disc">
+            <li>Вероятность одобрения выше</li>
+            <li>Без справок о доходах и трудоустройстве</li>
+            <li>С защитой Ваших данных</li>
+          </ul>
+          <Img image={{ icon: 'GosUslugiIcon', iconVersion: 'normal' }} height="70" />
+        </div>
+        <div className="@container flex flex-wrap gap-lg w-full">
+          <Button type="button" onClick={handleAuth} className="w-full md:w-auto">
+            Заполнить через Госуслуги
+          </Button>
+          <Button
+            type="button"
+            version="secondary"
+            onClick={handleClose}
+            className="w-full md:w-auto"
+          >
+            Пропустить
+          </Button>
+        </div>
+      </div>
+    </Dialog>
+  );
+});

package/src/retail/components/EsiaLoginDialog/useEsiaLoginDialog.tsx

@@ -0,0 +1,13 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { locationNavigator } from '../../../external/locationNavigator';
+import { useDialog } from '../../../ui-kit/DialogManager/useDialog';
+import { EsiaLoginDialog } from './EsiaLoginDialog';
+
+export const useEsiaLoginDialog = (nextStepLink: string) => {
+  const { open } = useDialog(EsiaLoginDialog);
+  const navigator = locationNavigator();
+
+  return useCallback(() => {
+    open({ onClose: () => navigator.assign(nextStepLink) });
+  }, [open, nextStepLink]);
+};

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

@@ -1,13 +1,11 @@
 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={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -1,29 +1,18 @@
 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 = input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '');
 
   return (
-    <div>
-      {filledByEsia ? (
-        <div className="mb-6">
-          <InfoCard __html="Для выбора иного способа подтверждения дохода, оформите новую заявку на кредит без авторизации на портале Госуслуги" />
-        </div>
-      ) : null}
-      <SelectField
-        field={field}
-        source={confirmationIncome}
-        label="Способ подтверждения дохода"
-        fieldName="confirmationIncome"
-        input={input}
-        disabled={filledByEsia}
-      />
-    </div>
+    <SelectField
+      field={field}
+      source={confirmationIncome}
+      label="Способ подтверждения дохода"
+      fieldName="confirmationIncome"
+      input={input}
+    />
   );
 });

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

@@ -4,7 +4,6 @@ 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';
 
@@ -42,7 +41,6 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

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

@@ -2,7 +2,6 @@ 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;
@@ -23,7 +22,6 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
     />
   );
 });

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -11,6 +10,5 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

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

@@ -3,7 +3,6 @@ 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';
 
@@ -20,7 +19,6 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
       onDaDataChange={onDaDataChange}
     />
   );

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

@@ -1,6 +1,5 @@
 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 }) => (
@@ -10,6 +9,5 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     isInteger={true}
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
   />
 ));

package/src/retail/content.tsx

@@ -139,7 +139,7 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
         label: 'Телефон работодателя',
         required: true,
       },
-      { name: 'beginDate', required: true, filledByEsia: true },
+      { name: 'beginDate', required: true },
     ],
   },
   {
@@ -180,16 +180,6 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   {
     title: 'Совокупный доход',
   },
-  {
-    columns: 1,
-    inputs: [
-      {
-        name: 'confirmationIncome',
-        required: true,
-        filledByEsia: true,
-      },
-    ],
-  },
   {
     inputs: [
       {
@@ -198,6 +188,10 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
       },
     ],
   },
+  {
+    columns: 1,
+    inputs: [{ name: 'confirmationIncome', required: true }],
+  },
   {
     columns: 1,
     inputs: [{ name: 'wages', required: true, filledByEsia: true }],

package/src/retail/model/NameFieldDef.ts

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

package/src/retail/utils/mainFormStateMap.ts

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

package/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -0,0 +1,21 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { limitedBirthdayValidator, type LimitedBirthdayValidationParams } from './validators';
+
+const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidationParams> = {
+  credit: {
+    minAge: 23,
+    maxAge: 75,
+    errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+  },
+  creditCard: {
+    minAge: 21,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+  },
+  debitCard: {
+    minAge: 18,
+    errorMessage: 'Допустимый возраст - от 18 лет',
+  },
+};
+
+export const getLimitedBirthdayValidation = (productType: ProductType) =>
+  limitedBirthdayValidator(limitedBirthdayValidationData[productType]);

package/src/retail/validator/validatorObj.ts

@@ -11,7 +11,6 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
-  limitedBirthdayValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -53,7 +52,6 @@ const validatorRetailObj: Record<string, Validator> = {
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   sex: defaultValidator('Укажите свой пол'),
-  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),