m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig

Browse Source 
No longer show network spinner on config screen
This commit is contained in:
Kevin Serrano 2017-07-03 15:30:51 -07:00 committed by GitHub
commit ba4a7de1a2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## Current Master ## Current Master
- No longer show network loading indication on config screen, to allow selecting custom RPCs.
- Visually indicate that network spinner is a menu. - Visually indicate that network spinner is a menu.
- Indicate what network is being searched for when disconnected. - Indicate what network is being searched for when disconnected.

2
ui/app/app.js
View File

@ -66,7 +66,7 @@ function mapStateToProps (state) {
App.prototype.render = function () { App.prototype.render = function () {
var props = this.props var props = this.props
const { isLoading, loadingMessage, transForward, network } = props const { isLoading, loadingMessage, transForward, network } = props
const isLoadingNetwork = network === 'loading' const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
const loadMessage = loadingMessage || isLoadingNetwork ? const loadMessage = loadingMessage || isLoadingNetwork ?
`Connecting to ${this.getNetworkName()}` : null `Connecting to ${this.getNetworkName()}` : null