Merge branch 'master' into i1720-NoSpinnerOnConfig

feature/default_network_editable
Kevin Serrano 8 years ago committed by GitHub
commit 36e0fef854
  1. 2
      CHANGELOG.md
  2. 31
      ui/app/app.js
  3. 17
      ui/app/components/network.js

@ -3,6 +3,8 @@
## Current Master ## Current Master
- No longer show network loading indication on config screen, to allow selecting custom RPCs. - 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.
## 3.8.1 2017-6-30 ## 3.8.1 2017-6-30

@ -68,7 +68,7 @@ App.prototype.render = function () {
const { isLoading, loadingMessage, transForward, network } = props const { isLoading, loadingMessage, transForward, network } = props
const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config' const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
const loadMessage = loadingMessage || isLoadingNetwork ? const loadMessage = loadingMessage || isLoadingNetwork ?
'Searching for Network' : null `Connecting to ${this.getNetworkName()}` : null
log.debug('Main ui render function') log.debug('Main ui render function')
@ -136,7 +136,7 @@ App.prototype.renderAppBar = function () {
}, },
}, [ }, [
h('div', { h('div.left-menu-section', {
style: { style: {
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
@ -151,11 +151,6 @@ App.prototype.renderAppBar = function () {
src: '/images/icon-128.png', src: '/images/icon-128.png',
}), }),
h('#network-spacer.flex-center', {
style: {
marginRight: '-72px',
},
}, [
h(NetworkIndicator, { h(NetworkIndicator, {
network: this.props.network, network: this.props.network,
provider: this.props.provider, provider: this.props.provider,
@ -166,7 +161,6 @@ App.prototype.renderAppBar = function () {
}, },
}), }),
]), ]),
]),
// metamask name // metamask name
props.isUnlocked && h('h1', { props.isUnlocked && h('h1', {
@ -555,6 +549,27 @@ App.prototype.renderCustomOption = function (provider) {
} }
} }
App.prototype.getNetworkName = function () {
const { provider } = this.props
const providerName = provider.type
let name
if (providerName === 'mainnet') {
name = 'Main Ethereum Network'
} else if (providerName === 'ropsten') {
name = 'Ropsten Test Network'
} else if (providerName === 'kovan') {
name = 'Kovan Test Network'
} else if (providerName === 'rinkeby') {
name = 'Rinkeby Test Network'
} else {
name = 'Unknown Private Network'
}
return name
}
App.prototype.renderCommonRpc = function (rpcList, provider) { App.prototype.renderCommonRpc = function (rpcList, provider) {
const { rpcTarget } = provider const { rpcTarget } = provider
const props = this.props const props = this.props

@ -22,15 +22,24 @@ Network.prototype.render = function () {
let iconName, hoverText let iconName, hoverText
if (networkNumber === 'loading') { if (networkNumber === 'loading') {
return h('img.network-indicator', { return h('span', {
title: 'Attempting to connect to blockchain.', style: {
display: 'flex',
alignItems: 'center',
flexDirection: 'row',
},
onClick: (event) => this.props.onClick(event), onClick: (event) => this.props.onClick(event),
}, [
h('img', {
title: 'Attempting to connect to blockchain.',
style: { style: {
width: '27px', width: '27px',
marginRight: '-27px',
}, },
src: 'images/loading.svg', src: 'images/loading.svg',
}) }),
h('i.fa.fa-sort-desc'),
])
} else if (providerName === 'mainnet') { } else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network' hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network' iconName = 'ethereum-network'

Loading…
Cancel
Save