Merge branch 'feature/flow-typed/enums-migration'

3 files changed, 28 insertions, 31 deletions

diff --git a/app/components/Connect.js b/app/components/Connect.js
index c060986af3..0a3bd761a9 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -7,7 +7,6 @@ import cheapRuler from 'cheap-ruler';
 import { Layout, Container, Header } from './Layout';
 import { mapbox as mapboxConfig } from '../config';
 import Backend from '../lib/backend';
-import { ConnectionState } from '../enums';
 import ExternalLinkSVG from '../assets/images/icon-extLink.svg';
 
 import type HeaderBarStyle from './HeaderBar';
@@ -109,9 +108,9 @@ export default class Connect extends Component {
     const preferredServer = this.props.settings.preferredServer;
     const serverInfo = this.props.getServerInfo(preferredServer);
 
-    const isConnecting = this.props.connect.status === ConnectionState.connecting;
-    const isConnected = this.props.connect.status === ConnectionState.connected;
-    const isDisconnected = this.props.connect.status === ConnectionState.disconnected;
+    const isConnecting = this.props.connect.status === 'connecting';
+    const isConnected = this.props.connect.status === 'connected';
+    const isDisconnected = this.props.connect.status === 'disconnected';
 
     const altitude = (isConnecting ? 300 : 100) * 1000;
 
@@ -338,19 +337,19 @@ export default class Connect extends Component {
 
   headerStyle(): HeaderBarStyle {
     switch(this.props.connect.status) {
-    case ConnectionState.connecting:
-    case ConnectionState.disconnected:
+    case 'connecting':
+    case 'disconnected':
       return 'error';
-    case ConnectionState.connected:
+    case 'connected':
       return 'success';
     }
   }
 
   networkSecurityClass() {
     let classes = ['connect__status-security'];
-    if(this.props.connect.status === ConnectionState.connected) {
+    if(this.props.connect.status === 'connected') {
       classes.push('connect__status-security--secure');
-    } else if(this.props.connect.status === ConnectionState.disconnected) {
+    } else if(this.props.connect.status === 'disconnected') {
       classes.push('connect__status-security--unsecured');
     }
 
@@ -359,15 +358,15 @@ export default class Connect extends Component {
 
   networkSecurityMessage() {
     switch(this.props.connect.status) {
-    case ConnectionState.connected: return 'Secure connection';
-    case ConnectionState.connecting: return 'Creating secure connection';
+    case 'connected': return 'Secure connection';
+    case 'connecting': return 'Creating secure connection';
     default: return 'Unsecured connection';
     }
   }
 
   spinnerClass() {
     var classes = ['connect__status-icon'];
-    if(this.props.connect.status !== ConnectionState.connecting) {
+    if(this.props.connect.status !== 'connecting') {
       classes.push('connect__status-icon--hidden');
     }
     return classes.join(' ');
@@ -375,14 +374,14 @@ export default class Connect extends Component {
 
   ipAddressClass() {
     var classes = ['connect__status-ipaddress'];
-    if(this.props.connect.status === ConnectionState.connecting) {
+    if(this.props.connect.status === 'connecting') {
       classes.push('connect__status-ipaddress--invisible');
     }
     return classes.join(' ');
   }
 
   displayLocation() {
-    if(this.props.connect.status === ConnectionState.disconnected) {
+    if(this.props.connect.status === 'disconnected') {
       const { location, country, city } = this.props.user;
       return { location, country, city };
     }
diff --git a/app/components/Login.js b/app/components/Login.js
index 3e841e096f..2bcf40950e 100644
--- a/app/components/Login.js
+++ b/app/components/Login.js
@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import { If, Then } from 'react-if';
 import { Layout, Container, Header } from './Layout';
-import { LoginState } from '../enums';
 import AccountInput from './AccountInput';
 import ExternalLinkSVG from '../assets/images/icon-extLink.svg';
 import LoginArrowSVG from '../assets/images/icon-arrow.svg';
@@ -28,7 +27,7 @@ export default class Login extends Component {
     const prev = this.props.user || {};
     const next = nextProps.user || {};
 
-    if(prev.status !== next.status && next.status === LoginState.failed) {
+    if(prev.status !== next.status && next.status === 'failed') {
       this.setState({ notifyOnFirstChangeAfterFailure: true });
     }
   }
@@ -63,17 +62,17 @@ export default class Login extends Component {
 
   formTitle(s) {
     switch(s) {
-    case LoginState.connecting: return 'Logging in...';
-    case LoginState.failed: return 'Login failed';
-    case LoginState.ok: return 'Login successful';
+    case 'connecting': return 'Logging in...';
+    case 'failed': return 'Login failed';
+    case 'ok': return 'Login successful';
     default: return 'Login';
     }
   }
 
   formSubtitle(s, e) {
     switch(s) {
-    case LoginState.failed: return e.message;
-    case LoginState.connecting: return 'Checking account number';
+    case 'failed': return e.message;
+    case 'connecting': return 'Checking account number';
     default: return 'Enter your account number';
     }
   }
@@ -86,10 +85,10 @@ export default class Login extends Component {
     }
 
     switch(user.status) {
-    case LoginState.connecting:
+    case 'connecting':
       classes.push('login-form__input-wrap--inactive');
       break;
-    case LoginState.failed:
+    case 'failed':
       classes.push('login-form__input-wrap--error');
       break;
     }
@@ -100,8 +99,8 @@ export default class Login extends Component {
   footerClass(user) {
     const classes = ['login-footer'];
     switch(user.status) {
-    case LoginState.ok:
-    case LoginState.connecting:
+    case 'ok':
+    case 'connecting':
       classes.push('login-footer--invisible');
       break;
     }
@@ -115,7 +114,7 @@ export default class Login extends Component {
       classes.push('login-form__submit--active');
     }
 
-    if(user.status === LoginState.connecting) {
+    if(user.status === 'connecting') {
       classes.push('login-form__submit--invisible');
     }
 
@@ -126,9 +125,9 @@ export default class Login extends Component {
     const { account, status, error } = this.props.user;
     const title = this.formTitle(status);
     const subtitle = this.formSubtitle(status, error);
-    const isConnecting = status === LoginState.connecting;
-    const isFailed = status === LoginState.failed;
-    const isLoggedIn = status === LoginState.ok;
+    const isConnecting = status === 'connecting';
+    const isFailed = status === 'failed';
+    const isLoggedIn = status === 'ok';
 
     const inputWrapClass = this.inputWrapClass(this.props.user);
     const footerClass = this.footerClass(this.props.user);
diff --git a/app/components/Settings.js b/app/components/Settings.js
index 08a9af441b..cc8dc24f25 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -4,7 +4,6 @@ import { If, Then, Else } from 'react-if';
 import { Layout, Container, Header } from './Layout';
 import Switch from './Switch';
 import CustomScrollbars from './CustomScrollbars';
-import { LoginState } from '../enums';
 
 export default class Settings extends Component {
 
@@ -34,7 +33,7 @@ export default class Settings extends Component {
   }
 
   render() {
-    const isLoggedIn = this.props.user.status === LoginState.ok;
+    const isLoggedIn = this.props.user.status === 'ok';
     let isOutOfTime = false, formattedPaidUntil = '';
     let paidUntilIso = this.props.user.paidUntil;