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/issue 20810 #21836

Merged
merged 6 commits into from
Jun 30, 2023
Merged

Fix/issue 20810 #21836

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b13d207
fix: correct dependency of effect hook
sangar-1028 Jun 23, 2023
9600169
fix: conflicts
sangar-1028 Jun 24, 2023
6be7771
Merge branch 'main' into fix/issue-20810
sangar-1028 Jun 28, 2023
9b0d1d9
fix: prettier
sangar-1028 Jun 28, 2023
3bb529c
fix: use the latest moderation decision
sangar-1028 Jun 29, 2023
bba5e3d
fix: remove empty line
sangar-1028 Jun 29, 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
20 changes: 6 additions & 14 deletions src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,26 +148,18 @@ function ReportActionItem(props) {

// Hide the message if it is being moderated for a higher offense, or is hidden by a moderator
// Removed messages should not be shown anyway and should not need this flow

const decisions = lodashGet(props, ['action', 'message', 0, 'moderationDecisions'], []);
const latestDecision = lodashGet(_.last(decisions), 'decision', '');
useEffect(() => {
if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(props.action.message[0].moderationDecisions)) {
if (!props.action.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT || _.isEmpty(latestDecision)) {
return;
}

// Right now we are only sending the latest moderationDecision to the frontend even though it is an array
let decisions = props.action.message[0].moderationDecisions;
if (decisions.length > 1) {
decisions = decisions.slice(-1);
}
const latestDecision = decisions[0];
if (latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {
if (latestDecision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || latestDecision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN) {
setIsHidden(true);
}
setModerationDecision(latestDecision.decision);

// props.action.message doesn't need to be a dependency, we only need to check the change of props.action.message[0].moderationDecisions
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [props.action.message[0].moderationDecisions, props.action.actionName]);
setModerationDecision(latestDecision);
}, [latestDecision, props.action.actionName]);

const toggleContextMenuFromActiveReportAction = useCallback(() => {
setIsContextMenuActive(ReportActionContextMenu.isActiveReportAction(props.action.reportActionID));
Expand Down