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

package/mobile/bundle/bundle.umd.js

@@ -411,58 +411,39 @@
     ].join(' ');
 
     class EventBus {
-        subscribersMap = {};
+        subscribers = {};
         subjectsStateMap = {};
-        emitter = this;
-        observable = this;
         subscribe(type, listener) {
-            this.subscribersMap[type] ||= [];
-            this.subscribersMap[type]?.push(listener);
-            this.fireSubscribers([listener], this.subjectsStateMap[type]);
+            this.subscribers[type] = (this.subscribers[type] || []).concat(listener);
+            const latestEvent = this.subjectsStateMap[type];
+            if (latestEvent) {
+                listener(latestEvent);
+            }
             return () => {
                 this.unsubscribe(type, listener);
             };
         }
         unsubscribe(type, listener) {
-            const index = this.subscribersMap[type]?.indexOf(listener);
-            if (index && index !== -1) {
-                this.subscribersMap[type]?.splice(index, 1);
-            }
+            this.subscribers[type] = this.subscribers[type]?.filter((s) => s !== listener);
         }
         fire(type, event) {
             const isSubjectDeclared = type in this.subjectsStateMap;
             if (isSubjectDeclared) {
-                this.subject(type, event);
-            }
-            else {
-                this.fireSubscribers(this.subscribersMap[type], event);
-            }
-        }
-        subject(type, event) {
-            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));
         }
-        fireSubscribers(subscribers, event) {
-            if (!subscribers || !event) {
-                return;
-            }
-            for (const _ of subscribers) {
-                _(event);
-            }
+        subject(type, event) {
+            this.subjectsStateMap[type] = event;
         }
     }
 
     const defaultEventBus = new EventBus();
 
     const useDialogManager = () => ({
-        open: (dialog, options = {}) => defaultEventBus.emitter.fire('dialog', { type: 'open', dialog, ...options }),
-        close: () => defaultEventBus.emitter.fire('dialog', { type: 'close' }),
-        closeAll: () => defaultEventBus.emitter.fire('dialog', { type: 'close', all: true }),
+        open: (dialog, options = {}) => defaultEventBus.fire('dialog', { type: 'open', dialog, ...options }),
+        close: () => defaultEventBus.fire('dialog', { type: 'close' }),
+        closeAll: () => defaultEventBus.fire('dialog', { type: 'close', all: true }),
     });
 
     const adjustBase = (href, basePath = '') => href.replace(basePath, '') || '/';
@@ -1117,48 +1098,10 @@
         { key: 'phone', text: 'Телефонный звонок' },
         { key: 'email', text: 'Электронное сообщение' },
     ];
-    // TODO Тоже надо рефакторить - файлик constants
     const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';
 
     const getRegionUrl = (typeForm) => typeForm === 'OUTSERVICE' ? OUT_SERVICE_URL : undefined;
 
-    const renderErrorText = (error) => (jsx("div", { className: "h-6", children: error ? (jsx(Text, { size: "text-xs", font: "font-light", color: "text-error", children: error })) : null }));
-
-    const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
-        return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
-                const resultOptions = { ...commonOptions, ...options };
-                return (jsx("path", { d: d, fill: pathFill || 'currentColor', stroke: resultOptions.stroke, strokeLinecap: resultOptions.strokeLinecap, strokeLinejoin: resultOptions.strokeLinejoin, strokeWidth: resultOptions.strokeWidth, strokeMiterlimit: resultOptions.strokeMiterlimit }, i));
-            }) }));
-    });
-
-    const defaultCheckStyle = 'appearance-none w-5 h-5 border-solid flex-none';
-
-    const CHECK_PATHS = [
-        {
-            d: 'M10.207.793a1 1 0 0 1 0 1.414l-6 6a1 1 0 0 1-1.414 0l-2.5-2.5a1 1 0 0 1 1.414-1.414L3.5 6.086 8.793.793a1 1 0 0 1 1.414 0Z',
-            fillRule: 'evenodd',
-            clipRule: 'evenodd',
-            fill: 'white',
-        },
-    ];
-    const Checkbox = JSX(({ className, value, text, disabled, isRadio, onChange }) => {
-        const handleChange = useCallback((e) => {
-            if (disabled) {
-                return;
-            }
-            e.preventDefault();
-            onChange && onChange(!value);
-        }, [onChange, disabled, value]);
-        const icon = isRadio ? (jsx("div", { className: "absolute left-1 w-3 h-3 rounded-full bg-primary-main" })) : (jsx(SVG, { paths: CHECK_PATHS, className: "absolute left-1 ml-px block", width: "11", height: "9", fill: "white", viewBox: "0 0 11 9" }));
-        return (jsx("div", { className: className, children: jsxs("label", { className: style('flex items-center relative group/box', getCursorStyle(disabled)), onClick: handleChange, children: [jsx("div", { className: style(defaultCheckStyle, 'm-0', isRadio ? 'rounded-full border-2' : checkboxStyle(value), !disabled && value ? 'border-primary-main' : 'border-gray', disabled ? 'bg-main-disabled' : 'group-hover/box:border-primary-hover'), role: role(isRadio), "aria-checked": Boolean(value), "aria-disabled": Boolean(disabled), "aria-label": text }), value ? icon : null, renderText$3(text)] }) }));
-    });
-    const renderText$3 = (text) => text ? (jsx("div", { className: "ml-s", children: jsx(Text, { size: "text-l", font: "font-light", children: text }) })) : null;
-    const getCursorStyle = (disabled = false) => (disabled ? 'cursor-not-allowed' : 'cursor-pointer');
-    const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
-    const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });
-
-    const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
-
     function useBool(defaultValue = false) {
         const [value, setValue] = useState(defaultValue);
         const setTrue = useCallback(() => setValue(true), []);
@@ -1220,6 +1163,8 @@
     const getValidStyle = (valid) => (valid ? inputValidStyle : 'border-error');
     const defaultStyle$1 = 'w-full border rounded-md text-primary-text outline-none p-m';
 
+    const renderErrorText = (error) => (jsx("div", { className: "h-6", children: error ? (jsx(Text, { size: "text-xs", font: "font-light", color: "text-error", children: error })) : null }));
+
     const DEFAULT_HINTS_COUNT = 10;
     const defaultResponseItemHandler = (item) => item?.value || '';
     const getResponseHandler = (itemHandler) => (response) => {
@@ -1324,9 +1269,9 @@
     };
 
     const usePopupManager = () => ({
-        open: (popup, options) => defaultEventBus.emitter.fire('popup', { type: 'open', popup, ...options }),
-        update: (popup, options) => defaultEventBus.emitter.fire('popup', { type: 'update', popup, ...options }),
-        close: () => defaultEventBus.emitter.fire('popup', { type: 'close' }),
+        open: (popup, options) => defaultEventBus.fire('popup', { type: 'open', popup, ...options }),
+        update: (popup, options) => defaultEventBus.fire('popup', { type: 'update', popup, ...options }),
+        close: () => defaultEventBus.fire('popup', { type: 'close' }),
     });
 
     const InputPopup = JSX(({ options, onChange }) => (jsx("div", { className: "bg-white text-l max-h-64 overflow-y-auto overflow-x-hidden rounded-md shadow-2xl", role: "list", children: options?.map((item, key) => (jsx("div", { className: "flex px-m py-s cursor-pointer hover:bg-main-divider pr-5xl relative", role: "listitem", onMouseDown: () => onChange(item), children: jsx("span", { className: "min-h-6", children: item.processedValue }) }, key.toString()))) })));
@@ -1595,7 +1540,6 @@
         };
     };
 
