@redneckz/wildless-cms-uni-blocks 0.14.145 → 0.14.147

package/mobile/src/components/ApplicationForm/ApplicationFormFeedback.tsx

@@ -6,7 +6,6 @@ import { useBranches } from '../../hooks/useBranches';
 import { useForm } from '../../hooks/useForm';
 import { type Option } from '../../ui-kit/Select/Option';
 import { withValidator } from '../../validation/withValidator';
-import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import { ApplicationFieldsetLayout } from './ApplicationFieldsetLayout';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
 import { FEEDBACK_METHOD, FEEDBACK_TYPES, SERVICE_DIRECTIONS } from './feedbackTypes';
@@ -14,8 +13,8 @@ import { formStyle, oneColumnFormStyle } from './formStyle';
 import { handleSubmitIndividual, handleSubmitLegal, handleSubmitQuestion } from './handleSubmit';
 import { InputControl } from './InputControl';
 import { PhoneInputControl } from './PhoneInputControl';
+import { RegionField } from './RegionField';
 import { renderAgreementWithSubmit } from './renderAgreementWithSubmit';
-import { renderRegion } from './renderRegion';
 import { initialUserFormState, renderUserData, type UserDataState } from './renderUserData';
 import { SelectControl } from './SelectControl';
 import { defaultValidator, innValidator, phoneValidator } from './validators';
