Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.

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'})