@redneckz/wildless-cms-uni-blocks 0.14.600 → 0.14.602

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

@@ -9,6 +9,7 @@ import { formatPhone } from '../../utils/formatPhone';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess } from '../../validation/validator';
 import { type FieldDef } from './ApplicationLeadFormContent';
+import { CONSENTS } from './consents';
 import { type FormState } from './getInitialFormState';
 
 type ApplicationLeadApiProps = {
@@ -61,10 +62,15 @@ export const useApplicationLeadApi = ({ inputs, programId, saveForm }: Applicati
             setResponseStatus('Fail');
           }
         };
+
+        const acceptedConsents: string[] = Object.keys(CONSENTS)
+          .filter((_) => formData[_])
+          .map((_) => CONSENTS[_]);
+
         // eslint-disable-next-line react-hooks/rules-of-hooks
         const verifyPhoneDialog = useVerifyPhoneDialog({
           close: handleSuccessVerify,
-          ...verifyPhoneContent(formData?.phone),
+          ...verifyPhoneContent(formData?.phone, acceptedConsents),
         });
         verifyPhoneDialog.open();
       }
@@ -79,14 +85,15 @@ export const useApplicationLeadApi = ({ inputs, programId, saveForm }: Applicati
   };
 };
 
-const verifyPhoneContent = (phone: string) => ({
+const verifyPhoneContent = (phone: string, consents: string[]) => ({
   title: 'Подтвердите номер телефона',
   description: `Мы отправили код на ${phone}`,
   phoneNumber: formatPhone(phone),
   textButton: 'Оформить',
-  __html: `<span>Вводя код, я подтверждаю, что ознакомлен и подписываю:</span>
-              <ul><li>соглашение о порядке использования простой электронной подписи,
-              </li><li>согласие на обработку персональных данных,
-              </li><li>предоставление и подписание прочих согласий Банка,
-              </li><li>согласие на запрос в ПФР</li></ul>`,
+  __html: `<span>Вводя код, я подтверждаю, что ознакомлен и подписываю:</span>${consentsToList(
+    consents,
+  )}`,
 });
+
+const consentsToList = (consents?: string[]) =>
+  `<ul>${consents?.map((_) => '<li>' + _ + '</li>').join('')}</ul>`;

package/mobile/src/components/CarouselTariffsCard/CarouselTariffsCard.tsx

@@ -1,22 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useSubjectState } from '../../EventBus/useSubjectState';
+import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { defaultEventBus } from '../../EventBus/defaultEventBus';
+import { type AspectsDef } from '../../model/AspectsProps';
+import { type Slot } from '../../model/ContentPageDef';
+import { type VNode } from '../../model/VNode';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
+import { Foldable } from '../../ui-kit/Foldable/Foldable';
+import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
 import { Heading } from '../../ui-kit/Heading/Heading';
+import { Icon } from '../../ui-kit/Icon/Icon';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkButton } from '../../ui-kit/LinkButton/LinkButton';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
+import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { isIcon } from '../../utils/isIcon';
 import { style } from '../../utils/style';
-import { CardCellsSection } from './CardCellsSection';
 import { type CarouselTariffsCardContent } from './CarouselTariffsCardContent';
