From 1ea7def065800c61f212df6249d8a3deb2b8de0f Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Wed, 3 Jan 2018 15:17:41 -0500
Subject: [PATCH 1/6] simplify sidebar

---
 .../renderer/components/common/AppMenu.vue    | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/src/renderer/components/common/AppMenu.vue b/app/src/renderer/components/common/AppMenu.vue
index 6623e29a8a..a7ffeb7211 100644
--- a/app/src/renderer/components/common/AppMenu.vue
+++ b/app/src/renderer/components/common/AppMenu.vue
@@ -1,20 +1,13 @@
 <template lang="pug">
 menu.app-menu
   .app-menu-main
-    part(title='Wallet')
-      list-item(to="/" exact @click.native="close" title="Balance")
-      list-item(to="/wallet/send" exact @click.native="close" title="Send")
-      list-item(to="/wallet/transactions" exact @click.native="close" title="Transactions")
-    part(title='Governance' v-if="config.devMode")
-      list-item(to="/proposals" exact @click.native="close" title="Proposals")
-    part(title='Stake')
-      list-item(to="/staking" exact @click.native="close" title="Delegates")
-    part(title='Monitor' v-if="config.devMode")
-      list-item(to="/blockchain" exact @click.native="close" title="Blockchain")
-      list-item(to="/validators" exact @click.native="close" title="Validators"
-        v-bind:class="{ 'active': isValidatorPage }")
-    part(title='Connectivity')
-      connectivity
+    list-item(to="/" exact @click.native="close" title="Balances")
+    list-item(to="/wallet/transactions" exact @click.native="close" title="Transactions")
+    list-item(to="/staking" exact @click.native="close" title="Delegates")
+    list-item(to="/validators" exact @click.native="close" title="Validators" v-bind:class="{ 'active': isValidatorPage }")
+    list-item(to="/proposals" exact @click.native="close" title="Proposals" v-if="config.devMode")
+    list-item(to="/blockchain" exact @click.native="close" title="Monitor" v-if="config.devMode")
+    connectivity
   user-pane
 </template>
 

From 2589484483543afb0ec91a1cfcaa28e006a77b2c Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Wed, 3 Jan 2018 15:17:59 -0500
Subject: [PATCH 2/6] improve ni-li-* styling

---
 app/src/renderer/components/common/AppMenu.vue        | 3 +++
 app/src/renderer/components/common/NiConnectivity.vue | 4 ++++
 app/src/renderer/components/common/NiListItem.vue     | 3 +--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/renderer/components/common/AppMenu.vue b/app/src/renderer/components/common/AppMenu.vue
