Merge pull request #41302 from Expensify/revert-40286-fix/38855

Revert "[CP Staging] Chat is not scrolled to the new message on a newly created WS chat after whisper message"
Expensify · Apr 30, 2024 · aee3a53 · aee3a53
2 parents dac5dfd + 516c466
commit aee3a53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/src/hooks/useReportScrollManager/index.ts b/src/hooks/useReportScrollManager/index.ts
@@ -21,15 +21,11 @@ function useReportScrollManager(): ReportScrollManagerData {
      * Scroll to the bottom of the flatlist.
      */
     const scrollToBottom = useCallback(() => {
-        // We're deferring execution here because on iOS: mWeb (WebKit based browsers)
-        // scrollToOffset method doesn't work unless called on the next tick
-        requestAnimationFrame(() => {
-            if (!flatListRef?.current) {
-                return;
-            }
+        if (!flatListRef?.current) {
+            return;
+        }
 
-            flatListRef.current.scrollToOffset({animated: false, offset: 0});
-        });
+        flatListRef.current.scrollToOffset({animated: false, offset: 0});
     }, [flatListRef]);
 
     return {ref: flatListRef, scrollToIndex, scrollToBottom};

diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
@@ -325,16 +325,14 @@ 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.
-            // Additionally, since the first report action could be a whisper message (new WS) ->
-            // hasNewestReportAction will be false, check isWhisperAction is false before returning early.
-            if (!isFromCurrentUser || (!hasNewestReportActionRef.current && !ReportActionsUtils.isWhisperAction(sortedReportActions?.[0]))) {
+            // 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 || !hasNewestReportActionRef.current) {
                 return;
             }
             InteractionManager.runAfterInteractions(() => reportScrollManager.scrollToBottom());
         },
-        [sortedReportActions, reportScrollManager],
+        [reportScrollManager],
     );
     useEffect(() => {
         // Why are we doing this, when in the cleanup of the useEffect we are already calling the unsubscribe function?