From 11aa44de5621b0c48f94ac7bde3da3f172ecb327 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sun, 18 Jun 2023 12:03:41 +0200
Subject: [PATCH] Settings: Various fixes (#3312)

---
 src/components/left/settings/Settings.scss              | 6 ++++++
 src/components/left/settings/SettingsActiveSessions.tsx | 2 +-
 src/components/right/management/Management.scss         | 5 +++++
 src/global/actions/api/settings.ts                      | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/left/settings/Settings.scss b/src/components/left/settings/Settings.scss
index b88083690..f35ad34aa 100644
--- a/src/components/left/settings/Settings.scss
+++ b/src/components/left/settings/Settings.scss
@@ -47,6 +47,7 @@
   &.infinite-scroll {
     display: flex;
     flex-direction: column;
+    overflow-y: hidden;
 
     & > .custom-scroll {
       flex: 1 1 auto;
@@ -126,6 +127,11 @@
   padding: 1.5rem 1.5rem 1rem;
   box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
   border-bottom: 0.625rem solid var(--color-background-secondary);
+
+  &:last-child {
+    border-bottom: none;
+    box-shadow: none;
+  }
 }
 
 .settings-item {
diff --git a/src/components/left/settings/SettingsActiveSessions.tsx b/src/components/left/settings/SettingsActiveSessions.tsx
index b6f0fcdca..9df2d29f1 100644
--- a/src/components/left/settings/SettingsActiveSessions.tsx
+++ b/src/components/left/settings/SettingsActiveSessions.tsx
@@ -149,7 +149,7 @@ const SettingsActiveSessions: FC<OwnProps & StateProps> = ({
         </h4>
 
         <ListItem narrow inactive icon={`device-${getSessionIcon(session)} icon-device`}>
-          <div className="multiline-menu-item" dir="auto">
+          <div className="multiline-menu-item full-size" dir="auto">
             <span className="title" dir="auto">{session.deviceModel}</span>
             <span className="subtitle black tight">
               {session.appName} {session.appVersion}, {session.platform} {session.systemVersion}
diff --git a/src/components/right/management/Management.scss b/src/components/right/management/Management.scss
index 26dbb131f..a0e151d16 100644
--- a/src/components/right/management/Management.scss
+++ b/src/components/right/management/Management.scss
@@ -19,6 +19,11 @@
     box-shadow: inset 0 -0.0625rem 0 0 var(--color-background-secondary-accent);
     border-bottom: 0.625rem solid var(--color-background-secondary);
 
+    &:last-child {
+      border-bottom: none;
+      box-shadow: none;
+    }
+
     &.wide {
       padding: 1.5rem;
     }
diff --git a/src/global/actions/api/settings.ts b/src/global/actions/api/settings.ts
index 7dec00278..bb2bd6869 100644
--- a/src/global/actions/api/settings.ts
+++ b/src/global/actions/api/settings.ts
@@ -273,7 +273,7 @@ addActionHandler('loadBlockedContacts', async (global): Promise<void> => {
     ...global,
     blocked: {
       ...global.blocked,
-      ids: [...(global.blocked.ids || []), ...result.blockedIds],
+      ids: result.blockedIds,
       totalCount: result.totalCount,
     },
   };