aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/app.js2
2 files changed, 3 insertions, 1 deletions
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