Skip to content

fix/36045: Flag as offensive is absent #37399

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

Merged
youssef-lr merged 4 commits into from
Mar 7, 2024
Merged

fix/36045: Flag as offensive is absent #37399

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8bfee9
fix flag as offensive is absent
dukenv0307 Feb 28, 2024
85f757c
fix add comment
dukenv0307 Mar 5, 2024
2fa9944
fix merge main
dukenv0307 Mar 6, 2024
0a4ced1
fix: update comment
dukenv0307 Mar 7, 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
8 changes: 7 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4138,7 +4138,13 @@ function chatIncludesChronos(report: OnyxEntry<Report> | EmptyObject): boolean {
* - It's an ADDCOMMENT that is not an attachment
*/
function canFlagReportAction(reportAction: OnyxEntry<ReportAction>, reportID: string | undefined): boolean {
const report = getReport(reportID);
let report = getReport(reportID);

// If the childReportID exists in reportAction and is equal to the reportID,
Comment thread
dukenv0307 marked this conversation as resolved.
// the report action being evaluated is the parent report action in a thread, and we should get the parent report to evaluate instead.
if (reportAction?.childReportID?.toString() === reportID?.toString()) {
report = getReport(report?.parentReportID);
}
const isCurrentUserAction = reportAction?.actorAccountID === currentUserAccountID;
const isOriginalMessageHaveHtml =
reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT ||
Expand Down