@redneckz/wildless-cms-uni-blocks 0.14.730 → 0.14.732

package/mobile/src/model/FormTypeFieldDef.ts

@@ -0,0 +1,20 @@
+/** @hidden */
+export type FormTypeFieldDef =
+  | ''
+  | 'ACQR'
+  | 'ANALITIC'
+  | 'ANTIFRAUD'
+  | 'BCRD'
+  | 'BROK'
+  | 'BROKACCOUNT'
+  | 'COLLECTION'
+  | 'CORRUPTION'
+  | 'CRED'
+  | 'DPST'
+  | 'PRODUCT'
+  | 'SELFCOLLECTION'
+  | 'KVED'
+  | 'ULTRASERVICE'
+  | 'FEEDBACK'
+  | 'FEEDBACK_QS'
+  | 'OUTSERVICE';

package/mobile/src/model/InputSectionsType.ts

@@ -1,4 +1,5 @@
-import { type FieldDef } from '../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../components/ApplicationForm/ApplicationFormContent';
+import { type FieldRetailDef } from '../services/retail/model/RetailFormContent';
 import { type ColumnsCount } from './ColumnCount';
 import { type TitleProps } from './HeadlineType';
 
@@ -14,3 +15,13 @@ export interface InputSectionsType {
   /** @hidden */
   sections?: SectionsProps[];
 }
+
+export type SectionsRetailProps = TitleProps & {
+  columns?: ColumnsCount;
+  inputs?: FieldRetailDef[];
+};
+
+export interface InputRetailSectionsType {
+  /** @hidden */
+  sections?: SectionsRetailProps[];
+}

package/mobile/src/services/retail/content.tsx

@@ -95,8 +95,9 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'info',
-        text:
+        fieldType: 'common',
+        name: 'infoCard',
+        label:
           'Клиент на момент оформления заявки на кредит должен быть: официально трудоустроен более 6 месяцев, ' +
           'если Клиент получает з/п на счет РСХБ, то трудоустроен более 3 месяцев, не должен находиться в декретном отпуске',
       },
@@ -188,8 +189,9 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'info',
-        text: 'Сумма основного и дополнительных доходов после вычета налога',
+        fieldType: 'common',
+        name: 'infoCard',
+        label: 'Сумма основного и дополнительных доходов после вычета налога',
       },
     ],
   },
@@ -266,8 +268,9 @@ export const DELIVERY_CREDIT_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'info',
-        text: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+        fieldType: 'common',
+        name: 'infoCard',
+        label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
       },
     ],
   },
