@redneckz/wildless-cms-uni-blocks 0.14.656 → 0.14.658

package/mobile/bundle/bundle.umd.js

@@ -1337,10 +1337,10 @@
         return inputRef;
     }
 
-    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, inputLength, dadata = false, disabled = false, }) => {
+    const InputControl = JSX(({ className, label, value = '', placeholder, error, errors, onChange = noop, onDaDataChange, onBlur, isTextarea, type, name = '', daDataQueryPrefix, maxLength, dadata = false, disabled = false, }) => {
         const [isOpen, { setFalse: close, setTrue: open }] = useBool();
         const popupRef = useOutsideClick(close);
-        const handleChange = useCallback((v) => (inputLength ? v.length <= inputLength && onChange(v) : onChange(v)), [onChange]);
+        const handleChange = useCallback((v) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)), [onChange]);
         const inputRef = useInputPopup({
             isOpen: isOpen && dadata,
             name,
@@ -1534,8 +1534,6 @@
         sex: defaultValidator('Укажите свой пол'),
         addressRegistration: addressDaDataValidator(),
         organizationAddress: addressDaDataValidator(),
-        deliveryDate: defaultValidator('Укажите дату доставки'),
-        addressCourier: addressDaDataValidator(),
         participantDateRegistration: defaultValidator('Укажите дату регистрации'),
         retirementIncome: defaultValidator(),
         otherIncome: defaultValidator(),
@@ -1550,15 +1548,14 @@
         regionRetail: defaultSelectValidator('Выберите филиал банка'),
         addressRetail: defaultSelectValidator('Выберите адрес банка'),
         addressMatch: defaultValidator(),
-        codeWord: codeWordValidator('Необходимо ввести кодовое слово латиницей'),
-        currency: defaultValidator(),
-        paymentSystem: defaultValidator(),
-        cardCategory: defaultSelectValidator(),
+        codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
         confirmationIncome: defaultValidator(),
+        deliveryDate: defaultValidator('Укажите дату доставки'),
+        addressCourier: addressDaDataValidator(),
     };
     const getObjectValidator = (inputs) => {
         const requiredInputs = getNamesFromInput(inputs.filter((_) => Boolean(_?.required)));
-        return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]));
+        return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator));
     };
 
     const withValidator = (props, validator) => {
@@ -1571,7 +1568,7 @@
         };
     };
 
-    const getValidation = (field, validator, required = false) => required ? withValidator(field, validator) : field;
+    const getValidation = (field, validator, required = false) => required && validator ? withValidator(field, validator) : field;
 
     const ACQUIRING_TYPES = [
         {
@@ -1719,6 +1716,9 @@
                 region: item?.data?.region,
                 regionCode: item?.data?.region_kladr_id ? item?.data?.region_kladr_id.substring(0, 2) : '',
                 street: item?.data?.house,
+                qc: item?.data?.qc,
+                qcComplete: item?.data?.qc_complete,
+                qcHouse: item?.data?.qc_house,
             });
         }, []);
         const onChange = useCallback((val) => {
@@ -1730,10 +1730,8 @@
         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 }));
     });
 
-    const calculateIsRequired = (field, initialRequired) => (field?.('employment')?.value?.key === 'RETIREE' ? false : initialRequired);
-
     const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
-    const isEsiaAuthorize = (field) => Boolean(field(ESIA_FIELD_NAME)?.value?.key);
+    const isEsiaAuthorize = (field, name) => Boolean(field(ESIA_FIELD_NAME)?.value?.key) && field(name).value;
 
     const AddressField = JSX(({ field, input }) => {
         const fieldName = input?.name || 'addressRegistration';
@@ -1763,14 +1761,7 @@
                 fullAddress: value,
             });
         }, []);
-        const isDisabled = [
-            fieldName === 'addressRegistration',
-            input?.filledByEsia,
-            isEsiaAuthorize(field),
-        ].every(Boolean);
-        return (jsx(InputControl, { disabled: isDisabled, label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.name === 'organizationAddress'
-                ? calculateIsRequired(field, input?.required)
-                : 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", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
     });
 
     const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
@@ -1808,8 +1799,8 @@
 
     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 AddressMatchField = JSX(({ field }) => {
-        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) }));
+    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) }));
     });
 
     const useNormalizedInput = (props, { normalize, format }) => {
@@ -1904,13 +1895,13 @@
 
     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 ArmyIdFlgField = JSX(({ field }) => (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) })));
+    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 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", type: "number", ...getValidation(field('bankEmployeeCode'), validatorObj.bankEmployeeCode, input?.required), ...input })));
 
     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 BankruptcyFlgField = JSX(({ field }) => (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) })));
