@redneckz/wildless-cms-uni-blocks 0.14.917 → 0.14.919

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { useRetailFormStore } from '../../retail/hooks/useRetailFormStore';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
@@ -24,6 +25,7 @@ const PRODUCT_TYPE = 'credit';
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
+    useIFrameMode();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
 
     const inputs = useMemo(

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

@@ -44,38 +44,30 @@ const EMPLOYMENT_CONTENT: SectionsRetailProps[] = [
     ],
   },
   {
-    inputs: [
-      { name: 'employment', required: true },
-      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
-    ],
+    inputs: [{ name: 'employment', required: true }],
   },
   {
     columns: 2,
     inputs: [
+      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
       { name: 'inn', required: true, dadata: true, filledByEsia: true },
-      { name: 'legalForm', required: true },
     ],
   },
   {
+    columns: 2,
     inputs: [
-      { name: 'organization', required: true },
       { name: 'amountWorkers', required: true },
+      {
+        name: 'organizationPhone',
+        label: 'Телефон работодателя',
+        required: true,
+      },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'employerOrganization', required: true },
       { name: 'jobsNumber', required: true, filledByEsia: true },
-    ],
-  },
-  {
-    inputs: [
-      {
-        name: 'organizationPhone',
-        label: 'Телефон работодателя',
-        required: true,
-      },
       { name: 'beginDate', required: true, filledByEsia: true },
     ],
   },
