Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254

1 files changed, 25 insertions, 0 deletions

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index fabf4e563..4fea3a6d1 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -2,6 +2,8 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const AccountAndTransactionDetails = require('./account-and-transaction-details')
+const Settings = require('./components/pages/settings')
+const UnlockScreen = require('./components/pages/unlock')
 
 module.exports = MainContainer
 
@@ -23,6 +25,29 @@ MainContainer.prototype.render = function () {
     style: {},
   }
 
+  if (this.props.isUnlocked === false) {
+    switch (this.props.currentViewName) {
+      case 'config':
+        log.debug('rendering config screen from unlock screen.')
+        return h(Settings, {key: 'config'})
+      default:
+        log.debug('rendering locked screen')
+        contents = {
+          component: UnlockScreen,
+          style: {
+            boxShadow: 'none',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            background: '#F7F7F7',
+            // must force 100%, because lock screen is full-width
+            width: '100%',
+          },
+          key: 'locked',
+        }
+    }
+  }
+
   return h('div.main-container', {
     style: contents.style,
   }, [