Fix: 27456 green line

Expensify · Oct 18, 2023 · 1ea93f7 · 1ea93f7
1 parent 9664f8c
commit 1ea93f7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
@@ -288,9 +288,13 @@ function ReportActionsList({
             if (!currentUnreadMarker) {
                 const nextMessage = sortedReportActions[index + 1];
                 const isCurrentMessageUnread = isMessageUnread(reportAction, report.lastReadTime);
-                shouldDisplay = isCurrentMessageUnread && !isMessageUnread(nextMessage, report.lastReadTime);
-                if (!messageManuallyMarkedUnread) {
-                    shouldDisplay = shouldDisplay && reportAction.actorAccountID !== Report.getCurrentUserAccountID();
+                const isNextMessageRead = !isMessageUnread(nextMessage, report.lastReadTime);
+                const isWithinVisibleThreshold = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < userActiveSince.current : true;
+
+                shouldDisplay = isCurrentMessageUnread && isNextMessageRead && isWithinVisibleThreshold;
+
+                if (shouldDisplay && !messageManuallyMarkedUnread) {
+                    shouldDisplay = reportAction.actorAccountID !== Report.getCurrentUserAccountID();
                 }
             } else {
                 shouldDisplay = reportAction.reportActionID === currentUnreadMarker;