@@ -69,89 +68,84 @@ export const ApplicationFormFeedback = JSX<ApplicationFormsProps>(({ button, lin
   );
 
   const [formState, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
-  const regions = useGetRegions();
-  const addressByBranch = useBranches(formState?.region?.key).filter((branch) => branch?.address);
+
   const isQualityService = field('typeForm').value?.key === 'FEEDBACK_QS';
   const isLegalEntity = getLegalEntity(
     field('typeForm').value?.key,
     field('serviceDirection').value?.key,
   );
+  const addressByBranch = useBranches(formState?.region?.key).filter((branch) => branch?.address);
 
   return (
     <form className={formStyle} onSubmit={formProps.onSubmit}>
-      <ApplicationFieldsetLayout
-        firstChildren={
-          <div className={oneColumnFormStyle}>
+      <ApplicationFieldsetLayout>
+        <div className={oneColumnFormStyle}>
+          <SelectControl
+            label="Тема*"
+            placeholder="Выберите тему"
+            options={FEEDBACK_TYPES}
+            {...withValidator(field('typeForm'), defaultValidator)}
+          />
+          {isQualityService ? (
             <SelectControl
-              label="Тема*"
-              placeholder="Выберите тему"
-              options={FEEDBACK_TYPES}
-              {...withValidator(field('typeForm'), defaultValidator)}
+              label="Направление обслуживания*"
+              placeholder="Выберите направление"
+              options={SERVICE_DIRECTIONS}
+              {...withValidator(field('serviceDirection'), defaultValidator)}
             />
-            {isQualityService ? (
-              <SelectControl
-                label="Направление обслуживания*"
-                placeholder="Выберите направление"
-                options={SERVICE_DIRECTIONS}
-                {...withValidator(field('serviceDirection'), defaultValidator)}
-              />
-            ) : null}
-            {renderRegion(regions, field)}
-            {isQualityService ? (
-              <SelectControl
-                label="Адрес*"
-                placeholder="Выберите адрес"
-                options={addressByBranch.map(({ branchCode = '', address = '' }) => ({
-                  key: branchCode,
-                  text: address,
-                }))}
-                {...withValidator(field('addressBranch'), defaultValidator)}
-              />
-            ) : null}
-            {renderUserData<FeedbackFormState>(field, true)}
-            {isLegalEntity ? (
-              <div>
-                <InputControl label="ИНН*" {...withValidator(field('inn'), innValidator)} />
-                <InputControl label="Наименование организации" {...field('fullName')} />
-              </div>
-            ) : null}
+          ) : null}
+          <RegionField field={field} />
+          {isQualityService ? (
             <SelectControl
-              label="Способ получения ответа*"
-              options={FEEDBACK_METHOD}
-              {...withValidator(field('feedbackMethod'), defaultValidator)}
-            />
-            <PhoneInputControl
-              label="Телефон*"
-              {...withValidator(field('phone'), phoneValidator)}
+              label="Адрес*"
+              placeholder="Выберите адрес"
+              options={addressByBranch.map(({ branchCode = '', address = '' }) => ({
+                key: branchCode,
+                text: address,
+              }))}
+              {...withValidator(field('addressBranch'), defaultValidator)}
             />
-            {isQualityService ? (
-              <div>
-                <PhoneInputControl label="Дополнительный телефон" {...field('secondaryPhone')} />
-                <InputControl
-                  label="Электронная почта*"
-                  {...withValidator(field('email'), defaultValidator)}
-                />
-                <InputControl
-                  label="ФИО или должность обслуживавшего Вас сотрудника Банка"
-                  {...field('bankEmpolee')}
-                />
-                <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
-              </div>
-            ) : (
+          ) : null}
+          {renderUserData<FeedbackFormState>(field, true)}
+          {isLegalEntity ? (
+            <div>
+              <InputControl label="ИНН*" {...withValidator(field('inn'), innValidator)} />
+              <InputControl label="Наименование организации" {...field('fullName')} />
+            </div>
+          ) : null}
+          <SelectControl
+            label="Способ получения ответа*"
+            options={FEEDBACK_METHOD}
+            {...withValidator(field('feedbackMethod'), defaultValidator)}
+          />
+          <PhoneInputControl label="Телефон*" {...withValidator(field('phone'), phoneValidator)} />
+          {isQualityService ? (
+            <div>
+              <PhoneInputControl label="Дополнительный телефон" {...field('secondaryPhone')} />
               <InputControl
                 label="Электронная почта*"
                 {...withValidator(field('email'), defaultValidator)}
               />
-            )}
+              <InputControl
+                label="ФИО или должность обслуживавшего Вас сотрудника Банка"
+                {...field('bankEmpolee')}
+              />
+              <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
+            </div>
+          ) : (
             <InputControl
-              {...withValidator(field('comment'), defaultValidator)}
-              placeholder="Ваше сообщение*"
-              isTextarea={true}
+              label="Электронная почта*"
+              {...withValidator(field('email'), defaultValidator)}
             />
-            {renderAgreementWithSubmit(field('consentDataProcessing'), link, button)}
-          </div>
-        }
-      />
+          )}
+          <InputControl
+            {...withValidator(field('comment'), defaultValidator)}
+            placeholder="Ваше сообщение*"
+            isTextarea={true}
+          />
+          {renderAgreementWithSubmit(field('consentDataProcessing'), link, button)}
+        </div>
+      </ApplicationFieldsetLayout>
     </form>
   );
 });

package/mobile/src/components/ApplicationForm/ApplicationFormIndividuals.tsx

@@ -68,28 +68,25 @@ export const ApplicationFormIndividuals = JSX<ApplicationFormsProps>((props) =>
 
   return (
     <form className={formStyle} onSubmit={formProps.onSubmit}>
-      <ApplicationFieldsetLayout
-        firstChildren={
-          <div className={formChildrenStyle}>
-            <InputControl label="Фамилия" {...withValidator(field('surname'), nameValidator)} />
-            <InputControl label="Отчество" {...withValidator(field('middleName'), nameValidator)} />
-            <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
-          </div>
-        }
-        secondChildren={
-          <div className={formChildrenStyle}>
-            <InputControl label="Имя" {...withValidator(field('name'), nameValidator)} />
-            <DatePickerControl
-              label="Дата рождения*"
-              {...withValidator(field('birthday'), defaultValidator)}
-            />
-            <InputControl
-              label="Электронная почта"
-              {...withValidator(field('email'), defaultValidator)}
-            />
-          </div>
-        }
-      />
+      <ApplicationFieldsetLayout>
+        <div className={formChildrenStyle}>
+          <InputControl label="Фамилия" {...withValidator(field('surname'), nameValidator)} />
+          <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} />
+          <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
+        </div>
+
+        <div className={formChildrenStyle}>
+          <InputControl label="Имя" {...withValidator(field('name'), nameValidator)} />
+          <DatePickerControl
+            label="Дата рождения*"
+            {...withValidator(field('birthday'), defaultValidator)}
+          />
+          <InputControl
+            label="Электронная почта"
+            {...withValidator(field('email'), defaultValidator)}
+          />
+        </div>
+      </ApplicationFieldsetLayout>
       {renderAgreementWithSubmit(field('consentDataProcessing'), link, button)}
     </form>
   );

package/mobile/src/components/ApplicationForm/ApplicationFormSelfCollection.tsx

@@ -6,14 +6,13 @@ import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
-import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import { ApplicationFieldsetLayout } from './ApplicationFieldsetLayout';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
 import { formStyle, oneColumnFormStyle } from './formStyle';
 import { InputControl } from './InputControl';
 import { PhoneInputControl } from './PhoneInputControl';
-import { renderRegion } from './renderRegion';
+import { RegionField } from './RegionField';
 import { renderSubmitButton } from './renderSubmitButton';
 import { initialUserFormState, type UserDataState } from './renderUserData';
 import { defaultValidator, phoneValidator } from './validators';
@@ -57,24 +56,21 @@ export const ApplicationFormSelfCollection = JSX<ApplicationFormsProps>(
     );
 
     const [, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
-    const regions = useGetRegions();
 
     return (
       <form className={formStyle} onSubmit={formProps.onSubmit}>
-        <ApplicationFieldsetLayout
-          firstChildren={
-            <div className={oneColumnFormStyle}>
-              <InputControl label="ФИО*" {...withValidator(field('fullName'), defaultValidator)} />
-              {renderRegion(regions, field)}
-              <PhoneInputControl
-                label="Телефон*"
-                {...withValidator(field('phone'), phoneValidator)}
-              />
-              {renderSubmitButton(button)}
-              <Footnote link={link} />
-            </div>
-          }
-        />
+        <ApplicationFieldsetLayout>
+          <div className={oneColumnFormStyle}>
+            <InputControl label="ФИО*" {...withValidator(field('fullName'), defaultValidator)} />
+            <RegionField field={field} />
+            <PhoneInputControl
+              label="Телефон*"
+              {...withValidator(field('phone'), phoneValidator)}
+            />
+            {renderSubmitButton(button)}
+            <Footnote link={link} />
+          </div>
+        </ApplicationFieldsetLayout>
       </form>
     );
   },

package/mobile/src/components/ApplicationForm/ApplicationFormUltraPremium.tsx

@@ -0,0 +1,151 @@
+/* eslint-disable max-lines-per-function,max-lines */
+
+import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm } from '../../hooks/useForm';
+import { usePremiumBranchesByRegions } from '../../hooks/usePremiumBranchesByRegions';
+import { type Option } from '../../ui-kit/Select/Option';
+import { formatPhone } from '../../utils/formatPhone';
+import { objectValidator } from '../../validation/objectValidator';
+import { isValidationSuccess } from '../../validation/validator';
+import { withValidator } from '../../validation/withValidator';
+import { ApplicationFieldsetLayout, formChildrenStyle } from './ApplicationFieldsetLayout';
+import { type ApplicationFormsProps } from './ApplicationFormsProps';
+import { formStyle } from './formStyle';
+import { InputControl } from './InputControl';
+import { PhoneInputControl } from './PhoneInputControl';
+import { renderAgreementWithSubmit } from './renderAgreementWithSubmit';
+import { initialUserFormState, type UserDataState } from './renderUserData';
+import { SelectControl } from './SelectControl';
+import { checkboxValidator, defaultValidator, nameValidator, phoneValidator } from './validators';
+
+export const SERVICE_TYPES: Option[] = [
+  { key: 'ULTRASERVICE', text: 'Ультра' },
+  { key: 'PREMIUMSERVICE', text: 'Премиум' },
+];
+
+export type UltraPremiumFormState = UserDataState & {
+  typeForm: Option;
+  phone: string;
+  email: string;
+  addressBranch?: Option;
+  region?: Option;
+  comment: string;
+  consentDataProcessing: boolean;
+};
+
+const initialFormState: UltraPremiumFormState = {
+  typeForm: SERVICE_TYPES[0],
+  ...initialUserFormState,
+  email: '',
+  phone: '',
+  comment: '',
+  consentDataProcessing: false,
+};
+
+const creditValidator = objectValidator({
+  typeForm: defaultValidator,
+  surname: defaultValidator,
+  name: nameValidator,
+  phone: phoneValidator,
+  email: defaultValidator,
+  addressBranch: defaultValidator,
+  consentDataProcessing: checkboxValidator,
+});
+
+export const ApplicationFormUltraPremium = JSX<ApplicationFormsProps>(
+  ({ button, link, onSubmit, defaultType = 'PREMIUMSERVICE' }) => {
+    const handleSubmit = useCallback(
+      (formState: UltraPremiumFormState) => {
+        const { surname, name, middleName, email, comment, consentDataProcessing } = formState;
+
+        const submitData = {
+          typeForm: formState.typeForm.key,
+          surname,
+          name,
+          middleName,
+          phoneNumber: formatPhone(formState.phone),
+          email,
+          addressBranch: formState.addressBranch?.key,
+          comment,
+          consentDataProcessing,
+        };
+        console.log(submitData);
+
+        isValidationSuccess(creditValidator(formState)) && onSubmit(submitData, true);
+      },
+      [onSubmit],
+    );
+
+    const [formState, { field, ...formProps }] = useForm(
+      { ...initialFormState, typeForm: getDefaultFormType(defaultType) as Option },
+      handleSubmit,
+    );
+    const branchByRegions = usePremiumBranchesByRegions();
+    const regions = branchByRegions.map(({ region }) => ({
+      key: region,
+      text: region,
+    }));
+    const regionKey = formState?.region?.key;
+    const addressBranches = branchByRegions.find((_) => _?.region === regionKey)?.branches;
+
+    return (
+      <form className={formStyle} onSubmit={formProps.onSubmit}>
+        <ApplicationFieldsetLayout title="Ваши данные">
+          <div className={formChildrenStyle}>
+            <InputControl label="Фамилия*" {...withValidator(field('surname'), nameValidator)} />
+            <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} />
+            <InputControl
+              label="Электронная почта*"
+              {...withValidator(field('email'), defaultValidator)}
+            />
+          </div>
+
+          <div className={formChildrenStyle}>
+            <InputControl label="Имя*" {...withValidator(field('name'), nameValidator)} />
+            <PhoneInputControl
+              label="Телефон*"
+              {...withValidator(field('phone'), phoneValidator)}
+            />
+            <SelectControl
+              label="Тип обслуживания*"
+              options={SERVICE_TYPES}
+              {...withValidator(field('typeForm'), defaultValidator)}
+            />
+          </div>
+        </ApplicationFieldsetLayout>
+        <ApplicationFieldsetLayout title="Офис банка">
+          <div className={formChildrenStyle}>
+            <SelectControl
+              label="Регион*"
+              placeholder="Выберите регион"
+              options={regions as Option[]}
+              {...withValidator(field('region'), defaultValidator)}
+            />
+          </div>
+          <div className={formChildrenStyle}>
+            <SelectControl
+              className="w-full"
+              label="Адрес*"
+              placeholder="Выберите отделение"
+              options={(addressBranches || []).map(({ address = '' }) => ({
+                key: address,
+                text: address,
+              }))}
+              {...withValidator(field('addressBranch'), defaultValidator)}
+            />
+          </div>
+        </ApplicationFieldsetLayout>
+        <InputControl
+          {...field('comment')}
+          placeholder="Комментарий, удобное время и прочее"
+          isTextarea={true}
+        />
+        {renderAgreementWithSubmit(field('consentDataProcessing'), link, button)}
+      </form>
+    );
+  },
+);
+
+const getDefaultFormType = (defaultType: string) =>
+  SERVICE_TYPES.find((_) => _.key === defaultType);

