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

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

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' }),
 });