Merge pull request #936 from MetaMask/MergeMaster

Merge master

1 files changed, 7 insertions, 9 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 9538a6b93..2fa6415dd 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -15,6 +15,8 @@ const AccountsScreen = require('./accounts')
 const AccountDetailScreen = require('./account-detail')
 const SendTransactionScreen = require('./send')
 const ConfirmTxScreen = require('./conf-tx')
+// notice
+const NoticeScreen = require('./notice')
 // other views
 const ConfigScreen = require('./config')
 const InfoScreen = require('./info')
@@ -40,6 +42,7 @@ function mapStateToProps (state) {
     // state from plugin
     isLoading: state.appState.isLoading,
     isDisclaimerConfirmed: state.metamask.isDisclaimerConfirmed,
+    noActiveNotices: state.metamask.noActiveNotices,
     isInitialized: state.metamask.isInitialized,
     isUnlocked: state.metamask.isUnlocked,
     currentView: state.appState.currentView,
@@ -241,15 +244,6 @@ App.prototype.renderNetworkDropdown = function () {
     }),
 
     h(DropMenuItem, {
-      label: 'Morden Test Network',
-      closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
-      action: () => props.dispatch(actions.setProviderType('morden')),
-      icon: h('.menu-icon.red-dot'),
-      activeNetworkRender: props.network,
-      provider: props.provider,
-    }),
-
-    h(DropMenuItem, {
       label: 'Localhost 8545',
       closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
       action: () => props.dispatch(actions.setRpcTarget('http://localhost:8545')),
@@ -372,6 +366,10 @@ App.prototype.renderPrimary = function () {
     }
   }
 
+  if (!props.noActiveNotices) {
+    return h(NoticeScreen, {key: 'NoticeScreen'})
+  }
+
   // show current view
   switch (props.currentView.name) {