From ca1a4b309676c3d10473acf4869b398d4ed50fb7 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Sun, 30 Jul 2017 20:42:12 -0700
Subject: Add layout for main container elements

---
 ui/app/main-container.js | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 ui/app/main-container.js

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
new file mode 100644
index 000000000..ca68ba6b0
--- /dev/null
+++ b/ui/app/main-container.js
@@ -0,0 +1,41 @@
+const Component = require('react').Component
+const h = require('react-hyperscript')
+const inherits = require('util').inherits
+
+module.exports = MainContainer
+
+inherits(MainContainer, Component)
+function MainContainer () {
+  Component.call(this)
+}
+
+MainContainer.prototype.render = function () {
+  console.log("rendering MainContainer...");
+  return h('div.flex-row', {
+    style: {
+      position: 'absolute',
+      marginTop: '6vh',
+      width: '98%',
+      zIndex: 20,
+    }
+  }, [
+    h('div.wallet-view', {
+      style: {
+        flexGrow: 1,
+        height: '82vh',
+        background: 'blue',
+      }
+    }, [
+    ]),
+
+    h('div.tx-view', {
+      style: {
+        flexGrow: 2,
+        height: '82vh',
+        background: 'green',
+      }
+    }, [
+    ]),
+  ])
+}
+
-- 
cgit 


From cbd53d4601f1af5aa4337e86ea8875606406e803 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Sun, 30 Jul 2017 21:25:32 -0700
Subject: Add containers for wallet view and dropdown UI

---
 ui/app/main-container.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index ca68ba6b0..c1f7db0d8 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -1,6 +1,7 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
+const WalletView = require('./components/wallet-view')
 
 module.exports = MainContainer
 
