1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00

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

Cancel deferred actions
This commit is contained in:
David Baker
2017-06-05 21:27:13 +01:00
committed by GitHub
2 changed files with 8 additions and 0 deletions

View File

@ -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);

View File

@ -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;