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