fix: ReportActionContextMenu.isActiveReportAction

jabezX · Sep 14, 2023 · 4e9083f · 4e9083f
1 parent c24df9c
commit 4e9083f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -23,6 +23,7 @@ class PopoverReportActionContextMenu extends React.Component {
             reportID: '0',
             reportActionID: '0',
             originalReportID: '0',
+            reportAction: {},
             selection: '',
             reportActionDraftMessage: '',
             isPopoverVisible: false,
@@ -114,7 +115,7 @@ class PopoverReportActionContextMenu extends React.Component {
      * @return {Boolean}
      */
     isActiveReportAction(actionID) {
-        return Boolean(actionID) && this.state.reportActionID === actionID;
+        return Boolean(actionID) && (this.state.reportActionID === actionID || this.state.reportAction.reportActionID === actionID);
     }
 
     clearActiveReportAction() {

diff --git a/src/pages/tasks/TaskDescriptionPage.js b/src/pages/tasks/TaskDescriptionPage.js
@@ -125,4 +125,4 @@ export default compose(
             key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
         },
     }),
-)(TaskDescriptionPage);
+)(TaskDescriptionPage);