@@ -345,8 +348,9 @@ export const DELIVERY_CREDIT_CARD_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       {
-        fieldType: 'info',
-        text: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
+        fieldType: 'common',
+        name: 'infoCard',
+        label: 'Если представитель Банка помогал Вам в заведении заявки, введите здесь его код',
         condition: {
           name: 'methodObtain',
           values: ['office'],

package/mobile/src/services/retail/inputs.tsx

@@ -36,6 +36,7 @@ import { FamilyMembersField } from '../../ui-kit/FormField/Fields/FamilyMembersF
 import { FamilyStatusField } from '../../ui-kit/FormField/Fields/FamilyStatusField';
 import { GeneralSeniorityField } from '../../ui-kit/FormField/Fields/GeneralSeniorityField';
 import { HousingField } from '../../ui-kit/FormField/Fields/HousingField';
+import { InfoCardField } from '../../ui-kit/FormField/Fields/InfoCardField';
 import { JobsNumberField } from '../../ui-kit/FormField/Fields/JobsNumberField';
 import { LastJobExperienceField } from '../../ui-kit/FormField/Fields/LastJobExperienceField';
 import { LegalEntityNameField } from '../../ui-kit/FormField/Fields/LegalEntityNameField';
@@ -125,6 +126,7 @@ export const InputsRetailMap = {
   bankEmployeeCode: (props: CustomFieldProps) => <BankEmpoleeCodeField {...props} />,
   partInBusiness: (props: CustomFieldProps) => <PartInBusinessField {...props} />,
   regionRetail: (props: CustomFieldProps) => <RegionRetailField {...props} />,
+  infoCard: (props: CustomFieldProps) => <InfoCardField {...props} />,
   calculator: (props: CustomFieldProps) => <CreditCalcField {...props} />,
 };
 

package/mobile/src/services/retail/model/RetailFormContent.ts

@@ -1,6 +1,3 @@
-/* eslint-disable max-lines */
-/* eslint-disable max-len */
-
 import { type LabelProps, type LinkButtonVersion, type TextProps } from '../external/types';
 import { type NameFieldDef } from './LeadFormState';
 
@@ -37,65 +34,11 @@ export type FieldDefaultDef = Required &
   };
 
 /**
- * @title Поля ввода по умолчанию
- * @default {"fieldType": "common"}
- */
-export type FieldCommonDef = FieldDefaultDef & {
-  /** @default "common" */
-  fieldType: 'common';
-};
-
-/**
- * @title Значение по умолчанию
- * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
- */
-type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
-
-/**
- * @title Поле ввода ВЭД
- * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
+ * @title Поле ввода
+ * @default { "fieldType": "common" }
  */
-export type FieldVedDef = FieldDefaultDef & {
-  /** @default "ved" */
-  fieldType: 'ved';
-  defaultValue?: VedTypes;
-};
 
-/**
- * @title Текст для отображения в карточке информации
- * @default {"fieldType": "info"}
- */
-export type FieldInfoDef = FieldDefaultDef &
+export type FieldRetailDef = FieldDefaultDef &
   TextProps & {
-    /** @default "info" */
-    fieldType: 'info';
+    fieldType: 'common';
   };
-
-/**
- * @title Поле
- * @default { "fieldType": "common" }
- */
-
-export type FieldDef = FieldCommonDef | FieldVedDef | FieldInfoDef;
-
-/** @hidden */
-export type TypeFormFieldDef =
-  | ''
-  | 'ACQR'
-  | 'ANALITIC'
-  | 'ANTIFRAUD'
-  | 'BCRD'
-  | 'BROK'
-  | 'BROKACCOUNT'
-  | 'COLLECTION'
-  | 'CORRUPTION'
-  | 'CRED'
-  | 'DPST'
-  | 'PRODUCT'
-  | 'SELFCOLLECTION'
-  | 'KVED'
-  | 'ULTRASERVICE'
-  | 'PREMIUMSERVICE'
-  | 'FEEDBACK'
-  | 'FEEDBACK_QS'
-  | 'OUTSERVICE';

package/mobile/src/services/retail/utils/calculateInputs.ts

@@ -1,10 +1,11 @@
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { type Option } from '../../../ui-kit/Select/Option';
 import { type LeadFormState } from '../model/LeadFormState';
-import { type FieldDef } from '../model/RetailFormContent';
+import { type FieldRetailDef } from '../model/RetailFormContent';
 
 export type GetValue = <K extends keyof LeadFormState>(name: K) => LeadFormState[K];
 
-export const calculateInputs = (getValue: GetValue) => (inputs: FieldDef[], step: number) =>
+export const calculateInputs = (getValue: GetValue) => (inputs: FieldRetailDef[], step: number) =>
   inputs
     .filter((_) => _)
     .map((_) => {

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

@@ -1,13 +1,14 @@
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
 export interface CustomFieldProps {
   field: FormFieldRegisterer<any>;
   input?: FieldDef;
   url?: string;
   params?: Record<string, any>;
-  typeForm?: TypeFormFieldDef;
+}
+
+export interface CustomFieldPropsWithTypeForm extends CustomFieldProps {
+  typeForm?: FormTypeFieldDef;
 }

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

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBranches } from '../../../hooks/useBranches';
 import { useBranchesByRegions } from '../../../hooks/useBranchesByRegions';
-import { type TypeFormFieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../../model/FormTypeFieldDef';
 import { SelectControl } from '../../Select/SelectControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
@@ -14,7 +14,7 @@ interface RegionFieldProps extends CustomFieldProps {
 }
 
 export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, params }) => {
-  const isPremium = getPremium(params?.typeForm as TypeFormFieldDef);
+  const isPremium = getPremium(params?.typeForm as FormTypeFieldDef);
 
   const fieldRegion = field('region');
   const regionKey = fieldRegion?.value?.key as string;

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

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

@@ -0,0 +1,7 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InfoCard } from '../../InfoCard/InfoCard';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const InfoCardField = JSX<CustomFieldProps>(({ input }) => (
+  <InfoCard __html={input?.label} />
+));

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { type FieldDef } from '../../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../../components/ApplicationForm/ApplicationFormContent';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';

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

@@ -71,7 +71,8 @@ type NameFieldRetailDef =
   | 'bankEmployeeCode'
   | 'partInBusiness'
   | 'regionRetail'
-  | 'calculator';
+  | 'calculator'
+  | 'infoCard';
 
 type NameFieldApplicationDef =
   | 'surname'

package/mobile/src/ui-kit/FormField/getConsentDataProcessing.tsx

@@ -1,4 +1,4 @@
-import type { FieldDef } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getConsentDataProcessing = (inputs: FieldDef[]) =>
   inputs?.find((_) => _?.name === 'consentDataProcessing');

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -1,9 +1,7 @@
 //TODO: Убрать обращение к компонентам т.к. ApplicationForm
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../components/ApplicationForm/ApplicationFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type VNode } from '../../model/VNode';
 import { InputControl } from '../Input/InputControl';
 import { type CustomFieldProps } from './CustomFieldProps';
