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

package/mobile/src/components/ApplicationLeadForm/EsiaLoginBanner.tsx

@@ -0,0 +1,51 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { locationNavigator } from '../../external/locationNavigator';
+import { getLink } from '../../retail/api/getLink';
+import { Button } from '../../ui-kit/Button/Button';
+import { Img } from '../../ui-kit/Img/Img';
+
+export interface EsiaLoginBannerProps {
+  onClose?: () => void;
+}
+
+export const EsiaLoginBanner = JSX<EsiaLoginBannerProps>(() => {
+  const navigator = locationNavigator();
+
+  const handleAuth = useCallback(async () => {
+    const resp = await getLink({
+      redirectUri: globalThis.location.origin + globalThis.location.pathname,
+    });
+
+    if (resp?.link) {
+      navigator.assign(resp.link);
+    }
+  }, []);
+
+  return (
+    <div className="flex gap-lg items-center rounded-md bg-main-gray p-4xl">
+      <div className="flex flex-col justify-around w-full">
+        <p className="mb-m text-xl">Заполните данные через Госуслуги</p>
+        <ul className="list-disc list-inside mb-4xl">
+          <li>Вероятность одобрения выше</li>
+          <li>Без справок о доходах и трудоустройстве</li>
+          <li>С защитой Ваших данных</li>
+        </ul>
+        <Img
+          className="block mb-xl self-center @md:hidden"
+          image={{ icon: 'GosUslugiIcon', iconVersion: 'normal' }}
+          height="80"
+          width="80"
+        />
+        <Button type="button" onClick={handleAuth} className="w-full @md:w-fit">
+          Заполнить
+        </Button>
+      </div>
+      <Img
+        className="hidden @md:block"
+        image={{ icon: 'GosUslugiIcon', iconVersion: 'normal' }}
+        height="164"
+      />
+    </div>
+  );
+});

