@redneckz/wildless-cms-uni-blocks 0.14.698 → 0.14.700

package/mobile/src/api/RetailAPI/utils/getUpdateUserProfile.ts

@@ -1,11 +1,13 @@
-import { type FormState } from '../../../components/ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../../../components/ApplicationLeadForm/LeadFormState';
 import { formatDate } from '../../../utils/formatDate';
 import { formatPhone } from '../../../utils/formatPhone';
 import { type UpdateUserProfileBody } from '../updateUserProfile';
 
+// TODO Не должно быть импортов из бизнес-слоя в API слой. Только наоборот.
+
 export const getUpdateUserProfileData = (
   profileId: number,
-  formData: FormState,
+  formData: LeadFormState,
 ): UpdateUserProfileBody => {
   const {
     name = '',

package/mobile/src/api/dadataHints/dadataHintsType.ts

@@ -37,12 +37,15 @@ interface DaDataOrganization {
     value: string;
   };
   inn: string;
+  employee_count: number;
   name: {
     short_with_opf: string;
   };
   opf: {
     short: string;
+    code: string;
   };
+  okved: string;
 }
 
 export interface DaDataAddress {

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
@@ -13,7 +12,6 @@ import { style } from '../../utils/style';
 import { renderInputs } from '../ApplicationForm/renderInputs';
 import { applicationFormData } from './applicationFormData';
 import { type ApplicationLeadFormContent, type FieldDef } from './ApplicationLeadFormContent';
-import { getInitialFormState, type FormState } from './getInitialFormState';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
 import { useInitApplicationLead } from './useInitApplicationLead';
@@ -22,16 +20,16 @@ interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockP
 
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
-    const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[];
+    const inputs = useMemo(
+      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[],
+      [applicationFormData],
+    );
 
-    const { isLoading } = useInitApplicationLead(nextStepLink);
-    const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
-    const initialFormState = getInitialFormState(inputs, leadForm);
+    const [initialFormState, { isLoading }] = useInitApplicationLead(inputs, nextStepLink);
     const { handleSubmit, responseStatus } = useApplicationLeadApi({
       inputs,
       programId,
       nextStepLink,
-      saveForm: setLeadForm,
     });
 
     const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -5,7 +5,7 @@ import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 import { type TypeFormFieldDef } from '../ApplicationForm/ApplicationFormContent';
-import { type FormState } from './getInitialFormState';
+import { type LeadFormState } from './LeadFormState';
 
 interface Required {
   /** @title Обязательно для заполнения */
@@ -97,5 +97,5 @@ export type ApplicationLeadFormContent = UniBlockContent &
 export interface GroupedConsentsProps {
   inputs?: FieldDef[];
   typeForm?: TypeFormFieldDef;
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
 }

package/mobile/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -11,18 +11,18 @@ import { Icon } from '../../ui-kit/Icon/Icon';
 import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
 import { withValidator } from '../../validation/withValidator';
 import { type GroupedConsentsProps } from './ApplicationLeadFormContent';
-import { type FormState } from './getInitialFormState';
+import { type LeadFormState } from './LeadFormState';
 
 const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
 const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
 
 export const GroupedConsents = JSX<GroupedConsentsProps>(
   ({ inputs = [], typeForm = '', field, key }) => {
-    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof FormState).value));
+    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof LeadFormState).value));
 
     const handleGeneralToggle = (value: boolean) => {
       for (const item of inputs) {
-        const itemField = field(item.name as keyof FormState);
+        const itemField = field(item.name as keyof LeadFormState);
         itemField?.onChange && itemField.onChange(value);
       }
     };
@@ -34,8 +34,8 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
           ?.some((_) =>
             Boolean(
               withValidator(
-                field(_?.name as keyof FormState),
-                validatorObj[_?.name as keyof FormState],
+                field(_?.name as keyof LeadFormState),
+                validatorObj[_?.name as keyof LeadFormState],
               ).error,
             ),
           ),

package/mobile/src/components/ApplicationLeadForm/LeadFormState.ts

