Merge pull request #1039 from matrix-org/dbkr/ilag_cancel_action

Cancel deferred actions

src/components/structures/MatrixChat.js

@@ -681,6 +681,9 @@ module.exports = React.createClass({
             homeserverUrl: MatrixClientPeg.get().getHomeserverUrl(),
             onFinished: (submitted, credentials) => {
                 if (!submitted) {
+                    dis.dispatch({
+                        action: 'cancel_after_sync_prepared',
+                    });
                     return;
                 }
                 this.onRegistered(credentials);

src/stores/LifecycleStore.js

@@ -45,6 +45,11 @@ class LifecycleStore extends Store {
                     deferred_action: payload.deferred_action,
                 });
                 break;
+            case 'cancel_after_sync_prepared':
+                this._setState({
+                    deferred_action: null,
+                });
+                break;
             case 'sync_state':
                 if (payload.state !== 'PREPARED') {
                     break;