package/mobile/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -3,32 +3,6 @@ import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 
-export const applicationFormData: SectionsRetailProps[] = [
-  {
-    columns: 2,
-    inputs: [
-      { name: 'surname', required: true, dadata: true },
-      { name: 'name', required: true, dadata: true },
-      { name: 'middleName', dadata: true },
-      { name: 'limitedBirthday', required: true },
-      { name: 'phone', required: true },
-      { name: 'email', required: true, dadata: true },
-    ],
-  },
-  {
-    inputs: [
-      { name: 'processPersonalDataFlg', required: true },
-      { name: 'consentProviderFlg', required: true },
-      { name: 'consentOthersFlg', required: true },
-      { name: 'consentInformFlg' },
-      { name: 'consentPfrFlg' },
-      { name: 'consentInformMaterialsFlg' },
-      { name: 'consentPhotoFlg' },
-      { name: 'consentFATCA' },
-    ],
-  },
-];
-
 export const getApplicationFormData = (productType: ProductType): SectionsRetailProps[] => {
   const currentProductConsents = productTypeToConsentsMap[productType];
   const allConsents: FieldRetailDef[] = [
@@ -46,11 +20,11 @@ export const getApplicationFormData = (productType: ProductType): SectionsRetail
     {
       columns: 2,
       inputs: [
-        { name: 'surname', required: true, dadata: true },
-        { name: 'name', required: true, dadata: true },
-        { name: 'middleName', dadata: true },
-        { name: 'limitedBirthday', required: true },
-        { name: 'phone', required: true },
+        { name: 'surname', required: true, dadata: true, filledByEsia: true },
+        { name: 'name', required: true, dadata: true, filledByEsia: true },
+        { name: 'middleName', dadata: true, filledByEsia: true },
+        { name: 'limitedBirthday', required: true, filledByEsia: true },
+        { name: 'phone', required: true, filledByEsia: true },
         { name: 'email', required: true, dadata: true },
       ],
     },

package/mobile/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -21,9 +21,16 @@ const initialFormState = {
 export const getInitialFormState = (
   inputs: FieldRetailDef[],
   savedForm: LeadFormState | null,
+  esiaAuthSuccess: boolean,
 ): LeadFormState => {
   if (savedForm) {
-    return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
+    return {
+      ...savedForm,
+      limitedBirthday: new Date(savedForm?.limitedBirthday || 0),
+      ...(!esiaAuthSuccess && {
+        esiaAccountTypeCd: { key: '' },
+      }),
+    };
   }
 
   const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));

package/mobile/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -1,33 +1,23 @@
 /* eslint-disable max-lines */
-import { type UpdateProfileEsiaResponse } from '../../retail/api/updateProfileEsia';
+/* eslint-disable max-lines-per-function */
+import { type EsiaRequestProfileResponse } from '../../retail/api/esiaRequestProfile';
 import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
 import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = async (
-  esiaProfile: UpdateProfileEsiaResponse,
-  taskId: string,
+  esiaProfile: EsiaRequestProfileResponse,
   isDebit: boolean,
 ): Promise<LeadFormState> => {
-  isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
+  checkEsiaData(esiaProfile);
+  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
-  const files: File[] = [];
+  let files: File[] = [];
 
-  if (!isDebit) {
-    await saveDocument({
-      document: esiaAdditionalDocument.pdfFileWorkbook,
-      taskId,
-      category: 'CONFIRMING_INCOME_DOC',
-      files,
-    });
-    await saveDocument({
-      document: esiaAdditionalDocument.pdfFilePayout,
-      taskId,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      files,
-    });
+  if (isFullEsiaData) {
+    files = await saveDocuments(esiaAdditionalDocument);
   }
 
   const mainData = {
@@ -45,12 +35,12 @@ export const parseEsiaProfile = async (
     birthPlace: addInfo.birthPlace,
     addressRegistration: buildAddress(addressRegistration),
     addressFact: buildAddress(addressFact),
-    esiaAccountTypeCd: profile.esiaAccountType,
+    esiaAccountTypeCd: isDebit ? profile.esiaAccountType : { key: '' },
   };
 
   return {
     ...mainData,
-    ...(!isDebit && {
+    ...(isFullEsiaData && {
       snils: addInfo.snils,
       inn: esiaAdditionalDocument.inn,
       wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
@@ -59,6 +49,9 @@ export const parseEsiaProfile = async (
       generalSeniority: getYearFromMonth(esiaAdditionalDocument.workLength).toString(),
       lastJobExperience: getYearFromMonth(esiaAdditionalDocument.workLengthLastJob).toString(),
       jobsNumber: esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
+      esiaAccountTypeCd: profile.esiaAccountType,
+      confirmationIncome: { key: 'SFR_CERTIFICATE', text: 'Запрос Банком доходов из СФР' },
+      employment: { key: 'WORK', text: 'Работаю' },
       files,
     }),
   };
@@ -74,7 +67,7 @@ const concatFullAddress = (address: Array<string | undefined>): string => {
   }, '');
 };
 
-const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration']): Address => {
   const {
     postcode,
     region,
@@ -110,25 +103,67 @@ const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']):
 
 const getYearFromMonth = (month: number) => Math.floor(month / 12);
 
-const saveDocument = async ({
-  document,
-  taskId,
-  category,
-  files,
-}: {
-  document: string;
-  taskId: string;
-  category: DocumentCategory;
-  files: File[];
-}) => {
-  await fetch(`data:application/pdf;base64,${document}`)
-    .then((res) => res.blob())
-    .then((value) => uploadFile(value, taskId, category))
-    .then((file) => files.push(file));
+const saveDocuments = async (
+  esiaAdditionalDocument: EsiaRequestProfileResponse['esiaAdditionalDocument'],
+): Promise<File[]> => {
+  const files: File[] = [];
+  const documents = [
+    {
+      file: esiaAdditionalDocument.pdfFileWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFilePayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFileSigPayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFilePayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileSigPayout,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: false,
+    },
+    {
+      file: esiaAdditionalDocument.pdfFileSigWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: true,
+    },
+    {
+      file: esiaAdditionalDocument.xmlFileSigWorkbook,
+      category: 'CONFIRMING_INCOME_DOC',
+      isPDF: false,
+    },
+  ];
+
+  for (const doc of documents) {
+    const contentType = doc.isPDF ? 'data:application/pdf;base64' : 'data:application/xml;base64';
+
+    await fetch(`${contentType},${doc.file}`)
+      .then((res) => res.blob())
+      .then((value) => uploadFile(value, doc.category as DocumentCategory, doc.isPDF))
+      .then((file) => files.push(file));
+  }
+
+  return files;
 };
 
-const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
-  const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
+const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
+  const { profile, document, addressRegistration } = esiaProfile;
 
   const data = [
     profile.name,
@@ -136,7 +171,6 @@ const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
     profile.midname,
     profile.birthDate,
     profile.phone,
-    profile.email,
     document.dulIssueDate,
     document.dulIssuedBy,
     document.dulNumber,
@@ -144,42 +178,33 @@ const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
     document.dulSubdivisionCode,
     addressRegistration,
     profile.esiaAccountType,
-    esiaAdditionalDocument.inn,
-    esiaAdditionalDocument.averageMonthlyIncome.toString(),
-    esiaAdditionalDocument.startWorkDate,
-    esiaAdditionalDocument.workLengthInFiveYears.toString(),
-    esiaAdditionalDocument.workLength.toString(),
-    esiaAdditionalDocument.workLengthLastJob.toString(),
-    esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
-    esiaAdditionalDocument.pdfFilePayout,
-    esiaAdditionalDocument.pdfFileWorkbook,
   ];
 
-  if (!data.every((_) => Boolean(_))) {
+  if (!data.every(Boolean)) {
     throw new Error();
   }
 };
 
-const checkEsiaDataForDebit = (esiaProfile: UpdateProfileEsiaResponse) => {
-  const { profile, document, addressRegistration } = esiaProfile;
+const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) => {
+  const { esiaAdditionalDocument } = esiaProfile;
 
   const data = [
-    profile.name,
-    profile.surname,
-    profile.midname,
-    profile.birthDate,
-    profile.phone,
-    profile.email,
-    document.dulIssueDate,
-    document.dulIssuedBy,
-    document.dulNumber,
-    document.dulSerie,
-    document.dulSubdivisionCode,
-    addressRegistration,
-    profile.esiaAccountType,
+    esiaAdditionalDocument?.inn,
+    esiaAdditionalDocument?.averageMonthlyIncome?.toString(),
+    esiaAdditionalDocument?.startWorkDate,
+    esiaAdditionalDocument?.workLengthInFiveYears?.toString(),
+    esiaAdditionalDocument?.workLength?.toString(),
+    esiaAdditionalDocument?.workLengthLastJob?.toString(),
+    esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
+    esiaAdditionalDocument?.pdfFilePayout,
+    esiaAdditionalDocument?.pdfFileWorkbook,
+    esiaAdditionalDocument?.pdfFileSigPayout,
+    esiaAdditionalDocument?.xmlFilePayout,
+    esiaAdditionalDocument?.xmlFileSigPayout,
+    esiaAdditionalDocument?.xmlFileWorkbook,
+    esiaAdditionalDocument?.pdfFileSigWorkbook,
+    esiaAdditionalDocument?.xmlFileSigWorkbook,
   ];
 
-  if (!data.every((_) => Boolean(_))) {
-    throw new Error();
-  }
+  return data.every(Boolean);
 };

package/mobile/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -12,7 +12,6 @@ import { updateUserProfile } from '../../retail/api/updateUserProfile';
 import { updateUserTask } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
-import { useEsiaLoginDialog } from '../../retail/components/EsiaLoginDialog/useEsiaLoginDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
@@ -28,7 +27,6 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
-  esiaError: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -36,7 +34,6 @@ export const useApplicationLeadApi = ({
   programId,
   nextStepLink,
   productType,
-  esiaError,
   data,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
@@ -45,78 +42,76 @@ export const useApplicationLeadApi = ({
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
 
-  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+  const goToNextStep = useCallback(() => {
+    navigator.assign(nextStepLink);
+  }, []);
+
+  const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
 
-  const handleSubmit = useCallback(
-    async (formData: LeadFormState) => {
-      if (esiaError) {
-        navigator.assign(nextStepLink);
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
+    try {
+      startSending();
+      const transformedFormData = transformFormData(formData);
+      const profileId = await createUserProfile({
+        profile: { phone: formatPhone(transformedFormData.phone as string) },
+      });
 
-        return;
+      if (!profileId) {
+        throw new Error();
       }
-      try {
-        startSending();
-        const transformedFormData = transformFormData(formData);
-        const profileId = await createUserProfile({
-          profile: { phone: formatPhone(transformedFormData.phone as string) },
+
+      const sendCurrentTask = async () => {
+        await updateUserData({
+          programId,
+          profileId,
+          formData: transformedFormData,
+          productType,
+          saveUserData,
+          sendAspects,
         });
+        verifyPhoneDialog.close();
+        if (productType === 'debitCard') {
+          goToNextStep();
+        } else {
+          consentBkiDialog.open(transformedFormData.phone, profileId);
+        }
+      };
+      const handleSuccessVerify = async () => {
+        try {
+          const lastTaskId = await getLastTaskStatus({ profileId, programId });
 
-        if (profileId && transformedFormData?.phone) {
-          const sendCurrentTask = async () => {
-            await updateUserData({
-              programId,
-              profileId,
-              formData: transformedFormData,
-              productType,
-              saveUserData,
+          if (lastTaskId) {
+            const task = await getTaskById({ taskId: lastTaskId });
+            verifyPhoneDialog.close();
+            draftDialog.open({
+              task,
+              isFromLead: true,
               sendAspects,
+              onClose: sendCurrentTask,
             });
-            verifyPhoneDialog.close();
-            if (productType === 'debitCard') {
-              openEsiaLoginDialog();
-            } else {
-              consentBkiDialog.open(transformedFormData.phone, profileId);
-            }
-          };
-          const handleSuccessVerify = async () => {
-            try {
-              const lastTaskId = await getLastTaskStatus({ profileId, programId });
-
-              if (lastTaskId) {
-                const task = await getTaskById({ taskId: lastTaskId });
-                verifyPhoneDialog.close();
-                draftDialog.open({
-                  task,
-                  isFromLead: true,
-                  sendAspects,
-                  onClose: sendCurrentTask,
-                });
-              } else {
-                await sendCurrentTask();
-              }
-            } catch {
-              setOK(false);
-            }
-          };
-
-          const acceptedConsents = getAcceptedConsents(formData, productType);
-
-          verifyPhoneDialog.open({
-            phone: transformedFormData?.phone,
-            consents: acceptedConsents,
-            onSuccess: handleSuccessVerify,
-          });
-          endSending();
+          } else {
+            await sendCurrentTask();
+          }
+        } catch {
+          setOK(false);
         }
-      } catch {
-        setOK(false);
-      }
-    },
-    [esiaError],
-  );
+      };
+
+      const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
+
+      verifyPhoneDialog.open({
+        phone: transformedFormData.phone as string,
+        consents: acceptedConsents,
+        onSuccess: handleSuccessVerify,
+      });
+    } catch {
+      setOK(false);
+    } finally {
+      endSending();
+    }
+  }, []);
 
   return { isSending, ok, handleSubmit };
 };

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

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

package/mobile/src/components/CreditCardForm/CreditCardFormStep.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 { useCreditCardFormAPI } from './useCreditCardFormAPI';
 
@@ -21,11 +18,6 @@ export interface CreditCardFormStepProps {
 
 const PRODUCT_TYPE = 'creditCard';
 
-const extendedValidatorObj = {
-  ...validatorObj,
-  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
-
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -35,11 +27,12 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
 
     const formValidator = useCallback(
       (formState: LeadFormState) =>
-        // TODO Слишком сложно
-        getFormValidator(
-          calculateInputs((_) => formState[_])(inputs, step),
-          extendedValidatorObj,
-        )(formState),
+        getRetailFormValidator({
+          formState,
+          inputs,
+          step,
+          productType: PRODUCT_TYPE,
+        }),
       [inputs],
     );