@redneckz/wildless-cms-uni-blocks 0.14.737 → 0.14.738

package/bundle/bundle.umd.js

@@ -1074,7 +1074,7 @@
     };
 
     const handleAspects = ({ aspectsAttributes, aspects, ev }) => {
-        for (const { aspectName, params } of aspectsAttributes) {
+        for (const { aspectName, params } of aspectsAttributes ?? []) {
             aspects[aspectName ?? '']?.(ev, params);
         }
     };
@@ -1141,64 +1141,99 @@
         useAspects._impl = impl;
     };
 
-    const identity = (_) => _;
+    function useBool(defaultValue = false) {
+        const [value, setValue] = useState(defaultValue);
+        const setTrue = useCallback(() => setValue(true), []);
+        const setFalse = useCallback(() => setValue(false), []);
+        const toggle = useCallback(() => setValue(_ => !_), []);
+        return [value, { setValue, setTrue, setFalse, toggle }];
+    }
 
-    // eslint-disable-next-line max-lines-per-function
-    const useForm = (initialState, { resetOnSubmit, onSubmit, normalize, } = {}) => {
+    const objectValidator = (validatorsMap) => (o) => (o &&
+        Object.entries(validatorsMap ?? {}).flatMap(([key, validator]) => validator ? validator(o[key]) : [])) ||
+        [];
+
+    const isValidationSuccess = (info) => !info?.length;
+    const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
+
+    const EMPTY_VALIDATORS_MAP = {};
+    const NO_ERRORS = [];
+    function useFormValidator(formState, formValidator) {
+        const validatorsMap = useMemo(() => formValidator?.(formState) ?? EMPTY_VALIDATORS_MAP, [formValidator, formState]);
+        const errors = useMemo(() => objectValidator(validatorsMap)(formState) ?? NO_ERRORS, [validatorsMap, formState]);
+        const isValid = isValidationSuccess(errors);
+        return [validatorsMap, { isValid, errors }];
+    }
+
+    const shallowCompare = (a, b) => a && b && (a === b || Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]));
+
+    function useNormalizedFormState(initialState, normalizer, onChange) {
         const [formState, setFormStateUnsafe] = useState(initialState);
-        const setFormState = useCallback(normalize
-            ? (_) => setFormStateUnsafe(_ instanceof Function
-                ? (prev) => {
-                    const _normalize = normalize(_(prev));
-                    return shellowCompare(prev, _normalize) ? prev : _normalize;
-                }
-                : normalize(_))
-            : setFormStateUnsafe, [normalize]);
+        const setFormState = useCallback((_) => setFormStateUnsafe((prevState) => {
+            const rawState = _ instanceof Function ? _(prevState) : _;
+            const normalizedState = normalizer ? normalizer(rawState) : rawState;
+            const hasChangedWithNormalization = !shallowCompare(rawState, normalizedState);
+            const nextState = hasChangedWithNormalization ? normalizedState : rawState;
+            const hasChanged = !shallowCompare(prevState, nextState);
+            if (hasChanged) {
+                onChange?.(nextState);
+            }
+            return nextState;
+        }), [normalizer, onChange]);
         useEffect(() => {
-            if (normalize) {
-                setFormStateUnsafe(normalize);
-            }
-        }, [normalize]);
-        const [isDirtyForm, setDirtyForm] = useState(false);
-        const [dirtyFieldsMap, setDirtyFieldsMap] = useState({});
-        const field = useCallback((fieldName, options) => {
-            const { parse = identity, format = identity } = options || {};
+            if (normalizer) {
+                setFormStateUnsafe(normalizer);
+            }
+        }, [normalizer]);
+        return [formState, setFormState];
+    }
+
+    function useForm(initialState, { resetOnSubmit, formValidator, normalizer, onChange, onSubmit } = {}) {
+        const [formState, setFormState] = useNormalizedFormState(initialState, normalizer, onChange);
+        const [isDirtyForm, { setTrue: markAsDirty, setFalse: markAsClean }] = useBool(false);
+        const dirtyFieldsMap = useRef({});
+        const [fieldValidatorsMap, { isValid, errors }] = useFormValidator(formState, formValidator);
+        const field = useCallback((fieldName, options = {}) => {
+            const { parse, format, onChange: onFieldChange } = options;
+            const value = formState[fieldName];
+            const isDirty = isDirtyForm || dirtyFieldsMap.current?.[String(fieldName)];
+            const fieldValidator = options?.validator ?? fieldValidatorsMap[fieldName];
+            const fieldErrors = isDirty && fieldValidator ? fieldValidator(value) : [];
             return {
-                value: format(formState[fieldName]),
-                isDirty: isDirtyForm || dirtyFieldsMap[fieldName],
-                onChange: (value) => {
-                    setFormState((prev) => ({ ...prev, [fieldName]: parse(value) }));
-                    setDirtyFieldsMap((prev) => ({ ...prev, [fieldName]: true }));
+                value: format ? format(value) : value,
+                isDirty,
+                errors: fieldValidator && fieldErrors,
+                error: fieldErrors[0],
+                onChange: (_) => {
+                    dirtyFieldsMap.current ||= {};
+                    dirtyFieldsMap.current[String(fieldName)] = true;
+                    const fieldVal = parse ? parse(_) : _;
+                    onFieldChange?.(fieldVal);
+                    setFormState((prev) => ({ ...prev, [fieldName]: fieldVal }));
                 },
             };
-        }, [setFormState, isDirtyForm, dirtyFieldsMap]);
+        }, [formState, isDirtyForm, fieldValidatorsMap, setFormState]);
         const update = useCallback((_) => {
+            dirtyFieldsMap.current = _;
             setFormState(_);
-            setDirtyFieldsMap(_);
-        }, []);
+        }, [setFormState]);
         const reset = useCallback(() => {
+            dirtyFieldsMap.current = {};
+            markAsClean();
             setFormState(initialState);
-            setDirtyForm(false);
-            setDirtyFieldsMap({});
-        }, [initialState]);
+        }, [initialState, setFormState]);
         const handleSubmit = useCallback((ev) => {
             ev.preventDefault();
-            resetOnSubmit ? reset() : setDirtyForm(true);
-            onSubmit && onSubmit(formState, ev);
-            return formState;
-        }, [onSubmit, formState]);
-        return [
-            formState,
-            {
-                isDirty: isDirtyForm || Object.values(dirtyFieldsMap).some(Boolean),
-                field,
-                update,
-                reset,
-                onSubmit: handleSubmit,
-            },
-        ];
-    };
-    const shellowCompare = (a, b) => a && b && Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
+            if (isValid) {
+                resetOnSubmit && reset();
+                onSubmit?.(formState, ev);
+            }
+            else {
+                markAsDirty();
+            }
+        }, [resetOnSubmit, formState, isValid, reset, onSubmit]);
+        return [formState, { errors, field, update, reset, onSubmit: handleSubmit }];
+    }
 
     const ApplicationFormLayout = JSX((props) => {
         const { className, title, children, ...rest } = props;
@@ -1219,14 +1254,6 @@
 
     const getConsentDataProcessing = (inputs) => inputs?.find((_) => _?.name === 'consentDataProcessing');
 
-    function useBool(defaultValue = false) {
-        const [value, setValue] = useState(defaultValue);
-        const setTrue = useCallback(() => setValue(true), []);
-        const setFalse = useCallback(() => setValue(false), []);
-        const toggle = useCallback(() => setValue(_ => !_), []);
-        return [value, { setValue, setTrue, setFalse, toggle }];
-    }
-
     function useEventListener(target, type, listener, options) {
         useEffect(() => {
             if (!target || !listener) {
@@ -1250,6 +1277,7 @@
         return targetRef;
     }
 
+    // TODO Базовая функицональность всех Control - надо вынести и привязать к required флагу
     const getRequiredLabel = ({ label, errors }) => label && errors ? `${label}*` : label;
 
     const noop = () => {
@@ -1550,182 +1578,6 @@
 
     const SelectControl = JSX(({ className = '', label, error, errors, ...rest }) => (jsxs("div", { className: className, children: [jsx(Select, { ...rest, valid: !error, label: getRequiredLabel({ label, errors }) }), renderErrorText(error)] })));
 
-    const getNamesFromInput = (inputs) => Object.values(inputs.filter((_) => _))?.map((_) => _.name);
-
-    const isValidationSuccess = (info) => !info?.length;
-    const validator = (predicate) => (message) => (_) => predicate(_) ? [] : [message];
-
-    const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
-
-    const ERROR_MESSAGE = 'Некорректно заполненное поле';
-    const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
-    const MIN_AGE = 23;
-    const MAX_AGE = 75;
-    const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
-    const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE);
-    const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
-    const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(errorMsg ?? ERROR_MESSAGE);
-    const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
-    const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
-    const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
-    const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
-    const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
-    const phoneValidate = (email) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
-    const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
-    const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
-    const snilsValidate = (snils) => {
-        const snl = String(snils).replace(/[^0-9]+/g, '');
-        if (snl.length === 11) {
-            let checksum = 0;
-            for (let i = 0; i < 9; i++) {
-                checksum += parseInt(snl.charAt(i)) * (9 - i);
-            }
-            if (checksum > 101) {
-                checksum = checksum % 101;
-            }
-            if (checksum === 100 || checksum === 101) {
-                checksum = 0;
-            }
-            return checksum === parseInt(snl.substr(9));
-        }
-        return false;
-    };
-    const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
-    const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
-    const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
-    const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
-    const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
-    const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))(ADDRESS_ERROR_MESSAGE);
-    const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
-    const cyrillicPattern = /^[\u0400-\u04FF\d\s]+$/u;
-    const isCyrillic = (_ = '') => cyrillicPattern.test(_);
-    const limitedBirthdayValidate = (date) => {
-        const today = new Date();
-        const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-        const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
-        if (!date || date > minDate || date < maxDate) {
-            return false;
-        }
-        return true;
-    };
-    const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
-
-    const validatorConsentsObj = {
-        processPersonalDataFlg: agreementValidator,
-        consentProviderFlg: agreementValidator,
-        consentInformFlg: agreementValidator,
-        consentPfrFlg: agreementValidator,
-        consentOthersFlg: agreementValidator,
-    };
-    const validatorCreditCardObj = {
-        addressCourier: addressDaDataValidator(),
-        paymentSystem: defaultValidator('Укажите тип платежной системы'),
-        currency: defaultValidator('Укажите валюту'),
-        cardCategory: defaultValidator('Укажите категорию карты'),
-        codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
-        confirmationIncome: defaultSelectValidator(),
-        methodObtain: defaultValidator(),
-        deliveryDate: defaultValidator('Укажите дату доставки'),
-    };
-    const validatorRetailObj = {
-        organization: defaultSelectValidator('Выберите тип организации'),
-        organizationAddress: addressOrganizationValidator(),
-        organizationPhone: phoneValidator('Укажите номер телефона'),
-        organizationName: defaultValidator('Укажите наименование организации'),
-        legalForm: defaultValidator('Укажите ОПФ'),
-        generalSeniority: jobNumberValidator('Укажите количество лет стажа'),
-        lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
-        experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
-        jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
-        beginDate: defaultValidator('Укажите дату заключения трудового договора'),
-        addressFact: addressDaDataValidator(),
-        addressRegistration: addressDaDataValidator(),
-        addressRetail: defaultSelectValidator('Выберите адрес банка'),
-        addressMatch: defaultValidator(),
-        sex: defaultValidator('Укажите свой пол'),
-        limitedBirthday: limitedBirthdayValidator(),
-        birthPlace: defaultValidator('Укажите место рождения'),
-        education: defaultSelectValidator('Выберите ваше образование'),
-        housing: defaultSelectValidator('Выберите тип жилья'),
-        amountWorkers: defaultSelectValidator('Выберите информацию о количестве сотрудников'),
-        employment: defaultSelectValidator('Выберите информацию о трудоустройстве'),
-        employerActivities: defaultSelectValidator('Выберите вид деятельности организации'),
-        employerOrganization: defaultSelectValidator('Выберите вид организации'),
-        positionOrganization: defaultSelectValidator('Выберите вашу должность'),
-        familyStatus: defaultSelectValidator('Выберите семейное положение'),
-        familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
-        children: lengthStringValidator(2, 'Укажите количество детей'),
-        dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
-        totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
-        expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
-        snils: snilsValidator('Некорректный номер СНИЛС'),
-        conscription: defaultValidator(),
-        armyIdFlg: agreementValidator,
-        dulSerie: serieValidator('Укажите серию паспорта'),
-        dulNumber: numberValidator('Укажите номер паспорта'),
-        dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
-        dulSubdivisionCode: numberValidator('Укажите код подразделения'),
-        dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
-        participantDateRegistration: defaultValidator('Укажите дату регистрации'),
-        retirementIncome: defaultValidator(),
-        otherIncome: defaultValidator(),
-        wages: defaultValidator(),
-        mandatoryPayments: defaultValidator(),
-        disablePeopleFlg: defaultValidator(),
-        bankruptcyFlg: defaultValidator(),
-        shareholderFlg: defaultValidator(),
-        legalEntityName: defaultValidator(),
-        bankEmployeeCode: defaultValidator(),
-        partInBusiness: defaultValidator(),
-        regionRetail: defaultSelectValidator('Выберите регион'),
-    };
-    const validatorObj = {
-        fullName: defaultValidator(),
-        addressBranch: defaultSelectValidator(),
-        desiredMeetingDate: defaultValidator(),
-        product: defaultValidator(),
-        localities: defaultValidator(),
-        partnerComments: defaultValidator(),
-        collectionCount: defaultValidator(),
-        acquiringType: defaultSelectValidator(),
-        serviceType: defaultSelectValidator(),
-        annualRevenue: defaultValidator(),
-        feedbackMethod: defaultSelectValidator(),
-        serviceDirection: defaultSelectValidator(),
-        secondaryPhone: phoneValidator('Укажите номер телефона'),
-        region: defaultSelectValidator(),
-        surname: nameValidator('Укажите свою фамилию'),
-        name: nameValidator('Укажите своё имя'),
-        middleName: nameValidator('Укажите своё отчество'),
-        birthday: defaultValidator('Укажите дату рождения'),
-        phone: phoneValidator('Укажите номер телефона'),
-        email: emailValidator('Укажите электронную почту'),
-        inn: innValidator('Укажите ИНН'),
-        comment: defaultValidator(),
-        typeForm: defaultValidator(),
-        consentToReceiveMaterials: agreementValidator,
-        consentDataProcessing: agreementValidator,
-        ...validatorConsentsObj,
-        ...validatorRetailObj,
-        ...validatorCreditCardObj,
-    };
-    const getObjectValidator = (inputs) => {
-        const requiredInputs = getNamesFromInput(inputs.filter((_) => Boolean(_?.required)));
-        return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator));
-    };
-
-    const withValidator = (props, validator) => {
-        const { value, isDirty } = props;
-        const errors = isDirty ? validator(value) : [];
-        return {
-            ...props,
-            errors,
-            error: errors[0],
-        };
-    };
-
-    const getValidation = (field, validator, required = false) => required && validator ? withValidator(field, validator) : field;
-
     const ACQUIRING_TYPES = [
         {
             text: 'Торговый эквайринг',
@@ -1744,7 +1596,7 @@
             key: 'all',
         },
     ];
-    const AcquiringField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0412\u0438\u0434 \u044D\u043A\u0432\u0430\u0439\u0440\u0438\u043D\u0433\u0430", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u044D\u043A\u0432\u0430\u0439\u0440\u0438\u043D\u0433", options: ACQUIRING_TYPES, ...getValidation(field('acquiringType'), validatorObj.acquiringType, input?.required) })));
+    const AcquiringField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0412\u0438\u0434 \u044D\u043A\u0432\u0430\u0439\u0440\u0438\u043D\u0433\u0430", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u044D\u043A\u0432\u0430\u0439\u0440\u0438\u043D\u0433", options: ACQUIRING_TYPES, ...field(input?.name ?? '') })));
     const isAcquiringTrade = (key = '') => Boolean(key === 'trade' || key === 'all');
 
     const isFilled = (_) => _ !== null && _ !== undefined;
