Add connecting indication templates

feature/default_network_editable
Dan Finlay 7 years ago
parent 424e98f6a8
commit e504bc6215
  1. 15
      app/_locales/en/messages.json
  2. 33
      ui/app/app.js

@ -604,6 +604,21 @@
"ropsten": {
"message": "Ropsten Test Network"
},
"connectingToMainnet": {
"message": "Connecting to Main Ethereum Network"
},
"connectingToRopsten": {
"message": "Connecting to Ropsten Test Network"
},
"connectingToKovan": {
"message": "Connecting to Kovan Test Network"
},
"connectingToRinkeby": {
"message": "Connecting to Rinkeby Test Network"
},
"connectingToUnknown": {
"message": "Connecting to Unknown Network"
},
"sampleAccountName": {
"message": "E.g. My new account",
"description": "Help user understand concept of adding a human-readable name to their account"

@ -132,7 +132,7 @@ App.prototype.render = function () {
} = props
const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
const loadMessage = loadingMessage || isLoadingNetwork ?
`Connecting to ${this.getNetworkName()}` : null
this.getConnectingLabel() : null
log.debug('Main ui render function')
return (
@ -550,6 +550,27 @@ App.prototype.toggleMetamaskActive = function () {
}
}
App.prototype.getConnectingLabel = function () {
const { provider } = this.props
const providerName = provider.type
let name
if (providerName === 'mainnet') {
name = t('connectingToMainnet')
} else if (providerName === 'ropsten') {
name = t('connectingToRopsten')
} else if (providerName === 'kovan') {
name = t('connectingToRopsten')
} else if (providerName === 'rinkeby') {
name = t('connectingToRinkeby')
} else {
name = t('connectingToUnknown')
}
return name
}
App.prototype.getNetworkName = function () {
const { provider } = this.props
const providerName = provider.type
@ -557,15 +578,15 @@ App.prototype.getNetworkName = function () {
let name
if (providerName === 'mainnet') {
name = 'Main Ethereum Network'
name = t('mainnet')
} else if (providerName === 'ropsten') {
name = 'Ropsten Test Network'
name = t('ropsten')
} else if (providerName === 'kovan') {
name = 'Kovan Test Network'
name = t('kovan')
} else if (providerName === 'rinkeby') {
name = 'Rinkeby Test Network'
name = t('rinkeby')
} else {
name = 'Unknown Private Network'
name = t('unknownNetwork')
}
return name

Loading…
Cancel
Save