@redneckz/wildless-cms-uni-blocks 0.14.819 → 0.14.821

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

@@ -1,6 +1,6 @@
-/* eslint-disable max-lines-per-function */
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { validatorObj } from '../../retail/validator/validatorObj';
@@ -16,7 +16,6 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
 import { type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
-import { EsiaLoginBanner } from './EsiaLoginBanner';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -24,12 +23,6 @@ import { useInitApplicationLead } from './useInitApplicationLead';
 
 interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockProps {}
 
-export enum EsiaStatuses {
-  Success = 'SUCCESS',
-  Error = 'ERROR',
-  Pending = 'PENDING',
-}
-
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({
     className,
@@ -41,8 +34,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     data,
     ...rest
   }) => {
-    const [esiaStatus, setEsiaStatus] = useState<EsiaStatuses>();
-    const leadForm = useRef<HTMLFormElement | null>(null);
+    const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
     const inputs = useMemo(
       () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
@@ -51,21 +43,21 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
 
     const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
 
-    const initialFormState = useInitApplicationLead({
+    const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
       nextStepLink,
       productType,
-      setEsiaStatus,
-      esiaAuthSuccess: esiaStatus === EsiaStatuses.Success,
+      setEsiaError,
     });
     const { isSending, ok, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
       productType,
+      esiaError,
       data,
     });
 
-    const [, { field, onSubmit, reset }] = useForm(initialFormState, {
+    const [, { field, onSubmit }] = useForm(initialFormState, {
       formValidator,
       onSubmit: handleSubmit,
     });
@@ -77,27 +69,14 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
       }
     }, [ok]);
 
-    useEffect(() => {
-      if (esiaStatus && leadForm?.current) {
-        leadForm.current.scrollIntoView({
-          block: 'start',
-        });
-      }
-
-      if (esiaStatus === EsiaStatuses.Success) {
-        reset();
-      }
-    }, [leadForm?.current, esiaStatus]);
-
     return (
       <ApplicationFormLayout
         className={style('container space-y-m', className)}
         title={title}
         {...rest}
       >
-        {!esiaStatus ? <EsiaLoginBanner /> : null}
-        <form onSubmit={onSubmit} className="space-y-m relative" ref={leadForm}>
-          {esiaStatus === EsiaStatuses.Pending ? <Loader blur={false} /> : null}
+        <form onSubmit={onSubmit} className="space-y-m relative">
+          {isLoading ? <Loader blur={false} /> : null}
           {applicationFormData.map((_, i) => (
             <div
               key={`section-${i}`}
@@ -108,7 +87,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
             </div>
           ))}
           {renderSubmitButton(button, isSending)}
-          {esiaStatus === EsiaStatuses.Error ? (
+          {esiaError ? (
             <Text size="text-m" font="font-medium" color="text-error">
               Использовать Госуслуги для оформления заявки невозможно, необходимо заполнить поля
               вручную.

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

@@ -3,6 +3,32 @@ import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 
+export const applicationFormData: SectionsRetailProps[] = [
+  {
+    columns: 2,
+    inputs: [
+      { name: 'surname', required: true, dadata: true },
+      { name: 'name', required: true, dadata: true },
+      { name: 'middleName', dadata: true },
+      { name: 'limitedBirthday', required: true },
+      { name: 'phone', required: true },
+      { name: 'email', required: true, dadata: true },
+    ],
+  },
+  {
+    inputs: [
+      { name: 'processPersonalDataFlg', required: true },
+      { name: 'consentProviderFlg', required: true },
+      { name: 'consentOthersFlg', required: true },
+      { name: 'consentInformFlg' },
+      { name: 'consentPfrFlg' },
+      { name: 'consentInformMaterialsFlg' },
+      { name: 'consentPhotoFlg' },
+      { name: 'consentFATCA' },
+    ],
+  },
+];
+
 export const getApplicationFormData = (productType: ProductType): SectionsRetailProps[] => {
   const currentProductConsents = productTypeToConsentsMap[productType];
   const allConsents: FieldRetailDef[] = [
@@ -20,11 +46,11 @@ export const getApplicationFormData = (productType: ProductType): SectionsRetail
     {
       columns: 2,
       inputs: [
-        { name: 'surname', required: true, dadata: true, filledByEsia: true },
-        { name: 'name', required: true, dadata: true, filledByEsia: true },
-        { name: 'middleName', dadata: true, filledByEsia: true },
-        { name: 'limitedBirthday', required: true, filledByEsia: true },
-        { name: 'phone', required: true, filledByEsia: true },
+        { name: 'surname', required: true, dadata: true },
+        { name: 'name', required: true, dadata: true },
+        { name: 'middleName', dadata: true },
+        { name: 'limitedBirthday', required: true },
+        { name: 'phone', required: true },
         { name: 'email', required: true, dadata: true },
       ],
     },

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

@@ -21,16 +21,9 @@ const initialFormState = {
 export const getInitialFormState = (
   inputs: FieldRetailDef[],
   savedForm: LeadFormState | null,
-  esiaAuthSuccess: boolean,
 ): LeadFormState => {
   if (savedForm) {
-    return {
-      ...savedForm,
-      limitedBirthday: new Date(savedForm?.limitedBirthday || 0),
-      ...(!esiaAuthSuccess && {
-        esiaAccountTypeCd: { key: '' },
-      }),
-    };
+    return { ...savedForm, limitedBirthday: new Date(savedForm?.limitedBirthday || 0) };
   }
 
   const formState = Object.fromEntries(inputs.map((_) => [_.name, initialFormState[_.name || '']]));

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

@@ -1,23 +1,33 @@
 /* eslint-disable max-lines */
-/* eslint-disable max-lines-per-function */
-import { type EsiaRequestProfileResponse } from '../../retail/api/esiaRequestProfile';
+import { type UpdateProfileEsiaResponse } from '../../retail/api/updateProfileEsia';
 import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
 import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
 
 export const parseEsiaProfile = async (
-  esiaProfile: EsiaRequestProfileResponse,
+  esiaProfile: UpdateProfileEsiaResponse,
+  taskId: string,
   isDebit: boolean,
 ): Promise<LeadFormState> => {
-  checkEsiaData(esiaProfile);
-  const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
+  isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
 
   const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
     esiaProfile;
-  let files: File[] = [];
+  const files: File[] = [];
 
-  if (isFullEsiaData) {
-    files = await saveDocuments(esiaAdditionalDocument);
+  if (!isDebit) {
+    await saveDocument({
+      document: esiaAdditionalDocument.pdfFileWorkbook,
+      taskId,
+      category: 'CONFIRMING_INCOME_DOC',
+      files,
+    });
+    await saveDocument({
+      document: esiaAdditionalDocument.pdfFilePayout,
+      taskId,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      files,
+    });
   }
 
   const mainData = {
@@ -35,12 +45,12 @@ export const parseEsiaProfile = async (
     birthPlace: addInfo.birthPlace,
     addressRegistration: buildAddress(addressRegistration),
     addressFact: buildAddress(addressFact),
-    esiaAccountTypeCd: isDebit ? profile.esiaAccountType : { key: '' },
+    esiaAccountTypeCd: profile.esiaAccountType,
   };
 
   return {
     ...mainData,
-    ...(isFullEsiaData && {
+    ...(!isDebit && {
       snils: addInfo.snils,
       inn: esiaAdditionalDocument.inn,
       wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
@@ -49,9 +59,6 @@ export const parseEsiaProfile = async (
       generalSeniority: getYearFromMonth(esiaAdditionalDocument.workLength).toString(),
       lastJobExperience: getYearFromMonth(esiaAdditionalDocument.workLengthLastJob).toString(),
       jobsNumber: esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
-      esiaAccountTypeCd: profile.esiaAccountType,
-      confirmationIncome: { key: 'SFR_CERTIFICATE', text: 'Запрос Банком доходов из СФР' },
-      employment: { key: 'WORK', text: 'Работаю' },
       files,
     }),
   };
@@ -67,7 +74,7 @@ const concatFullAddress = (address: Array<string | undefined>): string => {
   }, '');
 };
 
-const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration']): Address => {
+const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
   const {
     postcode,
     region,
@@ -103,67 +110,25 @@ const buildAddress = (fields: EsiaRequestProfileResponse['addressRegistration'])
 
 const getYearFromMonth = (month: number) => Math.floor(month / 12);
 
-const saveDocuments = async (
-  esiaAdditionalDocument: EsiaRequestProfileResponse['esiaAdditionalDocument'],
-): Promise<File[]> => {
-  const files: File[] = [];
-  const documents = [
-    {
-      file: esiaAdditionalDocument.pdfFileWorkbook,
-      category: 'CONFIRMING_INCOME_DOC',
-      isPDF: true,
-    },
-    {
-      file: esiaAdditionalDocument.pdfFilePayout,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      isPDF: true,
-    },
-    {
-      file: esiaAdditionalDocument.pdfFileSigPayout,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      isPDF: true,
-    },
-    {
-      file: esiaAdditionalDocument.xmlFilePayout,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      isPDF: false,
-    },
-    {
-      file: esiaAdditionalDocument.xmlFileSigPayout,
-      category: 'CONFIRMING_EMPLOYMENT_DOC',
-      isPDF: false,
-    },
-    {
-      file: esiaAdditionalDocument.xmlFileWorkbook,
-      category: 'CONFIRMING_INCOME_DOC',
-      isPDF: false,
-    },
-    {
-      file: esiaAdditionalDocument.pdfFileSigWorkbook,
-      category: 'CONFIRMING_INCOME_DOC',
-      isPDF: true,
-    },
-    {
-      file: esiaAdditionalDocument.xmlFileSigWorkbook,
-      category: 'CONFIRMING_INCOME_DOC',
-      isPDF: false,
-    },
-  ];
-
-  for (const doc of documents) {
-    const contentType = doc.isPDF ? 'data:application/pdf;base64' : 'data:application/xml;base64';
-
-    await fetch(`${contentType},${doc.file}`)
-      .then((res) => res.blob())
-      .then((value) => uploadFile(value, doc.category as DocumentCategory, doc.isPDF))
-      .then((file) => files.push(file));
-  }
-
-  return files;
+const saveDocument = async ({
+  document,
+  taskId,
+  category,
+  files,
+}: {
+  document: string;
+  taskId: string;
+  category: DocumentCategory;
+  files: File[];
+}) => {
+  await fetch(`data:application/pdf;base64,${document}`)
+    .then((res) => res.blob())
+    .then((value) => uploadFile(value, taskId, category))
+    .then((file) => files.push(file));
 };
 
-const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
-  const { profile, document, addressRegistration } = esiaProfile;
+const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
+  const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
 
   const data = [
     profile.name,
@@ -171,6 +136,7 @@ const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
     profile.midname,
     profile.birthDate,
     profile.phone,
+    profile.email,
     document.dulIssueDate,
     document.dulIssuedBy,
     document.dulNumber,
@@ -178,17 +144,6 @@ const checkEsiaData = (esiaProfile: EsiaRequestProfileResponse) => {
     document.dulSubdivisionCode,
     addressRegistration,
     profile.esiaAccountType,
-  ];
-
-  if (!data.every((_) => Boolean(_))) {
-    throw new Error();
-  }
-};
-
-const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) => {
-  const { esiaAdditionalDocument } = esiaProfile;
-
-  const data = [
     esiaAdditionalDocument.inn,
     esiaAdditionalDocument.averageMonthlyIncome.toString(),
     esiaAdditionalDocument.startWorkDate,
@@ -198,13 +153,33 @@ const checkEsiaAdditionalDocument = (esiaProfile: EsiaRequestProfileResponse) =>
     esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
     esiaAdditionalDocument.pdfFilePayout,
     esiaAdditionalDocument.pdfFileWorkbook,
-    esiaAdditionalDocument.pdfFileSigPayout,
-    esiaAdditionalDocument.xmlFilePayout,
-    esiaAdditionalDocument.xmlFileSigPayout,
-    esiaAdditionalDocument.xmlFileWorkbook,
-    esiaAdditionalDocument.pdfFileSigWorkbook,
-    esiaAdditionalDocument.xmlFileSigWorkbook,
   ];
 
-  return data.every((_) => Boolean(_));
+  if (!data.every((_) => Boolean(_))) {
+    throw new Error();
+  }
+};
+
+const checkEsiaDataForDebit = (esiaProfile: UpdateProfileEsiaResponse) => {
+  const { profile, document, addressRegistration } = esiaProfile;
+
+  const data = [
+    profile.name,
+    profile.surname,
+    profile.midname,
+    profile.birthDate,
+    profile.phone,
+    profile.email,
+    document.dulIssueDate,
+    document.dulIssuedBy,
+    document.dulNumber,
+    document.dulSerie,
+    document.dulSubdivisionCode,
+    addressRegistration,
+    profile.esiaAccountType,
+  ];
+
+  if (!data.every((_) => Boolean(_))) {
+    throw new Error();
+  }
 };

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

@@ -12,6 +12,7 @@ import { updateUserProfile } from '../../retail/api/updateUserProfile';
 import { updateUserTask } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
+import { useEsiaLoginDialog } from '../../retail/components/EsiaLoginDialog/useEsiaLoginDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
@@ -27,6 +28,7 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
+  esiaError: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -34,6 +36,7 @@ export const useApplicationLeadApi = ({
   programId,
   nextStepLink,
   productType,
+  esiaError,
   data,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
@@ -42,72 +45,77 @@ export const useApplicationLeadApi = ({
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
 
-  const goToNextStep = useCallback(() => {
-    navigator.assign(nextStepLink);
-  }, []);
-
-  const consentBkiDialog = useConsentBkiDialog(goToNextStep);
+  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
+  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
 
-  const handleSubmit = useCallback(async (formData: LeadFormState) => {
-    try {
-      startSending();
-      const profileId = await createUserProfile({
-        profile: { phone: formatPhone(formData.phone as string) },
-      });
+  const handleSubmit = useCallback(
+    async (formData: LeadFormState) => {
+      if (esiaError) {
+        navigator.assign(nextStepLink);
 
-      if (profileId && formData?.phone) {
-        const sendCurrentTask = async () => {
-          await updateUserData({
-            programId,
-            profileId,
-            formData,
-            productType,
-            saveUserData,
-            sendAspects,
-          });
-          verifyPhoneDialog.close();
-          if (productType === 'debitCard') {
-            goToNextStep();
-          } else {
-            consentBkiDialog.open(formData.phone, profileId);
-          }
-        };
-        const handleSuccessVerify = async () => {
-          try {
-            const lastTaskId = await getLastTaskStatus({ profileId, programId });
-
-            if (lastTaskId) {
-              const task = await getTaskById({ taskId: lastTaskId });
-              verifyPhoneDialog.close();
-              draftDialog.open({
-                task,
-                isFromLead: true,
-                sendAspects,
-                onClose: sendCurrentTask,
-              });
+        return;
+      }
+      try {
+        startSending();
+        const profileId = await createUserProfile({
+          profile: { phone: formatPhone(formData.phone as string) },
+        });
+
+        if (profileId && formData?.phone) {
+          const sendCurrentTask = async () => {
+            await updateUserData({
+              programId,
+              profileId,
+              formData,
+              productType,
+              saveUserData,
+              sendAspects,
+            });
+            verifyPhoneDialog.close();
+            if (productType === 'debitCard') {
+              openEsiaLoginDialog();
             } else {
-              await sendCurrentTask();
+              consentBkiDialog.open(formData.phone, profileId);
+            }
+          };
+          const handleSuccessVerify = async () => {
+            try {
+              const lastTaskId = await getLastTaskStatus({ profileId, programId });
+
+              if (lastTaskId) {
+                const task = await getTaskById({ taskId: lastTaskId });
+                verifyPhoneDialog.close();
+                draftDialog.open({
+                  task,
+                  isFromLead: true,
+                  sendAspects,
+                  onClose: sendCurrentTask,
+                });
+              } else {
+                await sendCurrentTask();
+              }
+            } catch {
+              setOK(false);
             }
-          } catch {
-            setOK(false);
-          }
-        };
+          };
 
-        const acceptedConsents = getAcceptedConsents(formData, productType);
+          const acceptedConsents = getAcceptedConsents(formData, productType);
 
-        verifyPhoneDialog.open({
-          phone: formData?.phone,
-          consents: acceptedConsents,
-          onSuccess: handleSuccessVerify,
-        });
-        endSending();
+          verifyPhoneDialog.open({
+            phone: formData?.phone,
+            consents: acceptedConsents,
+            onSuccess: handleSuccessVerify,
+          });
+          endSending();
+        }
+      } catch {
+        setOK(false);
       }
-    } catch {
-      setOK(false);
-    }
-  }, []);
+    },
+    [esiaError],
+  );
 
   return { isSending, ok, handleSubmit };
 };

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

@@ -1,9 +1,11 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
+import { locationNavigator } from '../../external/locationNavigator';
 import { useSetter } from '../../hooks/useSetter';
-import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
+import { updateProfileEsia } from '../../retail/api/updateProfileEsia';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
-import { EsiaStatuses } from './ApplicationLeadForm';
+import { safeJsonParse } from '../../utils/safeJsonParse';
 import { type ProductType } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
@@ -13,62 +15,76 @@ type InitApplicationLeadProps = {
   inputs: FieldRetailDef[];
   nextStepLink: string;
   productType: ProductType;
-  setEsiaStatus: (status: EsiaStatuses) => void;
-  esiaAuthSuccess: boolean;
+  setEsiaError: () => void;
 };
 
 export const useInitApplicationLead = ({
   inputs,
+  nextStepLink,
   productType,
-  setEsiaStatus,
-  esiaAuthSuccess,
-}: InitApplicationLeadProps): LeadFormState => {
+  setEsiaError,
+}: InitApplicationLeadProps): [LeadFormState, { isLoading: boolean }] => {
+  const navigator = locationNavigator();
+  const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+
   const leadFormStore = useLeadFormStore();
   const saveForm = useSetter(leadFormStore, 'leadForm');
 
   const initialFormState = useMemo(
-    () => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess),
+    () => getInitialFormState(inputs, leadFormStore.leadForm),
     [inputs, leadFormStore.leadForm],
   );
 
-  const requestEsiaProfile = useCallback(async (code: string, state: string) => {
-    setEsiaStatus(EsiaStatuses.Pending);
-    try {
-      const data = await esiaRequestProfile({
-        code,
-        state,
-        redirectUri: globalThis.location?.href,
-        authorize: true,
-      });
+  const updateEsiaProfile = useCallback(
+    async (profileId: string, code: string, state: string) => {
+      startLoading();
+      try {
+        const data = await updateProfileEsia({
+          profileId,
+          code,
+          state,
+          redirectUri: globalThis.location?.href,
+        });
+
+        if (data && leadFormStore?.taskId) {
+          const parsedData = await parseEsiaProfile(
+            data,
+            leadFormStore.taskId.toString(),
+            productType === 'debitCard',
+          );
 
-      if (data) {
-        const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
+          saveForm((_) => ({
+            ..._,
+            ...parsedData,
+          }));
+        }
 
-        saveForm((_) => ({
-          ..._,
-          ...parsedData,
-        }));
-        setEsiaStatus(EsiaStatuses.Success);
+        navigator.assign(nextStepLink);
+      } catch {
+        setEsiaError();
+      } finally {
+        endLoading();
       }
-    } catch {
-      setEsiaStatus(EsiaStatuses.Error);
-    }
-  }, []);
+    },
+    [nextStepLink],
+  );
 
   useEffect(() => {
     leadFormStore.productType = productType;
-
+    const profileId: string = <string>(
+      safeJsonParse(globalThis.localStorage?.getItem('profileId') ?? '')
+    );
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
 
-    if (code && state) {
-      requestEsiaProfile(code, state);
+    if (profileId && code && state) {
+      updateEsiaProfile(profileId, code, state);
     } else {
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }
   }, []);
 
-  return initialFormState;
+  return [initialFormState, { isLoading }];
 };