Merge pull request Expensify#20185 from bernhardoj/fix/18165-message-…

…stays-highlighted
mikesmnx · Jun 6, 2023 · 29df8b5 · 29df8b5
2 parents e063acf + 0449561
commit 29df8b5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
@@ -256,7 +256,6 @@ class PopoverReportActionContextMenu extends React.Component {
     hideDeleteModal() {
         this.callbackWhenDeleteModalHide = () => (this.onCancelDeleteModal = this.runAndResetCallback(this.onCancelDeleteModal));
         this.setState({
-            reportID: '0',
             isDeleteCommentConfirmModalVisible: false,
             shouldSetModalVisibilityForDeleteConfirmation: true,
             isArchivedRoom: false,
@@ -319,7 +318,10 @@ class PopoverReportActionContextMenu extends React.Component {
                     shouldSetModalVisibility={this.state.shouldSetModalVisibilityForDeleteConfirmation}
                     onConfirm={this.confirmDeleteAndHideModal}
                     onCancel={this.hideDeleteModal}
-                    onModalHide={this.callbackWhenDeleteModalHide}
+                    onModalHide={() => {
+                        this.setState({reportID: '0', reportAction: {}});
+                        this.callbackWhenDeleteModalHide();
+                    }}
                     prompt={this.props.translate('reportActionContextMenu.deleteConfirmation', {action: this.state.reportAction})}
                     confirmText={this.props.translate('common.delete')}
                     cancelText={this.props.translate('common.cancel')}