@@ -1849,7 +1701,7 @@
         return (jsx(SelectControl, { label: "\u041E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", options: (addressBranch || []).map(({ address = '' }) => ({
                 key: address,
                 text: address,
-            })), ...getValidation(field('addressBranch'), validatorObj.addressBranch, input?.required), isSearch: true }));
+            })), ...field(input?.name ?? ''), isSearch: true }));
     });
 
     const useNormalizedInput = (props, { normalize, format }) => {
@@ -1913,11 +1765,11 @@
     const MIN_CREDIT_AMOUNT = 1000;
     const MAX_CREDIT_AMOUNT = 1000000000;
     const ITEMS_CREDIT_AMOUNT = ['От 1 000 ₽', 'До 1 000 000 000 ₽'];
-    const AmountField = JSX(({ field }) => (jsx(InputRange, { title: "\u0421\u0443\u043C\u043C\u0430, \u20BD", items: ITEMS_CREDIT_AMOUNT, min: MIN_CREDIT_AMOUNT, max: MAX_CREDIT_AMOUNT, ...field('amount') })));
+    const AmountField = JSX(({ field, input }) => (jsx(InputRange, { title: "\u0421\u0443\u043C\u043C\u0430, \u20BD", items: ITEMS_CREDIT_AMOUNT, min: MIN_CREDIT_AMOUNT, max: MAX_CREDIT_AMOUNT, ...field(input?.name ?? '') })));
 
-    const AnnualRevenueField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0413\u043E\u0434\u043E\u0432\u0430\u044F \u0432\u044B\u0440\u0443\u0447\u043A\u0430, \u20BD", ...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required) })));
+    const AnnualRevenueField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0413\u043E\u0434\u043E\u0432\u0430\u044F \u0432\u044B\u0440\u0443\u0447\u043A\u0430, \u20BD", ...field(input?.name ?? '') })));
 
-    const BankEmpoleeField = JSX(({ field }) => (jsx(InputControl, { label: "\u0424\u0418\u041E \u0438\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u044C \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u0432\u0448\u0435\u0433\u043E \u0412\u0430\u0441 \u0441\u043E\u0442\u0440\u0443\u0434\u043D\u0438\u043A\u0430 \u0411\u0430\u043D\u043A\u0430", ...field('bankEmpolee') })));
+    const BankEmpoleeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E \u0438\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u044C \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u0432\u0448\u0435\u0433\u043E \u0412\u0430\u0441 \u0441\u043E\u0442\u0440\u0443\u0434\u043D\u0438\u043A\u0430 \u0411\u0430\u043D\u043A\u0430", ...field(input?.name ?? '') })));
 
     const useElementSpace = (ref, heightEl) => {
         const [spaceAbove, setSpaceAbove] = useState(false);
@@ -2210,11 +2062,11 @@
 
     const DatePickerControl = JSX(({ className, label, error, errors, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(DatePicker, { label: getRequiredLabel({ label, errors }), valid: Boolean(!error), ...rest }), renderErrorText(error)] })));
 
-    const BirthdayField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthday'), validatorObj.birthday, input?.required) })));
+    const BirthdayField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...field(input?.name ?? '') })));
 
-    const CollectionCountField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0438\u043D\u043A\u0430\u0441\u0441\u0430\u0446\u0438\u0438", isInteger: true, ...getValidation(field('collectionCount'), validatorObj.collectionCount, input?.required) })));
+    const CollectionCountField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0438\u043D\u043A\u0430\u0441\u0441\u0430\u0446\u0438\u0438", isInteger: true, ...field(input?.name ?? '') })));
 
-    const CommentField = JSX(({ field, input }) => (jsx(InputControl, { className: "col-span-2", ...getValidation(field('comment'), validatorObj.comment, input?.required), placeholder: "\u0412\u0430\u0448\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435", isTextarea: true })));
+    const CommentField = JSX(({ field, input }) => (jsx(InputControl, { className: "col-span-2", ...field(input?.name ?? ''), placeholder: "\u0412\u0430\u0448\u0435 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0435", isTextarea: true })));
 
     const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
         return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
@@ -2249,14 +2101,12 @@
     const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
     const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });
 
-    const FIELD_NAME$c = 'consentToReceiveMaterials';
-    const ConsentToReceiveMaterialsField = JSX(({ field, input }) => (jsx(Checkbox, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0435\u043D \u043D\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0438 \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432 \u043F\u043E \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0447\u0442\u0435", ...getValidation(field(FIELD_NAME$c), validatorObj[FIELD_NAME$c], input?.required) })));
+    const ConsentToReceiveMaterialsField = JSX(({ field, input }) => (jsx(Checkbox, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0435\u043D \u043D\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0438 \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432 \u043F\u043E \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0447\u0442\u0435", ...field(input?.name ?? '') })));
 
-    const DesiredMeetingDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0416\u0435\u043B\u0430\u0435\u043C\u0430\u044F \u0434\u0430\u0442\u0430 \u0432\u0441\u0442\u0440\u0435\u0447\u0438", ...getValidation(field('desiredMeetingDate'), validatorObj.desiredMeetingDate, input?.required) })));
+    const DesiredMeetingDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0416\u0435\u043B\u0430\u0435\u043C\u0430\u044F \u0434\u0430\u0442\u0430 \u0432\u0441\u0442\u0440\u0435\u0447\u0438", ...field(input?.name ?? '') })));
 
     const EmailField = JSX(({ field, input }) => {
-        const { required, ...rest } = input;
-        return (jsx(InputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", ...getValidation(field('email'), validatorObj.email, required), ...rest }));
+        return jsx(InputControl, { label: "\u042D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u0430\u044F \u043F\u043E\u0447\u0442\u0430", ...field(input?.name ?? ''), ...input });
     });
 
     const SERVICE_TYPES = [{ key: 'ULTRASERVICE', text: 'Ультра' }];
@@ -2269,9 +2119,9 @@
         { key: 'email', text: 'Электронное сообщение' },
     ];
 
-    const FeedbackMethodField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0421\u043F\u043E\u0441\u043E\u0431 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u043E\u0442\u0432\u0435\u0442\u0430", options: FEEDBACK_METHOD, ...getValidation(field('feedbackMethod'), validatorObj.feedbackMethod, input?.required) })));
+    const FeedbackMethodField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0421\u043F\u043E\u0441\u043E\u0431 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u043E\u0442\u0432\u0435\u0442\u0430", options: FEEDBACK_METHOD, ...field(input?.name ?? '') })));
 
-    const FullNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E", ...getValidation(field('fullName'), validatorObj.fullName, input?.required), ...input })));
+    const FullNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E", ...field(input?.name ?? ''), ...input })));
 
     function copy(source, target) {
         for (const [k, v] of source.entries()) {
@@ -2549,7 +2399,7 @@
                 qcHouse: '',
             });
         }, []);
-        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, fieldName), label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue?.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, fieldName), label: "\u0410\u0434\u0440\u0435\u0441", ...field(fieldName), value: fieldValue?.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
     const getAddressFromDaDataItem = (item) => ({
         apartment: item?.data?.flat,
@@ -2595,12 +2445,12 @@
             field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
             updateOrganizationFields(store, field, item);
         }, []);
-        return (jsx(InputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...getValidation(field('inn'), validatorObj.inn, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u0418\u041D\u041D", isInteger: true, maxLength: 12, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
     });
 
     const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
 
-    const IsClientField = JSX(({ field }) => (jsx(CheckboxWithError, { ...field('isClient'), text: '\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u043C \u0431\u0430\u043D\u043A\u0430 \u0410\u041E "\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A"' })));
+    const IsClientField = JSX(({ field, input }) => (jsx(CheckboxWithError, { ...field(input?.name ?? ''), text: '\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u043C \u0431\u0430\u043D\u043A\u0430 \u0410\u041E "\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A"' })));
 
     const OUT_SERVICE_BASE_URL = `${API_BASE_URI}/outservice`;
     const EMPTY_REGIONS$1 = [];
@@ -2613,30 +2463,24 @@
         const fieldRegion = field('region');
         const regionKey = fieldRegion?.value?.key;
         const { data: regions } = useAsyncData('outServiceRegions', getOutServiceRegions);
-        const localities = regions
-            ?.find((_) => _.code === regionKey)
-            ?.localities?.map((_) => ({ key: _, text: _ }));
+        const localities = useMemo(() => regions?.find((_) => _.code === regionKey)?.localities?.map((_) => ({ key: _, text: _ })), [regions, regionKey]);
         useEffect(() => {
             if (regionKey !== '') {
-                field?.('localities')?.onChange?.('');
+                field?.(input?.name ?? '')?.onChange?.('');
             }
-        }, [regionKey]);
-        return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u043E\u0440\u043E\u0434, \u0433\u0434\u0435 \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0441\u0435\u0440\u0432\u0438\u0441", options: localities, ...getValidation(field('localities'), validatorObj.localities, input?.required), isSearch: true }));
+        }, [regionKey, input?.name ?? '']);
+        return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u043E\u0440\u043E\u0434, \u0433\u0434\u0435 \u0434\u043E\u0441\u0442\u0443\u043F\u0435\u043D \u0441\u0435\u0440\u0432\u0438\u0441", options: localities, ...field(input?.name ?? ''), isSearch: true }));
     });
 
-    const FIELD_NAME$b = 'middleName';
-    const MiddleNameField = JSX(({ field, input }) => (jsx(InputControl, { 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, FIELD_NAME$b), ...getValidation(field(FIELD_NAME$b), validatorObj.middleName, input?.required), ...input })));
+    const MiddleNameField = JSX(({ field, input }) => (jsx(InputControl, { 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 NameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...getValidation(field('name'), validatorObj.name, input?.required), ...input })));
+    const NameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u043C\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), ...field(input?.name ?? ''), ...input })));
 
     const SlideCheckbox = JSX(({ value = false, text, type = 'checkbox', onChange }) => (jsxs("div", { role: type, "aria-checked": value, className: "flex justify-start items-center w-full cursor-pointer mb-s", onClick: () => onChange && onChange(!value), children: [jsx("div", { className: style('relative flex-shrink-0 duration-300 w-9 h-5 mr-s rounded-2xl', value ? 'bg-primary-main' : 'bg-main-divider'), children: jsx("div", { className: style('absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full', value ? 'left-1/2' : 'left-[5%]') }) }), text ? (jsx(Text, { size: "text-l", font: "font-light", color: "text-primary-text", children: text })) : null] })));
 
-    const OnlineCheckoutField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 \u043E\u043D\u043B\u0430\u0439\u043D-\u043A\u0430\u0441\u0441\u0443", ...field('onlineCheckout') })) : null);
+    const OnlineCheckoutField = JSX(({ field, input }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 \u043E\u043D\u043B\u0430\u0439\u043D-\u043A\u0430\u0441\u0441\u0443", ...field(input?.name ?? '') })) : null);
 
-    const PartnerCommentsField = JSX(({ field, input }) => {
-        const { required, ...rest } = input;
-        return (jsx(InputControl, { ...getValidation(field('partnerComments'), validatorObj.partnerComments, required), placeholder: "\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u0443\u044E\u0449\u0438\u0439 \u0432\u0430\u0441 \u0432\u043E\u043F\u0440\u043E\u0441", isTextarea: true, ...rest }));
-    });
+    const PartnerCommentsField = JSX(({ field, input }) => (jsx(InputControl, { ...field(input?.name ?? ''), placeholder: "\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u0443\u044E\u0449\u0438\u0439 \u0432\u0430\u0441 \u0432\u043E\u043F\u0440\u043E\u0441", isTextarea: true, ...input })));
 
     const isPlaceholder = (_) => _ === '_';
     const isDigit = (_) => /\d/.test(_);
@@ -2666,12 +2510,12 @@
 
     const PhoneField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'phone';
-        return (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...getValidation(field(fieldName), validatorObj.phone, input?.required), disabled: input?.filledByEsia && isEsiaAuthorize(field, fieldName), ...input }));
+        return (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...field(fieldName), disabled: input?.filledByEsia && isEsiaAuthorize(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);
 
-    const ProductField = JSX(({ field, source }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: arrayToOptions(source?.productList), ...withValidator(field('product'), validatorObj.product) })));
+    const ProductField = JSX(({ field, input, source }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: arrayToOptions(source?.productList), ...field(input?.name ?? '') })));
     const arrayToOptions = (array) => (array ?? []).map((_) => ({ key: _, value: _ }));
 
     const REGIONS_URL = `${API_BASE_URI}/regions`;
