diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-07-04 06:30:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 06:30:51 +0800 |
| commit | ba4a7de1a291cd079a7d32bc72b8f6c2a78a7d81 (patch) | |
| tree | 325b1da321f0051ae40d8cfad8f860c2a3a2fba8 | |
| parent | 27c651d8da3a9d8956c6b8a119a51a3382c449fe (diff) | |
| parent | 36e0fef8548b098078350ad0658173d6a4154cd1 (diff) | |
| download | tangerine-wallet-browser-ba4a7de1a291cd079a7d32bc72b8f6c2a78a7d81.tar.gz tangerine-wallet-browser-ba4a7de1a291cd079a7d32bc72b8f6c2a78a7d81.tar.zst tangerine-wallet-browser-ba4a7de1a291cd079a7d32bc72b8f6c2a78a7d81.zip | |
Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig
No longer show network spinner on config screen
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ui/app/app.js | 2 |
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 |