index a7ffeb7211..8ffec24e01 100644
--- a/app/src/renderer/components/common/AppMenu.vue
+++ b/app/src/renderer/components/common/AppMenu.vue
@@ -65,6 +65,9 @@ export default {
     flex 1
     position relative // for perfect-scrollbar
 
+    .ni-li-link
+      padding 0 0 0 1rem
+
   .ni-user
     border-top 1px solid bc
     padding 1rem
diff --git a/app/src/renderer/components/common/NiConnectivity.vue b/app/src/renderer/components/common/NiConnectivity.vue
index ad43150d72..7355b61a16 100644
--- a/app/src/renderer/components/common/NiConnectivity.vue
+++ b/app/src/renderer/components/common/NiConnectivity.vue
@@ -33,6 +33,10 @@ export default {
 .ni-connectivity
   background app-bg
 
+  .ni-li-thumb
+    .material-icons
+      color success
+
 @media screen and (min-width: 1024px)
   .ni-connectivity
     border-top px solid bc
diff --git a/app/src/renderer/components/common/NiListItem.vue b/app/src/renderer/components/common/NiListItem.vue
index 97f040921a..65997f187d 100644
--- a/app/src/renderer/components/common/NiListItem.vue
+++ b/app/src/renderer/components/common/NiListItem.vue
@@ -129,7 +129,6 @@ export default {
   width 3rem - px
   i.material-icons
     display block
-    background app-fg
     width 3rem - px
     height 3rem - px
     display flex
@@ -142,7 +141,7 @@ export default {
   display flex
   align-items flex-start
   justify-content center
-  padding 0 1rem
+  padding 0 1rem 0 0
   flex-flow column nowrap
 
   .ni-li-title

From 13c40b1e56f083128d3388fb5c40b919cad5798a Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Wed, 3 Jan 2018 15:18:09 -0500
Subject: [PATCH 3/6] simplify user pane

---
 app/src/renderer/components/common/NiUserPane.vue | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/src/renderer/components/common/NiUserPane.vue b/app/src/renderer/components/common/NiUserPane.vue
index 397f6060cf..f1d4617fad 100644
--- a/app/src/renderer/components/common/NiUserPane.vue
+++ b/app/src/renderer/components/common/NiUserPane.vue
@@ -5,18 +5,7 @@ list-item.ni-li-user(
   to="/profile"
   @click.native="close"
   icon="face"
-  :title="'Account ' + user.account")
-div(v-else-if="user.signedIn")
-  list-item.ni-li-user(
-    type="link"
-    icon="exit_to_app"
-    @click.native="signOut"
-    title="Sign Out")
-list-item.ni-li-user(
-  v-else
-  @click.native="openSession"
-  icon="exit_to_app"
-  title="Sign In")
+  :title="user.account")
 </template>
 
 <script>

From b8b14a241814f1267fcfa1011d66ef18cc3265b9 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Wed, 3 Jan 2018 15:23:46 -0500
Subject: [PATCH 4/6] fix tests

---
 test/unit/specs/NiUserPane.spec.js                    | 10 +---------
 test/unit/specs/__snapshots__/NiUserPane.spec.js.snap |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/test/unit/specs/NiUserPane.spec.js b/test/unit/specs/NiUserPane.spec.js
index 3b4db17fd4..b6bfae4f6a 100644
--- a/test/unit/specs/NiUserPane.spec.js
+++ b/test/unit/specs/NiUserPane.spec.js
@@ -31,19 +31,11 @@ describe('NiUserPane', () => {
   it('should not show the active account name if signed out', async () => {
     await store.dispatch('signOut')
     wrapper.update()
-    expect(wrapper.html()).not.toContain('ACTIVE_ACCOUNT')
+    expect(wrapper.html()).toBeUndefined()
   })
 
   it('should redirect to the profile page if signed in', () => {
     wrapper.find(ListItem).trigger('click')
     expect(router.currentRoute.path).toBe('/profile')
   })
-
-  it('should show login page if clicked and signed out', async () => {
-    await store.dispatch('signOut')
-    wrapper.update()
-    wrapper.find(ListItem).trigger('click')
-    expect(store.commit).toHaveBeenCalledWith('setModalSession', true)
-    expect(store.commit).toHaveBeenCalledWith('setActiveMenu', '')
-  })
 })
diff --git a/test/unit/specs/__snapshots__/NiUserPane.spec.js.snap b/test/unit/specs/__snapshots__/NiUserPane.spec.js.snap
index 139783d9ea..911eba3234 100644
--- a/test/unit/specs/__snapshots__/NiUserPane.spec.js.snap
+++ b/test/unit/specs/__snapshots__/NiUserPane.spec.js.snap
@@ -23,7 +23,7 @@ exports[`NiUserPane has the expected html structure 1`] = `
       <div
         class="ni-li-title"
       >
-        Account ACTIVE_ACCOUNT
+        ACTIVE_ACCOUNT
       </div>
       <div
         class="ni-li-subtitle"

From 7d89c236f8f97e5fa0f8649a7d71b5ca91babbfb Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Thu, 4 Jan 2018 10:54:18 -0500
Subject: [PATCH 5/6] bring sign out back

---
 app/src/renderer/components/common/NiUserPane.vue | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/renderer/components/common/NiUserPane.vue b/app/src/renderer/components/common/NiUserPane.vue
index f1d4617fad..f35f082b02 100644
--- a/app/src/renderer/components/common/NiUserPane.vue
+++ b/app/src/renderer/components/common/NiUserPane.vue
@@ -6,6 +6,12 @@ list-item.ni-li-user(
   @click.native="close"
   icon="face"
   :title="user.account")
+div(v-else-if="user.signedIn")
+  list-item.ni-li-user(
+  type="link"
+  icon="exit_to_app"
+  @click.native="signOut"
+  title="Sign Out")
 </template>
 
 <script>

From e568eea37e332771ad1cf131aaf20b7ffcf60b41 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Thu, 4 Jan 2018 10:55:06 -0500
Subject: [PATCH 6/6] proper indentation

---
 app/src/renderer/components/common/NiUserPane.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/renderer/components/common/NiUserPane.vue b/app/src/renderer/components/common/NiUserPane.vue
index f35f082b02..b197e7748c 100644
--- a/app/src/renderer/components/common/NiUserPane.vue
+++ b/app/src/renderer/components/common/NiUserPane.vue
@@ -8,10 +8,10 @@ list-item.ni-li-user(
   :title="user.account")
 div(v-else-if="user.signedIn")
   list-item.ni-li-user(
-  type="link"
-  icon="exit_to_app"
-  @click.native="signOut"
-  title="Sign Out")
+    type="link"
+    icon="exit_to_app"
+    @click.native="signOut"
+    title="Sign Out")
 </template>
 
 <script>