@@ -177,7 +169,12 @@ const DELIVERY_CREDIT_CONTENT: SectionsRetailProps[] = [
     ],
   },
   {
-    inputs: [{ name: 'bankEmployeeCode' }],
+    columns: 2,
+    inputs: [
+      {
+        name: 'bankEmployeeCode',
+      },
+    ],
   },
 ];
 const CALCULATOR_CONTENT: SectionsRetailProps[] = [

package/mobile/src/components/DebitForm/DebitFormStep.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm';
+import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { renderStep } from '../../retail/utils/renderStep';
@@ -20,6 +21,7 @@ const PRODUCT_TYPE = 'debitCard';
 
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+    useIFrameMode();
     const inputs = useMemo(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],

package/mobile/src/retail/adaptors/getPersonalInfoData.tsx

@@ -1,17 +1,11 @@
 import { formatDate } from '../../utils/formatDate';
-import { formatPhone } from '../../utils/formatPhone';
 import { type Participant } from '../api/updateUserTask';
 import { type LeadFormState } from '../model/LeadFormState';
-import { getParticipantAddresses, getParticipantContacts } from './utils';
+import { getParticipantAddresses } from './utils';
 
 export const getPersonalInfoData = (formData: LeadFormState): Partial<Participant> => {
   const {
-    name,
-    surname,
-    middleName,
     limitedBirthday = '',
-    phone = '',
-    email,
     sex,
     birthPlace,
     dulIssueDate = '',
@@ -29,9 +23,6 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
 
   return {
     birthDate: formatDate(limitedBirthday, true),
-    midname: middleName,
-    name,
-    surname,
     birthPlace,
     dulIssueDate: formatDate(dulIssueDate, true),
     dulIssuedBy,
@@ -44,10 +35,6 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
       : undefined,
     homeMatchFlg: addressMatch,
     houseTypeCd: housing,
-    participantContacts: getParticipantContacts({
-      phone: formatPhone(phone),
-      email,
-    }),
     participantAddresses: getParticipantAddresses({
       addressRegistration,
       addressFact: addressMatch ? addressRegistration : addressFact,

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

@@ -0,0 +1,21 @@
+import { type CreditFormDictionarySlice } from '../hooks/useRetailFormStore';
+import { type DictionaryItem } from '../model/LeadFormData';
+import { fetchRetailJSON } from './doRequest';
+
+export const getDictionaries = (
+  dictionaries: Record<string, string>,
+  store: CreditFormDictionarySlice,
+) => {
+  Promise.all(
+    Object.entries(dictionaries).map((dictionary) => {
+      const [fieldName, dictionaryName] = dictionary;
+
+      fetchRetailJSON<DictionaryItem[]>(
+        `/dictionary?dictionaryType=${encodeURIComponent(dictionaryName)}`,
+        'POST',
+      ).then((res) => {
+        store[fieldName] = res;
+      });
+    }),
+  );
+};

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

@@ -90,6 +90,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     employment: getSelectValue(employment, EMPLOYMENT_TYPE),
     organizationName,
     inn,
+    isDadataOrganization: Boolean(inn),
     employerActivities: getSelectValue(employerActivities),
     organization: getSelectValue(organization),
     employerOrganization: getSelectValue(employerOrganization),

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

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const AmountWorkersField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('EMPLOYEES_NUMBER');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.amountWorkers = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

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

@@ -1,13 +1,45 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { type RadioButtonItem } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroup';
+import { RadioButtonGroupControl } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroupControl';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const BankEmpoleeCodeField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Код представителя Банка"
-    placeholder="Введите код"
-    isInteger={true}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const BUTTON_TYPES: RadioButtonItem[] = [
+  { id: 'true', text: 'Да' },
+  { id: 'false', text: 'Нет' },
+];
+
+export const BankEmployeeCodeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const [bankEmployeeFlg, setBankEmployeeFlg] = useState('');
+
+  const handleBankEmployeeFlgChange = useCallback((value: string) => {
+    setBankEmployeeFlg(value);
+
+    if (value === 'false') {
+      field('bankEmployeeCode')?.onChange?.(null);
+    }
+  }, []);
+
+  return (
+    <div className="flex flex-col md:flex-row">
+      <RadioButtonGroupControl
+        label="Мне помог сотрудник Банка"
+        orientation="horizontal"
+        items={BUTTON_TYPES}
+        value={bankEmployeeFlg}
+        onChange={handleBankEmployeeFlgChange}
+      />
+      {bankEmployeeFlg === 'true' ? (
+        <DaDataInputControl
+          label="Код представителя Банка"
+          placeholder="Введите код"
+          isInteger={true}
+          maxLength={8}
+          {...field(input?.name ?? '')}
+          {...input}
+        />
+      ) : null}
+    </div>
+  );
+});

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

@@ -1,23 +1,40 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { getDictionaries } from '../../api/getDictionaries';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore, type CreditFormStoreSlice } from '../../hooks/useRetailFormStore';
+import { organizationDictionaries } from '../../utils/getOrganizationParams';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
+const NO_DADATA_ERROR_TEXT = 'Необходимо выбрать ИНН из выпадающего списка';
+
 export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const [errorText, setErrorText] = useState('');
   const { employerActivities, employerOrganization, organization, amountWorkers } = store;
   const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
   const inn = field?.('inn')?.value;
+  const fieldError = field?.('organizationName')?.error;
+  const isDadataOrganization = field('isDadataOrganization')?.value;
+
+  useEffect(() => {
+    setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT : '');
+  }, [isDadataOrganization, fieldError]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
     updateOrganizationFields(store, field, item);
   }, []);
 
+  useEffect(() => {
+    (async () => {
+      await getDictionaries(organizationDictionaries, store);
+    })();
+  }, []);
+
   useEffect(() => {
     if (!esiaAccountTypeCd || !inn || !isDictionariesAlreadyLoad(store as CreditFormStoreSlice)) {
       return;
@@ -30,6 +47,11 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
     })();
   }, [employerActivities, employerOrganization, organization, amountWorkers]);
 
+  const onChange = useCallback((value: string) => {
+    field?.('inn')?.onChange?.(value);
+    field?.('isDadataOrganization')?.onChange?.(false);
+  }, []);
+
   return (
     <DaDataInputControl
       label="ИНН"
@@ -39,18 +61,14 @@ export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}
       disabled={isEsiaAuthorize(field, input)}