+    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 useElementSpace = (ref, heightEl) => {
         const [spaceAbove, setSpaceAbove] = useState(false);
@@ -2189,14 +2180,15 @@
 
     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 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, calculateIsRequired(field, 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", ...getValidation(field('beginDate'), validatorObj.beginDate, input?.required), ...input })));
 
     const MIN_AGE = 23;
     const MAX_AGE = 75;
     const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+    const FIELD_NAME$8 = 'birthday';
     const BirthdayField = JSX(({ field, input, isRetailForm = false }) => {
-        const { value } = field('birthday');
-        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthday'), validatorObj.birthday, input?.required), error: isRetailForm && value && !birthdayValidate(value) ? AGE_ERROR_MESSAGE : '' }));
+        const { value } = field(FIELD_NAME$8);
+        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field(FIELD_NAME$8), validatorObj.birthday, input?.required), error: isRetailForm && value && !birthdayValidate(value) ? AGE_ERROR_MESSAGE : '', disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$8) }));
     });
     const birthdayValidate = (date) => {
         const today = new Date();
@@ -2208,7 +2200,8 @@
         return true;
     };
 
-    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 })));
+    const FIELD_NAME$7 = '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$7) })));
 
     const CardCategoryField = JSX(({ field, input }) => {
         const { data: cardCategory } = useLeadFormData('CARD_TYPE');
@@ -2338,31 +2331,36 @@
 
     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 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", type: "number", inputLength: 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", type: "number", maxLength: 2, ...getValidation(field('dependents'), validatorObj.dependents, input?.required), ...input })));
 
     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.meetingDay, input?.required) })));
 
-    const DisablePeopleFlgField = JSX(({ field }) => (jsx(CheckboxWithError, { text: "\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u0438\u043D\u0432\u0430\u043B\u0438\u0434\u043E\u043C", ...getValidation(field('disablePeopleFlg'), validatorObj.disablePeopleFlg) })));
+    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 DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...getValidation(field('dulIssueDateField'), validatorObj.dulIssueDateField, input?.required), disabled: input?.filledByEsia && isEsiaAuthorize(field) })));
+    const FIELD_NAME$6 = 'dulIssueDateField';
+    const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...getValidation(field(FIELD_NAME$6), validatorObj.dulIssueDateField, input?.required), disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$6) })));
 
+    const FIELD_NAME$5 = '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), label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...input, ...getValidation(field('dulIssuedBy'), validatorObj.dulIssuedBy, input?.required), onDaDataChange: onDaDataChange, daDataQueryPrefix: dulSubdivisionCode }));
+        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$5), label: "\u041A\u0435\u043C \u0432\u044B\u0434\u0430\u043D", ...input, ...getValidation(field(FIELD_NAME$5), validatorObj.dulIssuedBy, input?.required), onDaDataChange: onDaDataChange, daDataQueryPrefix: dulSubdivisionCode }));
     });
 
-    const DulNumberField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field), label: "\u041D\u043E\u043C\u0435\u0440 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", inputLength: 6, ...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required) })));
+    const FIELD_NAME$4 = 'dulNumber';
+    const DulNumberField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$4), label: "\u041D\u043E\u043C\u0435\u0440 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", maxLength: 6, ...getValidation(field('dulNumber'), validatorObj.dulNumber, input?.required) })));
 
-    const DulSerieField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field), label: "\u0421\u0435\u0440\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", inputLength: 4, ...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required) })));
+    const FIELD_NAME$3 = 'dulSerie';
+    const DulSerieField = JSX(({ field, input }) => (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$3), label: "\u0421\u0435\u0440\u0438\u044F \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430", type: "number", maxLength: 4, ...getValidation(field('dulSerie'), validatorObj.dulSerie, input?.required) })));
 
