diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js index 6af89e25dbb6..8c1af5282558 100644 --- a/src/pages/home/report/ReportActionCompose.js +++ b/src/pages/home/report/ReportActionCompose.js @@ -190,9 +190,13 @@ class ReportActionCompose extends React.Component { this.setMaxLines(); } + // Value state does not have the same value as comment props when the comment gets changed from another tab. + // In this case, we should synchronize the value between tabs. + const shouldSyncComment = prevProps.comment !== this.props.comment && this.state.value !== this.props.comment; + // As the report IDs change, make sure to update the composer comment as we need to make sure // we do not show incorrect data in there (ie. draft of message from other report). - if (this.props.report.reportID === prevProps.report.reportID) { + if (this.props.report.reportID === prevProps.report.reportID && !shouldSyncComment) { return; }