+      onChange={onChange}
+      error={errorText || field('inn')?.error}
     />
   );
 });
 
 const isDictionariesAlreadyLoad = (store: CreditFormStoreSlice) => {
-  const { employerActivities, employerOrganization, organization, amountWorkers, productType } =
-    store;
-
-  return [
-    employerOrganization,
-    organization,
-    amountWorkers,
-    productType === 'creditCard' ? employerActivities : true,
-  ].every(Boolean);
+  const { employerActivities, employerOrganization, organization, amountWorkers } = store;
+
+  return [employerOrganization, organization, amountWorkers, employerActivities].every(Boolean);
 };

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

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const EmployerActivitiesField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_ACTIVITY_TYPE');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.employerActivities = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

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

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const EmployerOrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_KIND');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.employerOrganization = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

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

@@ -1,21 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
-import { useLeadFormData } from '../../hooks/useLeadFormData';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 import { SelectField } from './SelectField';
 
 export const OrganizationField = JSX<CustomFieldProps>(({ field, input }) => {
-  const { data } = useLeadFormData('ORGANIZATION_TYPE');
-
   const store = useRetailFormStore();
 
-  useEffect(() => {
-    if (data) {
-      store.organization = data;
-    }
-  }, [data]);
-
   return (
     <SelectField
       field={field}

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } 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';
@@ -7,14 +7,27 @@ import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
+const NO_DADATA_ERROR_TEXT = 'Необходимо выбрать организацию из выпадающего списка';
+
 export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const [errorText, setErrorText] = useState('');
+  const fieldError = field?.('organizationName')?.error;
+  const isDadataOrganization = field('isDadataOrganization')?.value;
+
+  useEffect(() => {
+    setErrorText(fieldError && !isDadataOrganization ? NO_DADATA_ERROR_TEXT : '');
+  }, [isDadataOrganization, fieldError]);
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.('inn')?.onChange?.(item.data?.inn);
     updateOrganizationFields(store, field, item);
   }, []);
 
+  const onChange = useCallback((value: string) => {
+    field?.('organizationName')?.onChange?.(value);
+    field?.('isDadataOrganization')?.onChange?.(false);
+  }, []);
+
   return (
     <DaDataInputControl
       label="Наименование организации"
@@ -22,6 +35,8 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
       {...field(input?.name ?? '')}
       disabled={isEsiaAuthorize(field, input)}
       onDaDataChange={onDaDataChange}
+      onChange={onChange}
+      error={errorText || field('organizationName')?.error}
     />
   );
 });

package/mobile/src/retail/content.tsx

@@ -6,21 +6,14 @@ export const PERSONAL_DATA: CreditCardSectionsProps[] = [
     title: 'Персональные данные',
     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: 'sex', required: true },
       { name: 'limitedBirthday', required: true, filledByEsia: true },
       { name: 'birthPlace', required: true, filledByEsia: true },
-      { name: 'phone', disabled: true, required: true },
-      { name: 'email', required: true, dadata: true },
     ],
   },
