@redneckz/wildless-cms-uni-blocks 0.14.665 → 0.14.667

package/mobile/src/ui-kit/FormField/Fields/{RetailAddressField.tsx → AddressRetailField.tsx}

@@ -1,9 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { regionOffices, type OfficeType } from '../../../api/RetailAPI/regionOffices';
 import { getOfficePoint } from '../../../components/OfficesAtmsMap/renderOfficeCard';
 import { useOfficesAtmsMapData } from '../../../components/OfficesAtmsMap/useOfficesAtmsMapData';
-import { type Branch } from '../../../hooks/useBranches';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { ClientOnly } from '../../ClientOnly';
 import { SelectControl } from '../../Select/SelectControl';
 import { YandexMap } from '../../YandexMap/YandexMap';
@@ -11,43 +11,40 @@ import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-type RegionFieldProps = CustomFieldProps;
+export const AddressRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [offices, setOffices] = useState<OfficeType[]>([]);
+  const { data } = useLeadFormData('REGION_RF');
 
-export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
-  const fieldRegion = field('regionRetail');
+  const regionValue = field('regionRetail')?.value || {};
   const fieldBranch = field('addressRetail');
-  const regions = useBranchesByRegions();
-  const regionKey = fieldRegion?.value?.key as string;
-  const selectedRegion = regions.find(({ region }) => region === regionKey);
-
-  const isLoad = !regions;
-
-  const regionText = fieldRegion?.value?.text as string;
-  const addressBranchRetail = useBranchesByRegions()?.find(
-    (_) => _?.region === regionText,
-  )?.branches;
 
   useEffect(() => {
-    if (fieldRegion?.value?.key !== '') {
+    (async () => {
+      const officesList = await regionOffices((regionValue?.key as string) ?? '');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      setOffices(officesList || []);
+    })();
+
+    if (regionValue?.key) {
       field?.('addressRetail')?.onChange?.('');
     }
-  }, [fieldRegion?.value]);
+  }, [regionValue.key]);
 
   const { points } = useOfficesAtmsMapData({
-    data: (selectedRegion?.branches as Branch[]) || [],
+    data: offices,
     filtrationState: {},
     getBalloon: getOfficePoint,
   });
 