-import { carouselTariffsCardEventBus } from './carouselTariffsCardEventBus';
+import { renderCardInfo } from './renderCardInfo';
 
 export interface CarouselTariffsCardProps extends CarouselTariffsCardContent, UniBlockProps {}
 
 export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
   ({
-    className,
+    className = '',
     title,
     align = 'text-center',
     icon,
@@ -27,20 +33,22 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
     data,
     ...rest
   }) => {
-    const { isUnfolded, parent: firedParent } = useSubjectState(
-      carouselTariffsCardEventBus.observable,
-      'fold',
-      {},
-    );
-    const isVisible = isUnfolded && firedParent === options?.parent;
+    const cellsNode = cardCells.map(renderCardInfo);
+
+    const [visibleCells, hiddenCells] =
+      visibleCellsCount > 0
+        ? [cellsNode.slice(0, visibleCellsCount), cellsNode.slice(visibleCellsCount)]
+        : [cellsNode, []];
+    const [isVisible, setIsVisible] = useState(false);
 
-    const toggle = useCallback(
+    useEffect(
       () =>
-        carouselTariffsCardEventBus.emitter.fire('fold', {
-          isUnfolded: !isVisible,
-          parent: options?.parent,
+        defaultEventBus.subscribe('fold', (event) => {
+          if (options?.parent !== undefined && event.parent === options?.parent) {
+            setIsVisible(event.isUnfolded);
+          }
         }),
-      [isVisible, options?.parent],
+      [options?.parent],
     );
 
     return (
@@ -54,14 +62,49 @@ export const CarouselTariffsCard = JSX<CarouselTariffsCardProps>(
           <Heading className={style('pt-xs', align)} headingType="h5" title={title} />
         ) : null}
         {button?.text ? <LinkButton className="w-full mt-m mb-lg" {...button} /> : null}
-        <CardCellsSection
-          cardCells={cardCells}
-          visibleCellsCount={visibleCellsCount}
-          isUnfolded={isVisible}
-          data={data}
-          onToggle={toggle}
-        />
+        {hiddenCells.length ? (
+          <Foldable
+            renderFoldableSection={() => (
+              <div>
+                {visibleCells}
+                <FoldableSection isUnfolded={isVisible}>{hiddenCells}</FoldableSection>
+              </div>
+            )}
+            renderFoldButton={
+              cardCells.length >= visibleCellsCount
+                ? renderFoldButton(options?.parent, data, isVisible)
+                : null
+            }
+          />
+        ) : (
+          <div>{visibleCells}</div>
+        )}
       </BlockWrapper>
     );
   },
 );
+
+const renderFoldButton =
+  (parent?: Slot, data?: AspectsDef[], isUnfolded = false) =>
+  (): VNode =>
+    (
+      <button
+        className="w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center"
+        onClick={() => {
+          if (parent !== undefined) {
+            defaultEventBus.fire('fold', { type: 'fold', isUnfolded: !isUnfolded, parent });
+          }
+        }}
+        type="button"
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...(isUnfolded ? getAspectsAttributes(data) : {})}
+      >
+        <div>{isUnfolded ? 'Скрыть' : 'Подробнее о тарифе'}</div>
+        <Icon
+          className="text-primary-text"
+          name={isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon'}
+          width="16"
+          height="16"
+        />
+      </button>
+    );

package/mobile/src/components/CarouselTariffsCard/CarouselTariffsCardAction.ts

@@ -0,0 +1,6 @@
+import { type Slot } from './../../model/ContentPageDef';
+export type CarouselTariffsCardAction = {
+  type: 'fold';
+  isUnfolded: boolean;
+  parent: Slot;
+};

package/mobile/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocationState } from '../../hooks/useLocation';
+import { useLocation } from '../../hooks/useLocation';
 import { BaseTile } from '../../ui-kit/BaseTile/BaseTile';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -19,7 +19,7 @@ export interface ExchangeRateTileProps extends ExchangeRateTileContent, UniBlock
 
 export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
   ({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-    const currentLocation = useLocationState();
+    const [currentLocation] = useLocation();
     const exchangeRates = useFetchExchangeRateData(currentLocation);
 
     const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -4,7 +4,7 @@ import { type SearchHeaderProps } from '../../data/CommonData';
 import { type HeaderData } from '../../data/HeaderData';
 import { type NavigationData } from '../../data/NavigationData';
 import { getAspectsWithInclude } from '../../hooks/useAspects/aspects/getAspectsWithInclude';
-import { useLocationState } from '../../hooks/useLocation';
+import { useLocation } from '../../hooks/useLocation';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type IconVersion } from '../../model/IconVersion';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
@@ -22,7 +22,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
   ({ className, version, ...rest }) => {
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
-    const currentLocation = useLocationState(rest?.branches?.default);
+    const [currentLocation] = useLocation(rest?.branches?.default);
 
     const searchDialog = useSearchDialog(rest);
     const locationDialog = useLocationDialog(rest);

package/mobile/src/components/OfficesAtmsMap/AtmsMap.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocationState } from '../../hooks/useLocation';
+import { useLocation } from '../../hooks/useLocation';
 import { type AtmsDef } from './OfficesAtmsMapContent';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
 import { type Atm } from './OfficesAtmsMapProps';
@@ -30,7 +30,8 @@ export interface AtmsMapProps {
 }
 
 export const AtmsMap = JSX<AtmsMapProps>(({ descriptionData, className }) => {
-  const currentLocation = useLocationState();
+  const [currentLocation] = useLocation();
+
   const regionCode = currentLocation?.code ?? '000';
 
   const { data: officesData, isLoad } = useAtms(regionCode);

package/mobile/src/components/OfficesAtmsMap/OfficesMap.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLocationState } from '../../hooks/useLocation';
+import { useLocation } from '../../hooks/useLocation';
 import { OfficesAtmsMapLayout } from './OfficesAtmsMapLayout';
 import { getOfficePoint, renderOfficeCard } from './renderOfficeCard';
 import { getRemoteWorkplacePoint, renderRemoteWorkplaceCard } from './renderRemoteWorkplaceCard';
@@ -10,7 +10,7 @@ export interface OfficesMapProps {
 }
 
 export const OfficesMap = JSX<OfficesMapProps>(({ className }) => {
-  const currentLocation = useLocationState();
+  const [currentLocation] = useLocation();
   const regionCode = currentLocation?.code ?? '000';
   const { data, isLoad } = useOffices(regionCode);
 

package/mobile/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -4,7 +4,7 @@ import { type HeaderData } from '../../data/HeaderData';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type StickyMenuItem } from '../../data/StickyMobileData';
 import { env } from '../../Env';
-import { useLocationState } from '../../hooks/useLocation';
+import { useLocation } from '../../hooks/useLocation';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useLocationDialog } from '../../ui-kit/LocationDialog/useLocationDialog';
 import { getBasePath } from '../../utils/getBasePath';
@@ -22,7 +22,7 @@ export interface BurgerMenuDialogProps {
 export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
   ({ menuRef, menuItem, locationDialogProps, closeAll }) => {
     const locationDialog = useLocationDialog(locationDialogProps || {});
-    const { name: location } = useLocationState();
+    const [{ name: location }] = useLocation();
     const menuDimensions = menuRef?.current?.getBoundingClientRect();
     const basePath = getBasePath(env.SITE_URL);
 

package/mobile/src/hooks/useLocation.ts

@@ -1,40 +1,54 @@
-import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
-import { useSubject } from '../EventBus/useSubject';
-import { useSubjectState } from '../EventBus/useSubjectState';
-import { fetchJSON } from '../utils/fetchJSON';
+import { useLatestEvent } from '../EventBus/useLatestEvent';
+import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 import { type Region } from './useRegions';
 
 const REGION_URL = '/api/v1/region';
 const LOCATION_STORAGE_KEY = 'location';
 
-export function useLocation(defaultLocation = 'Москва'): (_: Region) => void {
-  useEffect(() => defaultEventBus.subscribe('location', storeLocation), []);
-
-  return useSubject(defaultEventBus.emitter, 'location', restoreLocation(defaultLocation));
-}
-
-export function useLocationState(defaultLocation = 'Москва'): Region {
-  return useSubjectState(defaultEventBus.observable, 'location', { name: defaultLocation });
-}
-
-function restoreLocation(defaultLocation: string) {
-  return async (): Promise<Region> => {
-    if (!globalThis.localStorage?.hasItem(LOCATION_STORAGE_KEY)) {
-      storeLocation(await fetchJSON<Region>(REGION_URL));
-    }
-
-    const storedLocation = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
-    try {
-      return storedLocation && JSON.parse(storedLocation);
-    } catch (ex) {
-      // Do nothing
+export function useLocation(defaultLocation = 'Москва'): [Region, (_: Region) => void] {
+  const [currentLocation, fireCurrentLocation] = useLatestEvent(
+    defaultEventBus,
+    'location',
+    restoreLocation() ?? { name: defaultLocation },
+  );
+
+  const selectCurrentLocation = useCallback((_: Region) => {
+    storeLocation(_);
+    fireCurrentLocation(_);
+  }, []);
+
+  const { data } = useAsyncData(
+    hasStoredLocation() ? null : REGION_URL,
+    fetchJSONUnsafe as FetchJSONUnsafeType<Region>,
+  );
+  useEffect(() => {
+    if (data && !hasStoredLocation()) {
+      fireCurrentLocation(data);
     }
+  }, [data]);
 
-    return { name: defaultLocation };
-  };
+  return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
 }
 
-function storeLocation(_: Region | null | undefined) {
-  _ && globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
-}
+const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
+
+const restoreLocation = (): Region | null => {
+  try {
+    const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+
+    return data && JSON.parse(data);
+  } catch (ex) {
+    return null;
+  }
+};
+
+const storeLocation = (_: Region) => {
+  try {
+    globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+  } catch (ex) {
+    // Do nothing
+  }
+};

package/mobile/src/hooks/useRegions.ts

@@ -11,11 +11,8 @@ export interface Region {
   localities?: string[];
 }
 
-const EMPTY_REGIONS: Region[] = [];
-
-// TODO Почему url можно менять? Разве смысл не в инкапсуляции api url. Тоже под рефакторинг попадает
 export function useRegions(url: string = REGIONS_URL): Region[] {
   const { data } = useAsyncData(url, fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>);
 
-  return Array.isArray(data) ? data : EMPTY_REGIONS;
+  return Array.isArray(data) ? data : [];
 }

package/mobile/src/model/LinkProps.ts

@@ -13,9 +13,12 @@ import { type TextProps } from './HeadlineType';
  */
 export type Target = '' | '_self' | '_blank' | '_parent' | '_top';
 
-export type LinkCommonProps = {
+export type HrefProps = {
   /** @title URL (href) */
   href?: string;
+};
+
+export type LinkCommonProps = HrefProps & {
   /** @default "" */
   target?: Target;
 };

package/mobile/src/ui-kit/Checkbox/CheckboxWithDoc.tsx

@@ -0,0 +1,48 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type VNode } from '../../model/VNode';
+import { Dialog } from '../DialogManager/Dialog';
+import { useDialogManager } from '../DialogManager/useDialogManager';
+import { renderErrorText } from '../Input/renderErrorText';
+import { LinkButton } from '../LinkButton/LinkButton';
+import { Text } from '../Text/Text';
+import { Checkbox } from './Checkbox';
+import { type CheckboxProps } from './CheckboxProps';
+import { getDocument } from './getDocument';
+
+const OPEN_DOC_BUTTON_TEXT = 'Ознакомиться';
+
+interface CheckboxWithDocProps extends CheckboxProps {
+  docId?: number;
+}
+
+export const CheckboxWithDoc = JSX<CheckboxWithDocProps>(
+  ({ className, error, docId, ...props }) => {
+    const { open } = useDialogManager();
+
+    return (
+      <div className={className}>
+        <div className="flex flex-wrap gap-x-m">
+          <Checkbox {...props} />
+          {docId ? (
+            <LinkButton
+              className="text-primary-main"
+              onClick={() => handleOpenDocument(docId, open)}
+            >
+              <Text>{OPEN_DOC_BUTTON_TEXT}</Text>
+            </LinkButton>
+          ) : null}
+        </div>
+        {renderErrorText(error)}
+      </div>
+    );
+  },
+);
+
+const handleOpenDocument = async (id: number, open: (dialog: VNode) => void) => {
+  const document = await getDocument(id);
+  open(
+    <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0">
+      <iframe src={`${document}#toolbar=0`} className="w-full h-[80vh]" id="iframe-dialog" />
+    </Dialog>,
+  );
+};

package/mobile/src/ui-kit/Checkbox/getDocument.ts

@@ -0,0 +1,7 @@
+import { RETAIL_API } from '../../api/RetailApi/RetailApi';
+
+export const getDocument = async (id: number) => {
+  const response = await RETAIL_API.GetFileByID(id);
+
+  return URL.createObjectURL(await response.blob());
+};

package/mobile/src/ui-kit/DialogManager/useDialogManager.ts

@@ -8,7 +8,7 @@ export interface DialogOptions {
 
 export const useDialogManager = () => ({
   open: (dialog: VNode, options: DialogOptions = {}) =>
-    defaultEventBus.emitter.fire('dialog', { type: 'open', dialog, ...options }),
-  close: () => defaultEventBus.emitter.fire('dialog', { type: 'close' }),
-  closeAll: () => defaultEventBus.emitter.fire('dialog', { type: 'close', all: true }),
+    defaultEventBus.fire('dialog', { type: 'open', dialog, ...options }),
+  close: () => defaultEventBus.fire('dialog', { type: 'close' }),
+  closeAll: () => defaultEventBus.fire('dialog', { type: 'close', all: true }),
 });

package/mobile/src/ui-kit/DialogManager/useDialogsList.ts

@@ -27,7 +27,7 @@ export const useDialogsList = ({
 
   useEffect(
     () =>
-      defaultEventBus.observable.subscribe('dialog', (action) => {
+      defaultEventBus.subscribe('dialog', (action) => {
         switch (action.type) {
           case 'open':
             push(action);

package/mobile/src/ui-kit/Foldable/Foldable.tsx

@@ -3,30 +3,14 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type VNode } from '../../model/VNode';
 import { type FoldablePartProps } from './FoldablePartProps';
 
-export interface FoldableWrapperProps {
+export interface FoldableProps {
   className?: string;
-}
-
-export interface FoldableProps extends FoldableWrapperProps {
   unfoldedByDefault?: boolean;
   isFoldButtonOnTop?: boolean;
   renderFoldableSection: (props: FoldablePartProps) => VNode;
   renderFoldButton?: ((props: FoldablePartProps) => VNode) | null;
 }
 
-export const FoldableWrapper = JSX<FoldableWrapperProps>(({ className, children }) => (
-  <div className={className} role="group">
-    {children}
-  </div>
-));
-
-/**
- * Какой то бесполезный компонент. Его можно заменить на useBool
- * Лучше оставить только обёрточный div с необходимой атрибутикой
- * и сделать пассивный компонент
- *
- * @deprecated
- */
 export const Foldable = JSX<FoldableProps>(
   ({
     className = '',
@@ -45,15 +29,15 @@ export const Foldable = JSX<FoldableProps>(
     const buttonNode = renderFoldButton ? renderFoldButton({ isUnfolded, onToggle }) : null;
 
     return isFoldButtonOnTop ? (
-      <FoldableWrapper className={className}>
+      <div className={className} role="group">
         {buttonNode}
         {sectionNode}
-      </FoldableWrapper>
+      </div>
     ) : (
-      <FoldableWrapper className={className}>
+      <div className={className} role="group">
         {sectionNode}
         {buttonNode}
-      </FoldableWrapper>
+      </div>
     );
   },
 );

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

@@ -0,0 +1,16 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { CONSENTS } from '../../../components/ApplicationLeadForm/consents';
+import { CheckboxWithDoc } from '../../Checkbox/CheckboxWithDoc';
+import { type CustomFieldProps } from '../CustomFieldProps';
+import { validatorObj } from '../getObjectValidator';
+import { getValidation } from '../getValidation';
+
+export const ConsentField = JSX<CustomFieldProps>(({ field, input }) =>
+  input && input.name ? (
+    <CheckboxWithDoc
+      text={CONSENTS[input.name]?.text}
+      docId={CONSENTS[input.name]?.docId}
+      {...getValidation(field(input.name), validatorObj[input.name], input?.required)}
+    />
+  ) : null,
+);

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

@@ -26,5 +26,4 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'email', text: 'Электронное сообщение' },
 ];
 
-// TODO Тоже надо рефакторить - файлик constants
 export const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';

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

@@ -1,7 +1,6 @@
 import { type FieldDef } from '../../components/ApplicationForm/ApplicationFormContent';
 import { getRegionUrl } from '../../components/ApplicationForm/getRegionUrl';
 import { type FormFieldRegisterer } from '../../hooks/useForm';
-import { CheckboxWithError } from '../Checkbox/CheckboxWithError';
 import { InputControl } from '../Input/InputControl';
 import { AcquiringField } from './Fields/AcquiringField';
 import { AddressBranchField } from './Fields/AddressBranchField';
@@ -17,12 +16,7 @@ import { ChildrenField } from './Fields/ChildrenField';
 import { CollectionCountField } from './Fields/CollectionCountField';
 import { CommentField } from './Fields/CommentField';
 import { ConscriptionField } from './Fields/ConscriptionField';
-import { ConsentAssignmentField } from './Fields/ConsentAssignmentField';
-import { ConsentCollectionField } from './Fields/ConsentCollectionField';
-import { ConsentInformField } from './Fields/ConsentInformField';
-import { ConsentPhotoFlg } from './Fields/ConsentPhotoField';
-import { ConsentProviderField } from './Fields/ConsentProviderField';
-import { ConsentToReceiveMaterialsField } from './Fields/ConsentToReceiveMaterialsField';
+import { ConsentField } from './Fields/ConsentField';
 import { DependentsField } from './Fields/DependentsField';
 import { DesiredMeetingDateField } from './Fields/DesiredMeetingDateField';
 import { DulIssueDateField } from './Fields/DulIssueDateField';
@@ -61,7 +55,6 @@ import { PartnerCommentsField } from './Fields/PartnerCommentsField';
 import { PhoneField } from './Fields/PhoneField';
 import { PositionOrganizationField } from './Fields/PositionOrganizationField';
 import { PosTerminalField } from './Fields/PosTerminalField';
-import { ProcessPersonalDataField } from './Fields/ProcessPersonalDataField';
 import { ProductField } from './Fields/ProductField';
 import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
@@ -124,19 +117,18 @@ export const getField =
       serviceDirection: <ServiceDirectionField field={field} input={input} />,
       bankEmpolee: <BankEmpoleeField field={field} />,
       secondaryPhone: <SecondaryPhoneField field={field} />,
-      consentToReceiveMaterials: <ConsentToReceiveMaterialsField field={field} input={input} />,
-      processPersonalDataLeadFlg: <ProcessPersonalDataField field={field} input={input} />,
-      consentProviderFlg: <ConsentProviderField field={field} input={input} />,
-      consentPhotoFlg: <ConsentPhotoFlg field={field} input={input} />,
-      consentAssignmentClaimsFlg: <ConsentAssignmentField field={field} input={input} />,
-      consentCollectionFlg: <ConsentCollectionField field={field} input={input} />,
-      consentInformFlg: <ConsentInformField field={field} input={input} />,
+      consentToReceiveMaterials: <ConsentField field={field} input={input} />,
+      processPersonalDataLeadFlg: <ConsentField field={field} input={input} />,
+      consentProviderFlg: <ConsentField field={field} input={input} />,
+      consentPhotoFlg: <ConsentField field={field} input={input} />,
+      consentAssignmentClaimsFlg: <ConsentField field={field} input={input} />,
+      consentCollectionFlg: <ConsentField field={field} input={input} />,
+      consentInformFlg: <ConsentField field={field} input={input} />,
+      consentPfrFlg: <ConsentField field={field} input={input} />,
       applicationDate: (
         <InputControl label="Дата и время обращения в Банк" {...field('applicationDate')} />
       ),
-      consentPfrFlg: (
-        <CheckboxWithError text="Согласие на запрос в ПФР" {...field('consentPfrFlg')} />
-      ),
+
       region: isPremium ? (
         <RegionPremiumField field={field} />
       ) : (
@@ -152,7 +144,6 @@ export const getField =
       positionOrganization: <PositionOrganizationField field={field} input={input} />,
       familyStatus: <FamilyStatusField field={field} input={input} />,
       children: <ChildrenField field={field} input={input} />,
-      // eslint-disable-next-line max-lines
       familyMembers: <FamilyMembersField field={field} input={input} />,
       dependents: <DependentsField field={field} input={input} />,
       totalIncome: <TotalIncomeField field={field} input={input} />,
@@ -162,6 +153,7 @@ export const getField =
       armyIdFlg: <ArmyIdFlgField field={field} input={input} />,
       dulSerie: <DulSerieField field={field} input={input} />,
       dulNumber: <DulNumberField field={field} input={input} />,
+      // eslint-disable-next-line max-lines
       dulIssueDateField: <DulIssueDateField field={field} input={input} />,
       dulSubdivisionCode: <DulSubdivisionCodeField field={field} input={input} />,
       dulIssuedBy: <DulIssuedByField field={field} input={input} />,

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

@@ -2,6 +2,5 @@ import { type FieldProps } from '../../hooks/useForm';
 import { type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
 
-// TODO Зачем это?
 export const getValidation = (field: FieldProps<any>, validator: Validator, required = false) =>
   required ? withValidator(field, validator) : field;