From 2c61fe2cb12c9d128b0c9d42b8296823decee1ed Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Wed, 15 Oct 2025 19:57:22 +0200
Subject: [PATCH] Modal: More fixes for header layout

---
 .../ProfileRatingModal.module.scss            |  4 +--
 .../modals/webApp/WebAppModalTabContent.tsx   |  4 ++-
 src/components/ui/Modal.tsx                   | 34 +++++++++----------
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/components/modals/profileRating/ProfileRatingModal.module.scss b/src/components/modals/profileRating/ProfileRatingModal.module.scss
index dd66e486d..6ad392e2e 100644
--- a/src/components/modals/profileRating/ProfileRatingModal.module.scss
+++ b/src/components/modals/profileRating/ProfileRatingModal.module.scss
@@ -77,9 +77,7 @@
 }
 
 .ratingProgress {
-  margin: 0 auto;
-  margin-top: 5.625rem;
-  margin-bottom: 1.5rem;
+  margin: 4.5rem auto 1.5rem;
 
   &.withPreview {
     margin-bottom: 1rem;
diff --git a/src/components/modals/webApp/WebAppModalTabContent.tsx b/src/components/modals/webApp/WebAppModalTabContent.tsx
index 0ee5a6b8d..15834b4c3 100644
--- a/src/components/modals/webApp/WebAppModalTabContent.tsx
+++ b/src/components/modals/webApp/WebAppModalTabContent.tsx
@@ -107,6 +107,8 @@ const DEFAULT_BUTTON_TEXT: Record<string, string> = {
   close: 'Close',
 };
 
+const NBSP = '\u00A0';
+
 const WebAppModalTabContent: FC<OwnProps & StateProps> = ({
   modal,
   webApp,
@@ -1109,7 +1111,7 @@ const WebAppModalTabContent: FC<OwnProps & StateProps> = ({
       {popupParameters && (
         <Modal
           isOpen={Boolean(popupParameters)}
-          title={popupParameters.title}
+          title={popupParameters.title || NBSP}
           className={
             buildClassName(styles.webAppPopup, !popupParameters.title?.trim().length && styles.withoutTitle)
           }
diff --git a/src/components/ui/Modal.tsx b/src/components/ui/Modal.tsx
index 46578ac6f..1ce3094cb 100644
--- a/src/components/ui/Modal.tsx
+++ b/src/components/ui/Modal.tsx
@@ -54,8 +54,6 @@ export type OwnProps = {
   isCondensedHeader?: boolean;
 };
 
-const NBSP = '\u00A0';
-
 const Modal: FC<OwnProps> = ({
   dialogRef,
   title,
@@ -147,25 +145,25 @@ const Modal: FC<OwnProps> = ({
       return header;
     }
 
-    if (!title && !withCloseButton) return undefined;
+    const closeButton = withCloseButton ? (
+      <Button
+        className={buildClassName(hasAbsoluteCloseButton && 'modal-absolute-close-button')}
+        round
+        color={absoluteCloseButtonColor}
+        size="smaller"
+        ariaLabel={lang('Close')}
+        onClick={onClose}
+      >
+        <Icon name="close" />
+      </Button>
+    ) : undefined;
 
-    return (
+    return title ? (
       <div className={buildClassName('modal-header', headerClassName, isCondensedHeader && 'modal-header-condensed')}>
-        {withCloseButton && (
-          <Button
-            className={buildClassName(hasAbsoluteCloseButton && 'modal-absolute-close-button')}
-            round
-            color={absoluteCloseButtonColor}
-            size="smaller"
-            ariaLabel={lang('Close')}
-            onClick={onClose}
-          >
-            <Icon name="close" />
-          </Button>
-        )}
-        <div className="modal-title">{title || NBSP}</div>
+        {closeButton}
+        <div className="modal-title">{title}</div>
       </div>
-    );
+    ) : closeButton;
   }
 
   const fullClassName = buildClassName(