Merge pull request #43085 from c3024/prevent-auto-scroll-on-android

prevent autoscroll to bottom on android when last track expense whisper is unresolved
Expensify · Jun 7, 2024 · a4e20bf · a4e20bf
2 parents 97ead64 + d7a7f35
commit a4e20bf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/src/hooks/useReportScrollManager/index.native.ts b/src/hooks/useReportScrollManager/index.native.ts
@@ -8,13 +8,16 @@ function useReportScrollManager(): ReportScrollManagerData {
     /**
      * Scroll to the provided index.
      */
-    const scrollToIndex = (index: number) => {
-        if (!flatListRef?.current) {
-            return;
-        }
-
-        flatListRef.current.scrollToIndex({index});
-    };
+    const scrollToIndex = useCallback(
+        (index: number) => {
+            if (!flatListRef?.current) {
+                return;
+            }
+
+            flatListRef.current.scrollToIndex({index});
+        },
+        [flatListRef],
+    );
 
     /**
      * Scroll to the bottom of the flatlist.

diff --git a/src/hooks/useReportScrollManager/index.ts b/src/hooks/useReportScrollManager/index.ts
@@ -8,13 +8,16 @@ function useReportScrollManager(): ReportScrollManagerData {
     /**
      * Scroll to the provided index. On non-native implementations we do not want to scroll when we are scrolling because
      */
-    const scrollToIndex = (index: number, isEditing?: boolean) => {
-        if (!flatListRef?.current || isEditing) {
-            return;
-        }
+    const scrollToIndex = useCallback(
+        (index: number, isEditing?: boolean) => {
+            if (!flatListRef?.current || isEditing) {
+                return;
+            }
 
-        flatListRef.current.scrollToIndex({index, animated: true});
-    };
+            flatListRef.current.scrollToIndex({index, animated: true});
+        },
+        [flatListRef],
+    );
 
     /**
      * Scroll to the bottom of the flatlist.

diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
@@ -372,7 +372,7 @@ function ReportActionItem({
             return;
         }
 
-        if (prevActionResolution !== (action.originalMessage.resolution ?? null)) {
+        if (prevActionResolution !== action.originalMessage.resolution) {
             reportScrollManager.scrollToIndex(index);
         }
     }, [index, action, prevActionResolution, reportScrollManager, isActionableWhisper]);