diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-07-04 06:36:15 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-07-04 06:36:15 +0800 |
commit | d0d01552da8d0a6f58fb7c5be16947175ec90267 (patch) | |
tree | 93cfbe226dfe869e46f7d0daadf608e4103051e4 /ui/app/app.js | |
parent | 91cd849e76d81ebbb984a007979b0566e13a86c2 (diff) | |
parent | ba4a7de1a291cd079a7d32bc72b8f6c2a78a7d81 (diff) | |
download | tangerine-wallet-browser-d0d01552da8d0a6f58fb7c5be16947175ec90267.tar.gz tangerine-wallet-browser-d0d01552da8d0a6f58fb7c5be16947175ec90267.tar.zst tangerine-wallet-browser-d0d01552da8d0a6f58fb7c5be16947175ec90267.zip |
Merge branch 'master' into NewUI
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 49 |
1 files changed, 32 insertions, 17 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 8bf69b5ad..1a63002e1 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -66,9 +66,9 @@ function mapStateToProps (state) { App.prototype.render = function () { var props = this.props const { isLoading, loadingMessage, transForward, network } = props - const isLoadingNetwork = network === 'loading' + const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config' 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,21 +151,15 @@ 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, + onClick: (event) => { + event.preventDefault() + event.stopPropagation() + this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) }, - }, [ - h(NetworkIndicator, { - network: this.props.network, - provider: this.props.provider, - onClick: (event) => { - event.preventDefault() - event.stopPropagation() - this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) - }, - }), - ]), + }), ]), // metamask name @@ -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 |