@@ -2688,7 +2532,7 @@
     const RegionField = JSX(({ field, input, params }) => {
         const url = getRegionUrl(params?.typeForm);
         const regions = useRegions(url);
-        return (jsx(SelectControl, { label: "\u0424\u0438\u043B\u0438\u0430\u043B", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B", isSearch: true, options: useMemo(() => regions?.map(({ code = '', name = '' }) => ({ key: code, text: name })), [regions]), ...getValidation(field('region'), validatorObj.region, input?.required) }));
+        return (jsx(SelectControl, { label: "\u0424\u0438\u043B\u0438\u0430\u043B", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B", isSearch: true, options: useMemo(() => regions?.map(({ code = '', name = '' }) => ({ key: code, text: name })), [regions]), ...field(input?.name ?? '') }));
     });
 
     const RegionPremiumField = JSX(({ field, input }) => {
@@ -2697,9 +2541,191 @@
             key: region,
             text: region,
         })), [branchByRegions]);
-        return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", options: regions, ...getValidation(field('region'), validatorObj.region, input?.required) }));
+        return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", options: regions, ...field(input?.name ?? '') }));
     });
 
+    const withValidator = (props, validator) => {
+        const { value, isDirty } = props;
+        const errors = isDirty ? validator(value) : [];
+        return {
+            ...props,
+            errors,
+            error: errors[0],
+        };
+    };
+
+    const required = validator((_) => _ !== null && _ !== undefined && _ !== '');
+
+    const ERROR_MESSAGE = 'Некорректно заполненное поле';
+    const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
+    const MIN_AGE = 23;
+    const MAX_AGE = 75;
+    const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+    const defaultValidator = (errorMsg) => required(errorMsg ?? ERROR_MESSAGE);
+    const defaultSelectValidator = (errorMsg) => validator((_) => _?.key && _?.key !== '')(errorMsg ?? ERROR_MESSAGE);
+    const jobNumberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 0 && _.length <= 2)(errorMsg ?? ERROR_MESSAGE);
+    const nameValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length > 1 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
+    const lengthStringValidator = (inputLength, errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 1 && _.length <= inputLength)(errorMsg ?? ERROR_MESSAGE);
+    const serieValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 4)(errorMsg);
+    const numberValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);
+    const innValidator = (errorMsg) => validator((_) => typeof _ === 'string' && (_.length === 10 || _.length === 12))(errorMsg);
+    const phoneValidate = (email) => /^(\+7)?[\s-]?\(?[0-9]{3}\)?[\s-]?[0-9]{3}[\s-]?[0-9]{2}[\s-]?[0-9]{2}$/.test(email);
+    const phoneValidator = (errorMsg) => validator(phoneValidate)(errorMsg);
+    const agreementValidator = validator((_) => typeof _ === 'boolean' && _)('Согласие обязательно');
+    const snilsValidate = (snils) => {
+        const snl = String(snils).replace(/[^0-9]+/g, '');
+        if (snl.length === 11) {
+            let checksum = 0;
+            for (let i = 0; i < 9; i++) {
+                checksum += parseInt(snl.charAt(i)) * (9 - i);
+            }
+            if (checksum > 101) {
+                checksum = checksum % 101;
+            }
+            if (checksum === 100 || checksum === 101) {
+                checksum = 0;
+            }
+            return checksum === parseInt(snl.substr(9));
+        }
+        return false;
+    };
+    const snilsValidator = (errorMsg) => validator(snilsValidate)(errorMsg);
+    const emailValidate = (email) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test(email);
+    const emailValidator = (errorMsg) => validator((_) => emailValidate(_))(errorMsg);
+    const addressDaDataValidate = (address) => Boolean(address.region && address.city && address.house);
+    const addressDaDataValidator = () => validator(addressDaDataValidate)(ADDRESS_ERROR_MESSAGE);
+    const addressOrganizationValidator = () => validator((address) => Boolean(address.fiasCode && address.city && address.house))(ADDRESS_ERROR_MESSAGE);
+    const codeWordValidator = (errorMsg) => validator((_) => typeof _ === 'string' && _.length >= 3 && _.length <= 21 && isCyrillic(_))(errorMsg ?? ERROR_MESSAGE);
+    const cyrillicPattern = /^[\u0400-\u04FF\d\s]+$/u;
+    const isCyrillic = (_ = '') => cyrillicPattern.test(_);
+    const limitedBirthdayValidate = (date) => {
+        const today = new Date();
+        const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
+        const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
+        if (!date || date > minDate || date < maxDate) {
+            return false;
+        }
+        return true;
+    };
+    const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+
+    const validatorConsentsObj = {
+        processPersonalDataFlg: agreementValidator,
+        consentProviderFlg: agreementValidator,
+        consentInformFlg: agreementValidator,
+        consentPfrFlg: agreementValidator,
+        consentOthersFlg: agreementValidator,
+    };
+    const validatorCreditCardObj = {
+        addressCourier: addressDaDataValidator(),
+        paymentSystem: defaultValidator('Укажите тип платежной системы'),
+        currency: defaultValidator('Укажите валюту'),
+        cardCategory: defaultValidator('Укажите категорию карты'),
+        codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
+        confirmationIncome: defaultSelectValidator(),
+        methodObtain: defaultValidator(),
+        deliveryDate: defaultValidator('Укажите дату доставки'),
+    };
+    const validatorRetailObj = {
+        organization: defaultSelectValidator('Выберите тип организации'),
+        organizationAddress: addressOrganizationValidator(),
+        organizationPhone: phoneValidator('Укажите номер телефона'),
+        organizationName: defaultValidator('Укажите наименование организации'),
+        legalForm: defaultValidator('Укажите ОПФ'),
+        generalSeniority: jobNumberValidator('Укажите количество лет стажа'),
+        lastJobExperience: jobNumberValidator('Укажите стаж на последнем месте работы'),
+        experience5Years: jobNumberValidator('Укажите общий стаж за последние 5 лет'),
+        jobsNumber: jobNumberValidator('Укажите количество мест работы за последние 5 лет'),
+        beginDate: defaultValidator('Укажите дату заключения трудового договора'),
+        addressFact: addressDaDataValidator(),
+        addressRegistration: addressDaDataValidator(),
+        addressRetail: defaultSelectValidator('Выберите адрес банка'),
+        addressMatch: defaultValidator(),
+        sex: defaultValidator('Укажите свой пол'),
+        limitedBirthday: limitedBirthdayValidator(),
+        birthPlace: defaultValidator('Укажите место рождения'),
+        education: defaultSelectValidator('Выберите ваше образование'),
+        housing: defaultSelectValidator('Выберите тип жилья'),
+        amountWorkers: defaultSelectValidator('Выберите информацию о количестве сотрудников'),
+        employment: defaultSelectValidator('Выберите информацию о трудоустройстве'),
+        employerActivities: defaultSelectValidator('Выберите вид деятельности организации'),
+        employerOrganization: defaultSelectValidator('Выберите вид организации'),
+        positionOrganization: defaultSelectValidator('Выберите вашу должность'),
+        familyStatus: defaultSelectValidator('Выберите семейное положение'),
+        familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
+        children: lengthStringValidator(2, 'Укажите количество детей'),
+        dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
+        totalIncome: lengthStringValidator(19, 'Укажите среднемесячный доход от основной зарплаты'),
+        expenses: lengthStringValidator(10, 'Укажите сумму обязательных выплат'),
+        snils: snilsValidator('Некорректный номер СНИЛС'),
+        conscription: defaultValidator(),
+        armyIdFlg: agreementValidator,
+        dulSerie: serieValidator('Укажите серию паспорта'),
+        dulNumber: numberValidator('Укажите номер паспорта'),
+        dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+        dulSubdivisionCode: numberValidator('Укажите код подразделения'),
+        dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
+        participantDateRegistration: defaultValidator('Укажите дату регистрации'),
+        retirementIncome: defaultValidator(),
+        otherIncome: defaultValidator(),
+        wages: defaultValidator(),
+        mandatoryPayments: defaultValidator(),
+        disablePeopleFlg: defaultValidator(),
+        bankruptcyFlg: defaultValidator(),
+        shareholderFlg: defaultValidator(),
+        legalEntityName: defaultValidator(),
+        bankEmployeeCode: defaultValidator(),
+        partInBusiness: defaultValidator(),
+        regionRetail: defaultSelectValidator('Выберите регион'),
+    };
+    const validatorObj = {
+        fullName: defaultValidator(),
+        addressBranch: defaultSelectValidator(),
+        desiredMeetingDate: defaultValidator(),
+        product: defaultValidator(),
+        localities: defaultValidator(),
+        partnerComments: defaultValidator(),
+        collectionCount: defaultValidator(),
+        acquiringType: defaultSelectValidator(),
+        serviceType: defaultSelectValidator(),
+        annualRevenue: defaultValidator(),
+        feedbackMethod: defaultSelectValidator(),
+        serviceDirection: defaultSelectValidator(),
+        secondaryPhone: phoneValidator('Укажите номер телефона'),
+        region: defaultSelectValidator(),
+        surname: nameValidator('Укажите свою фамилию'),
+        name: nameValidator('Укажите своё имя'),
+        middleName: nameValidator('Укажите своё отчество'),
+        birthday: defaultValidator('Укажите дату рождения'),
+        phone: phoneValidator('Укажите номер телефона'),
+        email: emailValidator('Укажите электронную почту'),
+        inn: innValidator('Укажите ИНН'),
+        comment: defaultValidator(),
+        typeForm: defaultValidator(),
+        consentToReceiveMaterials: agreementValidator,
+        consentDataProcessing: agreementValidator,
+        ...validatorConsentsObj,
+        ...validatorRetailObj,
+        ...validatorCreditCardObj,
+    };
+    const getFormValidator = (fieldDefs) => {
+        const requiredFields = fieldDefs.filter((_) => Boolean(_?.required && _?.name));
+        const hasConditions = requiredFields.some((_) => _.condition?.values);
+        const requiredFieldValidatorsMap = Object.fromEntries(requiredFields.filter(byNonEmptyValidator).map(({ name }) => [name, validatorObj[name ?? '']]));
+        return (formState) => hasConditions
+            ? Object.fromEntries(requiredFields
+                .filter(byNonEmptyValidator)
+                .filter(byCondition(formState))
+                .map(({ name }) => [name, validatorObj[name ?? '']]))
+            : requiredFieldValidatorsMap;
+    };
+    const byNonEmptyValidator = ({ name }) => Boolean(validatorObj[name ?? '']);
+    const byCondition = (formState) => (fieldDef) => !fieldDef?.condition ||
+        fieldDef.condition.values.find((_) => {
+            const dependencyValue = formState?.[fieldDef?.condition?.name ?? ''];
+            return _ === (dependencyValue?.key ?? dependencyValue);
+        });
+
     const SecondaryPhoneField = JSX(({ field }) => {
         const fieldPhone = field('secondaryPhone');
         return (jsx(InputPhoneControl, { label: "\u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0442\u0435\u043B\u0435\u0444\u043E\u043D", ...(!fieldPhone.value || fieldPhone.value === '+7 ('
@@ -2707,23 +2733,23 @@
                 : withValidator(fieldPhone, validatorObj.secondaryPhone)) }));
     });
 
-    const ServiceDirectionField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u041D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435", options: SERVICE_DIRECTIONS, ...getValidation(field('serviceDirection'), validatorObj.serviceDirection, input?.required) })));
+    const ServiceDirectionField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u041D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435", options: SERVICE_DIRECTIONS, ...field(input?.name ?? '') })));
 
-    const FIELD_NAME$a = 'surname';
-    const SurnameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$a), ...getValidation(field('surname'), validatorObj.surname, input?.required), ...input })));
+    const FIELD_NAME$2 = 'surname';
+    const SurnameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", maxLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$2), ...field(input?.name ?? ''), ...input })));
 
     const MIN_CREDIT_TERM = 1;
     const MAX_CREDIT_TERM = 180;
     const ITEMS_CREDIT_TERM = ['От 1 мес', 'До 15 лет'];
     const TermField = JSX(({ field }) => (jsx(InputRange, { title: "\u0421\u0440\u043E\u043A, \u043C\u0435\u0441\u044F\u0446\u0435\u0432", items: ITEMS_CREDIT_TERM, min: MIN_CREDIT_TERM, max: MAX_CREDIT_TERM, ...field('term') })));
 
-    const UltraPremiumField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0422\u0438\u043F \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u044F", options: SERVICE_TYPES, ...getValidation(field('serviceType'), validatorObj.serviceType, input?.required) })));
+    const UltraPremiumField = JSX(({ field, input }) => (jsx(SelectControl, { label: "\u0422\u0438\u043F \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u044F", options: SERVICE_TYPES, ...field(input?.name ?? '') })));
 
     const orientationStyleMap = {
         horizontal: '@lg:flex-row',
         vertical: '',
     };
-    const RadioButtonGroup = JSX(({ label, items, value, className, onChange: onChangeCheckedItem, disabled = false, orientation = 'horizontal', }) => (jsxs("div", { className: "grid gap-xs whitespace-nowrap", children: [label ? (jsx("div", { role: "radiogroup", "aria-label": label, children: jsx(Text, { color: "text-secondary-text", font: "font-light", children: label }) })) : null, jsx("div", { className: style('flex flex-col gap-s', orientationStyleMap[orientation], className), role: "radiogroup", "aria-label": "\u0413\u0440\u0443\u043F\u043F\u0430 \u043A\u043D\u043E\u043F\u043E\u043A", children: items?.map(({ id, text }) => (jsx(Checkbox, { isRadio: true, text: text, value: value === id, onChange: () => onChangeCheckedItem && onChangeCheckedItem(id), disabled: disabled }, String(id)))) })] })));
+    const RadioButtonGroup = JSX(({ label, items, value, className, disabled = false, orientation = 'horizontal', onChange: onChangeCheckedItem, }) => (jsxs("div", { className: "grid gap-xs whitespace-nowrap", children: [label ? (jsx("div", { role: "radiogroup", "aria-label": label, children: jsx(Text, { color: "text-secondary-text", font: "font-light", children: label }) })) : null, jsx("div", { className: style('flex flex-col gap-s', orientationStyleMap[orientation], className), role: "radiogroup", "aria-label": "\u0413\u0440\u0443\u043F\u043F\u0430 \u043A\u043D\u043E\u043F\u043E\u043A", children: items?.map(({ id, text }) => (jsx(Checkbox, { isRadio: true, text: text, value: value === id, onChange: () => onChangeCheckedItem?.(id), disabled: disabled }, String(id)))) })] })));
 
     const VED_TYPES = [
         { id: 'currencyControl', text: 'Валютный контроль' },
@@ -2731,15 +2757,14 @@
         { id: 'conversionTransactions', text: 'Конверсионные операции' },
         { id: 'otherIssues', text: 'Иные вопросы ВЭД' },
     ];