+  {
+    columns: 2,
+    inputs: [{ name: 'sex', required: true }],
+  },
   {
     title: 'Паспортные данные',
     columns: 2,

package/mobile/src/retail/hooks/useIFrameMode.ts

@@ -0,0 +1,45 @@
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
+import { initializeExternalStylesheet } from '../../hooks/useExternalNS';
+import { isIFrame } from '../../utils/isIFrame';
+
+export type IFrameStore = {
+  frameLocation: string;
+};
+
+export const useIFrameMode = () => {
+  const isFrame = isIFrame();
+  const height = globalThis.document?.body?.scrollHeight;
+  const sessionStore = useSessionStore<IFrameStore>();
+  const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+
+  const styles = params.get('styles');
+  if (styles) {
+    initializeExternalStylesheet(styles);
+  }
+
+  useEffect(() => {
+    if (isFrame) {
+      globalThis.parent.postMessage({ height: document.body.scrollHeight }, '*');
+    }
+  }, [height, isFrame]);
+
+  useEffect(() => {
+    const handlePostMessage = (event: MessageEvent<{ location: string }>) => {
+      if (!event.data?.location) {
+        return;
+      }
+
+      sessionStore.frameLocation = event.data?.location;
+    };
+    if (isFrame) {
+      globalThis.addEventListener('message', handlePostMessage);
+    }
+
+    return () => {
+      if (isFrame) {
+        globalThis.removeEventListener('message', handlePostMessage);
+      }
+    };
+  }, [isFrame]);
+};

package/mobile/src/retail/inputs.tsx

@@ -8,7 +8,7 @@ import { AddressMatchField } from './components/Fields/AddressMatchField';
 import { AddressRetailField } from './components/Fields/AddressRetailField';
 import { AmountWorkersField } from './components/Fields/AmountWorkersField';
 import { ArmyIdFlgField } from './components/Fields/ArmyIdFlgField';
-import { BankEmpoleeCodeField } from './components/Fields/BankEmployeeCodeField';
+import { BankEmployeeCodeField } from './components/Fields/BankEmployeeCodeField';
 import { BankruptcyFlgField } from './components/Fields/BankruptcyFlgField';
 import { BeginDateField } from './components/Fields/BeginDateField';
 import { BirthPlaceField } from './components/Fields/BirthPlaceField';
@@ -136,7 +136,7 @@ export const InputsRetailMap = {
   shareholderFlg: ShareholderFlgField,
   legalEntityName: LegalEntityNameField,
   creditInRshbCd: CreditInRshbCdField,
-  bankEmployeeCode: BankEmpoleeCodeField,
+  bankEmployeeCode: BankEmployeeCodeField,
   partInBusiness: PartInBusinessField,
   regionRetail: RegionRetailField,
   infoCard: InfoCardField,

package/mobile/src/retail/model/LeadFormState.ts

@@ -128,6 +128,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   inn?: string;
   legalForm?: string;
   organizationName?: string;
+  isDadataOrganization?: boolean;
   generalSeniority?: string;
   lastJobExperience?: string;
   experience5Years?: string;
@@ -136,7 +137,6 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   beginDate?: Date | string;
   addressFact?: Address;
   addressBranch?: Option;
-  bankEmpolee?: string;
   applicationDate?: string;
   comment?: string;
   isClient?: boolean;

package/mobile/src/retail/model/NameFieldDef.ts

@@ -35,6 +35,7 @@ type NameFieldRetailDef =
   | 'organizationAddress'
   | 'organizationPhone'
   | 'organizationName'
+  | 'isDadataOrganization'
   | 'legalForm'
   | 'generalSeniority'
   | 'lastJobExperience'

package/mobile/src/retail/utils/getMainFormStateMap.ts

@@ -43,6 +43,7 @@ export const getMainFormStateMap = (isCredit = false): Partial<LeadFormState>[]
       fiasCode: '',
     },
     organizationName: '',
+    isDadataOrganization: false,
     organizationPhone: '',
     partInBusiness: undefined,
     positionOrganization: { key: '', text: '' },
@@ -59,10 +60,4 @@ export const getMainFormStateMap = (isCredit = false): Partial<LeadFormState>[]
     esiaAccountTypeCd: { key: '', text: '' },
     initiateBankruptcyFlg: isCredit ? false : undefined,
   },
-  {
-    bankruptcyFlg: false,
-    shareholderFlg: false,
-    legalEntityName: '',
-    creditInRshbCd: undefined,
-  },
 ];

package/mobile/src/retail/utils/getOrganizationParams.ts

@@ -129,3 +129,10 @@ const getOptionOp = (options: DictionaryItem[]) => (key: string) =>
   options
     .map((_): Option => ({ key: _.key as string, text: _.value as string }))
     .find((_) => _.key === key) ?? null;
