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

Fix unread message indicator not displayed after flagging message as offensive #39482

Merged
merged 2 commits into from
Apr 16, 2024
Merged

Fix unread message indicator not displayed after flagging message as offensive #39482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cd0cb1
skip whisper when mark as read except ACTIONABLEMENTIONWHISPER
bernhardoj Apr 3, 2024
8b5871b
Merge branch 'main' into fix/39170-mark-as-unread-when-last-action-is…
bernhardoj Apr 10, 2024
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
7 changes: 6 additions & 1 deletion src/libs/actions/Report.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,12 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {

// Find the latest report actions from other users
const latestReportActionFromOtherUsers = Object.values(reportActions ?? {}).reduce((latest: ReportAction | null, current: ReportAction) => {
if (current.actorAccountID !== currentUserAccountID && (!latest || current.created > latest.created)) {
if (
current.actorAccountID !== currentUserAccountID &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The style is odd, this should go after the if not in a new line 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Prettier doesn't allow me to move it after the if

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a few codes that has the same style, for example,

App/src/pages/home/report/ReportActionsList.tsx

Lines 219 to 225 in ed7029b

useEffect(() => {
if (
scrollingVerticalOffset.current < AUTOSCROLL_TO_TOP_THRESHOLD &&
previousLastIndex.current !== lastActionIndex &&
reportActionSize.current > sortedVisibleReportActions.length &&
hasNewestReportAction
) {

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow so ugly but sure 😄

(!latest || current.created > latest.created) &&
// Whisper action doesn't affect lastVisibleActionCreated, so skip whisper action except actionable mention whisper
(!ReportActionsUtils.isWhisperAction(current) || current.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLEMENTIONWHISPER)
) {
return current;
}
return latest;
Expand Down
Loading