@redneckz/wildless-cms-uni-blocks 0.14.824 → 0.14.826

package/mobile/bundle/bundle.umd.js

@@ -2030,7 +2030,7 @@
 
     const PhoneField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'phone';
-        return (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(fieldName), ...input }));
+        return jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...field(fieldName), ...input });
     });
 
     const PosTerminalField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 POS-\u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B", ...field('posTerminal') })) : null);
@@ -2210,7 +2210,7 @@
     function shouldRenderField({ input, field, }) {
         const { condition } = input;
         const { value } = field(condition?.name || '');
-        return !condition || condition?.values?.includes(value?.key ?? value);
+        return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
     }
 
     const PRODUCT_REF = {
@@ -2460,6 +2460,14 @@
         return true;
     };
     const limitedBirthdayValidator = (params) => validator(limitedBirthdayValidate(params))(params.errorMessage);
+    const passportValidator = (birthDate) => validator((_) => {
+        if (_ && birthDate) {
+            return (_.getTime() >=
+                new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()).getTime());
+        }
+        return false;
+    })('Укажите дату выдачи паспорта');
+    const deliveryDateValidator = (errorMsg) => validator((_) => _?.getTime() >= new Date().getTime())(errorMsg);
     const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
     const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
     const snilsValidate = (snils) => {
@@ -2514,7 +2522,7 @@
         codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
         confirmationIncome: defaultSelectValidator(),
         methodObtain: defaultValidator(),
-        deliveryDate: defaultValidator('Укажите дату доставки'),
+        deliveryDate: deliveryDateValidator('Укажите дату доставки'),
     };
     const validatorRetailObj = {
         organization: defaultSelectValidator('Выберите тип организации'),
@@ -2551,7 +2559,6 @@
         armyIdFlg: agreementValidator,
         dulSerie: serieValidator('Укажите серию паспорта'),
         dulNumber: numberValidator('Укажите номер паспорта'),
-        dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
         dulSubdivisionCode: numberValidator('Укажите код подразделения'),
         dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
@@ -2668,11 +2675,11 @@
             {
                 columns: 2,
                 inputs: [
-                    { 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: '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 },
                 ],
             },
@@ -2682,57 +2689,6 @@
         ];
     };
 
