From 1df44b1e98ee566d67b367ff955bcc5733d6c25e Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Wed, 11 Dec 2024 18:16:12 +0100
Subject: [PATCH] Various Fixes (#5286)

---
 .../left/settings/SettingsHeader.tsx          | 21 ++++++++++++-------
 src/components/middle/message/Contact.tsx     |  2 ++
 .../webApp/WebAppModalTabContent.module.scss  | 18 +++++++++++++++-
 src/components/ui/Checkbox.scss               |  1 +
 src/components/ui/ListItem.scss               |  4 ++++
 5 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/components/left/settings/SettingsHeader.tsx b/src/components/left/settings/SettingsHeader.tsx
index 688dfaab4..2fa42005a 100644
--- a/src/components/left/settings/SettingsHeader.tsx
+++ b/src/components/left/settings/SettingsHeader.tsx
@@ -132,30 +132,35 @@ const SettingsHeader: FC<OwnProps> = ({
       case SettingsScreens.PrivacyPhoneCall:
         return <h3>{oldLang('Calls')}</h3>;
 
-      case SettingsScreens.PrivacyPhoneNumberAllowedContacts:
       case SettingsScreens.PrivacyLastSeenAllowedContacts:
       case SettingsScreens.PrivacyProfilePhotoAllowedContacts:
       case SettingsScreens.PrivacyBioAllowedContacts:
+      case SettingsScreens.PrivacyGroupChatsAllowedContacts:
+        return <h3>{oldLang('AlwaysShareWith')}</h3>;
+
+      case SettingsScreens.PrivacyLastSeenDeniedContacts:
+      case SettingsScreens.PrivacyProfilePhotoDeniedContacts:
+      case SettingsScreens.PrivacyBioDeniedContacts:
+      case SettingsScreens.PrivacyGroupChatsDeniedContacts:
+        return <h3>{oldLang('NeverShareWith')}</h3>;
+
+      case SettingsScreens.PrivacyPhoneNumberAllowedContacts:
       case SettingsScreens.PrivacyBirthdayAllowedContacts:
       case SettingsScreens.PrivacyGiftsAllowedContacts:
       case SettingsScreens.PrivacyForwardingAllowedContacts:
       case SettingsScreens.PrivacyVoiceMessagesAllowedContacts:
-      case SettingsScreens.PrivacyGroupChatsAllowedContacts:
       case SettingsScreens.PrivacyPhoneCallAllowedContacts:
       case SettingsScreens.PrivacyPhoneP2PAllowedContacts:
-        return <h3>{oldLang('AlwaysShareWith')}</h3>;
+        return <h3>{oldLang('AlwaysAllow')}</h3>;
+
       case SettingsScreens.PrivacyPhoneNumberDeniedContacts:
-      case SettingsScreens.PrivacyLastSeenDeniedContacts:
-      case SettingsScreens.PrivacyProfilePhotoDeniedContacts:
-      case SettingsScreens.PrivacyBioDeniedContacts:
       case SettingsScreens.PrivacyBirthdayDeniedContacts:
       case SettingsScreens.PrivacyGiftsDeniedContacts:
       case SettingsScreens.PrivacyForwardingDeniedContacts:
       case SettingsScreens.PrivacyVoiceMessagesDeniedContacts:
-      case SettingsScreens.PrivacyGroupChatsDeniedContacts:
       case SettingsScreens.PrivacyPhoneCallDeniedContacts:
       case SettingsScreens.PrivacyPhoneP2PDeniedContacts:
-        return <h3>{oldLang('NeverShareWith')}</h3>;
+        return <h3>{oldLang('NeverAllow')}</h3>;
 
       case SettingsScreens.Performance:
         return <h3>{oldLang('Animations and Performance')}</h3>;
diff --git a/src/components/middle/message/Contact.tsx b/src/components/middle/message/Contact.tsx
index 14718381d..02b066f8c 100644
--- a/src/components/middle/message/Contact.tsx
+++ b/src/components/middle/message/Contact.tsx
@@ -85,6 +85,7 @@ const Contact: FC<OwnProps & StateProps> = ({
               isText
               color="translucent"
               ripple
+              size="tiny"
               onClick={handleOpenChat}
               className={styles.button}
             >
@@ -95,6 +96,7 @@ const Contact: FC<OwnProps & StateProps> = ({
                 isText
                 color="translucent"
                 ripple
+                size="tiny"
                 onClick={handleAddContact}
                 className={styles.button}
               >
diff --git a/src/components/modals/webApp/WebAppModalTabContent.module.scss b/src/components/modals/webApp/WebAppModalTabContent.module.scss
index b13c78a57..c90032065 100644
--- a/src/components/modals/webApp/WebAppModalTabContent.module.scss
+++ b/src/components/modals/webApp/WebAppModalTabContent.module.scss
@@ -95,15 +95,29 @@
   }
 
   &.two-rows {
-    height: 8rem;
+    height: 7.75rem;
   }
 
   &.left-to-right {
     flex-direction: row;
+
+    .secondary-button {
+      margin-right: 0.25rem !important;
+    }
+    .main-button {
+      margin-left: 0.25rem !important;
+    }
   }
 
   &.right-to-left {
     flex-direction: row-reverse;
+
+    .secondary-button {
+      margin-left: 0.25rem !important;
+    }
+    .main-button {
+      margin-right: 0.25rem !important;
+    }
   }
 
   &.top-to-bottom,
@@ -119,9 +133,11 @@
   &.top-to-bottom {
     .secondary-button {
       top: 0rem;
+      margin-bottom: 0.25rem !important;
     }
     .main-button {
       bottom: 0rem;
+      margin-top: 0.25rem !important;
     }
   }
   &.bottom-to-top {
diff --git a/src/components/ui/Checkbox.scss b/src/components/ui/Checkbox.scss
index c46a8901f..5649198d2 100644
--- a/src/components/ui/Checkbox.scss
+++ b/src/components/ui/Checkbox.scss
@@ -119,6 +119,7 @@
       font-size: 0.875rem;
       line-height: 1rem;
       color: var(--color-text-secondary);
+      margin-top: 0.25rem;
     }
   }
 
diff --git a/src/components/ui/ListItem.scss b/src/components/ui/ListItem.scss
index c10816260..12efcbaa4 100644
--- a/src/components/ui/ListItem.scss
+++ b/src/components/ui/ListItem.scss
@@ -383,6 +383,10 @@
     }
   }
 
+  .Checkbox {
+    padding-inline-start: 4rem;
+  }
+
   &.picker-list-item {
     margin: 0;