@redneckz/wildless-cms-uni-blocks 0.14.688 → 0.14.690

package/bundle/bundle.umd.js

@@ -415,6 +415,17 @@
         handlerDecorator._impl = impl;
     };
 
+    function useEmitterWithActions(eventBus, type) {
+        const cache = useRef({});
+        return useMemo(() => new Proxy({}, {
+            get(_, actionType) {
+                cache.current ||= {};
+                cache.current[actionType] ||= action => eventBus.fire(type, { ...(action ?? {}), type: actionType });
+                return cache.current[actionType];
+            }
+        }), [eventBus, type]);
+    }
+
     class EventBus {
         watchers = new Set();
         subscribersMap = {};
@@ -466,11 +477,7 @@
 
     const defaultEventBus = new EventBus();
 
-    const useDialogManager = () => ({
-        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 useDialogManager = () => useEmitterWithActions(defaultEventBus.emitter, 'dialog');
 
     const adjustBase = (href, basePath = '') => href?.replace(basePath, '') || '/';
 
@@ -602,17 +609,18 @@
 
     const INITIAL_MOBILE_MODE = false;
 
+    const MOBILE_WIDTH = 1024;
+    const MOBILE_QUERY = `(max-width: ${MOBILE_WIDTH}px)`;
     const useMobileMode = () => {
-        const mq = `(max-width: 1024px)`;
-        const [isMobileMode, setIsMobileMode] = useState(INITIAL_MOBILE_MODE);
+        const [isMobileMode, setMobileMode] = useState(INITIAL_MOBILE_MODE);
         useEffect(() => {
-            const mqList = globalThis.matchMedia?.(mq);
+            const mqList = globalThis.matchMedia?.(MOBILE_QUERY);
             const mqHandler = () => {
-                setIsMobileMode(Boolean(mqList?.matches));
+                setMobileMode(Boolean(mqList?.matches));
             };
             mqList?.addEventListener('change', mqHandler);
             if (mqList?.matches) {
-                setIsMobileMode(Boolean(mqList.matches));
+                setMobileMode(true);
             }
             return () => {
                 mqList?.removeEventListener('change', mqHandler);
@@ -1201,6 +1209,18 @@
         return (jsx(BlockWrapper, { className: className, defaultPadding: "p-6xl", ...rest, children: jsxs("div", { className: "container max-w-[978px] space-y-lg", children: [title ? jsx(Heading, { headingType: "h3", title: title, className: "@xl:text-center" }) : null, children] }) }));
     });
 
+    function useDialog(Dialog, initialProps = {}) {
+        const { open, close, ...rest } = useDialogManager();
+        const openDialog = useCallback((props, options = {}) => open({
+            dialog: (jsx(Dialog, { ...initialProps, ...props, onClose: () => {
+                    close();
+                    props.onClose?.();
+                } })),
+            ...options,
+        }), [Dialog, open, close]);
+        return { open: openDialog, close, ...rest };
+    }
+
     const getConsentDataProcessing = (inputs) => inputs?.find((_) => _?.name === 'consentDataProcessing');
 
     function useBool(defaultValue = false) {
@@ -1372,11 +1392,7 @@
         return debouncedCallback;
     };
 
-    const usePopupManager = () => ({
-        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 usePopupManager = () => useEmitterWithActions(defaultEventBus.emitter, 'popup');
 
     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()))) })));
 
@@ -1426,7 +1442,8 @@
                 debouncedGetHintsList(value);
                 prevInputValue.current = value;
             }
-            popup.update(jsx(InputPopup, { options: hintsList, value: value, onChange: handleChange }), {
+            popup.open({
+                popup: jsx(InputPopup, { options: hintsList, value: value, onChange: handleChange }),
                 top: top + globalThis.scrollY + height,
                 left,
                 width,
@@ -1494,7 +1511,8 @@
             }
             const inputElement = inputRef.current;
             const { top, left, width, height } = inputElement.getBoundingClientRect();
-            popup.update(jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion }), {
+            popup.open({
+                popup: (jsx(SelectPopup, { popupRef: popupRef, options: options, value: value, query: query, onChange: handleChange, iconVersion: iconVersion })),
                 top: top + window.scrollY + height,
                 left,
                 width,
@@ -1882,8 +1900,21 @@
         }, []);
         const onChange = useCallback((value) => {
             field?.(fieldName)?.onChange?.({
-                ...field(fieldName).value,
+                apartment: '',
+                city: '',
+                district: '',
                 fullAddress: value,
+                fiasCode: '',
+                house: '',
+                locality: '',
+                okatoRegionCode: '',
+                postcode: '',
+                region: '',
+                regionCode: '',
+                street: '',
+                qc: '',
+                qcComplete: '',
+                qcHouse: '',
             });
         }, []);
         return (jsx(InputControl, { disabled: input?.filledByEsia && isEsiaAuthorize(field, fieldName), label: "\u0410\u0434\u0440\u0435\u0441", ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), value: fieldValue.fullAddress, onChange: onChange, ...input, onDaDataChange: onDaDataChange }));
@@ -2611,12 +2642,14 @@
     const ITEMS_CREDIT_AMOUNT = ['От 1 000 ₽', 'До 1 000 000 000 ₽'];
     const AmountField = JSX(({ field }) => (jsx(InputRange, { title: "\u0421\u0443\u043C\u043C\u0430, \u20BD", items: ITEMS_CREDIT_AMOUNT, min: MIN_CREDIT_AMOUNT, max: MAX_CREDIT_AMOUNT, ...field('amount') })));
 
-    const SelectField = UniBlock(({ field, source, label, fieldName, input, placeholder = 'Выберите из списка', isSearch = false, }) => {
+    const SelectField = UniBlock(({ field, source, fieldName, input, placeholder = 'Выберите из списка', 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options, ...rest }) => {
         const leadOptions = source?.map((_) => ({
             key: _.key || '',
             text: _.value,
         })) || [];
-        return (jsx(SelectControl, { placeholder: placeholder, label: label, options: leadOptions, isSearch: isSearch, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required) }));
+        return (jsx(SelectControl, { placeholder: placeholder, options: leadOptions, ...getValidation(field(fieldName), validatorObj[fieldName], input?.required), ...rest }));
     });
 
     const AmountWorkersField = JSX(({ field, input }) => {
@@ -2927,11 +2960,15 @@
     };
 
     function useLocalStorage(key) {
-        const [storedValue, setStoredValue] = useState(JSON.parse(globalThis.localStorage?.getItem(key) || 'null'));
+        const initialValue = globalThis.localStorage?.getItem(key);
+        const [storedValue, setStoredValue] = useState(initialValue ? JSON.parse(initialValue) : null);
         const setValue = useCallback((value) => {
-            globalThis.localStorage?.setItem(key, JSON.stringify(value));
-            setStoredValue(value);
-        }, [key, globalThis.localStorage]);
+            setStoredValue((oldValue) => {
+                const newValue = value instanceof Function ? value(oldValue) : value;
+                globalThis.localStorage?.setItem(key, JSON.stringify(newValue));
+                return newValue;
+            });
+        }, [key]);
         return [storedValue, setValue];
     }
 
@@ -2999,6 +3036,11 @@
         },
     };
 
+    const feedbackById = async (id, convertToPng = false) => {
+        const response = await doRequest(`/feedback/file?id=${encodeURIComponent(id)}&convertToPngFlg=${convertToPng}`, 'GET');
+        return response ? await response.blob() : new Blob();
+    };
+
     function useButton() {
         return (props) => ({
             ...props,
@@ -3031,37 +3073,28 @@
                 : '', className), type: type, role: role, onClick: onClick, children: children }));
     });
 
