From c424930fda40d38554585a3ef3bc3b57bbc6f6dc Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Sun, 12 Oct 2025 19:11:25 +0700
Subject: [PATCH 1/2] New Messages badge appears briefly on report with new
 system messages

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

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index f5a7859acc95..8e232dbf3055 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -405,9 +405,8 @@ function ReportActionsList({
 
         // eslint-disable-next-line deprecation/deprecation
         InteractionManager.runAfterInteractions(() => {
-            setIsFloatingMessageCounterVisible(false);
-
             if (!shouldScrollToEndAfterLayout) {
+                setIsFloatingMessageCounterVisible(false);
                 reportScrollManager.scrollToBottom();
             }
         });

From 045400ef07979bd81a23be90a415f6f6c67a42c0 Mon Sep 17 00:00:00 2001
From: nkdengineer <nkdengineer@outlook.com>
Date: Mon, 13 Oct 2025 19:02:40 +0700
Subject: [PATCH 2/2] refactor

---
 src/pages/home/report/ReportActionsList.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index 8e232dbf3055..a4a3651973d3 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -405,10 +405,11 @@ function ReportActionsList({
 
         // eslint-disable-next-line deprecation/deprecation
         InteractionManager.runAfterInteractions(() => {
-            if (!shouldScrollToEndAfterLayout) {
-                setIsFloatingMessageCounterVisible(false);
-                reportScrollManager.scrollToBottom();
+            if (shouldScrollToEndAfterLayout) {
+                return;
             }
+            setIsFloatingMessageCounterVisible(false);
+            reportScrollManager.scrollToBottom();
         });
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);