From 362b5a78768bb56a82e10b1832b0c5606444989b Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Mon, 16 Aug 2021 20:42:11 +0300
Subject: [PATCH] Message List: Fix unneded "Unread Messages" badge

---
 src/components/middle/MessageList.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx
index 508eb65e2..01253e928 100644
--- a/src/components/middle/MessageList.tsx
+++ b/src/components/middle/MessageList.tsx
@@ -140,7 +140,7 @@ const MessageList: FC<OwnProps & StateProps & DispatchProps> = ({
   const anchorIdRef = useRef<string>();
   const anchorTopRef = useRef<number>();
   const listItemElementsRef = useRef<HTMLDivElement[]>();
-  const memoUnreadDividerBeforeIdRef = useRef<number | undefined>();
+  const memoUnreadDividerBeforeIdRef = useRef<number | undefined>(firstUnreadId);
   // Updated every time (to be used from intersection callback closure)
   const memoFirstUnreadIdRef = useRef<number>();
   const memoFocusingIdRef = useRef<number>();
@@ -162,11 +162,6 @@ const MessageList: FC<OwnProps & StateProps & DispatchProps> = ({
 
   useOnChange(() => {
     memoFirstUnreadIdRef.current = firstUnreadId;
-
-    // Updated only once (to preserve divider even after messages are read)
-    if (!memoUnreadDividerBeforeIdRef.current) {
-      memoUnreadDividerBeforeIdRef.current = firstUnreadId;
-    }
   }, [firstUnreadId]);
 
   useOnChange(() => {