-    // TODO Зачем это?
     const getValidation = (field, validator, required = false) => required ? withValidator(field, validator) : field;
 
     const ACQUIRING_TYPES = [
@@ -1809,6 +1753,41 @@
 
     const AnnualRevenueField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0413\u043E\u0434\u043E\u0432\u0430\u044F \u0432\u044B\u0440\u0443\u0447\u043A\u0430, \u20BD", ...getValidation(field('annualRevenue'), validatorObj.annualRevenue, input?.required) })));
 
+    const SVG = JSX(({ className, viewBox, fill = 'none', width, height, paths, ...commonOptions }) => {
+        return (jsx("svg", { xmlns: "http://www.w3.org/2000/svg", className: className, viewBox: viewBox, fill: fill, width: width, height: height, children: paths.map(({ d, fill: pathFill, ...options }, i) => {
+                const resultOptions = { ...commonOptions, ...options };
+                return (jsx("path", { d: d, fill: pathFill || 'currentColor', stroke: resultOptions.stroke, strokeLinecap: resultOptions.strokeLinecap, strokeLinejoin: resultOptions.strokeLinejoin, strokeWidth: resultOptions.strokeWidth, strokeMiterlimit: resultOptions.strokeMiterlimit }, i));
+            }) }));
+    });
+
+    const defaultCheckStyle = 'appearance-none w-5 h-5 border-solid flex-none';
+
+    const CHECK_PATHS = [
+        {
+            d: 'M10.207.793a1 1 0 0 1 0 1.414l-6 6a1 1 0 0 1-1.414 0l-2.5-2.5a1 1 0 0 1 1.414-1.414L3.5 6.086 8.793.793a1 1 0 0 1 1.414 0Z',
+            fillRule: 'evenodd',
+            clipRule: 'evenodd',
+            fill: 'white',
+        },
+    ];
+    const Checkbox = JSX(({ className, value, text, disabled, isRadio, onChange }) => {
+        const handleChange = useCallback((e) => {
+            if (disabled) {
+                return;
+            }
+            e.preventDefault();
+            onChange && onChange(!value);
+        }, [onChange, disabled, value]);
+        const icon = isRadio ? (jsx("div", { className: "absolute left-1 w-3 h-3 rounded-full bg-primary-main" })) : (jsx(SVG, { paths: CHECK_PATHS, className: "absolute left-1 ml-px block", width: "11", height: "9", fill: "white", viewBox: "0 0 11 9" }));
+        return (jsx("div", { className: className, children: jsxs("label", { className: style('flex items-center relative group/box', getCursorStyle(disabled)), onClick: handleChange, children: [jsx("div", { className: style(defaultCheckStyle, 'm-0', isRadio ? 'rounded-full border-2' : checkboxStyle(value), !disabled && value ? 'border-primary-main' : 'border-gray', disabled ? 'bg-main-disabled' : 'group-hover/box:border-primary-hover'), role: role(isRadio), "aria-checked": Boolean(value), "aria-disabled": Boolean(disabled), "aria-label": text }), value ? icon : null, renderText$3(text)] }) }));
+    });
+    const renderText$3 = (text) => text ? (jsx("div", { className: "ml-s", children: jsx(Text, { size: "text-l", font: "font-light", children: text }) })) : null;
+    const getCursorStyle = (disabled = false) => (disabled ? 'cursor-not-allowed' : 'cursor-pointer');
+    const role = (isRadio = false) => (isRadio ? 'radio' : 'checkbox');
+    const checkboxStyle = (value = false) => style('rounded border', { 'bg-primary-main': value });
+
+    const CheckboxWithError = JSX(({ className, text, value, key, disabled, error, onChange }) => (jsxs("div", { className: style('shrink-0', className), children: [jsx(Checkbox, { text: text, value: value, disabled: disabled, onChange: onChange }, key), renderErrorText(error)] })));
+
     const ArmyIdFlgField = JSX(({ field }) => (jsx(CheckboxWithError, { text: "\u041D\u0430\u043B\u0438\u0447\u0438\u0435 \u0432\u043E\u0435\u043D\u043D\u043E\u0433\u043E \u0431\u0438\u043B\u0435\u0442\u0430", ...getValidation(field('armyIdFlg'), validatorObj.armyIdFlg) })));
 
     const BankEmpoleeField = JSX(({ field }) => (jsx(InputControl, { label: "\u0424\u0418\u041E \u0438\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u044C \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u0432\u0448\u0435\u0433\u043E \u0412\u0430\u0441 \u0441\u043E\u0442\u0440\u0443\u0434\u043D\u0438\u043A\u0430 \u0411\u0430\u043D\u043A\u0430", ...field('bankEmpolee') })));
@@ -1994,17 +1973,109 @@
         return (jsx(SelectField, { field: field, source: conscription, label: "\u0421\u0442\u0430\u0442\u0443\u0441 \u0432\u043E\u0435\u043D\u043D\u043E\u043E\u0431\u044F\u0437\u0430\u043D\u043D\u043E\u0433\u043E", fieldName: "conscription", input: input }));
     });
 
