1 files changed, 8 insertions, 4 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 7669a5db9..14b199b8e 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -7,7 +7,7 @@ const h = require('react-hyperscript')
 const actions = require('./actions')
 const classnames = require('classnames')
 const log = require('loglevel')
-const { getMetaMaskAccounts } = require('./selectors')
+const { getMetaMaskAccounts, getNetworkIdentifier } = require('./selectors')
 
 // init
 const InitializeScreen = require('../../mascara/src/app/first-time').default
@@ -32,6 +32,7 @@ const CreateAccountPage = require('./components/pages/create-account')
 const NoticeScreen = require('./components/pages/notice')
 
 const Loading = require('./components/loading-screen')
+const LoadingNetwork = require('./components/loading-network-screen').default
 const NetworkDropdown = require('./components/dropdowns/network-dropdown')
 const AccountMenu = require('./components/account-menu')
 
@@ -169,9 +170,10 @@ class App extends Component {
         h(AccountMenu),
 
         h('div.main-container-wrapper', [
-          (isLoading || isLoadingNetwork) && h(Loading, {
+          isLoading && h(Loading, {
             loadingMessage: loadMessage,
           }),
+          !isLoading && isLoadingNetwork && h(LoadingNetwork),
 
           // content
           this.renderRoutes(),
@@ -196,7 +198,7 @@ class App extends Component {
     if (loadingMessage) {
       return loadingMessage
     }
-    const { provider } = this.props
+    const { provider, providerId } = this.props
     const providerName = provider.type
 
     let name
@@ -210,7 +212,7 @@ class App extends Component {
     } else if (providerName === 'rinkeby') {
       name = this.context.t('connectingToRinkeby')
     } else {
-      name = this.context.t('connectingToUnknown')
+      name = this.context.t('connectingTo', [providerId])
     }
 
     return name
@@ -279,6 +281,7 @@ App.propTypes = {
   isMouseUser: PropTypes.bool,
   setMouseUserState: PropTypes.func,
   t: PropTypes.func,
+  providerId: PropTypes.string,
 }
 
 function mapStateToProps (state) {
@@ -348,6 +351,7 @@ function mapStateToProps (state) {
     isRevealingSeedWords: state.metamask.isRevealingSeedWords,
     Qr: state.appState.Qr,
     welcomeScreenSeen: state.metamask.welcomeScreenSeen,
+    providerId: getNetworkIdentifier(state),
 
     // state needed to get account dropdown temporarily rendering from app bar
     identities,