Merge pull request #1007 from matrix-org/dbkr/propagate_room_join_errors

Propagate room join errors to the UI
2017-06-02 16:09:34 +01:00 · 2017-06-02 16:09:34 +01:00 · ec0ad93ad7
commit ec0ad93ad7
parent 953a573f81 ac0f2f79d1
2 changed files with 34 additions and 8 deletions
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@ -185,7 +185,6 @@ module.exports = React.createClass({
            roomLoading: RoomViewStore.isRoomLoading(),
            roomLoadError: RoomViewStore.getRoomLoadError(),
            joining: RoomViewStore.isJoining(),
-            joinError: RoomViewStore.getJoinError(),
        }, () => {
            this._onHaveRoom();
            this.onRoom(MatrixClientPeg.get().getRoom(this.state.roomId));