Merge pull request #5534 from Santhosh-Sellavel/show_NEW_marker_fix

Show NEW marker over unread messages, while scroll back from viewing history
Expensify · Oct 5, 2021 · 357af46 · 357af46
2 parents d3f2934 + bf12949
commit 357af46
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
@@ -399,11 +399,13 @@ class ReportActionsView extends React.Component {
      * @param {Boolean} [shouldResetLocalCount=false] Whether count should increment or reset
      */
     updateLocalUnreadActionCount(shouldResetLocalCount = false) {
-        this.setState(prevState => ({
-            localUnreadActionCount: shouldResetLocalCount
+        this.setState((prevState) => {
+            const localUnreadActionCount = shouldResetLocalCount
                 ? this.props.report.unreadActionCount
-                : prevState.localUnreadActionCount + this.props.report.unreadActionCount,
-        }));
+                : prevState.localUnreadActionCount + this.props.report.unreadActionCount;
+            this.updateUnreadIndicatorPosition(localUnreadActionCount);
+            return {localUnreadActionCount};
+        });
     }
 
     /**