diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-06-21 14:11:49 +0300 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-06-21 14:11:49 +0300 |
| commit | 5ae8eda0075ec72424c478fdf1ff731db43b0ff5 (patch) | |
| tree | c642e59864520408cbe8c1f7967cf814fdee43e8 /app/lib | |
| parent | 7950d83c2d70c72bb08415d8ecf823d85ce7bd35 (diff) | |
| parent | 00c6ccf614bc92b72262e4ac57e8d602573ffc65 (diff) | |
| download | mullvadvpn-5ae8eda0075ec72424c478fdf1ff731db43b0ff5.tar.xz mullvadvpn-5ae8eda0075ec72424c478fdf1ff731db43b0ff5.zip | |
Merge branch 'feature/flow-typed/enums-migration'
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/backend-redux-actions.js | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/app/lib/backend-redux-actions.js b/app/lib/backend-redux-actions.js index 4e3dd63323..50bfd22943 100644 --- a/app/lib/backend-redux-actions.js +++ b/app/lib/backend-redux-actions.js @@ -1,7 +1,6 @@ import userActions from '../actions/user'; import connectActions from '../actions/connect'; import Backend from './backend'; -import { LoginState, ConnectionState } from '../enums'; import log from 'electron-log'; /** @@ -22,7 +21,7 @@ export default function mapBackendEventsToReduxActions(backend, store) { const onConnecting = (serverAddress) => { store.dispatch(connectActions.connectionChange({ - status: ConnectionState.connecting, + status: 'connecting', serverAddress })); }; @@ -31,33 +30,33 @@ export default function mapBackendEventsToReduxActions(backend, store) { if (error) { log.error('Unable to connect to', serverAddress, error); } else { - store.dispatch(connectActions.connectionChange({ status: ConnectionState.connected })); + store.dispatch(connectActions.connectionChange({ status: 'connected' })); } }; const onDisconnect = () => { store.dispatch(connectActions.connectionChange({ - status: ConnectionState.disconnected, + status: 'disconnected', serverAddress: null })); }; const onLoggingIn = (info) => { store.dispatch(userActions.loginChange(Object.assign({ - status: LoginState.connecting, + status: 'connecting', error: null }, info))); }; const onLogin = (info, error) => { - const status = error ? LoginState.failed : LoginState.ok; + const status = error ? 'failed' : 'ok'; const paidUntil = info.paidUntil ? info.paidUntil : null; store.dispatch(userActions.loginChange({ paidUntil, status, error })); }; const onLogout = () => { store.dispatch(userActions.loginChange({ - status: LoginState.none, + status: 'none', account: '', paidUntil: null, error: null |
