Fix multiple new message indicator
authorAjay Bura <ajbura@gmail.com>
Tue, 14 Dec 2021 15:17:01 +0000 (20:47 +0530)
committerAjay Bura <ajbura@gmail.com>
Tue, 14 Dec 2021 15:17:01 +0000 (20:47 +0530)
Signed-off-by: Ajay Bura <ajbura@gmail.com>
src/app/organisms/room/RoomViewContent.jsx

index c7ba8f915749e6f16e90954deb3a2a73a97443f3..75706192e00c3e01415e6ea2cac5586b79e3200b 100644 (file)
@@ -608,13 +608,15 @@ function RoomViewContent({ eventId, roomTimeline }) {
         }
       }
 
-      unreadDivider = (readEvent && !unreadDivider
-        && prevMEvent?.getTs() <= readEvent.getTs()
-        && readEvent.getTs() < mEvent.getTs());
-      if (unreadDivider) {
-        tl.push(<Divider key={`new-${mEvent.getId()}`} variant="positive" text="New messages" />);
-        itemCountIndex += 1;
-        if (jumpToItemIndex === -1) jumpToItemIndex = itemCountIndex;
+      if (!unreadDivider) {
+        unreadDivider = (readEvent
+          && prevMEvent?.getTs() <= readEvent.getTs()
+          && readEvent.getTs() < mEvent.getTs());
+        if (unreadDivider) {
+          tl.push(<Divider key={`new-${mEvent.getId()}`} variant="positive" text="New messages" />);
+          itemCountIndex += 1;
+          if (jumpToItemIndex === -1) jumpToItemIndex = itemCountIndex;
+        }
       }
       const dayDivider = prevMEvent && !isInSameDay(mEvent.getDate(), prevMEvent.getDate());
       if (dayDivider) {