diff options
| author | Andrej Mihajlov <and@codeispoetry.ru> | 2017-03-03 13:37:58 +0000 |
|---|---|---|
| committer | Andrej Mihajlov <and@codeispoetry.ru> | 2017-03-03 13:37:58 +0000 |
| commit | 57aad97bc31129b78619ea16cf51828df8a058e3 (patch) | |
| tree | 005245feaad138ca836b5c32b71b1da620505128 | |
| parent | 94496a26d622c58d6f4e923f51754bbad42f6e23 (diff) | |
| download | mullvadvpn-57aad97bc31129b78619ea16cf51828df8a058e3.tar.xz mullvadvpn-57aad97bc31129b78619ea16cf51828df8a058e3.zip | |
Fix listing issues
| -rw-r--r-- | app/components/Settings.js | 20 | ||||
| -rw-r--r-- | app/lib/backend-redux-actions.js | 3 | ||||
| -rw-r--r-- | test/reducers.spec.js | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js index a196c7597b..153627b646 100644 --- a/app/components/Settings.js +++ b/app/components/Settings.js @@ -54,17 +54,19 @@ export default class Settings extends Component { { /* show account options when logged in */ } <If condition={ isLoggedIn }> - <div> - <div className="settings__cell"> - <div className="settings__cell-label">Auto-secure</div> - <div className="settings__cell-value"> - <Switch onChange={ ::this.onAutoSecure } isOn={ this.props.settings.autoSecure } /> + <Then> + <div> + <div className="settings__cell"> + <div className="settings__cell-label">Auto-secure</div> + <div className="settings__cell-value"> + <Switch onChange={ ::this.onAutoSecure } isOn={ this.props.settings.autoSecure } /> + </div> + </div> + <div className="settings__cell-footer"> + When this device connects to the internet it will automatically connect to a secure server </div> </div> - <div className="settings__cell-footer"> - When this device connects to the internet it will automatically connect to a secure server - </div> - </div> + </Then> </If> <div className="settings__cell settings__cell--active" onClick={ this.onExternalLink.bind(this, 'faq') }> diff --git a/app/lib/backend-redux-actions.js b/app/lib/backend-redux-actions.js index f7ddb05008..5718278dde 100644 --- a/app/lib/backend-redux-actions.js +++ b/app/lib/backend-redux-actions.js @@ -1,4 +1,3 @@ -import { replace } from 'react-router-redux'; import userActions from '../actions/user'; import connectActions from '../actions/connect'; import Backend from './backend'; @@ -58,4 +57,4 @@ export default function mapBackendEventsToReduxActions(backend, store) { backend.on(Backend.EventType.logging, onLoggingIn); backend.on(Backend.EventType.login, onLogin); backend.on(Backend.EventType.logout, onLogout); -}; +} diff --git a/test/reducers.spec.js b/test/reducers.spec.js index 96937250c5..8a5402c3e8 100644 --- a/test/reducers.spec.js +++ b/test/reducers.spec.js @@ -15,7 +15,7 @@ describe('reducers', () => { status: LoginState.failed, error: new Error('Something went wrong') } - } + }; const test = Object.assign({}, action.payload); expect(userReducer({}, action)).to.deep.equal(test); }); |