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.

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 - Web - Thread report and LHN title still visible after thread parent message being flagged as Intimidation or Bullying #21890 #22771

Merged
merged 5 commits into from
Jul 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,7 @@ export default {
},
parentReportAction: {
deletedMessage: '[Deleted message]',
hiddenMessage: '[Hidden message]',
},
threads: {
replies: 'Replies',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -1917,6 +1917,7 @@ export default {
},
parentReportAction: {
deletedMessage: '[Mensaje eliminado]',
hiddenMessage: '[Mensaje oculto]',
},
threads: {
replies: 'Respuestas',
Expand Down
6 changes: 6 additions & 0 deletions src/libs/ReportUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,12 @@ function getReportName(report) {
if (isAttachment && parentReportActionMessage) {
return `[${Localize.translateLocal('common.attachment')}]`;
}
if (
lodashGet(parentReportAction, 'message[0].moderationDecisions[0].decision') === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE ||
lodashGet(parentReportAction, 'message[0].moderationDecisions[0].decision') === CONST.MODERATION.MODERATOR_DECISION_HIDDEN
) {
return Localize.translateLocal('parentReportAction.hiddenMessage');
}
return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
}
if (isChatRoom(report) || isTaskReport(report)) {
Expand Down
Loading