From 1503dba5ca3526e9750353c2db999dd50433837e Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Mon, 3 Jul 2017 13:51:39 -0700
Subject: [PATCH] No longer show network spinner on config screen

The config screen is used to select networks, so we must not block it with network loading indication.
---
 CHANGELOG.md  | 2 ++
 ui/app/app.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abb8f24f5..16472e8e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- No longer show network loading indication on config screen, to allow selecting custom RPCs.
+
 ## 3.8.1 2017-6-30
 
 - Temporarily disabled loading popular tokens by default to improve performance.
diff --git a/ui/app/app.js b/ui/app/app.js
index 8bf69b5ad..e4f312bf4 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 ?
     'Searching for Network' : null