@redneckz/wildless-cms-uni-blocks 0.14.680 → 0.14.682

package/mobile/src/hooks/useLink.ts

@@ -1,4 +1,6 @@
 import { env } from '../Env';
+import { handlerDecorator } from '../external/handlerDecorator';
+import { useRouter } from '../external/useRouter';
 import { type LinkProps, type Target } from '../model/LinkProps';
 import { useDialogManager } from '../ui-kit/DialogManager/useDialogManager';
 import { type PreventableEvent } from '../ui-kit/PreventableEvent';
@@ -6,8 +8,6 @@ import { adjustBase } from '../utils/adjustBase';
 import { adjustHref } from '../utils/adjustHref';
 import { getBasePath } from '../utils/getBasePath';
 import { hasPrefix, isLocalURL } from '../utils/url';
-import { handlerDecorator } from './handlerDecorator';
-import { useRouter } from './useRouter';
 
 interface Clickable {
   onClick(ev?: PreventableEvent): void;

package/mobile/src/index.ts

@@ -2,9 +2,9 @@ export { setupHooks } from '@redneckz/uni-jsx/lib/hooks';
 export { setup } from '@redneckz/uni-jsx/lib/setup';
 export { Blocks } from './components/Blocks';
 export { ContentPage } from './components/ContentPage/ContentPage';
-export { handlerDecorator } from './hooks/handlerDecorator';
-export { useNavigator } from './hooks/useNavigator';
-export { useRouter } from './hooks/useRouter';
+export { handlerDecorator } from './external/handlerDecorator';
+export { locationNavigator } from './external/locationNavigator';
+export { useRouter } from './external/useRouter';
 export { projectSettings } from './ProjectSettings';
 export { joinList } from './utils/joinList';
 export * as url from './utils/url';

package/mobile/src/setup-fixture.ts

@@ -1,7 +1,7 @@
 import '@redneckz/uni-jsx/lib/setup.react';
 import { useEffect, useState } from 'react';
-import { handlerDecorator } from './hooks/handlerDecorator';
-import { useRouter } from './hooks/useRouter';
+import { handlerDecorator } from './external/handlerDecorator';
+import { useRouter } from './external/useRouter';
 import { projectSettings } from './ProjectSettings';
 import { joinPath } from './utils/url';
 import wlc from './wlc.json';

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

@@ -2,8 +2,8 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { renderBackwardButton } from '../../components/ProductBlock/renderBackwardButton';
+import { useRouter } from '../../external/useRouter';
 import { useMobileMode } from '../../hooks/useMobileMode';
-import { useRouter } from '../../hooks/useRouter';
 import { type Align } from '../../model/Align';
 import { type VNode } from '../../model/VNode';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';

package/mobile/src/ui-kit/Button/useButton.ts

@@ -1,4 +1,4 @@
-import { handlerDecorator } from '../../hooks/handlerDecorator';
+import { handlerDecorator } from '../../external/handlerDecorator';
 import { type PreventableEvent } from '../PreventableEvent';
 import { type ButtonProps } from './Button';
 

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { getLink } from '../../api/RetailAPI/getLink';
+import { locationNavigator } from '../../external/locationNavigator';
 import { Button } from '../Button/Button';
 import { Dialog } from '../DialogManager/Dialog';
 import { Img } from '../Img/Img';
@@ -10,13 +11,15 @@ export interface EsiaLoginDialogProps {
 }
 
 export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(function ({ handleClose }) {
+  const navigator = locationNavigator();
+
   const handleAuth = useCallback(async () => {
     const resp = await getLink({
-      redirectUri: globalThis.location.href,
+      redirectUri: navigator.href,
     });
 
     if (resp) {
-      globalThis.location.href = resp.link;
+      navigator.assign(resp.link);
     }
   }, []);
 

package/mobile/src/ui-kit/EsiaLoginDialog/useEsiaLoginDialog.tsx

@@ -1,4 +1,5 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { locationNavigator } from '../../external/locationNavigator';
 import { useDialogManager, type DialogOptions } from '../DialogManager/useDialogManager';
 import { EsiaLoginDialog } from './EsiaLoginDialog';
 
@@ -9,10 +10,11 @@ export interface EsiaLoginDialogProps {
 
 export const useEsiaLoginDialog = (nextStepLink: string) => {
   const { open, close } = useDialogManager();
+  const navigator = locationNavigator();
 
   const handleClose = useCallback(() => {
     close();
-    globalThis.location.href = nextStepLink;
+    navigator.assign(nextStepLink);
   }, []);
 
   return {

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

@@ -1,5 +1,5 @@
+import { JSX } from '@redneckz/uni-jsx';
 import { type JSONRefObject } from '../../../data/JSONRefObject';
-import { UniBlock } from '../../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
 import { withValidator } from '../../../validation/withValidator';
 import { SelectControl } from '../../Select/SelectControl';
@@ -12,7 +12,7 @@ export interface ProductFieldProps extends CustomFieldProps, UniBlockProps {
   };
 }
 
-export const ProductField = UniBlock<ProductFieldProps>(({ field, source }) => (
+export const ProductField = JSX<ProductFieldProps>(({ field, source }) => (
   <SelectControl
     placeholder="Выберите продукт"
     label="Продукт"

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

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { type IconVersion } from '../../model/IconVersion';
 import { projectSettings } from '../../ProjectSettings';
 import { adjustHref } from '../../utils/adjustHref';

package/mobile/src/ui-kit/Img/ImgAsPicture.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { type ImgSource, type Picture } from '../../model/Picture';
 import { adjustSrc } from '../../utils/adjustSrc';
 import { style } from '../../utils/style';

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

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type LinkDoc } from '../../components/LinkDocs/LinkDocsContent';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { type Picture } from '../../model/Picture';
 import { adjustHref } from '../../utils/adjustHref';
 import { Button } from '../Button/Button';

package/mobile/src/utils/adjustSrc.ts

@@ -1,5 +1,5 @@
 import { env } from '../Env';
-import { type Router } from '../hooks/useRouter';
+import { type Router } from '../external/useRouter';
 import { adjustHref } from './adjustHref';
 import { getBasePath } from './getBasePath';
 import { isURL } from './url';

package/package.json

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

package/src/api/RetailAPI/getPaymentSystems.ts

@@ -14,8 +14,10 @@ export const getPaymentSystems = async () => {
 
   const data: PaymentSystemResponse = await response?.json();
 
-  return data?.paymentSystems?.map((paymentSystem) => ({
-    id: paymentSystem.type,
-    text: paymentSystem.name,
-  }));
+  return (
+    data?.paymentSystems?.map((paymentSystem) => ({
+      id: paymentSystem.type,
+      text: paymentSystem.name,
+    })) ?? []
+  );
 };

package/src/api/RetailAPI/updateRefreshToken.ts

@@ -1,3 +1,4 @@
+import { locationNavigator } from '../../external/locationNavigator';
 import { doRequest } from './doRequest';
 
 interface UpdateRefreshTokenBody {
@@ -5,17 +6,23 @@ interface UpdateRefreshTokenBody {
   access_token: string;
 }
 
+const PORTAL_NATURAL_URL = '/';
+
 const UPDATING_INTERVAL = 60000 * 4;
 
-export const updateRefreshToken = (failCallback: () => void) => {
+export const updateRefreshToken = () => {
   const refreshToken = globalThis.sessionStorage?.getItem('refreshToken');
   const accessToken = globalThis.sessionStorage?.getItem('accessToken');
   const taskId = globalThis.localStorage.getItem('taskId');
 
+  const navigator = locationNavigator();
+
   if (!accessToken || !refreshToken || !taskId) {
-    failCallback();
+    navigator.assign(PORTAL_NATURAL_URL);
 
-    return () => null;
+    return () => {
+      // do nothing
+    };
   }
 
   const updateTokenRequest = async () => {
@@ -27,7 +34,7 @@ export const updateRefreshToken = (failCallback: () => void) => {
     });
 
     if (res?.status == 401) {
-      failCallback();
+      navigator.assign(PORTAL_NATURAL_URL);
     }
 
     if (res?.ok) {

package/src/api/RetailAPI/updateUserTask.ts

@@ -52,6 +52,7 @@ export type Participant = {
   };
   armyIdFlg?: boolean;
   birthPlace?: string;
+  childrenDependents?: number;
   genderCd?: Option;
   dulIssueDate?: string;
   dulIssuedBy?: string;

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -118,7 +118,7 @@ export interface FormState extends FormConsents, FormStateDeliveryType {
   totalIncome?: number;
   expenses?: number;
   snils?: string;
-  conscription?: string;
+  conscription?: Option;
   armyIdFlg?: boolean;
   addressRegistration?: Address;
   participantDateRegistration?: Date | string;

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -1,5 +1,6 @@
 import { type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
 import { type FormState } from '../../components/ApplicationLeadForm/getInitialFormState';
+import { locationNavigator } from '../../external/locationNavigator';
 import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { getParticipantContacts } from '../CreditForm/utils';
@@ -18,12 +19,13 @@ export const getLeadFormTaskData = ({
   formData,
 }: getLeadFormTaskDataProps): UpdateUserTaskBody => {
   const { name, surname, middleName, limitedBirthday, phone, email } = formData;
+  const navigator = locationNavigator();
 
   return {
     sendToBank: true,
     taskKind: 'SHORT',
     task: {
-      taskSource: globalThis.location.origin,
+      taskSource: navigator.origin,
       id: taskId,
       participants: [
         {

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -1,11 +1,13 @@
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
+import { locationNavigator } from '../../external/locationNavigator';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { type FormState } from './getInitialFormState';
 import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
+  const navigator = locationNavigator();
   const [isLoading, setIsLoading] = useState(false);
   const [profileId] = useLocalStorage<string>('profileId');
   const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
@@ -19,7 +21,7 @@ export const useInitApplicationLead = (nextStepLink: string) => {
         profileId: profileId,
         code,
         state,
-        redirectUri: globalThis.location?.href,
+        redirectUri: navigator.href,
       });
 
       data &&
@@ -28,7 +30,7 @@ export const useInitApplicationLead = (nextStepLink: string) => {
           ...parseEsiaProfile(data),
         });
 
-      globalThis.location.href = nextStepLink;
+      navigator.assign(nextStepLink);
     }
   }, []);
 

package/src/components/Blocks.ts

@@ -3,7 +3,6 @@ import { type BlocksRegistry } from '../model/BlocksRegistry';
 import { AdTile } from './AdTile/AdTile';
 import { ApplicationForm } from './ApplicationForm/ApplicationForm';
 import { ApplicationLeadForm } from './ApplicationLeadForm/ApplicationLeadForm';
-import { ApplicationStatus } from './ApplicationStatus/ApplicationStatus';
 import { BankAccountFiltration } from './BankAccountFiltration/BankAccountFiltration';
 import { BenefitsBlock } from './BenefitsBlock/BenefitsBlock';
 import { BonusBenefitsBlock } from './BonusBenefitsBlock/BonusBenefitsBlock';
@@ -60,7 +59,6 @@ export const Blocks: BlocksRegistry = {
   AdTile,
   ApplicationForm,
   ApplicationLeadForm,
-  ApplicationStatus,
   BankAccountFiltration,
   BenefitsBlock,
   BonusBenefitsBlock,

package/src/components/CreditCardForm/CreditCardForm.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
-import { useNavigator } from '../../hooks/useNavigator';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
@@ -12,8 +11,6 @@ import { stepsSectionsMap } from './creditCardFormStepsData';
 
 interface CreditCardFormWizardProps extends CreditCardFormContent, UniBlockProps {}
 
-const PORTAL_NATURAL_URL = '/';
-
 const WIZARD_STEPS = 6;
 
 const WIZARD_TITLES = [
@@ -34,9 +31,7 @@ export const CreditCardForm = JSX<CreditCardFormWizardProps>(({ className, ...re
     [formContainerRef],
   );
 
-  const navigator = useNavigator();
-
-  useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL)), []);
+  useEffect(updateRefreshToken, []);
 
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));

package/src/components/CreditCardForm/getCreditCardFormTaskData.ts

@@ -1,10 +1,11 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { locationNavigator } from '../../external/locationNavigator';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
 import { getFourthStepData } from './getFourthStepData';
 import { getSecondStepData } from './getSecondStepData';
-import { getDeliveryData, getSixthStepData } from './getSixthStepData';
+import { getDeliveryData, getOfficeCode, getSixthStepData } from './getSixthStepData';
 import { getThirdStepData } from './getThirdStepData';
 
 type getCreditCardFormTaskDataProps = {
@@ -22,15 +23,15 @@ export const getCreditCardFormTaskData = ({
   formData,
   step = 0,
 }: getCreditCardFormTaskDataProps): UpdateUserTaskBody => {
+  const navigator = locationNavigator();
+
   return {
     sendToBank: true,
     taskKind: 'UNITED',
     task: {
-      taskSource: globalThis.location.origin,
+      taskSource: navigator.origin,
       id: taskId,
-      office: {
-        id: '650', // TODO: Remove hardcode
-      },
+      ...getOfficeCode(formData),
       authorizedAgentId: formData?.bankEmployeeCode,
       participants: [
         {

package/src/components/CreditCardForm/getFourthStepData.ts

@@ -7,6 +7,7 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     familyStatus,
     dependents,
     familyMembers,
+    children,
     wages,
     mandatoryPayments,
     incomeAverage,
@@ -17,12 +18,15 @@ export const getFourthStepData = (formData: FormState): Partial<Participant> =>
     retirementIncome,
     snils,
     armyIdFlg,
+    conscription,
   } = formData;
 
   return {
     maritalStatusCd: familyStatus,
+    childrenDependents: children,
     totalDependents: familyMembers,
     otherDependents: dependents,
+    militaryStatusCd: conscription,
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,

package/src/components/CreditCardForm/getSixthStepData.ts

@@ -12,6 +12,14 @@ export const getDeliveryData = (formData: FormState) => {
   };
 };
 
+export const getOfficeCode = (formData: FormState) => {
+  const { addressRetail } = formData;
+
+  return {
+    office: addressRetail?.key ? { id: addressRetail.key } : undefined,
+  };
+};
+
 export const getSixthStepData = (formData: FormState) => {
   const { addressCourier } = formData;
 

package/src/components/CreditCardForm/getThirdStepData.tsx

@@ -1,10 +1,12 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getParticipantAddresses, getParticipantContacts } from '../CreditForm/utils';
 
 export const getThirdStepData = (formData: FormState): Partial<Participant> => {
   const {
+    beginDate,
     employment,
     organizationName,
     inn,
@@ -23,6 +25,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
   } = formData;
 
   return {
+    employmentContractDate: formatDate(beginDate || '', true),
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,

package/src/components/CreditCardForm/useCreditCardFormAPI.tsx

@@ -32,7 +32,7 @@ export const useCreditCardFormAPI = ({
     const feedbackValidator = objectValidator(
       getObjectValidator(calculateInputs(getValue(formData))(inputs, step)),
     );
-    console.log(getObjectValidator(calculateInputs(getValue(formData))(inputs, step)));
+
     if (!isValidationSuccess(feedbackValidator(formData))) {
       return console.warn('validation fail');
     }

package/src/components/CreditForm/CreditForm.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateRefreshToken } from '../../api/RetailAPI/updateRefreshToken';
-import { useNavigator } from '../../hooks/useNavigator';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
@@ -13,8 +12,6 @@ import { stepsSectionsMap } from './creditFormStepsData';
 
 interface CreditFormWizardProps extends CreditFormContent, UniBlockProps {}
 
-const PORTAL_NATURAL_URL = '/';
-
 const WIZARD_STEPS = 5;
 
 const WIZARD_TITLES = [
@@ -35,9 +32,7 @@ export const CreditForm = JSX<CreditFormWizardProps>(({ className, ...rest }) =>
     [formContainerRef],
   );
 
-  const navigator = useNavigator();
-
-  useEffect(() => updateRefreshToken(() => navigator.assign(PORTAL_NATURAL_URL)), []);
+  useEffect(updateRefreshToken, []);
 
   const handleNextStep = useCallback(() => {
     setStep((_) => Math.min(_ + 1, WIZARD_STEPS));

package/src/components/CreditForm/getCreditFormTaskData.ts

@@ -1,4 +1,5 @@
 import { type Participant, type UpdateUserTaskBody } from '../../api/RetailAPI/updateUserTask';
+import { locationNavigator } from '../../external/locationNavigator';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getFifthStepData } from './getFifthStepData';
 import { getFirstStepData } from './getFirstStepData';
@@ -21,36 +22,37 @@ export const getCreditFormTaskData = ({
   profileId,
   formData,
   step = 0,
-}: getCreditFormTaskDataProps): UpdateUserTaskBody => ({
-  sendToBank: true,
-  taskKind: 'UNITED',
-  task: {
-    taskSource: globalThis.location.origin,
-    id: taskId,
-    office: {
-      id: '',
-    },
-    authorizedAgentId: formData?.bankEmployeeCode,
-    participants: [
-      {
-        id: participantId,
-        profile: {
-          id: profileId,
-        },
-        roleCd: {
-          key: 'BORROWER',
-          value: 'Заемщик',
+}: getCreditFormTaskDataProps): UpdateUserTaskBody => {
+  const navigator = locationNavigator();
+
+  return {
+    sendToBank: true,
+    taskKind: 'UNITED',
+    task: {
+      taskSource: navigator.origin,
+      id: taskId,
+      authorizedAgentId: formData?.bankEmployeeCode,
+      participants: [
+        {
+          id: participantId,
+          profile: {
+            id: profileId,
+          },
+          roleCd: {
+            key: 'BORROWER',
+            value: 'Заемщик',
+          },
+          ...getCurrentStepData(step, formData),
         },
-        ...getCurrentStepData(step, formData),
-      },
-    ],
-    ...getZeroStepData(formData), // moved from participants
-    ...getFifthStepData(formData),
-    esiaAccountTypeCd: {
-      key: formData?.esiaAccountTypeCd?.key,
-    } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
-  },
-});
+      ],
+      ...getZeroStepData(formData), // moved from participants
+      ...getFifthStepData(formData),
+      esiaAccountTypeCd: {
+        key: formData?.esiaAccountTypeCd?.key,
+      } as UpdateUserTaskBody['task']['esiaAccountTypeCd'],
+    },
+  };
+};
 
 const getCurrentStepData = (step: number, formData: FormState): Partial<Participant> => {
   switch (step) {

package/src/components/CreditForm/getSecondStepData.tsx

@@ -1,10 +1,12 @@
 import { type Participant } from '../../api/RetailAPI/updateUserTask';
+import { formatDate } from '../../utils/formatDate';
 import { formatPhone } from '../../utils/formatPhone';
 import { type FormState } from '../ApplicationLeadForm/getInitialFormState';
 import { getParticipantAddresses, getParticipantContacts } from './utils';
 
 export const getSecondStepData = (formData: FormState): Partial<Participant> => {
   const {
+    beginDate,
     employment,
     organizationName,
     inn,
@@ -23,6 +25,7 @@ export const getSecondStepData = (formData: FormState): Partial<Participant> =>
   } = formData;
 
   return {
+    employmentContractDate: formatDate(beginDate || '', true),
     employmentTypeCd: employment,
     organizationName,
     organizationInn: inn,

package/src/components/CreditForm/getThirdStepData.ts

@@ -7,6 +7,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     familyStatus,
     dependents,
     familyMembers,
+    children,
     confirmationIncome,
     wages,
     mandatoryPayments,
@@ -18,6 +19,7 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     retirementIncome,
     snils,
     armyIdFlg,
+    conscription,
   } = formData;
 
   return {
@@ -25,6 +27,8 @@ export const getThirdStepData = (formData: FormState): Partial<Participant> => {
     totalDependents: familyMembers,
     incomeCertificateCd: confirmationIncome,
     otherDependents: dependents,
+    childrenDependents: children,
+    militaryStatusCd: conscription,
     participantIncomes: getParticipantIncomes({
       wages,
       mandatoryPayments,

package/src/components/Header/HeaderTop.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { type BgColorVersion } from '../../model/BgColorVersion';
 import { type BlockVersion } from '../../model/BlockVersion';
 import { type LogoType } from '../../model/LogoType';

package/src/components/LinkDocs/LinkDocs.tsx

@@ -1,4 +1,4 @@
-import { useRouter, type Router } from '../../hooks/useRouter';
+import { useRouter, type Router } from '../../external/useRouter';
 import { type Picture } from '../../model/Picture';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { RichText } from '../../ui-kit/RichText/RichText';

package/src/components/LinkDocs/renderDefaultItem.tsx

@@ -1,4 +1,4 @@
-import { type Router } from '../../hooks/useRouter';
+import { type Router } from '../../external/useRouter';
 import { type Picture } from '../../model/Picture';
 import { Img } from '../../ui-kit/Img/Img';
 import { RichText } from '../../ui-kit/RichText/RichText';

package/src/components/TabsLayout/TabsLayout.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { type BlockDef } from '../../model/ContentPageDef';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { type TabItemBase } from '../../ui-kit/TabsControl/TabItem';

package/src/components/VerticalLayout/VerticalLayout.tsx

@@ -1,5 +1,5 @@
 import { renderChildren } from '../../BlockRenderer/renderChildren';
-import { useRouter } from '../../hooks/useRouter';
+import { useRouter } from '../../external/useRouter';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';