-    const feedbackById = async (id, convertToPng = false) => {
-        const response = await doRequest(`/feedback/file?id=${encodeURIComponent(id)}&convertToPngFlg=${convertToPng}`, 'GET');
-        return response ? await response.blob() : new Blob();
-    };
-
-    const getDocument = async (id, convertToPng = false) => {
-        const response = await feedbackById(id, convertToPng);
-        return URL.createObjectURL(response);
-    };
-
     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 Dialog = JSX(({ className, head, children, onClose, onClick }) => (jsxs("div", { className: style('relative min-h-full bg-white pt-0 p-lg', className), role: "dialog", onClick: onClick, children: [jsxs("div", { className: "sticky py-xl top-0 bg-white z-10", children: [jsx(CloseButton, { className: "absolute top-0 right-0", onClose: onClose }), jsx("div", { className: "container", children: head })] }), jsx("div", { className: "container pb-6xl", children: children })] })));
 
-    const openDocument = async ({ open, close, id, convertToPng = false }) => {
-        const document = await getDocument(id, convertToPng);
-        open(jsxs(Dialog, { className: "my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0", children: [convertToPng ? (jsx("img", { src: document })) : (jsx("iframe", { src: `${document}#toolbar=0`, className: "w-full h-[80vh]", id: "iframe-dialog" })), jsx(Button, { className: "mx-auto mt-m", type: "button", onClick: close, children: "\u041E\u0437\u043D\u0430\u043A\u043E\u043C\u0438\u0442\u044C\u0441\u044F" })] }));
+    // TODO Перенесено как есть из openDocument. Требует рефакторинга
+    const DocumentDialog = JSX(({ src, convertToPng, onClose }) => (jsxs(Dialog, { className: "my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0", onClose: onClose, children: [convertToPng ? (jsx("img", { src: src })) : (jsx("iframe", { src: `${src}#toolbar=0`, className: "w-full h-[80vh]", id: "iframe-dialog" })), jsx(Button, { className: "mx-auto mt-m", type: "button", onClick: onClose, children: "\u041E\u0437\u043D\u0430\u043A\u043E\u043C\u0438\u0442\u044C\u0441\u044F" })] })));
+
+    const useDocumentDialog = (docId) => {
+        const { open } = useDialog(DocumentDialog);
+        const isMobileMode = useMobileMode();
+        return useCallback(async () => {
+            if (docId) {
+                const src = URL.createObjectURL(await feedbackById(docId, isMobileMode));
+                open({ src });
+            }
+        }, [open, docId, isMobileMode]);
     };
 
     const OPEN_DOC_BUTTON_TEXT = 'Ознакомиться';
     const CheckboxWithDoc = JSX(({ className, error, docId, ...props }) => {
-        const { open, close } = useDialogManager();
-        const isMobile = useMobileMode();
-        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: () => openDocument({ open, close, id: docId, convertToPng: isMobile }), children: jsx(Text, { children: OPEN_DOC_BUTTON_TEXT }) })) : null] }), renderErrorText(error)] }));
+        const openDocument = useDocumentDialog(docId);
+        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: openDocument, children: jsx(Text, { children: OPEN_DOC_BUTTON_TEXT }) })) : null] }), renderErrorText(error)] }));
     });
 
     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);
@@ -3378,12 +3411,12 @@
         return (jsx(CalculatorCredit, { ...params?.calcData, defaultParams: defaultValueAdapter(field(FIELD_NAME$9).value), onChange: handleChange }));
     });
 