@@ -19,11 +20,10 @@ MainContainer.prototype.render = function () {
       zIndex: 20,
     }
   }, [
-    h('div.wallet-view', {
+    h(WalletView, {
       style: {
         flexGrow: 1,
         height: '82vh',
-        background: 'blue',
       }
     }, [
     ]),
@@ -32,7 +32,7 @@ MainContainer.prototype.render = function () {
       style: {
         flexGrow: 2,
         height: '82vh',
-        background: 'green',
+        background: '#FFFFFF',
       }
     }, [
     ]),
-- 
cgit 


From 4cdfd00f58082a26b8835a7c17ed4c964ec24c9e Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Sun, 30 Jul 2017 21:35:27 -0700
Subject: Add box shadow to main container

---
 ui/app/main-container.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index c1f7db0d8..f64009539 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -18,6 +18,7 @@ MainContainer.prototype.render = function () {
       marginTop: '6vh',
       width: '98%',
       zIndex: 20,
+      boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
     }
   }, [
     h(WalletView, {
-- 
cgit 


From 0ca50dfb1b990dadc702b178fad7e6434b71167a Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Sun, 30 Jul 2017 21:53:13 -0700
Subject: Center account name and dropdowns

---
 ui/app/main-container.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index f64009539..f891402ac 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -23,15 +23,15 @@ MainContainer.prototype.render = function () {
   }, [
     h(WalletView, {
       style: {
-        flexGrow: 1,
-        height: '82vh',
+        // width: '33.33%',
+        // height: '82vh',
       }
     }, [
     ]),
 
     h('div.tx-view', {
       style: {
-        flexGrow: 2,
+        width: '66.66%',
         height: '82vh',
         background: '#FFFFFF',
       }
-- 
cgit 


From 2d5c3394f493868a2eb5706e8b42127252c9b746 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Mon, 31 Jul 2017 20:46:56 -0700
Subject: Use DIN OT in wallet view

---
 ui/app/main-container.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index f891402ac..cc61860b6 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -11,7 +11,7 @@ function MainContainer () {
 }
 
 MainContainer.prototype.render = function () {
-  console.log("rendering MainContainer...");
+
   return h('div.flex-row', {
     style: {
       position: 'absolute',
@@ -19,6 +19,7 @@ MainContainer.prototype.render = function () {
       width: '98%',
       zIndex: 20,
       boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
+      fontFamily: 'DIN OT',
     }
   }, [
     h(WalletView, {
-- 
cgit 


From c876428044c8e6eec300ceeb0d7ab0c44e68f8d3 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Mon, 31 Jul 2017 21:16:07 -0700
Subject: Add TxView, use width percentages instead of flex-grow for layout

---
 ui/app/main-container.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index cc61860b6..88028f8eb 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -2,6 +2,7 @@ const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const WalletView = require('./components/wallet-view')
+const TxView = require('./components/tx-view')
 
 module.exports = MainContainer
 
@@ -20,6 +21,7 @@ MainContainer.prototype.render = function () {
       zIndex: 20,
       boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
       fontFamily: 'DIN OT',
+      display: 'flex',
     }
   }, [
     h(WalletView, {
@@ -30,11 +32,12 @@ MainContainer.prototype.render = function () {
     }, [
     ]),
 
-    h('div.tx-view', {
+    h(TxView, {
       style: {
-        width: '66.66%',
-        height: '82vh',
-        background: '#FFFFFF',
+        // flexGrow: 2
+        // width: '66.66%',
+        // height: '82vh',
+        // background: '#FFFFFF',
       }
     }, [
     ]),
-- 
cgit 


From a7fc5126502a9c69aaa727178997ea4ed703c2d6 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Mon, 31 Jul 2017 23:07:58 -0700
Subject: Implement mobile-friendly responsive layout with flex wrap

---
 ui/app/main-container.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 88028f8eb..ae62a0e0c 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -13,7 +13,7 @@ function MainContainer () {
 
 MainContainer.prototype.render = function () {
 
-  return h('div.flex-row', {
+  return h('div', {
     style: {
       position: 'absolute',
       marginTop: '6vh',
@@ -22,6 +22,9 @@ MainContainer.prototype.render = function () {
       boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
       fontFamily: 'DIN OT',
       display: 'flex',
+      flexWrap: 'wrap',
+      alignItems: 'stretch',
+      overflowY: 'scroll',
     }
   }, [
     h(WalletView, {
-- 
cgit 


From 41c585c796a9049c2413036e7b23bf07330daa82 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 12:18:29 -0700
Subject: Make wallet view visible iff vw above 575px

---
 ui/app/main-container.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index ae62a0e0c..592f331b5 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -27,10 +27,9 @@ MainContainer.prototype.render = function () {
       overflowY: 'scroll',
     }
   }, [
+
     h(WalletView, {
       style: {
-        // width: '33.33%',
-        // height: '82vh',
       }
     }, [
     ]),
-- 
cgit 


From 7767f9f7ad7321d88a0b738d2c272961cc1ce286 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 13:03:36 -0700
Subject: Hook up responsive sidebar

---
 ui/app/main-container.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 592f331b5..fb768c386 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -3,6 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const WalletView = require('./components/wallet-view')
 const TxView = require('./components/tx-view')
+const SlideoutMenu = require('react-burger-menu').slide
 
 module.exports = MainContainer
 
@@ -28,9 +29,18 @@ MainContainer.prototype.render = function () {
     }
   }, [
 
+    h(SlideoutMenu, {
+      isOpen: true,
+    }, [
+      h(WalletView, {
+        responsiveDisplayClassname: '.phone-visible'
+      }),
+    ]),
+
     h(WalletView, {
       style: {
-      }
+      },
+      responsiveDisplayClassname: '.lap-visible',
     }, [
     ]),
 
-- 
cgit 


From dfa10763e36f745d82fb62adc4ac42773d266da4 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 13:32:02 -0700
Subject: Integrate slideout menu with tx view

---
 ui/app/main-container.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index fb768c386..870b3e7f0 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -1,8 +1,8 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const WalletView = require('./components/wallet-view')
 const TxView = require('./components/tx-view')
+const WalletView = require('./components/wallet-view')
 const SlideoutMenu = require('react-burger-menu').slide
 
 module.exports = MainContainer
@@ -29,14 +29,6 @@ MainContainer.prototype.render = function () {
     }
   }, [
 
-    h(SlideoutMenu, {
-      isOpen: true,
-    }, [
-      h(WalletView, {
-        responsiveDisplayClassname: '.phone-visible'
-      }),
-    ]),
-
     h(WalletView, {
       style: {
       },
-- 
cgit 


From 41250f9769d3224e0b42821058cd6445fa7efaca Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 19:48:33 -0700
Subject: Adjust header spacing for 500px and 900px heights

---
 ui/app/main-container.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 870b3e7f0..62a8bdb7b 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -17,7 +17,7 @@ MainContainer.prototype.render = function () {
   return h('div', {
     style: {
       position: 'absolute',
-      marginTop: '6vh',
+      marginTop: '35px',
       width: '98%',
       zIndex: 20,
       boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
-- 
cgit 


From b70a399faa30c478ffffb5607cfe36001745adc7 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 21:53:40 -0700
Subject: Isolate container component, add refactor notes

---
 ui/app/main-container.js | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 62a8bdb7b..5194c2343 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -4,6 +4,7 @@ const inherits = require('util').inherits
 const TxView = require('./components/tx-view')
 const WalletView = require('./components/wallet-view')
 const SlideoutMenu = require('react-burger-menu').slide
+const AccountAndTransactionDetails = require('./account-and-transaction-details')
 
 module.exports = MainContainer
 
@@ -14,6 +15,22 @@ function MainContainer () {
 
 MainContainer.prototype.render = function () {
 
+  // 1. Fixing Mobile View: flush container
+  //   media query for mobile view:
+  //   position: absolute;
+  //   margin-top: 35px;
+  //   width: 100%;
+  // 
+  // 2. Fix responsive sizing - smaller
+  //    https://puu.sh/x0gDA/5ff3b734eb.png
+  // 
+  // 3. summarize:
+  //  switch statement goes inside MainContainer,
+  //  or a method in renderPrimary
+  //    - pass resulting h() to MainContainer
+  //  - error checking in separate func
+  //  - router in separate func
+
   return h('div', {
     style: {
       position: 'absolute',
@@ -27,24 +44,6 @@ MainContainer.prototype.render = function () {
       alignItems: 'stretch',
       overflowY: 'scroll',
     }
-  }, [
-
-    h(WalletView, {
-      style: {
-      },
-      responsiveDisplayClassname: '.lap-visible',
-    }, [
-    ]),
-
-    h(TxView, {
-      style: {
-        // flexGrow: 2
-        // width: '66.66%',
-        // height: '82vh',
-        // background: '#FFFFFF',
-      }
-    }, [
-    ]),
-  ])
+  }, [h(AccountAndTransactionDetails, {}, [])])
 }
 
-- 
cgit 


From ff7ba83a6c62abb42c0141d4cd5a53a7870a9199 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 22:09:12 -0700
Subject: Add note for styling buttons

---
 ui/app/main-container.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 5194c2343..84d8c5435 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -30,6 +30,8 @@ MainContainer.prototype.render = function () {
   //    - pass resulting h() to MainContainer
   //  - error checking in separate func
   //  - router in separate func
+  //
+  //  4. style all buttons as <button>s: accessibility + mobile focus
 
   return h('div', {
     style: {
-- 
cgit 


From b523faba1333caa2f05d7721b8b623a84047ac40 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 22:23:48 -0700
Subject: Make mobile view flush with header

---
 ui/app/main-container.js | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 84d8c5435..af722d100 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -15,12 +15,6 @@ function MainContainer () {
 
 MainContainer.prototype.render = function () {
 
-  // 1. Fixing Mobile View: flush container
-  //   media query for mobile view:
-  //   position: absolute;
-  //   margin-top: 35px;
-  //   width: 100%;
-  // 
   // 2. Fix responsive sizing - smaller
   //    https://puu.sh/x0gDA/5ff3b734eb.png
   // 
@@ -33,19 +27,8 @@ MainContainer.prototype.render = function () {
   //
   //  4. style all buttons as <button>s: accessibility + mobile focus
 
-  return h('div', {
-    style: {
-      position: 'absolute',
-      marginTop: '35px',
-      width: '98%',
-      zIndex: 20,
-      boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
-      fontFamily: 'DIN OT',
-      display: 'flex',
-      flexWrap: 'wrap',
-      alignItems: 'stretch',
-      overflowY: 'scroll',
-    }
+  return h('div.main-container', {
+    style: {}
   }, [h(AccountAndTransactionDetails, {}, [])])
 }
 
-- 
cgit 


From c7ac20ff659bce3dbde67ad5ee4923eab8f00528 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 23:14:53 -0700
Subject: Finalize sidebar dimensions

---
 ui/app/main-container.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index af722d100..b9f4902af 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -14,10 +14,6 @@ function MainContainer () {
 }
 
 MainContainer.prototype.render = function () {
-
-  // 2. Fix responsive sizing - smaller
-  //    https://puu.sh/x0gDA/5ff3b734eb.png
-  // 
   // 3. summarize:
   //  switch statement goes inside MainContainer,
   //  or a method in renderPrimary
-- 
cgit 


From 3ed81847d1b6f00e208dbcb973cafcc633c268ad Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Wed, 2 Aug 2017 23:54:21 -0700
Subject: Isolate routing logic for isUnlocked, remove stray logs

---
 ui/app/main-container.js | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index b9f4902af..ca7a94c67 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -5,6 +5,9 @@ const TxView = require('./components/tx-view')
 const WalletView = require('./components/wallet-view')
 const SlideoutMenu = require('react-burger-menu').slide
 const AccountAndTransactionDetails = require('./account-and-transaction-details')
+const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
+const ConfigScreen = require('./config')
+const UnlockScreen = require('./unlock')
 
 module.exports = MainContainer
 
@@ -22,9 +25,49 @@ MainContainer.prototype.render = function () {
   //  - router in separate func
   //
   //  4. style all buttons as <button>s: accessibility + mobile focus
+  let contents = {
+    component: AccountAndTransactionDetails,
+    key: 'account-detail', 
+    style: {},
+  }
+
+  if (this.props.isUnlocked === false) {
+    switch (this.props.currentViewName) {
+      case 'restoreVault':
+        log.debug('rendering restore vault screen')
+        contents = {
+          component: HDRestoreVaultScreen,
+          key: 'HDRestoreVaultScreen',
+        }
+      case 'config':
+        log.debug('rendering config screen from unlock screen.')
+        contents = {
+          component: ConfigScreen,
+          key: 'config',
+        }
+      default:
+        log.debug('rendering locked screen')
+        contents = {
+          component: UnlockScreen,
+          style: {
+            boxShadow: 'none',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            // must force 100%, because lock screen is full-width
+            width: '100%',
+          },
+          key: 'locked',
+        }
+    }
+  }
 
   return h('div.main-container', {
-    style: {}
-  }, [h(AccountAndTransactionDetails, {}, [])])
+    style: contents.style,
+  }, [
+    h(contents.component, {
+      key: contents.key,
+    }, [])
+  ])
 }
 
-- 
cgit 


From d6779115cdab10257c25910be73c1bbc5b066ade Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Thu, 3 Aug 2017 00:21:19 -0700
Subject: Fix background color for lock screen

---
 ui/app/main-container.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index ca7a94c67..752532f12 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -54,6 +54,7 @@ MainContainer.prototype.render = function () {
             display: 'flex',
             alignItems: 'center',
             justifyContent: 'center',
+            background: '#F7F7F7',
             // must force 100%, because lock screen is full-width
             width: '100%',
           },
-- 
cgit 


From 267d12646c93931c76a1c0fa1ccabd61f8e0dcd6 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Thu, 3 Aug 2017 00:43:24 -0700
Subject: Implement 'clear buttons' for tx view

---
 ui/app/main-container.js | 2 --
 1 file changed, 2 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 752532f12..b00349c05 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -23,8 +23,6 @@ MainContainer.prototype.render = function () {
   //    - pass resulting h() to MainContainer
   //  - error checking in separate func
   //  - router in separate func
-  //
-  //  4. style all buttons as <button>s: accessibility + mobile focus
   let contents = {
     component: AccountAndTransactionDetails,
     key: 'account-detail', 
-- 
cgit 


From e7b3ef0708290a81dad5c469adaa6fab3f1c45b5 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Tue, 29 Aug 2017 12:20:48 -0230
Subject: Lint fixes

---
 ui/app/main-container.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 31583f3e5..eaaff8517 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -1,8 +1,6 @@
 const Component = require('react').Component
 const h = require('react-hyperscript')
 const inherits = require('util').inherits
-const TxView = require('./components/tx-view')
-const WalletView = require('./components/wallet-view')
 const AccountAndTransactionDetails = require('./account-and-transaction-details')
 const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
 const ConfigScreen = require('./config')
@@ -24,7 +22,7 @@ MainContainer.prototype.render = function () {
   //  - router in separate func
   let contents = {
     component: AccountAndTransactionDetails,
-    key: 'account-detail', 
+    key: 'account-detail',
     style: {},
   }
 
@@ -36,12 +34,14 @@ MainContainer.prototype.render = function () {
           component: HDRestoreVaultScreen,
           key: 'HDRestoreVaultScreen',
         }
+        break
       case 'config':
         log.debug('rendering config screen from unlock screen.')
         contents = {
           component: ConfigScreen,
           key: 'config',
         }
+        break
       default:
         log.debug('rendering locked screen')
         contents = {
@@ -65,7 +65,7 @@ MainContainer.prototype.render = function () {
   }, [
     h(contents.component, {
       key: contents.key,
-    }, [])
+    }, []),
   ])
 }
 
-- 
cgit 


From 2c032e0df44a2d589aae62d3fc532df82441580b Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Sun, 22 Oct 2017 22:40:03 -0700
Subject: Update settings screen to new UI

---
 ui/app/main-container.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index eaaff8517..6e2342c2b 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -3,7 +3,7 @@ const h = require('react-hyperscript')
 const inherits = require('util').inherits
 const AccountAndTransactionDetails = require('./account-and-transaction-details')
 const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
-const ConfigScreen = require('./config')
+const Settings = require('./settings')
 const UnlockScreen = require('./unlock')
 
 module.exports = MainContainer
@@ -38,7 +38,7 @@ MainContainer.prototype.render = function () {
       case 'config':
         log.debug('rendering config screen from unlock screen.')
         contents = {
-          component: ConfigScreen,
+          component: Settings,
           key: 'config',
         }
         break
-- 
cgit 


From 4e8d8639cb29bd47c110765467393865e1c19f4e Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@users.noreply.github.com>
Date: Thu, 26 Oct 2017 23:02:56 -0700
Subject: Fix Settings/Info screen being visible on logout (#2490)

---
 ui/app/main-container.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'ui/app/main-container.js')

diff --git a/ui/app/main-container.js b/ui/app/main-container.js
index 6e2342c2b..031f61e84 100644
--- a/ui/app/main-container.js
+++ b/ui/app/main-container.js
@@ -37,11 +37,7 @@ MainContainer.prototype.render = function () {
         break
       case 'config':
         log.debug('rendering config screen from unlock screen.')
-        contents = {
-          component: Settings,
-          key: 'config',
-        }
-        break
+        return h(Settings, {key: 'config'})
       default:
         log.debug('rendering locked screen')
         contents = {
-- 
cgit