fix: unread logic

Expensify · Oct 21, 2023 · b0c9b95 · b0c9b95
1 parent ad8b9ff
commit b0c9b95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -2992,6 +2992,15 @@ function buildTransactionThread(reportAction, moneyRequestReportID) {
     );
 }
 
+/**
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isEmptyReport(report) {
+    const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(report.reportID);
+    return !report.lastMessageText && !report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+}
+
 /**
  * @param {Object} report
  * @returns {Boolean}
@@ -4000,6 +4009,7 @@ export {
     navigateToDetailsPage,
     generateReportID,
     hasReportNameError,
+    isEmptyReport,
     isUnread,
     isUnreadWithMention,
     buildOptimisticWorkspaceChats,

diff --git a/src/libs/UnreadIndicatorUpdater/index.js b/src/libs/UnreadIndicatorUpdater/index.js
@@ -8,7 +8,7 @@ Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (reportsFromOnyx) => {
-        const unreadReports = _.filter(reportsFromOnyx, ReportUtils.isUnread);
+        const unreadReports = _.filter(reportsFromOnyx, (report) => ReportUtils.unread(report) && ReportUtils.isEmptyReport(report));
         updateUnread(_.size(unreadReports));
     },
 });