-    const getTraceId = () => {
-        const result = new Uint8Array(8);
-        globalThis.crypto.getRandomValues(result);
-        return result.reduce((acc, _) => `${acc}${_.toString(16).padStart(2, '0')}`, '');
-    };
-
-    const fetchRetailJSON = async (url, method, body) => {
-        try {
-            const response = await doRequest(url, method, body);
-            return response.json();
-        }
-        catch (err) {
-            console.error(err);
-            return null;
-        }
-    };
-    async function doRequest(url, method, body) {
-        const traceId = getTraceId();
-        return globalThis?.fetch?.(`${RETAIL_API_BASE_URI}${url}`, {
-            method,
-            headers: {
-                'Content-Type': 'application/json',
-                'X-B3-Sampled': '1',
-                'X-B3-Spanid': traceId,
-                'X-B3-Traceid': traceId,
-                ...getAuthorizationHeaders(),
-            },
-            credentials: 'include',
-            body: body ? JSON.stringify(body) : null,
-        });
-    }
-    const getAuthorizationHeaders = () => {
-        const token = sessionStorage.getItem('accessToken');
-        return token ? { Authorization: `Bearer ${token}` } : null;
-    };
-
-    const getLink = (body) => fetchRetailJSON('/esia/getLink', 'POST', body);
-
-    const EsiaLoginBanner = JSX(() => {
-        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 (jsxs("div", { className: "flex gap-lg items-center rounded-md bg-main-gray px-4 py-6 @md:p-9", children: [jsxs("div", { className: "flex flex-col justify-around w-full", children: [jsx("p", { className: "mb-4 text-xl @md:text-2xl @md:mb-6", children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u0435 \u0434\u0430\u043D\u043D\u044B\u0435 \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsxs("ul", { className: "list-disc list-inside mb-9", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { className: "block mb-6 self-center @md:hidden", image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "80", width: "80" }), jsx(Button, { type: "button", onClick: handleAuth, className: "w-full @md:w-fit", children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C" })] }), jsx(Img, { className: "hidden @md:block", image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "164" })] }));
-    });
-
     const debounce = (fn, delay = 600) => {
         let timerId;
         const debouncedCallback = (...args) => {
@@ -3619,6 +3575,42 @@
     const mapByIndex = (points, index) => points.map((_) => _.coords?.[index]);
     const getArraySumAndAverage = (arr) => arr.length && arr.reduce((a, b) => a + b) / arr.length;
 
+    const getTraceId = () => {
+        const result = new Uint8Array(8);
+        globalThis.crypto.getRandomValues(result);
+        return result.reduce((acc, _) => `${acc}${_.toString(16).padStart(2, '0')}`, '');
+    };
+
+    const fetchRetailJSON = async (url, method, body) => {
+        try {
+            const response = await doRequest(url, method, body);
+            return response.json();
+        }
+        catch (err) {
+            console.error(err);
+            return null;
+        }
+    };
+    async function doRequest(url, method, body) {
+        const traceId = getTraceId();
+        return globalThis?.fetch?.(`${RETAIL_API_BASE_URI}${url}`, {
+            method,
+            headers: {
+                'Content-Type': 'application/json',
+                'X-B3-Sampled': '1',
+                'X-B3-Spanid': traceId,
+                'X-B3-Traceid': traceId,
+                ...getAuthorizationHeaders(),
+            },
+            credentials: 'include',
+            body: body ? JSON.stringify(body) : null,
+        });
+    }
+    const getAuthorizationHeaders = () => {
+        const token = sessionStorage.getItem('accessToken');
+        return token ? { Authorization: `Bearer ${token}` } : null;
+    };
+
     const fetchRegionOffices = async (regionKey) => {
         const response = await fetchRetailJSON('/public-data/regionOffices', 'POST', {
             regionRfCd: {
@@ -3848,7 +3840,7 @@
 
     const BankruptcyFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0412 \u043E\u0442\u043D\u043E\u0448\u0435\u043D\u0438\u0438 \u043C\u0435\u043D\u044F \u0432\u0435\u0434\u0451\u0442\u0441\u044F \u043F\u0440\u043E\u0438\u0437\u0432\u043E\u0434\u0441\u0442\u0432\u043E \u043F\u043E \u0434\u0435\u043B\u0443 \u043E \u0431\u0430\u043D\u043A\u0440\u043E\u0442\u0441\u0442\u0432\u0435", ...field(input?.name ?? '') })));
 
-    const BeginDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u043D\u0430\u0447\u0430\u043B\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u043C \u043C\u0435\u0441\u0442\u0435", ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const BeginDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u043D\u0430\u0447\u0430\u043B\u0430 \u0440\u0430\u0431\u043E\u0442\u044B \u043D\u0430 \u0442\u0435\u043A\u0443\u0449\u0435\u043C \u043C\u0435\u0441\u0442\u0435", ...field(input?.name ?? ''), ...input })));
 
     const FIELD_NAME$2 = 'birthPlace';
     const BirthPlaceField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041C\u0435\u0441\u0442\u043E \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$2) })));
@@ -3912,8 +3904,7 @@
 
     const ConfirmationIncomeField = JSX(({ field, input }) => {
         const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
-        const filledByEsia = input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '');
-        return (jsxs("div", { children: [filledByEsia ? (jsx("div", { className: "mb-6", children: jsx(InfoCard, { __html: "\u0414\u043B\u044F \u0432\u044B\u0431\u043E\u0440\u0430 \u0438\u043D\u043E\u0433\u043E \u0441\u043F\u043E\u0441\u043E\u0431\u0430 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F \u0434\u043E\u0445\u043E\u0434\u0430, \u043E\u0444\u043E\u0440\u043C\u0438\u0442\u0435 \u043D\u043E\u0432\u0443\u044E \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442 \u0431\u0435\u0437 \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0438 \u043D\u0430 \u043F\u043E\u0440\u0442\u0430\u043B\u0435 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }) })) : null, jsx(SelectField, { field: field, source: confirmationIncome, label: "\u0421\u043F\u043E\u0441\u043E\u0431 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F \u0434\u043E\u0445\u043E\u0434\u0430", fieldName: "confirmationIncome", input: input, disabled: filledByEsia })] }));
+        return (jsx(SelectField, { field: field, source: confirmationIncome, label: "\u0421\u043F\u043E\u0441\u043E\u0431 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F \u0434\u043E\u0445\u043E\u0434\u0430", fieldName: "confirmationIncome", input: input }));
     });
 
     const ConscriptionField = JSX(({ field, input }) => {
@@ -4457,7 +4448,7 @@
                 }
             })();
         }, [employerActivities, employerOrganization, organization, amountWorkers]);
-        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') }));
+        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
     });
 
     const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), minDate: new Date() })));
@@ -4475,7 +4466,7 @@
 
     const DulIssueDateField = JSX(({ field, input }) => {
         const birthDate = field('limitedBirthday')?.value;
-        const startDulIssueDate = useMemo(() => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()), [birthDate]);
+        const startDulIssueDate = useMemo(() => new Date(birthDate?.getFullYear() + 14, birthDate?.getMonth(), birthDate?.getDate()), [birthDate]);
         return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), minDate: startDulIssueDate }));
     });
 
@@ -4540,7 +4531,7 @@
     const MIN_YEARS = 0;
     const Experience5YearsField = JSX(({ field, input }) => {
         const onChange = useCallback((value) => field(input?.name ?? '')?.onChange?.(String(clamp(Number(value), MIN_YEARS, MAX_YEARS))), []);
-        return (jsx(DaDataInputControl, { label: "\u0421\u0442\u0430\u0436", placeholder: "\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", type: "number", ...field(input?.name ?? ''), ...input, onChange: onChange, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') }));
+        return (jsx(DaDataInputControl, { label: "\u0421\u0442\u0430\u0436", placeholder: "\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", type: "number", ...field(input?.name ?? ''), ...input, onChange: onChange }));
     });
 
     const FamilyMembersField = JSX(({ field, input }) => {
@@ -4561,7 +4552,7 @@
         return (jsx(SelectField, { field: field, source: familyStatus, label: "\u0421\u0435\u043C\u0435\u0439\u043D\u043E\u0435 \u043F\u043E\u043B\u043E\u0436\u0435\u043D\u0438\u0435", fieldName: "familyStatus", input: input }));
     });
 
-    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041E\u0431\u0449\u0438\u0439 \u0441\u0442\u0430\u0436", type: "number", maxLength: 2, placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041E\u0431\u0449\u0438\u0439 \u0441\u0442\u0430\u0436", type: "number", maxLength: 2, placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", ...field(input?.name ?? ''), ...input })));
 
     const HousingField = JSX(({ field, input }) => {
         const { data: housing } = useLeadFormData('HOUSE_TYPE');
@@ -4570,9 +4561,9 @@
 
     const InfoCardField = JSX(({ input }) => (jsx(InfoCard, { __html: input?.label })));
 
-    const JobsNumberField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442 \u0440\u0430\u0431\u043E\u0442\u044B \u0437\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const JobsNumberField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442 \u0440\u0430\u0431\u043E\u0442\u044B \u0437\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0435\u0441\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
-    const LastJobExperienceField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", type: "number", maxLength: 2, ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const LastJobExperienceField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", type: "number", maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
     const latinPattern = /^[\u0041-\u005A\u0061-\u007A\s]+$/u;
     const isLatin = (_ = '') => latinPattern.test(_);
@@ -4738,7 +4729,7 @@
             field?.('inn')?.onChange?.(item.data?.inn);
             updateOrganizationFields(store, field, item);
         }, []);
-        return (jsx(DaDataInputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), onDaDataChange: onDaDataChange }));
+        return (jsx(DaDataInputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
     });
 
     const OtherIncomeField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0418\u043D\u044B\u0435 \u0434\u043E\u0445\u043E\u0434\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
@@ -4885,7 +4876,7 @@
 
     const TotalIncomeField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u043E\u0444\u0438\u0446\u0438\u0430\u043B\u044C\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
-    const WagesField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const WagesField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0421\u043E\u0432\u043E\u043A\u0443\u043F\u043D\u044B\u0439 \u0434\u043E\u0445\u043E\u0434 \u0432 \u043C\u0435\u0441\u044F\u0446 \u043F\u043E\u0441\u043B\u0435 \u0432\u044B\u0447\u0435\u0442\u0430 \u043D\u0430\u043B\u043E\u0433\u043E\u0432 (\u0437\u0430\u0440\u043F\u043B\u0430\u0442\u0430, \u043F\u0440\u0435\u043C\u0438\u0438)", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
     const DELIVERY_CITIES_REF = {
         $ref: '/wcms-resources/delivery-cities-data.json',
@@ -4923,7 +4914,6 @@
         addressRetail: AddressRetailField,
         addressMatch: AddressMatchField,
         sex: SexField,
-        limitedBirthday: LimitedBirthdayField,
         birthPlace: BirthPlaceField,
         education: EducationField,
         housing: HousingField,
@@ -4962,6 +4952,7 @@
         calculator: CreditCalcField,
         confirmationIncome: ConfirmationIncomeField,
         inn: DaDataInnField,
+        ...InputsApplicationLeadMap,
     };
     const InputRetailCardMap = {
         addressCourier: (props) => (jsx(AddressCourierField, { ...props, source: DELIVERY_CITIES_REF })),
@@ -5515,7 +5506,7 @@
         const participant = task.participants[0];
         const { classCard: cardCategory, codeWord, paymentSystemTypeCd: paymentSystem, currencyCode: currency, } = task;
         const { loanAmount: moneyValue, creditPeriod: monthsValue, paymentTypeCd } = task;
-        const { birthDate: limitedBirthday, midname: middleName, name, surname, birthPlace, dulIssueDate: dulIssueDate, dulIssuedBy, dulNumber, dulSerie, dulSubdivisionCode, educationLevelCd: education, registrationDate: participantDateRegistration, houseTypeCd: housing, genderCd, participantContacts = [], participantAddresses = [], employmentContractDate: beginDate, employmentTypeCd: employment, organizationName, organizationInn: inn, organizationActivityTypeCd: employerActivities, organizationTypeCd: organization, organizationKindCd: employerOrganization, employeesNumberCd: amountWorkers, opf: legalForm, seniority: generalSeniority, generalSeniority: experience5Years, jobsNumber, lastWorkDuration: lastJobExperience, positionCd: positionOrganization, maritalStatusCd: familyStatus, childrenDependents: children, totalDependents: familyMembers, otherDependents: dependents, militaryStatusCd: conscription, participantIncomes, snils, armyIdFlg, bankruptcyFlg, shareholderFlg, nameLegalEntity: legalEntityName, creditInRshbCd, payrollCardRshbFlg: isInsurance, consentInsuranceFlg: isSalaryClient, incomeCertificateCd, profile, } = participant;
+        const { birthDate: limitedBirthday, midname: middleName, name, surname, birthPlace, dulIssueDate: dulIssueDate, dulIssuedBy, dulNumber, dulSerie, dulSubdivisionCode, educationLevelCd: education, registrationDate: participantDateRegistration, houseTypeCd: housing, genderCd, participantContacts = [], participantAddresses = [], employmentContractDate: beginDate, employmentTypeCd: employment, organizationName, organizationInn: inn, organizationActivityTypeCd: employerActivities, organizationTypeCd: organization, organizationKindCd: employerOrganization, employeesNumberCd: amountWorkers, opf: legalForm, seniority: generalSeniority, generalSeniority: experience5Years, jobsNumber, lastWorkDuration: lastJobExperience, positionCd: positionOrganization, maritalStatusCd: familyStatus, childrenDependents: children, totalDependents: familyMembers, otherDependents: dependents, militaryStatusCd: conscription, participantIncomes, snils, armyIdFlg, bankruptcyFlg, shareholderFlg, nameLegalEntity: legalEntityName, creditInRshbCd, payrollCardRshbFlg: isInsurance, consentInsuranceFlg: isSalaryClient, incomeCertificateCd, } = participant;
         return {
             currency: currency?.key,
             paymentSystem: getSelectValue(paymentSystem),
@@ -5567,7 +5558,6 @@
                 monthsValue,
                 isAnnuity: paymentTypeCd?.key === 'ANNUITY',
             },
-            esiaAccountTypeCd: profile?.esiaAccountTypeCd,
             ...getParticipantIncomes(participantIncomes),
             ...getParticipantAddresses(participantAddresses),
             ...getParticipantContacts(participantContacts),
@@ -5622,6 +5612,39 @@
         };
     };
 
+    const getLink = (body) => fetchRetailJSON('/esia/getLink', 'POST', body);
+
+    const EsiaLoginDialog = JSX(({ 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 (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", onClose: handleClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex items-center justify-around w-full px-m", children: [jsxs("ul", { className: "list-disc", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "70" })] }), jsxs("div", { className: "@container flex flex-wrap gap-lg w-full", children: [jsx(Button, { type: "button", onClick: handleAuth, className: "w-full md:w-auto", children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsx(Button, { type: "button", version: "secondary", onClick: handleClose, className: "w-full md:w-auto", children: "\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C" })] })] }) }));
+    });
+
+    const useEsiaLoginDialog = (nextStepLink) => {
+        const { open } = useDialog(EsiaLoginDialog);
+        const navigator = locationNavigator();
+        return useCallback(() => {
+            open({ onClose: () => navigator.assign(nextStepLink) });
+        }, [open, nextStepLink]);
+    };
+
     // TODO Не должно быть импортов из бизнес-слоя в API слой. Только наоборот.
     const getUpdateUserProfileData = (profileId, formData, consents) => {
         const { name = '', surname = '', middleName = '', limitedBirthday = '', phone = '', email = '', } = formData;
@@ -5743,40 +5766,43 @@
 
     /* eslint-disable max-lines */
     // eslint-disable-next-line max-lines-per-function
-    const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, }) => {
+    const useApplicationLeadApi = ({ programId, nextStepLink, productType, esiaError, data, }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
         const [ok, setOK] = useState();
         const saveUserData = useSaveUserData();
         const sendAspects = useSendLeadFormAspects({ data });
         const navigator = locationNavigator();
-        const goToNextStep = useCallback(() => {
-            navigator.assign(nextStepLink);
-        }, []);
-        const consentBkiDialog = useConsentBkiDialog(goToNextStep);
+        const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
+        const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const draftDialog = useDraftDialog();
         const handleSubmit = useCallback(async (formData) => {
+            if (esiaError) {
+                navigator.assign(nextStepLink);
+                return;
+            }
             try {
                 startSending();
+                const transformedFormData = transformFormData(formData);
                 const profileId = await createUserProfile({
-                    profile: { phone: formatPhone(formData.phone) },
+                    profile: { phone: formatPhone(transformedFormData.phone) },
                 });
-                if (profileId && formData?.phone) {
+                if (profileId && transformedFormData?.phone) {
                     const sendCurrentTask = async () => {
                         await updateUserData({
                             programId,
                             profileId,
-                            formData,
+                            formData: transformedFormData,
                             productType,
                             saveUserData,
                             sendAspects,
                         });
                         verifyPhoneDialog.close();
                         if (productType === 'debitCard') {
-                            goToNextStep();
+                            openEsiaLoginDialog();
                         }
                         else {
-                            consentBkiDialog.open(formData.phone, profileId);
+                            consentBkiDialog.open(transformedFormData.phone, profileId);
                         }
                     };
                     const handleSuccessVerify = async () => {
@@ -5802,7 +5828,7 @@
                     };
                     const acceptedConsents = getAcceptedConsents(formData, productType);
                     verifyPhoneDialog.open({
-                        phone: formData?.phone,
+                        phone: transformedFormData?.phone,
                         consents: acceptedConsents,
                         onSuccess: handleSuccessVerify,
                     });
@@ -5812,7 +5838,7 @@
             catch {
                 setOK(false);
             }
-        }, []);
+        }, [esiaError]);
         return { isSending, ok, handleSubmit };
     };
     const getAcceptedConsents = (formData, productType) => {
@@ -5884,6 +5910,12 @@
             consentAssignmentClaimsFlg: consentOthersFlg,
         };
     };
+    const transformFormData = (formData) => ({
+        ...formData,
+        surname: formData.surname?.trim(),
+        name: formData.name?.trim(),
+        middleName: formData.middleName?.trim(),
+    });
 
     const useSetter = (target, key) => useCallback((value) => {
         const newValue = value instanceof Function ? value(target[key]) : value;
@@ -5895,10 +5927,7 @@
         }
     }, [target, key]);
 
