Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig

No longer show network spinner on config screen

2 files changed, 2 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddaa8a049..07f55bf2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Current Master
 
+- No longer show network loading indication on config screen, to allow selecting custom RPCs.
 - Visually indicate that network spinner is a menu.
 - Indicate what network is being searched for when disconnected.
 
diff --git a/ui/app/app.js b/ui/app/app.js
index 8fb424786..1a63002e1 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -66,7 +66,7 @@ function mapStateToProps (state) {
 App.prototype.render = function () {
   var props = this.props
   const { isLoading, loadingMessage, transForward, network } = props
-  const isLoadingNetwork = network === 'loading'
+  const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
   const loadMessage = loadingMessage || isLoadingNetwork ?
     `Connecting to ${this.getNetworkName()}` : null