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

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

@@ -1,18 +1,20 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type BranchesHeader, type ForeignOfficeProps } from '../../data/HeaderData';
+import { useLink } from '../../hooks/useLink';
 import { useLocation } from '../../hooks/useLocation';
 import { useRegions, type Region } from '../../hooks/useRegions';
 import { groupBy } from '../../utils/groupBy';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance';
 import { Dialog } from '../DialogManager/Dialog';
 import { useDialogManager } from '../DialogManager/useDialogManager';
+import { LinkWrapper } from '../LinkWrapper/LinkWrapper';
+import { Paragraph } from '../Paragraph/Paragraph';
 import { Text } from '../Text/Text';
 import { renderForeignOffices } from './renderForeignOffices';
 import { renderRegion } from './renderRegion';
 import { renderRegionGroup } from './renderRegionGroup';
 import { SearchBar } from './SearchBar';
-import { SelectedLocation } from './SelectedLocation';
 
 const SEARCH_TERM_MIN_LENGTH = 3;
 
@@ -22,21 +24,22 @@ export interface LocationDialogProps {
 }
 
 export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branches }) => {
-  const selectLocation = useLocation(branches?.default);
+  const [currentLocation, selectCurrentLocation] = useLocation(branches?.default);
+
+  const link = useLink();
+  const { href } = link({ href: `/branches/${currentLocation.slug}` });
 
   const [query, setQuery] = useState('');
 
-  const rawRegions = useRegions();
-  const regions = useMemo(
-    () => cleanUpRegions(rawRegions).sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
-    [rawRegions],
+  const regions: Region[] = cleanUpRegions(useRegions()).sort((a, b) =>
+    a.name.localeCompare(b.name),
   );
-  const regionsGroupByLetter = useMemo(() => groupBy(regions, regionFirstLetter), [regions]);
+  const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
 
   const { close } = useDialogManager();
 
   const handleChangeLocation = useCallback((region: Region) => {
-    selectLocation(region);
+    selectCurrentLocation(region);
     close();
   }, []);
 
@@ -48,7 +51,16 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
           <Text size="text-h4" color="text-primary-text">
             Выберите филиал
           </Text>
-          <SelectedLocation defaultLocation={branches?.default} />
+          {currentLocation ? (
+            <div className="mb-s">
+              <Paragraph size="text-l" color="text-primary-text">
+                Сейчас выбран:
+                <LinkWrapper href={href} className="inline mx-2xs text-primary-main">
+                  {currentLocation.name}
+                </LinkWrapper>
+              </Paragraph>
+            </div>
+          ) : null}
           <SearchBar onSearch={setQuery} searchTerm={query} />
         </div>
       }
@@ -74,10 +86,10 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
   );
 });
 
-const regionFirstLetter = (region: Region) => region.name?.charAt(0) ?? '';
+const regionFirstLetter = (region: Region) => region.name?.charAt(0) || '';
 
-const cleanUpRegions = (regions: Region[]): Region[] =>
+const cleanUpRegions = (regions: Region[]) =>
   regions.map((region) => ({
     ...region,
-    name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
+    name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
   }));

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

