From c33cfa52da59038be8d902843011b7696df16413 Mon Sep 17 00:00:00 2001
From: Vladimir Volek <vladimir.volek@satoshilabs.com>
Date: Wed, 31 Oct 2018 12:55:29 +0100
Subject: [PATCH] Added loader for all accounts views

---
 src/actions/SelectedAccountActions.js           | 16 ----------------
 src/views/Wallet/views/Account/Receive/index.js |  2 +-
 src/views/Wallet/views/Account/Send/index.js    |  2 +-
 src/views/Wallet/views/Account/Summary/index.js |  3 ++-
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/actions/SelectedAccountActions.js b/src/actions/SelectedAccountActions.js
index 995e1cf8..e7ed924e 100644
--- a/src/actions/SelectedAccountActions.js
+++ b/src/actions/SelectedAccountActions.js
@@ -110,13 +110,6 @@ const getAccountStatus = (state: State, selectedAccount: SelectedAccountState):
                 shouldRender: false,
             };
         }
-
-        // case 6: discovery is not completed yet
-        return {
-            type: 'info',
-            title: 'Loading accounts...',
-            shouldRender: false,
-        };
     }
 
     // Additional status: account does exists and it's visible but shouldn't be active
@@ -136,15 +129,6 @@ const getAccountStatus = (state: State, selectedAccount: SelectedAccountState):
         };
     }
 
-    // Additional status: account does exists, but waiting for discovery to complete
-    if (discovery && !discovery.completed) {
-        return {
-            type: 'info',
-            title: 'Loading accounts...',
-            shouldRender: true,
-        };
-    }
-
     return null;
 };
 
diff --git a/src/views/Wallet/views/Account/Receive/index.js b/src/views/Wallet/views/Account/Receive/index.js
index 8349f0b3..7d38c917 100644
--- a/src/views/Wallet/views/Account/Receive/index.js
+++ b/src/views/Wallet/views/Account/Receive/index.js
@@ -111,7 +111,7 @@ const AccountReceive = (props: Props) => {
     }
 
     return (
-        <Content>
+        <Content isLoading={!discovery.completed}>
             <React.Fragment>
                 <H2>Receive Ethereum or tokens</H2>
                 <AddressWrapper isShowingQrCode={addressVerified || addressUnverified}>
diff --git a/src/views/Wallet/views/Account/Send/index.js b/src/views/Wallet/views/Account/Send/index.js
index 74f17322..9dbe9a62 100644
--- a/src/views/Wallet/views/Account/Send/index.js
+++ b/src/views/Wallet/views/Account/Send/index.js
@@ -248,7 +248,7 @@ const AccountSend = (props: Props) => {
     const isAdvancedSettingsHidden = !advanced;
 
     return (
-        <Content>
+        <Content isLoading={!discovery.completed}>
             <React.Fragment>
                 <H2>Send Ethereum or tokens</H2>
                 <InputRow>
diff --git a/src/views/Wallet/views/Account/Summary/index.js b/src/views/Wallet/views/Account/Summary/index.js
index 79bc6831..d7918922 100644
--- a/src/views/Wallet/views/Account/Summary/index.js
+++ b/src/views/Wallet/views/Account/Summary/index.js
@@ -73,6 +73,7 @@ const AccountSummary = (props: Props) => {
         account,
         network,
         tokens,
+        discovery,
         pending,
         shouldRender,
     } = props.selectedAccount;
@@ -85,7 +86,7 @@ const AccountSummary = (props: Props) => {
     const balance: string = new BigNumber(account.balance).minus(pendingAmount).toString(10);
 
     return (
-        <Content>
+        <Content isLoading={!discovery.completed}>
             <React.Fragment>
                 <AccountHeading>
                     <AccountName>