aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-11 04:43:01 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-11 04:43:01 +0800
commit9c6dd9ef4953f6e421feb6e6684ef43da26f6b75 (patch)
tree309366cc31236440709705e0a9a9e7eb183801a3 /ui/app/app.js
parent667483ac2037bef5b412ce33f0d9bb0605d6c13b (diff)
downloadtangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar.gz
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar.bz2
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar.lz
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar.xz
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.tar.zst
tangerine-wallet-browser-9c6dd9ef4953f6e421feb6e6684ef43da26f6b75.zip
Create "buy form" add shape shift
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js17
1 files changed, 17 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 536b871b3..b8deedc13 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -27,6 +27,7 @@ const MenuDroppo = require('menu-droppo')
const DropMenuItem = require('./components/drop-menu-item')
const NetworkIndicator = require('./components/network')
const Tooltip = require('./components/tooltip')
+const EthStoreWarning = require('./eth-store-warning')
module.exports = connect(mapStateToProps)(App)
@@ -37,6 +38,7 @@ function mapStateToProps (state) {
return {
// state from plugin
isConfirmed: state.metamask.isConfirmed,
+ isEthConfirmed: state.metamask.isEthConfirmed,
isInitialized: state.metamask.isInitialized,
isUnlocked: state.metamask.isUnlocked,
currentView: state.appState.currentView,
@@ -129,6 +131,7 @@ App.prototype.renderAppBar = function () {
h(NetworkIndicator, {
network: this.props.network,
+ provider: this.props.provider,
onClick: (event) => {
event.preventDefault()
event.stopPropagation()
@@ -201,6 +204,7 @@ App.prototype.renderNetworkDropdown = function () {
style: {
position: 'absolute',
left: 0,
+ top: '36px',
},
innerStyle: {
background: 'white',
@@ -218,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, {
@@ -235,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),
])
}
@@ -324,6 +339,8 @@ App.prototype.renderPrimary = function () {
// show current view
switch (props.currentView.name) {
+ case 'EthStoreWarning':
+ return h(EthStoreWarning, {key: 'ethWarning'})
case 'accounts':
return h(AccountsScreen, {key: 'accounts'})