Merge pull request #11634 from Expensify/john-fix-no-comment-reports

Only show reports without comments if they are non-archived policy rooms (cherry picked from commit bc5ceff)
Expensify · Oct 6, 2022 · f411797 · f411797
1 parent 94f6fc6
commit f411797
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -929,9 +929,9 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr
     }
 
     // Exclude reports that don't have any comments
-    // Archived rooms or user created policy rooms are OK to show when the don't have any comments
+    // User created policy rooms are OK to show when the don't have any comments, only if they aren't archived.
     const hasNoComments = report.lastMessageTimestamp === 0;
-    if (hasNoComments && (isArchivedRoom(report) || isUserCreatedPolicyRoom(report))) {
+    if (hasNoComments && (isArchivedRoom(report) || !isUserCreatedPolicyRoom(report))) {
         return false;
     }
 

diff --git a/tests/unit/LHNFilterTest.js b/tests/unit/LHNFilterTest.js
@@ -247,17 +247,16 @@ describe('Sidebar', () => {
 
             // Given these combinations of booleans which result in the report being filtered out (not shown).
             const booleansWhichRemovesInactiveReport = [
-                // isUserCreatedPolicyRoom
-                JSON.stringify([false, false, true, false, false, false, false]),
+                JSON.stringify([false, false, false, false, false, false, false]),
 
-                // isUserCreatedPolicyRoom, isUnread
-                JSON.stringify([false, false, true, false, true, false, false]),
+                // isUnread
+                JSON.stringify([false, false, false, false, true, false, false]),
 
-                // isUserCreatedPolicyRoom, hasAddWorkspaceError
-                JSON.stringify([false, false, true, true, false, false, false]),
+                // hasAddWorkspaceError, isUnread
+                JSON.stringify([false, false, false, true, true, false, false]),
 
-                // isUserCreatedPolicyRoom, hasAddWorkspaceError, isUnread
-                JSON.stringify([false, false, true, true, true, false, false]),
+                // hasAddWorkspaceError
+                JSON.stringify([false, false, false, true, false, false, false]),
 
                 // isArchived
                 JSON.stringify([false, true, false, false, false, false, false]),
@@ -563,10 +562,10 @@ describe('Sidebar', () => {
         const booleansWhichRemovesInactiveReport = [
             JSON.stringify([false, false, false, false, false, false, false]),
             JSON.stringify([false, false, false, true, false, false, false]),
+            JSON.stringify([false, false, false, false, true, false, false]),
+            JSON.stringify([false, false, false, true, true, false, false]),
             JSON.stringify([false, false, true, false, false, false, false]),
-            JSON.stringify([false, false, true, false, true, false, false]),
             JSON.stringify([false, false, true, true, false, false, false]),
-            JSON.stringify([false, false, true, true, true, false, false]),
             JSON.stringify([false, true, false, false, false, false, false]),
             JSON.stringify([false, true, false, false, true, false, false]),
             JSON.stringify([false, true, false, true, false, false, false]),

diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
@@ -283,8 +283,8 @@ describe('OptionsListUtils', () => {
         // Then the 2 personalDetails that don't have reports should be returned
         expect(results.personalDetails.length).toBe(2);
 
-        // Then all of the reports should be shown, including the one that has no message on them.
-        expect(results.recentReports.length).toBe(_.size(REPORTS));
+        // Then all of the reports should be shown EXCEPT the archived room, including the one that has no message on them.
+        expect(results.recentReports.length).toBe(_.size(REPORTS) - 1);
 
         // When we filter again but provide a searchValue
         results = OptionsListUtils.getSearchOptions(REPORTS, PERSONAL_DETAILS, 'spider');