Merge pull request #52955 from Anaslancer/Page-do-scroll-to-bottom-wh…

…en-send-message-in-public-room Page do scroll to bottom when send message in public room
Expensify · Dec 16, 2024 · 7d5bf75 · 7d5bf75
2 parents 314e4fb + 4628a5b
commit 7d5bf75
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
@@ -415,19 +415,21 @@ function ReportActionsList({
 
     const scrollToBottomForCurrentUserAction = useCallback(
         (isFromCurrentUser: boolean) => {
-            // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
-            // they are now in the list.
-            if (!isFromCurrentUser) {
-                return;
-            }
-            if (!hasNewestReportActionRef.current) {
-                if (isInNarrowPaneModal) {
+            InteractionManager.runAfterInteractions(() => {
+                // If a new comment is added and it's from the current user scroll to the bottom otherwise leave the user positioned where
+                // they are now in the list.
+                if (!isFromCurrentUser) {
                     return;
                 }
-                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
-                return;
-            }
-            InteractionManager.runAfterInteractions(() => reportScrollManager.scrollToBottom());
+                if (!hasNewestReportActionRef.current) {
+                    if (isInNarrowPaneModal) {
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
+                    return;
+                }
+                reportScrollManager.scrollToBottom();
+            });
         },
         [isInNarrowPaneModal, reportScrollManager, report.reportID],
     );