-    const VedField = JSX(({ field }) => {
-        const { value, onChange } = field('vedTypes');
-        useEffect(() => {
-            if (value !== 'currencyControl') {
-                field?.('inn')?.onChange?.('');
-                field?.('region')?.onChange?.('');
+    const VedField = JSX(({ field, input }) => {
+        const handleChange = useCallback((_) => {
+            if (_ !== 'currencyControl') {
+                field('inn').onChange?.('');
+                field('region').onChange?.('');
             }
-        }, [value]);
-        return (jsx("div", { className: "py-m gap-m grid @xl:flex @xl:items-center", children: jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: VED_TYPES, value: value, onChange: (_) => onChange && onChange(_) }) }));
+        }, []);
+        return (jsx("div", { className: "py-m gap-m grid @xl:flex @xl:items-center", children: jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: VED_TYPES, ...field(input?.name ?? '', { onChange: handleChange }) }) }));
     });
 
     function isRenderField({ input, field, }) {
@@ -2751,42 +2776,42 @@
     const PRODUCT_REF = {
         $ref: '/wcms-resources/outservice-productlist.json',
     };
-    const InputsMap = {
-        fullName: (props) => jsx(FullNameField, { ...props }),
-        addressBranch: (props) => jsx(AddressBranchField, { ...props }),
-        desiredMeetingDate: (props) => jsx(DesiredMeetingDateField, { ...props }),
+    const InputsMap$1 = {
+        fullName: FullNameField,
+        addressBranch: AddressBranchField,
+        desiredMeetingDate: DesiredMeetingDateField,
         product: (props) => jsx(ProductField, { ...props, source: PRODUCT_REF }),
-        localities: (props) => jsx(LocalitiesField, { ...props }),
-        isClient: (props) => jsx(IsClientField, { ...props }),
-        partnerComments: (props) => jsx(PartnerCommentsField, { ...props }),
-        collectionCount: (props) => jsx(CollectionCountField, { ...props }),
-        acquiringType: (props) => jsx(AcquiringField, { ...props }),
-        onlineCheckout: (props) => jsx(OnlineCheckoutField, { ...props }),
-        posTerminal: (props) => jsx(PosTerminalField, { ...props }),
-        serviceType: (props) => jsx(UltraPremiumField, { ...props }),
-        term: (props) => jsx(TermField, { ...props }),
-        amount: (props) => jsx(AmountField, { ...props }),
-        annualRevenue: (props) => jsx(AnnualRevenueField, { ...props }),
-        vedTypes: (props) => jsx(VedField, { ...props }),
-        feedbackMethod: (props) => jsx(FeedbackMethodField, { ...props }),
-        serviceDirection: (props) => jsx(ServiceDirectionField, { ...props }),
-        bankEmpolee: (props) => jsx(BankEmpoleeField, { ...props }),
-        secondaryPhone: (props) => jsx(SecondaryPhoneField, { ...props }),
+        localities: LocalitiesField,
+        isClient: IsClientField,
+        partnerComments: PartnerCommentsField,
+        collectionCount: CollectionCountField,
+        acquiringType: AcquiringField,
+        onlineCheckout: OnlineCheckoutField,
+        posTerminal: PosTerminalField,
+        serviceType: UltraPremiumField,
+        term: TermField,
+        amount: AmountField,
+        annualRevenue: AnnualRevenueField,
+        vedTypes: VedField,
+        feedbackMethod: FeedbackMethodField,
+        serviceDirection: ServiceDirectionField,
+        bankEmpolee: BankEmpoleeField,
+        secondaryPhone: SecondaryPhoneField,
         applicationDate: (props) => (jsx(InputControl, { label: "\u0414\u0430\u0442\u0430 \u0438 \u0432\u0440\u0435\u043C\u044F \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u044F \u0432 \u0411\u0430\u043D\u043A", ...props })),
         region: (props) => getPremium(props?.params?.typeForm) ? (jsx(RegionPremiumField, { ...props })) : (jsx(RegionField, { ...props })),
-        consentToReceiveMaterials: (props) => (jsx(ConsentToReceiveMaterialsField, { ...props })),
-        surname: (props) => jsx(SurnameField, { ...props }),
-        name: (props) => jsx(NameField, { ...props }),
-        middleName: (props) => jsx(MiddleNameField, { ...props }),
-        birthday: (props) => jsx(BirthdayField, { ...props }),
-        phone: (props) => jsx(PhoneField, { ...props }),
-        email: (props) => jsx(EmailField, { ...props }),
-        inn: (props) => jsx(InnField, { ...props }),
-        comment: (props) => jsx(CommentField, { ...props }),
+        consentToReceiveMaterials: ConsentToReceiveMaterialsField,
+        surname: SurnameField,
+        name: NameField,
+        middleName: MiddleNameField,
+        birthday: BirthdayField,
+        phone: PhoneField,
+        email: EmailField,
+        inn: InnField,
+        comment: CommentField,
     };
     const getField = (field, params, externalInputs = {}) => (input, i) => {
         const resultInputsMap = {
-            ...InputsMap,
+            ...InputsMap$1,
             ...externalInputs,
         };
         return isRenderField({ input, field }) ? (jsx("div", { children: resultInputsMap[input?.name || '']?.({ field, input, params }) }, String(i))) : null;
@@ -2836,21 +2861,16 @@
 
     const Dialog = JSX(({ className, head, children, onClose, onClick }) => (jsxs("div", { className: style('relative bg-white pt-0 p-lg', className), role: "dialog", onClick: onClick, children: [jsxs("div", { className: "sticky py-xl top-0 bg-white z-10", children: [jsx(CloseButton, { className: "absolute top-0 right-0", onClose: onClose }), jsx("div", { className: "container", children: head })] }), jsx("div", { className: "container pb-6xl", children: children })] })));
 
-    const ResponseTypeDialog = JSX(({ responseType, typeForm, onClose }) => {
-        const responseOK = responseType === 'OK';
-        const statusIcon = responseOK ? 'ResponseOKIcon' : 'ResponseFailIcon';
+    const ResponseTypeDialog = JSX(({ ok, typeForm, onClose }) => {
+        const statusIcon = ok ? 'ResponseOKIcon' : 'ResponseFailIcon';
         const responseOKDescription = typeForm === 'ANTIFRAUD'
             ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
   можете самостоятельно позвонить по номеру контакт-центра +78001000100. Будьте внимательны, работники Банка
    не звонят с использованием мессенджеров.`
             : 'Совсем скоро мы с вами свяжемся';
-        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md space-x-m", children: [jsx(Img, { image: { icon: statusIcon, iconVersion: 'normal' }, width: "136", height: "136" }), jsx(Headline, { className: "w-full", title: responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку', description: responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее', headlineVersion: "XS", isEmbedded: true }), jsx(Button, { type: "button", onClick: onClose, children: "\u0425\u043E\u0440\u043E\u0448\u043E" })] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md space-x-m", children: [jsx(Img, { image: { icon: statusIcon, iconVersion: 'normal' }, width: "136", height: "136" }), jsx(Headline, { className: "w-full", title: ok ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку', description: ok ? responseOKDescription : 'Пожалуйста, повторите позднее', headlineVersion: "XS", isEmbedded: true }), jsx(Button, { type: "button", onClick: onClose, children: "\u0425\u043E\u0440\u043E\u0448\u043E" })] }) }));
     });
 
-    const objectValidator = (validatorsMap) => (o) => (o &&
-        Object.entries(validatorsMap).flatMap(([key, validator]) => validator(o[key]))) ||
-        [];
-
     const getPartnerComments = (data) => {
         const { acquiringType, onlineCheckout = false, posTerminal = false, term, amount, annualRevenue, } = data;
         if (acquiringType) {
@@ -2928,46 +2948,28 @@
     const renderContacts = () => (jsxs("div", { className: "space-y-m", children: [jsx(Heading, { headingType: "h6", title: "\u0418\u043B\u0438 \u0441\u0432\u044F\u0436\u0438\u0442\u0435\u0441\u044C \u0441 \u043D\u0430\u043C\u0438 \u0443\u0434\u043E\u0431\u043D\u044B\u043C \u0441\u043F\u043E\u0441\u043E\u0431\u043E\u043C", className: "@xl:text-center" }), jsxs("div", { className: "flex sm:justify-center gap-xl", children: [jsxs("a", { className: "flex gap-s items-center text-primary-text no-underline", href: `tel:8 (800) 200-78-70`, "aria-label": "\u0442\u0435\u043B\u0435\u0444\u043E\u043D 8 (800) 200-78-70", children: [jsx(Img, { image: { icon: 'PhoneIcon' }, width: "24", height: "24" }), jsx("span", { children: "8 (800) 200-78-70" })] }), jsxs("a", { className: "flex gap-s items-center text-primary-text no-underline", "aria-label": "\u043F\u043E\u0447\u0442\u0430 ved@rshb.ru", href: `mailto:ved@rshb.ru`, children: [jsx(Img, { image: { icon: 'MailIcon' }, width: "24", height: "24" }), jsx("span", { children: "ved@rshb.ru" })] })] })] }));
 
     const API = LeadServiceAPI();
-    const ApplicationForm = JSX(
-    // eslint-disable-next-line max-lines-per-function
-    ({ className, title, typeForm = '', sections = [], button, link, endpoint, additionalParams, isContacts, data, ...rest }) => {
-        const inputs = (sections?.flatMap((_) => _?.inputs) || []);
-        const initialFormState = getInitialFormState$3(inputs, typeForm);
-        const [responseType, setResponseType] = useState('');
+    const ApplicationForm = JSX(({ className, title, typeForm = '', sections = [], button, link, endpoint, additionalParams, isContacts, data, ...rest }) => {
+        const inputs = useMemo(() => (sections?.flatMap((_) => _?.inputs) || []), [sections]);
+        const initialFormState = useMemo(() => getInitialFormState$3(inputs, typeForm), [inputs, typeForm]);
+        const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
         const responseTypeDialog = useDialog(ResponseTypeDialog);
+        const aspects = useAspects();
         const handleSubmit = useCallback(async (formData, ev) => {
-            const inputsFiltered = getFilteredInputs(inputs, formData);
-            const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
-            if (!isValidationSuccess(feedbackValidator(formData))) {
-                return console.warn('validation fail');
-            }
             const formatData = getFormatData({ ...formData, ...additionalParams });
-            const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
-            setResponseType(status);
-            if (status) {
-                responseTypeDialog.open({ typeForm, responseType: status });
-            }
-            if (status === 'OK' && data) {
-                const aspects = useAspects();
+            const ok = Boolean(await API.send(formatData, endpoint === 'lead'));
+            responseTypeDialog.open({ ok, typeForm });
+            if (ok) {
                 handleAspects({ aspectsAttributes: data, aspects, ev });
             }
-            return status;
         }, [typeForm]);
-        const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
+        const [, { field, onSubmit }] = useForm(initialFormState, {
+            resetOnSubmit: true,
+            formValidator,
+            onSubmit: handleSubmit,
+        });
         const fieldName = getConsentDataProcessing(inputs)?.name;
-        useEffect(() => {
-            if (responseType === 'OK') {
-                setResponseType('');
-                reset();
-            }
-        }, [responseType]);
         return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [jsxs("form", { onSubmit: onSubmit, children: [sections.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), (_?.inputs || [])?.map(getField(field, { typeForm }))] }, `section-${i}`))), renderAgreementSubmit(fieldName ? field('consentDataProcessing') : undefined, link, button)] }), isContacts ? renderContacts() : null] }));
     });
-    const getFilteredInputs = (inputs, data) => inputs.filter((input) => !input?.condition ||
-        input?.condition.values.find((_) => {
-            const dataValue = data?.[input?.condition?.name ?? ''];
-            return _ === (dataValue?.key ?? dataValue);
-        }));
 
     const applicationFormData = [
         {
@@ -3039,11 +3041,11 @@
                 qcHouse: '',
             });
         }, []);
-        return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", disabled: value, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue?.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u0410\u0434\u0440\u0435\u0441", disabled: value, ...field(fieldName), value: fieldValue?.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
 
     const AddressMatchField = JSX(({ field, input }) => {
-        return (jsx(CheckboxWithError, { text: "\u0410\u0434\u0440\u0435\u0441 \u0444\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043C\u0435\u0441\u0442\u0430 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0435\u0442 \u0441 \u0430\u0434\u0440\u0435\u0441\u043E\u043C \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438", ...getValidation(field('addressMatch'), validatorObj.addressMatch, input?.required) }));
+        return (jsx(CheckboxWithError, { text: "\u0410\u0434\u0440\u0435\u0441 \u0444\u0430\u043A\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043C\u0435\u0441\u0442\u0430 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0435\u0442 \u0441 \u0430\u0434\u0440\u0435\u0441\u043E\u043C \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438", ...field(input?.name ?? '') }));
     });
 
     const MapMarkerClusterIcon = '/icons/MapMarkerClusterIcon.svg';
@@ -3476,7 +3478,7 @@
 
     const ICONS$1 = ['ArrowDownIcon', 'ArrowUpIcon'];
     const labels = ['Подробнее', 'Скрыть'];
-    const renderFoldButton$3 = ({ isUnfolded, onToggle }) => (jsxs("button", { className: "w-full py-2xl cursor-pointer text-primary-main flex items-center border-b border-solid border-main-divider", onClick: onToggle, type: "button", children: [jsx("div", { className: "pr-m", children: labels[Number(isUnfolded)] }), jsx(Icon, { className: "text-primary-text", name: ICONS$1[Number(isUnfolded)], width: "16", height: "16" })] }));
+    const renderFoldButton$2 = ({ isUnfolded, onToggle }) => (jsxs("button", { className: "w-full py-2xl cursor-pointer text-primary-main flex items-center border-b border-solid border-main-divider", onClick: onToggle, type: "button", children: [jsx("div", { className: "pr-m", children: labels[Number(isUnfolded)] }), jsx(Icon, { className: "text-primary-text", name: ICONS$1[Number(isUnfolded)], width: "16", height: "16" })] }));
 
     const renderWorkSchedule = (workSchedule) => {
         const workScheduleWeek = getWorkScheduleWeek(workSchedule);
@@ -3525,7 +3527,7 @@
                             }) }));
                     }, 
                     //** TODO: remove styles with refactoring  DefaultFoldButton*/
-                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$3({ isUnfolded, onToggle }) })] }, String(i)));
+                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$2({ isUnfolded, onToggle }) })] }, String(i)));
     };
     const renderCardContent$1 = ({ phone, fax, phoneBusiness, phoneNatural, phoneCallCentre, phoneCurrencyControl, workSchedule, exchangeRate, }) => {
         const workScheduleWeek = getWorkScheduleWeek(workSchedule);
@@ -3639,14 +3641,14 @@
         const [offices, setOffices] = useState([]);
         const { data } = useLeadFormData('REGION_RF');
         const regionValue = field('regionRetail')?.value || {};
-        const fieldBranch = field('addressRetail');
+        const addressField = field(input?.name ?? '');
         useEffect(() => {
             (async () => {
                 const officesList = await fetchRegionOffices(regionValue?.key ?? '');
                 setOffices(officesList);
             })();
             if (regionValue?.key) {
-                field?.('addressRetail')?.onChange?.('');
+                addressField.onChange?.('');
             }
         }, [regionValue.key]);
         const { points } = useOfficesAtmsMapData({
@@ -3654,21 +3656,20 @@
             filtrationState: {},
             getBalloon: getOfficePoint,
         });
-        const isRegionSelected = Boolean(regionValue?.key);
         return (jsxs("div", { children: [jsx(SelectControl, { label: "\u0410\u0434\u0440\u0435\u0441 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", options: offices.map(({ id, address = '' }) => ({
                         key: id?.toString() || '',
                         text: address,
-                    })), ...getValidation(field('addressRetail'), validatorObj.addressRetail, input?.required && isRegionSelected), isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full", selectedAddress: fieldBranch?.value?.text }) }) })] }));
+                    })), ...addressField, isSearch: true }), jsx("div", { className: "h-[600px]", children: jsx(ClientOnly, { children: jsx(YandexMap, { points: points, isLoad: !data, className: "h-full", selectedAddress: addressField?.value?.text }) }) })] }));
     });
 
-    const SelectField = UniBlock(({ field, source, fieldName, input, placeholder = 'Выберите из списка', 
+    const SelectField = UniBlock(({ field, source, fieldName, placeholder = 'Выберите из списка', 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options, ...rest }) => {
         const leadOptions = source?.map((_) => ({
             key: _.key || '',
             text: _.value,
         })) || [];
-        return (jsx(SelectControl, { placeholder: placeholder, options: leadOptions, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), ...rest }));
+        return (jsx(SelectControl, { placeholder: placeholder, options: leadOptions, ...field(fieldName), ...rest }));
     });
 
     const AmountWorkersField = JSX(({ field, input }) => {
@@ -3682,16 +3683,16 @@
         return (jsx(SelectField, { field: field, source: store.amountWorkers ?? [], label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0438\u0445 \u0432 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", fieldName: "amountWorkers", input: input }));
     });
 
-    const ArmyIdFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041D\u0430\u043B\u0438\u0447\u0438\u0435 \u0432\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0438\u043B\u0435\u0442\u0430", ...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg, input?.required) })));
+    const ArmyIdFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041D\u0430\u043B\u0438\u0447\u0438\u0435 \u0432\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0438\u043B\u0435\u0442\u0430", ...field(input?.name ?? '') })));
 
-    const BankEmpoleeCodeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F \u0411\u0430\u043D\u043A\u0430", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434", isInteger: true, ...getValidation(field('bankEmployeeCode'), validatorObj.bankEmployeeCode, input?.required), ...input })));
+    const BankEmpoleeCodeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044F \u0411\u0430\u043D\u043A\u0430", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
-    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", ...getValidation(field('bankruptcyFlg'), validatorObj.bankruptcyFlg, input?.required) })));
+    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", ...getValidation(field('beginDate'), validatorObj.beginDate, input?.required), ...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 })));
 
-    const FIELD_NAME$9 = 'birthPlace';
-    const BirthPlaceField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041C\u0435\u0441\u0442\u043E \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthPlace'), validatorObj.birthPlace, input?.required), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$9) })));
+    const FIELD_NAME$1 = 'birthPlace';
+    const BirthPlaceField = JSX(({ field, input }) => (jsx(InputControl, { 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$1) })));
 
     const getCardTypes = async (paymentSystemTypeCd, creditProgramId) => {
         const data = await fetchRetailJSON('/dictionaryFiltered', 'POST', {
@@ -3743,9 +3744,9 @@
     });
     const isValidCardCategory = (cardTypes, selectedCardCategory) => cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);
 
-    const ChildrenField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('children'), validatorObj.children, input?.required), ...input })));
+    const ChildrenField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
-    const CodeWordField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434\u043E\u0432\u043E\u0435 \u0441\u043B\u043E\u0432\u043E", ...getValidation(field('codeWord'), validatorObj.codeWord, input?.required), ...input })));
+    const CodeWordField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u0434\u043E\u0432\u043E\u0435 \u0441\u043B\u043E\u0432\u043E", ...field(input?.name ?? ''), ...input })));
 
     const ConfirmationIncomeField = JSX(({ field, input }) => {
         const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
@@ -3808,7 +3809,7 @@
         return (jsxs("div", { className: className, children: [jsxs("div", { className: "flex flex-wrap gap-x-m", children: [jsx(Checkbox, { ...props }), docId ? (jsx(LinkButton, { className: "text-primary-main", onClick: openDocument, children: jsx(Text, { children: OPEN_DOC_BUTTON_TEXT }) })) : null] }), renderErrorText(error)] }));
     });
 
-    const ConsentField = JSX(({ field, input }) => input && input.name ? (jsx(CheckboxWithDoc, { text: CONSENTS[input.name]?.text, docId: CONSENTS[input.name]?.docId, ...getValidation(field(input.name), validatorObj[input.name], input?.required) })) : null);
+    const ConsentField = JSX(({ field, input }) => input && input.name ? (jsx(CheckboxWithDoc, { text: CONSENTS[input.name]?.text, docId: CONSENTS[input.name]?.docId, ...field(input.name) })) : null);
 
     const MONTHS_IN_YEAR$1 = 12;
     const MONTHLY_INTEREST_RATE = MONTHS_IN_YEAR$1 * 100;
@@ -4037,7 +4038,7 @@
     };
     const CalculatorCredit = UniBlock(({ className, title, calcSource, buttons, footnote, paramsViewSettings, defaultParams, onChange, ...rest }) => {
         const defaultParamsCals = getDefaultParamsMin(calcSource?.rateRows);
-        const [userInputParams, { field, isDirty }] = useForm({
+        const [userInputParams, { field }] = useForm({
             moneyValue: getMoneyDefaultValue(defaultParams, CREDIT_DEFAULT_SUM),
             monthsValue: getMonthsDefaultValue(defaultParams, DEFAULT_MONTHS),
             isAnnuity: Boolean(defaultParams?.isAnnuity),
@@ -4045,10 +4046,7 @@
             isSalaryClient: Boolean(defaultParams?.isEnableSalaryClient),
             isPensionClient: Boolean(defaultParams?.isEnablePensionClient),
             isStateEmployee: Boolean(defaultParams?.isEnableStateEmployee),
-        });
-        useEffect(() => {
-            isDirty && onChange?.(userInputParams);
-        }, [userInputParams, isDirty]);
+        }, { onChange });
         const calcParams = getCreditCalculatorParams(userInputParams, calcSource, paramsViewSettings);
         const paymentTypeElement = renderPaymentType({
             title: 'Тип платежа',
@@ -4093,12 +4091,12 @@
     });
     const renderCreditParamsForm$1 = (params, field) => (jsxs("div", { className: "flex flex-col gap-y-2xl", children: [params.isShowSalaryClient ? (jsx(Checkbox, { text: `Получаю зарплату на счёт\nв Россельхозбанке`, ...field('isSalaryClient'), value: params.isSalaryClient, className: "whitespace-pre-line sm:whitespace-normal" })) : null, params.isShowStateEmployee ? (jsx(Checkbox, { text: "\u0420\u0430\u0431\u043E\u0442\u0430\u044E \u0432 \u0431\u044E\u0434\u0436\u0435\u0442\u043D\u043E\u0439 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...field('isStateEmployee'), value: params.isStateEmployee })) : null, params.isShowPensionClient ? (jsx(Checkbox, { text: "\u041F\u043E\u043B\u0443\u0447\u0430\u044E \u043F\u0435\u043D\u0441\u0438\u044E \u043D\u0430 \u043A\u0430\u0440\u0442\u0443 \u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u0430", ...field('isPensionClient'), value: params.isPensionClient })) : null, params.isShowInsurance ? (jsx(Checkbox, { text: "\u041A\u043E\u043C\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F \u0441\u0442\u0440\u0430\u0445\u043E\u0432\u0430\u044F \u0437\u0430\u0449\u0438\u0442\u0430", ...field('isInsurance'), value: params.isInsurance })) : null] }));
 
-    const FIELD_NAME$8 = 'calculator';
+    const FIELD_NAME = 'calculator';
     const CreditCalcField = JSX(({ field, params }) => {
         const handleChange = useCallback((_) => {
-            field(FIELD_NAME$8).onChange?.(_);
+            field(FIELD_NAME).onChange?.(_);
         }, []);
-        return (jsx(CalculatorCredit, { ...params?.calcData, padding: "p-0", defaultParams: defaultValueAdapter(field(FIELD_NAME$8).value), onChange: handleChange }));
+        return (jsx(CalculatorCredit, { ...params?.calcData, padding: "p-0", defaultParams: defaultValueAdapter(field(FIELD_NAME).value), onChange: handleChange }));
     });
     const PARAMS_MAP = {
         moneyValue: 'sum',
@@ -4123,44 +4121,36 @@
         return (jsx(SelectField, { field: field, source: creditInRshbCd, label: LABEL_TEXT, fieldName: "creditInRshbCd", input: input, disabled: !field?.('shareholderFlg')?.value }));
     });
 
-    const RadioButtonGroupControl = JSX(({ className, label, onChange, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), onChange: (_) => onChange && onChange(_), ...rest }), renderErrorText(error)] })));
+    const RadioButtonGroupControl = JSX(({ className, label, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), ...rest }), renderErrorText(error)] })));
 
-    const CurrencyField = JSX(({ field, input }) => {
-        const { value, onChange } = field('currency');
-        const currencyTypes = [{ id: '810', text: 'Рубли' }];
-        return (jsx(RadioButtonGroupControl, { label: "\u0412\u0430\u043B\u044E\u0442\u0430", orientation: "horizontal", items: currencyTypes, value: value, onChange: (_) => onChange?.(_), ...getValidation(field('currency'), validatorObj.currency, input?.required) }));
-    });
+    const CURRENCY_TYPES = [{ id: '810', text: 'Рубли' }];
+    const CurrencyField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { label: "\u0412\u0430\u043B\u044E\u0442\u0430", orientation: "horizontal", items: CURRENCY_TYPES, ...field(input?.name ?? '') })));
 
-    const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...getValidation(field('deliveryDate'), validatorObj.deliveryDate, input?.required) })));
+    const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? '') })));
 
-    const DependentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", isInteger: true, maxLength: 2, ...getValidation(field('dependents'), validatorObj.dependents, input?.required), ...input })));
+    const DependentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
-    const DisablePeopleFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u0438\u043D\u0432\u0430\u043B\u0438\u0434\u043E\u043C", ...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg, input?.required) })));
+    const DisablePeopleFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u0438\u043D\u0432\u0430\u043B\u0438\u0434\u043E\u043C", ...field(input?.name ?? '') })));
 
-    const FIELD_NAME$7 = 'dulIssueDateField';
-    const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...getValidation(field(FIELD_NAME$7), validatorObj.dulIssueDateField, input?.required), disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$7) })));
+    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 FIELD_NAME$6 = 'dulIssuedBy';
     const DulIssuedByField = JSX(({ field, input }) => {
         const { value: dulSubdivisionCode, onChange: changeDulSubdivisionCode } = field('dulSubdivisionCode');
         const onDaDataChange = useCallback((item) => {
             changeDulSubdivisionCode?.(item?.data?.code?.replace('-', ''));
         }, []);
-        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$6), label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...input, ...getValidation(field(FIELD_NAME$6), validatorObj.dulIssuedBy, input?.required), onDaDataChange: onDaDataChange, daDataQueryPrefix: dulSubdivisionCode }));
+        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? ''), label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange, daDataQueryPrefix: dulSubdivisionCode }));
     });
 
-    const FIELD_NAME$5 = 'dulNumber';
-    const DulNumberField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$5), label: "\u041D\u043E\u043C\u0435\u0440 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", isInteger: true, maxLength: 6, ...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required) })));
+    const DulNumberField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), label: "\u041D\u043E\u043C\u0435\u0440 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", isInteger: true, maxLength: 6, ...field(input?.name ?? '') })));
 
-    const FIELD_NAME$4 = 'dulSerie';
-    const DulSerieField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$4), label: "\u0421\u0435\u0440\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", isInteger: true, maxLength: 4, ...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required) })));
+    const DulSerieField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), label: "\u0421\u0435\u0440\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", isInteger: true, maxLength: 4, ...field(input?.name ?? '') })));
 
-    const FIELD_NAME$3 = 'dulSubdivisionCode';
     const DulSubdivisionCodeField = JSX(({ field, input }) => {
         const onDaDataChange = useCallback((item) => {
             field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
         }, []);
-        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$3), label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", isInteger: true, maxLength: 6, ...input, ...getValidation(field(FIELD_NAME$3), validatorObj.dulSubdivisionCode, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? ''), label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", isInteger: true, maxLength: 6, ...input, ...field(input?.name ?? ''), onDaDataChange: onDaDataChange }));
     });
 
     const EducationField = JSX(({ field, input }) => {
@@ -4195,27 +4185,26 @@
         return (jsx(SelectField, { field: field, source: employment, label: "\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435", fieldName: "employment", input: input }));
     });
 
-    const ExpensesField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0440\u0430\u0441\u0445\u043E\u0434\u044B \u0432 \u043C\u0435\u0441\u044F\u0446", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('expenses'), validatorObj.expenses, input?.required), ...input })));
+    const ExpensesField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0440\u0430\u0441\u0445\u043E\u0434\u044B \u0432 \u043C\u0435\u0441\u044F\u0446", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
-    const FIELD_NAME$2 = 'experience5Years';
     const MAX_YEARS = 5;
     const MIN_YEARS = 0;
     const Experience5YearsField = JSX(({ field, input }) => {
-        const onChange = useCallback((value) => field(FIELD_NAME$2)?.onChange?.(String(clamp(Number(value), MIN_YEARS, MAX_YEARS))), []);
-        return (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436", placeholder: "\u0417\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u0435 5 \u043B\u0435\u0442", type: "number", ...getValidation(field(FIELD_NAME$2), validatorObj[FIELD_NAME$2], input?.required), ...input, onChange: onChange }));
+        const onChange = useCallback((value) => field(input?.name ?? '')?.onChange?.(String(clamp(Number(value), MIN_YEARS, MAX_YEARS))), []);
+        return (jsx(InputControl, { 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 }) => {
-        const { value, onChange } = field('familyMembers');
+    const FamilyMembersField = JSX(({ field, input }) => {
+        const { value, onChange } = field(input?.name ?? '');
         const familyStatusKey = field('familyStatus')?.value?.key;
         const adultsCount = familyStatusKey === 'MARRIED' ? 2 : 1;
         const childrenCount = Number(field('children')?.value);
         const dependentsCount = Number(field('dependents')?.value);
         const totalCount = adultsCount + childrenCount + dependentsCount;
         useEffect(() => {
-            field?.('familyMembers')?.onChange?.(totalCount);
+            onChange?.(totalCount);
         }, [familyStatusKey, childrenCount, dependentsCount]);
-        return (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0447\u043B\u0435\u043D\u043E\u0432 \u0441\u0435\u043C\u044C\u0438", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", disabled: true, value: value, onChange: (_) => onChange?.(_) }));
+        return (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0447\u043B\u0435\u043D\u043E\u0432 \u0441\u0435\u043C\u044C\u0438", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", type: "number", disabled: true, value: value, onChange: onChange }));
     });
 
     const FamilyStatusField = JSX(({ field, input }) => {
@@ -4223,7 +4212,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(InputControl, { 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", ...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required), ...input })));
+    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(InputControl, { 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');
@@ -4234,26 +4223,25 @@
 
     const InfoCardField = JSX(({ input }) => (jsx(InfoCard, { __html: input?.label })));
 
-    const JobsNumberField = JSX(({ field, input }) => (jsx(InputControl, { 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, ...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required), ...input })));
+    const JobsNumberField = JSX(({ field, input }) => (jsx(InputControl, { 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(InputControl, { 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, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...input })));
+    const LastJobExperienceField = JSX(({ field, input }) => (jsx(InputControl, { 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 LegalEntityNameField = JSX(({ field, input }) => {
-        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...input, ...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required), disabled: !field?.('shareholderFlg')?.value }));
+        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...input, ...field(input?.name ?? ''), disabled: !field?.('shareholderFlg')?.value }));
     });
 
-    const LegalFormField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u041F\u0424", placeholder: "\u041E\u041E\u041E, \u041F\u0410\u041E  \u0438 \u0434\u0440.", ...getValidation(field('legalForm'), validatorObj.legalForm, input?.required), ...input })));
+    const LegalFormField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u041F\u0424", placeholder: "\u041E\u041E\u041E, \u041F\u0410\u041E  \u0438 \u0434\u0440.", ...field(input?.name ?? ''), ...input })));
 
-    const FIELD_NAME$1 = 'limitedBirthday';
-    const LimitedBirthdayField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field(FIELD_NAME$1), validatorObj.limitedBirthday, input?.required), disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$1) })));
+    const LimitedBirthdayField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '') })));
 
-    const MandatoryPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required), ...input })));
+    const MandatoryPaymentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u044B\u0435 \u0432\u044B\u043F\u043B\u0430\u0442\u044B", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...field(input?.name ?? ''), ...input })));
 
     const METHODS_OF_OBTAIN = [
         { id: 'office', text: 'В отделении Банка' },
         { id: 'courier', text: 'Курьерская доставка' },
     ];
-    const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...getValidation(field('methodObtain'), validatorObj.methodObtain, input?.required) })));
+    const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...field(input?.name ?? '') })));
 
     const OrganizationField = JSX(({ field, input }) => {
         const { data } = useLeadFormData('ORGANIZATION_TYPE');
@@ -4272,19 +4260,18 @@
             field?.('inn')?.onChange?.(item.data?.inn);
             updateOrganizationFields(store, field, item);
         }, []);
-        return (jsx(InputControl, { 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, ...getValidation(field('organizationName'), validatorObj.organizationName, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { 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(InputControl, { 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, ...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required), ...input })));
+    const OtherIncomeField = JSX(({ field, input }) => (jsx(InputControl, { 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 })));
 
-    const ParticipantDateRegistrationField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043F\u043E \u043C\u0435\u0441\u0442\u0443 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430", ...getValidation(field('participantDateRegistration'), validatorObj.participantDateRegistration, input?.required) })));
+    const ParticipantDateRegistrationField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u043F\u043E \u043C\u0435\u0441\u0442\u0443 \u0436\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u0430", ...field(input?.name ?? '') })));
 
     const MAX_PART = 100;
     const MIN_PART = 0;
-    const FIELD_NAME = 'partInBusiness';
     const PartInBusinessField = JSX(({ field, input }) => {
-        const onChange = useCallback((value) => field(FIELD_NAME)?.onChange?.(String(clamp(Number(value), MIN_PART, MAX_PART))), []);
-        return (jsx(InputControl, { label: "\u0414\u043E\u043B\u044F \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0432 \u0431\u0438\u0437\u043D\u0435\u0441\u0435", placeholder: "\u0432 %", isInteger: true, maxLength: 3, ...getValidation(field(FIELD_NAME), validatorObj.partInBusiness, input?.required), ...input, onChange: onChange }));
+        const onChange = useCallback((value) => field(input?.name ?? '')?.onChange?.(String(clamp(Number(value), MIN_PART, MAX_PART))), []);
+        return (jsx(InputControl, { label: "\u0414\u043E\u043B\u044F \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0432 \u0431\u0438\u0437\u043D\u0435\u0441\u0435", placeholder: "\u0432 %", isInteger: true, maxLength: 3, ...field(input?.name ?? ''), ...input, onChange: onChange }));
     });
 
     const getPaymentSystems = async (creditProgramId) => {
@@ -4298,22 +4285,34 @@
         text: _.name,
     }));
 
+    function useAsyncEffect(effect, deps) {
+        useEffect(() => {
+            const free = effect();
+            return () => {
+                free.then((_) => {
+                    _ instanceof Function && _();
+                });
+            };
+        }, deps);
+    }
+
+    const optionKey = (option) => option?.key;
     const PaymentSystemField = JSX(({ field, input }) => {
-        const { value, onChange } = field('paymentSystem');
-        const [programId] = useLocalStorage('programId');
         const [paymentSystemOptions, setPaymentSystemOptions] = useState([]);
-        useEffect(() => {
+        const localStore = useLocalStore();
+        useAsyncEffect(async () => {
+            const { programId } = localStore;
             if (programId) {
-                (async () => {
-                    const fetchedPaymentSystems = await getPaymentSystems(programId);
-                    setPaymentSystemOptions(fetchedPaymentSystems || []);
-                })();
+                const fetchedPaymentSystems = await getPaymentSystems(programId);
+                setPaymentSystemOptions(fetchedPaymentSystems ?? []);
             }
         }, []);
-        const handleChange = useCallback((type) => onChange?.(paymentSystemOptions?.find((_) => _.key === type)), [paymentSystemOptions, onChange]);
-        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043B\u0430\u0442\u0435\u0436\u043D\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430", orientation: "horizontal", items: formatPaymentSystems(paymentSystemOptions), ...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required), value: value?.key, onChange: handleChange }));
+        const items = useMemo(() => paymentSystemOptions?.map((_) => ({ id: _.key, text: _.text })) ?? [], [paymentSystemOptions]);
+        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043B\u0430\u0442\u0435\u0436\u043D\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430", orientation: "horizontal", items: items, ...field(input?.name ?? '', {
+                format: optionKey,
+                parse: (key) => paymentSystemOptions?.find((_) => _.key === key),
+            }) }));
     });
-    const formatPaymentSystems = (paymentSystems) => paymentSystems?.map((_) => ({ id: _.key, text: _.text })) ?? [];
 
     const PositionOrganizationField = JSX(({ field, input }) => {
         const { data: positionOrganization } = useLeadFormData('POSITION');
@@ -4323,10 +4322,10 @@
     const RegionRetailField = JSX(({ field, input }) => {
         const { data: regions } = useLeadFormData('REGION_RF');
         const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
-        return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: formatRegions, ...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required) }));
+        return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: formatRegions, ...field(input?.name ?? '') }));
     });
 
-    const RetirementIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\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, ...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required), ...input })));
+    const RetirementIncomeField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041F\u0435\u043D\u0441\u0438\u043E\u043D\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 })));
 
     const GENDERS = ['male', 'female'];
     const getGenderFromName = async (name) => {
@@ -4356,10 +4355,10 @@
                 })();
             }
         }, []);
-        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043E\u043B", orientation: "horizontal", items: SEX_TYPES, ...getValidation(field('sex'), validatorObj.sex, input?.required) }));
+        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043E\u043B", orientation: "horizontal", items: SEX_TYPES, ...field(input?.name ?? '') }));
     });
 
-    const ShareholderFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u042F \u044F\u0432\u043B\u044F\u044E\u0441\u044C \u0430\u043A\u0446\u0438\u043E\u043D\u0435\u0440\u043E\u043C / \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u043E\u043C / \u0447\u043B\u0435\u043D\u043E\u043C / \u043F\u0430\u0439\u0449\u0438\u043A\u043E\u043C / \u0432\u043A\u043B\u0430\u0434\u0447\u0438\u043A\u043E\u043C \u0441 \u0434\u043E\u043B\u0435\u0439 \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0431\u043E\u043B\u0435\u0435 20% \u0443\u0441\u0442\u0430\u0432\u043D\u043E\u0433\u043E \u043A\u0430\u043F\u0438\u0442\u0430\u043B\u0430 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg, input?.required) })));
+    const ShareholderFlgField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u042F \u044F\u0432\u043B\u044F\u044E\u0441\u044C \u0430\u043A\u0446\u0438\u043E\u043D\u0435\u0440\u043E\u043C / \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u043E\u043C / \u0447\u043B\u0435\u043D\u043E\u043C / \u043F\u0430\u0439\u0449\u0438\u043A\u043E\u043C / \u0432\u043A\u043B\u0430\u0434\u0447\u0438\u043A\u043E\u043C \u0441 \u0434\u043E\u043B\u0435\u0439 \u0443\u0447\u0430\u0441\u0442\u0438\u044F \u0431\u043E\u043B\u0435\u0435 20% \u0443\u0441\u0442\u0430\u0432\u043D\u043E\u0433\u043E \u043A\u0430\u043F\u0438\u0442\u0430\u043B\u0430 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...field(input?.name ?? '') })));
 
     const SnilsInput = JSX(({ children, onChange, maxLength, ...inputProps }) => {
         const handleChange = useCallback((v) => maxLength
@@ -4375,86 +4374,86 @@
 
     const InputSnilsControl = JSX(({ className, label, value, error, onChange, onBlur, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(SnilsInput, { "aria-label": label, label: getRequiredLabel({ label, errors: rest?.errors }), valid: Boolean(!error), value: value, onChange: onChange, onBlur: onBlur, placeholder: "___-___-___ __", ...rest }), renderErrorText(error)] })));
 
-    const SnilsField = JSX(({ field, input }) => (jsx(InputSnilsControl, { label: "\u0421\u041D\u0418\u041B\u0421", maxLength: 14, ...getValidation(field('snils'), validatorObj.snils, input?.required), ...input })));
+    const SnilsField = JSX(({ field, input }) => (jsx(InputSnilsControl, { label: "\u0421\u041D\u0418\u041B\u0421", maxLength: 14, ...field(input?.name ?? ''), ...input })));
 
-    const TotalIncomeField = JSX(({ field, input }) => (jsx(InputControl, { 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, ...getValidation(field('totalIncome'), validatorObj.totalIncome, input?.required), ...input })));
+    const TotalIncomeField = JSX(({ field, input }) => (jsx(InputControl, { 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(InputControl, { 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, ...getValidation(field('wages'), validatorObj.wages, input?.required), ...input })));
+    const WagesField = JSX(({ field, input }) => (jsx(InputControl, { 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 InputsApplicationLeadMap = {
-        limitedBirthday: (props) => jsx(LimitedBirthdayField, { ...props }),
+        limitedBirthday: LimitedBirthdayField,
     };
     const InputsConsentsMap = {
-        processPersonalDataFlg: (props) => jsx(ConsentField, { ...props }),
-        consentProviderFlg: (props) => jsx(ConsentField, { ...props }),
-        consentOthersFlg: (props) => jsx(ConsentField, { ...props }),
-        consentInformFlg: (props) => jsx(ConsentField, { ...props }),
-        consentPfrFlg: (props) => jsx(ConsentField, { ...props }),
+        processPersonalDataFlg: ConsentField,
+        consentProviderFlg: ConsentField,
+        consentOthersFlg: ConsentField,
+        consentInformFlg: ConsentField,
+        consentPfrFlg: ConsentField,
     };
     const InputsRetailMap = {
-        organization: (props) => jsx(OrganizationField, { ...props }),
-        organizationAddress: (props) => jsx(AddressField, { ...props }),
-        organizationPhone: (props) => jsx(PhoneField, { ...props }),
-        organizationName: (props) => jsx(OrganizationNameField, { ...props }),
-        legalForm: (props) => jsx(LegalFormField, { ...props }),
-        generalSeniority: (props) => jsx(GeneralSeniorityField, { ...props }),
-        lastJobExperience: (props) => jsx(LastJobExperienceField, { ...props }),
-        experience5Years: (props) => jsx(Experience5YearsField, { ...props }),
-        jobsNumber: (props) => jsx(JobsNumberField, { ...props }),
-        beginDate: (props) => jsx(BeginDateField, { ...props }),
-        addressFact: (props) => jsx(AddressFactField, { ...props }),
-        addressRegistration: (props) => jsx(AddressField, { ...props }),
-        addressRetail: (props) => jsx(AddressRetailField, { ...props }),
-        addressMatch: (props) => jsx(AddressMatchField, { ...props }),
-        sex: (props) => jsx(SexField, { ...props }),
-        limitedBirthday: (props) => jsx(LimitedBirthdayField, { ...props }),
-        birthPlace: (props) => jsx(BirthPlaceField, { ...props }),
-        education: (props) => jsx(EducationField, { ...props }),
-        housing: (props) => jsx(HousingField, { ...props }),
-        amountWorkers: (props) => jsx(AmountWorkersField, { ...props }),
-        employment: (props) => jsx(EmploymentField, { ...props }),
-        employerActivities: (props) => jsx(EmployerActivitiesField, { ...props }),
-        employerOrganization: (props) => jsx(EmployerOrganizationField, { ...props }),
-        positionOrganization: (props) => jsx(PositionOrganizationField, { ...props }),
-        familyStatus: (props) => jsx(FamilyStatusField, { ...props }),
-        familyMembers: (props) => jsx(FamilyMembersField, { ...props }),
-        children: (props) => jsx(ChildrenField, { ...props }),
-        dependents: (props) => jsx(DependentsField, { ...props }),
-        totalIncome: (props) => jsx(TotalIncomeField, { ...props }),
-        expenses: (props) => jsx(ExpensesField, { ...props }),
-        snils: (props) => jsx(SnilsField, { ...props }),
-        conscription: (props) => jsx(ConscriptionField, { ...props }),
-        armyIdFlg: (props) => jsx(ArmyIdFlgField, { ...props }),
-        dulSerie: (props) => jsx(DulSerieField, { ...props }),
-        dulNumber: (props) => jsx(DulNumberField, { ...props }),
-        dulIssueDateField: (props) => jsx(DulIssueDateField, { ...props }),
-        dulSubdivisionCode: (props) => jsx(DulSubdivisionCodeField, { ...props }),
-        dulIssuedBy: (props) => jsx(DulIssuedByField, { ...props }),
-        participantDateRegistration: (props) => (jsx(ParticipantDateRegistrationField, { ...props })),
-        retirementIncome: (props) => jsx(RetirementIncomeField, { ...props }),
-        otherIncome: (props) => jsx(OtherIncomeField, { ...props }),
-        wages: (props) => jsx(WagesField, { ...props }),
-        mandatoryPayments: (props) => jsx(MandatoryPaymentsField, { ...props }),
-        disablePeopleFlg: (props) => jsx(DisablePeopleFlgField, { ...props }),
-        bankruptcyFlg: (props) => jsx(BankruptcyFlgField, { ...props }),
-        shareholderFlg: (props) => jsx(ShareholderFlgField, { ...props }),
-        legalEntityName: (props) => jsx(LegalEntityNameField, { ...props }),
-        creditInRshbCd: (props) => jsx(CreditInRshbCdField, { ...props }),
-        bankEmployeeCode: (props) => jsx(BankEmpoleeCodeField, { ...props }),
-        partInBusiness: (props) => jsx(PartInBusinessField, { ...props }),
-        regionRetail: (props) => jsx(RegionRetailField, { ...props }),
-        infoCard: (props) => jsx(InfoCardField, { ...props }),
-        calculator: (props) => jsx(CreditCalcField, { ...props }),
-        confirmationIncome: (props) => jsx(ConfirmationIncomeField, { ...props }),
+        organization: OrganizationField,
+        organizationAddress: AddressField,
+        organizationPhone: PhoneField,
+        organizationName: OrganizationNameField,
+        legalForm: LegalFormField,
+        generalSeniority: GeneralSeniorityField,
+        lastJobExperience: LastJobExperienceField,
+        experience5Years: Experience5YearsField,
+        jobsNumber: JobsNumberField,
+        beginDate: BeginDateField,
+        addressFact: AddressFactField,
+        addressRegistration: AddressField,
+        addressRetail: AddressRetailField,
+        addressMatch: AddressMatchField,
+        sex: SexField,
+        limitedBirthday: LimitedBirthdayField,
+        birthPlace: BirthPlaceField,
+        education: EducationField,
+        housing: HousingField,
+        amountWorkers: AmountWorkersField,
+        employment: EmploymentField,
+        employerActivities: EmployerActivitiesField,
+        employerOrganization: EmployerOrganizationField,
+        positionOrganization: PositionOrganizationField,
+        familyStatus: FamilyStatusField,
+        familyMembers: FamilyMembersField,
+        children: ChildrenField,
+        dependents: DependentsField,
+        totalIncome: TotalIncomeField,
+        expenses: ExpensesField,
+        snils: SnilsField,
+        conscription: ConscriptionField,
+        armyIdFlg: ArmyIdFlgField,
+        dulSerie: DulSerieField,
+        dulNumber: DulNumberField,
+        dulIssueDateField: DulIssueDateField,
+        dulSubdivisionCode: DulSubdivisionCodeField,
+        dulIssuedBy: DulIssuedByField,
+        participantDateRegistration: ParticipantDateRegistrationField,
+        retirementIncome: RetirementIncomeField,
+        otherIncome: OtherIncomeField,
+        wages: WagesField,
+        mandatoryPayments: MandatoryPaymentsField,
+        disablePeopleFlg: DisablePeopleFlgField,
+        bankruptcyFlg: BankruptcyFlgField,
+        shareholderFlg: ShareholderFlgField,
+        legalEntityName: LegalEntityNameField,
+        creditInRshbCd: CreditInRshbCdField,
+        bankEmployeeCode: BankEmpoleeCodeField,
+        partInBusiness: PartInBusinessField,
+        regionRetail: RegionRetailField,
+        infoCard: InfoCardField,
+        calculator: CreditCalcField,
+        confirmationIncome: ConfirmationIncomeField,
     };
     const InputRetailCardMap = {
-        addressCourier: (props) => jsx(AddressField, { ...props }),
-        paymentSystem: (props) => jsx(PaymentSystemField, { ...props }),
-        currency: (props) => jsx(CurrencyField, { ...props }),
-        cardCategory: (props) => jsx(CardCategoryField, { ...props }),
-        codeWord: (props) => jsx(CodeWordField, { ...props }),
-        methodObtain: (props) => jsx(MethodObtainField, { ...props }),
-        deliveryDate: (props) => jsx(DeliveryDateFiels, { ...props }),
+        addressCourier: AddressField,
+        paymentSystem: PaymentSystemField,
+        currency: CurrencyField,
+        cardCategory: CardCategoryField,
+        codeWord: CodeWordField,
+        methodObtain: MethodObtainField,
+        deliveryDate: DeliveryDateFiels,
     };
 
     const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
@@ -4464,13 +4463,15 @@
         const handleGeneralToggle = (value) => {
             for (const item of inputs) {
                 const itemField = field(item.name);
-                itemField?.onChange && itemField.onChange(value);
+                itemField.onChange?.(value);
             }
         };
         const hasValidationErrors = useMemo(() => inputs
             ?.filter((_) => _.required)
             ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)), [inputs]);
-        return (jsx("div", { className: "w-fit", children: jsx(Foldable, { isFoldButtonOnTop: true, unfoldedByDefault: true, renderFoldableSection: ({ isUnfolded }) => (jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: inputs.map(getField(field, {}, InputsConsentsMap)) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
+        return (jsx("div", { className: "w-fit", children: jsx(Foldable, { isFoldButtonOnTop: true, unfoldedByDefault: true, renderFoldableSection: ({ isUnfolded }) => (jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: 
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    inputs.map(getField(field, {}, InputsConsentsMap)) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
     });
     const renderGeneralCheckbox = (generalCheckBox) => (foldableData) => (jsxs("div", { className: "flex items-start", children: [generalCheckBox, jsx("button", { onClick: foldableData.onToggle, className: "px-m py-2xs", type: "button", children: jsx(Icon, { className: "text-primary-text", name: foldableData.isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" }) })] }));
 
@@ -5177,19 +5178,15 @@
         return saveUserData;
     };
 
-    const useApplicationLeadApi = ({ inputs, programId, nextStepLink, }) => {
-        const [responseStatus, setResponseStatus] = useState('');
+    const useApplicationLeadApi = ({ programId, nextStepLink }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
+        const [ok, setOK] = useState();
         const saveUserData = useSaveUserData();
         const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
         const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const draftDialog = useDraftDialog();
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(inputs));
-            if (!isValidationSuccess(feedbackValidator(formData))) {
-                return;
-            }
             try {
                 startSending();
                 const profileId = await createUserProfile({
@@ -5223,7 +5220,7 @@
                             }
                         }
                         catch {
-                            setResponseStatus('Fail');
+                            setOK(false);
                         }
                     };
                     const acceptedConsents = getAcceptedConsents(formData);
@@ -5236,14 +5233,10 @@
                 }
             }
             catch {
-                setResponseStatus('Fail');
+                setOK(false);
             }
         }, []);
-        return {
-            handleSubmit,
-            responseStatus,
-            isSending,
-        };
+        return { isSending, ok, handleSubmit };
     };
     const getAcceptedConsents = (formData) => Object.keys(CONSENTS)
         .filter((_) => formData[_])
@@ -5405,19 +5398,22 @@
 
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
         const inputs = useMemo(() => (applicationFormData?.flatMap((_) => _?.inputs) || []), [applicationFormData]);
+        const formValidator = useMemo(() => getFormValidator(inputs), [inputs]);
         const [initialFormState, { isLoading }] = useInitApplicationLead(inputs, nextStepLink);
-        const { handleSubmit, responseStatus, isSending } = useApplicationLeadApi({
-            inputs,
+        const { isSending, ok, handleSubmit } = useApplicationLeadApi({
             programId,
             nextStepLink,
         });
-        const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });
+        const [, { field, onSubmit }] = useForm(initialFormState, {
+            formValidator,
+            onSubmit: handleSubmit,
+        });
         const responseTypeDialog = useDialog(ResponseTypeDialog);
         useEffect(() => {
-            if (responseStatus) {
-                responseTypeDialog.open({ responseType: responseStatus });
+            if (ok !== undefined) {
+                responseTypeDialog.open({ ok });
             }
-        }, [responseStatus]);
+        }, [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$2({ field, inputs: _?.inputs })] }, `section-${i}`))), renderSubmitButton(button, isSending)] }) }));
     });
 
@@ -5760,6 +5756,8 @@
         return (jsxs("div", { className: "flex-1", children: [item?.title ? (jsx("div", { className: "mb-m", children: jsx(Text, { size: "text-m", font: "font-medium", color: "text-primary-text", children: item.title }) })) : null, jsx(SlideCheckboxGroup, { items: options, multiple: !item?.single, ...field(key) })] }, key));
     };
 
+    const identity = (_) => _;
+
     function zip(firstCol, ...restCols) {
         return firstCol.map((firstEl, rowIndex) => [firstEl, ...restCols.map((col) => col[rowIndex])]);
     }
@@ -5805,12 +5803,12 @@
 
     const useFiltrationForm = (initialFormState, { block, page, normalize = identity }) => {
         const blocks = block?.blocks || [];
-        const [filtrationState, { field, reset, update }] = useForm(initialFormState);
+        const [filtrationState, operators] = useForm(initialFormState);
         const blocksWithProps = useMemo(() => zip(blocks, blocks.map((b) => resolveBlockProps(b.content, page?.fallback))), [blocks, page?.fallback]);
         const blocksToRender = filtrationState === initialFormState
             ? blocks
             : filterBlocks(blocksWithProps, filtrationState)(normalize);
-        return [filtrationState, { blocksToRender, blocksWithProps }, { field, reset, update }];
+        return [filtrationState, { blocksToRender, blocksWithProps }, operators];
     };
 
     const EMPTY_SCHEMA = {};
@@ -6310,7 +6308,7 @@
             isWithdrawn: Boolean(defaultParams?.isWithdrawn),
             isNewClient: Boolean(defaultParams?.isNewClient),
             currency: DEFAULT_CURRENCY,
-        }, { normalize });
+        }, { normalizer: normalize });
         const currencyValue = field?.('currency')?.value ?? DEFAULT_CURRENCY;
         const isNewClient = field?.('isNewClient')?.value;
         const row = getRows(rows, currencyValue);
@@ -6736,6 +6734,8 @@
     const CarouselRecommendationCard = JSX(({ className, padding, description, additionalDescription, href, icon, isDotted, __html, socialMedia = [], target, title, align = 'text-left', benefits, imageOptions: { directionRight = true, isImageAlwaysOnRight = ImageAlwaysOnRight, isImageSecondary = false, } = {}, data, ...rest }) => (jsx(BlockWrapper, { className: style('relative min-h-28 group-data-gray:bg-main-divider/50', className), defaultPadding: "p-0", ...rest, children: jsx(LinkWrapper, { href: href, target: target, className: "h-full", data: getAspectsWithInclude(data), children: jsxs(BaseTile, { className: "h-full", defaultPadding: "p-2xl", padding: padding, insetTitle: jsx(Headline, { title: title, description: description, headlineVersion: "XS", isEmbedded: true, align: align }), ...leftOrRightImage(isIcon(icon) ? jsx(Img, { image: icon }) : null, directionRight), buttons: socialMedia.length ? (jsx(SocialMedia, { media: socialMedia, stretched: true, showButtonText: true, version: rest?.version })) : null, isImageAlwaysOnRight: isImageAlwaysOnRight, isImageSecondary: isImageSecondary, imageAlign: "center", children: [jsx(BenefitsList, { benefits: benefits }), __html ? jsx(RichText, { __html: __html, isDotted: isDotted, itemSize: "list-s" }) : null, renderAdditionalDescription(additionalDescription, align)] }) }) })));
     const renderAdditionalDescription = (additionalDescription, align) => additionalDescription ? (jsx(Paragraph, { size: "text-m", font: "font-light", color: "text-secondary-text group-data-secondary:text-white/80", align: align, children: additionalDescription })) : null;
 
+    const carouselTariffsCardEventBus = new EventBus();
+
     const renderCardInfo = (cell, i) => {
         const { title, description, buttons } = cell;
         return (jsxs("div", { className: "py-lg border-b border-main-divider", children: [title ? (jsx("div", { className: "opacity-80", children: jsx(Text, { size: "text-m", color: "text-secondary-text", children: title }) })) : null, description ? (jsx("div", { className: "mt-2xs", children: jsx(Text, { size: "text-xl", color: "text-primary-text", children: description }) })) : null, buttons?.length ? (jsx("div", { className: "text-primary-main", children: renderButtonsSection(buttons) })) : null] }, String(i)));
@@ -6747,20 +6747,21 @@
             ? [cellsNode.slice(0, visibleCellsCount), cellsNode.slice(visibleCellsCount)]
             : [cellsNode, []];
         const [isVisible, setIsVisible] = useState(false);
-        useEffect(() => defaultEventBus.subscribe('fold', (event) => {
-            if (event && options?.parent !== undefined && event.parent === options?.parent) {
+        useEffect(() => carouselTariffsCardEventBus.subscribe('fold', (event) => {
+            if (event && options?.parent && event.parent === options?.parent) {
                 setIsVisible(event.isUnfolded);
             }
         }), [options?.parent]);
-        return (jsxs(BlockWrapper, { className: style('flex flex-col', className), defaultPadding: "p-2xl", ...rest, children: [isIcon(icon) ? (jsx("div", { className: "self-center", children: jsx(Img, { image: icon }) })) : null, title ? (jsx(Heading, { className: style('pt-xs', align), headingType: "h5", title: title })) : null, button?.text ? jsx(LinkButton, { className: "w-full mt-m mb-lg", ...button }) : null, hiddenCells.length ? (jsx(Foldable, { renderFoldableSection: () => (jsxs("div", { children: [visibleCells, jsx(FoldableSection, { isUnfolded: isVisible, children: hiddenCells })] })), renderFoldButton: cardCells.length >= visibleCellsCount
-                        ? renderFoldButton$2(options?.parent, data, isVisible)
-                        : null })) : (jsx("div", { children: visibleCells }))] }));
+        const toggle = useCallback(() => {
+            carouselTariffsCardEventBus.fire('fold', {
+                type: 'fold',
+                isUnfolded: !isVisible,
+                parent: options?.parent,
+            });
+        }, [isVisible, options?.parent]);
+        return (jsxs(BlockWrapper, { className: style('flex flex-col', className), defaultPadding: "p-2xl", ...rest, children: [isIcon(icon) ? (jsx("div", { className: "self-center", children: jsx(Img, { image: icon }) })) : null, title ? (jsx(Heading, { className: style('pt-xs', align), headingType: "h5", title: title })) : null, button?.text ? jsx(LinkButton, { className: "w-full mt-m mb-lg", ...button }) : null, hiddenCells.length ? (jsx(Foldable, { renderFoldableSection: () => (jsxs("div", { children: [visibleCells, jsx(FoldableSection, { isUnfolded: isVisible, children: hiddenCells })] })), renderFoldButton: () => cardCells.length >= visibleCellsCount ? (jsx(FoldButton, { data: data, isUnfolded: isVisible, onClick: toggle })) : null })) : (jsx("div", { children: visibleCells }))] }));
     });
-    const renderFoldButton$2 = (parent, data, isUnfolded = false) => () => (jsxs("button", { className: "w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center", onClick: () => {
-            if (parent !== undefined) {
-                defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
-            }
-        }, type: "button", ...(isUnfolded ? getAspectsAttributes(data) : {}), children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] }));
+    const FoldButton = JSX(({ data, isUnfolded = false, onClick }) => (jsxs("button", { className: "w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center", type: "button", onClick: onClick, ...(isUnfolded ? getAspectsAttributes(data) : {}), children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] })));
 
     const ContactsBlock = JSX(({ className, contacts, info, version = 'secondary', ...rest }) => (jsxs(BlockWrapper, { className: style('flex', className), defaultPadding: "p-6xl", version: version, ...rest, children: [info?.length ? renderBlocks(info) : null, contacts?.length ? renderBlocks(contacts) : null] })));
     const renderBlocks = (info) => (jsx("div", { className: "flex gap-5xl grow basis-0", children: info.map((column, i) => renderBlocksColumn({ column, i })) }));
@@ -6807,6 +6808,33 @@
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step + 1, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
     });
 
+    const calculateInputs = (getValue) => (inputs, step) => inputs
+        .filter((_) => _)
+        .map((_) => {
+        if ([
+            checkIsRetiree(step, getValue),
+            checkBusinessOwner(_, getValue),
+            checkConsentPfrFlg(_, getValue),
+            checkAddressFillFromESIA(_, getValue),
+            checkAddressFact(_, getValue),
+            checkCondition(_, getValue),
+        ].some(Boolean)) {
+            return { ..._, required: false };
+        }
+        return _;
+    });
+    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
+    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
+    const checkCondition = ({ condition }, getValue) => condition?.name &&
+        condition?.values?.some((_) => {
+            const dataValue = getValue(condition?.name);
+            return _ !== (dataValue?.key ?? dataValue);
+        });
+    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
+    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
+
     var STATUS_TYPE;
     (function (STATUS_TYPE) {
         STATUS_TYPE["process"] = "IN_PROCESS";
@@ -6964,40 +6992,14 @@
         return statusesMap[status] || jsx(ReworkStatusContent$1, {});
     };
 
-    const calculateInputs = (getValue) => (inputs, step) => inputs
-        .filter((_) => _)
-        .map((_) => {
-        if ([
-            checkIsRetiree(step, getValue),
-            checkBusinessOwner(_, getValue),
-            checkConsentPfrFlg(_, getValue),
-            checkAddressFillFromESIA(_, getValue),
-            checkAddressFact(_, getValue),
-            checkCondition(_, getValue),
-        ].some(Boolean)) {
-            return { ..._, required: false };
-        }
-        return _;
-    });
-    const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
-    const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
-    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
-    const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
-    const checkCondition = ({ condition }, getValue) => condition?.name &&
-        condition?.values?.some((_) => {
-            const dataValue = getValue(condition?.name);
-            return _ !== (dataValue?.key ?? dataValue);
-        });
-    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
-    const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
-
-    const renderInputs$1 = ({ field, inputs, params }) => inputs.map(getField(field, params, { ...InputsRetailMap, ...InputRetailCardMap }));
+    const InputsMap = { ...InputsRetailMap, ...InputRetailCardMap };
+    const renderInputs$1 = ({ field, inputs, params }) => inputs.map(getField(field, params, InputsMap));
 
     const renderStep$2 = ({ sections, field, step, params }) => sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
-        const inputs = calculateInputs(getValue$3(field))(origInputs, step);
+        const inputs = calculateInputs(getValue$1(field))(origInputs, step);
         return (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderTitle(title), renderInputs$1({ field, inputs, params })] }, `section-${i}`));
     });
-    const getValue$3 = (field) => (name) => field(name)?.value;
+    const getValue$1 = (field) => (name) => field(name)?.value;
 
     const StepsNavigationButtons$1 = JSX(({ step, isSending, onPrevStep }) => {
         const isFirstStep = step === 0;
@@ -7263,7 +7265,7 @@
         }
     };
 
-    const useCreditCardFormAPI = ({ step, inputs, onNextStep, onFinish, }) => {
+    const useCreditCardFormAPI = ({ step, onNextStep, onFinish, }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
         const isFinalStep = step === 5;
         const retailFormStore = useRetailFormStore();
@@ -7282,10 +7284,6 @@
             }
         }, [isFinalStep, initialState]);
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs(getValue$2(formData))(inputs, step)));
-            if (!isValidationSuccess(feedbackValidator(formData))) {
-                return;
-            }
             startSending();
             retailFormStore.leadForm = formData;
             try {
@@ -7314,17 +7312,21 @@
         }, [isFinalStep, resetForm]);
         return [initialState, handleSubmit, isSending];
     };
-    const getValue$2 = (formData) => (name) => formData[name];
 
     const CreditCardFormStep = JSX(({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
         const inputs = useMemo(() => (sections?.flatMap((_) => _?.inputs) || []), [sections]);
+        const formValidator = useCallback((formState) => 
+        // TODO Слишком сложно
+        getFormValidator(calculateInputs((_) => formState[_])(inputs, step))(formState), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
             step,
-            inputs,
             onNextStep,
             onFinish,
         });
-        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
+        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+            formValidator,
+            onSubmit,
+        });
         return isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$2({ sections, field, step }), jsx(StepsNavigationButtons$1, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
     });
 
@@ -7727,7 +7729,7 @@
             setStep((_) => Math.max(_ - 1, 0));
             scrollToTop();
         }, []);
-        const sections = useMemo(() => stepsSectionsMap$1[step], [step]);
+        const sections = stepsSectionsMap$1[step];
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
         return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: TITLES, step: step, totalSteps: STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
     });
@@ -7867,10 +7869,10 @@
     const renderInputs = ({ field, inputs, params }) => inputs.map(getField(field, params, { ...InputsRetailMap }));
 
     const renderStep$1 = ({ sections, field, step, params }) => sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
-        const inputs = calculateInputs(getValue$1(field))(origInputs, step);
+        const inputs = calculateInputs(getValue(field))(origInputs, step);
         return (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderTitle(title), renderInputs({ field, inputs, params })] }, `section-${i}`));
     });
-    const getValue$1 = (field) => (name) => field(name)?.value;
+    const getValue = (field) => (name) => field(name)?.value;
 
     const StepsNavigationButtons = JSX(({ step, onPrevStep, isSending }) => {
         const isFirstStep = step === 0;
@@ -8053,7 +8055,7 @@
         }
     };
 
-    const useCreditFormAPI = ({ step, inputs, onNextStep, onFinish, }) => {
+    const useCreditFormAPI = ({ step, onNextStep, onFinish, }) => {
         const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
         const isFinalStep = step === 5;
         const retailFormStore = useRetailFormStore();
@@ -8074,10 +8076,6 @@
             }
         }, [isFinalStep, initialState]);
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs(getValue(formData))(inputs, step)));
-            if (!isValidationSuccess(feedbackValidator(formData))) {
-                return;
-            }
             startSending();
             retailFormStore.leadForm = formData;
             try {
@@ -8106,19 +8104,23 @@
         }, [isFinalStep, resetForm]);
         return [initialState, handleSubmit, isSending];
     };
-    const getValue = (formData) => (name) => formData[name];
 
     const CreditFormStep = JSX(({ step, sections, isFormFinished, 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))(formState), [inputs]);
         const [initialState, onSubmit, isSending] = useCreditFormAPI({
             step,
-            inputs,
             onNextStep,
             onFinish,
         });
-        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
+        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+            formValidator,
+            onSubmit,
+        });
         return isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, params: { calcData } }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
     });
 
@@ -8151,7 +8153,7 @@
             setStep((_) => Math.max(_ - 1, 0));
             scrollToTop();
         }, []);
-        const sections = useMemo(() => stepsSectionsMap[step], [step]);
+        const sections = stepsSectionsMap[step];
         const isStartStep = step === 0;
         const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
         return (jsx(BlockWrapper, { className: className, ...rest, children: jsxs("div", { ref: formContainerRef, className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: STEP_TITLES, step: step, totalSteps: STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, isFormFinished: isFormFinished, programsSource: programsSource, onNextStep: handleNextStep, onPrevStep: handlePrevStep, onFinish: handleFinish }, String(step)) })] }) }));
@@ -9575,7 +9577,7 @@
                         return (jsx(FoldableSection, { isUnfolded: isUnfolded, children: jsx(CardRow, { className: "flex-wrap", children: additionalInfo?.map(renderInfo) }) }));
                     }, 
                     //** TODO: Remove styles with refactoring  DefaultFoldButton*/
-                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$3({ isUnfolded, onToggle }) })] }, String(i)));
+                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$2({ isUnfolded, onToggle }) })] }, String(i)));
     };
     const getAtmPoint = ({ address = '', terminalType, atmCode = '' }) => {
         const header = `${capitalizedFirstLetter(terminalType)} №${atmCode}`;
@@ -9641,7 +9643,7 @@
                             workScheduleDescription,
                         }) })), 
                     //** TODO: remove styles with refactoring  DefaultFoldButton*/
-                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$3({ isUnfolded, onToggle }) })] }, String(i)));
+                    renderFoldButton: ({ isUnfolded, onToggle }) => renderFoldButton$2({ isUnfolded, onToggle }) })] }, String(i)));
     };
     const renderCardContent = ({ workScheduleDescription }) => {
         return (jsxs("div", { children: [jsxs(CardRow, { className: "flex", children: [jsx(CardCell, { label: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043B\u0438\u0446", children: jsx(Text, { children: "\u041E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438 \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u043A\u0440\u0435\u0434\u0438\u0442\u043E\u0432, \u0441\u0447\u0435\u0442\u043E\u0432, \u0432\u043A\u043B\u0430\u0434\u043E\u0432" }) }), jsx(CardCell, { label: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043B\u0438\u0446", children: jsx(Text, { children: "\u041E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438 \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u0435 \u0431\u0430\u043D\u043A\u043E\u0432\u0441\u043A\u0438\u0445 \u043A\u0430\u0440\u0442" }) }), jsx(CardCell, { label: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043B\u0438\u0446", children: jsx(Text, { children: "\u0418\u043D\u0432\u0435\u0441\u0442\u0438\u0446\u0438\u043E\u043D\u043D\u043E\u0435 \u0438 \u043D\u0430\u043A\u043E\u043F\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0435 \u0441\u0442\u0440\u0430\u0445\u043E\u0432\u0430\u043D\u0438\u0435" }) }), jsx(CardCell, { label: "\u041E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043B\u0438\u0446", children: jsx(Text, { children: "\u0411\u0435\u0437\u043D\u0430\u043B\u0438\u0447\u043D\u044B\u0435 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u0432 \u0440\u0443\u0431\u043B\u044F\u0445, \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u044B \u0431\u0435\u0437 \u043E\u0442\u043A\u0440\u044B\u0442\u0438\u044F \u0441\u0447\u0451\u0442\u0430" }) })] }), jsx("hr", { className: "text-main-divider pb-xl" }), jsx(CardCell, { label: "\u0420\u0435\u0436\u0438\u043C \u0440\u0430\u0431\u043E\u0442\u044B", className: "max-w-none", children: jsx(Text, { children: workScheduleDescription }) })] }));
@@ -10431,7 +10433,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.736";
+    const packageVersion = "0.14.737";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;