@@ -0,0 +1,152 @@
+import { type PaymentSystem, type PaymentType } from '../../api/RetailAPI/updateUserTask';
+import { type Option } from '../../ui-kit/Select/Option';
+
+export interface FormConsents {
+  processPersonalDataFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentPfrFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentToReceiveMaterials?: boolean;
+  consentOthersFlg?: boolean;
+}
+
+export type FormStateDeliveryType = {
+  regionRetail?: string;
+  bankEmployeeCode?: number;
+  methodObtain?: 'office' | 'courier';
+  deliveryDate?: Date | string;
+  addressRetail?: Option;
+  addressCourier?: Address;
+};
+
+export interface Address {
+  apartment?: string;
+  block?: string;
+  building?: string;
+  city?: string;
+  countryCode?: string;
+  district?: string;
+  fiasCode?: string;
+  fullAddress: string;
+  house?: string;
+  locality?: string;
+  okatoRegionCode?: string;
+  postcode?: string;
+  region?: string;
+  regionCode?: string;
+  street?: string;
+  qc?: string;
+  qcComplete?: string;
+  qcHouse?: string;
+}
+
+// TODO Какая то часть должна быть взята из RetailAPI
+export interface LeadFormState extends FormConsents, FormStateDeliveryType {
+  typeForm?: Option | string;
+  surname?: string;
+  name?: string;
+  middleName?: string;
+  fullName?: string;
+  registrationDate?: Date | string;
+  birthday?: Date | string;
+  limitedBirthday?: Date | string;
+  birthPlace?: string;
+  sex?: string;
+  phone?: string;
+  organizationPhone?: string;
+  secondaryPhone?: string;
+  education?: Option;
+  housing?: Option;
+  employment?: Option;
+  organization?: Option;
+  amountWorkers?: Option;
+  employerActivities?: Option;
+  employerOrganization?: Option;
+  positionOrganization?: Option;
+  dulSerie?: string;
+  dulNumber?: string;
+  dulIssueDateField?: Date | string;
+  dulSubdivisionCode?: string;
+  dulIssuedBy?: string;
+  email?: string;
+  acquiringType?: Option;
+  serviceType?: Option;
+  vedTypes?: string;
+  region?: Option;
+  onlineCheckout?: boolean;
+  posTerminal?: boolean;
+  term?: number;
+  amount?: number;
+  annualRevenue?: string;
+  serviceDirection?: string;
+  desiredMeetingDate?: string;
+  inn?: number;
+  legalForm?: string;
+  organizationName?: string;
+  generalSeniority?: string;
+  lastJobExperience?: number;
+  experience5Years?: number;
+  jobsNumber?: number;
+  organizationAddress?: Address;
+  beginDate?: Date | string;
+  addressFact?: Address;
+  addressBranch?: Option;
+  bankEmpolee?: string;
+  applicationDate?: string;
+  comment?: string;
+  isClient?: boolean;
+  feedbackMethod?: string;
+  collectionCount?: number;
+  product?: string;
+  localities?: string[];
+  partnerComments?: string;
+  consentDataProcessing?: boolean;
+  consentPhotoFlg?: boolean;
+  consentAssignmentClaimsFlg?: boolean;
+  consentCollectionFlg?: boolean;
+  familyStatus?: Option;
+  children?: number;
+  familyMembers?: number;
+  dependents?: number;
+  totalIncome?: number;
+  expenses?: number;
+  snils?: string;
+  conscription?: Option;
+  armyIdFlg?: boolean;
+  addressRegistration?: Address;
+  participantDateRegistration?: Date | string;
+  retirementIncome?: number;
+  otherIncome?: number;
+  incomeAverage?: number;
+  mandatoryPayments?: number;
+  additionalIncome?: number;
+  otherPayments?: number;
+  rentalIncome?: number;
+  wages?: number;
+  creditInRshbCd?: Option;
+  disablePeopleFlg?: boolean;
+  bankruptcyFlg?: boolean;
+  shareholderFlg?: boolean;
+  legalEntityName?: string;
+  partInBusiness?: number;
+  addressMatch?: boolean;
+  confirmationIncome?: Option;
+  currency?: string;
+  paymentSystem?: PaymentSystem;
+  cardCategory?: Option;
+  codeWord?: string;
+  esiaAccountTypeCd?: Option;
+  calculator?: {
+    moneyValue?: number;
+    monthsValue?: number;
+    isAnnuity?: boolean;
+    isInsurance?: boolean;
+    isSalaryClient?: boolean;
+    isPensionClient?: boolean;
+    isStateEmployee?: boolean;
+  };
+  addressRetail?: Option;
+  loanAmount?: number;
+  creditPeriod?: number;
+  paymentTypeCd?: PaymentType;
+}

package/mobile/src/components/ApplicationLeadForm/consents.ts

@@ -1,9 +1,9 @@
-import { type FormConsents } from './getInitialFormState';
+import { type FormConsents } from './LeadFormState';
 
