From 75a65883a448dc67550f9b47bac78222cc381a49 Mon Sep 17 00:00:00 2001
From: Huu Le <20178761+huult@users.noreply.github.com>
Date: Wed, 6 Aug 2025 10:11:52 +0700
Subject: [PATCH] Update condition to prevent scrolling to end when there is a
 new message

---
 src/pages/home/report/ReportActionsList.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index bb782c5438bc..d314a3802333 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -398,7 +398,8 @@ function ReportActionsList({
             return;
         }
 
-        const shouldScrollToEnd = (isExpenseReport(report) || isTransactionThread(parentReportAction)) && isSearchTopmostFullScreenRoute();
+        const shouldScrollToEnd =
+            (isExpenseReport(report) || isTransactionThread(parentReportAction)) && isSearchTopmostFullScreenRoute() && hasNewestReportAction && !unreadMarkerReportActionID;
 
         if (shouldScrollToEnd) {
             setShouldScrollToEndAfterLayout(true);