@@ -15,7 +15,7 @@ export const PopupManager = JSX(() => {
 
   useEffect(
     () =>
-      defaultEventBus.observable.subscribe('popup', (action) => {
+      defaultEventBus.subscribe('popup', (action) => {
         switch (action.type) {
           case 'open':
           case 'update':

package/mobile/src/ui-kit/PopupManager/usePopupManager.tsx

@@ -4,8 +4,8 @@ import { type PopupOptions } from './PopupAction';
 
 export const usePopupManager = () => ({
   open: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.emitter.fire('popup', { type: 'open', popup, ...options }),
+    defaultEventBus.fire('popup', { type: 'open', popup, ...options }),
   update: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.emitter.fire('popup', { type: 'update', popup, ...options }),
-  close: () => defaultEventBus.emitter.fire('popup', { type: 'close' }),
+    defaultEventBus.fire('popup', { type: 'update', popup, ...options }),
+  close: () => defaultEventBus.fire('popup', { type: 'close' }),
 });

package/package.json

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

package/src/EventBus/EventBus.ts

@@ -1,72 +1,36 @@
-export type Subscriber<Event> = (ev: Event) => void;
-
-type Cleanup = () => void;
-
-export interface EventBusObservable<EM extends Record<string, any>> {
-  subscribe<K extends keyof EM>(type: K, listener: Subscriber<EM[K]>): Cleanup;
-}
-
-export interface EventBusEmitter<EM extends Record<string, any>> {
-  fire<K extends keyof EM>(type: K, event: EM[K]): void;
-  subject<K extends keyof EM>(type: K, event: EM[K]): Cleanup;
-}
-
-export class EventBus<EM extends Record<string, any>>
-  implements EventBusObservable<EM>, EventBusEmitter<EM>
-{
-  private subscribersMap: Partial<Record<keyof EM, Subscriber<EM[keyof EM]>[]>> = {};
+export class EventBus<EM extends Record<string, any>> {
+  private subscribers: Partial<Record<keyof EM, Array<(ev: EM[keyof EM]) => void>>> = {};
   private subjectsStateMap: Partial<EM> = {};
 
-  readonly emitter: EventBusEmitter<EM> = this;
-  readonly observable: EventBusObservable<EM> = this;
+  subscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
+    this.subscribers[type] = (this.subscribers[type] || []).concat(
+      listener as (ev: EM[keyof EM]) => void,
+    );
 
-  subscribe<K extends keyof EM>(type: K, listener: Subscriber<EM[K]>): Cleanup {
-    this.subscribersMap[type] ||= [];
-    this.subscribersMap[type]?.push(listener as Subscriber<EM[keyof EM]>);
-
-    this.fireSubscribers([listener], this.subjectsStateMap[type]);
+    const latestEvent = this.subjectsStateMap[type];
+    if (latestEvent) {
+      listener(latestEvent as EM[K]);
+    }
 
     return () => {
       this.unsubscribe(type, listener);
     };
   }
 
-  private unsubscribe<K extends keyof EM>(type: K, listener: Subscriber<EM[K]>) {
-    const index = this.subscribersMap[type]?.indexOf(listener as Subscriber<EM[keyof EM]>);
-    if (index && index !== -1) {
-      this.subscribersMap[type]?.splice(index, 1);
-    }
+  private unsubscribe<K extends keyof EM>(type: K, listener: (event: EM[K]) => void) {
+    this.subscribers[type] = this.subscribers[type]?.filter((s) => s !== listener);
   }
 
   fire<K extends keyof EM>(type: K, event: EM[K]) {
     const isSubjectDeclared = type in this.subjectsStateMap;
     if (isSubjectDeclared) {
-      this.subject(type, event);
-    } else {
-      this.fireSubscribers(this.subscribersMap[type], event);
-    }
-  }
-
-  subject<K extends keyof EM>(type: K, event: EM[K]): Cleanup {
-    if (this.subjectsStateMap[type] !== event) {
       this.subjectsStateMap[type] = event;
-      this.fireSubscribers(this.subscribersMap[type], event);
     }
 
-    return () => {
-      delete this.subjectsStateMap[type];
-    };
+    this.subscribers[type]?.forEach((s) => s(event));
   }
 
-  private fireSubscribers<K extends keyof EM>(
-    subscribers: Subscriber<EM[K]>[] | undefined,
-    event: EM[K] | undefined,
-  ) {
-    if (!subscribers || !event) {
-      return;
-    }
-    for (const _ of subscribers) {
-      _(event);
-    }
+  subject<K extends keyof EM>(type: K, event: EM[K]) {
+    this.subjectsStateMap[type] = event;
   }
 }

package/src/EventBus/defaultEventBus.ts

@@ -1,10 +1,22 @@
+import { type CarouselTariffsCardAction } from '../components/CarouselTariffsCard/CarouselTariffsCardAction';
+import { type Tab } from '../components/TabsLayout/TabsLayoutContent';
 import { type Region } from '../hooks/useRegions';
 import { type DialogAction } from '../ui-kit/DialogManager/DialogAction';
 import { type PopupAction } from '../ui-kit/PopupManager/PopupAction';
 import { EventBus } from './EventBus';
 
-export const defaultEventBus = new EventBus<{
+interface TabActivationEvent {
+  type?: Tab['type'];
+  groupName?: string;
+  label?: string;
+}
+
+interface GlobalEventMap {
   location: Region;
   dialog: DialogAction;
   popup: PopupAction;
-}>();
+  tab: TabActivationEvent;
+  fold: CarouselTariffsCardAction;
+}
+
+export const defaultEventBus = new EventBus<GlobalEventMap>();

package/src/EventBus/useLatestEvent.ts

@@ -0,0 +1,16 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type EventBus } from './EventBus';
+
+export const useLatestEvent = <EM extends Record<string, any>, K extends keyof EM>(
+  eventBus: EventBus<EM>,
+  type: K,
+  initialEvent?: EM[K],
+): [EM[K] | null, (_: EM[K]) => void] => {
+  const [latestEvent, setLatestEvent] = useState<EM[K] | null>(initialEvent || null);
+
+  useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
+
+  const fireEvent = useCallback((_: EM[K]) => eventBus.fire(type, _), [eventBus, type]);
+
+  return [latestEvent, fireEvent];
+};

package/src/api/RetailApi/RetailApi.ts

@@ -65,4 +65,5 @@ export const RETAIL_API = {
     await request<Response>(`/sms/createCaptcha?phoneNumber=${phoneNumber}`, 'GET'),
   CheckCaptcha: async (body: CapchaTextType) =>
     await request<Response>('/sms/checkCaptcha', 'POST', body),
+  GetFileByID: async (id: number) => await request<Response>(`/feedback/file?id=${id}`, 'GET'),
 };

package/src/components/ApplicationLeadForm/ApplicationLeadForm.fixture.tsx

@@ -34,12 +34,12 @@ export default {
           {
             inputs: [
               { fieldType: 'common', name: 'processPersonalDataLeadFlg', required: true },
+              { fieldType: 'common', name: 'consentInformFlg', required: true },
               { fieldType: 'common', name: 'consentProviderFlg', required: true },
               { fieldType: 'common', name: 'consentPfrFlg' },
               { fieldType: 'common', name: 'consentPhotoFlg', required: true },
               { fieldType: 'common', name: 'consentAssignmentClaimsFlg', required: true },
               { fieldType: 'common', name: 'consentCollectionFlg', required: true },
-              { fieldType: 'common', name: 'consentInformFlg', required: true },
             ],
           },
         ]}

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -87,6 +87,6 @@ const renderInputs = ({ field, typeForm = '', inputs }: GroupedConsentsProps) =>
 };
 
 const splitInputs = (inputs?: FieldDef[]) => ({
-  consentInputs: inputs?.filter((_) => CONSENTS.includes(_.name)) || [],
-  restInputs: inputs?.filter((_) => !CONSENTS.includes(_.name)) || [],
+  consentInputs: inputs?.filter((_) => Object.keys(CONSENTS).includes(_.name)) || [],
+  restInputs: inputs?.filter((_) => !Object.keys(CONSENTS).includes(_.name)) || [],
 });

package/src/components/ApplicationLeadForm/GroupedConsents.tsx

@@ -39,6 +39,7 @@ export const GroupedConsents = JSX<GroupedConsentsProps>(
       <div className="w-fit">
         <Foldable
           isFoldButtonOnTop
+          unfoldedByDefault
           renderFoldableSection={({ isUnfolded }) => (
             <FoldableSection isUnfolded={isUnfolded} className="flex flex-col pl-2xl">
               {inputs.map(getField(field, typeForm))}

package/src/components/ApplicationLeadForm/consents.ts

@@ -1,10 +1,40 @@
-export const CONSENTS = [
-  'processPersonalDataLeadFlg',
-  'consentProviderFlg',
-  'consentPfrFlg',
-  'consentPhotoFlg',
-  'consentAssignmentClaimsFlg',
-  'consentCollectionFlg',
-  'consentInformFlg',
-  'consentToReceiveMaterials',
-];
+import { type FormConsents } from './getInitialFormState';
+
+type ConsentData = {
+  text: string;
+  docId?: number;
+};
+
+export const CONSENTS: Record<keyof FormConsents, ConsentData> = {
+  processPersonalDataLeadFlg: {
+    text: 'Согласие на обработку персональных данных',
+    docId: 4,
+  },
+  consentProviderFlg: {
+    text: 'Согласие об использовании простой электронной подписи',
+    docId: 5,
+  },
+  consentPfrFlg: {
+    text: 'Согласие на запрос в ПФР',
+    docId: 3,
+  },
+  consentPhotoFlg: {
+    text: 'Прочие согласия (согласие на фотографирование)',
+    docId: 1,
+  },
+  consentAssignmentClaimsFlg: {
+    text: 'Прочие согласия (согласие на уступку прав требований)',
+    docId: 1,
+  },
+  consentCollectionFlg: {
+    text: 'Прочие согласия (согласие на взыскание по исполнительной надписи нотариуса)',
+    docId: 1,
+  },
+  consentInformFlg: {
+    text: 'Согласие на информирование о продуктах и услугах Банка',
+    docId: 14,
+  },
+  consentToReceiveMaterials: {
+    text: 'Согласен на получение информационных и аналитических материалов по электронной почте',
+  },
+};

package/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -8,7 +8,18 @@ import { VED_TYPES } from '../../ui-kit/FormField/Fields/VedField';
 import { type Option } from '../../ui-kit/Select/Option';
 import { type FieldDef } from './ApplicationLeadFormContent';
 
-export interface FormState {
+export interface FormConsents {
+  processPersonalDataLeadFlg?: boolean;
+  consentProviderFlg?: boolean;
+  consentPfrFlg?: boolean;
+  consentPhotoFlg?: boolean;
+  consentAssignmentClaimsFlg?: boolean;
+  consentCollectionFlg?: boolean;
+  consentInformFlg?: boolean;
+  consentToReceiveMaterials?: boolean;
+}
+
+export interface FormState extends FormConsents {
   typeForm?: Option | string;
   surname?: string;
   name?: string;
@@ -65,14 +76,6 @@ export interface FormState {
   localities?: string[];
   partnerComments?: string;
   consentDataProcessing?: boolean;
-  processPersonalDataLeadFlg?: boolean;
-  consentProviderFlg?: boolean;
-  consentPfrFlg?: boolean;
-  consentPhotoFlg?: boolean;
-  consentAssignmentClaimsFlg?: boolean;
-  consentCollectionFlg?: boolean;
-  consentInformFlg?: boolean;
-  consentToReceiveMaterials?: boolean;
   familyStatus?: string;
   children?: number;
   familyMembers?: number;

package/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/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/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/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/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/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/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/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);