Merge pull request #39040 from margelo/perunt/linking-rerender

Blinking on chat switching
Expensify · Mar 28, 2024 · a3f777e · a3f777e
2 parents 2b96626 + 8ec3050
commit a3f777e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
@@ -135,7 +135,12 @@ function ReportActionsView({
         setCurrentReportActionID('');
     }, [route]);
 
+    // Change the list ID only for comment linking to get the positioning right
     const listID = useMemo(() => {
+        if (!reportActionID) {
+            // Keep the old list ID since we're not in the Comment Linking flow
+            return listOldID;
+        }
         isFirstLinkedActionRender.current = true;
         const newID = generateNewRandomInt(listOldID, 1, Number.MAX_SAFE_INTEGER);
         listOldID = newID;