+    const FIELD_NAME$2 = 'dulSubdivisionCode';
     const DulSubdivisionCodeField = JSX(({ field, input }) => {
         const onDaDataChange = useCallback((item) => {
             field?.('dulIssuedBy')?.onChange?.(item?.data?.name);
         }, []);
-        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field), label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", type: "number", inputLength: 6, ...input, ...getValidation(field('dulSubdivisionCode'), validatorObj.dulSubdivisionCode, input?.required), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$2), label: "\u041A\u043E\u0434 \u043F\u043E\u0434\u0440\u0430\u0437\u0434\u0435\u043B\u0435\u043D\u0438\u044F", type: "number", maxLength: 6, ...input, ...getValidation(field(FIELD_NAME$2), validatorObj.dulSubdivisionCode, input?.required), onDaDataChange: onDaDataChange }));
     });
 
     const EducationField = JSX(({ field, input }) => {
@@ -2392,17 +2390,18 @@
 
     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", type: "number", ...getValidation(field('expenses'), validatorObj.expenses, input?.required), ...input })));
 
-    const Experience5YearsField = JSX(({ field, input }) => (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", inputLength: 2, ...getValidation(field('experience5Years'), validatorObj.experience5Years, calculateIsRequired(field, input?.required)), ...input })));
+    const Experience5YearsField = JSX(({ field, input }) => (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", maxLength: 2, ...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required), ...input })));
 
     const FamilyMembersField = JSX(({ field }) => {
         const { value, onChange } = field('familyMembers');
-        const adultsCount = field('familyStatus')?.value?.key === 'В браке' ? 2 : 1;
+        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);
-        }, [field('familyStatus')?.value?.key, childrenCount, dependentsCount]);
+        }, [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?.(_) }));
     });
 
@@ -2428,7 +2427,7 @@
 
     const FullNameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0418\u041E", ...getValidation(field('fullName'), validatorObj.fullName, input?.required), ...input })));
 
-    const GeneralSeniorityField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u0431\u0449\u0438\u0439 \u0441\u0442\u0430\u0436", type: "number", inputLength: 2, placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", ...getValidation(field('generalSeniority'), validatorObj.generalSeniority, calculateIsRequired(field, 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", ...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required), ...input })));
 
     const HousingField = JSX(({ field, input }) => {
         const { data: housing } = useLeadFormData('HOUSE_TYPE');
@@ -2440,20 +2439,20 @@
             field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
             field?.('legalForm')?.onChange?.(item.data?.opf?.short);
         }, []);
-        return (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", inputLength: 12, ...input, ...getValidation(field('inn'), validatorObj.inn, calculateIsRequired(field, input?.required)), onDaDataChange: onDaDataChange }));
+        return (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", maxLength: 12, ...input, ...getValidation(field('inn'), validatorObj.inn, input?.required), onDaDataChange: onDaDataChange }));
     });
 
     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 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", type: "number", inputLength: 2, ...getValidation(field('jobsNumber'), validatorObj.jobsNumber, calculateIsRequired(field, 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", type: "number", maxLength: 2, ...getValidation(field('jobsNumber'), validatorObj.jobsNumber, 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", inputLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, calculateIsRequired(field, 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, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...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) }));
     });
 
-    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, calculateIsRequired(field, input?.required)), ...input })));
+    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 OUT_SERVICE_BASE_URL = `${API_BASE_URI}/outservice`;
     const EMPTY_REGIONS = [];
@@ -2485,9 +2484,10 @@
     ];
     const MethodObtainField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { orientation: "horizontal", items: METHODS_OF_OBTAIN, ...getValidation(field('methodObtain'), validatorObj.methodObtain, input?.required) })));
 
-    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)", inputLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field), ...getValidation(field('middleName'), validatorObj.middleName), ...input })));
+    const FIELD_NAME$1 = '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$1), ...getValidation(field(FIELD_NAME$1), validatorObj.middleName, input?.required), ...input })));
 
-    const NameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0418\u043C\u044F", inputLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field), ...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 ?? ''), ...getValidation(field('name'), validatorObj.name, input?.required), ...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] })));
 
@@ -2503,7 +2503,7 @@
             field?.('inn')?.onChange?.(item.data?.inn);
             field?.('legalForm')?.onChange?.(item.data?.opf?.short);
         }, []);
-        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, calculateIsRequired(field, 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, ...getValidation(field('organizationName'), validatorObj.organizationName, input?.required), 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", type: "number", ...getValidation(field('otherIncome'), validatorObj.otherIncome, input?.required), ...input })));
@@ -2516,11 +2516,11 @@
     const PartInBusinessField = JSX(({ field, input }) => {
         const isBusinessOwner = field('positionOrganization')?.value?.key === 'BUSINESS_OWNER';
         const partInBusinessField = {
-            ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, calculateIsRequired(field, isBusinessOwner && input?.required)),
+            ...getValidation(field('partInBusiness'), validatorObj.partInBusiness, input?.required),
         };
         const handleChange = (value) => partInBusinessField?.onChange &&
             partInBusinessField?.onChange(String(Number(value) > MAX_PART ? MAX_PART : Number(value) || ''));
-        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 %", type: "number", inputLength: 3, ...partInBusinessField, ...input, onChange: handleChange, value: isBusinessOwner ? partInBusinessField?.value : '', disabled: !isBusinessOwner }));
+        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 %", type: "number", maxLength: 3, ...partInBusinessField, ...input, onChange: handleChange, value: isBusinessOwner ? partInBusinessField?.value : '', disabled: !isBusinessOwner }));
     });
 
     const PartnerCommentsField = JSX(({ field, input }) => {
@@ -2566,9 +2566,10 @@
 
     const InputPhoneControl = JSX(({ className, label, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(PhoneInput, { "aria-label": label, label: getRequiredLabel({ label, errors: rest?.errors }), valid: Boolean(!error), placeholder: "+7 (___) ___-__-__", ...rest }), renderErrorText(error)] })));
 
