Merge pull request #1049 from matrix-org/dbkr/ilag_cancel_join_on_login

Cancel 'join room' action if 'log in' is clicked

src/components/structures/RoomView.js

@@ -791,6 +791,9 @@ module.exports = React.createClass({
                     if (submitted) {
                         this.props.onRegistered(credentials);
                     } else {
+                        dis.dispatch({
+                            action: 'cancel_after_sync_prepared',
+                        });
                         dis.dispatch({
                             action: 'cancel_join',
                         });