-  const isRegionSelected = Boolean(fieldRegion?.value?.key);
+  const isRegionSelected = Boolean(regionValue?.key);
 
   return (
     <div>
       <SelectControl
         label="Адрес отделения"
         placeholder="Выберите отделение"
-        options={(addressBranchRetail || []).map(({ address = '' }) => ({
-          key: address,
+        options={offices.map(({ id, address = '' }) => ({
+          key: id?.toString() || '',
           text: address,
         }))}
         {...getValidation(
@@ -61,7 +58,7 @@ export const RetailAddressField = JSX<RegionFieldProps>(({ field, input }) => {
         <ClientOnly>
           <YandexMap
             points={points}
-            isLoad={isLoad}
+            isLoad={!data}
             className="h-full"
             selectedAddress={fieldBranch?.value?.text}
           />

package/{src/ui-kit/FormField/Fields/OtherPayments.tsx → mobile/src/ui-kit/FormField/Fields/MandatoryPaymentsField.tsx}

@@ -4,12 +4,12 @@ import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const OtherPaymentsField = JSX<CustomFieldProps>(({ field, input }) => (
+export const MandatoryPaymentsField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Обязательные выплаты"
     placeholder="Введите значение"
     type="number"
-    {...getValidation(field('otherPayments'), validatorObj.otherPayments, input?.required)}
+    {...getValidation(field('mandatoryPayments'), validatorObj.mandatoryPayments, input?.required)}
     {...input}
   />
 ));

package/{src/ui-kit/FormField/Fields/RetailRegionField.tsx → mobile/src/ui-kit/FormField/Fields/RegionRetailField.tsx}

@@ -1,23 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
+import { useLeadFormData } from '../../../hooks/useLeadFormData';
+import { type Option } from '../../Select/Option';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetailRegionField = JSX<CustomFieldProps>(({ field, input }) => {
-  const regions = useBranchesByRegions();
+export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { data: regions } = useLeadFormData('REGION_RF');
+  const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
 
   return (
     <SelectControl
       label="Регион"
       placeholder="Выберите регион"
       isSearch={true}
-      options={useMemo(
-        () => regions?.map(({ region = '' }) => ({ key: region, text: region })),
-        [regions],
-      )}
+      options={formatRegions as Option[]}
       {...getValidation(field('regionRetail'), validatorObj.regionRetail, input?.required)}
     />
   );

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

@@ -1,15 +1,31 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { InputControl } from '../../Input/InputControl';
 import type { CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
 
-export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl
-    label="Пенсионные доходы"
-    placeholder="Введите значение"
-    type="number"
-    {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
-    {...input}
-  />
-));
+export const RetirementIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const currentWages = field('wages')?.value;
+
+  const onChange = useCallback(
+    (_: string) => {
+      const incomesSum = Number(_) + Number(currentWages || 0);
+
+      field('retirementIncome')?.onChange?.(_);
+      field('incomeAverage')?.onChange?.(String(incomesSum));
+    },
+    [currentWages],
+  );
+
+  return (
+    <InputControl
+      label="Пенсионные доходы"
+      placeholder="Введите значение"
+      type="number"
+      {...getValidation(field('retirementIncome'), validatorObj.retirementIncome, input?.required)}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

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

@@ -0,0 +1,31 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { InputControl } from '../../Input/InputControl';
+import type { CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const WagesField = JSX<CustomFieldProps>(({ field, input }) => {
+  const currentRetirementIncome = field('retirementIncome')?.value;
+
+  const onChange = useCallback(
+    (_: string) => {
+      const incomesSum = Number(_) + Number(currentRetirementIncome || 0);
+
+      field('wages')?.onChange?.(_);
+      field('incomeAverage')?.onChange?.(String(incomesSum));
+    },
+    [currentRetirementIncome],
+  );
+
+  return (
+    <InputControl
+      label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
+      placeholder="Введите значение"
+      type="number"
+      {...getValidation(field('wages'), validatorObj.wages, input?.required)}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

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

@@ -76,8 +76,12 @@ export type NameFieldDef =
   | 'participantDateRegistration'
   | 'retirementIncome'
   | 'otherIncome'
-  | 'mandatoryIncome'
+  | 'incomeAverage'
+  | 'mandatoryPayments'
+  | 'additionalIncome'
   | 'otherPayments'
+  | 'rentalIncome'
+  | 'wages'
   | 'creditInRshbCd'
   | 'disablePeopleFlg'
   | 'bankruptcyFlg'

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

@@ -18,10 +18,20 @@ export interface SelectFieldProps extends CustomFieldProps, UniBlockProps {
   source?: LeadProps[];
   label: string;
   fieldName: string;
+  placeholder?: string;
+  isSearch?: boolean;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
-  ({ field, source, label, fieldName, input }) => {
+  ({
+    field,
+    source,
+    label,
+    fieldName,
+    input,
+    placeholder = 'Выберите из списка',
+    isSearch = false,
+  }) => {
     const leadOptions: Option[] =
       (source &&
         source?.map((_: LeadProps) => ({
@@ -32,9 +42,10 @@ export const SelectField = UniBlock<SelectFieldProps>(
 
     return (
       <SelectControl
-        placeholder="Выберите из списка"
+        placeholder={placeholder}
         label={label}
         options={leadOptions}
+        isSearch={isSearch}
         {...getValidation(field(fieldName), validatorObj[fieldName], input?.required)}
       />
     );

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

@@ -10,6 +10,7 @@ import { AddressBranchField } from './Fields/AddressBranchField';
 import { AddressFactField } from './Fields/AddressFactField';
 import { AddressField } from './Fields/AddressField';
 import { AddressMatchField } from './Fields/AddressMatchField';
+import { AddressRetailField } from './Fields/AddressRetailField';
 import { AmountField } from './Fields/AmountField';
 import { AmountWorkersField } from './Fields/AmountWorkersField';
 import { AnnualRevenueField } from './Fields/AnnualRevenueField';
@@ -59,7 +60,7 @@ import { LastJobExperienceField } from './Fields/LastJobExperienceField';
 import { LegalEntityNameField } from './Fields/LegalEntityNameField';
 import { LegalFormField } from './Fields/LegalFormField';
 import { LocalitiesField } from './Fields/LocalitiesField';
-import { MandatoryIncomeField } from './Fields/MandatoryIncome';
+import { MandatoryPaymentsField } from './Fields/MandatoryPaymentsField';
 import { MethodObtainField } from './Fields/MethodObtainField';
 import { MiddleNameField } from './Fields/MiddleNameField';
 import { NameField } from './Fields/NameField';
@@ -67,7 +68,6 @@ import { OnlineCheckoutField } from './Fields/OnlineCheckoutField';
 import { OrganizationField } from './Fields/OrganizationField';
 import { OrganizationNameField } from './Fields/OrganizationNameField';
 import { OtherIncomeField } from './Fields/OtherIncomeField';
-import { OtherPaymentsField } from './Fields/OtherPayments';
 import { ParticipantDateRegistrationField } from './Fields/ParticipantDateRegistrationField';
 import { PartInBusinessField } from './Fields/PartInBusinessField';
 import { PartnerCommentsField } from './Fields/PartnerCommentsField';
@@ -78,8 +78,7 @@ import { PosTerminalField } from './Fields/PosTerminalField';
 import { ProductField } from './Fields/ProductField';
 import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
-import { RetailAddressField } from './Fields/RetailAddressField';
-import { RetailRegionField } from './Fields/RetailRegionField';
+import { RegionRetailField } from './Fields/RegionRetailField';
 import { RetirementIncomeField } from './Fields/RetirementIncomeField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
@@ -91,6 +90,7 @@ import { TermField } from './Fields/TermField';
 import { TotalIncomeField } from './Fields/TotalIncomeField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
 import { VedField } from './Fields/VedField';
+import { WagesField } from './Fields/WagesField';
 import { isRenderField } from './isRenderField';
 
 const PRODUCT_REF = {
@@ -184,8 +184,8 @@ export const getField =
       participantDateRegistration: <ParticipantDateRegistrationField field={field} input={input} />,
       retirementIncome: <RetirementIncomeField field={field} input={input} />,
       otherIncome: <OtherIncomeField field={field} input={input} />,
-      mandatoryIncome: <MandatoryIncomeField field={field} input={input} />,
-      otherPayments: <OtherPaymentsField field={field} input={input} />,
+      wages: <WagesField field={field} input={input} />,
+      mandatoryPayments: <MandatoryPaymentsField field={field} input={input} />,
       disablePeopleFlg: <DisablePeopleFlgField field={field} input={input} />,
       bankruptcyFlg: <BankruptcyFlgField field={field} input={input} />,
       shareholderFlg: <ShareholderFlgField field={field} input={input} />,
@@ -193,8 +193,8 @@ export const getField =
       creditInRshbCd: <CreditInRshbCdField field={field} input={input} />,
       bankEmployeeCode: <BankEmpoleeCodeField field={field} input={input} />,
       partInBusiness: <PartInBusinessField field={field} input={input} />,
-      regionRetail: <RetailRegionField field={field} input={input} />,
-      addressRetail: <RetailAddressField field={field} input={input} />,
+      regionRetail: <RegionRetailField field={field} input={input} />,
+      addressRetail: <AddressRetailField field={field} input={input} />,
       addressMatch: <AddressMatchField field={field} input={input} />,
       paymentSystem: <PaymentSystemField field={field} input={input} />,
       currency: <CurrencyField field={field} input={input} />,

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

@@ -62,6 +62,7 @@ export const validatorObj: Record<string, Validator> = {
   feedbackMethod: defaultSelectValidator(),
   serviceType: defaultSelectValidator(),
   serviceDirection: defaultSelectValidator(),
+  regionRetail: defaultSelectValidator('Выберите регион'),
   meetingDay: defaultValidator(),
   product: defaultValidator(),
   localities: defaultValidator(),
@@ -88,15 +89,14 @@ export const validatorObj: Record<string, Validator> = {
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),
   retirementIncome: defaultValidator(),
   otherIncome: defaultValidator(),
-  mandatoryIncome: defaultValidator(),
-  otherPayments: defaultValidator(),
+  wages: defaultValidator(),
+  mandatoryPayments: defaultValidator(),
   disablePeopleFlg: defaultValidator(),
   bankruptcyFlg: defaultValidator(),
   shareholderFlg: defaultValidator(),
   legalEntityName: defaultValidator(),
   bankEmployeeCode: defaultValidator(),
   partInBusiness: defaultValidator(),
-  regionRetail: defaultSelectValidator('Выберите филиал банка'),
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   codeWord: codeWordValidator('Необходимо ввести кодовое слово'),

package/mobile/src/ui-kit/YandexMap/YandexMap.tsx

@@ -19,7 +19,7 @@ interface YandexMapProps {
   selectedAddress?: string;
 }
 
-const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
+export const DEFAULT_CENTER_COORDS = [55.753995, 37.614069];
 
 // TODO: Поле для поиска: невыяснено среди каких данных делать поиск (искать в имени офиса, в адресе, метро и т.д.).
 //       Сейчас реализован поиск среди тестовых данных
@@ -33,7 +33,7 @@ export const YandexMap = JSX<YandexMapProps>(
 
     useEffect(() => {
       if (map.current) {
-        renderClusterer({ yandexMaps, map: map.current, points, isLoad });
+        renderClusterer({ yandexMaps, map: map.current, points, isLoad, selectedAddress });
       } else {
         yandexMaps?.ready(() => {
           // Ready function may be called few times, but must be called once

package/package.json

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

package/src/api/RetailAPI/regionOffices.ts

@@ -0,0 +1,36 @@
+import { DEFAULT_CENTER_COORDS } from './../../ui-kit/YandexMap/YandexMap';
+import { doRequest } from './doRequest';
+
+export type OfficeType = {
+  address?: string;
+  id?: number;
+  regionRfCd?: {
+    key: string;
+    text: string;
+  };
+  gpsLatitude?: number;
+  gpsLongitude?: number;
+  latitude?: number;
+  longitude?: number;
+};
+
+export interface RegionOfficesResponseType {
+  offices: OfficeType[];
+}
+
+export const regionOffices = async (regionKey: string) => {
+  const response: Response = await doRequest('/public-data/regionOffices', 'POST', {
+    regionRfCd: {
+      key: regionKey,
+    },
+    cashCardFlg: true,
+  });
+
+  return await response.json().then((_) =>
+    _?.offices?.map((office: OfficeType) => ({
+      ...office,
+      gpsLatitude: (office.latitude ?? DEFAULT_CENTER_COORDS[0]).toString().replace(',', '.'),
+      gpsLongitude: (office.longitude ?? DEFAULT_CENTER_COORDS[1]).toString().replace(',', '.'),
+    })),
+  );
+};

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -27,6 +27,7 @@ export interface FormState {
   amount?: number;
   annualRevenue?: string;
   consentDataProcessing?: boolean;
+  addressRetail?: Option;
 }
 
 const initialFormState = {
@@ -54,6 +55,7 @@ const initialFormState = {
   posTerminal: false,
   consentToReceiveMaterials: false,
   consentDataProcessing: false,
+  addressRetail: { key: '', text: '' },
 };
 
 export const getInitialFormState = (inputs: FieldDef[], typeForm = ''): FormState => {

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -23,7 +23,7 @@ export type FormStateDeliveryType = {
   bankEmployeeCode?: number;
   methodObtain?: 'office' | 'courier';
   deliveryDate?: Date | string;
-  addressRetail?: Address;
+  addressRetail?: Option;
   addressCourier?: Address;
 };
 
@@ -123,8 +123,12 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   participantDateRegistration?: Date | string;
   retirementIncome?: number;
   otherIncome?: number;
-  mandatoryIncome?: number;
+  incomeAverage?: number;
+  mandatoryPayments?: number;
+  additionalIncome?: number;
   otherPayments?: number;
+  rentalIncome?: number;
+  wages?: number;
   creditInRshbCd?: Option;
   disablePeopleFlg?: boolean;
   bankruptcyFlg?: boolean;
@@ -145,6 +149,7 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   isSalaryClient?: boolean;
   isPensionClient?: boolean;
   isStateEmployee?: boolean;
+  addressRetail?: Option;
 }
 
 const initialFormState = {
@@ -183,6 +188,7 @@ const initialFormState = {
   paymentSystem: '',
   cardCategory: { key: '', text: '' },
   codeWord: '',
+  addressRetail: { key: '', text: '' },
 };
 
 export const getInitialFormState = (

package/src/components/ContentPage/useContentPageData.ts

@@ -3,7 +3,7 @@ import { type BlocksRegistry } from '../../model/BlocksRegistry';
 import { type BlockDef, type ContentPageDef } from '../../model/ContentPageDef';
 import baseData from './ContentPage.page.json';
 
-const BLOCK_TYPES_BLACK_LIST = ['Header', 'Footer', 'Placeholder'];
+const BLOCK_TYPES_BLACK_LIST = ['Header', 'Footer', 'Placeholder', 'CreditForm', 'CreditCardForm'];
 
 export function useContentPageData(blocksRegistry: BlocksRegistry): ContentPageDef {
   const [data, setData] = useState<ContentPageDef>(baseData as ContentPageDef);

package/src/components/CreditCardForm/CreditCardForm.fixture.tsx

@@ -3,6 +3,17 @@ import { DialogManager } from '../../ui-kit/DialogManager/DialogManager';
 import { PopupManager } from '../../ui-kit/PopupManager/PopupManager';
 import { CreditCardForm } from './CreditCardForm';
 
+const MOCK_TOKEN = 'mock-key';
+const MOCK_TASK_ID = '111111';
+
+const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
+const accessToken = globalThis.sessionStorage?.getItem('accessToken');
+const taskId = globalThis.localStorage.getItem('taskId');
+
+!refreshToken && globalThis.sessionStorage?.setItem('refreshToken', MOCK_TOKEN);
+!accessToken && globalThis.sessionStorage?.setItem('accessToken', MOCK_TOKEN);
+!taskId && globalThis.localStorage.setItem('taskId', MOCK_TASK_ID);
+
 export default {
   default: (
     <div>

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,5 +1,6 @@
 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 { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
@@ -24,6 +25,8 @@ const WIZARD_TITLES = [
 export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...rest }) => {
   const [step, setStep] = useState(0);
 
+  useEffect(updateRefreshToken, []);
+
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));
   }, []);

package/src/components/CreditCardForm/creditCardFormStepsData.tsx

@@ -205,11 +205,11 @@ export const stepsSectionsMap: CreditCardSectionsProps[][] = [
     },
     {
       columns: 1,
-      inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+      inputs: [{ fieldType: 'common', name: 'wages', required: true }],
     },
     {
       columns: 1,
-      inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+      inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
     },
     {
       columns: 1,

package/src/components/CreditCardForm/formStateMap.tsx

@@ -63,8 +63,8 @@ export const formStateMap: Partial<FormState>[] = [
     dependents: undefined,
     familyMembers: undefined,
     confirmationIncome: { key: '', text: '' },
-    mandatoryIncome: undefined,
-    otherPayments: undefined,
+    wages: undefined,
+    mandatoryPayments: undefined,
     snils: '',
     armyIdFlg: false,
   },
@@ -78,8 +78,8 @@ export const formStateMap: Partial<FormState>[] = [
   {
     regionRetail: '',
     addressRetail: {
-      fullAddress: '',
-      fiasCode: '',
+      key: '',
+      text: '',
     },
     bankEmployeeCode: undefined,
     addressCourier: {

package/src/components/CreditCardForm/getFourthStepData.ts

@@ -7,8 +7,14 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     familyStatus,
     dependents,
     familyMembers,
-    mandatoryIncome,
+    wages,
+    mandatoryPayments,
+    incomeAverage,
+    additionalIncome,
+    otherIncome,
     otherPayments,
+    rentalIncome,
+    retirementIncome,
     snils,
     armyIdFlg,
   } = formData;
@@ -18,8 +24,14 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     totalDependents: familyMembers,
     otherDependents: dependents,
     participantIncomes: getParticipantIncomes({
-      mandatoryIncome,
+      wages,
+      mandatoryPayments,
+      incomeAverage,
+      additionalIncome,
+      otherIncome,
       otherPayments,
+      rentalIncome,
+      retirementIncome,
     }),
     snils: snils?.replaceAll(' ', ''),
     armyIdFlg,

package/src/components/CreditForm/creditFormStepsData.tsx

@@ -198,11 +198,11 @@ export const stepsSectionsMap: SectionsProps[][] = [
     },
     {
       columns: 1,
-      inputs: [{ fieldType: 'common', name: 'mandatoryIncome', required: true }],
+      inputs: [{ fieldType: 'common', name: 'wages', required: true }],
     },
     {
       columns: 1,
-      inputs: [{ fieldType: 'common', name: 'otherPayments', required: true }],
+      inputs: [{ fieldType: 'common', name: 'mandatoryPayments', required: true }],
     },
     {
       columns: 1,

package/src/components/CreditForm/formStateMap.tsx

@@ -61,8 +61,8 @@ export const formStateMap: Partial<FormState>[] = [
     dependents: undefined,
     familyMembers: undefined,
     confirmationIncome: { key: '', text: '' },
-    mandatoryIncome: undefined,
-    otherPayments: undefined,
+    wages: undefined,
+    mandatoryPayments: undefined,
     snils: '',
     armyIdFlg: false,
   },

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,5 +1,6 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
@@ -27,7 +28,7 @@ export const getCreditFormTaskData = ({
     taskSource: globalThis.location.origin,
     id: taskId,
     office: {
-      id: '650', // TODO: Remove hardcode
+      id: '',
     },
     authorizedAgentId: formData?.bankEmployeeCode,
     participants: [
@@ -44,6 +45,7 @@ export const getCreditFormTaskData = ({
       },
     ],
     ...getZeroStepData(formData), // moved from participants
+    ...getFifthStepData(formData),
     esiaAccountTypeCd: {
       key: formData?.esiaAccountTypeCd?.key,
     } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],

package/src/components/CreditForm/getFifthStepData.ts

@@ -0,0 +1,10 @@
+import { type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+
+export const getFifthStepData = (formData: FormState): Partial<UpdateUserTaskBody['task']> => {
+  const { addressRetail } = formData;
+
+  return {
+    office: addressRetail?.key ? { id: addressRetail.key } : undefined,
+  };
+};