-    const PhoneField = JSX(({ field, input }) => (jsx(InputPhoneControl, { label: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D", ...getValidation(field(input?.name || 'phone'), validatorObj.phone, input?.name === 'organizationPhone'
-            ? calculateIsRequired(field, input?.required)
-            : input?.required), ...input })));
+    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 }));
+    });
 
     const PositionOrganizationField = JSX(({ field, input }) => {
         const { data: positionOrganization } = useLeadFormData('POSITION');
@@ -3278,7 +3279,7 @@
     ];
     const SexField = JSX(({ field, input }) => (jsx(RadioButtonGroupControl, { label: "\u041F\u043E\u043B", orientation: "horizontal", items: SEX_TYPES, ...getValidation(field('sex'), validatorObj.sex, input?.required) })));
 
-    const ShareholderFlgField = JSX(({ field }) => (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) })));
+    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 SnilsInput = JSX(({ children, onChange, ...inputProps }) => {
         const handleChange = useCallback((v) => onChange && onChange(normalizeWithMask(v, '___-___-___ __')), [onChange]);
@@ -3297,7 +3298,8 @@
         return (jsx(InputSnilsControl, { label: "\u0421\u041D\u0418\u041B\u0421", ...getValidation(field('snils'), validatorObj.snils, isPfrFlg ? input?.required : false), ...input }));
     });
 
-    const SurnameField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0424\u0430\u043C\u0438\u043B\u0438\u044F", inputLength: 60, disabled: input?.filledByEsia && isEsiaAuthorize(field), ...getValidation(field('surname'), validatorObj.surname, input?.required), ...input })));
+    const FIELD_NAME = '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), ...getValidation(field('surname'), validatorObj.surname, input?.required), ...input })));
 
     const MIN_CREDIT_TERM = 1;
     const MAX_CREDIT_TERM = 180;
