Merge branch 'main' into marcaaron-editManualRequests

Expensify · Jun 21, 2023 · 50f15c8 · 50f15c8
2 parents 1f8a90d + c819a32
commit 50f15c8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/pages/FlagCommentPage.js b/src/pages/FlagCommentPage.js
@@ -116,7 +116,7 @@ function FlagCommentPage(props) {
         let reportID = getReportID(props.route);
 
         // Handle threads if needed
-        if (reportAction === undefined) {
+        if (reportAction === undefined || reportAction.reportActionID === undefined) {
             reportID = ReportUtils.getParentReport(props.report).reportID;
             reportAction = ReportActionsUtils.getParentReportAction(props.report);
         }