@redneckz/wildless-cms-uni-blocks 0.14.651 → 0.14.653

package/src/components/CreditCardForm/getInitialFormState.tsx

@@ -0,0 +1,28 @@
+import { formStateMap, type FormStateMap } from './formStateMap';
+
+export const getInitialFormState = <Step extends keyof FormStateMap>(
+  step: Step,
+  localStorageData: Record<string, any> | null,
+): FormStateMap[Step] => {
+  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 as string)
+      : undefined;
+    localStorageData.dulIssueDateField = localStorageData.dulIssueDateField
+      ? new Date(localStorageData.dulIssueDateField as string)
+      : undefined;
+    localStorageData.participantDateRegistration = localStorageData.participantDateRegistration
+      ? new Date(localStorageData.participantDateRegistration as string)
+      : undefined;
+    localStorageData.beginDate = localStorageData?.beginDate
+      ? new Date(localStorageData.beginDate as string)
+      : undefined;
+  }
+
+  return {
+    ...formStateMap[step],
+    ...localStorageData,
+  };
+};

package/src/components/CreditCardForm/getSecondStepData.tsx

@@ -0,0 +1,54 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
+import { formatPhone } from '../../utils/formatPhone';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
+
+export const getSecondStepData = (formData: FormState): Partial<Participant> => {
+  const {
+    name,
+    surname,
+    middleName,
+    birthday = '',
+    phone = '',
+    email,
+    sex,
+    birthPlace,
+    dulIssueDateField = '',
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    education,
+    participantDateRegistration = '',
+    housing,
+    addressRegistration,
+    addressFact,
+  } = formData;
+
+  return {
+    birthDate: formatDate(birthday, true),
+    midname: middleName,
+    name,
+    surname,
+    birthPlace,
+    dulIssueDate: formatDate(dulIssueDateField, true),
+    dulIssuedBy,
+    dulNumber,
+    dulSerie,
+    dulSubdivisionCode,
+    educationLevelCd: education,
+    registrationDate: formatDate(participantDateRegistration, true),
+    houseTypeCd: housing,
+    participantContacts: getParticipantContacts({
+      phone: formatPhone(phone),
+      email,
+    }),
+    participantAddresses: getParticipantAddresses({ addressRegistration, addressFact }),
+    genderCd: sex
+      ? {
+          key: sex === 'male' ? 'MAN' : 'WOMAN',
+        }
+      : undefined,
+  };
+};

package/src/components/CreditCardForm/getThirdStepData.tsx

@@ -0,0 +1,44 @@
+import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatPhone } from '../../utils/formatPhone';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
+
+export const getThirdStepData = (formData: FormState): Partial<Participant> => {
+  const {
+    employment,
+    organizationName,
+    inn,
+    legalForm,
+    organization,
+    amountWorkers,
+    employerActivities,
+    employerOrganization,
+    generalSeniority,
+    lastJobExperience,
+    experience5Years,
+    jobsNumber,
+    organizationPhone,
+    organizationAddress,
+    positionOrganization,
+  } = formData;
+
+  return {
+    employmentTypeCd: employment,
+    organizationName,
+    organizationInn: inn,
+    organizationActivityTypeCd: employerActivities,
+    organizationTypeCd: organization,
+    organizationKindCd: employerOrganization,
+    employeesNumberCd: amountWorkers,
+    opf: legalForm,
+    seniority: generalSeniority,
+    generalSeniority: experience5Years,
+    jobsNumber,
+    lastWorkDuration: lastJobExperience,
+    positionCd: positionOrganization,
+    participantContacts: getParticipantContacts({
+      organizationPhone: organizationPhone && formatPhone(organizationPhone),
+    }),
+    participantAddresses: getParticipantAddresses({ organizationAddress }),
+  };
+};

package/src/components/CreditCardForm/renderInfo.tsx

@@ -0,0 +1,10 @@
+import { InfoCard } from '../../ui-kit/InfoCard/InfoCard';
+import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+
+export const renderInfo = (inputs: FieldDef[] = []) => {
+  const infoInputs = inputs.filter((_) => _.fieldType === 'info');
+
+  return infoInputs.length
+    ? infoInputs.map(({ text, name }, i) => <InfoCard key={`${name}_${i}`} __html={text} />)
+    : null;
+};