+
+export const organizationDictionaries = {
+  amountWorkers: 'EMPLOYEES_NUMBER',
+  employerOrganization: 'ORGANIZATION_KIND',
+  employerActivities: 'ORGANIZATION_ACTIVITY_TYPE',
+  organization: 'ORGANIZATION_TYPE',
+};

package/mobile/src/retail/utils/updateOrganizationFields.ts

@@ -28,6 +28,8 @@ export const updateOrganizationFields = (
     organization: getOrganizationType(store?.organization ?? [], okopf, inn),
     employerOrganization: getOrganizationKind(store?.employerOrganization ?? [], okopf),
     organizationName,
+    inn,
+    isDadataOrganization: true,
   };
 
   for (const fieldName in organizationData) {

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -8,6 +8,8 @@ import { validatorObj } from './validatorObj';
 import {
   dateRegistrationValidator,
   generalSeniorityValidator,
+  organizationInnValidator,
+  organizationNameValidator,
   passportValidator,
   workBeginDateValidator,
 } from './validators';
@@ -32,4 +34,6 @@ export const getRetailFormValidator = ({
     generalSeniority: generalSeniorityValidator(formState.lastJobExperience as string),
     beginDate: workBeginDateValidator(formState.limitedBirthday as Date),
     participantDateRegistration: dateRegistrationValidator(formState.limitedBirthday as Date),
+    organizationName: organizationNameValidator(formState.isDadataOrganization),
+    inn: organizationInnValidator(formState.isDadataOrganization),
   })(formState);

package/mobile/src/retail/validator/validators.ts

@@ -1,3 +1,4 @@
+import { isValidInnLength } from '../../ui-kit/FormField/validators';
 import { isCyrillic } from '../../utils/isCyrilic';
 import { validator } from '../../validation/validator';
 import { type Address } from '../model/LeadFormState';
@@ -135,3 +136,11 @@ export const validateDateFromBirth = (age: number, birthDate?: Date) =>
 
     return false;
   });
+
+export const organizationNameValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => Boolean(_) && Boolean(isDadataOrganization))(
+    'Укажите наименование организации',
+  );
+
+export const organizationInnValidator = (isDadataOrganization?: boolean) =>
+  validator((_: string) => isValidInnLength(_) && Boolean(isDadataOrganization))('Укажите ИНН');

package/mobile/src/ui-kit/DatePicker/DatePickerInput.tsx

@@ -70,7 +70,7 @@ export const DatePickerInput = JSX<DatePickerInputProps>(
       <div onClick={onInputClick} className={style('relative', className)}>
         <input
           ref={ref}
-          className="h-full w-full px-m text-l text-black focus-visible:outline-none"
+          className="h-full w-full px-m text-l text-black focus-visible:outline-none rounded-none"
           value={inputValue}
           type="text"
           onChange={handleChange}

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

@@ -43,5 +43,5 @@ const emailValidate = (email: string) => /^[^\s@]+@[^\s@]+\.[a-zA-Z]{2,4}$/.test
 export const emailValidator = (errorMsg: string) =>
   validator((_: string) => emailValidate(_))(errorMsg);
 
-const isValidInnLength = (value: string | undefined): boolean =>
+export const isValidInnLength = (value: string | undefined): boolean =>
   typeof value === 'string' && (value.length === 10 || value.length === 12);

package/mobile/src/ui-kit/TabsControl/TabItemInner.tsx

@@ -50,6 +50,7 @@ export const TabItemInner = JSX<TabItemInnerProps>(
           'h-12',
           'block flex-1',
           'cursor-pointer',
+          'rounded-none',
           tabPaddingStyleMap[type],
           isActive ? activeTabBgStyleMap[type] : tabBgStyleMap[type],
         )}

package/mobile/src/utils/isIFrame.ts

@@ -0,0 +1 @@
+export const isIFrame = () => globalThis.location !== globalThis?.top?.location;