Merge pull request Expensify#66105 from dmkt9/fix/65594

Author: dangrous

src/pages/home/report/ReportActionsList.tsx

@@ -411,7 +411,6 @@ function ReportActionsList({
     const scrollToBottomForCurrentUserAction = useCallback(
         (isFromCurrentUser: boolean) => {
             InteractionManager.runAfterInteractions(() => {
-                setIsFloatingMessageCounterVisible(false);
                 // 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 || (!isReportTopmostSplitNavigator() && !Navigation.getReportRHPActiveRoute())) {
@@ -427,6 +426,7 @@ function ReportActionsList({
                     return;
                 }
 
+                setIsFloatingMessageCounterVisible(false);
                 reportScrollManager.scrollToBottom();
                 setIsScrollToBottomEnabled(true);
             });
@@ -726,6 +726,9 @@ function ReportActionsList({
                     key={listID}
                     shouldEnableAutoScrollToTopThreshold={shouldEnableAutoScrollToTopThreshold}
                     initialScrollKey={reportActionID}
+                    onContentSizeChange={() => {
+                        trackVerticalScrolling(undefined);
+                    }}
                 />
             </View>
         </>

src/pages/home/report/useReportUnreadMessageScrollTracking.ts

@@ -1,5 +1,5 @@
 import {useState} from 'react';
-import type {MutableRefObject} from 'react';
+import type {RefObject} from 'react';
 import type {NativeScrollEvent, NativeSyntheticEvent} from 'react-native';
 import {readNewestAction} from '@userActions/Report';
 import CONST from '@src/CONST';
@@ -9,10 +9,10 @@ type Args = {
     reportID: string;
 
     /** The current offset of scrolling from either top or bottom of chat list */
-    currentVerticalScrollingOffsetRef: MutableRefObject<number>;
+    currentVerticalScrollingOffsetRef: RefObject<number>;
 
     /** Ref for whether read action was skipped */
-    readActionSkippedRef: MutableRefObject<boolean>;
+    readActionSkippedRef: RefObject<boolean>;
 
     /** The initial value for visibility of floating message button */
     floatingMessageVisibleInitialValue: boolean;
@@ -39,8 +39,10 @@ export default function useReportUnreadMessageScrollTracking({
      * Show/hide the new floating message counter when user is scrolling back/forth in the history of messages.
      * Call any other callback that the component might need
      */
-    const trackVerticalScrolling = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-        onTrackScrolling(event);
+    const trackVerticalScrolling = (event: NativeSyntheticEvent<NativeScrollEvent> | undefined) => {
+        if (event) {
+            onTrackScrolling(event);
+        }
 
         // display floating button if we're scrolled more than the offset
         if (currentVerticalScrollingOffsetRef.current > CONST.REPORT.ACTIONS.SCROLL_VERTICAL_OFFSET_THRESHOLD && !isFloatingMessageCounterVisible && hasUnreadMarkerReportAction) {