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

package/bundle/bundle.umd.js

@@ -2022,7 +2022,7 @@
 
     const PhoneField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'phone';
-        return jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...field(fieldName), ...input });
+        return (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...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);
@@ -2202,7 +2202,7 @@
     function shouldRenderField({ input, field, }) {
         const { condition } = input;
         const { value } = field(condition?.name || '');
-        return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
+        return !condition || condition?.values?.includes(value?.key ?? value);
     }
 
     const PRODUCT_REF = {
@@ -2429,10 +2429,12 @@
 
     const ERROR_MESSAGE = 'Некорректно заполненное поле';
     const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
+    const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
     const addressDaDataValidate = (address) => Boolean(address.region && (address.city || address.locality) && address.house);
     const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
     const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && (address.city || address.locality) && address.house))(ADDRESS_ERROR_MESSAGE);
     const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
+    const nameRetailValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && retailCyrillicPattern.test(_))(errorMsg ?? ERROR_MESSAGE);
     const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
     const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
     const limitedBirthdayValidate = ({ minAge, maxAge }) => (date) => {
@@ -2556,6 +2558,9 @@
         partInBusiness: defaultValidator(),
         regionRetail: defaultSelectValidator('Выберите регион'),
         latinSurname: defaultValidator('Укажите фамилию'),
+        surname: nameRetailValidator('Укажите свою фамилию на кириллице'),
+        name: nameRetailValidator('Укажите своё имя на кириллице'),
+        middleName: nameRetailValidator('Укажите своё отчество на кириллице'),
     };
     const validatorObj = {
         ...validatorRetailObj,
@@ -2655,11 +2660,11 @@
             {
                 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 },
                 ],
             },
@@ -2669,6 +2674,57 @@
         ];
     };
 
+    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) => {
@@ -3555,42 +3611,6 @@
     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: {
@@ -3820,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 })));
+    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 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) })));
@@ -3884,7 +3904,8 @@
 
     const ConfirmationIncomeField = JSX(({ field, input }) => {
         const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
-        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 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 })] }));
     });
 
     const ConscriptionField = JSX(({ field, input }) => {
@@ -4428,10 +4449,10 @@
                 }
             })();
         }, [employerActivities, employerOrganization, organization, amountWorkers]);
-        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
+        return (jsx(DaDataInputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') }));
     });
 
-    const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? '') })));
+    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() })));
 
     const DeliveryTimeField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('COURIER_DELIVERY_TIME');
@@ -4444,7 +4465,11 @@
 
     const DependentsField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u043D\u044B\u0445 \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435\u043C \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
-    const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
+    const DulIssueDateField = JSX(({ field, input }) => {
+        const birthDate = field('limitedBirthday')?.value;
+        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 }));
+    });
 
     const DulIssuedByField = JSX(({ field, input }) => {
         const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } = field('dulSubdivisionCode');
@@ -4507,7 +4532,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 }));
+        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 ?? '') }));
     });
 
     const FamilyMembersField = JSX(({ field, input }) => {
@@ -4528,7 +4553,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 })));
+    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 HousingField = JSX(({ field, input }) => {
         const { data: housing } = useLeadFormData('HOUSE_TYPE');
@@ -4537,9 +4562,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 })));
+    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 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 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 latinPattern = /^[\u0041-\u005A\u0061-\u007A\s]+$/u;
     const isLatin = (_ = '') => latinPattern.test(_);
@@ -4670,9 +4695,23 @@
     ];
     const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...field(input?.name ?? '') })));
 
-    const MiddleNameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), ...field(input?.name ?? ''), ...input })));
+    const MiddleNameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('middleName')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u041E\u0442\u0447\u0435\u0441\u0442\u0432\u043E (\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E, \u043F\u0440\u0438 \u043D\u0430\u043B\u0438\u0447\u0438\u0438)", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
-    const NameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(input?.name ?? ''), ...input })));
+    const NameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('name')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
     const OrganizationField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('ORGANIZATION_TYPE');
@@ -4691,7 +4730,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 ?? ''), 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 ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(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 })));
@@ -4827,11 +4866,18 @@
     const SnilsField = JSX(({ field, input }) => (jsx(InputSnilsControl, { label: "\u0421\u041D\u0418\u041B\u0421", maxLength: 14, ...field(input?.name ?? ''), ...input })));
 
     const FIELD_NAME = 'surname';
