1 files changed, 62 insertions, 56 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index ad56df8db..67c78b31c 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -15,8 +15,12 @@ const AccountsScreen = require('./accounts')
 const AccountDetailScreen = require('./account-detail')
 const SendTransactionScreen = require('./send')
 const ConfirmTxScreen = require('./conf-tx')
+// notice
+const NoticeScreen = require('./components/notice')
+const generateLostAccountsNotice = require('../lib/lost-accounts-notice')
 // other views
 const ConfigScreen = require('./config')
+const Import = require('./accounts/import')
 const InfoScreen = require('./info')
 const LoadingIndicator = require('./components/loading')
 const SandwichExpando = require('sandwich-expando')
@@ -40,7 +44,8 @@ function mapStateToProps (state) {
   return {
     // state from plugin
     isLoading: state.appState.isLoading,
-    isConfirmed: state.metamask.isConfirmed,
+    isDisclaimerConfirmed: state.metamask.isDisclaimerConfirmed,
+    noActiveNotices: state.metamask.noActiveNotices,
     isInitialized: state.metamask.isInitialized,
     isUnlocked: state.metamask.isUnlocked,
     currentView: state.appState.currentView,
@@ -53,6 +58,8 @@ function mapStateToProps (state) {
     network: state.metamask.network,
     provider: state.metamask.provider,
     forgottenPassword: state.appState.forgottenPassword,
+    lastUnreadNotice: state.metamask.lastUnreadNotice,
+    lostAccounts: state.metamask.lostAccounts,
   }
 }
 
@@ -91,7 +98,6 @@ App.prototype.render = function () {
           transitionLeaveTimeout: 300,
         }, [
           this.renderPrimary(),
-          this.renderBackToInitButton(),
         ]),
       ]),
     ])
@@ -99,7 +105,6 @@ App.prototype.render = function () {
 }
 
 App.prototype.renderAppBar = function () {
-
   if (window.METAMASK_UI_TYPE === 'notification') {
     return null
   }
@@ -138,15 +143,21 @@ App.prototype.renderAppBar = function () {
             src: '/images/icon-128.png',
           }),
 
-          h(NetworkIndicator, {
-            network: this.props.network,
-            provider: this.props.provider,
-            onClick: (event) => {
-              event.preventDefault()
-              event.stopPropagation()
-              this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen })
+          h('#network-spacer.flex-center', {
+            style: {
+              marginRight: '-72px',
             },
-          }),
+          }, [
+            h(NetworkIndicator, {
+              network: this.props.network,
+              provider: this.props.provider,
+              onClick: (event) => {
+                event.preventDefault()
+                event.stopPropagation()
+                this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen })
+              },
+            }),
+          ]),
         ]),
 
         // metamask name
@@ -235,7 +246,7 @@ App.prototype.renderNetworkDropdown = function () {
     }),
 
     h(DropMenuItem, {
-      label: 'Morden Test Network',
+      label: 'Ropsten Test Network',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setProviderType('testnet')),
       icon: h('.menu-icon.red-dot'),
@@ -251,7 +262,15 @@ App.prototype.renderNetworkDropdown = function () {
       activeNetworkRender: props.provider.rpcTarget,
     }),
 
-    this.renderCustomOption(props.provider.rpcTarget),
+    this.renderCustomOption(props.provider),
+
+    h(DropMenuItem, {
+      label: 'Custom RPC',
+      closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
+      action: () => this.props.dispatch(actions.showConfigPage()),
+      icon: h('i.fa.fa-question-circle.fa-lg'),
+    }),
+
   ])
 }
 
@@ -288,6 +307,13 @@ App.prototype.renderDropdown = function () {
     }),
 
     h(DropMenuItem, {
+      label: 'Import Account',
+      closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
+      action: () => this.props.dispatch(actions.showImportPage()),
+      icon: h('i.fa.fa-arrow-circle-o-up.fa-lg'),
+    }),
+
+    h(DropMenuItem, {
       label: 'Lock',
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
       action: () => this.props.dispatch(actions.lockMetamask()),
@@ -322,43 +348,10 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
   )
 }
 
-App.prototype.renderBackToInitButton = function () {
-  var props = this.props
-  var button = null
-  if (!props.isConfirmed) return button
-
-  if (!props.isUnlocked) {
-    if (props.currentView.name === 'InitMenu') {
-      button = props.forgottenPassword ? h('.flex-row', {
-        key: 'rightArrow',
-        style: {
-          position: 'absolute',
-          bottom: '10px',
-          right: '15px',
-          fontSize: '21px',
-          fontFamily: 'Montserrat Light',
-          color: '#7F8082',
-          width: '77.578px',
-          alignItems: 'flex-end',
-        },
-      }, [
-        h('div.cursor-pointer', {
-          style: {
-            marginRight: '3px',
-          },
-          onClick: () => props.dispatch(actions.backToUnlockView()),
-        }, 'LOGIN'),
-        h('i.fa.fa-arrow-right.cursor-pointer'),
-      ]) : null
-    }
-  }
-  return button
-}
-
 App.prototype.renderPrimary = function () {
   var props = this.props
 
-  if (!props.isConfirmed) {
+  if (!props.isDisclaimerConfirmed) {
     return h(DisclaimerScreen, {key: 'disclaimerScreen'})
   }
 
@@ -368,7 +361,6 @@ App.prototype.renderPrimary = function () {
 
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
-
     // show current view
     switch (props.currentView.name) {
 
@@ -392,6 +384,21 @@ App.prototype.renderPrimary = function () {
     }
   }
 
+  // notices
+  if (!props.noActiveNotices) {
+    return h(NoticeScreen, {
+      notice: props.lastUnreadNotice,
+      key: 'NoticeScreen',
+      onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)),
+    })
+  } else if (props.lostAccounts && props.lostAccounts.length > 0) {
+    return h(NoticeScreen, {
+      notice: generateLostAccountsNotice(props.lostAccounts),
+      key: 'LostAccountsNotice',
+      onConfirm: () => props.dispatch(actions.markAccountsFound()),
+    })
+  }
+
   // show current view
   switch (props.currentView.name) {
 
@@ -416,6 +423,9 @@ App.prototype.renderPrimary = function () {
     case 'config':
       return h(ConfigScreen, {key: 'config'})
 
+    case 'import-menu':
+      return h(Import, {key: 'import-menu'})
+
     case 'reveal-seed-conf':
       return h(RevealSeedConfirmation, {key: 'reveal-seed-conf'})
 
@@ -469,15 +479,11 @@ App.prototype.toggleMetamaskActive = function () {
   }
 }
 
-App.prototype.renderCustomOption = function (rpcTarget) {
+App.prototype.renderCustomOption = function (provider) {
+  const { rpcTarget, type } = provider
+  if (type !== 'rpc') return null
+
   switch (rpcTarget) {
-    case undefined:
-      return h(DropMenuItem, {
-        label: 'Custom RPC',
-        closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-        action: () => this.props.dispatch(actions.showConfigPage()),
-        icon: h('i.fa.fa-question-circle.fa-lg'),
-      })
 
     case 'http://localhost:8545':
       return null