-    const LABEL_TEXT = `Имеет ли юридическое лицо, акционером / участником / членом / пайщиком / 
-    вкладчиком с долей участия более 20% уставного капитала руководителем, 
+    const LABEL_TEXT = `Имеет ли юридическое лицо, акционером / участником / членом / пайщиком /
+    вкладчиком с долей участия более 20% уставного капитала руководителем,
     которого Вы являетесь, кредит в АО «Россельхозбанк»`;
     const CreditInRshbCdField = JSX(({ field, input }) => {
         const { data: creditInRshbCd } = useLeadFormData('CREDIT_IN_RSHB');
-        return (jsx(SelectField, { field: field, source: creditInRshbCd, label: LABEL_TEXT, fieldName: "creditInRshbCd", input: input }));
+        return (jsx(SelectField, { field: field, source: creditInRshbCd, label: LABEL_TEXT, fieldName: "creditInRshbCd", input: input, disabled: !field?.('shareholderFlg')?.value }));
     });
 
     const RadioButtonGroupControl = JSX(({ className, label, onChange, error, ...rest }) => (jsxs("div", { className: style('shrink-0 w-full', className), children: [jsx(RadioButtonGroup, { label: getRequiredLabel({ label, errors: rest?.errors }), onChange: (_) => onChange && onChange(_), ...rest }), renderErrorText(error)] })));
@@ -3514,7 +3547,7 @@
     const LastJobExperienceField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u0421\u0442\u0430\u0436 \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0440\u0430\u0431\u043E\u0447\u0435\u043C \u043C\u0435\u0441\u0442\u0435", placeholder: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043B\u0435\u0442", type: "number", maxLength: 2, ...getValidation(field('lastJobExperience'), validatorObj.lastJobExperience, input?.required), ...input })));
 
     const LegalEntityNameField = JSX(({ field, input }) => {
-        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...input, ...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required) }));
+        return (jsx(InputControl, { label: "\u041D\u0430\u0438\u043C\u0435\u043D\u043E\u0432\u0430\u043D\u0438\u0435 \u044E\u0440\u0438\u0434\u0438\u0447\u0435\u0441\u043A\u043E\u0433\u043E \u043B\u0438\u0446\u0430", ...input, ...getValidation(field('legalEntityName'), validatorObj.legalEntityName, input?.required), disabled: !field?.('shareholderFlg')?.value }));
     });
 
     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 })));
@@ -3911,29 +3944,17 @@
 
     const renderTitle = (title) => title ? (jsx("div", { className: "@xl:text-center @xl:col-span-2 mb-m", children: jsx(Text, { size: "text-h6", children: title }) })) : null;
 
-    const ResponseTypeDialog = JSX(function ({ responseType, typeForm, }) {
+    const ResponseTypeDialog = JSX(({ responseType, typeForm, onClose }) => {
         const responseOK = responseType === 'OK';
         const statusIcon = responseOK ? 'ResponseOKIcon' : 'ResponseFailIcon';
-        const { close } = useDialogManager();
-        const handleClose = useCallback(() => {
-            close();
-        }, []);
         const responseOKDescription = typeForm === 'ANTIFRAUD'
             ? `Сообщение отправлено. Для уточнения информации с Вами могут связаться работники Банка либо Вы
   можете самостоятельно позвонить по номеру контакт-центра +78001000100. Будьте внимательны, работники Банка
    не звонят с использованием мессенджеров.`
             : 'Совсем скоро мы с вами свяжемся';
-        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto ", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md space-x-m", children: [jsx(Img, { image: { icon: statusIcon, iconVersion: 'normal' }, width: "136", height: "136" }), jsx(Headline, { className: "w-full", title: responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку', description: responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее', headlineVersion: "XS", isEmbedded: true }), jsx(Button, { type: "button", onClick: handleClose, children: "\u0425\u043E\u0440\u043E\u0448\u043E" })] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md space-x-m", children: [jsx(Img, { image: { icon: statusIcon, iconVersion: 'normal' }, width: "136", height: "136" }), jsx(Headline, { className: "w-full", title: responseOK ? 'Ваша заявка отправлена' : 'Не удалось отправить заявку', description: responseOK ? responseOKDescription : 'Пожалуйста, повторите позднее', headlineVersion: "XS", isEmbedded: true }), jsx(Button, { type: "button", onClick: onClose, children: "\u0425\u043E\u0440\u043E\u0448\u043E" })] }) }));
     });
 
-    const useResponseTypeDialog = (initialProps) => {
-        const { open, close } = useDialogManager();
-        return {
-            open: (props, options = {}) => open(jsx(ResponseTypeDialog, { ...initialProps, ...props }), options),
-            close,
-        };
-    };
-
     const objectValidator = (validatorsMap) => (o) => (o &&
         Object.entries(validatorsMap).flatMap(([key, validator]) => validator(o[key]))) ||
         [];
@@ -4024,7 +4045,7 @@
         const inputs = (sections?.flatMap((_) => _?.inputs) || []);
         const initialFormState = getInitialFormState$3(inputs, typeForm);
         const [responseType, setResponseType] = useState('');
-        const responseTypeDialog = useResponseTypeDialog({ typeForm });
+        const responseTypeDialog = useDialog(ResponseTypeDialog);
         const handleSubmit = useCallback(async (formData, ev) => {
             const inputsFiltered = getFilteredInputs(inputs, formData);
             const feedbackValidator = objectValidator(getObjectValidator(inputsFiltered));
@@ -4035,14 +4056,14 @@
             const status = (await API.send(formatData, endpoint === 'lead')) ? 'OK' : 'Fail';
             setResponseType(status);
             if (status) {
-                responseTypeDialog.open({ responseType: status });
+                responseTypeDialog.open({ typeForm, responseType: status });
             }
             if (status === 'OK' && data) {
                 const aspects = useAspects();
                 handleAspects({ aspectsAttributes: data, aspects, ev });
             }
             return status;
-        }, []);
+        }, [typeForm]);
         const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
         const fieldName = getConsentDataProcessing(inputs)?.name;
         useEffect(() => {
@@ -4238,7 +4259,7 @@
                 ? children ?? (jsx("div", { className: "ml-s", children: jsx(Text, { font: "font-medium", color: TEXT_COLOR[bgColor], size: logoTitleSizeStyle, children: logo?.title ?? 'Россельхозбанк' }) }))
                 : null] })));
 
-    const CaptchaDialog = JSX(({ phoneNumber, close, sendCode, onClose }) => {
+    const CaptchaDialog = JSX(({ phoneNumber, sendCode, onClose }) => {
         const [captcha, setCaptcha] = useState('');
         const [code, setCode] = useState('');
         const [hasError, setHasError] = useState(false);
@@ -4246,28 +4267,19 @@
             const isValidCode = await checkCaptcha({ captchaText: code });
             if (isValidCode) {
                 sendCode?.();
-                close?.();
+                onClose?.();
             }
             else {
                 setHasError(isValidCode);
             }
-        }, [code]);
+        }, [code, sendCode]);
         const handleCreateCaptcha = useCallback(() => {
             (async () => setCaptcha(URL.createObjectURL(await createCaptcha(phoneNumber))))();
         }, []);
         useEffect(handleCreateCaptcha, []);
-        return (jsx(Dialog, { head: jsx(Logo, {}), onClose: onClose, className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex h-36 w-72", children: [jsx("img", { className: "grow", src: captcha }), jsx("div", { onClick: handleCreateCaptcha, className: "flex w-8 items-center justify-center cursor-pointer", children: jsx(Icon, { iconVersion: "normal", name: "RefreshIcon" }) })] }), jsx(Input, { className: "w-[300px]", onChange: setCode, value: code, placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434 \u0441 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438" }), hasError ? jsx("div", { className: "text-error", children: "\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043A\u043E\u0434" }) : null, jsxs("div", { className: "flex w-[310px] justify-between", children: [jsx(Button, { onClick: close, version: "secondary", children: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F" }), jsx(Button, { type: "submit", disabled: !code, onClick: handleCheckCaptcha, version: "secondary", children: "\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C" })] })] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", head: jsx(Logo, {}), onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex h-36 w-72", children: [jsx("img", { className: "grow", src: captcha }), jsx("div", { onClick: handleCreateCaptcha, className: "flex w-8 items-center justify-center cursor-pointer", children: jsx(Icon, { iconVersion: "normal", name: "RefreshIcon" }) })] }), jsx(Input, { className: "w-[300px]", onChange: setCode, value: code, placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043A\u043E\u0434 \u0441 \u043A\u0430\u0440\u0442\u0438\u043D\u043A\u0438" }), hasError ? jsx("div", { className: "text-error", children: "\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u043A\u043E\u0434" }) : null, jsxs("div", { className: "flex w-[310px] justify-between", children: [jsx(Button, { onClick: close, version: "secondary", children: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F" }), jsx(Button, { type: "submit", disabled: !code, onClick: handleCheckCaptcha, version: "secondary", children: "\u041E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C" })] })] }) }));
     });
 
-    const useCaptchaDialog = (initialProps, onClose) => {
-        const { open, close, closeAll } = useDialogManager();
-        return {
-            open: () => open(jsx(CaptchaDialog, { close: close, onClose: onClose, ...initialProps })),
-            close,
-            closeAll,
-        };
-    };
-
     const Timer = JSX(({ time, setTime, className }) => {
         useEffect(() => {
             const timer = setInterval(() => {
@@ -4340,94 +4352,77 @@
         }
     };
 
-    const useVerifyPhoneDialogSubmit = ({ close, values }) => {
-        const [hasError, setHasError] = useState(false);
+    const useVerifyPhoneDialogSubmit = ({ values, onSuccess, }) => {
         const [errorText, setErrorText] = useState('');
         const [isLoading, setIsLoading] = useState(false);
         const [timeNextReq, setTimeNextReq] = useState(0);
         const [isTimerStarted, setIsTimerStarted] = useState(false);
-        const [attemps, setAttemps] = useState(0);
-        const resetError = useCallback(() => {
-            setHasError(false);
-            setErrorText('');
-        }, []);
-        const isTimeExpired = useMemo(() => timeNextReq === 0 && isTimerStarted, [timeNextReq, isTimerStarted]);
-        const isSubmitButtonDisabled = useMemo(() => attemps > 2 || !values.every(Boolean) || isTimeExpired, [values]);
+        const [attempts, setAttempts] = useState(0);
+        const resetError = useCallback(() => setErrorText(''), []);
+        const isTimeExpired = Boolean(timeNextReq === 0 && isTimerStarted);
+        const isSubmitButtonDisabled = attempts > 2 || isTimeExpired || !values.every(Boolean);
         const handleSubmit = useCallback(async () => {
             try {
                 setIsTimerStarted(false);
                 setTimeNextReq(0);
-                setAttemps(attemps + 1);
+                setAttempts((_) => _ + 1);
                 setIsLoading(true);
                 await checkCode({
                     smsText: values.join(''),
                     smsCodesSetName: { key: 'AUTHENTICATION' },
                 });
                 resetError();
-                close && close(values.join(''));
+                onSuccess?.(values.join(''));
             }
             catch {
+                setErrorText(attempts > 1 ? 'Исчерпан лимит ввода смс-кода' : 'Неверный код');
+            }
+            finally {
                 setIsLoading(false);
-                attemps > 1 ? setErrorText('Исчерпан лимит ввода смс-кода') : setErrorText('Неверный код');
-                setHasError(true);
             }
-        }, [values, attemps]);
+        }, [values, attempts]);
         useEffect(() => {
-            if (isTimeExpired) {
-                setHasError(true);
-                setErrorText('Код просрочен');
-            }
-            else {
-                setHasError(false);
-            }
+            setErrorText(isTimeExpired ? 'Код просрочен' : '');
         }, [isTimeExpired]);
         return {
             handleSubmit,
-            hasError,
+            hasError: Boolean(errorText),
             errorText,
             isLoading,
             timeNextReq,
             isSubmitButtonDisabled,
             setTimeNextReq,
             setIsTimerStarted,
-            setAttemps,
+            setAttempts,
         };
     };
 
-    const VerifyPhoneDialog = JSX(({ close = noop, onClose = noop, title, description, __html, code = true, codeLength = 4, textButton = 'Далее', phoneNumber = '+79999999999', }) => {
+    const VerifyPhoneDialog = JSX(({ title, description, __html, code = true, codeLength = 4, textButton = 'Далее', phoneNumber = '+79999999999', onSuccess = noop, onClose = noop, }) => {
         const [values, setValues] = useState(Array(codeLength).fill(''));
-        const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttemps, } = useVerifyPhoneDialogSubmit({ values, close });
+        const { handleSubmit, hasError, errorText, isLoading, timeNextReq, isSubmitButtonDisabled, setTimeNextReq, setIsTimerStarted, setAttempts, } = useVerifyPhoneDialogSubmit({ values, onSuccess });
+        const captchaDialog = useDialog(CaptchaDialog);
         const handleSendCode = useCallback(async () => {
             const isSuccessSendCode = await sendCode({
-                phoneNumber: phoneNumber,
+                phoneNumber,
                 smsCodesSetName: { key: 'AUTHENTICATION' },
             });
             if (isSuccessSendCode) {
-                setAttemps(0);
+                setAttempts(0);
                 setTimeNextReq(180);
                 setIsTimerStarted(true);
             }
             else {
-                captchaDialog.open();
+                captchaDialog.open({ phoneNumber, sendCode: handleSendCode, onClose });
             }
-        }, []);
-        const captchaDialog = useCaptchaDialog({ phoneNumber, sendCode: handleSendCode }, onClose);
+        }, [phoneNumber, onClose]);
         useEffect(() => {
             handleSendCode();
         }, []);
-        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$1(timeNextReq, setTimeNextReq, handleSendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-xl px-5xl py-0", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center rounded-md", children: [jsx(Headline, { className: "w-full", title: title, description: description, headlineVersion: "XS", isEmbedded: true, as: "h6" }), code ? (jsx(InputCode, { values: values, setValues: setValues, errorText: errorText, hasError: hasError })) : null, renderText$1(timeNextReq, setTimeNextReq, handleSendCode), jsx(RichText, { itemSize: "list-s", __html: __html }), renderTextButton(textButton, isSubmitButtonDisabled, handleSubmit), isLoading ? jsx(Loader, { blur: false }) : null] }) }));
     });
     const renderTextButton = (textButton, isDisabled, handleSubmit) => textButton ? (jsx(SubmitButton, { isDisabled: isDisabled, onClick: handleSubmit, text: textButton })) : null;
     const renderText$1 = (timeNextReq, setTimeNextReq, handleSendCode) => timeNextReq ? (jsxs("div", { className: "flex flex-row text-l font-light text-base", children: ["\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434 \u043C\u043E\u0436\u043D\u043E \u0447\u0435\u0440\u0435\u0437", jsx(Timer, { className: "text-base ml-1", time: timeNextReq, setTime: setTimeNextReq })] })) : (jsx(LinkButton, { onClick: handleSendCode, className: "text-primary-main", children: "\u041F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043A\u043E\u0434" }));
 
-    const useVerifyPhoneDialog = () => {
-        const { open, close } = useDialogManager();
-        return {
-            open: (handleClose, props) => open(jsx(VerifyPhoneDialog, { onClose: close, close: handleClose, ...props })),
-            close,
-        };
-    };
-
     const defaultConsentText = {
         title: 'Подпишите согласие на запрос в БКИ',
         description: 'Согласие на запрос в Бюро кредитных историй (БКИ) ускорит решение по кредиту',
@@ -4436,33 +4431,31 @@
         title: 'Вы уверены, что хотите отказаться от запроса в БКИ',
         description: 'Согласие на запрос в Бюро кредитных историй (БКИ) повысит вероятность одобрения',
     };
-    const ConsentBkiDialog = JSX(function ({ handleSubmit = noop, onClose = noop, }) {
+    const ITEMS$1 = [
+        { id: 'SIGNED', text: 'Подписать' },
+        { id: 'REFUSE', text: 'Отказаться' },
+    ];
+    const CONSENT_BKI_ID = 2;
+    const ConsentBkiDialog = JSX(({ onSubmit = noop, onClose = noop }) => {
         const [confirmStatus, setConfirmStatus] = useState('');
-        const [showRefuceContent, setShowRefuceContent] = useState(false);
-        const { open, close } = useDialogManager();
-        const isMobile = useMobileMode();
-        const handleClose = useCallback(() => {
-            close();
-            handleSubmit(confirmStatus);
-        }, [confirmStatus]);
+        const [showRefuseContent, setShowRefuseContent] = useState(false);
+        const openDocument = useDocumentDialog(CONSENT_BKI_ID);
+        const handleSubmit = useCallback(() => {
+            onSubmit(confirmStatus);
+        }, [onSubmit, confirmStatus]);
         const handleConfirmChange = useCallback((value) => {
             setConfirmStatus(value);
             if (value === 'REFUSE') {
-                setShowRefuceContent(true);
+                setShowRefuseContent(true);
             }
         }, []);
-        const consentText = showRefuceContent ? refuseConsentText : defaultConsentText;
-        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center", children: [jsx("div", { role: "button", onClick: () => openDocument({ open, close, id: CONSENT_BKI_ID, convertToPng: isMobile }), children: jsx(Heading, { className: "text-center text-balance", headingType: "h2", title: consentText.title }) }), jsx(Paragraph, { align: "text-center", children: consentText.description }), jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: ITEMS$1, value: confirmStatus, onChange: handleConfirmChange }), jsx(Button, { disabled: !confirmStatus, type: "button", onClick: handleClose, children: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C" })] }) }));
+        const consentText = showRefuseContent ? refuseConsentText : defaultConsentText;
+        return (jsx(Dialog, { className: "my-6xl max-w-3xl w-full min-h-fit mx-auto rounded-lg py-0 px-5xl", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center", children: [jsx("div", { role: "button", onClick: openDocument, children: jsx(Heading, { className: "text-center text-balance", headingType: "h2", title: consentText.title }) }), jsx(Paragraph, { align: "text-center", children: consentText.description }), jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: ITEMS$1, value: confirmStatus, onChange: handleConfirmChange }), jsx(Button, { disabled: !confirmStatus, type: "button", onClick: handleSubmit, children: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C" })] }) }));
     });
-    const ITEMS$1 = [
-        { id: 'SIGNED', text: 'Подписать' },
-        { id: 'REFUSE', text: 'Отказаться' },
-    ];
-    const CONSENT_BKI_ID = 2;
 
     const useConsentBkiDialog = (onClose) => {
-        const { open, close } = useDialogManager();
-        const verifyPhoneDialog = useVerifyPhoneDialog();
+        const { open } = useDialog(ConsentBkiDialog);
+        const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const handleSuccessVerify = (profileId) => async (smsCode) => {
             try {
                 if (profileId) {
@@ -4481,16 +4474,18 @@
             }
         };
         const handleSubmitBkiConstent = (phone, profileId) => async (confirmStatus) => {
-            close();
             if (confirmStatus === 'SIGNED' && phone) {
-                verifyPhoneDialog.open(handleSuccessVerify(profileId), verifyPhoneContent$1(phone));
+                verifyPhoneDialog.open({
+                    ...verifyPhoneContent$1(phone),
+                    onSuccess: handleSuccessVerify(profileId),
+                });
             }
             else {
                 onClose();
             }
         };
         return {
-            open: (phone, profileId) => open(jsx(ConsentBkiDialog, { handleSubmit: handleSubmitBkiConstent(phone, profileId), onClose: onClose })),
+            open: (phone, profileId) => open({ onSubmit: handleSubmitBkiConstent(phone, profileId), onClose }),
         };
     };
     const verifyPhoneContent$1 = (phone) => ({
@@ -4504,30 +4499,25 @@
 
     const getLink = (body) => fetchRetailJSON('/esia/getLink', 'POST', body);
 
-    const EsiaLoginDialog = JSX(function ({ handleClose }) {
+    const EsiaLoginDialog = JSX(({ onClose }) => {
         const navigator = locationNavigator();
         const handleAuth = useCallback(async () => {
             const resp = await getLink({
                 redirectUri: navigator.href,
             });
-            if (resp) {
+            if (resp?.link) {
                 navigator.assign(resp.link);
             }
         }, []);
-        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", onClose: handleClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex items-center justify-around w-full", children: [jsxs("ul", { className: "list-disc", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "70" })] }), jsxs("div", { className: "flex items-center justify-between w-full m-0", children: [jsx(Button, { type: "button", onClick: handleAuth, children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsx(Button, { type: "button", version: "secondary", onClick: handleClose, children: "\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C" })] })] }) }));
+        return (jsx(Dialog, { className: "my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg", onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-lg items-center rounded-md", children: [jsxs("div", { className: "flex items-center justify-around w-full", children: [jsxs("ul", { className: "list-disc", children: [jsx("li", { children: "\u0412\u0435\u0440\u043E\u044F\u0442\u043D\u043E\u0441\u0442\u044C \u043E\u0434\u043E\u0431\u0440\u0435\u043D\u0438\u044F \u0432\u044B\u0448\u0435" }), jsx("li", { children: "\u0411\u0435\u0437 \u0441\u043F\u0440\u0430\u0432\u043E\u043A \u043E \u0434\u043E\u0445\u043E\u0434\u0430\u0445 \u0438 \u0442\u0440\u0443\u0434\u043E\u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u0435" }), jsx("li", { children: "\u0421 \u0437\u0430\u0449\u0438\u0442\u043E\u0439 \u0412\u0430\u0448\u0438\u0445 \u0434\u0430\u043D\u043D\u044B\u0445" })] }), jsx(Img, { image: { icon: 'GosUslugiIcon', iconVersion: 'normal' }, height: "70" })] }), jsxs("div", { className: "flex items-center justify-between w-full m-0", children: [jsx(Button, { type: "button", onClick: handleAuth, children: "\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u0447\u0435\u0440\u0435\u0437 \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438" }), jsx(Button, { type: "button", version: "secondary", onClick: onClose, children: "\u041F\u0440\u043E\u043F\u0443\u0441\u0442\u0438\u0442\u044C" })] })] }) }));
     });
 
     const useEsiaLoginDialog = (nextStepLink) => {
-        const { open, close } = useDialogManager();
+        const { open } = useDialog(EsiaLoginDialog);
         const navigator = locationNavigator();
-        const handleClose = useCallback(() => {
-            close();
-            navigator.assign(nextStepLink);
-        }, []);
-        return {
-            open: (options = {}) => open(jsx(EsiaLoginDialog, { handleClose: handleClose }), options),
-            close,
-        };
+        return useCallback(() => {
+            open({ onClose: () => navigator.assign(nextStepLink) });
+        }, [open, nextStepLink]);
     };
 
     const fieldsNamesToContactKeysMap = {
@@ -4635,9 +4625,9 @@
         const [, setProfileId] = useLocalStorage('profileId');
         const [, setParticipantId] = useLocalStorage('participantId');
         const [, setProgramId] = useLocalStorage('programId');
-        const esiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-        const consentBkiDialog = useConsentBkiDialog(esiaLoginDialog.open);
-        const verifyPhoneDialog = useVerifyPhoneDialog();
+        const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
+        const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+        const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const saveUserData = useCallback(({ participantId, taskId, profileId, programId: programNumber }) => {
             setParticipantId(participantId);
             setTaskId(taskId);
@@ -4648,7 +4638,7 @@
         const handleSubmit = useCallback(async (formData) => {
             const feedbackValidator = objectValidator(getObjectValidator(inputs));
             if (!isValidationSuccess(feedbackValidator(formData))) {
-                return console.warn('validation fail');
+                return;
             }
             try {
                 const profileId = await createUserProfile({
@@ -4674,7 +4664,10 @@
                     const acceptedConsents = Object.keys(CONSENTS)
                         .filter((_) => formData[_])
                         .map((_) => CONSENTS[_]?.text);
-                    verifyPhoneDialog.open(handleSuccessVerify, verifyPhoneContent(formData?.phone, acceptedConsents));
+                    verifyPhoneDialog.open({
+                        ...verifyPhoneContent(formData?.phone, acceptedConsents),
+                        onSuccess: handleSuccessVerify,
+                    });
                 }
             }
             catch {
@@ -4778,32 +4771,36 @@
 
     const useInitApplicationLead = (nextStepLink) => {
         const navigator = locationNavigator();
-        const [isLoading, setIsLoading] = useState(false);
-        const [profileId] = useLocalStorage('profileId');
-        const [leadForm, setLeadForm] = useLocalStorage('leadForm');
-        const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
-        const code = params.get('code');
-        const state = params.get('state');
-        const updateEsiaProfile = useCallback(async () => {
-            if (profileId && code && state) {
+        const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+        const [, setLeadForm] = useLocalStorage('leadForm');
+        const updateEsiaProfile = useCallback(async (profileId, code, state) => {
+            startLoading();
+            try {
                 const data = await updateProfileEsia({
-                    profileId: profileId,
+                    profileId,
                     code,
                     state,
-                    redirectUri: navigator.href,
+                    redirectUri: globalThis.location?.href,
                 });
-                data &&
-                    setLeadForm({
-                        ...leadForm,
+                if (data) {
+                    setLeadForm((_) => ({
+                        ..._,
                         ...parseEsiaProfile(data),
-                    });
+                    }));
+                }
                 navigator.assign(nextStepLink);
             }
-        }, []);
+            finally {
+                endLoading();
+            }
+        }, [nextStepLink]);
         useEffect(() => {
-            if (code) {
-                setIsLoading(true);
-                updateEsiaProfile();
+            const profileId = JSON.parse(globalThis.localStorage?.getItem('profileId') ?? 'null');
+            const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
+            const code = params.get('code');
+            const state = params.get('state');
+            if (profileId && code && state) {
+                updateEsiaProfile(profileId, code, state);
             }
             else {
                 sessionStorage.removeItem('accessToken');
@@ -4817,7 +4814,6 @@
 
     const ApplicationLeadForm = JSX(({ className, title, programId = '', nextStepLink = '/credit-lead', button, ...rest }) => {
         const inputs = (applicationFormData?.flatMap((_) => _?.inputs) || []);
-        const [responseType, setResponseType] = useState('');
         const { isLoading } = useInitApplicationLead(nextStepLink);
         const [leadForm, setLeadForm] = useLocalStorage('leadForm');
         const initialFormState = getInitialFormState$2(inputs, leadForm);
@@ -4827,17 +4823,13 @@
             nextStepLink,
             saveForm: setLeadForm,
         });
-        if (responseStatus) {
-            const responseTypeDialog = useResponseTypeDialog({ responseType: responseStatus });
-            responseTypeDialog.open();
-        }
-        const [, { field, onSubmit, reset }] = useForm(initialFormState, { onSubmit: handleSubmit });
+        const [, { field, onSubmit }] = useForm(initialFormState, { onSubmit: handleSubmit });
+        const responseTypeDialog = useDialog(ResponseTypeDialog);
         useEffect(() => {
-            if (responseType === 'OK') {
-                setResponseType('');
-                reset();
+            if (responseStatus) {
+                responseTypeDialog.open({ responseType: responseStatus });
             }
-        }, [responseType]);
+        }, [responseStatus]);
         return (jsx(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: jsxs("form", { onSubmit: onSubmit, className: "space-y-m relative", children: [isLoading ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$2({ field, inputs: _?.inputs })] }, `section-${i}`))), renderSubmitButton(button)] }) }));
     });
 
@@ -6502,7 +6494,6 @@
     });
     const checkIsRetiree$1 = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
     const checkBusinessOwner$1 = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
-    const checkConsentPfrFlg$1 = ({ name }, getValue) => name === 'snils' && !getValue('consentPfrFlg');
     const checkAddressFillFromESIA$1 = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
     const checkAddressFact$1 = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
     const checkCondition$1 = ({ condition }, getValue) => condition?.name &&
@@ -6510,6 +6501,8 @@
             const dataValue = getValue(condition?.name);
             return _ !== (dataValue?.key ?? dataValue);
         });
+    const checkConsentPfrFlg$1 = ({ name }, getValue) => name === 'snils' && isSnilsRequired$1(getValue);
+    const isSnilsRequired$1 = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
 
     const renderInfo$2 = (inputs = []) => {
         const infoInputs = inputs.filter((_) => _.fieldType === 'info');
@@ -6529,10 +6522,20 @@
 
     const StepsNavigationButtons$1 = JSX(({ step, onPrevStep }) => {
         const isFirstStep = step === 0;
-        const isFinalStep = step === 6;
+        const isFinalStep = step === 5;
         return (jsxs("div", { className: "flex justify-between gap-m", children: [jsx(Button, { onClick: onPrevStep, type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(Button, { type: "submit", children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
 
+    const getCardData = (formData) => {
+        const { currency, paymentSystem, cardCategory, codeWord } = formData;
+        return {
+            currencyCode: currency,
+            paymentSystemTypeCd: paymentSystem,
+            classCard: cardCategory,
+            codeWord: codeWord,
+        };
+    };
+
     const getFifthStepData$1 = (formData) => {
         const { bankruptcyFlg, shareholderFlg, legalEntityName, creditInRshbCd } = formData;
         return {
@@ -6543,16 +6546,6 @@
         };
     };
 
-    const getFirstStepData$1 = (formData) => {
-        const { currency, paymentSystem, cardCategory, codeWord } = formData;
-        return {
-            currencyCode: currency,
-            paymentSystemTypeCd: paymentSystem,
-            classCard: cardCategory,
-            codeWord: codeWord,
-        };
-    };
-
     const getFourthStepData$1 = (formData) => {
         const { familyStatus, dependents, familyMembers, children, wages, mandatoryPayments, incomeAverage, additionalIncome, otherIncome, otherPayments, rentalIncome, retirementIncome, snils, armyIdFlg, conscription, } = formData;
         return {
@@ -6681,6 +6674,7 @@
                         ...getCurrentStepData$1(step, formData),
                     },
                 ],
+                ...getCardData(formData),
                 ...getDeliveryData(formData),
             },
         };
@@ -6688,7 +6682,7 @@
     const getCurrentStepData$1 = (step, formData) => {
         switch (step) {
             case 0:
-                return getFirstStepData$1(formData);
+                return {};
             case 1:
                 return getSecondStepData$1(formData);
             case 2:
@@ -6790,8 +6784,8 @@
                     { fieldType: 'common', name: 'middleName', dadata: true, filledByEsia: true },
                     { fieldType: 'common', name: 'sex', required: true },
                     { fieldType: 'common', name: 'limitedBirthday', required: true, filledByEsia: true },
-                    { fieldType: 'common', name: 'birthPlace', required: true },
-                    { fieldType: 'common', name: 'phone', required: true },
+                    { fieldType: 'common', name: 'birthPlace', required: true, filledByEsia: true },
+                    { fieldType: 'common', name: 'phone', required: true, filledByEsia: true },
                     { fieldType: 'common', name: 'email', required: true, dadata: true },
                 ],
             },
@@ -6875,7 +6869,7 @@
             },
             {
                 inputs: [
-                    { fieldType: 'common', name: 'employment' },
+                    { fieldType: 'common', name: 'employment', required: true },
                     { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
                 ],
             },
@@ -6888,15 +6882,15 @@
             },
             {
                 inputs: [
-                    { fieldType: 'common', name: 'organization', required: false },
-                    { fieldType: 'common', name: 'amountWorkers', required: false },
+                    { fieldType: 'common', name: 'organization', required: true },
+                    { fieldType: 'common', name: 'amountWorkers', required: true },
                 ],
             },
             {
                 columns: 2,
                 inputs: [
-                    { fieldType: 'common', name: 'employerActivities', required: false },
-                    { fieldType: 'common', name: 'employerOrganization', required: false },
+                    { fieldType: 'common', name: 'employerActivities', required: true },
+                    { fieldType: 'common', name: 'employerOrganization', required: true },
                     { fieldType: 'common', name: 'generalSeniority', required: true },
                     { fieldType: 'common', name: 'lastJobExperience', required: true },
                     { fieldType: 'common', name: 'experience5Years', required: true },
@@ -6917,7 +6911,7 @@
             {
                 columns: 2,
                 inputs: [
-                    { fieldType: 'common', name: 'positionOrganization', required: false },
+                    { fieldType: 'common', name: 'positionOrganization', required: true },
                     {
                         fieldType: 'common',
                         name: 'partInBusiness',
@@ -6964,6 +6958,10 @@
                     },
                 ],
             },
+            {
+                columns: 1,
+                inputs: [{ fieldType: 'common', name: 'confirmationIncome', required: true }],
+            },
             {
                 columns: 1,
                 inputs: [{ fieldType: 'common', name: 'wages', required: true }],
@@ -7001,7 +6999,12 @@
                 inputs: [{ fieldType: 'common', name: 'shareholderFlg' }],
             },
             {
-                inputs: [{ fieldType: 'common', name: 'legalEntityName' }],
+                inputs: [
+                    {
+                        fieldType: 'common',
+                        name: 'legalEntityName',
+                    },
+                ],
             },
             {
                 inputs: [{ fieldType: 'common', name: 'creditInRshbCd' }],
@@ -7374,7 +7377,6 @@
     });
     const checkIsRetiree = (step, getValue) => step === 2 && getValue('employment')?.key === 'RETIREE';
     const checkBusinessOwner = ({ name }, getValue) => name === 'partInBusiness' && getValue('positionOrganization')?.key !== 'BUSINESS_OWNER';
-    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
     const checkAddressFillFromESIA = ({ name, filledByEsia }, getValue) => name?.startsWith('address') && getValue('esiaAccountTypeCd')?.key && filledByEsia;
     const checkAddressFact = ({ name }, getValue) => name === 'addressFact' && getValue('addressMatch');
     const checkCondition = ({ condition }, getValue) => condition?.name &&
@@ -7382,6 +7384,7 @@
             const dataValue = getValue(condition?.name);
             return _ !== (dataValue?.key ?? dataValue);
         });
+    const checkConsentPfrFlg = ({ name }, getValue) => name === 'snils' && isSnilsRequired(getValue);
     const isSnilsRequired = (getValue) => getValue('confirmationIncome')?.key !== 'PFR_CERTIFICATE';
 
     const renderInfo$1 = (inputs = []) => {
@@ -7737,7 +7740,7 @@
             },
             {
                 inputs: [
-                    { fieldType: 'common', name: 'employment' },
+                    { fieldType: 'common', name: 'employment', required: true },
                     { fieldType: 'common', name: 'organizationName', required: true, dadata: true },
                 ],
             },
@@ -7750,15 +7753,15 @@
             },
             {
                 inputs: [
-                    { fieldType: 'common', name: 'organization', required: false },
-                    { fieldType: 'common', name: 'amountWorkers', required: false },
+                    { fieldType: 'common', name: 'organization', required: true },
+                    { fieldType: 'common', name: 'amountWorkers', required: true },
                 ],
             },
             {
                 columns: 2,
                 inputs: [
-                    { fieldType: 'common', name: 'employerActivities', required: false },
-                    { fieldType: 'common', name: 'employerOrganization', required: false },
+                    { fieldType: 'common', name: 'employerActivities', required: true },
+                    { fieldType: 'common', name: 'employerOrganization', required: true },
                     { fieldType: 'common', name: 'generalSeniority', required: true },
                     { fieldType: 'common', name: 'lastJobExperience', required: true },
                     { fieldType: 'common', name: 'experience5Years', required: true },
@@ -7779,7 +7782,7 @@
             {
                 columns: 2,
                 inputs: [
-                    { fieldType: 'common', name: 'positionOrganization', required: false },
+                    { fieldType: 'common', name: 'positionOrganization', required: true },
                     {
                         fieldType: 'common',
                         name: 'partInBusiness',
@@ -8648,14 +8651,14 @@
     };
     const fetchSearchIndex = async (...basePathList) => (await Promise.allSettled(basePathList.map((basePath) => fetchJSON(joinPath(basePath, '/', SEARCH_INDEX_FILENAME))))).map((_) => (_.status === 'fulfilled' ? _.value : {}));
 
-    const SearchDialog = JSX(({ initialQuery, navigationItems }) => {
+    const SearchDialog = JSX(({ initialQuery, navigationItems, onClose }) => {
         const basePathList = useMemo(() => navigationItems?.map((_) => _.href || '/'), [navigationItems]);
         const [searchResult, searchInputProps] = useSearch({
             basePathList,
             initialQuery,
         });
         const searchItems = useMemo(() => combineTopItemsAndSearchResult(navigationItems)(searchResult), [navigationItems, searchResult]);
-        return (jsx(Dialog, { head: jsx(SearchInput, { autoFocus: true, ...searchInputProps }), children: jsx(Sitemap, { navigationItems: searchItems }) }));
+        return (jsx(Dialog, { head: jsx(SearchInput, { autoFocus: true, ...searchInputProps }), onClose: onClose, children: jsx(Sitemap, { navigationItems: searchItems }) }));
     });
     const combineTopItemsAndSearchResult = (topItems) => (searchResult) => topItems?.length && searchResult?.length
         ? zip(topItems, searchResult).map(([_, portalSearchResult]) => ({
@@ -8664,23 +8667,15 @@
         }))
         : [];
 
-    const useSearchDialog = (initialProps = {}) => {
-        const { open, close } = useDialogManager();
-        return {
-            open: (props = {}, options = {}) => open(jsx(SearchDialog, { ...initialProps, ...props }), options),
-            close,
-        };
-    };
-
     const MIN_QUERY_LEN = 3;
     const SearchBar$1 = JSX(({ className, search, ...rest }) => {
         const [value, setValue] = useState('');
         const resetQueryOnDialogClose = useCallback(() => setValue(''), []);
-        const searchDialog = useSearchDialog(rest);
+        const searchDialog = useDialog(SearchDialog, rest);
         const handleInitialInputChange = useCallback((_) => {
             setValue(_);
             if (isQueryLongEnough(_)) {
-                searchDialog.open({ initialQuery: _ }, { onClose: resetQueryOnDialogClose });
+                searchDialog.open({ initialQuery: _, onClose: resetQueryOnDialogClose });
             }
         }, [resetQueryOnDialogClose, searchDialog]);
         return (jsxs("div", { className: style('relative', className), role: "search", children: [jsx(SearchInput, { value: value, placeholder: search?.placeholder, onChange: handleInitialInputChange }), jsx(CloseButton, { className: "absolute top-0 right-0 sm:hidden", onClose: resetQueryOnDialogClose })] }));
@@ -8928,18 +8923,17 @@
     });
 
     const SEARCH_TERM_MIN_LENGTH = 3;
-    const LocationDialog = JSX(({ foreignOffices, branches }) => {
+    const LocationDialog = JSX(({ foreignOffices, branches, onClose }) => {
         const locationStore = useDefaultLocation(branches?.default);
         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 { close } = useDialogManager();
         const handleChangeLocation = useCallback((_) => {
             locationStore.location = _;
-            close();
-        }, [locationStore]);
-        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
+            onClose?.();
+        }, [locationStore, onClose]);
+        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 })] }), onClose: onClose, 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)] }));
     });
@@ -8949,14 +8943,6 @@
         name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
     }));
 
-    const useLocationDialog = (props) => {
-        const { open, close } = useDialogManager();
-        return {
-            open: (options = {}) => open(jsx(LocationDialog, { ...props }), options),
-            close,
-        };
-    };
-
     const TopItem = JSX(({ className = '', active, flat, children, data, ...rest }) => {
         const link = useLink();
         const { href, target, text, onClick } = link(rest);
@@ -8975,10 +8961,10 @@
     const HeaderSecondaryMenu = JSX(({ className, version, ...rest }) => {
         const iconVersion = version === 'transparent' ? 'white' : 'black';
         const currentLocation = useLocation(rest?.branches?.default);
-        const searchDialog = useSearchDialog(rest);
-        const locationDialog = useLocationDialog(rest);
-        const openSearchDialog = useCallback(() => searchDialog.open(), [searchDialog]);
-        const openLocationDialog = useCallback(() => locationDialog.open(), [locationDialog]);
+        const searchDialog = useDialog(SearchDialog, rest);
+        const locationDialog = useDialog(LocationDialog, rest);
+        const openSearchDialog = useCallback(() => searchDialog.open({}), [searchDialog]);
+        const openLocationDialog = useCallback(() => locationDialog.open({}), [locationDialog]);
         return (jsxs("div", { className: style('flex items-center ml-5 md:max-w-[300px] xl:max-w-full gap-lg', className), role: "navigation", children: [rest?.branches?.visible ? (jsx(TopItem, { className: "whitespace-nowrap text-ellipsis overflow-hidden", flat: true, href: "#", text: currentLocation?.name, data: getAspectsWithInclude(rest?.branches?.dataClick, currentLocation?.name ?? ''), onClick: openLocationDialog })) : null, rest?.officesAtms?.href ? (jsx(TopItem, { className: "whitespace-nowrap", flat: true, ...rest.officesAtms })) : null, jsx(HeaderSecondaryMenuButton, { image: { icon: 'LoupeIcon', iconVersion }, ariaLabel: rest?.search?.ariaLabel ?? 'Поиск', onClick: openSearchDialog, data: rest?.search?.data })] }));
     });
 
@@ -9241,31 +9227,16 @@
         return docFormat.includes('/') ? docFormat.replace(regexp, '') : docFormat;
     };
 
-    const ReportDialog = JSX(({ href, __html, target }) => {
-        const { close } = useDialogManager();
+    const ReportDialog = JSX(({ href, __html, target, onClose }) => {
         const router = useRouter();
         const adjustedHref = adjustHref(router)(href);
-        const handleClose = useCallback(() => {
-            close();
-        }, []);
-        return (jsxs(Dialog, { className: "my-6xl min-h-fit w-fit mx-auto", children: [__html ? jsx(RichText, { __html: __html }) : null, jsxs("div", { className: "flex flex-row mx-auto w-fit gap-lg py-lg", children: [jsx(LinkButton, { text: "\u042F \u0441\u043E\u0433\u043B\u0430\u0441\u0435\u043D", version: "primary", target: target, href: adjustedHref, onClick: handleClose }), jsx(Button, { type: "button", version: "secondary", onClick: handleClose, children: "\u042F \u043D\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u0435\u043D" })] }), jsx("div", { children: "\u041D\u0430\u0436\u0438\u043C\u0430\u044F \u043A\u043D\u043E\u043F\u043A\u0443 \u00AB\u042F \u0421\u041E\u0413\u041B\u0410\u0421\u0415\u041D\u00BB \u043D\u0438\u0436\u0435 \u0412\u044B \u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0435\u0442\u0435 \u0434\u0430\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F. \u0420\u0430\u0441\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u0438\u043B\u0438 \u0440\u0430\u0441\u043A\u0440\u044B\u0442\u0438\u0435 \u043B\u044E\u0431\u043E\u0439 \u0447\u0430\u0441\u0442\u0438 \u0434\u0430\u043D\u043D\u043E\u0433\u043E \u0417\u0430\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0438\u043B\u0438 \u043B\u044E\u0431\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438, \u0438\u043B\u0438 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0430\u0446\u0438\u0438 \u0432 \u043D\u0435\u043C \u0437\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u043E.\u00BB" })] }));
+        return (jsxs(Dialog, { className: "my-6xl min-h-fit w-fit mx-auto", onClose: onClose, children: [__html ? jsx(RichText, { __html: __html }) : null, jsxs("div", { className: "flex flex-row mx-auto w-fit gap-lg py-lg", children: [jsx(LinkButton, { text: "\u042F \u0441\u043E\u0433\u043B\u0430\u0441\u0435\u043D", version: "primary", target: target, href: adjustedHref, onClick: onClose }), jsx(Button, { type: "button", version: "secondary", onClick: onClose, children: "\u042F \u043D\u0435 \u0441\u043E\u0433\u043B\u0430\u0441\u0435\u043D" })] }), jsx("div", { children: "\u041D\u0430\u0436\u0438\u043C\u0430\u044F \u043A\u043D\u043E\u043F\u043A\u0443 \u00AB\u042F \u0421\u041E\u0413\u041B\u0410\u0421\u0415\u041D\u00BB \u043D\u0438\u0436\u0435 \u0412\u044B \u043F\u0440\u0438\u043D\u0438\u043C\u0430\u0435\u0442\u0435 \u0434\u0430\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F. \u0420\u0430\u0441\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u0438\u043B\u0438 \u0440\u0430\u0441\u043A\u0440\u044B\u0442\u0438\u0435 \u043B\u044E\u0431\u043E\u0439 \u0447\u0430\u0441\u0442\u0438 \u0434\u0430\u043D\u043D\u043E\u0433\u043E \u0417\u0430\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0438\u043B\u0438 \u043B\u044E\u0431\u043E\u0439 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u0438, \u0438\u043B\u0438 \u0440\u0435\u043A\u043E\u043C\u0435\u043D\u0434\u0430\u0446\u0438\u0438 \u0432 \u043D\u0435\u043C \u0437\u0430\u043F\u0440\u0435\u0449\u0435\u043D\u043E.\u00BB" })] }));
     });
 
-    const useReportDialog = (props) => {
-        const { open, close } = useDialogManager();
-        return {
-            open: (options = {}) => open(jsx(ReportDialog, { ...props }), options),
-            close,
-        };
-    };
-
     const ReportDialogButton = JSX(({ text, href, target, __html, icon }) => {
-        if (!text && !__html) {
-            return null;
-        }
-        const reportDialog = useReportDialog({ __html, href, target });
-        const openReportDialog = useCallback(() => reportDialog.open(), [reportDialog]);
-        return (jsxs("button", { className: "flex gap-s text-primary-text no-underline hover:text-primary-main", onClick: openReportDialog, children: [renderImg(icon), jsx(Text, { font: "font-light", children: text })] }));
+        const { open } = useDialog(ReportDialog);
+        const openReportDialog = useCallback(() => open({ __html, href, target }), [__html, href, target]);
+        return text ? (jsxs("button", { className: "flex gap-s text-primary-text no-underline hover:text-primary-main", onClick: openReportDialog, children: [renderImg(icon), jsx(Text, { font: "font-light", children: text })] })) : null;
     });
 
     const linkColumnsModeStyleMap = {
@@ -10281,6 +10252,25 @@
         return opened && __html ? (jsx("div", { className: "container fixed left-0 right-0 bottom-0 z-50", role: "dialog", children: jsxs("div", { className: "bg-white m-xl p-xl rounded-md flex sm:items-center shadow-main-black", children: [jsx("div", { className: "sm:flex-1", children: jsx(RichText, { __html: __html }) }), jsx("div", { className: "ml-s sm:ml-0 w-36 flex justify-end", children: jsx(CloseButton, { className: "bg-main-gray rounded-md w-11 h-11", onClose: handleClose }) })] }) })) : null;
     });
 
+    function useOnEscape(handler) {
+        const escapeHandler = useCallback(({ key }) => {
+            if (key === 'Escape') {
+                handler();
+            }
+        }, [handler]);
+        useEventListener(globalThis.document, 'keydown', escapeHandler);
+    }
+
+    function useObservableWithActions(eventBus, type, handlersMap) {
+        useEffect(() => eventBus.subscribe(type, action => {
+            const actionType = action?.type;
+            if (actionType && typeof actionType === 'string') {
+                const handler = handlersMap[actionType];
+                handler && handler(action);
+            }
+        }), [eventBus, type, ...Object.values(handlersMap)]);
+    }
+
     function useList(initialList = []) {
         const [list, setList] = useState(initialList);
         const push = useCallback((item) => setList(_ => [..._, item]), []);
@@ -10290,72 +10280,30 @@
         return [list, { setList, push, pop, remove, clear }];
     }
 
-    function assertUnreachable(x) {
-        throw new Error(x);
-    }
-
-    const useDialogsList = ({ onCloseAll, onClose, } = {}) => {
+    const useDialogsList = () => {
         const [dialogs, { push, pop, clear }] = useList();
-        const closeAll = useCallback(() => {
-            onCloseAll && onCloseAll(dialogs);
-            clear();
-        }, [dialogs, onCloseAll]);
-        const close = useCallback(() => {
-            onClose && onClose(dialogs[dialogs.length - 1]);
-            pop();
-        }, [dialogs, onClose]);
-        useEffect(() => defaultEventBus.subscribe('dialog', (action) => {
-            if (!action) {
-                return;
-            }
-            switch (action.type) {
-                case 'open':
-                    push(action);
-                    break;
-                case 'close':
-                    if (action.all) {
-                        closeAll();
-                    }
-                    else {
-                        close();
-                    }
-                    break;
-                default:
-                    assertUnreachable(action);
-            }
-        }), [closeAll, close]);
-        return dialogs;
+        useObservableWithActions(defaultEventBus.observable, 'dialog', {
+            open: push,
+            close: pop,
+            closeAll: clear,
+        });
+        return [dialogs, { close: pop, closeAll: clear }];
     };
 
     const DialogManager = JSX(() => {
-        const handleCloseAll = useCallback((dialogActions) => {
-            for (const _ of dialogActions) {
-                _?.onClose && _.onClose();
-            }
-        }, []);
-        const handleClose = useCallback((_) => {
-            _?.onClose && _.onClose();
-        }, []);
-        const dialogs = useDialogsList({ onCloseAll: handleCloseAll, onClose: handleClose });
-        const { close } = useDialogManager();
-        const escapeHandler = useCallback(({ key }) => {
-            if (key === 'Escape') {
-                close();
-            }
-        }, []);
-        useEventListener(globalThis.document, 'keydown', escapeHandler);
+        const [dialogs, { close }] = useDialogsList();
+        const hasDialogs = Boolean(dialogs.length);
+        useOnEscape(close);
         useEffect(() => {
-            if (dialogs.length) {
-                globalThis.document?.body.classList.add('no-scrollbar');
-                globalThis.document?.body.classList.add('overflow-hidden');
+            if (hasDialogs) {
+                globalThis.document?.body.classList.add('no-scrollbar', 'overflow-hidden');
             }
             else {
-                globalThis.document?.body.classList.remove('no-scrollbar');
-                globalThis.document?.body.classList.remove('overflow-hidden');
+                globalThis.document?.body.classList.remove('no-scrollbar', 'overflow-hidden');
             }
-        }, [dialogs]);
-        return dialogs.length ? (jsx("div", { className: "fixed inset-0 z-50", role: "dialog", children: dialogs.map(({ dialog, id }, i) => (jsx("div", { className: style('absolute inset-0 overflow-x-hidden overflow-y-scroll no-scrollbar bg-black/50', {
-                    hidden: i !== dialogs.length - 1,
+        }, [hasDialogs]);
+        return hasDialogs ? (jsx("div", { className: "fixed inset-0 z-50", role: "dialog", children: dialogs.map(({ dialog, id }, i) => (jsx("div", { className: style('absolute inset-0 overflow-x-hidden overflow-y-scroll no-scrollbar bg-black/50', {
+                    hidden: i !== dialogs.length - 1, // TODO Чего?)
                 }), children: dialog }, String(id || i)))) })) : null;
     });
 
@@ -10364,28 +10312,11 @@
         const close = useCallback(() => {
             setPopup(null);
         }, []);
-        useEffect(() => defaultEventBus.subscribe('popup', (action) => {
-            if (!action) {
-                return;
-            }
-            switch (action.type) {
-                case 'open':
-                case 'update':
-                    setPopup(action);
-                    break;
-                case 'close':
-                    close();
-                    break;
-                default:
-                    assertUnreachable(action);
-            }
-        }), []);
-        const escapeHandler = useCallback(({ key }) => {
-            if (key === 'Escape') {
-                close();
-            }
-        }, [close]);
-        useEventListener(globalThis.document, 'keydown', escapeHandler);
+        useObservableWithActions(defaultEventBus.observable, 'popup', {
+            open: setPopup,
+            close,
+        });
+        useOnEscape(close);
         return popup ? (jsx("div", { className: style('z-50', popup.fixed ? 'fixed' : 'absolute'), style: {
                 left: `${popup.left}px`,
                 top: `${popup.top}px`,
@@ -10423,7 +10354,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.687";
+    const packageVersion = "0.14.689";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;