-    const SurnameField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME), ...field(input?.name ?? ''), ...input })));
+    const SurnameField = JSX(({ field, input }) => {
+        const onChange = useCallback((value) => {
+            if (retailCyrillicPattern.test(value) || value.length === 0) {
+                field('surname')?.onChange?.(value);
+            }
+        }, [field]);
+        return (jsx(DaDataInputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME), ...field(input?.name ?? ''), ...input, onChange: onChange }));
+    });
 
     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 })));
+    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 DELIVERY_CITIES_REF = {
         $ref: '/wcms-resources/delivery-cities-data.json',
@@ -5461,7 +5507,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, } = 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, profile, } = participant;
         return {
             currency: currency?.key,
             paymentSystem: getSelectValue(paymentSystem),
@@ -5513,6 +5559,7 @@
                 monthsValue,
                 isAnnuity: paymentTypeCd?.key === 'ANNUITY',
             },
+            esiaAccountTypeCd: profile?.esiaAccountTypeCd,
             ...getParticipantIncomes(participantIncomes),
             ...getParticipantAddresses(participantAddresses),
             ...getParticipantContacts(participantContacts),
@@ -5567,39 +5614,6 @@
         };
     };
 
-    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;
@@ -5721,21 +5735,19 @@
 
     /* eslint-disable max-lines */
     // eslint-disable-next-line max-lines-per-function
-    const useApplicationLeadApi = ({ programId, nextStepLink, productType, esiaError, data, }) => {
+    const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
         const [ok, setOK] = useState();
         const saveUserData = useSaveUserData();
         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) => {
-            if (esiaError) {
-                navigator.assign(nextStepLink);
-                return;
-            }
             try {
                 startSending();
                 const profileId = await createUserProfile({
@@ -5753,7 +5765,7 @@
                         });
                         verifyPhoneDialog.close();
                         if (productType === 'debitCard') {
-                            openEsiaLoginDialog();
+                            goToNextStep();
                         }
                         else {
                             consentBkiDialog.open(formData.phone, profileId);
@@ -5792,7 +5804,7 @@
             catch {
                 setOK(false);
             }
-        }, [esiaError]);
+        }, []);
         return { isSending, ok, handleSubmit };
     };
     const getAcceptedConsents = (formData, productType) => {
@@ -5875,7 +5887,10 @@
         }
     }, [target, key]);
 
-    const updateProfileEsia = (body) => fetchRetailJSON('/esia/updateProfileEsia', 'POST', body);
+    const esiaRequestProfile = (body) => fetchRetailJSON('/esia/requestProfile', 'POST', body).then((res) => {
+        saveToken(res);
+        return res;
+    });
 
     const initialFormState = {
         surname: '',
@@ -5893,19 +5908,24 @@
         consentPhotoFlg: false,
         consentFATCA: false,
     };
-    const getInitialFormState$1 = (inputs, savedForm) => {
+    const getInitialFormState$1 = (inputs, savedForm, esiaAuthSuccess) => {
         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 || '']]));
         return { ...formState };
     };
 
-    const uploadFile = async (file, taskId, documentCategory) => {
+    const uploadFile = async (file, documentCategory, isPDF = false) => {
         const fd = new FormData();
-        fd.append('taskId', taskId);
         fd.append('documentCategory', documentCategory);
-        fd.append('file', file, 'file.pdf');
+        fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
         const res = await globalThis
             ?.fetch?.(`/light-api-cash/v1/file`, {
             method: 'POST',
@@ -5919,23 +5939,13 @@
         return res;
     };
 
-    const parseEsiaProfile = async (esiaProfile, taskId, isDebit) => {
-        isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
+    const parseEsiaProfile = async (esiaProfile, isDebit) => {
+        checkEsiaData(esiaProfile);
+        const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
         const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } = esiaProfile;
-        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,
-            });
+        let files = [];
+        if (isFullEsiaData) {
+            files = await saveDocuments(esiaAdditionalDocument);
         }
         const mainData = {
             name: profile.name,
@@ -5952,11 +5962,11 @@
             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(),
@@ -5965,6 +5975,9 @@
                 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,
             }),
         };
@@ -5997,43 +6010,60 @@
         };
     };
     const getYearFromMonth = (month) => Math.floor(month / 12);
-    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,
+    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,
+            },
         ];
