Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check for unread reports at the end of the filter logic #11631

Merged
merged 8 commits into from
Oct 6, 2022
Merged

Check for unread reports at the end of the filter logic #11631

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d5a580
Check for unread reports at the end of the filter logic
tgolen Oct 6, 2022
fde8c34
Add a test for still showing pinned and archive reporst in focus mode
tgolen Oct 6, 2022
4a4c446
Fix a JS crash I noticed
tgolen Oct 6, 2022
0c16963
Add a test for unread policy rooms to be properly visible in the LHN
tgolen Oct 6, 2022
8d8befd
Add better tests for archived and policy rooms
tgolen Oct 6, 2022
76527ae
Add tests for every combination of filter logic
tgolen Oct 6, 2022
fa56c85
Stop factoring in the view mode when searching reports
tgolen Oct 6, 2022
c8fb8e4
Remove unused variable and fixed comment
tgolen Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,12 +916,6 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr
return true;
}

// Include unread reports when in GSD mode
// GSD mode is specifically for focusing the user on the most relevant chats, primarily, the unread ones
if (isInGSDMode) {
return isUnread(report);
}

// Include reports if they have a draft, are pinned, or have an outstanding IOU
// These are always relevant to the user no matter what view mode the user prefers
if (report.hasDraft || report.isPinned || hasOutstandingIOU(report, currentUserLogin, iouReports)) {
Expand Down Expand Up @@ -961,6 +955,12 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr
return false;
}

// Include unread reports when in GSD mode
// GSD mode is specifically for focusing the user on the most relevant chats, primarily, the unread ones
if (isInGSDMode) {
return isUnread(report);
}

return true;
}

Expand Down