@@ -3553,7 +3555,7 @@
         const [responseType, setResponseType] = useState('');
         const responseTypeDialog = useResponseTypeDialog({ typeForm });
         const handleSubmit = useCallback(async (formData, ev) => {
-            const inputsFiltered = getFilteredInputs$1(inputs, formData);
+            const inputsFiltered = getFilteredInputs(inputs, formData);
             const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
@@ -3580,7 +3582,7 @@
         }, [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$1 = (inputs, data) => inputs
+    const getFilteredInputs = (inputs, data) => inputs
         .filter((_) => (_?.name === 'secondaryPhone' ? Boolean(data.secondaryPhone) : _))
         .filter((input) => !input?.condition ||
         input?.condition.values.find((_) => {
@@ -6092,14 +6094,13 @@
         return statusesMap[status] || null;
     };
 
-    /* eslint-disable max-lines */
-    const formStateMap$1 = {
-        0: {
+    const formStateMap$1 = [
+        {
             paymentSystem: PAYMENT_SYSTEM_TYPES[0].id,
             currency: 'rub',
             codeWord: '',
         },
-        1: {
+        {
             surname: '',
             name: '',
             middleName: '',
@@ -6122,18 +6123,23 @@
                 fullAddress: '',
                 fiasCode: '',
             },
-            housing: '',
+            housing: undefined,
+            methodObtain: 'office',
+            addressCourier: {
+                fullAddress: '',
+                fiasCode: '',
+            },
         },
-        2: {
+        {
             amountWorkers: { key: '', text: '' },
             beginDate: undefined,
             employerActivities: { key: '', text: '' },
             employerOrganization: { key: '', text: '' },
             employment: { key: '', text: '' },
-            experience5Years: '',
+            experience5Years: undefined,
             inn: undefined,
-            jobsNumber: '',
-            lastJobExperience: '',
+            jobsNumber: undefined,
+            lastJobExperience: undefined,
             legalForm: '',
             organization: { key: '', text: '' },
             organizationAddress: {
@@ -6145,7 +6151,7 @@
             partInBusiness: undefined,
             positionOrganization: { key: '', text: '' },
         },
-        3: {
+        {
             familyStatus: { key: '', text: '' },
             dependents: undefined,
             familyMembers: undefined,
@@ -6155,74 +6161,89 @@
             snils: '',
             armyIdFlg: false,
         },
-        4: {
+        {
             disablePeopleFlg: false,
             bankruptcyFlg: false,
             shareholderFlg: false,
             legalEntityName: '',
             creditInRshbCd: undefined,
         },
-        5: {
+        {
             regionRetail: '',
             addressRetail: {
                 fullAddress: '',
                 fiasCode: '',
             },
+            bankEmployeeCode: undefined,
             addressCourier: {
                 fullAddress: '',
                 fiasCode: '',
             },
-            bankEmployeeCode: '',
             methodObtain: 'office',
             deliveryDate: undefined,
         },
-    };
+    ];
 
-    const getInitialFormState$1 = (step, localStorageData) => {
-        if (localStorageData) {
-            // TODO: Fill in for other fields with type Date
-            // TODO: Take it out to the helper
-            localStorageData.birthday = localStorageData.birthday
-                ? new Date(localStorageData.birthday)
-                : undefined;
-            localStorageData.dulIssueDateField = localStorageData.dulIssueDateField
-                ? new Date(localStorageData.dulIssueDateField)
-                : undefined;
-            localStorageData.participantDateRegistration = localStorageData.participantDateRegistration
-                ? new Date(localStorageData.participantDateRegistration)
-                : undefined;
-            localStorageData.beginDate = localStorageData?.beginDate
-                ? new Date(localStorageData.beginDate)
-                : undefined;
-            localStorageData.deliveryDate = localStorageData?.deliveryDate
-                ? new Date(localStorageData.deliveryDate)
-                : undefined;
+    const getInitialFormState$1 = (step, localStorageData) => ({
+        ...formStateMap$1[step],
+        ...localStorageData,
+        birthday: transformStringToData$1(localStorageData?.birthday),
+        dulIssueDateField: transformStringToData$1(localStorageData?.dulIssueDateField),
+        participantDateRegistration: transformStringToData$1(localStorageData?.participantDateRegistration),
+        beginDate: transformStringToData$1(localStorageData?.beginDate),
+        deliveryDate: transformStringToData$1(localStorageData?.deliveryDate),
+    });
+    const transformStringToData$1 = (text) => {
+        if (!text) {
+            return undefined;
+        }
+        try {
+            return new Date(text);
+        }
+        catch (_) {
+            return undefined;
         }
-        return {
-            ...formStateMap$1[step],
-            ...localStorageData,
-        };
     };
 
-    const getFilteredInputs = (inputs, data) => inputs
+    const calculateInputs$1 = (getValue) => (inputs, step) => inputs
         .filter((_) => _)
-        .filter((input) => !input?.condition ||
-        input?.condition.values.find((_) => {
-            const dataValue = data?.[input?.condition?.name ?? ''];
-            return _ === (dataValue?.key ?? dataValue);
-        }));
+        .map((_) => {
+        if ([
+            checkIsRetiree$1(step, getValue),
+            checkBusinessOwner$1(_, getValue),
+            checkConsentPfrFlg$1(_, getValue),
+            checkAddressFillFromESIA$1(_, getValue),
+            checkCondition$1(_, getValue),
+        ].some(Boolean)) {
+            return { ..._, required: false };
+        }
+        return _;
+    });
+    const checkIsRetiree$1 = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
+    const checkBusinessOwner$1 = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+    const checkConsentPfrFlg$1 = ({ name }, getValue) => name === 'snils' && !getValue('consentPfrFlg');
+    const checkAddressFillFromESIA$1 = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+    const checkCondition$1 = ({ condition }, getValue) => condition?.name &&
+        condition?.values?.some((_) => {
+            const dataValue = getValue(condition?.name);
+            return _ !== (dataValue?.key ?? dataValue);
+        });
 
-    const renderInfo$2 = (state, inputs = []) => {
+    const renderInfo$2 = (inputs = []) => {
         const infoInputs = inputs.filter((_) => _.fieldType === 'info');
-        const filteredInputs = getFilteredInputs(infoInputs, state);
-        return filteredInputs.length
-            ? filteredInputs.map(({ text, name }, i) => jsx(InfoCard, { __html: text }, `${name}_${i}`))
+        return infoInputs.length
+            ? infoInputs.map(({ text, name }, i) => jsx(InfoCard, { __html: text }, `${name}_${i}`))
             : null;
     };
 
-    const renderInputs$1 = ({ field, inputs }) => (inputs || [])?.map(getField(field, ''));
+    const renderInputs$1 = ({ field, inputs }) => inputs.map(getField(field, ''));
 
-    const renderStep$1 = ({ sections, field, userInputParams }) => sections?.map(({ inputs, columns, title }, i) => (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$2(userInputParams, inputs), renderTitle(title), renderInputs$1({ field, inputs })] }, `section-${i}`)));
+    const renderStep$1 = ({ sections, field, step }) => sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
+        const inputs = calculateInputs$1(getValue$3(field))(origInputs, step);
+        const filteredInputs = inputs.filter((_) => !checkCondition$1(_, getValue$3(field)));
+        return (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$2(filteredInputs), renderTitle(title), renderInputs$1({ field, inputs })] }, `section-${i}`));
+    });
+    const getValue$3 = (field) => (name) => field(name)?.value;
 
     const StepsNavigationButtons$1 = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
@@ -6323,7 +6344,9 @@
             task: {
                 taskSource: globalThis.location.origin,
                 id: taskId,
-                //TODO: Добавить id офиса
+                office: {
+                    id: '650',
+                },
                 authorizedAgentId: formData?.bankEmployeeCode,
                 participants: [
                     {
@@ -6367,8 +6390,8 @@
         const [profileId] = useLocalStorage('profileId');
         const [participantId] = useLocalStorage('participantId');
         const handleSubmit = useCallback(async (formData) => {
-            const inputsFiltered = getFilteredInputs(inputs, formData);
-            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs$1(formData, inputsFiltered, step)));
+            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs$1(getValue$2(formData))(inputs, step)));
+            console.log(getObjectValidator(calculateInputs$1(getValue$2(formData))(inputs, step)));
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
             }
@@ -6397,12 +6420,13 @@
             handleSubmit,
         };
     };
-    const calculateInputs$1 = (formData, inputs, step) => step === 2 && 'employment' in formData && formData?.employment?.key === 'RETIREE' ? [] : inputs;
+    const getValue$2 = (formData) => (name) => formData[name];
 
-    const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, inputs, isFormFinished, finishForm }) => {
+    const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm }) => {
         const [localStorageData, saveStep] = useLocalStorage('leadForm');
         const initialState = getInitialFormState$1(step, localStorageData);
         const customSubmit = useRef(undefined);
+        const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const registerSubmit = useCallback((submit) => {
             customSubmit.current = submit;
         }, []);
@@ -6413,7 +6437,7 @@
             saveStep,
             finishForm,
         });
