@redneckz/wildless-cms-uni-blocks 0.14.709 → 0.14.710

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

@@ -3,26 +3,22 @@ import { formStateMap } from './formStateMap';
 
 export const getInitialFormState = (
   step: number,
-  localStorageData: Record<string, any> | null,
+  formState: LeadFormState | null,
 ): LeadFormState => ({
   ...formStateMap[step],
-  ...localStorageData,
-  limitedBirthday: transformStringToData(localStorageData?.limitedBirthday as string),
-  dulIssueDateField: transformStringToData(localStorageData?.dulIssueDateField as string),
+  ...formState,
+  limitedBirthday: transformStringToData(formState?.limitedBirthday as string),
+  dulIssueDateField: transformStringToData(formState?.dulIssueDateField as string),
   participantDateRegistration: transformStringToData(
-    localStorageData?.participantDateRegistration as string,
+    formState?.participantDateRegistration as string,
   ),
-  beginDate: transformStringToData(localStorageData?.beginDate as string),
-  deliveryDate: transformStringToData(localStorageData?.deliveryDate as string),
+  beginDate: transformStringToData(formState?.beginDate as string),
+  deliveryDate: transformStringToData(formState?.deliveryDate as string),
 });
 
 const transformStringToData = (text?: string) => {
-  if (!text) {
-    return undefined;
-  }
-
   try {
-    return new Date(text);
+    return text ? new Date(text) : undefined;
   } catch (_) {
     return undefined;
   }

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

@@ -1,6 +1,6 @@
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
@@ -8,112 +8,89 @@ import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent
 import { type LeadFormState } from '../ApplicationLeadForm/LeadFormState';
 import { calculateInputs, type GetValue } from './calculateInputs';
 import { getCreditFormTaskData } from './getCreditFormTaskData';
+import { getInitialFormState } from './getInitialFormState';
 
-type CreditFormApiProps = {
+interface CreditFormApiProps {
   step: number;
   inputs: FieldDef[];
   onNextStep: () => void;
-  saveStep: (value: Record<string, any>) => void;
-  finishForm?: (bool: boolean) => void;
-};
-
-export type StatusInfoState = {
-  regionRetail?: string;
-  addressRetail?: string;
-  cardCategory?: string;
-  calculator?: {
-    monthsValue?: number;
-    moneyValue?: number;
-    isAnnuity?: boolean;
-  };
-};
+  onFinish?: () => void;
+}
 
 export const useCreditFormAPI = ({
   step,
   inputs,
   onNextStep,
-  saveStep,
-  finishForm,
-}: CreditFormApiProps) => {
+  onFinish,
+}: CreditFormApiProps): [LeadFormState, (formData: LeadFormState) => void] => {
   const isFinalStep = step === 5;
-  const [taskId] = useLocalStorage<number>('taskId');
-  const [profileId] = useLocalStorage<number>('profileId');
-  const [participantId] = useLocalStorage<number>('participantId');
-  const [, setStatusInfo] = useLocalStorage('statusInfo');
-  const [leadForm] = useLocalStorage<LeadFormState>('leadForm');
-
-  const handleSubmit = useCallback(async (formData: LeadFormState) => {
-    const feedbackValidator = objectValidator(
-      getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
-    );
 
-    if (!isValidationSuccess(feedbackValidator(formData))) {
-      return console.warn('validation fail');
-    }
+  const retailFormStore = useRetailFormStore();
 
-    saveStep(formData);
+  const initialState = useMemo(
+    () => getInitialFormState(step, retailFormStore.leadForm),
+    [step, retailFormStore.leadForm],
+  );
 
-    try {
-      if (taskId && profileId && participantId) {
-        const response = await updateUserTask(
-          getCreditFormTaskData({
-            participantId,
-            taskId,
-            profileId,
-            step,
-            formData: formData as any,
-          }),
-        );
-        resetForm({ isFinalStep, response, leadForm, setStatusInfo });
+  const resetForm = useCallback(
+    (response: Response) => {
+      const { leadForm } = retailFormStore;
+      if (isFinalStep && response.ok && leadForm) {
+        retailFormStore.statusInfo = {
+          regionRetail: leadForm?.regionRetail?.text,
+          addressRetail: leadForm?.addressRetail?.text,
+          cardCategory: leadForm?.cardCategory?.text,
+          calculator: {
+            monthsValue: leadForm?.calculator?.monthsValue,
+            moneyValue: leadForm?.calculator?.moneyValue,
+            isAnnuity: leadForm?.calculator?.isAnnuity,
+          },
+        };
+        retailFormStore.leadForm = initialState;
       }
-    } catch (ex) {
-      return 'Fail';
-    }
+    },
+    [isFinalStep, initialState],
+  );
 
-    onNextStep();
+  const handleSubmit = useCallback(
+    async (formData: LeadFormState) => {
+      const feedbackValidator = objectValidator(
+        getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
+      );
 
-    if (isFinalStep) {
-      finishForm?.(true);
-    }
-
-    return 'OK';
-  }, []);
+      if (!isValidationSuccess(feedbackValidator(formData))) {
+        return;
+      }
 
-  return {
-    handleSubmit,
-  };
-};
+      retailFormStore.leadForm = formData;
 
-const resetForm = ({
-  isFinalStep,
-  response,
-  leadForm,
-  setStatusInfo,
-}: {
-  isFinalStep: boolean;
-  response: Response;
-  leadForm: LeadFormState | null;
-  setStatusInfo: (statusInfo: StatusInfoState) => void;
-}) => {
-  if (isFinalStep && response.ok && leadForm !== null) {
-    const regionRetail = leadForm?.regionRetail?.text;
-    const addressRetail = leadForm?.addressRetail?.text;
-    const cardCategory = leadForm?.cardCategory?.text;
-    const calculator = {
-      monthsValue: leadForm?.calculator?.monthsValue,
-      moneyValue: leadForm?.calculator?.moneyValue,
-      isAnnuity: leadForm?.calculator?.isAnnuity,
-    };
+      try {
+        const { taskId, profileId, participantId } = retailFormStore;
+        if (taskId && profileId && participantId) {
+          const response = await updateUserTask(
+            getCreditFormTaskData({
+              participantId,
+              taskId,
+              profileId,
+              step,
+              formData: formData as any,
+            }),
+          );
+          resetForm(response);
+        }
 
-    setStatusInfo({
-      regionRetail,
-      addressRetail,
-      cardCategory,
-      calculator,
-    });
+        onNextStep();
+        if (isFinalStep) {
+          onFinish?.();
+        }
+      } catch (ex) {
+        // Do nothing
+      }
+    },
+    [isFinalStep, resetForm],
+  );
 
-    globalThis.localStorage.removeItem('leadForm');
-  }
+  return [initialState, handleSubmit];
 };
 
 const getValue =

package/mobile/src/hooks/useRetailFormStore.tsx

@@ -0,0 +1,29 @@
+import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
+import { type LeadProps } from '../api/RetailAPI/model/LeadFormData';
+import { type LeadFormStoreSlice } from '../components/ApplicationLeadForm/useLeadFormStore';
+
+export type StatusInfoState = {
+  regionRetail?: string;
+  addressRetail?: string;
+  cardCategory?: string;
+  calculator?: {
+    monthsValue?: number;
+    moneyValue?: number;
+    isAnnuity?: boolean;
+  };
+};
+
+export interface CreditFormDictionarySlice {
+  amountWorkers: LeadProps[] | null;
+  organization: LeadProps[] | null;
+  employerActivities: LeadProps[] | null;
+  employerOrganization: LeadProps[] | null;
+}
+
+export interface CreditFormStoreSlice extends CreditFormDictionarySlice, LeadFormStoreSlice {
+  statusInfo: StatusInfoState;
+}
+
+export const useRetailFormStore = () => {
+  return useLocalStore<CreditFormStoreSlice>();
+};

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

@@ -1,9 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type Task } from '../../api/RetailAPI/draftTasksKZO';
-import { useLeadFormStore } from '../../components/ApplicationLeadForm/useLeadFormStore';
 import { locationNavigator } from '../../external/locationNavigator';
