diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-06-30 10:19:17 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-07-07 12:54:37 +0200 |
| commit | 5da649c239443431fe492fdf57fbdaee0099ca79 (patch) | |
| tree | 0af0fb8df25886c7e2b234a5fd8bd12ddcdfd230 /app/components | |
| parent | 14dde4abec12189a63f1ae071b300add447c2bfc (diff) | |
| download | mullvadvpn-5da649c239443431fe492fdf57fbdaee0099ca79.tar.xz mullvadvpn-5da649c239443431fe492fdf57fbdaee0099ca79.zip | |
Rename loginstate connecting->logging in
Diffstat (limited to 'app/components')
| -rw-r--r-- | app/components/Connect.js | 1 | ||||
| -rw-r--r-- | app/components/Login.js | 14 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/components/Connect.js b/app/components/Connect.js index edca72c102..173628646d 100644 --- a/app/components/Connect.js +++ b/app/components/Connect.js @@ -1,4 +1,5 @@ // @flow + import moment from 'moment'; import React, { Component } from 'react'; import { If, Then, Else } from 'react-if'; diff --git a/app/components/Login.js b/app/components/Login.js index 0427832973..e09df8c3c7 100644 --- a/app/components/Login.js +++ b/app/components/Login.js @@ -45,7 +45,7 @@ export default class Login extends Component { formTitle(s: LoginState): string { switch(s) { - case 'connecting': return 'Logging in...'; + case 'logging in': return 'Logging in...'; case 'failed': return 'Login failed'; case 'ok': return 'Login successful'; default: return 'Login'; @@ -55,7 +55,7 @@ export default class Login extends Component { formSubtitle(s: LoginState, e: ?Error): string { switch(s) { case 'failed': return (e && e.message) || 'Unknown error'; - case 'connecting': return 'Checking account number'; + case 'logging in': return 'Checking account number'; default: return 'Enter your account number'; } } @@ -68,7 +68,7 @@ export default class Login extends Component { } switch(s) { - case 'connecting': + case 'logging in': classes.push('login-form__input-wrap--inactive'); break; case 'failed': @@ -83,7 +83,7 @@ export default class Login extends Component { const classes = ['login-footer']; switch(s) { case 'ok': - case 'connecting': + case 'logging in': classes.push('login-footer--invisible'); break; } @@ -97,7 +97,7 @@ export default class Login extends Component { classes.push('login-form__submit--active'); } - if(s === 'connecting') { + if(s === 'logging in') { classes.push('login-form__submit--invisible'); } @@ -122,7 +122,7 @@ export default class Login extends Component { let isFailed = false; let isLoggedIn = false; switch(status) { - case 'connecting': isConnecting = true; break; + case 'logging in': isConnecting = true; break; case 'failed': isFailed = true; break; case 'ok': isLoggedIn = true; break; } @@ -143,7 +143,7 @@ export default class Login extends Component { <Container> <div className="login"> <div className="login-form"> - { /* show spinner when connecting */ } + { /* show spinner when logging in */ } <If condition={ isConnecting }> <Then> <div className="login-form__status-icon"> |