Merge pull request #1727 from MetaMask/i1720-NoSpinnerOnConfig

No longer show network spinner on config screen
feature/default_network_editable
Kevin Serrano 8 years ago committed by GitHub
commit ba4a7de1a2
  1. 1
      CHANGELOG.md
  2. 2
      ui/app/app.js

@ -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.

@ -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

Loading…
Cancel
Save