aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-07-04 04:51:39 +0800
committerDan Finlay <dan@danfinlay.com>2017-07-04 04:51:39 +0800
commit1503dba5ca3526e9750353c2db999dd50433837e (patch)
tree63c0037e95f446b4a81ee2f445cc4062f97150bd
parentfa533469cb6ddc5b5142afed2b4950565494d5a0 (diff)
downloadtangerine-wallet-browser-1503dba5ca3526e9750353c2db999dd50433837e.tar.gz
tangerine-wallet-browser-1503dba5ca3526e9750353c2db999dd50433837e.tar.zst
tangerine-wallet-browser-1503dba5ca3526e9750353c2db999dd50433837e.zip
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.
-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