Merge branch 'update-flow-v0.78'

4 files changed, 19 insertions, 23 deletions

diff --git a/app/app.js b/app/app.js
index 8839e3d33e..eb9c9c2647 100644
--- a/app/app.js
+++ b/app/app.js
@@ -12,7 +12,6 @@ import { log } from './lib/platform';
 import ReconnectionBackoff from './lib/reconnection-backoff';
 import { DaemonRpc } from './lib/daemon-rpc';
 import { setShutdownHandler } from './shutdown-handler';
-
 import { NoAccountError } from './errors';
 
 import configureStore from './redux/store';
diff --git a/app/components/Account.js b/app/components/Account.js
index 2534a3e40c..2edf277fa4 100644
--- a/app/components/Account.js
+++ b/app/components/Account.js
@@ -23,14 +23,15 @@ export type AccountProps = {
   onBuyMore: () => void,
 };
 
-export type AccountState = {
+type State = {
   isRefreshingExpiry: boolean,
+  showAccountTokenCopiedMessage: boolean,
 };
 
-export default class Account extends Component<AccountProps, AccountState> {
+export default class Account extends Component<AccountProps, State> {
   state = {
     isRefreshingExpiry: false,
-    showAccountCopiedMessage: false,
+    showAccountTokenCopiedMessage: false,
   };
 
   _activationStateToken: ?Types.SubscriptionToken;
diff --git a/app/components/Connect.js b/app/components/Connect.js
index d472c45b31..037ab02495 100644
--- a/app/components/Connect.js
+++ b/app/components/Connect.js
@@ -80,8 +80,18 @@ export default class Connect extends Component<ConnectProps, ConnectState> {
   }
 
   renderError(error: Error) {
-    const title = error.userFriendlyTitle || 'Something went wrong';
-    const message = error.userFriendlyMessage || error.message;
+    let title = '';
+    let message = '';
+
+    if (error instanceof NoCreditError) {
+      title = 'Out of time';
+      message = 'Buy more time, so you can continue using the internet securely';
+    }
+
+    if (error instanceof NoInternetError) {
+      title = 'Offline';
+      message = 'Your internet connection will be secured when you get back online';
+    }
 
     return (
       <View style={styles.connect}>
@@ -91,7 +101,7 @@ export default class Connect extends Component<ConnectProps, ConnectState> {
         <View style={styles.status}>
           <View style={styles.error_title}>{title}</View>
           <View style={styles.error_message}>{message}</View>
-          {error.type === 'NO_CREDIT' ? (
+          {error instanceof NoCreditError ? (
             <View>
               <AppButton.GreenButton onPress={this.onExternalLink.bind(this, 'purchase')}>
                 <AppButton.Label>Buy more time</AppButton.Label>
diff --git a/app/errors.js b/app/errors.js
index 993b4d0ff1..7464851a1f 100644
--- a/app/errors.js
+++ b/app/errors.js
@@ -1,29 +1,15 @@
+// @flow
+
 export class NoCreditError extends Error {
   constructor() {
     super("Account doesn't have enough credit available for connection");
   }
-
-  get userFriendlyTitle(): string {
-    return 'Out of time';
-  }
-
-  get userFriendlyMessage(): string {
-    return 'Buy more time, so you can continue using the internet securely';
-  }
 }
 
 export class NoInternetError extends Error {
   constructor() {
     super('Internet connectivity is currently unavailable');
   }
-
-  get userFriendlyTitle(): string {
-    return 'Offline';
-  }
-
-  get userFriendlyMessage(): string {
-    return 'Your internet connection will be secured when you get back online';
-  }
 }
 
 export class NoDaemonError extends Error {