-        const [userInputParams, { field, onSubmit }] = useForm(initialState, {
+        const [, { field, onSubmit }] = useForm(initialState, {
             onSubmit: (formData, ev) => {
                 handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
             },
@@ -6421,8 +6445,8 @@
         return isFormFinished ? (jsx(CreditCardFormStatusTracker, {})) : (jsxs("form", { onSubmit: onSubmit, className: "space-y-m", children: [renderStep$1({
                     sections,
                     field,
+                    step,
                     registerSubmit,
-                    userInputParams: userInputParams,
                 }), jsx(StepsNavigationButtons$1, { step: step, onPrevStep: onPrevStep })] }));
     });
 
@@ -6780,9 +6804,8 @@
             setStep((_) => Math.max(_ - 1, 0));
         }, []);
         const sections = useMemo(() => stepsSectionsMap$1[step], [step]);
-        const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const [isFormFinished, setIsFormFinished] = useState(false);
-        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, inputs: inputs, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
+        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isFormFinished ? null : (jsx(CreditCardFormProgress, { stepsTitles: WIZARD_TITLES$1, step: step, totalSteps: WIZARD_STEPS$1 })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditCardFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished }, String(step)) })] }) }));
     });
 
     const PORTAL_NATURAL_URL = '/';
@@ -6942,8 +6965,8 @@
         return statusesMap[status] || null;
     };
 
