@redneckz/wildless-cms-uni-blocks 0.14.826 → 0.14.828

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

@@ -12,7 +12,6 @@ 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';
@@ -28,7 +27,6 @@ interface ApplicationLeadApiProps extends AspectsProps {
   programId: string;
   nextStepLink: string;
   productType: ProductType;
-  esiaError: boolean;
 }
 
 // eslint-disable-next-line max-lines-per-function
@@ -36,7 +34,6 @@ export const useApplicationLeadApi = ({
   programId,
   nextStepLink,
   productType,
-  esiaError,
   data,
 }: ApplicationLeadApiProps) => {
   const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
@@ -45,78 +42,76 @@ export const useApplicationLeadApi = ({
   const sendAspects = useSendLeadFormAspects({ data });
   const navigator = locationNavigator();
 
-  const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-  const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+  const goToNextStep = useCallback(() => {
+    navigator.assign(nextStepLink);
+  }, []);
+
+  const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
 
-  const handleSubmit = useCallback(
-    async (formData: LeadFormState) => {
-      if (esiaError) {
-        navigator.assign(nextStepLink);
+  const handleSubmit = useCallback(async (formData: LeadFormState) => {
+    try {
+      startSending();
+      const transformedFormData = transformFormData(formData);
+      const profileId = await createUserProfile({
+        profile: { phone: formatPhone(transformedFormData.phone as string) },
+      });
 
-        return;
+      if (!profileId) {
+        throw new Error();
       }
-      try {
-        startSending();
-        const transformedFormData = transformFormData(formData);
-        const profileId = await createUserProfile({
-          profile: { phone: formatPhone(transformedFormData.phone as string) },
+
+      const sendCurrentTask = async () => {
+        await updateUserData({
+          programId,
+          profileId,
+          formData: transformedFormData,
+          productType,
+          saveUserData,
+          sendAspects,
         });
+        verifyPhoneDialog.close();
+        if (productType === 'debitCard') {
+          goToNextStep();
+        } else {
+          consentBkiDialog.open(transformedFormData.phone, profileId);
+        }
+      };
+      const handleSuccessVerify = async () => {
+        try {
+          const lastTaskId = await getLastTaskStatus({ profileId, programId });
 
-        if (profileId && transformedFormData?.phone) {
-          const sendCurrentTask = async () => {
-            await updateUserData({
-              programId,
-              profileId,
-              formData: transformedFormData,
-              productType,
-              saveUserData,
+          if (lastTaskId) {
+            const task = await getTaskById({ taskId: lastTaskId });
+            verifyPhoneDialog.close();
+            draftDialog.open({
+              task,
+              isFromLead: true,
               sendAspects,
+              onClose: sendCurrentTask,
             });
-            verifyPhoneDialog.close();
-            if (productType === 'debitCard') {
-              openEsiaLoginDialog();
-            } else {
-              consentBkiDialog.open(transformedFormData.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);
-            }
-          };
-
-          const acceptedConsents = getAcceptedConsents(formData, productType);
-
-          verifyPhoneDialog.open({
-            phone: transformedFormData?.phone,
-            consents: acceptedConsents,
-            onSuccess: handleSuccessVerify,
-          });
-          endSending();
+          } else {
+            await sendCurrentTask();
+          }
+        } catch {
+          setOK(false);
         }
-      } catch {
-        setOK(false);
-      }
-    },
-    [esiaError],
-  );
+      };
+
+      const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
+
+      verifyPhoneDialog.open({
+        phone: transformedFormData.phone as string,
+        consents: acceptedConsents,
+        onSuccess: handleSuccessVerify,
+      });
+    } catch {
+      setOK(false);
+    } finally {
+      endSending();
+    }
+  }, []);
 
   return { isSending, ok, handleSubmit };
 };

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

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

package/mobile/src/retail/api/checkCode.ts

@@ -16,7 +16,7 @@ export type CheckCodeResponse = {
 export const checkCode = async (body: CheckCodeBody) =>
   fetchRetailJSON<CheckCodeResponse>('/sms/checkCode', 'POST', body).then(saveToken);
 
-const saveToken = (data: CheckCodeResponse | null) => {
+export const saveToken = (data: CheckCodeResponse | null) => {
   if (data) {
     globalThis.sessionStorage.setItem('accessToken', data.access_token);
     globalThis.sessionStorage.setItem('refreshToken', data.refresh_token);

package/mobile/src/retail/api/{updateProfileEsia.ts → esiaRequestProfile.ts}

@@ -1,13 +1,14 @@
+import { saveToken, type CheckCodeResponse } from './checkCode';
 import { fetchRetailJSON } from './doRequest';
 
-export type UpdateProfileEsiaBody = {
+export type EsiaRequestProfileBody = {
   code: string;
-  profileId: string;
+  authorize: boolean;
   state: string;
   redirectUri: string;
 };
 
-export type UpdateProfileEsiaResponse = {
+export type EsiaRequestProfileResponse = CheckCodeResponse & {
   profile: {
     id: number;
     esiaId: string;
@@ -75,8 +76,18 @@ export type UpdateProfileEsiaResponse = {
     workLengthLastJob: number;
     pdfFileWorkbook: string;
     pdfFilePayout: string;
+    pdfFileSigPayout: string;
+    pdfFileSigWorkbook: string;
+    xmlFilePayout: string;
+    xmlFileSigPayout: string;
+    xmlFileSigWorkbook: string;
+    xmlFileWorkbook: string;
   };
 };
 
-export const updateProfileEsia = (body: UpdateProfileEsiaBody) =>
-  fetchRetailJSON<UpdateProfileEsiaResponse>('/esia/updateProfileEsia', 'POST', body);
+export const esiaRequestProfile = (body: EsiaRequestProfileBody) =>
+  fetchRetailJSON<EsiaRequestProfileResponse>('/esia/requestProfile', 'POST', body).then((res) => {
+    saveToken(res);
+
+    return res;
+  });

package/mobile/src/retail/api/updateUserTask.ts

@@ -52,6 +52,7 @@ export type Participant = {
   surname?: string;
   profile?: {
     id: number;
+    esiaAccountTypeCd?: Option;
   };
   armyIdFlg?: boolean;
   birthPlace?: string;

package/mobile/src/retail/api/uploadFile.ts

@@ -5,13 +5,12 @@ export type DocumentCategory = 'CONFIRMING_EMPLOYMENT_DOC' | 'CONFIRMING_INCOME_
 
 export const uploadFile = async (
   file: Blob,
-  taskId: string,
   documentCategory: DocumentCategory,
+  isPDF = false,
 ): Promise<File> => {
   const fd = new FormData();
-  fd.append('taskId', taskId);
   fd.append('documentCategory', documentCategory);
-  fd.append('file', file, 'file.pdf');
+  fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
 
   const res = await globalThis
     ?.fetch?.(`/light-api-cash/v1/file`, {

package/mobile/src/retail/components/DraftDialog/parseDraftTask.ts

@@ -68,6 +68,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     payrollCardRshbFlg: isInsurance,
     consentInsuranceFlg: isSalaryClient,
     incomeCertificateCd,
+    profile,
   } = participant;
 
   return {
@@ -121,6 +122,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
       monthsValue,
       isAnnuity: paymentTypeCd?.key === 'ANNUITY',
     },
+    esiaAccountTypeCd: profile?.esiaAccountTypeCd,
     ...getParticipantIncomes(participantIncomes),
     ...getParticipantAddresses(participantAddresses),
     ...getParticipantContacts(participantContacts),

package/mobile/src/retail/components/Fields/AddressField.tsx

@@ -35,7 +35,7 @@ export const AddressField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, fieldName)}
+      disabled={isEsiaAuthorize(field, input, fieldName)}
       label="Адрес"
       {...field(fieldName)}
       value={fieldValue?.fullAddress}

package/mobile/src/retail/components/Fields/BeginDateField.tsx

@@ -1,11 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
 export const BeginDateField = JSX<CustomFieldProps>(({ field, input }) => (
   <DatePickerControl
     label="Дата начала работы на текущем месте"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/BirthPlaceField.tsx

@@ -3,13 +3,11 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-const FIELD_NAME = 'birthPlace';
-
 export const BirthPlaceField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
     label="Место рождения"
     {...field(input?.name ?? '')}
     {...input}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/ConfirmationIncomeField.tsx

@@ -1,18 +1,27 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { InfoCard } from '../../../ui-kit/InfoCard/InfoCard';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { SelectField } from './SelectField';
 
 export const ConfirmationIncomeField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: confirmationIncome } = useLeadFormData('INCOME_CERT_UNITED');
+  const filledByEsia = isEsiaAuthorize(field, input);
 
   return (
-    <SelectField
-      field={field}
-      source={confirmationIncome}
-      label="Способ подтверждения дохода"
-      fieldName="confirmationIncome"
-      input={input}
-    />
+    <div className="space-y-xl">
+      {filledByEsia ? (
+        <InfoCard __html="Для выбора иного способа подтверждения дохода, оформите новую заявку на кредит без авторизации на портале Госуслуги" />
+      ) : null}
+      <SelectField
+        field={field}
+        source={confirmationIncome}
+        label="Способ подтверждения дохода"
+        fieldName="confirmationIncome"
+        input={input}
+        disabled={filledByEsia}
+      />
+    </div>
   );
 });

package/mobile/src/retail/components/Fields/DaDataInnField.tsx

@@ -4,6 +4,7 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -41,6 +42,7 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
+      disabled={isEsiaAuthorize(field, input)}
     />
   );
 });

package/mobile/src/retail/components/Fields/DulIssueDateField.tsx

@@ -15,7 +15,7 @@ export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
     <DatePickerControl
       label="Дата выдачи"
       {...field(input?.name ?? '')}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       minDate={startDulIssueDate}
     />
   );

package/mobile/src/retail/components/Fields/DulIssuedByField.tsx

@@ -15,7 +15,7 @@ export const DulIssuedByField = JSX<CustomFieldProps>(({ field, input }) => {
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       label="Кем выдан"
       {...input}
       {...field(input?.name ?? '')}

package/mobile/src/retail/components/Fields/DulNumberField.tsx

@@ -5,7 +5,7 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DulNumberField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
     label="Номер документа"
     isInteger={true}
     maxLength={6}

package/mobile/src/retail/components/Fields/DulSerieField.tsx

@@ -5,7 +5,7 @@ import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DulSerieField = JSX<CustomFieldProps>(({ field, input }) => (
   <DaDataInputControl
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
     label="Серия документа"
     isInteger={true}
     maxLength={4}

package/mobile/src/retail/components/Fields/DulSubdivisionCodeField.tsx

@@ -12,7 +12,7 @@ export const DulSubdivisionCodeField = JSX<CustomFieldProps>(({ field, input })
 
   return (
     <DaDataInputControl
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       label="Код подразделения"
       isInteger={true}
       maxLength={6}

package/mobile/src/retail/components/Fields/Experience5YearsField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { clamp } from '../../../utils/clamp';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const MAX_YEARS = 5;
@@ -22,6 +23,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}
+      disabled={isEsiaAuthorize(field, input)}
     />
   );
 });

package/mobile/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     placeholder="Количество лет"
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/JobsNumberField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/LastJobExperienceField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -10,5 +11,6 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     maxLength={2}
     {...field(input?.name ?? '')}
     {...input}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/LimitedBirthdayField.tsx

@@ -7,6 +7,6 @@ export const LimitedBirthdayField = JSX<CustomFieldProps>(({ field, input }) =>
   <DatePickerControl
     label="Дата рождения"
     {...field(input?.name ?? '')}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    disabled={isEsiaAuthorize(field, input)}
   />
 ));

package/mobile/src/retail/components/Fields/MiddleNameField.tsx

@@ -19,7 +19,7 @@ export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Отчество (Обязательно, при наличии)"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/NameField.tsx

@@ -19,7 +19,7 @@ export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Имя"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/OrganizationNameField.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -19,6 +20,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Наименование организации"
       {...input}
       {...field(input?.name ?? '')}
+      disabled={isEsiaAuthorize(field, input)}
       onDaDataChange={onDaDataChange}
     />
   );

package/mobile/src/retail/components/Fields/SurnameField.tsx

@@ -5,8 +5,6 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-const FIELD_NAME = 'surname';
-
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
   const onChange = useCallback(
     (value: string) => {
@@ -21,7 +19,7 @@ export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
     <DaDataInputControl
       label="Фамилия"
       maxLength={60}
-      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      disabled={isEsiaAuthorize(field, input)}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}