-    const ConsentAssignmentField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041F\u0440\u043E\u0447\u0438\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u0438\u044F (\u0441\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u0443\u0441\u0442\u0443\u043F\u043A\u0443 \u043F\u0440\u0430\u0432 \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u0439)", ...getValidation(field('consentAssignmentClaimsFlg'), validatorObj.consentAssignmentClaimsFlg, input?.required) })));
+    const CONSENTS = {
+        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: 'Согласен на получение информационных и аналитических материалов по электронной почте',
+        },
+    };
+
+    const CloseButton = JSX(({ className, onClose }) => (jsx("button", { className: style('flex justify-center items-center w-12 h-12 p-2xs bg-transparent border-none', className), onClick: onClose, title: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C", type: "button", children: jsx(Icon, { name: "CloseIcon", width: "20", height: "20", iconVersion: "gray" }) })));
 
-    const ConsentCollectionField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041F\u0440\u043E\u0447\u0438\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u0438\u044F (\u0441\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u0432\u0437\u044B\u0441\u043A\u0430\u043D\u0438\u0435 \u043F\u043E \u0438\u0441\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u0439 \u043D\u0430\u0434\u043F\u0438\u0441\u0438 \u043D\u043E\u0442\u0430\u0440\u0438\u0443\u0441\u0430)", ...getValidation(field('consentCollectionFlg'), validatorObj.consentCollectionFlg, input?.required) })));
+    const Dialog = JSX(({ className, head, children, onClose, onClick }) => {
+        const { close } = useDialogManager();
+        const handleClose = useCallback(() => {
+            close();
+            onClose && onClose();
+        }, [onClose]);
+        return (jsxs("div", { onClick: onClick, className: style('relative min-h-full bg-white pt-0 p-lg', className), role: "dialog", children: [jsxs("div", { className: "sticky py-xl top-0 bg-white z-10", children: [jsx(CloseButton, { className: "absolute top-0 right-0", onClose: handleClose }), jsx("div", { className: "container", children: head })] }), jsx("div", { className: "container pb-6xl", children: children })] }));
+    });
 
-    const ConsentInformField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u043E \u043F\u0440\u043E\u0434\u0443\u043A\u0442\u0430\u0445 \u0438 \u0443\u0441\u043B\u0443\u0433\u0430\u0445 \u0411\u0430\u043D\u043A\u0430", ...getValidation(field('consentInformFlg'), validatorObj.consentInformFlg, input?.required) })));
+    const getResponse = (response) => (isJSON(response) ? response.json() : response);
+    const getAthorizationHeaders = () => {
+        const token = sessionStorage.getItem('accessToken');
+        return token ? { Authorization: `Bearer ${token}` } : null;
+    };
+    const isJSON = (response) => response.headers.get('Content-Type') === 'application/json';
+    const request = async (url, method, body) => await fetch('https://retail-light-api.cprb.dev.rshbdev.ru/api/v1' + url, {
+        method,
+        headers: {
+            'Content-Type': 'application/json',
+            ...getAthorizationHeaders(),
+        },
+        credentials: 'include',
+        body: body ? JSON.stringify(body) : null,
+    })
+        .then((response) => {
+        if (response.ok) {
+            return getResponse(response);
+        }
+        else {
+            throw response;
+        }
+    })
+        .catch((error) => {
+        throw error;
+    });
+    const saveToken = (data) => {
+        sessionStorage.setItem('accessToken', data.access_token);
+        sessionStorage.setItem('refreshToken', data.refresh_token);
+    };
+    const RETAIL_API = {
+        CreateUserProfile: async (body) => await request('/public-data/createUserProfile', 'POST', body),
+        UpdateUserProfile: async (body) => await request('/user-data/updateUserProfile', 'PUT', body),
+        CreateDraftTask: async (body) => await request('/user-data/createDraftTask', 'POST', body),
+        UpdateUserTask: async (body) => await request('/user-data/updateUserTask', 'PUT', body),
+        SendCode: async (body) => await request('/sms/sendCode', 'POST', body),
+        CheckCode: async (body) => await request('/sms/checkCode', 'POST', body).then(saveToken),
+        CreateCaptcha: async (phoneNumber) => await request(`/sms/createCaptcha?phoneNumber=${phoneNumber}`, 'GET'),
+        CheckCaptcha: async (body) => await request('/sms/checkCaptcha', 'POST', body),
+        GetFileByID: async (id) => await request(`/feedback/file?id=${id}`, 'GET'),
+    };
 
-    const ConsentPhotoFlg = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u041F\u0440\u043E\u0447\u0438\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u0438\u044F (\u0441\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435)", ...getValidation(field('consentPhotoFlg'), validatorObj.consentPhotoFlg, input?.required) })));
+    const getDocument = async (id) => {
+        const response = await RETAIL_API.GetFileByID(id);
+        return URL.createObjectURL(await response.blob());
+    };
 
-    const ConsentProviderField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043E\u0431 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0438 \u043F\u0440\u043E\u0441\u0442\u043E\u0439 \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0434\u043F\u0438\u0441\u0438", ...getValidation(field('consentProviderFlg'), validatorObj.consentProviderFlg, input?.required) })));
+    const OPEN_DOC_BUTTON_TEXT = 'Ознакомиться';
+    const CheckboxWithDoc = JSX(({ className, error, docId, ...props }) => {
+        const { open } = useDialogManager();
+        return (jsxs("div", { className: className, children: [jsxs("div", { className: "flex flex-wrap gap-x-m", children: [jsx(Checkbox, { ...props }), docId ? (jsx(LinkButton, { className: "text-primary-main", onClick: () => handleOpenDocument(docId, open), children: jsx(Text, { children: OPEN_DOC_BUTTON_TEXT }) })) : null] }), renderErrorText(error)] }));
+    });
+    const handleOpenDocument = async (id, open) => {
+        const document = await getDocument(id);
+        open(jsx(Dialog, { className: "my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0", children: jsx("iframe", { src: `${document}#toolbar=0`, className: "w-full h-[80vh]", id: "iframe-dialog" }) }));
+    };
 
-    const ConsentToReceiveMaterialsField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0435\u043D \u043D\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0438 \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432 \u043F\u043E \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0447\u0442\u0435", ...getValidation(field('consentToReceiveMaterials'), validatorObj.consentToReceiveMaterials, input?.required) })));
+    const ConsentField = JSX(({ field, input }) => input && input.name ? (jsx(CheckboxWithDoc, { text: CONSENTS[input.name]?.text, docId: CONSENTS[input.name]?.docId, ...getValidation(field(input.name), validatorObj[input.name], input?.required) })) : null);
 
     const DependentsField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", type: "number", ...getValidation(field('dependents'), validatorObj.dependents, input?.required), ...input })));
 
@@ -2097,11 +2168,9 @@
     const LegalFormField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041E\u041F\u0424", placeholder: "\u041E\u041E\u041E, \u041F\u0410\u041E  \u0438 \u0434\u0440.", ...getValidation(field('legalForm'), validatorObj.legalForm, input?.required), ...input })));
 
     const REGIONS_URL = '/api/v1/regions';
-    const EMPTY_REGIONS = [];
-    // TODO Почему url можно менять? Разве смысл не в инкапсуляции api url. Тоже под рефакторинг попадает
     function useRegions(url = REGIONS_URL) {
         const { data } = useAsyncData(url, fetchJSONUnsafe);
-        return Array.isArray(data) ? data : EMPTY_REGIONS;
+        return Array.isArray(data) ? data : [];
     }
 
     const LocalitiesField = JSX(({ field, input }) => {
@@ -2183,8 +2252,6 @@
 
     const PosTerminalField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 POS-\u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B", ...field('posTerminal') })) : null);
 
-    const ProcessPersonalDataField = JSX(({ field, input }) => (jsx(CheckboxWithError, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u043A\u0443 \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0445 \u0434\u0430\u043D\u043D\u044B\u0445", ...getValidation(field('processPersonalDataLeadFlg'), validatorObj.processPersonalDataLeadFlg, input?.required) })));
-
     const ProductField = UniBlock(({ field, source }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: arrayToOptions(source?.productList), ...withValidator(field('product'), validatorObj.product) })));
     const arrayToOptions = (array) => (array ?? []).map((_) => ({ key: _, value: _ }));
 
@@ -2339,15 +2406,15 @@
             serviceDirection: jsx(ServiceDirectionField, { field: field, input: input }),
             bankEmpolee: jsx(BankEmpoleeField, { field: field }),
             secondaryPhone: jsx(SecondaryPhoneField, { field: field }),
-            consentToReceiveMaterials: jsx(ConsentToReceiveMaterialsField, { field: field, input: input }),
-            processPersonalDataLeadFlg: jsx(ProcessPersonalDataField, { field: field, input: input }),
-            consentProviderFlg: jsx(ConsentProviderField, { field: field, input: input }),
-            consentPhotoFlg: jsx(ConsentPhotoFlg, { field: field, input: input }),
-            consentAssignmentClaimsFlg: jsx(ConsentAssignmentField, { field: field, input: input }),
-            consentCollectionFlg: jsx(ConsentCollectionField, { field: field, input: input }),
-            consentInformFlg: jsx(ConsentInformField, { field: field, input: input }),
+            consentToReceiveMaterials: jsx(ConsentField, { field: field, input: input }),
+            processPersonalDataLeadFlg: jsx(ConsentField, { field: field, input: input }),
+            consentProviderFlg: jsx(ConsentField, { field: field, input: input }),
+            consentPhotoFlg: jsx(ConsentField, { field: field, input: input }),
+            consentAssignmentClaimsFlg: jsx(ConsentField, { field: field, input: input }),
+            consentCollectionFlg: jsx(ConsentField, { field: field, input: input }),
+            consentInformFlg: jsx(ConsentField, { field: field, input: input }),
+            consentPfrFlg: jsx(ConsentField, { field: field, input: input }),
             applicationDate: (jsx(InputControl, { label: "\u0414\u0430\u0442\u0430 \u0438 \u0432\u0440\u0435\u043C\u044F \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u044F \u0432 \u0411\u0430\u043D\u043A", ...field('applicationDate') })),
-            consentPfrFlg: (jsx(CheckboxWithError, { text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0438\u0435 \u043D\u0430 \u0437\u0430\u043F\u0440\u043E\u0441 \u0432 \u041F\u0424\u0420", ...field('consentPfrFlg') })),
             region: isPremium ? (jsx(RegionPremiumField, { field: field })) : (jsx(RegionField, { field: field, input: input, url: getRegionUrl(typeForm) })),
             education: jsx(EducationField, { field: field, input: input }),
             housing: jsx(HousingField, { field: field, input: input }),
@@ -2359,7 +2426,6 @@
             positionOrganization: jsx(PositionOrganizationField, { field: field, input: input }),
             familyStatus: jsx(FamilyStatusField, { field: field, input: input }),
             children: jsx(ChildrenField, { field: field, input: input }),
-            // eslint-disable-next-line max-lines
             familyMembers: jsx(FamilyMembersField, { field: field, input: input }),
             dependents: jsx(DependentsField, { field: field, input: input }),
             totalIncome: jsx(TotalIncomeField, { field: field, input: input }),
@@ -2369,6 +2435,7 @@
             armyIdFlg: jsx(ArmyIdFlgField, { field: field, input: input }),
             dulSerie: jsx(DulSerieField, { field: field, input: input }),
             dulNumber: jsx(DulNumberField, { field: field, input: input }),
+            // eslint-disable-next-line max-lines
             dulIssueDateField: jsx(DulIssueDateField, { field: field, input: input }),
             dulSubdivisionCode: jsx(DulSubdivisionCodeField, { field: field, input: input }),
             dulIssuedBy: jsx(DulIssuedByField, { field: field, input: input }),
@@ -2414,17 +2481,6 @@
                 : '', className), type: type, role: role, onClick: onClick, children: children }));
     });
 
-    const CloseButton = JSX(({ className, onClose }) => (jsx("button", { className: style('flex justify-center items-center w-12 h-12 p-2xs bg-transparent border-none', className), onClick: onClose, title: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C", type: "button", children: jsx(Icon, { name: "CloseIcon", width: "20", height: "20", iconVersion: "gray" }) })));
-
-    const Dialog = JSX(({ className, head, children, onClose, onClick }) => {
-        const { close } = useDialogManager();
-        const handleClose = useCallback(() => {
-            close();
-            onClose && onClose();
-        }, [onClose]);
-        return (jsxs("div", { onClick: onClick, className: style('relative min-h-full bg-white pt-0 p-lg', className), role: "dialog", children: [jsxs("div", { className: "sticky py-xl top-0 bg-white z-10", children: [jsx(CloseButton, { className: "absolute top-0 right-0", onClose: handleClose }), jsx("div", { className: "container", children: head })] }), jsx("div", { className: "container pb-6xl", children: children })] }));
-    });
-
     const ResponseTypeDialog = JSX(function ({ responseType, typeForm, }) {
         const responseOK = responseType === 'OK';
         const statusIcon = responseOK ? 'ResponseOKIcon' : 'ResponseFailIcon';
@@ -2585,17 +2641,6 @@
         return [storedValue, setValue];
     }
 
-    const CONSENTS = [
-        'processPersonalDataLeadFlg',
-        'consentProviderFlg',
-        'consentPfrFlg',
-        'consentPhotoFlg',
-        'consentAssignmentClaimsFlg',
-        'consentCollectionFlg',
-        'consentInformFlg',
-        'consentToReceiveMaterials',
-    ];
-
     const initialFormState = {
         typeForm: '',
         region: { key: '', text: '' },
@@ -2643,14 +2688,6 @@
         return { ...formState, typeForm: { key: typeForm, text: '' } };
     };
 
-    const FoldableWrapper = JSX(({ className, children }) => (jsx("div", { className: className, role: "group", children: children })));
-    /**
-     * Какой то бесполезный компонент. Его можно заменить на useBool
-     * Лучше оставить только обёрточный div с необходимой атрибутикой
-     * и сделать пассивный компонент
-     *
-     * @deprecated
-     */
     const Foldable = JSX(({ className = '', isFoldButtonOnTop = false, unfoldedByDefault = false, renderFoldableSection, renderFoldButton, }) => {
         const [isUnfolded, setIsUnfolded] = useState(unfoldedByDefault);
         const onToggle = useCallback(() => {
@@ -2658,7 +2695,7 @@
         }, []);
         const sectionNode = renderFoldableSection({ isUnfolded, onToggle });
         const buttonNode = renderFoldButton ? renderFoldButton({ isUnfolded, onToggle }) : null;
-        return isFoldButtonOnTop ? (jsxs(FoldableWrapper, { className: className, children: [buttonNode, sectionNode] })) : (jsxs(FoldableWrapper, { className: className, children: [sectionNode, buttonNode] }));
+        return isFoldButtonOnTop ? (jsxs("div", { className: className, role: "group", children: [buttonNode, sectionNode] })) : (jsxs("div", { className: className, role: "group", children: [sectionNode, buttonNode] }));
     });
 
     function useResizeObserver(callback, deps) {
@@ -2704,53 +2741,12 @@
         const hasValidationErrors = useMemo(() => inputs
             ?.filter((_) => _.required)
             ?.some((_) => Boolean(withValidator(field(_?.name), validatorObj[_?.name]).error)), [inputs]);
-        return (jsx("div", { className: "w-fit", children: jsx(Foldable, { isFoldButtonOnTop: true, renderFoldableSection: ({ isUnfolded }) => (jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: inputs.map(getField(field, typeForm)) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
+        return (jsx("div", { className: "w-fit", children: jsx(Foldable, { isFoldButtonOnTop: true, unfoldedByDefault: true, renderFoldableSection: ({ isUnfolded }) => (jsx(FoldableSection, { isUnfolded: isUnfolded, className: "flex flex-col pl-2xl", children: inputs.map(getField(field, typeForm)) })), renderFoldButton: renderGeneralCheckbox(jsxs("div", { children: [jsx(Checkbox, { value: isChecked, onChange: handleGeneralToggle, text: CONSENT_ALL_DOCS_TEXT }, key), renderErrorText(hasValidationErrors ? CONSENT_REQUIRED : '')] })) }) }));
     });
     const renderGeneralCheckbox = (generalCheckBox) => (foldableData) => (jsxs("div", { className: "flex items-start", children: [generalCheckBox, jsx("button", { onClick: foldableData.onToggle, className: "px-m py-2xs", children: jsx(Icon, { className: "text-primary-text", name: foldableData.isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" }) })] }));
 
     const renderSubmitButton = (button, className) => (jsx(Button, { className: style('w-full @xl:w-auto', className), type: "submit", children: button?.text ? button.text : 'Отправить заявку' }));
 
-    const getResponse = (response) => (isJSON(response) ? response.json() : response);
-    const getAthorizationHeaders = () => {
-        const token = sessionStorage.getItem('accessToken');
-        return token ? { Authorization: `Bearer ${token}` } : null;
-    };
-    const isJSON = (response) => response.headers.get('Content-Type') === 'application/json';
-    const request = async (url, method, body) => await fetch('https://retail-light-api.cprb.dev.rshbdev.ru/api/v1' + url, {
-        method,
-        headers: {
-            'Content-Type': 'application/json',
-            ...getAthorizationHeaders(),
-        },
-        credentials: 'include',
-        body: body ? JSON.stringify(body) : null,
-    })
-        .then((response) => {
-        if (response.ok) {
-            return getResponse(response);
-        }
-        else {
-            throw response;
-        }
-    })
-        .catch((error) => {
-        throw error;
-    });
-    const saveToken = (data) => {
-        sessionStorage.setItem('accessToken', data.access_token);
-        sessionStorage.setItem('refreshToken', data.refresh_token);
-    };
-    const RETAIL_API = {
-        CreateUserProfile: async (body) => await request('/public-data/createUserProfile', 'POST', body),
-        UpdateUserProfile: async (body) => await request('/user-data/updateUserProfile', 'PUT', body),
-        CreateDraftTask: async (body) => await request('/user-data/createDraftTask', 'POST', body),
-        UpdateUserTask: async (body) => await request('/user-data/updateUserTask', 'PUT', body),
-        SendCode: async (body) => await request('/sms/sendCode', 'POST', body),
-        CheckCode: async (body) => await request('/sms/checkCode', 'POST', body).then(saveToken),
-        CreateCaptcha: async (phoneNumber) => await request(`/sms/createCaptcha?phoneNumber=${phoneNumber}`, 'GET'),
-        CheckCaptcha: async (body) => await request('/sms/checkCaptcha', 'POST', body),
-    };
-
     const getUpdateUserProfileData = (profileId, formData) => {
         const { name = '', surname = '', middleName = '', birthday = '', phone = '', email = '', processPersonalDataLeadFlg, consentProviderFlg, consentPfrFlg, consentPhotoFlg, consentAssignmentClaimsFlg, consentCollectionFlg, consentInformFlg, } = formData;
         return {
@@ -3084,10 +3080,13 @@
                             setResponseStatus('Fail');
                         }
                     };
+                    const acceptedConsents = 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();
                 }
@@ -3101,17 +3100,14 @@
             responseStatus,
         };
     };
-    const verifyPhoneContent = (phone) => ({
+    const verifyPhoneContent = (phone, consents) => ({
         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) => `<ul>${consents?.map((_) => '<li>' + _ + '</li>').join('')}</ul>`;
 
     const useInitApplicationLead = () => {
         useEffect(() => {
@@ -3149,8 +3145,8 @@
         return consentInputs.length > 2 ? (jsxs("div", { children: [restInputs.map(getField(field, typeForm)), jsx(GroupedConsents, { inputs: consentInputs, field: field })] })) : ((inputs || [])?.map(getField(field, typeForm)));
     };
     const splitInputs = (inputs) => ({
-        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)) || [],
     });
 
     const NotFound = JSX(({ title, description }) => {
@@ -4747,37 +4743,31 @@
     const CarouselRecommendationCard = JSX(({ className, padding, description, additionalDescription, href, icon, isDotted, __html, socialMedia = [], target, title, align = 'text-left', benefits, imageOptions: { directionRight = true, isImageAlwaysOnRight = ImageAlwaysOnRight, isImageSecondary = false, } = {}, data, ...rest }) => (jsx(BlockWrapper, { className: style('relative min-h-28 group-data-gray:bg-main-divider/50', className), defaultPadding: "p-0", ...rest, children: jsx(LinkWrapper, { href: href, target: target, className: "h-full", data: getAspectsWithInclude(data), children: jsxs(BaseTile, { className: "h-full", defaultPadding: "p-2xl", padding: padding, insetTitle: jsx(Headline, { title: title, description: description, headlineVersion: "XS", isEmbedded: true, align: align }), ...leftOrRightImage(isIcon(icon) ? jsx(Img, { image: icon }) : null, directionRight), buttons: socialMedia.length ? (jsx(SocialMedia, { media: socialMedia, stretched: true, showButtonText: true, version: rest?.version })) : null, isImageAlwaysOnRight: isImageAlwaysOnRight, isImageSecondary: isImageSecondary, imageAlign: "center", children: [jsx(BenefitsList, { benefits: benefits }), __html ? jsx(RichText, { __html: __html, isDotted: isDotted, itemSize: "list-s" }) : null, renderAdditionalDescription(additionalDescription, align)] }) }) })));
     const renderAdditionalDescription = (additionalDescription, align) => additionalDescription ? (jsx(Paragraph, { size: "text-m", font: "font-light", color: "text-secondary-text group-data-secondary:text-white/80", align: align, children: additionalDescription })) : null;
 
-    const useSubjectState = (eventBus, type, initialState) => {
-        const [state, setState] = useState(initialState);
-        useEffect(() => eventBus.subscribe(type, setState), [eventBus, type]);
-        return state;
-    };
-
     const renderCardInfo = (cell, i) => {
         const { title, description, buttons } = cell;
         return (jsxs("div", { className: "py-lg border-b border-main-divider", children: [title ? (jsx("div", { className: "opacity-80", children: jsx(Text, { size: "text-m", color: "text-secondary-text", children: title }) })) : null, description ? (jsx("div", { className: "mt-2xs", children: jsx(Text, { size: "text-xl", color: "text-primary-text", children: description }) })) : null, buttons?.length ? (jsx("div", { className: "text-primary-main", children: renderButtonsSection(buttons) })) : null] }, String(i)));
     };
 
-    const CardCellsSection = JSX((props) => {
-        const { cardCells = [], visibleCellsCount = 1, isUnfolded } = props;
-        const [visibleCells, hiddenCells] = visibleCellsCount > 0 && cardCells.length >= visibleCellsCount
-            ? [cardCells.slice(0, visibleCellsCount), cardCells.slice(visibleCellsCount)]
-            : [cardCells, []];
-        return hiddenCells.length ? (jsxs(FoldableWrapper, { children: [jsxs("div", { children: [visibleCells.map(renderCardInfo), jsx(FoldableSection, { isUnfolded: isUnfolded, children: hiddenCells.map(renderCardInfo) })] }), jsx(FoldButton, { ...props })] })) : (jsx("div", { children: visibleCells.map(renderCardInfo) }));
-    });
-    const FoldButton = JSX(({ isUnfolded, data, onToggle }) => (jsxs("button", { type: "button", className: "w-full cursor-pointer text-primary-main pt-lg flex justify-between items-center", ...(isUnfolded ? getAspectsAttributes(data) : {}), onClick: onToggle, children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] })));
-
-    const carouselTariffsCardEventBus = new EventBus();
-
-    const CarouselTariffsCard = JSX(({ className, title, align = 'text-center', icon, button, visibleCellsCount = 1, cardCells = [], options, data, ...rest }) => {
-        const { isUnfolded, parent: firedParent } = useSubjectState(carouselTariffsCardEventBus.observable, 'fold', {});
-        const isVisible = isUnfolded && firedParent === options?.parent;
-        const toggle = useCallback(() => carouselTariffsCardEventBus.emitter.fire('fold', {
-            isUnfolded: !isVisible,
-            parent: options?.parent,
-        }), [isVisible, options?.parent]);
-        return (jsxs(BlockWrapper, { className: style('flex flex-col', className), defaultPadding: "p-2xl", ...rest, children: [isIcon(icon) ? (jsx("div", { className: "self-center", children: jsx(Img, { image: icon }) })) : null, title ? (jsx(Heading, { className: style('pt-xs', align), headingType: "h5", title: title })) : null, button?.text ? jsx(LinkButton, { className: "w-full mt-m mb-lg", ...button }) : null, jsx(CardCellsSection, { cardCells: cardCells, visibleCellsCount: visibleCellsCount, isUnfolded: isVisible, data: data, onToggle: toggle })] }));
-    });
+    const CarouselTariffsCard = JSX(({ className = '', title, align = 'text-center', icon, button, visibleCellsCount = 1, cardCells = [], options, data, ...rest }) => {
+        const cellsNode = cardCells.map(renderCardInfo);
+        const [visibleCells, hiddenCells] = visibleCellsCount > 0
+            ? [cellsNode.slice(0, visibleCellsCount), cellsNode.slice(visibleCellsCount)]
+            : [cellsNode, []];
+        const [isVisible, setIsVisible] = useState(false);
+        useEffect(() => defaultEventBus.subscribe('fold', (event) => {
+            if (options?.parent !== undefined && event.parent === options?.parent) {
+                setIsVisible(event.isUnfolded);
+            }
+        }), [options?.parent]);
+        return (jsxs(BlockWrapper, { className: style('flex flex-col', className), defaultPadding: "p-2xl", ...rest, children: [isIcon(icon) ? (jsx("div", { className: "self-center", children: jsx(Img, { image: icon }) })) : null, title ? (jsx(Heading, { className: style('pt-xs', align), headingType: "h5", title: title })) : null, button?.text ? jsx(LinkButton, { className: "w-full mt-m mb-lg", ...button }) : null, hiddenCells.length ? (jsx(Foldable, { renderFoldableSection: () => (jsxs("div", { children: [visibleCells, jsx(FoldableSection, { isUnfolded: isVisible, children: hiddenCells })] })), renderFoldButton: cardCells.length >= visibleCellsCount
+                        ? renderFoldButton$3(options?.parent, data, isVisible)
+                        : null })) : (jsx("div", { children: visibleCells }))] }));
+    });
+    const renderFoldButton$3 = (parent, data, isUnfolded = false) => () => (jsxs("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", ...(isUnfolded ? getAspectsAttributes(data) : {}), children: [jsx("div", { children: isUnfolded ? 'Скрыть' : 'Подробнее о тарифе' }), jsx(Icon, { className: "text-primary-text", name: isUnfolded ? 'ArrowUpIcon' : 'ArrowDownIcon', width: "16", height: "16" })] }));
 
     const isRateRow = (rateRow) => typeof rateRow?.minMonths === 'number' && typeof rateRow?.maxMonths === 'number';
 
@@ -4944,46 +4934,47 @@
     };
     const ErrorBlock = JSX(({ className = '', title, description, error, button, ...rest }) => (jsxs(BlockWrapper, { className: style('flex flex-col justify-center items-center', className), defaultPadding: style('p-6xl'), version: "transparent", ...rest, children: [jsx("div", { className: "flex justify-center", children: renderErrorContent(error) }), jsx(Headline, { title: title, description: description, headlineVersion: "XL", isEmbedded: true, className: "mb-2xl last:mb-0" }), button?.text ? (jsx(LinkButton, { version: button?.version, text: button?.text, ...button })) : null] })));
 
-    function useSubject(eventBus, type, initialState) {
-        useEffect(() => {
-            const state = initialState instanceof Function ? initialState() : initialState;
-            if (state instanceof Promise) {
-                state.then((_) => eventBus.subject(type, _), console.warn);
-            }
-            else {
-                eventBus.subject(type, state);
-            }
-        }, [eventBus, type]);
-        return useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
-    }
+    const useLatestEvent = (eventBus, type, initialEvent) => {
+        const [latestEvent, setLatestEvent] = useState(initialEvent || null);
+        useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
+        const fireEvent = useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
+        return [latestEvent, fireEvent];
+    };
 
     const REGION_URL = '/api/v1/region';
     const LOCATION_STORAGE_KEY = 'location';
     function useLocation(defaultLocation = 'Москва') {
-        useEffect(() => defaultEventBus.subscribe('location', storeLocation), []);
-        return useSubject(defaultEventBus.emitter, 'location', restoreLocation(defaultLocation));
-    }
-    function useLocationState(defaultLocation = 'Москва') {
-        return useSubjectState(defaultEventBus.observable, 'location', { name: defaultLocation });
-    }
-    function restoreLocation(defaultLocation) {
-        return async () => {
-            if (!globalThis.localStorage?.hasItem(LOCATION_STORAGE_KEY)) {
-                storeLocation(await fetchJSON(REGION_URL));
-            }
-            const storedLocation = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
-            try {
-                return storedLocation && JSON.parse(storedLocation);
-            }
-            catch (ex) {
-                // Do nothing
+        const [currentLocation, fireCurrentLocation] = useLatestEvent(defaultEventBus, 'location', restoreLocation() ?? { name: defaultLocation });
+        const selectCurrentLocation = useCallback((_) => {
+            storeLocation(_);
+            fireCurrentLocation(_);
+        }, []);
+        const { data } = useAsyncData(hasStoredLocation() ? null : REGION_URL, fetchJSONUnsafe);
+        useEffect(() => {
+            if (data && !hasStoredLocation()) {
+                fireCurrentLocation(data);
             }
-            return { name: defaultLocation };
-        };
-    }
-    function storeLocation(_) {
-        _ && globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+        }, [data]);
+        return [currentLocation ?? { name: defaultLocation }, selectCurrentLocation];
     }
+    const hasStoredLocation = () => Boolean(globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY));
+    const restoreLocation = () => {
+        try {
+            const data = globalThis.localStorage?.getItem(LOCATION_STORAGE_KEY);
+            return data && JSON.parse(data);
+        }
+        catch (ex) {
+            return null;
+        }
+    };
+    const storeLocation = (_) => {
+        try {
+            globalThis.localStorage?.setItem(LOCATION_STORAGE_KEY, JSON.stringify(_));
+        }
+        catch (ex) {
+            // Do nothing
+        }
+    };
 
     var Currency;
     (function (Currency) {
@@ -5125,7 +5116,7 @@
     }
 
     const ExchangeRateTile = JSX(({ className = '', title = 'Курсы обмена валют', button, ...rest }) => {
-        const currentLocation = useLocationState();
+        const [currentLocation] = useLocation();
         const exchangeRates = useFetchExchangeRateData(currentLocation);
         const currencyRates = getCurrencyRates(exchangeRates?.exchangeRate?.currencies);
         const currencyRatesBuy = currencyRates.filter((_) => _.buyExchangeRate);
@@ -5978,7 +5969,7 @@
         designDisabledPeople: (item) => Boolean(item.designDisabledPeople),
     };
     const AtmsMap = JSX(({ descriptionData, className }) => {
-        const currentLocation = useLocationState();
+        const [currentLocation] = useLocation();
         const regionCode = currentLocation?.code ?? '000';
         const { data: officesData, isLoad } = useAtms(regionCode);
         return (jsx(OfficesAtmsMapLayout, { className: className, filterItems: filterItems, data: officesData, isLoad: isLoad, initFilterState: INITIAL_FILTRATION_STATE, renderCard: renderAtmCard, getBalloon: getAtmPoint, title: `Банкоматы филиала ${currentLocation?.name}`, descriptionData: descriptionData }));
@@ -6197,7 +6188,7 @@
     };
 
     const OfficesMap = JSX(({ className }) => {
-        const currentLocation = useLocationState();
+        const [currentLocation] = useLocation();
         const regionCode = currentLocation?.code ?? '000';
         const { data, isLoad } = useOffices(regionCode);
         return (jsx(OfficesAtmsMapLayout, { className: className, data: data?.branches, isLoad: isLoad, remoteWorkplaces: data?.remoteWorkplaces, renderCard: renderOfficeCard, renderRemoteWorkplaceCard: renderRemoteWorkplaceCard, getBalloon: getOfficePoint, getBalloonRemoteWorkplaces: getRemoteWorkplacePoint, title: `Офисы филиала ${currentLocation?.name}` }));
@@ -6445,7 +6436,7 @@
             onClose && onClose(dialogs[dialogs.length - 1]);
             pop();
         }, [dialogs, onClose]);
-        useEffect(() => defaultEventBus.observable.subscribe('dialog', (action) => {
+        useEffect(() => defaultEventBus.subscribe('dialog', (action) => {
             switch (action.type) {
                 case 'open':
                     push(action);
@@ -6554,33 +6545,27 @@
         return (jsxs("form", { className: `font-sans relative ${className}`, children: [jsx("div", { className: "absolute rounded h-full flex items-center justify-center pl-m max-w-44 gap-s pointer-events-none", children: searchTerm ? null : (jsx("label", { htmlFor: "search-bar-input", className: `text-secondary-text `, children: "\u041F\u043E\u0438\u0441\u043A \u043F\u043E \u0444\u0438\u043B\u0438\u0430\u043B\u0430\u043C" })) }), jsx("input", { id: "search-bar-input", className: style(inputValidStyle, `h-12 pl-m w-full peer text-l text-black rounded-md box-border`), value: searchTerm, onChange: (e) => onSearch(e.target.value.toLowerCase()), type: "text", name: "location-search-bar-input" })] }));
     });
 
-    const SelectedLocation = JSX(({ defaultLocation }) => {
-        const currentLocation = useLocationState(defaultLocation);
-        const link = useLink();
-        const { href } = link({ href: `/branches/${currentLocation.slug}` });
-        return currentLocation ? (jsx("div", { className: "mb-s", children: jsxs(Paragraph, { size: "text-l", color: "text-primary-text", children: ["\u0421\u0435\u0439\u0447\u0430\u0441 \u0432\u044B\u0431\u0440\u0430\u043D:", jsx(LinkWrapper, { href: href, className: "inline mx-2xs text-primary-main", children: currentLocation.name })] }) })) : null;
-    });
-
     const SEARCH_TERM_MIN_LENGTH = 3;
     const LocationDialog = JSX(({ 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 regionsGroupByLetter = useMemo(() => groupBy(regions, regionFirstLetter), [regions]);
+        const regions = cleanUpRegions(useRegions()).sort((a, b) => a.name.localeCompare(b.name));
+        const regionsGroupByLetter = groupBy(regions, regionFirstLetter);
         const { close } = useDialogManager();
         const handleChangeLocation = useCallback((region) => {
-            selectLocation(region);
+            selectCurrentLocation(region);
             close();
         }, []);
-        return (jsxs(Dialog, { className: "pb-20", head: jsxs("div", { children: [jsx(Text, { size: "text-h4", color: "text-primary-text", children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B" }), jsx(SelectedLocation, { defaultLocation: branches?.default }), jsx(SearchBar, { onSearch: setQuery, searchTerm: query })] }), children: [query && query.length >= SEARCH_TERM_MIN_LENGTH ? (jsx("div", { children: regions
+        return (jsxs(Dialog, { className: "pb-20", head: jsxs("div", { children: [jsx(Text, { size: "text-h4", color: "text-primary-text", children: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B" }), currentLocation ? (jsx("div", { className: "mb-s", children: jsxs(Paragraph, { size: "text-l", color: "text-primary-text", children: ["\u0421\u0435\u0439\u0447\u0430\u0441 \u0432\u044B\u0431\u0440\u0430\u043D:", jsx(LinkWrapper, { href: href, className: "inline mx-2xs text-primary-main", children: currentLocation.name })] }) })) : null, jsx(SearchBar, { onSearch: setQuery, searchTerm: query })] }), children: [query && query.length >= SEARCH_TERM_MIN_LENGTH ? (jsx("div", { children: regions
                         .filter(({ name }) => name && jaroWinklerDistance(name.toLowerCase())(query.toLowerCase()) >= 0.8)
                         .map(renderRegion(branches?.dataSelect, handleChangeLocation)) })) : (jsx("div", { className: "columns-1 sm:columns-3 md:columns-4 lg:columns-5", children: Array.from(regionsGroupByLetter.entries()).map(renderRegionGroup(handleChangeLocation, branches?.dataSelect)) })), renderForeignOffices(foreignOffices)] }));
     });
-    const regionFirstLetter = (region) => region.name?.charAt(0) ?? '';
+    const regionFirstLetter = (region) => region.name?.charAt(0) || '';
     const cleanUpRegions = (regions) => regions.map((region) => ({
         ...region,
-        name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
+        name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
     }));
 
     const useLocationDialog = (props) => {
@@ -6593,7 +6578,7 @@
 
     const BurgerMenuDialog = JSX(({ 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);
         const handleIframeLoad = () => {
@@ -7153,7 +7138,7 @@
         const close = useCallback(() => {
             setPopup(null);
         }, []);
-        useEffect(() => defaultEventBus.observable.subscribe('popup', (action) => {
+        useEffect(() => defaultEventBus.subscribe('popup', (action) => {
             switch (action.type) {
                 case 'open':
                 case 'update':
@@ -7208,7 +7193,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.599";
+    const packageVersion = "0.14.601";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;