aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-26 08:00:19 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-26 08:00:19 +0800
commit6c469a1826754d65a6845c8b6507fc96b56fb816 (patch)
tree89a13a2aace95c7ee8e4be53dbe15e1f813a4981 /ui/app/app.js
parentf9ff6cb55e35f29e95cab3b2157b58e602e6a35c (diff)
parentb3cb3e9ec67a138767bb2d6833c9056a66d46b92 (diff)
downloadtangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.gz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.bz2
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.lz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.xz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.zst
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.zip
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js5
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index a1004b74b..061545d59 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -25,7 +25,6 @@ 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')
const BuyView = require('./components/buy-button-subview')
const QrView = require('./components/qr-code')
module.exports = connect(mapStateToProps)(App)
@@ -38,7 +37,6 @@ function mapStateToProps (state) {
// state from plugin
isLoading: state.appState.isLoading,
isConfirmed: state.metamask.isConfirmed,
- isEthConfirmed: state.metamask.isEthConfirmed,
isInitialized: state.metamask.isInitialized,
isUnlocked: state.metamask.isUnlocked,
currentView: state.appState.currentView,
@@ -421,9 +419,6 @@ 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'})