From 635545a5fd9c64ad07b8d07d060dc4b3d021a72e Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 13 Feb 2025 14:27:56 +0100
Subject: [PATCH] Contacts: Adjust styles for checkbox (#5577)

---
 src/components/main/NewContactModal.scss               | 4 ++++
 src/components/main/NewContactModal.tsx                | 3 ++-
 src/components/main/WebAppsCloseConfirmationModal.tsx  | 1 +
 src/components/middle/composer/PollModal.tsx           | 3 +++
 src/components/middle/panes/ChatReportPane.tsx         | 4 +++-
 src/components/modals/urlAuth/UrlAuthModal.module.scss | 3 ---
 src/components/modals/urlAuth/UrlAuthModal.tsx         | 6 ++----
 7 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 src/components/modals/urlAuth/UrlAuthModal.module.scss

diff --git a/src/components/main/NewContactModal.scss b/src/components/main/NewContactModal.scss
index 910f2d947..814bf6ae0 100644
--- a/src/components/main/NewContactModal.scss
+++ b/src/components/main/NewContactModal.scss
@@ -43,5 +43,9 @@
   &__help-text {
     font-size: 0.9375rem;
     color: var(--color-text-secondary);
+
+    &__negative {
+      margin-top: -1rem;
+    }
   }
 }
diff --git a/src/components/main/NewContactModal.tsx b/src/components/main/NewContactModal.tsx
index 6aff04b6f..d20590d50 100644
--- a/src/components/main/NewContactModal.tsx
+++ b/src/components/main/NewContactModal.tsx
@@ -157,12 +157,13 @@ const NewContactModal: FC<OwnProps & StateProps> = ({
           )}
         </p>
         <Checkbox
+          className="dialog-checkbox"
           checked={shouldSharePhoneNumber}
           tabIndex={0}
           onCheck={setShouldSharePhoneNumber}
           label={lang('lng_new_contact_share')}
         />
-        <p className="NewContactModal__help-text">
+        <p className="NewContactModal__help-text NewContactModal__help-text__negative">
           {renderText(lang('AddContact.SharedContactExceptionInfo', renderingUser?.firstName))}
         </p>
       </>
diff --git a/src/components/main/WebAppsCloseConfirmationModal.tsx b/src/components/main/WebAppsCloseConfirmationModal.tsx
index 7c1d26039..3d7faeca4 100644
--- a/src/components/main/WebAppsCloseConfirmationModal.tsx
+++ b/src/components/main/WebAppsCloseConfirmationModal.tsx
@@ -54,6 +54,7 @@ const WebAppsCloseConfirmationModal: FC<OwnProps> = ({
     >
       <p>{lang('AreYouSureCloseMiniApps')}</p>
       <Checkbox
+        className="dialog-checkbox"
         label={lang('DoNotAskAgain')}
         checked={shouldSkipInFuture}
         onCheck={setShouldSkipInFuture}
diff --git a/src/components/middle/composer/PollModal.tsx b/src/components/middle/composer/PollModal.tsx
index 18d569696..fd385c12e 100644
--- a/src/components/middle/composer/PollModal.tsx
+++ b/src/components/middle/composer/PollModal.tsx
@@ -338,18 +338,21 @@ const PollModal: FC<OwnProps> = ({
       <div className="quiz-mode">
         {!shouldBeAnonymous && (
           <Checkbox
+            className="dialog-checkbox"
             label={lang('PollAnonymous')}
             checked={isAnonymous}
             onChange={handleIsAnonymousChange}
           />
         )}
         <Checkbox
+          className="dialog-checkbox"
           label={lang('PollMultiple')}
           checked={isMultipleAnswers}
           disabled={isQuizMode}
           onChange={handleMultipleAnswersChange}
         />
         <Checkbox
+          className="dialog-checkbox"
           label={lang('PollQuiz')}
           checked={isQuizMode}
           disabled={isMultipleAnswers || isQuiz !== undefined}
diff --git a/src/components/middle/panes/ChatReportPane.tsx b/src/components/middle/panes/ChatReportPane.tsx
index aa74097ae..fa89cde50 100644
--- a/src/components/middle/panes/ChatReportPane.tsx
+++ b/src/components/middle/panes/ChatReportPane.tsx
@@ -173,7 +173,7 @@ const ChatReportPane: FC<OwnProps & StateProps> = ({
         <Icon name="close" />
       </Button>
       <ConfirmDialog
-        isOpen={true}
+        isOpen={isBlockUserModalOpen}
         onClose={closeBlockUserModal}
         title={lang('BlockUserTitle', user ? getUserFirstOrLastName(user) : getChatTitle(lang, chat!))}
         text={user
@@ -185,6 +185,7 @@ const ChatReportPane: FC<OwnProps & StateProps> = ({
       >
         {user && (
           <Checkbox
+            className="dialog-checkbox"
             label={lang('DeleteThisChat')}
             checked={shouldDeleteChat}
             onCheck={setShouldDeleteChat}
@@ -192,6 +193,7 @@ const ChatReportPane: FC<OwnProps & StateProps> = ({
         )}
         {user && canReportSpam && (
           <Checkbox
+            className="dialog-checkbox"
             label={lang('ReportChat')}
             checked={shouldReportSpam}
             onCheck={setShouldReportSpam}
diff --git a/src/components/modals/urlAuth/UrlAuthModal.module.scss b/src/components/modals/urlAuth/UrlAuthModal.module.scss
deleted file mode 100644
index 85b5d4172..000000000
--- a/src/components/modals/urlAuth/UrlAuthModal.module.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.checkbox {
-  margin: 1rem 0;
-}
diff --git a/src/components/modals/urlAuth/UrlAuthModal.tsx b/src/components/modals/urlAuth/UrlAuthModal.tsx
index 0581916ab..a277edda9 100644
--- a/src/components/modals/urlAuth/UrlAuthModal.tsx
+++ b/src/components/modals/urlAuth/UrlAuthModal.tsx
@@ -18,8 +18,6 @@ import useOldLang from '../../../hooks/useOldLang';
 import Checkbox from '../../ui/Checkbox';
 import ConfirmDialog from '../../ui/ConfirmDialog';
 
-import styles from './UrlAuthModal.module.scss';
-
 export type OwnProps = {
   modal?: TabState['urlAuth'];
 };
@@ -82,6 +80,7 @@ const UrlAuthModal: FC<OwnProps & StateProps> = ({
       {renderText(lang('OpenUrlAlert2', currentAuth?.url), ['links'])}
       {domain && (
         <Checkbox
+          className="dialog-checkbox"
           checked={isLoginChecked}
           label={(
             <>
@@ -92,11 +91,11 @@ const UrlAuthModal: FC<OwnProps & StateProps> = ({
             </>
           )}
           onCheck={handleLoginChecked}
-          className={styles.checkbox}
         />
       )}
       {shouldRequestWriteAccess && (
         <Checkbox
+          className="dialog-checkbox"
           checked={isWriteAccessChecked}
           label={(
             <>
@@ -108,7 +107,6 @@ const UrlAuthModal: FC<OwnProps & StateProps> = ({
           )}
           onCheck={setWriteAccessChecked}
           disabled={!isLoginChecked}
-          className={styles.checkbox}
         />
       )}
     </ConfirmDialog>