package/src/components/CreditCardForm/renderInputs.tsx

@@ -0,0 +1,5 @@
+import { getField } from '../../ui-kit/FormField/getField';
+import { type RenderInputsProps } from './CreditCardFormContent';
+
+export const renderInputs = ({ field, inputs }: RenderInputsProps) =>
+  (inputs || [])?.map(getField(field, ''));

package/src/components/CreditCardForm/renderStep.tsx

@@ -0,0 +1,43 @@
+import { type FormFieldRegisterer, type FormOperatorProps } from '../../hooks/useForm';
+import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
+import { renderTitle } from '../../ui-kit/FormField/renderTitle';
+import { style } from '../../utils/style';
+import { type CreditCardSectionsProps } from './CreditCardFormContent';
+import { type FormStateMap } from './formStateMap';
+import { renderInfo } from './renderInfo';
+import { renderInputs } from './renderInputs';
+
+export type CustomSubmit = FormOperatorProps<FormStateMap[keyof FormStateMap]>['onSubmit'];
+
+export interface StepProps {
+  sections?: CreditCardSectionsProps[];
+  field: FormFieldRegisterer<FormStateMap[keyof FormStateMap]>;
+  registerSubmit?: (submit: CustomSubmit) => void;
+  isLastStep?: boolean;
+  methodObtain?: string;
+}
+
+const renderLastStep = ({ sections, field, methodObtain }: StepProps) =>
+  sections
+    ?.filter(({ type }) => type === methodObtain || !type)
+    .map(({ inputs, columns, title }, i) => (
+      <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
+        {renderInfo(inputs)}
+        {renderTitle(title)}
+        {renderInputs({ field, inputs })}
+      </div>
+    ));
+
+export const renderStep = ({ sections, field, isLastStep, methodObtain }: StepProps) => {
+  if (isLastStep) {
+    return renderLastStep({ sections, field, methodObtain });
+  }
+
+  return sections?.map(({ inputs, columns, title }, i) => (
+    <div key={`section-${i}`} className={style(inputColumnStyles(columns), 'grid gap-x-m')}>
+      {renderInfo(inputs)}
+      {renderTitle(title)}
+      {renderInputs({ field, inputs })}
+    </div>
+  ));
+};

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -0,0 +1,75 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
+import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess } from '../../validation/validator';
+import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FormStateMap } from './formStateMap';
+import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
+
+type CreditCardFormApiProps = {
+  step: number;
+  inputs: FieldDef[];
+  onNextStep: () => void;
+  saveStep: (value: Record<string, any>) => void;
+  finishForm?: (bool: boolean) => void;
+};
+
+export const useCreditCardFormAPI = ({
+  step,
+  inputs,
+  onNextStep,
+  saveStep,
+  finishForm,
+}: CreditCardFormApiProps) => {
+  const [taskId] = useLocalStorage<number>('taskId');
+  const [profileId] = useLocalStorage<number>('profileId');
+  const [participantId] = useLocalStorage<number>('participantId');
+
+  const handleSubmit = useCallback(async (formData: FormStateMap[keyof FormStateMap]) => {
+    const feedbackValidator = objectValidator(
+      getObjectValidator(calculateInputs(formData, inputs, step)),
+    );
+    if (!isValidationSuccess(feedbackValidator(formData))) {
+      return console.warn('validation fail');
+    }
+
+    saveStep(formData);
+
+    try {
+      if (taskId && profileId && participantId) {
+        await updateUserTask(
+          getCreditCardFormTaskData({
+            participantId,
+            taskId,
+            profileId,
+            step,
+            formData: formData as any,
+          }),
+        );
+      }
+    } catch (ex) {
+      return 'Fail';
+    }
+
+    onNextStep();
+
+    if (step === 5) {
+      finishForm?.(true);
+    }
+
+    return 'OK';
+  }, []);
+
+  return {
+    handleSubmit,
+  };
+};
+
+const calculateInputs = (
+  formData: FormStateMap[keyof FormStateMap],
+  inputs: FieldDef[],
+  step: number,
+) =>
+  step === 2 && 'employment' in formData && formData?.employment?.key === 'RETIREE' ? [] : inputs;