-import { useSetter } from '../../hooks/useSetter';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { noop } from '../../utils/noop';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
@@ -23,8 +22,7 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
   isFromLead = false,
   onClose = noop,
 }) {
-  const leadFormStore = useLeadFormStore();
-  const saveForm = useSetter(leadFormStore, 'leadForm');
+  const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
 
   const { participants, creditProgram, id: taskId } = task;
@@ -37,11 +35,11 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
 
   const handleGoToDraft = useCallback(() => {
     const taskFromDraft = parseDraftTask(task);
-    leadFormStore.participantId = participantId;
-    leadFormStore.taskId = taskId;
-    leadFormStore.profileId = profile?.id;
-    leadFormStore.programId = programmId;
-    saveForm(taskFromDraft);
+    retailFormStore.participantId = participantId;
+    retailFormStore.taskId = taskId;
+    retailFormStore.profileId = profile?.id;
+    retailFormStore.programId = programmId;
+    retailFormStore.leadForm = taskFromDraft;
     navigator.assign(nextStepLink);
   }, []);
 

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

@@ -1,9 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { getLink } from '../../api/RetailAPI/getLink';
-import { type LeadFormState } from '../../components/ApplicationLeadForm/LeadFormState';
 import { locationNavigator } from '../../external/locationNavigator';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
@@ -14,7 +13,8 @@ export interface EsiaLoginDialogProps {
 
 export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
   const navigator = locationNavigator();
-  const [leadForm, setLeadForm] = useLocalStorage<LeadFormState>('leadForm');
+  const retailFormStore = useRetailFormStore();
+
   const handleAuth = useCallback(async () => {
     const resp = await getLink({
       redirectUri: navigator.href,
@@ -26,10 +26,10 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
   }, []);
 
   const handleClose = useCallback(() => {
-    if (leadForm !== null) {
-      const leadFormCopy = { ...leadForm };
-      Reflect.deleteProperty(leadFormCopy, 'esiaAccountTypeCd');
-      setLeadForm(leadFormCopy);
+    if (retailFormStore.leadForm) {
+      const leadForm = { ...retailFormStore.leadForm };
+      delete leadForm.esiaAccountTypeCd;
+      retailFormStore.leadForm = leadForm;
     }
     onClose?.();
   }, []);

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('EMPLOYEES_NUMBER');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('ORGANIZATION_KIND');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,7 +1,7 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -9,7 +9,7 @@ import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const InnField = JSX<CustomFieldProps>(({ field, input }) => {
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);

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

@@ -1,14 +1,14 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { SelectField } from '../SelectField';
 
 export const OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data } = useLeadFormData('ORGANIZATION_TYPE');
 
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   useEffect(() => {
     if (data) {

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

@@ -1,7 +1,7 @@
 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 { useRetailFormStore } from '../../../hooks/useRetailFormStore';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -9,7 +9,7 @@ import { getValidation } from '../getValidation';
 import { updateOrganizationFields } from '../updateOrganizationFields';
 
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
-  const store = useCreditFormStore();
+  const store = useRetailFormStore();
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     field?.('inn')?.onChange?.(item.data?.inn);

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

@@ -5,12 +5,12 @@ import {
   getOrganizationKind,
   getOrganizationType,
 } from '../../api/RetailAPI/utils/getOrganizationParams';
-import { type CreditFormStore } from '../../hooks/useCreditFormStore';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type CreditFormDictionarySlice } from '../../hooks/useRetailFormStore';
 import { getAddressFromDaDataItem } from './Fields/AddressField';
 
 export const updateOrganizationFields = (
-  store: CreditFormStore,
+  store: CreditFormDictionarySlice,
   field: FormFieldRegisterer<any>,
   item: DaDataSuggestion,
 ) => {

package/package.json

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

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -1,5 +1,4 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useSetter } from '../../hooks/useSetter';
 import { type LeadFormState } from './LeadFormState';
 import { useLeadFormStore } from './useLeadFormStore';
 
@@ -12,15 +11,14 @@ export interface UserData {
 }
 export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
-  const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const saveUserData = useCallback(
-    ({ participantId, taskId, profileId, formData, programId: programNumber }: UserData) => {
+    ({ participantId, taskId, profileId, programId: programNumber, formData }: UserData) => {
       leadFormStore.participantId = participantId;
       leadFormStore.taskId = taskId;
       leadFormStore.profileId = profileId;
       leadFormStore.programId = programNumber;
-      saveForm(formData);
+      leadFormStore.leadForm = formData;
     },
     [],
   );

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
@@ -45,7 +46,7 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
 
   const sections = useMemo(() => stepsSectionsMap[step], [step]);
 
-  const [isFormFinished, setIsFormFinished] = useState(false);
+  const [isFormFinished, { setTrue: handleFinish }] = useBool(false);
 
   return (
     <BlockWrapper className={className} {...rest}>
@@ -58,10 +59,10 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
             key={String(step)}
             step={step}
             sections={sections}
+            isFormFinished={isFormFinished}
             onNextStep={handleNextStep}
             onPrevStep={handlePrevStep}
-            isFormFinished={isFormFinished}
-            finishForm={setIsFormFinished}
+            onFinish={handleFinish}
           />
         </div>
       </div>

package/src/components/CreditCardForm/CreditCardFormStatusTracker.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { getTaskStatus, STATUS_TYPE } from '../../api/RetailAPI/getTaskStatus';
 import { sendSignalToProcess, type SignalType } from '../../api/RetailAPI/sendSignalToProcess';
 import { useInterval } from '../../hooks/useInterval';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { type VNode } from '../../model/VNode';
 import { FailedStatusContent } from './FailedStatusContent';
 import { PendingStatusContent } from './PendingStatusContent';
@@ -17,7 +17,7 @@ const SIGNAL_TYPES: SignalType[] = [
 
 export const CreditCardFormStatusTracker = JSX(() => {
   const [status, setStatus] = useState(STATUS_TYPE.process);
-  const [taskId] = useLocalStorage<number>('taskId');
+  const { taskId } = useRetailFormStore();
 
   useEffect(() => {
     (async () => {

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type SectionsProps } from '../ApplicationForm/ApplicationFormContent';
 import { type FieldDef } from '../ApplicationLeadForm/ApplicationLeadFormContent';
 import { CreditCardFormStatusTracker } from './CreditCardFormStatusTracker';
-import { getInitialFormState } from './getInitialFormState';
 import { renderStep } from './renderStep';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
 import { useCreditCardFormAPI } from './useCreditCardFormAPI';
@@ -12,35 +11,32 @@ import { useCreditCardFormAPI } from './useCreditCardFormAPI';
 export interface CreditCardFormStepProps {
   step: number;
   sections: SectionsProps[];
+  isFormFinished: boolean;
   onNextStep: () => void;
   onPrevStep: () => void;
-  isFormFinished: boolean;
-  finishForm?: (bool: boolean) => void;
+  onFinish?: () => void;
 }
 
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
-  ({ step, sections, onPrevStep, onNextStep, isFormFinished, finishForm }) => {
-    const [localStorageData, saveStep] = useLocalStorage<Record<string, any>>('leadForm');
-    const initialState = getInitialFormState(step, localStorageData);
-
-    const inputs = (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[];
+  ({ step, sections, isFormFinished, onPrevStep, onNextStep, onFinish }) => {
+    const inputs = useMemo(
+      () => (sections?.flatMap((_: SectionsProps) => _?.inputs) || []) as FieldDef[],
+      [sections],
+    );
 
-    const { handleSubmit } = useCreditCardFormAPI({
+    const [initialState, onSubmit] = useCreditCardFormAPI({
       step,
       inputs,
       onNextStep,
-      saveStep,
-      finishForm,
+      onFinish,
     });
 
-    const [, { field, onSubmit }] = useForm(initialState, {
-      onSubmit: handleSubmit,
-    });
+    const [, { field, onSubmit: handleSubmit }] = useForm(initialState, { onSubmit });
 
     return isFormFinished ? (
       <CreditCardFormStatusTracker />
     ) : (
-      <form onSubmit={onSubmit} className="space-y-m">
+      <form onSubmit={handleSubmit} className="space-y-m">
         {renderStep({ sections, field, step })}
         <StepsNavigationButtons step={step} onPrevStep={onPrevStep} />
       </form>

package/src/components/CreditCardForm/PendingStatusContent.tsx

@@ -1,11 +1,10 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const PendingStatusContent = JSX(
   ({ handleExpireTimer }: { handleExpireTimer: () => void }) => {
-    const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+    const { statusInfo } = useRetailFormStore();
 
     return (
       <CreditCardFormStatus

package/src/components/CreditCardForm/ReworkStatusContent.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const ReworkStatusContent = JSX(() => {
-  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+  const { statusInfo } = useRetailFormStore();
 
   return (
     <CreditCardFormStatus

package/src/components/CreditCardForm/SuccessStatusContent.tsx

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { CreditCardFormStatus } from './CreditCardFormStatus';
-import { type StatusInfoState } from './useCreditCardFormAPI';
 
 export const SuccessStatusContent = JSX(() => {
-  const [statusInfo] = useLocalStorage<StatusInfoState>('statusInfo');
+  const { statusInfo } = useRetailFormStore();
 
   return (
     <CreditCardFormStatus

package/src/components/CreditCardForm/formStateMap.tsx

@@ -76,10 +76,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
   },
   {
     regionRetail: { key: '', text: '' },
-    addressRetail: {
-      key: '',
-      text: '',
-    },
+    addressRetail: { key: '', text: '' },
     bankEmployeeCode: undefined,
     addressCourier: {
       fullAddress: '',