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

package/mobile/src/components/CreditCardForm/getFifthStepData.ts

@@ -1,7 +1,7 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
-export const getFifthStepData = (formData: FormState): Partial<Participant> => {
+export const getFifthStepData = (formData: LeadFormState): Partial<Participant> => {
   const { bankruptcyFlg, shareholderFlg, legalEntityName, creditInRshbCd } = formData;
 
   return {

package/mobile/src/components/CreditCardForm/getFourthStepData.ts

@@ -1,8 +1,8 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantIncomes } from '../CreditForm/utils';
 
-export const getFourthStepData = (formData: FormState): Partial<Participant> => {
+export const getFourthStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     familyStatus,
     dependents,

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

@@ -1,10 +1,10 @@
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { formStateMap } from './formStateMap';
 
 export const getInitialFormState = (
   step: number,
   localStorageData: Record<string, any> | null,
-): FormState => ({
+): LeadFormState => ({
   ...formStateMap[step],
   ...localStorageData,
   limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),

package/mobile/src/components/CreditCardForm/getSecondStepData.tsx

@@ -1,10 +1,10 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
 
-export const getSecondStepData = (formData: FormState): Partial<Participant> => {
+export const getSecondStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     name,
     surname,

package/mobile/src/components/CreditCardForm/getSixthStepData.ts

@@ -1,8 +1,8 @@
 import { dateToISO } from '../../utils/dateToISO';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantAddresses } from '../CreditForm/utils';
 
-export const getDeliveryData = (formData: FormState) => {
+export const getDeliveryData = (formData: LeadFormState) => {
   const { methodObtain, deliveryDate = '' } = formData;
 
   const isCourierDelivery = methodObtain === 'courier';
@@ -16,7 +16,7 @@ export const getDeliveryData = (formData: FormState) => {
     : {};
 };
 
-export const getOfficeCode = (formData: FormState) => {
+export const getOfficeCode = (formData: LeadFormState) => {
   const { addressRetail, methodObtain } = formData;
 
   const isOfficeObtain = addressRetail?.key && methodObtain === 'office';
@@ -28,7 +28,7 @@ export const getOfficeCode = (formData: FormState) => {
     : {};
 };
 
-export const getSixthStepData = (formData: FormState) => {
+export const getSixthStepData = (formData: LeadFormState) => {
   const { addressCourier, methodObtain } = formData;
 
   const isCourierDelivery = methodObtain === 'courier';

package/mobile/src/components/CreditCardForm/getThirdStepData.tsx

@@ -1,10 +1,10 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
 
-export const getThirdStepData = (formData: FormState): Partial<Participant> => {
+export const getThirdStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     beginDate,
     employment,

package/mobile/src/components/CreditCardForm/renderInputs.tsx

@@ -1,11 +1,11 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { getField } from '../../ui-kit/FormField/getField';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export interface RenderInputsProps {
   inputs: FieldDef[];
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
   params?: Record<string, any>;
 }
 

package/mobile/src/components/CreditCardForm/renderStep.tsx

@@ -2,16 +2,16 @@ import { type FormFieldRegisterer, type FormOperatorProps } from '../../hooks/us
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, checkCondition, type GetValue } from './calculateInputs';
 import { type CreditCardSectionsProps } from './CreditCardFormContent';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
-export type CustomSubmit = FormOperatorProps<FormState>['onSubmit'];
+export type CustomSubmit = FormOperatorProps<LeadFormState>['onSubmit'];
 export interface StepProps {
   sections?: CreditCardSectionsProps[];
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
   step: number;
   params?: Record<string, any>;
 }
@@ -32,6 +32,6 @@ export const renderStep = ({ sections, field, step, params }: StepProps) =>
   });
 
 const getValue =
-  (field: FormFieldRegisterer<FormState>): GetValue =>
+  (field: FormFieldRegisterer<LeadFormState>): GetValue =>
   (name) =>
     field(name)?.value;

package/mobile/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -5,7 +5,7 @@ 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 FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, type GetValue } from './calculateInputs';
 import { getCreditCardFormTaskData } from './getCreditCardFormTaskData';
 
@@ -29,7 +29,7 @@ export const useCreditCardFormAPI = ({
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
 
-  const handleSubmit = useCallback(async (formData: FormState) => {
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(
       getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
     );
@@ -78,6 +78,6 @@ const resetForm = (isFinalStep: boolean, response: Response) => {
 };
 
 const getValue =
-  (formData: FormState): GetValue =>
+  (formData: LeadFormState): GetValue =>
   (name) =>
     formData[name];

package/mobile/src/components/CreditForm/PendingStatusContent.tsx

@@ -1,11 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { CreditFormStatus } from './CreditFormStatus';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [leadForm] = useLocalStorage<FormState>('leadForm');
+    const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
 
     return (
       <CreditFormStatus

package/mobile/src/components/CreditForm/calculateInputs.ts

@@ -1,8 +1,8 @@
 import { type Option } from '../../ui-kit/Select/Option';
 import { type FieldDef } from '../ApplicationForm/ApplicationFormContent';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
-export type GetValue = <K extends keyof FormState>(name: K) => FormState[K];
+export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
 export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
   inputs

package/mobile/src/components/CreditForm/formStateMap.tsx

@@ -1,6 +1,6 @@
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
-export const formStateMap: Partial<FormState>[] = [
+export const formStateMap: Partial<LeadFormState>[] = [
   {
     calculator: {
       moneyValue: 0,

package/mobile/src/components/CreditForm/getCalcData.ts

@@ -1,5 +1,5 @@
 import { type PaymentType, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
   annuity: { key: 'ANNUITY', value: 'Аннуитетный' },
@@ -7,7 +7,7 @@ const PAYMENT_TYPE_DATA: Record<string, PaymentType> = {
 };
 
 export const getCalcData = (
-  formData: FormState,
+  formData: LeadFormState,
 ): Pick<UpdateUserTaskBody['task'], 'loanAmount' | 'creditPeriod' | 'paymentTypeCd'> => {
   const { moneyValue, monthsValue, isAnnuity } = formData?.calculator ?? {};
 

package/mobile/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,6 +1,6 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { locationNavigator } from '../../external/locationNavigator';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getCalcData } from './getCalcData';
 import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
@@ -13,7 +13,7 @@ type getCreditFormTaskDataProps = {
   participantId: number;
   taskId: number;
   profileId: number;
-  formData: FormState;
+  formData: LeadFormState;
   step?: number;
 };
 
@@ -55,7 +55,7 @@ export const getCreditFormTaskData = ({
   };
 };
 
-const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
+const getCurrentStepData = (step: number, formData: LeadFormState): Partial<Participant> => {
   switch (step) {
     case 0:
       return getZeroStepData(formData);

package/mobile/src/components/CreditForm/getFifthStepData.ts

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

package/mobile/src/components/CreditForm/getFirstStepData.tsx

@@ -1,10 +1,10 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantAddresses, getParticipantContacts } from './utils';
 
-export const getFirstStepData = (formData: FormState): Partial<Participant> => {
+export const getFirstStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     name,
     surname,

package/mobile/src/components/CreditForm/getFourthStepData.ts

@@ -1,7 +1,7 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
-export const getFourthStepData = (formData: FormState): Partial<Participant> => {
+export const getFourthStepData = (formData: LeadFormState): Partial<Participant> => {
   const { bankruptcyFlg, shareholderFlg, legalEntityName, creditInRshbCd } = formData;
 
   return {

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

@@ -1,10 +1,10 @@
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { formStateMap } from './formStateMap';
 
 export const getInitialFormState = (
   step: number,
   localStorageData: Record<string, any> | null,
-): FormState => ({
+): LeadFormState => ({
   ...formStateMap[step],
   ...localStorageData,
   limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),

package/mobile/src/components/CreditForm/getSecondStepData.tsx

@@ -1,10 +1,10 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantAddresses, getParticipantContacts } from './utils';
 
-export const getSecondStepData = (formData: FormState): Partial<Participant> => {
+export const getSecondStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     beginDate,
     employment,

package/mobile/src/components/CreditForm/getThirdStepData.ts

@@ -1,8 +1,8 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { getParticipantIncomes } from './utils';
 
-export const getThirdStepData = (formData: FormState): Partial<Participant> => {
+export const getThirdStepData = (formData: LeadFormState): Partial<Participant> => {
   const {
     familyStatus,
     dependents,

package/mobile/src/components/CreditForm/getZeroStepData.ts

@@ -1,8 +1,8 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export const getZeroStepData = (
-  formData: FormState,
+  formData: LeadFormState,
 ): Pick<Participant, 'payrollCardRshbFlg' | 'consentInsuranceFlg'> => {
   const { isInsurance, isSalaryClient } = formData?.calculator ?? {};
 

package/mobile/src/components/CreditForm/renderInputs.tsx

@@ -1,11 +1,11 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { getField } from '../../ui-kit/FormField/getField';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 
 export interface RenderInputsProps {
   inputs: FieldDef[];
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
   params?: Record<string, any>;
 }
 

package/mobile/src/components/CreditForm/renderStep.tsx

@@ -3,16 +3,16 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { style } from '../../utils/style';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
-import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, type GetValue } from './calculateInputs';
 import { renderInfo } from './renderInfo';
 import { renderInputs } from './renderInputs';
 
-export type CustomSubmit = FormOperatorProps<FormState>['onSubmit'];
+export type CustomSubmit = FormOperatorProps<LeadFormState>['onSubmit'];
 
 export interface StepProps {
   sections?: SectionsProps[];
-  field: FormFieldRegisterer<FormState>;
+  field: FormFieldRegisterer<LeadFormState>;
   step: number;
   params?: Record<string, any>;
 }
@@ -31,6 +31,6 @@ export const renderStep = ({ sections, field, step, params }: StepProps) =>
   });
 
 const getValue =
-  (field: FormFieldRegisterer<FormState>): GetValue =>
+  (field: FormFieldRegisterer<LeadFormState>): GetValue =>
   (name) =>
     field(name)?.value;

package/mobile/src/components/CreditForm/useCreditFormAPI.tsx

@@ -5,7 +5,7 @@ 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 FormState } from '../ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, type GetValue } from './calculateInputs';
 import { getCreditFormTaskData } from './getCreditFormTaskData';
 
@@ -29,7 +29,7 @@ export const useCreditFormAPI = ({
   const [profileId] = useLocalStorage<number>('profileId');
   const [participantId] = useLocalStorage<number>('participantId');
 
-  const handleSubmit = useCallback(async (formData: FormState) => {
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
     const feedbackValidator = objectValidator(
       getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
     );
@@ -78,6 +78,6 @@ const resetForm = (isFinalStep: boolean, response: Response) => {
 };
 
 const getValue =
-  (formData: FormState): GetValue =>
+  (formData: LeadFormState): GetValue =>
   (name) =>
     formData[name];

package/mobile/src/components/CreditForm/utils.ts

@@ -1,4 +1,4 @@
-import { type Address } from '../ApplicationLeadForm/getInitialFormState';
+import { type Address } from '../ApplicationLeadForm/LeadFormState';
 
 export const fieldsNamesToContactKeysMap = {
   email: 'EMAIL',

package/mobile/src/hooks/useCreditFormStore.tsx

@@ -0,0 +1,13 @@
+import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
+import { type LeadProps } from '../api/RetailAPI/model/LeadFormData';
+
+export interface CreditFormStore {
+  amountWorkers: LeadProps[] | null;
+  organization: LeadProps[] | null;
+  employerActivities: LeadProps[] | null;
+  employerOrganization: LeadProps[] | null;
+}
+
+export const useCreditFormStore = () => {
+  return useLocalStore<CreditFormStore>();
+};

package/mobile/src/hooks/useLeadFormData.ts

@@ -1,5 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
-import { type LeadProps } from '../ui-kit/FormField/SelectField';
+import { type LeadProps } from '../api/RetailAPI/model/LeadFormData';
 import { fetchJSON } from '../utils/fetchJSON';
 
 type ErrorProps = {

package/mobile/src/hooks/useSetter.ts

@@ -0,0 +1,16 @@
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import type { Nullable } from '@redneckz/uni-jsx/lib/utils/ts/Nullable';
+
+export const useSetter = <T, K extends keyof T>(target: T, key: K) =>
+  useCallback(
+    (value: Nullable<T[K]> | ((oldValue: Nullable<T[K]>) => Nullable<T[K]>)) => {
+      const newValue = value instanceof Function ? value(target[key]) : value;
+
+      if (newValue !== null && newValue !== undefined) {
+        target[key] = newValue;
+      } else {
+        delete target[key];
+      }
+    },
+    [target, key],
+  );

package/mobile/src/ui-kit/ConsentBkiDialog/useConsentBkiDialog.tsx

@@ -1,5 +1,4 @@
 import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
-import { formatPhone } from '../../utils/formatPhone';
 import { useDialog } from '../DialogManager/useDialog';
 import { VerifyPhoneDialog } from '../VerifyPhoneDialog/VerifyPhoneDialog';
 import { ConsentBkiDialog } from './ConsentBkiDialog';
@@ -30,7 +29,8 @@ export const useConsentBkiDialog = (onClose: () => void) => {
     (phone?: string, profileId?: number) => async (confirmStatus: string) => {
       if (confirmStatus === 'SIGNED' && phone) {
         verifyPhoneDialog.open({
-          ...verifyPhoneContent(phone),
+          phone,
+          consents: ['согласие на запрос информации в БКИ'],
           onSuccess: handleSuccessVerify(profileId),
         });
       } else {
@@ -43,12 +43,3 @@ export const useConsentBkiDialog = (onClose: () => void) => {
       open({ onSubmit: handleSubmitBkiConstent(phone, profileId), onClose }),
   };
 };
-
-const verifyPhoneContent = (phone: string) => ({
-  title: 'Подтвердите номер телефона',
-  description: `Мы отправили код на ${phone}`,
-  phoneNumber: formatPhone(phone),
-  textButton: 'Далее',
-  __html: `<span>Вводя код, я подтверждаю, что ознакомлен и подписываю:</span>
-              <ul><li>согласие на запрос информации в БКИ</li></ul>`,
-});

package/mobile/src/ui-kit/DialogManager/useDialog.tsx

@@ -1,5 +1,6 @@
 import type { UNIComponent } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import type { VNode } from '../../model/VNode';
 import type { DialogOptions } from './DialogAction';
 import { useDialogManager } from './useDialogManager';
 
@@ -10,7 +11,7 @@ export function useDialog<Props extends { onClose?: () => void }>(
   const { open, close, ...rest } = useDialogManager();
 
   const openDialog = useCallback(
-    (props: Props, options: Partial<DialogOptions> = {}) =>
+    (props: Props & { children?: VNode }, options: Partial<DialogOptions> = {}) =>
       open({
         dialog: (
           <Dialog

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { getLink } from '../../api/RetailAPI/getLink';
-import { type FormState } from '../../components/ApplicationLeadForm/getInitialFormState';
+import { type LeadFormState } from '../../components/ApplicationLeadForm/LeadFormState';
 import { locationNavigator } from '../../external/locationNavigator';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { Button } from '../Button/Button';
@@ -14,7 +14,7 @@ export interface EsiaLoginDialogProps {
 
 export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
   const navigator = locationNavigator();
-  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
+  const [leadForm, setLeadForm] = useLocalStorage<LeadFormState>('leadForm');
   const handleAuth = useCallback(async () => {
     const resp = await getLink({
       redirectUri: navigator.href,

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

@@ -1,15 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data: amountWorkers } = useLeadFormData('EMPLOYEES_NUMBER');
+  const { data } = useLeadFormData('EMPLOYEES_NUMBER');
+
+  const store = useCreditFormStore();
+
+  useEffect(() => {
+    if (data) {
+      store.amountWorkers = data;
+    }
+  }, [data]);
 
   return (
     <SelectField
       field={field}
-      source={amountWorkers}
+      source={store.amountWorkers ?? []}
       label="Количество работающих в организации"
       fieldName="amountWorkers"
       input={input}

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

@@ -1,15 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data: employerActivities } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
+  const { data } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
+
+  const store = useCreditFormStore();
+
+  useEffect(() => {
+    if (data) {
+      store.employerActivities = data;
+    }
+  }, [data]);
 
   return (
     <SelectField
       field={field}
-      source={employerActivities}
+      source={store.employerActivities ?? []}
       label="Вид деятельности организации-работодателя"
       fieldName="employerActivities"
       input={input}

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

@@ -1,15 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { useLeadFormData } from '../../../hooks/useLeadFormData';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data: employerOrganization } = useLeadFormData('ORGANIZATION_KIND');
+  const { data } = useLeadFormData('ORGANIZATION_KIND');
+
+  const store = useCreditFormStore();
+
+  useEffect(() => {
+    if (data) {
+      store.employerOrganization = data;
+    }
+  }, [data]);
 
   return (
     <SelectField
       field={field}
-      source={employerOrganization}
+      source={store.employerOrganization ?? []}
       label="Вид организации работодателя"
       fieldName="employerOrganization"
       input={input}

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

@@ -1,19 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type DaDataSuggestion } from '../../../api/dadataHints/dadataHintsType';
+import { useCreditFormStore } from '../../../hooks/useCreditFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
-import { getAddressFromDaDataItem } from './AddressField';
+import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
+  const store = useCreditFormStore();
+
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.('organizationAddress')?.onChange?.(
-      getAddressFromDaDataItem(item.data?.address as DaDataSuggestion),
-    );
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
-    field?.('legalForm')?.onChange?.(item.data?.opf?.short);
+    updateOrganizationFields(store, field, item);
   }, []);
 
   return (