-    const formStateMap = {
-        0: {
+    const formStateMap = [
+        {
             moneyValue: 0,
             monthsValue: 0,
             isAnnuity: false,
@@ -6952,7 +6975,7 @@
             isPensionClient: false,
             isStateEmployee: false,
         },
-        1: {
+        {
             surname: '',
             name: '',
             middleName: '',
@@ -6975,18 +6998,18 @@
                 fullAddress: '',
                 fiasCode: '',
             },
-            housing: '',
+            housing: undefined,
         },
-        2: {
+        {
             amountWorkers: { key: '', text: '' },
             beginDate: undefined,
             employerActivities: { key: '', text: '' },
             employerOrganization: { key: '', text: '' },
             employment: { key: '', text: '' },
-            experience5Years: '',
+            experience5Years: undefined,
             inn: undefined,
-            jobsNumber: '',
-            lastJobExperience: '',
+            jobsNumber: undefined,
+            lastJobExperience: undefined,
             legalForm: '',
             organization: { key: '', text: '' },
             organizationAddress: {
@@ -6998,7 +7021,7 @@
             partInBusiness: undefined,
             positionOrganization: { key: '', text: '' },
         },
-        3: {
+        {
             familyStatus: { key: '', text: '' },
             dependents: undefined,
             familyMembers: undefined,
@@ -7008,43 +7031,65 @@
             snils: '',
             armyIdFlg: false,
         },
-        4: {
+        {
             disablePeopleFlg: false,
             bankruptcyFlg: false,
             shareholderFlg: false,
             legalEntityName: '',
             creditInRshbCd: undefined,
         },
-        5: {
+        {
             regionRetail: '',
-            addressRetail: '',
-            bankEmployeeCode: '',
+            addressRetail: undefined,
+            bankEmployeeCode: undefined,
         },
-    };
+    ];
 
-    const getInitialFormState = (step, localStorageData) => {
-        if (localStorageData) {
-            // TODO: Fill in for other fields with type Date
-            // TODO: Take it out to the helper
-            localStorageData.birthday = localStorageData.birthday
-                ? new Date(localStorageData.birthday)
-                : undefined;
-            localStorageData.dulIssueDateField = localStorageData.dulIssueDateField
-                ? new Date(localStorageData.dulIssueDateField)
-                : undefined;
-            localStorageData.participantDateRegistration = localStorageData.participantDateRegistration
-                ? new Date(localStorageData.participantDateRegistration)
-                : undefined;
-            localStorageData.beginDate = localStorageData?.beginDate
-                ? new Date(localStorageData.beginDate)
-                : undefined;
+    const getInitialFormState = (step, localStorageData) => ({
+        ...formStateMap[step],
+        ...localStorageData,
+        birthday: transformStringToData(localStorageData?.birthday),
+        dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField),
+        participantDateRegistration: transformStringToData(localStorageData?.participantDateRegistration),
+        beginDate: transformStringToData(localStorageData?.beginDate),
+        deliveryDate: transformStringToData(localStorageData?.deliveryDate),
+    });
+    const transformStringToData = (text) => {
+        if (!text) {
+            return undefined;
+        }
+        try {
+            return new Date(text);
+        }
+        catch (_) {
+            return undefined;
         }
-        return {
-            ...formStateMap[step],
-            ...localStorageData,
-        };
     };
 
+    const calculateInputs = (getValue) => (inputs, step) => inputs
+        .filter((_) => _)
+        .map((_) => {
+        if ([
+            checkIsRetiree(step, getValue),
+            checkBusinessOwner(_, getValue),
+            checkConsentPfrFlg(_, getValue),
+            checkAddressFillFromESIA(_, 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 checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && !getValue('consentPfrFlg');
+    const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+    const checkCondition = ({ condition }, getValue) => condition?.name &&
+        condition?.values?.some((_) => {
+            const dataValue = getValue(condition?.name);
+            return _ !== (dataValue?.key ?? dataValue);
+        });
+
     const renderInfo$1 = (inputs = []) => {
         const infoInputs = inputs.filter((_) => _.fieldType === 'info');
         return infoInputs.length
@@ -7052,9 +7097,13 @@
             : null;
     };
 
-    const renderInputs = ({ field, inputs }) => (inputs || [])?.map(getField(field, ''));
+    const renderInputs = ({ field, inputs }) => inputs.map(getField(field, ''));
 
-    const renderStep = ({ sections, field }) => sections?.map(({ inputs, columns, title }, i) => (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$1(inputs), renderTitle(title), renderInputs({ field, inputs })] }, `section-${i}`)));
+    const renderStep = ({ sections, field, step }) => sections?.map(({ inputs: origInputs = [], columns, title }, i) => {
+        const inputs = calculateInputs(getValue$1(field))(origInputs, step);
+        return (jsxs("div", { className: style(inputColumnStyles(columns), 'grid gap-x-m'), children: [renderInfo$1(inputs), renderTitle(title), renderInputs({ field, inputs })] }, `section-${i}`));
+    });
+    const getValue$1 = (field) => (name) => field(name)?.value;
 
     const StepsNavigationButtons = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
@@ -7158,7 +7207,9 @@
         task: {
             taskSource: globalThis.location.origin,
             id: taskId,
-            //TODO: Добавить id офиса
+            office: {
+                id: '650',
+            },
             authorizedAgentId: formData?.bankEmployeeCode,
             participants: [
                 {
@@ -7200,7 +7251,8 @@
         const [profileId] = useLocalStorage('profileId');
         const [participantId] = useLocalStorage('participantId');
         const handleSubmit = useCallback(async (formData) => {
-            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs(formData, inputs, step)));
+            const feedbackValidator = objectValidator(getObjectValidator(calculateInputs(getValue(formData))(inputs, step)));
+            console.log(feedbackValidator(formData), inputs);
             if (!isValidationSuccess(feedbackValidator(formData))) {
                 return console.warn('validation fail');
             }
@@ -7229,23 +7281,13 @@
             handleSubmit,
         };
     };
-    const calculateInputs = (formData, inputs, step) => {
-        if (formData['positionOrganization']?.key !== 'BUSINESS_OWNER') {
-            return inputs.map((_) => (_?.name === 'partInBusiness' ? { ..._, required: false } : _));
-        }
-        if (!formData['consentPfrFlg']) {
-            return inputs.map((_) => (_?.name === 'snils' ? { ..._, required: false } : _));
-        }
-        if (step === 2 && formData['employment']?.key === 'RETIREE') {
-            return [];
-        }
-        return inputs;
-    };
+    const getValue = (formData) => (name) => formData[name];
 
-    const CreditFormStep = JSX(({ step, sections, onPrevStep, onNextStep, inputs, renderStep: renderStep$1 = renderStep, isFormFinished, finishForm, }) => {
+    const CreditFormStep = JSX(({ step, sections, onPrevStep, onNextStep, renderStep: renderStep$1 = renderStep, isFormFinished, finishForm, }) => {
         const [localStorageData, saveStep] = useLocalStorage('leadForm');
         const initialState = getInitialFormState(step, localStorageData);
         const customSubmit = useRef(undefined);
+        const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const registerSubmit = useCallback((submit) => {
             customSubmit.current = submit;
         }, []);
@@ -7261,7 +7303,7 @@
                 handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
             },
         });
-        return isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsxs("form", { onSubmit: onSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, registerSubmit }), jsx(StepsNavigationButtons, { step: step, onPrevStep: onPrevStep })] }));
+        return isFormFinished ? (jsx(CreditFormStatusTracker, {})) : (jsxs("form", { onSubmit: onSubmit, className: "space-y-m", children: [renderStep$1({ sections, field, step, registerSubmit }), jsx(StepsNavigationButtons, { step: step, onPrevStep: onPrevStep })] }));
     });
 
     /* eslint-disable max-lines */
@@ -7286,8 +7328,8 @@
                     { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
                     { fieldType: 'common', name: 'sex', required: true },
                     { fieldType: 'common', name: 'birthday', required: true, filledByEsia: true },
-                    { fieldType: 'common', name: 'birthPlace', required: true },
-                    { fieldType: 'common', name: 'phone', required: true },
+                    { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
+                    { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
                     { fieldType: 'common', name: 'email', required: true, dadata: true },
                 ],
             },
@@ -7553,12 +7595,10 @@
             setStep((_) => Math.max(_ - 1, 0));
         }, []);
         const sections = useMemo(() => stepsSectionsMap[step], [step]);
-        const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const isStartStep = step === 0;
         const [isFormFinished, setIsFormFinished] = useState(false);
-        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: WIZARD_TITLES, step: step, totalSteps: WIZARD_STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, inputs: inputs, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished, renderStep: isStartStep
+        return (jsx(BlockWrapper, { className: style('bg-transparent', className), defaultPadding: "p-0", ...rest, children: jsxs("div", { className: "container grid grid-cols-12", children: [isStartStep || isFormFinished ? null : (jsx(CreditFormProgress, { stepsTitles: WIZARD_TITLES, step: step, totalSteps: WIZARD_STEPS })), jsx("div", { className: "py-lg px-5xl mt-2xs bg-white col-span-12", children: jsx(CreditFormStep, { step: step, sections: sections, onNextStep: handleNextStep, onPrevStep: handlePrevStep, isFormFinished: isFormFinished, finishForm: setIsFormFinished, renderStep: isStartStep
                                 ? ({ registerSubmit, field }) => (jsx(CalculatorCredit, { ...{
-                                        // TODO: Remove "as never"
                                         defaultParams: {
                                             sum: field('moneyValue').value,
                                             period: field('monthsValue').value,
@@ -9467,7 +9507,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.655";
+    const packageVersion = "0.14.657";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;