-    const esiaRequestProfile = (body) => fetchRetailJSON('/esia/requestProfile', 'POST', body).then((res) => {
-        saveToken(res);
-        return res;
-    });
+    const updateProfileEsia = (body) => fetchRetailJSON('/esia/updateProfileEsia', 'POST', body);
 
     const initialFormState = {
         surname: '',
@@ -5916,24 +5945,19 @@
         consentPhotoFlg: false,
         consentFATCA: false,
     };
-    const getInitialFormState$1 = (inputs, savedForm, esiaAuthSuccess) => {
+    const getInitialFormState$1 = (inputs, savedForm) => {
         if (savedForm) {
-            return {
-                ...savedForm,
-                limitedBirthday: new Date(savedForm?.limitedBirthday || 0),
-                ...(!esiaAuthSuccess && {
-                    esiaAccountTypeCd: { key: '' },
-                }),
-            };
+            return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
         }
         const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));
         return { ...formState };
     };
 
-    const uploadFile = async (file, documentCategory, isPDF = false) => {
+    const uploadFile = async (file, taskId, documentCategory) => {
         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`, {
             method: 'POST',
@@ -5947,13 +5971,23 @@
         return res;
     };
 
-    const parseEsiaProfile = async (esiaProfile, isDebit) => {
-        checkEsiaData(esiaProfile);
-        const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
+    const parseEsiaProfile = async (esiaProfile, taskId, isDebit) => {
+        isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
         const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } = esiaProfile;
-        let files = [];
-        if (isFullEsiaData) {
-            files = await saveDocuments(esiaAdditionalDocument);
+        const files = [];
+        if (!isDebit) {
+            await saveDocument({
+                document: esiaAdditionalDocument.pdfFileWorkbook,
+                taskId,
+                category: 'CONFIRMING_INCOME_DOC',
+                files,
+            });
+            await saveDocument({
+                document: esiaAdditionalDocument.pdfFilePayout,
+                taskId,
+                category: 'CONFIRMING_EMPLOYMENT_DOC',
+                files,
+            });
         }
         const mainData = {
             name: profile.name,
@@ -5970,11 +6004,11 @@
             birthPlace: addInfo.birthPlace,
             addressRegistration: buildAddress(addressRegistration),
             addressFact: buildAddress(addressFact),
-            esiaAccountTypeCd: isDebit ? profile.esiaAccountType : { key: '' },
+            esiaAccountTypeCd: profile.esiaAccountType,
         };
         return {
             ...mainData,
-            ...(isFullEsiaData && {
+            ...(!isDebit && {
                 snils: addInfo.snils,
                 inn: esiaAdditionalDocument.inn,
                 wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
@@ -5983,9 +6017,6 @@
                 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,
             }),
         };
@@ -6018,60 +6049,43 @@
         };
     };
     const getYearFromMonth = (month) => Math.floor(month / 12);
-    const saveDocuments = async (esiaAdditionalDocument) => {
-        const files = [];
-        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,
-            },
+    const saveDocument = async ({ document, taskId, category, files, }) => {
+        await fetch(`data:application/pdf;base64,${document}`)
+            .then((res) => res.blob())
+            .then((value) => uploadFile(value, taskId, category))
+            .then((file) => files.push(file));
+    };
+    const checkEsiaDataForCredit = (esiaProfile) => {
+        const { profile, document, addressRegistration, 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,
         ];
-        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, doc.isPDF))
-                .then((file) => files.push(file));
+        if (!data.every((_) => Boolean(_))) {
+            throw new Error();
         }
-        return files;
     };
-    const checkEsiaData = (esiaProfile) => {
+    const checkEsiaDataForDebit = (esiaProfile) => {
         const { profile, document, addressRegistration } = esiaProfile;
         const data = [
             profile.name,
@@ -6079,6 +6093,7 @@
             profile.midname,
             profile.birthDate,
             profile.phone,
+            profile.email,
             document.dulIssueDate,
             document.dulIssuedBy,
             document.dulNumber,
@@ -6091,97 +6106,75 @@
             throw new Error();
         }
     };
-    const checkEsiaAdditionalDocument = (esiaProfile) => {
-        const { esiaAdditionalDocument } = esiaProfile;
-        const data = [
-            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,
-        ];
-        return data.every((_) => Boolean(_));
-    };
 
-    const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSuccess, }) => {
+    const useInitApplicationLead = ({ inputs, nextStepLink, productType, setEsiaError, }) => {
+        const navigator = locationNavigator();
+        const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
         const leadFormStore = useLeadFormStore();
         const saveForm = useSetter(leadFormStore, 'leadForm');
-        const initialFormState = useMemo(() => getInitialFormState$1(inputs, leadFormStore.leadForm, esiaAuthSuccess), [inputs, leadFormStore.leadForm]);
-        const requestEsiaProfile = useCallback(async (code, state) => {
-            setEsiaStatus(EsiaStatuses.Pending);
+        const initialFormState = useMemo(() => getInitialFormState$1(inputs, leadFormStore.leadForm), [inputs, leadFormStore.leadForm]);
+        const updateEsiaProfile = useCallback(async (profileId, code, state) => {
+            startLoading();
             try {
-                const data = await esiaRequestProfile({
+                const data = await updateProfileEsia({
+                    profileId,
                     code,
                     state,
                     redirectUri: globalThis.location?.href,
-                    authorize: true,
                 });
-                if (data) {
-                    const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
+                if (data && leadFormStore?.taskId) {
+                    const parsedData = await parseEsiaProfile(data, leadFormStore.taskId.toString(), productType === 'debitCard');
                     saveForm((_) => ({
                         ..._,
                         ...parsedData,
                     }));
-                    setEsiaStatus(EsiaStatuses.Success);
                 }
+                navigator.assign(nextStepLink);
             }
             catch {
-                setEsiaStatus(EsiaStatuses.Error);
+                setEsiaError();
             }
-        }, []);
+            finally {
+                endLoading();
+            }
+        }, [nextStepLink]);
         useEffect(() => {
             leadFormStore.productType = productType;
+            const profileId = (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 }];
     };
 
-    var EsiaStatuses;
-    (function (EsiaStatuses) {
-        EsiaStatuses["Success"] = "SUCCESS";
-        EsiaStatuses["Error"] = "ERROR";
-        EsiaStatuses["Pending"] = "PENDING";
-    })(EsiaStatuses || (EsiaStatuses = {}));
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, productType = 'credit', data, ...rest }) => {
-        const [esiaStatus, setEsiaStatus] = useState();
-        const leadForm = useRef(null);
+        const [esiaError, { setTrue: setEsiaError }] = useBool(false);
         const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
         const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
         const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
         const formValidator = useMemo(() => getFormValidator(inputs, extendedValidatorObj), [inputs, extendedValidatorObj]);
-        const initialFormState = useInitApplicationLead({
+        const [initialFormState, { isLoading }] = useInitApplicationLead({
             inputs,
             nextStepLink,
             productType,
-            setEsiaStatus,
-            esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
+            setEsiaError,
         });
         const { isSending, ok, handleSubmit } = useApplicationLeadApi({
             programId,
             nextStepLink,
             productType,
+            esiaError,
             data,
         });
-        const [, { field, onSubmit, reset }] = useForm(initialFormState, {
+        const [, { field, onSubmit }] = useForm(initialFormState, {
             formValidator,
             onSubmit: handleSubmit,
         });
@@ -6191,17 +6184,7 @@
                 responseTypeDialog.open({ ok });
             }
         }, [ok]);
-        useEffect(() => {
-            if (esiaStatus && leadForm?.current) {
-                leadForm.current.scrollIntoView({
-                    block: 'start',
-                });
-            }
-            if (esiaStatus === EsiaStatuses.Success) {
-                reset();
-            }
-        }, [leadForm?.current, esiaStatus]);
-        return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [!esiaStatus ? jsx(EsiaLoginBanner, {}) : null, jsxs("form", { onSubmit: onSubmit, className: "space-y-m relative", ref: leadForm, children: [esiaStatus === EsiaStatuses.Pending ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, isSending), esiaStatus === EsiaStatuses.Error ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] })] }));
+        return (jsx(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: jsxs("form", { onSubmit: onSubmit, className: "space-y-m relative", children: [isLoading ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, isSending), esiaError ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] }) }));
     });
     const getInputs = (applicationFormData) => (applicationFormData?.flatMap((_) => _?.inputs) || []);
     const getExtendedValidatorObj = (productType) => ({
@@ -7819,6 +7802,12 @@
     });
     const getValue = (field) => (name) => field(name)?.value;
 
+    const getRetailFormValidator = ({ formState, inputs, step, productType, }) => getFormValidator(calculateInputs((_) => formState[_])(inputs, step), {
+        ...validatorObj,
+        limitedBirthday: getLimitedBirthdayValidation(productType),
+        dulIssueDate: passportValidator(formState.limitedBirthday),
+    })(formState);
+
     const StepsNavigationButtons$1 = JSX(({ step, isSending, onPrevStep }) => {
         const isFirstStep = step === 0;
         const isFinalStep = step === 5;
@@ -7899,7 +7888,6 @@
             mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
-            esiaAccountTypeCd: { key: '', text: '' },
         },
         {
             bankruptcyFlg: false,
@@ -8138,15 +8126,14 @@
     };
 
     const PRODUCT_TYPE$1 = 'creditCard';
-    const extendedValidatorObj$1 = {
-        ...validatorObj,
-        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE$1),
-    };
     const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
-        const formValidator = useCallback((formState) => 
-        // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj$1)(formState), [inputs]);
+        const formValidator = useCallback((formState) => getRetailFormValidator({
+            formState,
+            inputs,
+            step,
+            productType: PRODUCT_TYPE$1,
+        }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
             step,
             onNextStep,
@@ -8295,7 +8282,7 @@
                     label: 'Телефон работодателя',
                     required: true,
                 },
-                { name: 'beginDate', required: true, filledByEsia: true },
+                { name: 'beginDate', required: true },
             ],
         },
         {
@@ -8336,16 +8323,6 @@
         {
             title: 'Совокупный доход',
         },
-        {
-            columns: 1,
-            inputs: [
-                {
-                    name: 'confirmationIncome',
-                    required: true,
-                    filledByEsia: true,
-                },
-            ],
-        },
         {
             inputs: [
                 {
@@ -8354,6 +8331,10 @@
                 },
             ],
         },
+        {
+            columns: 1,
+            inputs: [{ name: 'confirmationIncome', required: true }],
+        },
         {
             columns: 1,
             inputs: [{ name: 'wages', required: true, filledByEsia: true }],
@@ -8889,17 +8870,16 @@
     };
 
     const PRODUCT_TYPE = 'credit';
-    const extendedValidatorObj = {
-        ...validatorObj,
-        limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-    };
     const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
         const { programId } = useRetailFormStore();
         const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
-        const formValidator = useCallback((formState) => 
-        // TODO Слишком сложно
-        getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
+        const formValidator = useCallback((formState) => getRetailFormValidator({
+            formState,
+            inputs,
+            step,
+            productType: PRODUCT_TYPE,
+        }), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditFormAPI({
             step,
             onNextStep,
@@ -10949,7 +10929,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.823";
+    const packageVersion = "0.14.825";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;