diff --git a/app/containers/MessageBox/index.js b/app/containers/MessageBox/index.js index 8da731b1f..1b99166ba 100644 --- a/app/containers/MessageBox/index.js +++ b/app/containers/MessageBox/index.js @@ -856,9 +856,9 @@ class MessageBox extends Component { renderSendToChannel = () => { const { tshow } = this.state; - const { theme, tmid, replying } = this.props; + const { theme, tmid, replyWithMention } = this.props; - if (!tmid && !replying) { + if (!tmid && !replyWithMention) { return null; } return ( diff --git a/app/views/RoomView/index.js b/app/views/RoomView/index.js index a12c52271..7a7f7d9b9 100644 --- a/app/views/RoomView/index.js +++ b/app/views/RoomView/index.js @@ -552,7 +552,7 @@ class RoomView extends React.Component { } onReplyCancel = () => { - this.setState({ selectedMessage: {}, replying: false }); + this.setState({ selectedMessage: {}, replying: false, replyWithMention: false }); } onReactionInit = (message) => {