diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-07-07 14:01:01 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-07 14:01:01 +0200 |
| commit | 249a7bd02f3be3e3a5dc4925775cddd63da3cbae (patch) | |
| tree | 3033099f2a3081618e05531a5e828b910b25c244 /app/app.js | |
| parent | 14dde4abec12189a63f1ae071b300add447c2bfc (diff) | |
| parent | 16ee9a212560f0a1989dc278cb9281152307275d (diff) | |
| download | mullvadvpn-249a7bd02f3be3e3a5dc4925775cddd63da3cbae.tar.xz mullvadvpn-249a7bd02f3be3e3a5dc4925775cddd63da3cbae.zip | |
Merge branch 'state-refactoring'
Diffstat (limited to 'app/app.js')
| -rw-r--r-- | app/app.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/app.js b/app/app.js index 1e56830880..f0fa27e4f1 100644 --- a/app/app.js +++ b/app/app.js @@ -24,14 +24,14 @@ const store = configureStore(initialState, memoryHistory); const backend = new Backend(store); // reset login state if user quit the app during login -if((['connecting', 'failed']: Array<LoginState>).includes(store.getState().account.status)) { +if((['logging in', 'failed']: Array<LoginState>).includes(store.getState().account.status)) { store.dispatch(accountActions.loginChange({ status: 'none' })); } -// reset connection state if user quit the app when connecting -if(store.getState().connection.status === 'connecting') { +// reset connection state if user quit the app when logging in +if(store.getState().connection.status === 'logging in') { store.dispatch(connectionActions.connectionChange({ status: 'disconnected' })); |
