Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine

1 files changed, 5 insertions, 2 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 0e8b907df..7005adb7f 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -99,7 +99,7 @@ class App extends Component {
     } = this.props
     const isLoadingNetwork = network === 'loading' && currentView.name !== 'config'
     const loadMessage = loadingMessage || isLoadingNetwork ?
-      this.getConnectingLabel() : null
+      this.getConnectingLabel(loadingMessage) : null
     log.debug('Main ui render function')
 
     return (
@@ -210,7 +210,10 @@ class App extends Component {
     }
   }
 
-  getConnectingLabel = function () {
+  getConnectingLabel = function (loadingMessage) {
+    if (loadingMessage) {
+      return loadingMessage
+    }
     const { provider } = this.props
     const providerName = provider.type