diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-05 04:26:03 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-05 04:26:03 +0800 |
commit | 479abadaa7dc59dc900cb35e897e0f164e3bb345 (patch) | |
tree | 07ea368e21d9c8277828e76e975f4671270b10a4 /ui/app/app.js | |
parent | 0ae5305822b86e43c7921c53456a4042b4bc8af6 (diff) | |
parent | 106cbc133f26606449746587d4a33a3b8fb3f727 (diff) | |
download | tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar.gz tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar.bz2 tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar.lz tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar.xz tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.tar.zst tangerine-wallet-browser-479abadaa7dc59dc900cb35e897e0f164e3bb345.zip |
Merge branch 'master' into usd-conversion
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index a11d679f1..cc616fb7c 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -131,6 +131,7 @@ App.prototype.renderAppBar = function () { h(NetworkIndicator, { network: this.props.network, + provider: this.props.provider, onClick: (event) => { event.preventDefault() event.stopPropagation() @@ -203,6 +204,7 @@ App.prototype.renderNetworkDropdown = function () { style: { position: 'absolute', left: 0, + top: '36px', }, innerStyle: { background: 'white', @@ -220,6 +222,16 @@ App.prototype.renderNetworkDropdown = function () { action: () => props.dispatch(actions.setProviderType('mainnet')), icon: h('.menu-icon.diamond'), activeNetworkRender: props.network, + provider: props.provider, + }), + + h(DropMenuItem, { + label: 'Ethereum Classic Network', + closeMenu: () => this.setState({ isNetworkMenuOpen: false }), + action: () => props.dispatch(actions.setProviderType('classic')), + icon: h('.menu-icon.hollow-diamond'), + activeNetworkRender: props.network, + provider: props.provider, }), h(DropMenuItem, { @@ -237,6 +249,7 @@ App.prototype.renderNetworkDropdown = function () { icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }), activeNetworkRender: props.provider.rpcTarget, }), + this.renderCustomOption(props.provider.rpcTarget), ]) } @@ -254,6 +267,7 @@ App.prototype.renderDropdown = function () { style: { position: 'absolute', right: 0, + top: '36px', }, innerStyle: { background: 'white', |