Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory

Reuse showRoom for onJoinClick so we join using alias if its available

src/components/structures/RoomDirectory.js

@@ -389,13 +389,7 @@ module.exports = createReactClass({
     },
 
     onJoinClick: function(ev, room) {
-        this.props.onFinished();
+        this.showRoom(room, null, true);
-        MatrixClientPeg.get().joinRoom(room.room_id);
-        dis.dispatch({
-            action: 'view_room',
-            room_id: room.room_id,
-            joining: true,
-        });
         ev.stopPropagation();
     },