-type ConsentData = {
+interface ConsentData {
   text: string;
   docId?: number;
-};
+}
 
 export const CONSENTS: Record<keyof FormConsents, ConsentData> = {
   processPersonalDataFlg: {

package/mobile/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -1,5 +1,3 @@
-/* eslint-disable max-lines */
-import { type PaymentType } from '../../api/RetailAPI/updateUserTask';
 import {
   FEEDBACK_METHOD,
   SERVICE_DIRECTIONS,
@@ -7,157 +5,8 @@ import {
 } from '../../ui-kit/FormField/constants';
 import { ACQUIRING_TYPES } from '../../ui-kit/FormField/Fields/AcquiringField';
 import { VED_TYPES } from '../../ui-kit/FormField/Fields/VedField';
-import { type Option } from '../../ui-kit/Select/Option';
 import { type FieldDef } from './ApplicationLeadFormContent';
-
-export interface FormConsents {
-  processPersonalDataFlg?: boolean;
-  consentProviderFlg?: boolean;
-  consentPfrFlg?: boolean;
-  consentInformFlg?: boolean;
-  consentToReceiveMaterials?: boolean;
-  consentOthersFlg?: boolean;
-}
-
-export type FormStateDeliveryType = {
-  regionRetail?: string;
-  bankEmployeeCode?: number;
-  methodObtain?: 'office' | 'courier';
-  deliveryDate?: Date | string;
-  addressRetail?: Option;
-  addressCourier?: Address;
-};
-
-export interface Address {
-  apartment?: string;
-  block?: string;
-  building?: string;
-  city?: string;
-  countryCode?: string;
-  district?: string;
-  fiasCode?: string;
-  fullAddress: string;
-  house?: string;
-  locality?: string;
-  okatoRegionCode?: string;
-  postcode?: string;
-  region?: string;
-  regionCode?: string;
-  street?: string;
-  qc?: string;
-  qcComplete?: string;
-  qcHouse?: string;
-}
-
-export interface FormState extends FormConsents, FormStateDeliveryType {
-  typeForm?: Option | string;
-  surname?: string;
-  name?: string;
-  middleName?: string;
-  fullName?: string;
-  registrationDate?: Date | string;
-  birthday?: Date | string;
-  limitedBirthday?: Date | string;
-  birthPlace?: string;
-  sex?: string;
-  phone?: string;
-  organizationPhone?: string;
-  secondaryPhone?: string;
-  education?: Option;
-  housing?: Option;
-  employment?: Option;
-  organization?: Option;
-  amountWorkers?: Option;
-  employerActivities?: Option;
-  employerOrganization?: Option;
-  positionOrganization?: Option;
-  dulSerie?: string;
-  dulNumber?: string;
-  dulIssueDateField?: Date | string;
-  dulSubdivisionCode?: string;
-  dulIssuedBy?: string;
-  email?: string;
-  acquiringType?: Option;
-  serviceType?: Option;
-  vedTypes?: string;
-  region?: Option;
-  onlineCheckout?: boolean;
-  posTerminal?: boolean;
-  term?: number;
-  amount?: number;
-  annualRevenue?: string;
-  serviceDirection?: string;
-  desiredMeetingDate?: string;
-  inn?: number;
-  legalForm?: string;
-  organizationName?: string;
-  generalSeniority?: string;
-  lastJobExperience?: number;
-  experience5Years?: number;
-  jobsNumber?: number;
-  organizationAddress?: Address;
-  beginDate?: Date | string;
-  addressFact?: Address;
-  addressBranch?: Option;
-  bankEmpolee?: string;
-  applicationDate?: string;
-  comment?: string;
-  isClient?: boolean;
-  feedbackMethod?: string;
-  collectionCount?: number;
-  product?: string;
-  localities?: string[];
-  partnerComments?: string;
-  consentDataProcessing?: boolean;
-  consentPhotoFlg?: boolean;
-  consentAssignmentClaimsFlg?: boolean;
-  consentCollectionFlg?: boolean;
-  familyStatus?: Option;
-  children?: number;
-  familyMembers?: number;
-  dependents?: number;
-  totalIncome?: number;
-  expenses?: number;
-  snils?: string;
-  conscription?: Option;
-  armyIdFlg?: boolean;
-  addressRegistration?: Address;
-  participantDateRegistration?: Date | string;
-  retirementIncome?: number;
-  otherIncome?: number;
-  incomeAverage?: number;
-  mandatoryPayments?: number;
-  additionalIncome?: number;
-  otherPayments?: number;
-  rentalIncome?: number;
-  wages?: number;
-  creditInRshbCd?: Option;
-  disablePeopleFlg?: boolean;
-  bankruptcyFlg?: boolean;
-  shareholderFlg?: boolean;
-  legalEntityName?: string;
-  partInBusiness?: number;
-  addressMatch?: boolean;
-  confirmationIncome?: Option;
-  currency?: string;
-  paymentSystem?: string;
-  cardCategory?: Option;
-  codeWord?: string;
-  esiaAccountTypeCd?: Option;
-  calculator?: {
-    moneyValue?: number;
-    monthsValue?: number;
-    isAnnuity?: boolean;
-    isInsurance?: boolean;
-    isSalaryClient?: boolean;
-    isPensionClient?: boolean;
-    isStateEmployee?: boolean;
-  };
-  addressRetail?: Option;
-  loanAmount?: number;
-  creditPeriod?: number;
-  paymentTypeCd?: PaymentType;
-}
+import type { LeadFormState } from './LeadFormState';
 
 const initialFormState = {
   typeForm: '',
@@ -193,7 +42,7 @@ const initialFormState = {
   addressRegistration: '',
   participantDateRegistration: undefined,
   currency: '',
-  paymentSystem: '',
+  paymentSystem: { name: '', type: '' },
   cardCategory: { key: '', text: '' },
   codeWord: '',
   addressRetail: { key: '', text: '' },
@@ -201,14 +50,10 @@ const initialFormState = {
 
 export const getInitialFormState = (
   inputs: FieldDef[],
-  savedForm: FormState | null,
-  typeForm = '',
-): FormState => {
+  savedForm: LeadFormState | null,
+): LeadFormState => {
   if (savedForm) {
-    const formStateCopy = { ...savedForm };
-    formStateCopy.limitedBirthday = new Date(formStateCopy?.limitedBirthday || 0);
-
-    return formStateCopy;
+    return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
   }
 
   const formState = Object.fromEntries(
@@ -218,5 +63,5 @@ export const getInitialFormState = (
     ]),
   );
 
-  return { ...formState, typeForm: { key: '' || typeForm, text: '' } };
+  return { ...formState, typeForm: { key: '', text: '' } };
 };

package/mobile/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -1,15 +1,15 @@
 import { type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../../components/ApplicationLeadForm/getInitialFormState';
 import { locationNavigator } from '../../external/locationNavigator';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { getParticipantContacts } from '../CreditForm/utils';
+import { type LeadFormState } from './LeadFormState';
 
 type getLeadFormTaskDataProps = {
   participantId: number;
   taskId: number;
   profileId: number;
-  formData: FormState;
+  formData: LeadFormState;
 };
 
 export const getLeadFormTaskData = ({

package/mobile/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -1,8 +1,8 @@
 import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
-import { type Address, type FormState } from './getInitialFormState';
+import { type Address, type LeadFormState } from './LeadFormState';
 
-export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormState => {
+export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFormState => {
   const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
 
   return {

package/mobile/src/components/ApplicationLeadForm/{useApplicationLeadApi.ts → useApplicationLeadApi.tsx}

@@ -4,7 +4,7 @@ import { createUserProfile } from '../../api/RetailAPI/createUserProfile';
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
 import { getUpdateUserProfileData } from '../../api/RetailAPI/utils/getUpdateUserProfile';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useSetter } from '../../hooks/useSetter';
 import { useConsentBkiDialog } from '../../ui-kit/ConsentBkiDialog/useConsentBkiDialog';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { useEsiaLoginDialog } from '../../ui-kit/EsiaLoginDialog/useEsiaLoginDialog';
@@ -15,34 +15,31 @@ import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from './ApplicationLeadFormContent';
 import { CONSENTS } from './consents';
-import { type FormState } from './getInitialFormState';
 import { getLeadFormTaskData } from './getLeadFormTaskData';
+import { type LeadFormState } from './LeadFormState';
+import { useLeadFormStore } from './useLeadFormStore';
 
-type ApplicationLeadApiProps = {
+interface ApplicationLeadApiProps {
   inputs: FieldDef[];
   programId: string;
   nextStepLink: string;
-  saveForm: (value: FormState) => void;
-};
+}
 
-type UserData = {
+interface UserData {
   participantId: number;
   taskId: number;
   profileId: number;
   programId: string;
-};
+}
 
 export const useApplicationLeadApi = ({
   inputs,
   programId,
   nextStepLink,
-  saveForm,
 }: ApplicationLeadApiProps) => {
   const [responseStatus, setResponseStatus] = useState<'OK' | 'Fail' | ''>('');
-  const [, setTaskId] = useLocalStorage<number>('taskId');
-  const [, setProfileId] = useLocalStorage<number>('profileId');
-  const [, setParticipantId] = useLocalStorage<number>('participantId');
-  const [, setProgramId] = useLocalStorage<string>('programId');
+  const leadFormStore = useLeadFormStore();
+  const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
   const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
@@ -50,16 +47,16 @@ export const useApplicationLeadApi = ({
 
   const saveUserData = useCallback(
     ({ participantId, taskId, profileId, programId: programNumber }: UserData) => {
-      setParticipantId(participantId);
-      setTaskId(taskId);
-      setProfileId(profileId);
-      setProgramId(programNumber);
+      leadFormStore.participantId = participantId;
+      leadFormStore.taskId = taskId;
+      leadFormStore.profileId = profileId;
+      leadFormStore.programId = programNumber;
     },
     [],
   );
 
   // eslint-disable-next-line consistent-return
-  const handleSubmit = useCallback(async (formData: FormState) => {
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(getObjectValidator(inputs));
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return;
@@ -92,7 +89,8 @@ export const useApplicationLeadApi = ({
           .map((_) => CONSENTS[_]?.text);
 
         verifyPhoneDialog.open({
-          ...verifyPhoneContent(formData?.phone, acceptedConsents),
+          phone: formData?.phone,
+          consents: acceptedConsents,
           onSuccess: handleSuccessVerify,
         });
       }
@@ -116,9 +114,9 @@ const updateUserData = async ({
 }: {
   programId: string;
   profileId: number;
-  formData: FormState;
+  formData: LeadFormState;
   saveUserData: (userData: UserData) => void;
-  saveForm: (formData: FormState) => void;
+  saveForm: (formData: LeadFormState) => void;
 }) => {
   const transformedForm = transformOtherConsentsField(formData);
 
@@ -146,20 +144,7 @@ const updateUserData = async ({
   saveForm(formData);
 };
 
-const verifyPhoneContent = (phone: string, consents: string[]) => ({
-  title: 'Подтвердите номер телефона',
-  description: `Мы отправили код на ${phone}`,
-  phoneNumber: formatPhone(phone),
-  textButton: 'Далее',
-  __html: `<span>Вводя код, я подтверждаю, что ознакомлен и подписываю:</span>${consentsToList(
-    consents,
-  )}`,
-});
-
-const consentsToList = (consents?: string[]) =>
-  `<ul>${consents?.map((_) => '<li>' + _ + '</li>').join('')}</ul>`;
-
-const transformOtherConsentsField = (formData: FormState): FormState => {
+const transformOtherConsentsField = (formData: LeadFormState): LeadFormState => {
   const { consentOthersFlg, ...form } = formData;
 
   return {

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,16 +1,29 @@
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { locationNavigator } from '../../external/locationNavigator';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useSetter } from '../../hooks/useSetter';
 import { safeJsonParse } from '../../utils/safeJsonParse';
-import { type FormState } from './getInitialFormState';
+import { type FieldDef } from './ApplicationLeadFormContent';
+import { getInitialFormState } from './getInitialFormState';
+import { type LeadFormState } from './LeadFormState';
 import { parseEsiaProfile } from './pasreEsiaProfile';
+import { useLeadFormStore } from './useLeadFormStore';
 
-export const useInitApplicationLead = (nextStepLink: string) => {
+export const useInitApplicationLead = (
+  inputs: FieldDef[],
+  nextStepLink: string,
+): [LeadFormState, { isLoading: boolean }] => {
   const navigator = locationNavigator();
   const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
-  const [, setLeadForm] = useLocalStorage<FormState>('leadForm');
+
+  const leadFormStore = useLeadFormStore();
+  const saveForm = useSetter(leadFormStore, 'leadForm');
+
+  const initialFormState = useMemo(
+    () => getInitialFormState(inputs, leadFormStore.leadForm),
+    [inputs, leadFormStore.leadForm],
+  );
 
   const updateEsiaProfile = useCallback(
     async (profileId: string, code: string, state: string) => {
@@ -24,7 +37,7 @@ export const useInitApplicationLead = (nextStepLink: string) => {
         });
 
         if (data) {
-          setLeadForm((_) => ({
+          saveForm((_) => ({
             ..._,
             ...parseEsiaProfile(data),
           }));
@@ -54,7 +67,5 @@ export const useInitApplicationLead = (nextStepLink: string) => {
     }
   }, []);
 
-  return {
-    isLoading,
-  };
+  return [initialFormState, { isLoading }];
 };