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

[FIX 20759] Remove the *New* notifiers just as the deletion starts. #21557

Merged
merged 10 commits into from
Jul 3, 2023
Merged

[FIX 20759] Remove the *New* notifiers just as the deletion starts. #21557

Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fce7f37
[FIX 20759] Remove the *New* notifiers just as the deletion starts.
DanutGavrus Jun 24, 2023
2465c0f
Merge branch 'main' into fix/20759-remove-new-notifiers-when-deleting…
DanutGavrus Jun 27, 2023
cb5b492
Merge branch 'main' into fix/20759-remove-new-notifiers-when-deleting…
DanutGavrus Jun 28, 2023
cecef7e
[FIX] Prevent unnecesarry re-renders.
DanutGavrus Jun 28, 2023
a6e9ca6
Prevent condition executing when deleting last message, but report ha…
DanutGavrus Jun 28, 2023
607451d
Merge branch 'main' into fix/20759-remove-new-notifiers-when-deleting…
DanutGavrus Jun 28, 2023
79a6c9b
Run prettier.
DanutGavrus Jun 28, 2023
cfd1a7f
Merge branch 'main' into fix/20759-remove-new-notifiers-when-deleting…
DanutGavrus Jun 29, 2023
98a1f21
Fixed lint error.
DanutGavrus Jun 29, 2023
1ca3b60
Merge branch 'main' into fix/20759-remove-new-notifiers-when-deleting…
DanutGavrus Jun 30, 2023
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
18 changes: 18 additions & 0 deletions src/pages/home/report/ReportActionsView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import _ from 'underscore';
import lodashGet from 'lodash/get';
import lodashCloneDeep from 'lodash/cloneDeep';
import * as Report from '../../../libs/actions/Report';
import reportActionPropTypes from './reportActionPropTypes';
import Visibility from '../../../libs/Visibility';
Expand Down Expand Up @@ -218,6 +219,23 @@ class ReportActionsView extends React.Component {
});
}

// If the last unread message was deleted, remove the *New* green marker and the *New Messages* notification at scroll just as the deletion starts.
if (
ReportUtils.isUnread(this.props.report) &&
this.props.reportActions.length > 0 &&
this.props.reportActions[0].pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
!this.props.network.isOffline
) {
const reportActionsWithoutPendingOne = lodashCloneDeep(this.props.reportActions);
reportActionsWithoutPendingOne.shift();
const newMarkerReportActionID = ReportUtils.getNewMarkerReportActionID(this.props.report, reportActionsWithoutPendingOne);
if (newMarkerReportActionID !== this.state.newMarkerReportActionID) {
this.setState({
newMarkerReportActionID: newMarkerReportActionID,
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
newMarkerReportActionID: newMarkerReportActionID,
newMarkerReportActionID,

Fix the lint.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mollfpr Thanks! Fixed lint issue & merged main again.

});
}
}

// Checks to see if a report comment has been manually "marked as unread". All other times when the lastReadTime
// changes it will be because we marked the entire report as read.
const didManuallyMarkReportAsUnread = prevProps.report.lastReadTime !== this.props.report.lastReadTime && ReportUtils.isUnread(this.props.report);
Expand Down