diff options
author | Frankie <frankie.diamond@gmail.com> | 2016-07-22 04:41:10 +0800 |
---|---|---|
committer | Dan Finlay <somniac@me.com> | 2016-07-22 04:41:10 +0800 |
commit | fcd523abe4c5e8c4da7f176b2fc15578903384b7 (patch) | |
tree | 9118133325c282d01f49bc717dacabfd824aa762 /ui/app/app.js | |
parent | 6658bea8d444281491718f8eee7bc3ae42f91b69 (diff) | |
download | tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar.gz tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar.bz2 tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar.lz tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar.xz tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.tar.zst tangerine-wallet-browser-fcd523abe4c5e8c4da7f176b2fc15578903384b7.zip |
Buy button (#474)
* WIP: Buy button link
* Add buy eth and the buy eth warning message
* Add css
* Move the opening of coinbase page to background
and send to faucet if on test net
* Create a Warning about storeing eth
* Finish Buy button and Eth store warning screen
* Add to CHANGELOG
* fix frankies deletion and change chrome to extension
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 536b871b3..a11d679f1 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, @@ -324,6 +326,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'}) |