package/src/components/CreditForm/CreditForm.fixture.tsx

@@ -3,6 +3,13 @@ import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { CreditForm } from './CreditForm';
 
+const MOCK_TOKEN = 'mockKEY';
+const MOCK_TASK_ID = '111111';
+
+globalThis.sessionStorage?.setItem('refreshToken', MOCK_TOKEN);
+globalThis.sessionStorage?.setItem('accessToken', MOCK_TOKEN);
+globalThis.localStorage.setItem('taskId', MOCK_TASK_ID);
+
 export default {
   default: (
     <div>

package/src/components/CreditForm/CreditForm.tsx

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
+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,
-  type SectionsProps,
-} from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CalculatorCredit } from '../CalculatorCredit/CalculatorCredit';
 import { type CreditFormContent } from './CreditFormContent';
 import { CreditFormProgress } from './CreditFormProgress';
@@ -29,6 +28,8 @@ const WIZARD_TITLES = [
 export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) => {
   const [step, setStep] = useState(0);
 
+  useEffect(updateRefreshToken, []);
+
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
   }, []);

package/src/components/CreditForm/CreditFormStatusTracker.tsx

@@ -8,7 +8,6 @@ import { PendingStatusContent } from './PendingStatusContent';
 import { ReworkStatusContent } from './ReworkStatusContent';
 import { SuccessStatusContent } from './SuccessStatusContent';
 
