@redneckz/wildless-cms-uni-blocks 0.14.657 → 0.14.659

package/mobile/src/ui-kit/FormField/Fields/Experience5YearsField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
     label="Стаж"
     placeholder="За последние 5 лет"
     type="number"
-    maxtLength={2}
-    {...getValidation(
-      field('experience5Years'),
-      validatorObj.experience5Years,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('experience5Years'), validatorObj.experience5Years, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/GeneralSeniorityField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -9,13 +8,9 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
   <InputControl
     label="Общий стаж"
     type="number"
-    maxtLength={2}
+    maxLength={2}
     placeholder="Количество лет"
-    {...getValidation(
-      field('generalSeniority'),
-      validatorObj.generalSeniority,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('generalSeniority'), validatorObj.generalSeniority, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/InnField.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -17,13 +16,9 @@ export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
     <InputControl
       label="ИНН"
       type="number"
-      maxtLength={12}
+      maxLength={12}
       {...input}
-      {...getValidation(
-        field('inn'),
-        validatorObj.inn,
-        calculateIsRequired(field, input?.required),
-      )}
+      {...getValidation(field('inn'), validatorObj.inn, input?.required)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/JobsNumberField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Количество мест работы за последние 5 лет"
     placeholder="Количество мест"
     type="number"
-    maxtLength={2}
-    {...getValidation(
-      field('jobsNumber'),
-      validatorObj.jobsNumber,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('jobsNumber'), validatorObj.jobsNumber, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LastJobExperienceField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -10,12 +9,8 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     label="Стаж на последнем рабочем месте"
     placeholder="Количество лет"
     type="number"
-    maxtLength={2}
-    {...getValidation(
-      field('lastJobExperience'),
-      validatorObj.lastJobExperience,
-      calculateIsRequired(field, input?.required),
-    )}
+    maxLength={2}
+    {...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/LegalFormField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -9,11 +8,7 @@ export const LegalFormField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="ОПФ"
     placeholder="ООО, ПАО  и др."
-    {...getValidation(
-      field('legalForm'),
-      validatorObj.legalForm,
-      calculateIsRequired(field, input?.required),
-    )}
+    {...getValidation(field('legalForm'), validatorObj.legalForm, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/MiddleNameField.tsx

@@ -5,12 +5,14 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'middleName';
+
 export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Отчество (Обязательно, при наличии)"
-    maxtLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
-    {...getValidation(field('middleName'), validatorObj.middleName)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    {...getValidation(field(FIELD_NAME), validatorObj.middleName, input?.required)}
     {...input}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/NameField.tsx

@@ -8,8 +8,8 @@ import { isEsiaAuthorize } from '../isEsiaAuthorize';
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Имя"
-    maxtLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...getValidation(field('name'), validatorObj.name, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/FormField/Fields/OrganizationNameField.tsx

@@ -2,7 +2,6 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -17,11 +16,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
     <InputControl
       label="Наименование организации"
       {...input}
-      {...getValidation(
-        field('organizationName'),
-        validatorObj.organizationName,
-        calculateIsRequired(field, input?.required),
-      )}
+      {...getValidation(field('organizationName'), validatorObj.organizationName, input?.required)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/ui-kit/FormField/Fields/PartInBusinessField.tsx

@@ -1,6 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputControl } from '../../Input/InputControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -11,11 +10,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ 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: string) =>
@@ -29,7 +24,7 @@ export const PartInBusinessField = JSX<CustomFieldProps>(({ field, input }) => {
       label="Доля участия в бизнесе"
       placeholder="в %"
       type="number"
-      maxtLength={3}
+      maxLength={3}
       {...partInBusinessField}
       {...input}
       onChange={handleChange}

package/mobile/src/ui-kit/FormField/Fields/PaymentSystemField.tsx

@@ -8,9 +8,6 @@ import { getValidation } from '../getValidation';
 export const PAYMENT_SYSTEM_TYPES: RadioButtonItem[] = [
   { id: 'mir', text: 'Карта МИР' },
   { id: 'union_pay', text: 'UnionPay' },
-  { id: 'payment_system_j', text: 'Платежная система (Дж)' },
-  { id: 'payment_system_b', text: 'Платежная система (B) ' },
-  { id: 'free_card', text: 'Бесплатная карта' },
 ];
 
 export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {

package/mobile/src/ui-kit/FormField/Fields/PhoneField.tsx

@@ -1,20 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { InputPhoneControl } from '../../Input/InputPhoneControl';
-import { calculateIsRequired } from '../calculateIsRequired';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
+import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
-export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputPhoneControl
-    label="Телефон"
-    {...getValidation(
-      field(input?.name || 'phone'),
-      validatorObj.phone,
-      input?.name === 'organizationPhone'
-        ? calculateIsRequired(field, input?.required)
-        : input?.required,
-    )}
-    {...input}
-  />
-));
+export const PhoneField = JSX<CustomFieldProps>(({ field, input }) => {
+  const fieldName = input?.name || 'phone';
+
+  return (
+    <InputPhoneControl
+      label="Телефон"
+      {...getValidation(field(fieldName), validatorObj.phone, input?.required)}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
+      {...input}
+    />
+  );
+});

package/mobile/src/ui-kit/FormField/Fields/ShareholderFlgField.tsx

@@ -4,9 +4,9 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const ShareholderFlgField = JSX<CustomFieldProps>(({ field }) => (
+export const ShareholderFlgField = JSX<CustomFieldProps>(({ field, input }) => (
   <CheckboxWithError
     text="Я являюсь акционером / участником / членом / пайщиком / вкладчиком с долей участия более 20% уставного капитала юридического лица"
-    {...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg)}
+    {...getValidation(field('shareholderFlg'), validatorObj.shareholderFlg, input?.required)}
   />
 ));

package/mobile/src/ui-kit/FormField/Fields/SurnameField.tsx

@@ -5,11 +5,13 @@ import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 import { isEsiaAuthorize } from '../isEsiaAuthorize';
 
+const FIELD_NAME = 'surname';
+
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Фамилия"
-    maxtLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field)}
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
     {...getValidation(field('surname'), validatorObj.surname, input?.required)}
     {...input}
   />

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -84,8 +84,6 @@ export const validatorObj: Record<string, Validator> = {
   sex: defaultValidator('Укажите свой пол'),
   addressRegistration: addressDaDataValidator(),
   organizationAddress: addressDaDataValidator(),
-  deliveryDate: defaultValidator('Укажите дату доставки'),
-  addressCourier: addressDaDataValidator(),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
@@ -100,15 +98,16 @@ export const validatorObj: Record<string, Validator> = {
   regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
-  codeWord: codeWordValidator('Необходимо ввести кодовое слово латиницей'),
-  currency: defaultValidator(),
-  paymentSystem: defaultValidator(),
-  cardCategory: defaultSelectValidator(),
+  codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
   confirmationIncome: defaultValidator(),
+  deliveryDate: defaultValidator('Укажите дату доставки'),
+  addressCourier: addressDaDataValidator(),
 };
 
 export const getObjectValidator = (inputs: FieldDef[]): Record<string, Validator> => {
   const requiredInputs = getNamesFromInput(inputs.filter((_: FieldDef) => Boolean(_?.required)));
 
-  return Object.fromEntries(requiredInputs.map((_) => [_, validatorObj?.[_ || '']]));
+  return Object.fromEntries(
+    requiredInputs.map((_) => [_, validatorObj?.[_ || '']]).filter(([, validator]) => validator),
+  );
 };

package/mobile/src/ui-kit/FormField/getValidation.tsx

@@ -3,4 +3,4 @@ import { type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
 
 export const getValidation = (field: FieldProps<any>, validator: Validator, required = false) =>
-  required ? withValidator(field, validator) : field;
+  required && validator ? withValidator(field, validator) : field;

package/mobile/src/ui-kit/FormField/isEsiaAuthorize.ts

@@ -2,5 +2,5 @@ import { type FormFieldRegisterer } from '../../hooks/useForm';
 
 const ESIA_FIELD_NAME = 'esiaAccountTypeCd';
 
-export const isEsiaAuthorize = (field: FormFieldRegisterer<any>) =>
-  Boolean(field(ESIA_FIELD_NAME)?.value?.key);
+export const isEsiaAuthorize = (field: FormFieldRegisterer<any>, name: string) =>
+  Boolean(field(ESIA_FIELD_NAME)?.value?.key) && field(name).value;

package/mobile/src/ui-kit/Input/InputControl.tsx

@@ -25,7 +25,7 @@ export const InputControl = JSX<InputProps>(
     type,
     name = '',
     daDataQueryPrefix,
-    maxtLength,
+    maxLength,
     dadata = false,
     disabled = false,
   }) => {
@@ -33,7 +33,7 @@ export const InputControl = JSX<InputProps>(
     const popupRef = useOutsideClick<HTMLDivElement>(close);
 
     const handleChange = useCallback(
-      (v: string) => (maxtLength ? v.length <= maxtLength && onChange(v) : onChange(v)),
+      (v: string) => (maxLength ? v.length <= maxLength && onChange(v) : onChange(v)),
       [onChange],
     );
 

package/mobile/src/ui-kit/Input/InputProps.ts

@@ -18,5 +18,5 @@ export interface InputProps<V = string> extends DefaultControlType, ControlProps
   autoFocus?: boolean;
   isTextarea?: boolean;
   dadata?: boolean;
-  maxtLength?: number;
+  maxLength?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.657",
+  "version": "0.14.659",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/api/RetailAPI/updateUserTask.ts

@@ -81,6 +81,7 @@ export type Participant = {
   opf?: string;
   participantAddresses?: ParticipantAddress[];
   participantIncomes?: ParticipantIncome[];
+  payrollCardRshbFlg?: boolean;
   positionCd?: Option;
   registrationDate?: string;
   seniority?: string;

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -18,6 +18,15 @@ export interface FormConsents {
   consentOthersFlg?: boolean;
 }
 
+export type FormStateDeliveryType = {
+  regionRetail?: string;
+  bankEmployeeCode?: number;
+  methodObtain?: 'office' | 'courier';
+  deliveryDate?: Date | string;
+  addressRetail?: Address;
+  addressCourier?: Address;
+};
+
 export interface Address {
   apartment?: string;
   block?: string;
@@ -39,14 +48,14 @@ export interface Address {
   qcHouse?: string;
 }
 
-export interface FormState extends FormConsents {
+export interface FormState extends FormConsents, FormStateDeliveryType {
   typeForm?: Option | string;
   surname?: string;
   name?: string;
   middleName?: string;
   fullName?: string;
-  registrationDate?: Date;
-  birthday?: Date;
+  registrationDate?: Date | string;
+  birthday?: Date | string;
   birthPlace?: string;
   sex?: string;
   phone?: string;
@@ -62,7 +71,7 @@ export interface FormState extends FormConsents {
   positionOrganization?: Option;
   dulSerie?: string;
   dulNumber?: string;
-  dulIssueDateField?: string;
+  dulIssueDateField?: Date | string;
   dulSubdivisionCode?: string;
   dulIssuedBy?: string;
   email?: string;
@@ -85,7 +94,7 @@ export interface FormState extends FormConsents {
   experience5Years?: number;
   jobsNumber?: number;
   organizationAddress?: Address;
-  beginDate?: string;
+  beginDate?: Date | string;
   addressFact?: Address;
   addressBranch?: Option;
   bankEmpolee?: string;
@@ -111,7 +120,7 @@ export interface FormState extends FormConsents {
   conscription?: string;
   armyIdFlg?: boolean;
   addressRegistration?: Address;
-  participantDateRegistration?: Date;
+  participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
   mandatoryIncome?: number;
@@ -121,18 +130,21 @@ export interface FormState extends FormConsents {
   bankruptcyFlg?: boolean;
   shareholderFlg?: boolean;
   legalEntityName?: string;
-  bankEmployeeCode?: number;
   partInBusiness?: number;
   addressMatch?: boolean;
   confirmationIncome?: Option;
   currency?: string;
   paymentSystem?: string;
-  cardCategory?: { key: ''; text: '' };
+  cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;
   moneyValue?: number;
   monthsValue?: number;
   isAnnuity?: boolean;
+  isInsurance?: boolean;
+  isSalaryClient?: boolean;
+  isPensionClient?: boolean;
+  isStateEmployee?: boolean;
 }
 
 const initialFormState = {

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,10 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type SectionsProps } from '../../model/InputSectionsType';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
-import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { type CreditCardFormContent } from './CreditCardFormContent';
 import { CreditCardFormProgress } from './CreditCardFormProgress';
 import { CreditCardFormStep } from './CreditCardFormStep';
@@ -37,8 +35,6 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
 
   const sections = useMemo(() => stepsSectionsMap[step], [step]);
 
-  const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
-
   const [isFormFinished, setIsFormFinished] = useState(false);
 
   return (
@@ -55,7 +51,6 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
           <CreditCardFormStep
             key={String(step)}
             step={step}
-            inputs={inputs}
             sections={sections}
             onNextStep={handleNextStep}
             onPrevStep={handlePrevStep}

package/src/components/CreditCardForm/CreditCardFormContent.ts

@@ -4,12 +4,12 @@ import { type InputSectionsType } from '../../model/InputSectionsType';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
-import { type FormStateMap } from './formStateMap';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 
 /** @hidden */
 export interface RenderInputsProps {
   inputs?: FieldDef[];
-  field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
+  field: FormFieldRegisterer<FormState>;
 }
 
 export type CreditCardSectionsProps = SectionsProps & {

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -4,8 +4,8 @@ import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
-import { type FormStateDeliveryType, type FormStateMap } from './formStateMap';
 import { getInitialFormState } from './getInitialFormState';
 import { renderStep, type CustomSubmit } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -14,7 +14,6 @@ import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 export interface CreditCardFormStepProps {
   step: number;
   sections: SectionsProps[];
-  inputs: FieldDef[];
   onNextStep: () => void;
   onPrevStep: () => void;
   isFormFinished: boolean;
@@ -22,12 +21,14 @@ export interface CreditCardFormStepProps {
 }
 
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
-  ({ step, sections, onPrevStep, onNextStep, inputs, isFormFinished, finishForm }) => {
+  ({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm }) => {
     const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const initialState = getInitialFormState(step as keyof FormStateMap, localStorageData);
+    const initialState = getInitialFormState(step, localStorageData);
 
     const customSubmit = useRef<CustomSubmit | undefined>(undefined);
 
+    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+
     const registerSubmit = useCallback((submit?: CustomSubmit) => {
       customSubmit.current = submit;
     }, []);
@@ -40,9 +41,9 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
       finishForm,
     });
 
-    const [userInputParams, { field, onSubmit }] = useForm(initialState, {
+    const [, { field, onSubmit }] = useForm(initialState, {
       onSubmit: (formData, ev) => {
-        handleSubmit({ ...formData, ...customSubmit.current?.(ev) });
+        handleSubmit({ ...formData, ...customSubmit.current?.(ev) } as FormState);
       },
     });
 
@@ -53,8 +54,8 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         {renderStep({
           sections,
           field,
+          step,
           registerSubmit,
-          userInputParams: userInputParams as FormStateDeliveryType,
         })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>

package/src/components/CreditCardForm/calculateInputs.ts

@@ -0,0 +1,44 @@
+import { type Option } from '../../ui-kit/Select/Option';
+import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export type GetValue = <K extends keyof FormState>(name: K) => FormState[K];
+
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
+  inputs
+    .filter((_) => _)
+    .map((_) => {
+      if (
+        [
+          checkIsRetiree(step, getValue),
+          checkBusinessOwner(_, getValue),
+          checkConsentPfrFlg(_, getValue),
+          checkAddressFillFromESIA(_, getValue),
+          checkCondition(_, getValue),
+        ].some(Boolean)
+      ) {
+        return { ..._, required: false };
+      }
+
+      return _;
+    });
+
+const checkIsRetiree = (step: number, getValue: GetValue) =>
+  step === 2 && getValue('employment')?.key === 'RETIREE';
+
+const checkBusinessOwner = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
+
+const checkConsentPfrFlg = ({ name }: FieldDef, getValue: GetValue) =>
+  name === 'snils' && !getValue('consentPfrFlg');
+
+const checkAddressFillFromESIA = ({ name, filledByEsia }: FieldDef, getValue: GetValue) =>
+  name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
+
+export const checkCondition = ({ condition }: FieldDef, getValue: GetValue) =>
+  condition?.name &&
+  condition?.values?.some((_) => {
+    const dataValue = getValue(condition?.name);
+
+    return _ !== ((dataValue as Option)?.key ?? dataValue);
+  });