From af6392d7ca77346a3fc0a82f8be4c303657a203e Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 15 Jun 2017 22:57:41 +0100 Subject: [PATCH] Fix URL previews and also things like the unsent message error and encryption warning. Stuff that we need to do at room view mount time had got moved into a clause of the if statement in onHaveRoom and so wasn't being executed. Fixes https://github.com/vector-im/riot-web/issues/4327 --- src/components/structures/RoomView.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index c1f59c8e28..9afec13e20 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -230,6 +230,10 @@ module.exports = React.createClass({ if (room) { this._updateAutoComplete(room); this.tabComplete.loadEntries(room); + this.setState({ + unsentMessageError: this._getUnsentMessageError(room), + }); + this._onRoomLoaded(room); } if (!this.state.joining && this.state.roomId) { if (this.props.autoJoin) { @@ -262,10 +266,6 @@ module.exports = React.createClass({ } else if (room) { // Stop peeking because we have joined this room previously MatrixClientPeg.get().stopPeeking(); - this.setState({ - unsentMessageError: this._getUnsentMessageError(room), - }); - this._onRoomLoaded(room); } },