-const TASK_ID = 2816419;
 const SIGNAL_TYPES: SignalType[] = [
   'CREATE_APPLICATION_SHORT_SIGNAL',
   'CREATE_APPLICATION_LOAN_V3_SIGNAL',
@@ -24,7 +23,8 @@ export const CreditFormStatusTracker = JSX(() => {
     }
 
     const trackStatus = () =>
-      getTaskStatus({ taskId: TASK_ID }).then((res) => {
+      taskId &&
+      getTaskStatus({ taskId }).then((res) => {
         if (res.statusCd && res.statusCd !== STATUS_TYPE.process) {
           clearInterval(pullingInterval);
           setStatus(res.statusCd);
@@ -32,6 +32,8 @@ export const CreditFormStatusTracker = JSX(() => {
       });
 
     const pullingInterval = setInterval(trackStatus, 30000);
+
+    return () => clearInterval(pullingInterval);
   }, []);
 
   return renderStatus(status);

package/src/components/CreditForm/CreditFormStep.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useRef } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
+import { type SectionsProps } from '../../model/InputSectionsType';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditFormStatusTracker } from './CreditFormStatusTracker';
 import { type FormStateMap } from './formStateMap';

package/src/components/CreditForm/FailedStatusContent.tsx

@@ -4,8 +4,7 @@ import { CreditFormStatus } from './CreditFormStatus';
 export const FailedStatusContent = JSX(() => (
   <CreditFormStatus
     title="Благодарим Вас за ожидание"
-    description="В настоящий момент Банк не может одобрить Вашу заявку на кредит.
-      Попробуйте подать заявку позже. Спасибо за обращение в АО «Россельхозбанк»."
+    description="В настоящий момент Банк не может одобрить Вашу заявку на кредит. Попробуйте подать заявку позже. Спасибо за обращение в АО «Россельхозбанк»."
     buttonText="Вернуться на главную"
   />
 ));

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines */
 /* eslint-disable max-len */
 
-import { type SectionsProps } from '../ApplicationLeadForm/ApplicationLeadFormContent';
+import { type SectionsProps } from '../../model/InputSectionsType';
 
 export const stepsSectionsMap: SectionsProps[][] = [
   [

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -57,6 +57,6 @@ const getCurrentStepData = (step: number, formData: FormState): Partial<Particip
     case 4:
       return getFourthStepData(formData);
     default:
-      return getFirstStepData(formData);
+      return {};
   }
 };

package/src/hooks/useInterval.ts

@@ -0,0 +1,14 @@
+import { useCallback, useEffect, useRef } from '@redneckz/uni-jsx/lib/hooks';
+
+export const useInterval = (handler: (stop: () => void) => void, period: number) => {
+  const timer = useRef<any | null>(null);
+  const clearTimer = useCallback(() => timer.current && clearInterval(timer.current as number), []);
+
+  useEffect(() => {
+    timer.current = setInterval(() => handler(clearTimer), period);
+
+    return clearTimer;
+  }, [handler, period]);
+
+  return clearTimer;
+};

package/src/model/InputSectionsType.ts

@@ -1,4 +1,16 @@
-import { type SectionsProps } from '../components/ApplicationForm/ApplicationFormContent';
+import {
+  type FieldDef,
+  type FormColumnsCount,
+} from '../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type TitleProps } from './HeadlineType';
+
+/**
+ * @title Секция полей ввода
+ */
+export type SectionsProps = TitleProps & {
+  columns?: FormColumnsCount;
+  inputs?: FieldDef[];
+};
 
 export interface InputSectionsType {
   /** @hidden */

package/src/ui-kit/FormField/Fields/CurrencyField.tsx

@@ -1,24 +1,23 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { RadioButtonGroup, type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
-import { Text } from '../../Text/Text';
+import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
 
 export const CURRENCY_TYPES: RadioButtonItem[] = [{ id: 'rub', text: 'Рубль' }];
 
-export const CurrencyField = JSX<CustomFieldProps>(({ field }) => {
-  const { value } = field('currency');
+export const CurrencyField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { value, onChange } = field('currency');
 
   return (
-    <div className="">
-      <Text font="font-light">Валюта дебетовой карты</Text>
-      <div className="py-m gap-m grid @xl:flex @xl:items-center">
-        <RadioButtonGroup
-          className="whitespace-normal"
-          orientation="horizontal"
-          items={CURRENCY_TYPES}
-          value={value ?? 'rub'}
-        />
-      </div>
-    </div>
+    <RadioButtonGroupControl
+      label="Валюта"
+      orientation="horizontal"
+      items={CURRENCY_TYPES}
+      value={value}
+      onChange={(_) => onChange?.(_)}
+      {...getValidation(field('currency'), validatorObj.currency, input?.required)}
+    />
   );
 });

package/src/ui-kit/FormField/Fields/DeliveryDateFiels.tsx

@@ -0,0 +1,12 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { DatePickerControl } from '../../DatePicker/DatePickerControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
+  <DatePickerControl
+    label="Дата доставки"
+    {...getValidation(field('deliveryDate'), validatorObj.deliveryDate, input?.required)}
+  />
+));

package/src/ui-kit/FormField/Fields/MethodObtainField.tsx

@@ -0,0 +1,19 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const METHODS_OF_OBTAIN: RadioButtonItem[] = [
+  { id: 'office', text: 'В отделении Банка' },
+  { id: 'courier', text: 'Курьерская доставка' },
+];
+
+export const MethodObtainField = JSX<CustomFieldProps>(({ field, input }) => (
+  <RadioButtonGroupControl
+    orientation="horizontal"
+    items={METHODS_OF_OBTAIN}
+    {...getValidation(field('methodObtain'), validatorObj.methodObtain, input?.required)}
+  />
+));

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

@@ -1,31 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { RadioButtonGroup, type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
-import { Text } from '../../Text/Text';
+import { type RadioButtonItem } from '../../RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../RadioButtonGroup/RadioButtonGroupControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+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: 'payment_system_b', text: 'Платежная система (B) ' },
   { id: 'free_card', text: 'Бесплатная карта' },
 ];
 
-export const PaymentSystemField = JSX<CustomFieldProps>(({ field }) => {
+export const PaymentSystemField = JSX<CustomFieldProps>(({ field, input }) => {
   const { value, onChange } = field('paymentSystem');
 
   return (
-    <div className="">
-      <Text font="font-light">Платежная система</Text>
-      <div className="py-m gap-m grid @xl:flex @xl:items-center">
-        <RadioButtonGroup
-          className="whitespace-normal"
-          orientation="horizontal"
-          items={PAYMENT_SYSTEM_TYPES}
-          value={value ?? 'mir'}
-          onChange={(_) => onChange && onChange(_)}
-        />
-      </div>
-    </div>
+    <RadioButtonGroupControl
+      label="Платежная система"
+      orientation="horizontal"
+      items={PAYMENT_SYSTEM_TYPES}
+      value={value}
+      onChange={(_) => onChange?.(_)}
+      {...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required)}
+    />
   );
 });

package/src/ui-kit/FormField/NameFieldDef.ts

@@ -88,6 +88,9 @@ export type NameFieldDef =
   | 'regionRetail'
   | 'addressRetail'
   | 'addressMatch'
+  | 'addressCourier'
+  | 'deliveryDate'
+  | 'methodObtain'
   | 'paymentSystem'
   | 'currency'
   | 'cardCategory'

package/src/ui-kit/FormField/getField.tsx

@@ -1,5 +1,6 @@
 /* eslint-disable max-lines */
 /* eslint-disable max-lines-per-function */
+//TODO: Убрать обращение к компонентам т.к. ApplicationForm
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { getRegionUrl } from '../../components/ApplicationForm/getRegionUrl';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
@@ -29,6 +30,7 @@ import { ConscriptionField } from './Fields/ConscriptionField';
 import { ConsentField } from './Fields/ConsentField';
 import { CreditInRshbCdField } from './Fields/CreditInRshbCdField';
 import { CurrencyField } from './Fields/CurrencyField';
+import { DeliveryDateFiels } from './Fields/DeliveryDateFiels';
 import { DependentsField } from './Fields/DependentsField';
 import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
 import { DisablePeopleFlgField } from './Fields/DisablePeopleFlgField';
@@ -58,6 +60,7 @@ import { LegalEntityNameField } from './Fields/LegalEntityNameField';
 import { LegalFormField } from './Fields/LegalFormField';
 import { LocalitiesField } from './Fields/LocalitiesField';
 import { MandatoryIncomeField } from './Fields/MandatoryIncome';
+import { MethodObtainField } from './Fields/MethodObtainField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
 import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
@@ -177,6 +180,7 @@ export const getField =
       dulSubdivisionCode: <DulSubdivisionCodeField field={field} input={input} />,
       dulIssuedBy: <DulIssuedByField field={field} input={input} />,
       addressRegistration: <AddressField field={field} input={input} />,
+      addressCourier: <AddressField field={field} input={input} />,
       participantDateRegistration: <ParticipantDateRegistrationField field={field} input={input} />,
       retirementIncome: <RetirementIncomeField field={field} input={input} />,
       otherIncome: <OtherIncomeField field={field} input={input} />,
@@ -197,6 +201,8 @@ export const getField =
       cardCategory: <CardCategoryField field={field} input={input} />,
       codeWord: <CodeWordField field={field} input={input} />,
       confirmationIncome: <ConfirmationIncomeField field={field} input={input} />,
+      methodObtain: <MethodObtainField field={field} input={input} />,
+      deliveryDate: <DeliveryDateFiels field={field} input={input} />,
     };
 
     return isRenderField({ input, field }) ? (

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

@@ -84,6 +84,8 @@ export const validatorObj: Record<string, Validator> = {
   sex: defaultValidator('Укажите свой пол'),
   addressRegistration: addressDaDataValidator(),
   organizationAddress: addressDaDataValidator(),
+  deliveryDate: defaultValidator('Укажите дату доставки'),
+  addressCourier: addressDaDataValidator(),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
@@ -98,7 +100,10 @@ export const validatorObj: Record<string, Validator> = {
   regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
-  codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
+  codeWord: codeWordValidator('Необходимо ввести кодовое слово латиницей'),
+  currency: defaultValidator(),
+  paymentSystem: defaultValidator(),
+  cardCategory: defaultSelectValidator(),
   confirmationIncome: defaultValidator(),
 };