package/mobile/src/components/ApplicationForm/ApplicationFormWed.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
+import { useRegions } from '../../hooks/useRegions';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { type Option } from '../../ui-kit/Select/Option';
 import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
-import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
 import { renderContacts } from './renderContacts';
@@ -89,7 +89,7 @@ export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
   );
 
   const [, { field, ...formProps }] = useForm(initialFormState, handleSubmit);
-  const regions = useGetRegions();
+  const regions = useRegions();
   const textField = field('text');
 
   return (

package/mobile/src/components/ApplicationForm/ApplicationFormsProps.ts

@@ -1,5 +1,5 @@
 import { type LinkProps } from '../../model/LinkProps';
-import { type SubmitButtonProps } from './ApplicationFormContent';
+import { type SubmitButtonProps, type UltraPremiumTypeProps } from './ApplicationFormContent';
 
 export interface ApplicationFormsProps<S extends Record<string, any> = Record<string, any>> {
   button?: SubmitButtonProps;
@@ -7,4 +7,5 @@ export interface ApplicationFormsProps<S extends Record<string, any> = Record<st
   sourceBookDir?: string;
   product?: string;
   onSubmit: (data: S, isIndividualType?: boolean) => void;
+  defaultType?: UltraPremiumTypeProps;
 }

package/mobile/src/components/ApplicationForm/EmbeddableForms.tsx

@@ -8,6 +8,7 @@ import { ApplicationFormFeedback } from './ApplicationFormFeedback';
 import { ApplicationFormGrantSupport } from './ApplicationFormGrantSupport';
 import { ApplicationFormIndividuals } from './ApplicationFormIndividuals';
 import { ApplicationFormSelfCollection } from './ApplicationFormSelfCollection';
+import { ApplicationFormUltraPremium } from './ApplicationFormUltraPremium';
 import { ApplicationFormWed } from './ApplicationFormWed';
 
 export const EmbeddableForms = {
@@ -22,4 +23,5 @@ export const EmbeddableForms = {
   ApplicationFormAntiFraud,
   ApplicationFormCorruption,
   ApplicationFormSelfCollection,
+  ApplicationFormUltraPremium,
 };

package/mobile/src/components/ApplicationForm/RegionField.tsx

@@ -0,0 +1,25 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type FormFieldRegisterer } from '../../hooks/useForm';
+import { useRegions } from '../../hooks/useRegions';
+import { withValidator } from '../../validation/withValidator';
+import { SelectControl } from './SelectControl';
+import { defaultValidator } from './validators';
+
+interface RegionFieldProps {
+  field: FormFieldRegisterer<any>;
+}
+
+export const RegionField = JSX<RegionFieldProps>(({ field }) => {
+  const regions = useRegions();
+
+  return (
+    <SelectControl
+      className="w-full"
+      label="Филиал"
+      placeholder="Выберите филиал"
+      isSearch={true}
+      options={regions.map(({ code = '', name = '' }) => ({ key: code, text: name }))}
+      {...withValidator(field('region'), defaultValidator)}
+    />
+  );
+});

package/mobile/src/components/ApplicationForm/renderAcquiringDataOrganization.tsx

@@ -10,22 +10,17 @@ export const renderAcquiringDataOrganization = (
   field: FormFieldRegisterer<AcquiringFormState>,
   title?: string,
 ) => (
-  <ApplicationFieldsetLayout
-    title={title}
-    firstChildren={
-      <div className={formChildrenStyle}>
-        <InputControl
-          label="Наименование организации*"
-          {...withValidator(field('fullName'), defaultValidator)}
-        />
-        <InputControl label="Контактное лицо*" {...withValidator(field('name'), nameValidator)} />
-      </div>
-    }
-    secondChildren={
-      <div className={formChildrenStyle}>
-        <InputControl label="ИНН*" {...withValidator(field('inn'), innValidator)} />
-        <PhoneInputControl label="Телефон*" {...withValidator(field('phone'), phoneValidator)} />
-      </div>
-    }
-  />
+  <ApplicationFieldsetLayout title={title}>
+    <div className={formChildrenStyle}>
+      <InputControl
+        label="Наименование организации*"
+        {...withValidator(field('fullName'), defaultValidator)}
+      />
+      <InputControl label="Контактное лицо*" {...withValidator(field('name'), nameValidator)} />
+    </div>
+    <div className={formChildrenStyle}>
+      <InputControl label="ИНН*" {...withValidator(field('inn'), innValidator)} />
+      <PhoneInputControl label="Телефон*" {...withValidator(field('phone'), phoneValidator)} />
+    </div>
+  </ApplicationFieldsetLayout>
 );

package/mobile/src/components/ApplicationForm/renderAcquiringRegion.tsx

@@ -3,30 +3,27 @@ import { withValidator } from '../../validation/withValidator';
 import { ACQUIRING_TYPES } from './acquiringTypes';
 import { ApplicationFieldsetLayout, formChildrenStyle } from './ApplicationFieldsetLayout';
 import { type AcquiringFormState } from './ApplicationFormAcquiring';
-import { type Select } from './models';
-import { renderRegion } from './renderRegion';
+import { RegionField } from './RegionField';
 import { SelectControl } from './SelectControl';
 import { defaultValidator } from './validators';
 
 interface AcquiringRegionProps {
-  regions: Select[];
   field: FormFieldRegisterer<AcquiringFormState>;
   title?: string;
 }
 
-export const renderAcquiringRegion = ({ field, title, regions }: AcquiringRegionProps) => (
-  <ApplicationFieldsetLayout
-    title={title}
-    firstChildren={
-      <div className={formChildrenStyle}>
-        <SelectControl
-          label="Вид эквайринга"
-          placeholder="Выберите эквайринг"
-          options={ACQUIRING_TYPES}
-          {...withValidator(field('acquiringType'), defaultValidator)}
-        />
-      </div>
-    }
-    secondChildren={<div className={formChildrenStyle}>{renderRegion(regions, field)}</div>}
-  />
+export const renderAcquiringRegion = ({ field, title }: AcquiringRegionProps) => (
+  <ApplicationFieldsetLayout title={title}>
+    <div className={formChildrenStyle}>
+      <SelectControl
+        label="Вид эквайринга"
+        placeholder="Выберите эквайринг"
+        options={ACQUIRING_TYPES}
+        {...withValidator(field('acquiringType'), defaultValidator)}
+      />
+    </div>
+    <div className={formChildrenStyle}>
+      <RegionField field={field} />
+    </div>
+  </ApplicationFieldsetLayout>
 );

package/mobile/src/components/ApplicationForm/renderAgreementWithSubmit.tsx

@@ -13,7 +13,7 @@ export const renderAgreementWithSubmit = (
   link?: LinkProps,
   button?: SubmitButtonProps,
 ) => (
-  <div className="flex flex-col lg:flex-row w-full justify-between items-baseline">
+  <div className="flex gap-m flex-col lg:flex-row w-full justify-between items-baseline">
     <div>
       <div className="flex gap-3">
         <Checkbox {...consentDataProcessing} />

package/mobile/src/components/ApplicationForm/renderBusinessCardDataOrganization.tsx

@@ -9,21 +9,14 @@ import { defaultValidator, innValidator, nameValidator, phoneValidator } from '.
 export const renderBusinessCardDataOrganization = (
   field: FormFieldRegisterer<BusinessCardFormState>,
 ) => (
-  <ApplicationFieldsetLayout
-    firstChildren={
-      <div className={formChildrenStyle}>
-        <InputControl label="Контактное лицо" {...withValidator(field('name'), nameValidator)} />
-        <InputControl label="ИНН" {...withValidator(field('inn'), innValidator)} />
-      </div>
-    }
-    secondChildren={
-      <div className={formChildrenStyle}>
-        <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
-        <InputControl
-          label="Электронная почта"
-          {...withValidator(field('mail'), defaultValidator)}
-        />
-      </div>
-    }
-  />
+  <ApplicationFieldsetLayout>
+    <div className={formChildrenStyle}>
+      <InputControl label="Контактное лицо" {...withValidator(field('name'), nameValidator)} />
+      <InputControl label="ИНН" {...withValidator(field('inn'), innValidator)} />
+    </div>
+    <div className={formChildrenStyle}>
+      <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
+      <InputControl label="Электронная почта" {...withValidator(field('mail'), defaultValidator)} />
+    </div>
+  </ApplicationFieldsetLayout>
 );