Merge pull request #1062 from matrix-org/luke/fix-rvs-join-by-alias

When joining, use a roomAlias if we have it

src/stores/RoomViewStore.js

@@ -185,7 +185,9 @@ class RoomViewStore extends Store {
         this._setState({
             joining: true,
         });
-        MatrixClientPeg.get().joinRoom(this._state.roomId, payload.opts).done(() => {
+        MatrixClientPeg.get().joinRoom(
+            this._state.roomAlias || this._state.roomId, payload.opts,
+        ).done(() => {
             dis.dispatch({
                 action: 'joined_room',
             });