@redneckz/wildless-cms-uni-blocks 0.14.862 → 0.14.863

package/mobile/src/retail/components/VerifyPhoneDialog/SubmitButton.tsx

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type DisabledProps } from '../../../model/DisabledProps';
+import { type TextProps } from '../../../model/HeadlineType';
+import { type OnClickProps } from '../../../model/OnClickProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Text } from '../../../ui-kit/Text/Text';
 
-interface SubmitButtonProps extends DisabledProps {
-  onClick: () => void;
-  text?: string;
-}
+interface SubmitButtonProps extends DisabledProps, TextProps, OnClickProps {}
 
 export const SubmitButton = JSX<SubmitButtonProps>(({ disabled = false, onClick, text }) => (
   <Button type="button" onClick={onClick} disabled={disabled}>

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

@@ -1,11 +1,13 @@
 /* eslint-disable complexity */
+import { type Option } from '../../ui-kit/Select/Option';
+import { type Nullable } from '../../utils/Nullable';
 import { EOrganizationActivityTypes } from '../model/EOrganizationActivityTypes';
 import { type DictionaryItem } from '../model/LeadFormData';
 
 export const getOrganizationActivityType = (
   options: DictionaryItem[],
   okved: string,
-): { key: string; text: string } | null => {
+): Nullable<Option> => {
   if (!okved) {
     return null;
   }
@@ -78,7 +80,7 @@ export const getOrganizationActivityType = (
 export const getEmployeesNumberOption = (
   options: DictionaryItem[] | null,
   count?: number,
-): { key: string; text?: string } | null => {
+): Nullable<Option> => {
   if (!count) {
     return null;
   }
@@ -91,10 +93,7 @@ export const getEmployeesNumberOption = (
   return option;
 };
 
-export const getOrganizationKind = (
-  options: DictionaryItem[],
-  okopf: number,
-): { key: string; text: string } | null => {
+export const getOrganizationKind = (options: DictionaryItem[], okopf: number): Nullable<Option> => {
   const getOptionByKey = getOptionOp(options);
 
   if ([40001, 40002, 71610].includes(okopf)) {
@@ -108,7 +107,7 @@ export const getOrganizationType = (
   options: DictionaryItem[],
   okopf: number,
   inn: string,
-): { key: string; text: string } | null => {
+): Nullable<Option> => {
   const getOptionByKey = getOptionOp(options);
 
   if (inn === '7725114488') {
@@ -128,5 +127,5 @@ export const getOrganizationType = (
 
 const getOptionOp = (options: DictionaryItem[]) => (key: string) =>
   options
-    .map((_) => ({ key: _.key as string, text: _.value as string }))
+    .map((_): Option => ({ key: _.key as string, text: _.value as string }))
     .find((_) => _.key === key) ?? null;

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

@@ -6,11 +6,11 @@ import { type ButtonVersion } from '../../model/ButtonVersion';
 import { type ComponentType } from '../../model/ComponentType';
 import { type ColorPalette } from '../../model/ContentPageBase';
 import { type DisabledProps } from '../../model/DisabledProps';
+import { type OnClickPreventableProps } from '../../model/OnClickProps';
 import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { noop } from '../../utils/noop';
 import { style } from '../../utils/style';
 import { type ARIAProps } from '../ARIAProps';
-import { type PreventableEvent } from '../PreventableEvent';
 
 export const themeStyle: Record<ButtonVersion, string> = {
   primary: style(
@@ -34,7 +34,11 @@ const embeddedStyle = style(
 
 const disabledStyle = style('bg-main-gray text-main-disabled cursor-not-allowed');
 
-export interface ButtonProps extends DisabledProps, ARIAProps, ComponentType {
+export interface ButtonProps
+  extends DisabledProps,
+    ARIAProps,
+    ComponentType,
+    OnClickPreventableProps {
   type?: 'button' | 'submit' | 'reset';
   version?: ButtonVersion;
   shape?: 'default' | 'round' | 'square';
@@ -43,7 +47,6 @@ export interface ButtonProps extends DisabledProps, ARIAProps, ComponentType {
   ariaLabel?: string;
   data?: AspectsDef[];
   dataTheme?: ColorPalette;
-  onClick?: (ev: PreventableEvent) => void;
   wcmsIgnore?: boolean;
 }
 

package/mobile/src/ui-kit/DialogManager/Dialog.tsx

@@ -1,14 +1,13 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type ComponentType } from '../../model/ComponentType';
+import { type OnClickPreventableProps } from '../../model/OnClickProps';
 import type { OnCloseProps } from '../../model/OnCloseProps';
 import { type VNode } from '../../model/VNode';
 import { style } from '../../utils/style';
-import { type PreventableEvent } from '../PreventableEvent';
 import { CloseButton } from './CloseButton';
 
-export interface DialogProps extends ComponentType, OnCloseProps {
+export interface DialogProps extends ComponentType, OnCloseProps, OnClickPreventableProps {
   head?: VNode;
-  onClick?: (e: PreventableEvent) => void;
 }
 
 export const Dialog = JSX<DialogProps>(({ className, head, children, onClose, onClick }) => (

package/mobile/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type ComponentType } from '../../model/ComponentType';
-import { type OnClickProps } from '../../model/onClick';
+import { type OnClickProps } from '../../model/OnClickProps';
 import { DefaultFoldButton } from '../Foldable/DefaultFoldButton';
 import { type TariffsTableInnerContent } from './InnerTableProps';
 

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

@@ -3,10 +3,10 @@ import { useLink } from '../../hooks/useLink';
 import { type ComponentType } from '../../model/ComponentType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
 import { type LinkProps as BaseLinkProps } from '../../model/LinkProps';
+import { type OnClickPreventableProps } from '../../model/OnClickProps';
 import { getAspectsAttributes } from '../../utils/dataAttributes';
 import { style } from '../../utils/style';
 import { themeStyle as buttonThemeStyle } from '../Button/Button';
-import { type PreventableEvent } from '../PreventableEvent';
 
 const themeStyle: Record<LinkButtonVersion, string> = {
   primary: buttonThemeStyle.primary,
@@ -19,12 +19,11 @@ const themeStyle: Record<LinkButtonVersion, string> = {
   '': '',
 };
 
-export interface LinkProps extends BaseLinkProps, ComponentType {
+export interface LinkProps extends BaseLinkProps, ComponentType, OnClickPreventableProps {
   version?: LinkButtonVersion;
   aboveText?: string;
   rel?: string;
   ariaLabel?: string;
-  onClick?: (ev?: PreventableEvent) => void;
 }
 
 export const Link = JSX<LinkProps>((props) => {

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

@@ -6,7 +6,7 @@ import { toLocalNumberFormat } from '../../utils/toLocalNumberFormat';
 import { Input } from '../Input/Input';
 import { type InputProps } from '../Input/InputProps';
 
-export interface NumberInputProps extends InputProps<string> {
+export interface NumberInputProps extends InputProps {
   min?: number;
   max?: number;
   defaultValue?: string;

package/mobile/src/ui-kit/Radio/RadioProps.ts

@@ -1,8 +1,8 @@
 import { type ComponentType } from '../../model/ComponentType';
 import { type ControlProps } from '../../model/ControlProps';
+import { type TextProps } from '../../model/HeadlineType';
 
-export interface RadioProps extends ComponentType, ControlProps<string> {
+export interface RadioProps extends TextProps, ComponentType, ControlProps<string> {
   name: string;
-  text?: string;
   checked: boolean;
 }

package/mobile/src/ui-kit/TimerCircle/useCountDownTimer.ts

@@ -29,10 +29,8 @@ export function useCountDownTimer({ seconds, period = 1000, onTick, onEnd }: Cou
 
   const { start } = useInterval(handleTick, period);
 
-  const restart = useCallback((_: number) => {
+  return useCallback((_: number) => {
     counter.current = _;
     start();
   }, []);
-
-  return restart;
 }

package/package.json

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

package/src/UniBlock/UniBlock.tsx

@@ -18,7 +18,7 @@ export interface UniBlockMeta<Props extends UniBlockProps = UniBlockProps> {
 }
 
 export type UniBlockComponent<Props extends UniBlockProps = UniBlockProps> = UniBlockMeta<Props> &
-  UNIComponent<Props, any, VNode | VNode[]>;
+  UNIComponent<Props, VNode | VNode[]>;
 
 export function UniBlock<Props extends UniBlockProps = UniBlockProps>(
   InputComponent: UniBlockComponent<Props>,

package/src/api/LeadServiceAPI.ts

@@ -61,9 +61,7 @@ export function LeadServiceAPI() {
         return null;
       }
 
-      const data = await response.json();
-
-      return data;
+      return await response.json();
     } catch (e) {
       return null;
     }

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -12,7 +12,7 @@ export interface UserData {
 export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
 
-  const saveUserData = useCallback(
+  return useCallback(
     ({ participantId, taskId, profileId, programId: programNumber, formData }: UserData) => {
       leadFormStore.participantId = participantId;
       leadFormStore.taskId = taskId;
@@ -22,6 +22,4 @@ export const useSaveUserData = () => {
     },
     [],
   );
-
-  return saveUserData;
 };

package/src/components/ApplicationLeadForm/useSendLeadFormAspects.tsx

@@ -8,7 +8,7 @@ import { type PreventableEventWithTarget } from '../../ui-kit/PreventableEvent';
 export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
   const aspects = useAspects();
 
-  const sendAspects = useCallback(
+  return useCallback(
     (ProfileId: number, TaskId: number) => {
       const snowplowParams = JSON.stringify({
         ProfileId,
@@ -23,6 +23,4 @@ export const useSendLeadFormAspects = ({ data }: AspectsProps) => {
     },
     [data],
   );
-
-  return sendAspects;
 };

package/src/components/CalculatorCredit/CalculatorCredit.tsx

@@ -63,11 +63,11 @@ export const CalculatorCredit = UniBlock<CalculatorDepositProps>(
     const defaultParamsCals = getDefaultParamsMin(calcSource?.rateRows);
     const handleChange = useCallback(
       (params: CreditCalculatorUserInputParams) => {
-        const calcParams = getCreditCalculatorParams(params, calcSource, paramsViewSettings);
+        const _calcParams = getCreditCalculatorParams(params, calcSource, paramsViewSettings);
 
         onChange?.({
           ...params,
-          monthlyPayment: calcParams.monthlyPayment,
+          monthlyPayment: _calcParams.monthlyPayment,
           rate: defaultParamsCals?.rate ?? 0,
         });
       },

package/src/components/CreditCardForm/CreditCardForm.fixture.mobile.tsx

@@ -8,7 +8,7 @@ import { CreditCardForm } from './CreditCardForm';
 
 export default {
   default: JSX(() => {
-    useAsyncEffect(async () => await mockLocalStorage(), []);
+    useAsyncEffect(async () => mockLocalStorage(), []);
 
     return (
       <div>

package/src/components/CreditCardForm/CreditCardForm.fixture.tsx

@@ -8,7 +8,7 @@ import { CreditCardForm } from './CreditCardForm';
 
 export default {
   default: JSX(() => {
-    useAsyncEffect(async () => await mockLocalStorage(), []);
+    useAsyncEffect(async () => mockLocalStorage(), []);
 
     return (
       <div>

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

@@ -8,7 +8,7 @@ import { CreditForm } from './CreditForm';
 
 export default {
   default: JSX(() => {
-    useAsyncEffect(async () => await mockLocalStorage(), []);
+    useAsyncEffect(async () => mockLocalStorage(), []);
 
     return (
       <div>

package/src/components/CreditForm/CreditForm.fixture.tsx

@@ -8,7 +8,7 @@ import { CreditForm } from './CreditForm';
 
 export default {
   default: JSX(() => {
-    useAsyncEffect(async () => await mockLocalStorage(), []);
+    useAsyncEffect(async () => mockLocalStorage(), []);
 
     return (
       <div>

package/src/components/Footer/HorizontalNavigationLink.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import { type LinkProps } from '../../model/LinkProps';
+import { type OnClickProps } from '../../model/OnClickProps';
 import { style } from '../../utils/style';
 
-interface HorizontalNavigationLinkProps extends LinkProps {
+interface HorizontalNavigationLinkProps extends LinkProps, OnClickProps {
   className: string;
   index: number;
-  onClick: () => void;
 }
 
 export const HorizontalNavigationLink = JSX<Partial<HorizontalNavigationLinkProps>>(

package/src/components/Footer/TextInformationLink.tsx

@@ -1,12 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import { type LinkProps } from '../../model/LinkProps';
+import { type OnClickProps } from '../../model/OnClickProps';
 import { style } from '../../utils/style';
 
-interface TextInformationLinkProps extends LinkProps {
+interface TextInformationLinkProps extends LinkProps, OnClickProps {
   className: string;
   index: number;
-  onClick: () => void;
 }
 
 export const TextInformationLink = JSX<Partial<TextInformationLinkProps>>(

package/src/components/OfficesAtmsMap/OfficesAtmsMapContent.ts

@@ -1,3 +1,4 @@
+import { type TextProps } from '../../model/HeadlineType';
 import { type Picture } from '../../model/Picture';
 import { type RichTextProps } from '../../ui-kit/RichText/RichTextProps';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
@@ -5,9 +6,7 @@ import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 /**
  * @title Пункт
  */
-export type ItemList = {
-  /** @title Название */
-  text?: string;
+export type ItemList = TextProps & {
   image?: Picture;
 };
 

package/src/components/OfficesAtmsMap/getScheduleDescription.tsx

@@ -38,7 +38,7 @@ export const getDateDescription = (workScheduleWeek: WorkScheduleWeek[]) => {
     .map((_) => _.short?.toLowerCase())
     .join(', ');
 
-  const rows = [
+  return [
     buildScheduleText({
       workTime: workingWeekday?.workTime,
       lunchHour: workingWeekday?.lunchHour,
@@ -49,6 +49,4 @@ export const getDateDescription = (workScheduleWeek: WorkScheduleWeek[]) => {
       true,
     ),
   ].filter(Boolean);
-
-  return rows;
 };

package/src/components/StickyBottomMenu/BurgerMenuDialog.tsx

@@ -41,7 +41,7 @@ export const BurgerMenuDialog = JSX<BurgerMenuDialogProps>(
     }, [location]);
 
     useEffect(() => {
-      const onMessage = (e: MessageEvent<any>) => {
+      const onMessage = (e: MessageEvent) => {
         if (e.data.type === 'location') {
           locationDialog.open({});
         }

package/src/components/StickyBottomMenu/StickyBottomMenuDialog.tsx

@@ -1,14 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type ComponentType } from '../../model/ComponentType';
+import { type OnClickPreventableProps } from '../../model/OnClickProps';
 import type { OnCloseProps } from '../../model/OnCloseProps';
 import { type VNode } from '../../model/VNode';
 import { CloseButton } from '../../ui-kit/DialogManager/CloseButton';
-import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { style } from '../../utils/style';
 
-export interface StickyBottomMenuDialogProps extends ComponentType, OnCloseProps {
+export interface StickyBottomMenuDialogProps
+  extends ComponentType,
+    OnCloseProps,
+    OnClickPreventableProps {
   head?: VNode;
-  onClick?: (e: PreventableEvent) => void;
 }
 
 export const StickyBottomMenuDialog = JSX<StickyBottomMenuDialogProps>(

package/src/components/StickyBottomMenu/StickyBottomMenuItem.tsx

@@ -1,13 +1,12 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type StickyMenuItem } from '../../data/StickyMobileData';
+import { type OnClickPreventableProps } from '../../model/OnClickProps';
 import { Icon } from '../../ui-kit/Icon/Icon';
-import { type PreventableEvent } from '../../ui-kit/PreventableEvent';
 import { style } from '../../utils/style';
 
-interface StickyBottomMenuItemProps {
+interface StickyBottomMenuItemProps extends OnClickPreventableProps {
   isActive?: boolean;
   item?: StickyMenuItem;
-  onClick?: (e: PreventableEvent) => void;
 }
 
 export const StickyBottomMenuItem = JSX<StickyBottomMenuItemProps>(

package/src/hooks/useForm/useForm.ts

@@ -51,7 +51,7 @@ export function useForm<FormState extends Record<string, any>>(
       const fieldErrors: ValidationInfo = isDirty && fieldValidator ? fieldValidator(value) : [];
 
       return {
-        value: format ? (format(value) as any) : value,
+        value: format ? (format(value) as FormState[any]) : value,
         isDirty,
         errors: fieldValidator && fieldErrors, // TODO Костыль
         error: fieldErrors[0],

package/src/hooks/useJSONRef/fetchRefs.ts

@@ -14,12 +14,11 @@ export const fetchRefs = async (refs: string[]): Promise<Record<string, JSONNode
       await Promise.allSettled(
         unique(refs)
           .filter(($ref) => !EXCLUSIONS.some((_) => $ref.startsWith(_)))
-          .map(
-            async ($ref): Promise<RefEntry> => [
-              $ref,
-              (refsCache[$ref] ||= await fetchJSONUnsafe($ref)),
-            ],
-          ),
+          .map(async ($ref): Promise<RefEntry> => {
+            refsCache[$ref] ||= await fetchJSONUnsafe($ref);
+
+            return [$ref, refsCache[$ref]];
+          }),
       )
     )
       .filter((res): res is PromiseFulfilledResult<RefEntry> => res.status === 'fulfilled')

package/src/model/OnClickProps.ts

@@ -1,3 +1,9 @@
+import type { PreventableEvent } from '../ui-kit/PreventableEvent';
+
 export interface OnClickProps {
   onClick?: () => void;
 }
+
+export interface OnClickPreventableProps {
+  onClick?: (ev: PreventableEvent) => void;
+}

package/src/retail/api/createCaptcha.ts

@@ -2,5 +2,5 @@ import { doRequest } from './doRequest';
 
 export const createCaptcha = (phoneNumber: string) =>
   doRequest(`/sms/createCaptcha?phoneNumber=${encodeURIComponent(phoneNumber)}`, 'GET').then(
-    async (res) => (res ? await res.blob() : new Blob()),
+    async (res) => (res ? res.blob() : new Blob()),
   );

package/src/retail/api/dadataHints/dadataHints.ts

@@ -31,7 +31,7 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
   const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
   const combinedQuery = `${queryPrefixValue}${query}`;
 
-  const result = globalThis
+  return globalThis
     ?.fetch?.(`/api/v1/suggestions/${url}`, {
       method: 'POST',
       mode: 'cors',
@@ -46,6 +46,4 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
     })
     .then((response) => response.json())
     .then(responseHandler);
-
-  return result;
 };

package/src/retail/api/feedbackById.ts

@@ -6,5 +6,5 @@ export const feedbackById = async (id: number, convertToPng = false) => {
     'GET',
   );
 
-  return response ? await response.blob() : new Blob();
+  return response ? response.blob() : new Blob();
 };

package/src/retail/api/updateRefreshToken.ts

@@ -33,7 +33,7 @@ export const updateRefreshToken = () => {
       access_token: accessToken,
     });
 
-    if (res?.status == 401) {
+    if (Number(res?.status) === 401) {
       navigator.assign(PORTAL_NATURAL_URL);
     }
 

package/src/retail/api/updateUserTask.ts

@@ -24,17 +24,19 @@ type ParticipantAddress = {
   street: string;
 };
 
+type IncomeTypeCdType =
+  | 'INCOME_AVERAGE'
+  | 'ADDITIONAL_INCOME'
+  | 'MANDATORY_PAYMENTS'
+  | 'OTHER_INCOME'
+  | 'OTHER_PAYMENTS'
+  | 'RENTAL_INCOME'
+  | 'WAGES'
+  | 'RETIREMENT_INCOME';
+
 type ParticipantIncome = {
   incomeTypeCd: {
-    key:
-      | 'INCOME_AVERAGE'
-      | 'ADDITIONAL_INCOME'
-      | 'MANDATORY_PAYMENTS'
-      | 'OTHER_INCOME'
-      | 'OTHER_PAYMENTS'
-      | 'RENTAL_INCOME'
-      | 'WAGES'
-      | 'RETIREMENT_INCOME';
+    key: IncomeTypeCdType;
   };
   value: string;
 };

package/src/retail/api/uploadFile.ts

@@ -12,7 +12,7 @@ export const uploadFile = async (
   fd.append('documentCategory', documentCategory);
   fd.append('file', file, `file.${isPDF ? 'pdf' : 'xml'}`);
 
-  const res = await globalThis
+  return await globalThis
     ?.fetch?.(`/light-api-cash/v1/file`, {
       method: 'POST',
       headers: {
@@ -22,6 +22,4 @@ export const uploadFile = async (
       body: fd,
     })
     .then((response) => response.json());
-
-  return res;
 };

package/src/retail/components/VerifyPhoneDialog/SubmitButton.tsx

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type DisabledProps } from '../../../model/DisabledProps';
+import { type TextProps } from '../../../model/HeadlineType';
+import { type OnClickProps } from '../../../model/OnClickProps';
 import { Button } from '../../../ui-kit/Button/Button';
 import { Text } from '../../../ui-kit/Text/Text';
 
-interface SubmitButtonProps extends DisabledProps {
-  onClick: () => void;
-  text?: string;
-}
+interface SubmitButtonProps extends DisabledProps, TextProps, OnClickProps {}
 
 export const SubmitButton = JSX<SubmitButtonProps>(({ disabled = false, onClick, text }) => (
   <Button type="button" onClick={onClick} disabled={disabled}>

package/src/retail/utils/getOrganizationParams.ts

@@ -1,11 +1,13 @@
 /* eslint-disable complexity */
+import { type Option } from '../../ui-kit/Select/Option';
+import { type Nullable } from '../../utils/Nullable';
 import { EOrganizationActivityTypes } from '../model/EOrganizationActivityTypes';
 import { type DictionaryItem } from '../model/LeadFormData';
 
 export const getOrganizationActivityType = (
   options: DictionaryItem[],
   okved: string,
-): { key: string; text: string } | null => {
+): Nullable<Option> => {
   if (!okved) {
     return null;
   }
@@ -78,7 +80,7 @@ export const getOrganizationActivityType = (
 export const getEmployeesNumberOption = (
   options: DictionaryItem[] | null,
   count?: number,
-): { key: string; text?: string } | null => {
+): Nullable<Option> => {
   if (!count) {
     return null;
   }
@@ -91,10 +93,7 @@ export const getEmployeesNumberOption = (
   return option;
 };
 
-export const getOrganizationKind = (
-  options: DictionaryItem[],
-  okopf: number,
-): { key: string; text: string } | null => {
+export const getOrganizationKind = (options: DictionaryItem[], okopf: number): Nullable<Option> => {
   const getOptionByKey = getOptionOp(options);
 
   if ([40001, 40002, 71610].includes(okopf)) {
@@ -108,7 +107,7 @@ export const getOrganizationType = (
   options: DictionaryItem[],
   okopf: number,
   inn: string,
-): { key: string; text: string } | null => {
+): Nullable<Option> => {
   const getOptionByKey = getOptionOp(options);
 
   if (inn === '7725114488') {
@@ -128,5 +127,5 @@ export const getOrganizationType = (
 
 const getOptionOp = (options: DictionaryItem[]) => (key: string) =>
   options
-    .map((_) => ({ key: _.key as string, text: _.value as string }))
+    .map((_): Option => ({ key: _.key as string, text: _.value as string }))
     .find((_) => _.key === key) ?? null;