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

Merge pull request #1729 from MetaMask/i1707-ClarifySearchingIndication

Clarify network searching indication
This commit is contained in:
Kevin Serrano 2017-07-03 15:23:40 -07:00 committed by GitHub
commit 27c651d8da
3 changed files with 50 additions and 23 deletions

View File

@ -2,6 +2,9 @@
## Current Master
- Visually indicate that network spinner is a menu.
- Indicate what network is being searched for when disconnected.
## 3.8.1 2017-6-30
- Temporarily disabled loading popular tokens by default to improve performance.

View File

@ -68,7 +68,7 @@ App.prototype.render = function () {
const { isLoading, loadingMessage, transForward, network } = props
const isLoadingNetwork = network === 'loading'
const loadMessage = loadingMessage || isLoadingNetwork ?
'Searching for Network' : null
`Connecting to ${this.getNetworkName()}` : null
log.debug('Main ui render function')
@ -136,7 +136,7 @@ App.prototype.renderAppBar = function () {
},
}, [
h('div', {
h('div.left-menu-section', {
style: {
display: 'flex',
flexDirection: 'row',
@ -151,11 +151,6 @@ App.prototype.renderAppBar = function () {
src: '/images/icon-128.png',
}),
h('#network-spacer.flex-center', {
style: {
marginRight: '-72px',
},
}, [
h(NetworkIndicator, {
network: this.props.network,
provider: this.props.provider,
@ -166,7 +161,6 @@ App.prototype.renderAppBar = function () {
},
}),
]),
]),
// metamask name
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) {
const { rpcTarget } = provider
const props = this.props

View File

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