-        if (!data.every((_) => Boolean(_))) {
-            throw new Error();
+        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));
         }
+        return files;
     };
-    const checkEsiaDataForDebit = (esiaProfile) => {
+    const checkEsiaData = (esiaProfile) => {
         const { profile, document, addressRegistration } = esiaProfile;
         const data = [
             profile.name,
@@ -6041,7 +6071,6 @@
             profile.midname,
             profile.birthDate,
             profile.phone,
-            profile.email,
             document.dulIssueDate,
             document.dulIssuedBy,
             document.dulNumber,
@@ -6054,75 +6083,97 @@
             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, nextStepLink, productType, setEsiaError, }) => {
-        const navigator = locationNavigator();
-        const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+    const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSuccess, }) => {
         const leadFormStore = useLeadFormStore();
         const saveForm = useSetter(leadFormStore, 'leadForm');
-        const initialFormState = useMemo(() => getInitialFormState$1(inputs, leadFormStore.leadForm), [inputs, leadFormStore.leadForm]);
-        const updateEsiaProfile = useCallback(async (profileId, code, state) => {
-            startLoading();
+        const initialFormState = useMemo(() => getInitialFormState$1(inputs, leadFormStore.leadForm, esiaAuthSuccess), [inputs, leadFormStore.leadForm]);
+        const requestEsiaProfile = useCallback(async (code, state) => {
+            setEsiaStatus(EsiaStatuses.Pending);
             try {
-                const data = await updateProfileEsia({
-                    profileId,
+                const data = await esiaRequestProfile({
                     code,
                     state,
                     redirectUri: globalThis.location?.href,
+                    authorize: true,
                 });
-                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,
                     }));
+                    setEsiaStatus(EsiaStatuses.Success);
                 }
-                navigator.assign(nextStepLink);
             }
             catch {
-                setEsiaError();
-            }
-            finally {
-                endLoading();
+                setEsiaStatus(EsiaStatuses.Error);
             }
-        }, [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 (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;
     };
 
+    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 [esiaError, { setTrue: setEsiaError }] = useBool(false);
+        const [esiaStatus, setEsiaStatus] = useState();
+        const leadForm = useRef(null);
         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, { isLoading }] = useInitApplicationLead({
+        const initialFormState = useInitApplicationLead({
             inputs,
             nextStepLink,
             productType,
-            setEsiaError,
+            setEsiaStatus,
+            esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
         });
         const { isSending, ok, handleSubmit } = useApplicationLeadApi({
             programId,
             nextStepLink,
             productType,
-            esiaError,
             data,
         });
-        const [, { field, onSubmit }] = useForm(initialFormState, {
+        const [, { field, onSubmit, reset }] = useForm(initialFormState, {
             formValidator,
             onSubmit: handleSubmit,
         });
@@ -6132,7 +6183,17 @@
                 responseTypeDialog.open({ ok });
             }
         }, [ok]);
-        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] }) }));
+        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] })] }));
     });
     const getInputs = (applicationFormData) => (applicationFormData?.flatMap((_) => _?.inputs) || []);
     const getExtendedValidatorObj = (productType) => ({
@@ -7846,6 +7907,7 @@
             mandatoryPayments: undefined,
             snils: '',
             armyIdFlg: false,
+            esiaAccountTypeCd: { key: '', text: '' },
         },
         {
             bankruptcyFlg: false,
@@ -8241,7 +8303,7 @@
                     label: 'Телефон работодателя',
                     required: true,
                 },
-                { name: 'beginDate', required: true },
+                { name: 'beginDate', required: true, filledByEsia: true },
             ],
         },
         {
@@ -8283,16 +8345,22 @@
             title: 'Совокупный доход',
         },
         {
+            columns: 1,
             inputs: [
                 {
-                    name: 'infoCard',
-                    label: 'Сумма основного и дополнительных доходов после вычета налога',
+                    name: 'confirmationIncome',
+                    required: true,
+                    filledByEsia: true,
                 },
             ],
         },
         {
-            columns: 1,
-            inputs: [{ name: 'confirmationIncome', required: true }],
+            inputs: [
+                {
+                    name: 'infoCard',
+                    label: 'Сумма основного и дополнительных доходов после вычета налога',
+                },
+            ],
         },
         {
             columns: 1,
@@ -11593,7 +11661,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.821";
+    const packageVersion = "0.14.823";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;