@@ -70,7 +68,7 @@ const InputsMap = {
     <InputControl label="Дата и время обращения в Банк" {...props} />
   ),
   region: (props: CustomFieldProps) =>
-    getPremium(props?.params?.typeForm as TypeFormFieldDef) ? (
+    getPremium(props?.params?.typeForm as FormTypeFieldDef) ? (
       <RegionPremiumField {...props} />
     ) : (
       <RegionField {...props} />

package/mobile/src/ui-kit/FormField/getNamesFromInput.tsx

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 
 export const getNamesFromInput = (inputs: FieldDef[]) =>
   Object.values(inputs.filter((_) => _))?.map((_) => _.name);

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -1,4 +1,4 @@
-import { type FieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { type Validator } from '../../validation/validator';
 import { getNamesFromInput } from './getNamesFromInput';
 import {

package/mobile/src/ui-kit/FormField/getPremium.tsx

@@ -1,3 +1,3 @@
-import { type TypeFormFieldDef } from '../../services/retail/model/RetailFormContent';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 
-export const getPremium = (typeForm: TypeFormFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';
+export const getPremium = (typeForm: FormTypeFieldDef = ''): boolean => typeForm === 'ULTRASERVICE';

package/package.json

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

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -3,6 +3,7 @@
 
 import { type AspectsProps } from '../../model/AspectsProps';
 import { type ColumnsCount } from '../../model/ColumnCount';
+import { type FormTypeFieldDef } from '../../model/FormTypeFieldDef';
 import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type InputSectionsType } from '../../model/InputSectionsType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
@@ -66,43 +67,12 @@ export type FieldVedDef = FieldDefaultDef & {
   defaultValue?: VedTypes;
 };
 
-/**
- * @title Текст для отображения в карточке информации
- * @default {"fieldType": "info"}
- */
-export type FieldInfoDef = FieldDefaultDef &
-  TextProps & {
-    /** @default "info" */
-    fieldType: 'info';
-  };
-
 /**
  * @title Поле
  * @default { "fieldType": "common" }
  */
 
-export type FieldDef = FieldCommonDef | FieldVedDef | FieldInfoDef;
-
-/** @hidden */
-export type TypeFormFieldDef =
-  | ''
-  | 'ACQR'
-  | 'ANALITIC'
-  | 'ANTIFRAUD'
-  | 'BCRD'
-  | 'BROK'
-  | 'BROKACCOUNT'
-  | 'COLLECTION'
-  | 'CORRUPTION'
-  | 'CRED'
-  | 'DPST'
-  | 'PRODUCT'
-  | 'SELFCOLLECTION'
-  | 'KVED'
-  | 'ULTRASERVICE'
-  | 'FEEDBACK'
-  | 'FEEDBACK_QS'
-  | 'OUTSERVICE';
+export type FieldDef = FieldCommonDef | FieldVedDef;
 
 /** @hidden */
 export type EndpointType = 'lead' | 'sendcorporatelead';
@@ -157,7 +127,7 @@ export type ApplicationFormContent = UniBlockContent &
       /** @default "" */
       target?: Target;
     };
-    typeForm?: TypeFormFieldDef;
+    typeForm?: FormTypeFieldDef;
     endpoint?: EndpointType;
     /** @title Дополнительные параметры формы */
     additionalParams?: additionalParamsType;

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
@@ -10,7 +11,7 @@ import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseType
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { applicationFormData } from './applicationFormData';
-import { type ApplicationLeadFormContent, type FieldDef } from './ApplicationLeadFormContent';
+import { type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -21,7 +22,7 @@ interface ApplicationLeadFormProps extends ApplicationLeadFormContent, UniBlockP
 export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   ({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
     const inputs = useMemo(
-      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldDef[],
+      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
       [applicationFormData],
     );
 

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -1,87 +1,19 @@
-import { type LabelProps, type TextProps, type TitleProps } from '../../model/HeadlineType';
-import { type InputSectionsType } from '../../model/InputSectionsType';
+import { type TextProps, type TitleProps } from '../../model/HeadlineType';
+import { type InputRetailSectionsType } from '../../model/InputSectionsType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
-import { type NameFieldDef } from '../../ui-kit/FormField/NameFieldDef';
-import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
-interface Required {
-  /** @title Обязательно для заполнения */
-  required?: boolean;
-}
+import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 export type SubmitButtonProps = TextProps & {
   version?: LinkButtonVersion;
 };
 
-export type ConditionFieldProps = {
-  /** @title Условия отображения полей формы */
-  condition?: {
-    name: NameFieldDef;
-    /** @title Значения при которых отображаются поля */
-    values: string[];
-  };
-};
-
-export type FilledByEsiaProps = {
-  /** @title Заполняется через госуслуги */
-  filledByEsia?: boolean;
-};
-
-export type FieldDefaultDef = Required &
-  TextProps &
-  LabelProps &
-  ConditionFieldProps &
-  FilledByEsiaProps & {
-    name?: NameFieldDef;
-  };
-
-/**
- * @title Поля ввода по умолчанию
- * @default {"fieldType": "common"}
- */
-export type FieldCommonDef = FieldDefaultDef & {
-  /** @default "common" */
-  fieldType: 'common';
-  dadata?: boolean;
-};
-
-/**
- * @title Значение по умолчанию
- * @enumNames ["Валютный контроль","Документарные операции","Конверсионные операции","Иные вопросы ВЭД"]
- */
-type VedTypes = 'currencyControl' | 'documentOperations' | 'conversionTransactions' | 'otherIssues';
-
-/**
- * @title Поле ввода ВЭД
- * @default {"fieldType": "ved", "name": "vedTypes", "defaultValue": "currencyControl"}
- */
-export type FieldVedDef = FieldDefaultDef & {
-  /** @default "ved" */
-  fieldType: 'ved';
-  defaultValue?: VedTypes;
-};
-
-/**
- * @title Текст для отображения в карточке информации
- * @default {"fieldType": "info"}
- */
-export type FieldInfoDef = FieldDefaultDef & {
-  /** @default "info" */
-  fieldType: 'info';
-};
-
-/**
- * @title Поле
- * @default { "fieldType": "common" }
- */
-export type FieldDef = FieldCommonDef | FieldVedDef | FieldInfoDef;
-
 /**
  * @title Форма заявки настраиваемая
  */
 export type ApplicationLeadFormContent = UniBlockContent &
   TitleProps &
-  InputSectionsType & {
+  InputRetailSectionsType & {
     /** @title Кнопка */
     button?: SubmitButtonProps;
     /** @title Номер кредитной программы */

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -3,10 +3,7 @@ import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { type FormFieldRegisterer, type VNode } from '../../services/retail/external/types';
 import { InputsConsentsMap } from '../../services/retail/inputs';
 import { type LeadFormState } from '../../services/retail/model/LeadFormState';
-import {
-  type FieldDef,
-  type TypeFormFieldDef,
-} from '../../services/retail/model/RetailFormContent';
+import { type FieldRetailDef } from '../../services/retail/model/RetailFormContent';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { Foldable } from '../../ui-kit/Foldable/Foldable';
 import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps';
@@ -18,66 +15,63 @@ import { renderErrorText } from '../../ui-kit/Input/renderErrorText';
 import { withValidator } from '../../validation/withValidator';
 
 export interface GroupedConsentsProps {
-  inputs?: FieldDef[];
-  typeForm?: TypeFormFieldDef;
+  inputs?: FieldRetailDef[];
   field: FormFieldRegisterer<LeadFormState>;
 }
 
 const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
 const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
 
-export const GroupedConsents = JSX<GroupedConsentsProps>(
-  ({ inputs = [], typeForm = '', field, key }) => {
-    const isChecked = inputs.every((_) => Boolean(field(_.name as keyof LeadFormState).value));
+export const GroupedConsents = JSX<GroupedConsentsProps>(({ inputs = [], field, key }) => {
+  const isChecked = inputs.every((_) => Boolean(field(_.name as keyof LeadFormState).value));
 
-    const handleGeneralToggle = (value: boolean) => {
-      for (const item of inputs) {
-        const itemField = field(item.name as keyof LeadFormState);
-        itemField?.onChange && itemField.onChange(value);
-      }
-    };
+  const handleGeneralToggle = (value: boolean) => {
+    for (const item of inputs) {
+      const itemField = field(item.name as keyof LeadFormState);
+      itemField?.onChange && itemField.onChange(value);
+    }
+  };
 
-    const hasValidationErrors = useMemo(
-      () =>
-        inputs
-          ?.filter((_) => _.required)
-          ?.some((_) =>
-            Boolean(
-              withValidator(
-                field(_?.name as keyof LeadFormState),
-                validatorObj[_?.name as keyof LeadFormState],
-              ).error,
-            ),
+  const hasValidationErrors = useMemo(
+    () =>
+      inputs
+        ?.filter((_) => _.required)
+        ?.some((_) =>
+          Boolean(
+            withValidator(
+              field(_?.name as keyof LeadFormState),
+              validatorObj[_?.name as keyof LeadFormState],
+            ).error,
           ),
-      [inputs],
-    );
+        ),
+    [inputs],
+  );
 
-    return (
-      <div className="w-fit">
-        <Foldable
-          isFoldButtonOnTop
-          unfoldedByDefault
-          renderFoldableSection={({ isUnfolded }) => (
-            <FoldableSection isUnfolded={isUnfolded} className="flex flex-col pl-2xl">
-              {inputs.map(getField(field, { typeForm }, InputsConsentsMap))}
-            </FoldableSection>
-          )}
-          renderFoldButton={renderGeneralCheckbox(
-            <div>
-              <Checkbox
-                value={isChecked}
-                onChange={handleGeneralToggle}
-                text={CONSENT_ALL_DOCS_TEXT}
-                key={key}
-              />
-              {renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')}
-            </div>,
-          )}
-        />
-      </div>
-    );
-  },
-);
+  return (
+    <div className="w-fit">
+      <Foldable
+        isFoldButtonOnTop
+        unfoldedByDefault
+        renderFoldableSection={({ isUnfolded }) => (
+          <FoldableSection isUnfolded={isUnfolded} className="flex flex-col pl-2xl">
+            {inputs.map(getField(field, {}, InputsConsentsMap))}
+          </FoldableSection>
+        )}
+        renderFoldButton={renderGeneralCheckbox(
+          <div>
+            <Checkbox
+              value={isChecked}
+              onChange={handleGeneralToggle}
+              text={CONSENT_ALL_DOCS_TEXT}
+              key={key}
+            />
+            {renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')}
+          </div>,
+        )}
+      />
+    </div>
+  );
+});
 
 const renderGeneralCheckbox =
   (generalCheckBox: VNode) =>

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -1,6 +1,6 @@
-import { type SectionsProps } from '../../model/InputSectionsType';
+import { type SectionsRetailProps } from '../../model/InputSectionsType';
 
-export const applicationFormData: SectionsProps[] = [
+export const applicationFormData: SectionsRetailProps[] = [
   {
     columns: 2,
     inputs: [