From 2ca30fcb4a9e0a1c8694eaad9e4e4dd51ea29f18 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 18:47:54 -0500
Subject: [PATCH 1/8] added back button to toolbar

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

diff --git a/app/src/renderer/components/common/NiToolBar.vue b/app/src/renderer/components/common/NiToolBar.vue
index 165df70581..44629a93a6 100644
--- a/app/src/renderer/components/common/NiToolBar.vue
+++ b/app/src/renderer/components/common/NiToolBar.vue
@@ -1,8 +1,13 @@
 <template lang="pug">
 .ni-tool-bar
   .ni-tool-bar-container
+    a.back(@click="$router.go(-1)")
+      i.material-icons arrow_back
+      .label Back
     .main: slot
-    a.help(@click="enableModalHelp"): i.material-icons help_outline
+    a.help(@click="enableModalHelp")
+      i.material-icons help_outline
+      .label Help
 </template>
 
 <script>

From 21cee3979459d0a599e16ebfe3fab80517805878 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 18:48:35 -0500
Subject: [PATCH 2/8] added `replace` to staking route so back button works as
 expected

---
 app/src/renderer/components/common/AppMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/renderer/components/common/AppMenu.vue b/app/src/renderer/components/common/AppMenu.vue
index 6255471957..f89a2d8798 100644
--- a/app/src/renderer/components/common/AppMenu.vue
+++ b/app/src/renderer/components/common/AppMenu.vue
@@ -3,7 +3,7 @@ menu.app-menu
   .app-menu-main
     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="/staking" exact replace @click.native="close" title="Delegates")
     list-item(to="/validators" exact @click.native="close" title="Validators" v-bind:class="{ 'active': isValidatorPage }" v-if="config.devMode")
     list-item(to="/proposals" exact @click.native="close" title="Proposals" v-if="config.devMode")
     list-item(to="/blocks" exact @click.native="close" title="Blocks")

From 9d1a8a1bf8f61ff4c8dca1849b26d5e4954e99a0 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 18:49:25 -0500
Subject: [PATCH 3/8] remove back button from pages where toolbar is present

---
 app/src/renderer/components/monitor/PageBlock.vue | 3 ---
 app/src/renderer/components/staking/PageBond.vue  | 4 ----
 app/src/renderer/components/wallet/PageSend.vue   | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/app/src/renderer/components/monitor/PageBlock.vue b/app/src/renderer/components/monitor/PageBlock.vue
index bbe90a091c..7397f1ed86 100644
--- a/app/src/renderer/components/monitor/PageBlock.vue
+++ b/app/src/renderer/components/monitor/PageBlock.vue
@@ -1,9 +1,6 @@
 <template lang="pug">
 page(:title="pageBlockTitle" v-if="block.header")
   div(slot="menu"): tool-bar
-    router-link(to="/blocks")
-      i.material-icons arrow_back
-      .label Back
     a(:href="blockUrl" target="_blank")
       i.material-icons code
       .label JSON
diff --git a/app/src/renderer/components/staking/PageBond.vue b/app/src/renderer/components/staking/PageBond.vue
index 33a35d8797..8ff42fc5c9 100644
--- a/app/src/renderer/components/staking/PageBond.vue
+++ b/app/src/renderer/components/staking/PageBond.vue
@@ -1,10 +1,6 @@
 <template lang="pug">
 page.page-bond(title="Bond Atoms")
   div(slot="menu"): tool-bar
-    router-link(to='/staking')
-      i.material-icons arrow_back
-      .label Back
-
   part(:title="'Start bonding your '+ totalAtoms + ' ATOM'"): form-struct(
     :submit="onSubmit")
     .bond-group(:class="bondGroupClass(unbondedAtomsDelta)")
diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
index e03d05b5a8..15eb1b56a1 100644
--- a/app/src/renderer/components/wallet/PageSend.vue
+++ b/app/src/renderer/components/wallet/PageSend.vue
@@ -1,10 +1,6 @@
 <template lang='pug'>
 page(title='Send')
   div(slot="menu"): tool-bar
-    router-link(:to="{ name: 'balances' }")
-      i.material-icons arrow_back
-      .label Back
-
   form-struct(:submit="onSubmit")
     part(title='Denomination Options')
       form-group(:error='$v.fields.denom.$error'

From cf30954aca78f5f52d6deadd6df0054bbf0f5741 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 18:50:43 -0500
Subject: [PATCH 4/8] back button should stay in the same place

---
 app/src/renderer/components/common/NiToolBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/renderer/components/common/NiToolBar.vue b/app/src/renderer/components/common/NiToolBar.vue
index 44629a93a6..057949782c 100644
--- a/app/src/renderer/components/common/NiToolBar.vue
+++ b/app/src/renderer/components/common/NiToolBar.vue
@@ -1,10 +1,10 @@
 <template lang="pug">
 .ni-tool-bar
   .ni-tool-bar-container
+    .main: slot
     a.back(@click="$router.go(-1)")
       i.material-icons arrow_back
       .label Back
-    .main: slot
     a.help(@click="enableModalHelp")
       i.material-icons help_outline
       .label Help

From d5b74ff5182adb0b861f2b758879616aa4cebfe2 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 18:54:40 -0500
Subject: [PATCH 5/8] update snapshots

---
 .../__snapshots__/PageBlock.spec.js.snap      | 18 +++++----
 .../__snapshots__/PageBlocks.spec.js.snap     | 10 ++++-
 .../__snapshots__/PageBond.spec.js.snap       | 33 ++++++++--------
 .../__snapshots__/PageDelegate.spec.js.snap   | 19 ++++++++++
 .../__snapshots__/PageDelegates.spec.js.snap  | 29 +++++++++++++-
 .../__snapshots__/PageBalances.spec.js.snap   | 38 +++++++++++++++++++
 .../__snapshots__/PageSend.spec.js.snap       | 33 ++++++++--------
 .../PageTransactions.spec.js.snap             | 38 +++++++++++++++++++
 8 files changed, 179 insertions(+), 39 deletions(-)

diff --git a/test/unit/specs/components/monitor/__snapshots__/PageBlock.spec.js.snap b/test/unit/specs/components/monitor/__snapshots__/PageBlock.spec.js.snap
index 8b83998b46..1398e6b913 100644
--- a/test/unit/specs/components/monitor/__snapshots__/PageBlock.spec.js.snap
+++ b/test/unit/specs/components/monitor/__snapshots__/PageBlock.spec.js.snap
@@ -20,14 +20,10 @@ exports[`PageBlock has the expected html structure 1`] = `
             <div class=\\"ni-tool-bar\\">
                <div class=\\"ni-tool-bar-container\\">
                   <div class=\\"main\\">
-                     <a href=\\"#/blocks\\" class=\\"\\"><i class=\\"material-icons\\">arrow_back</i>
+                     <a href=\\"https://the-url\\" target=\\"_blank\\"><i class=\\"material-icons\\">code</i>
                      <div class=\\"label\\">
-                        Back
+                        JSON
                      </div>
-      </a><a href=\\"https://the-url\\" target=\\"_blank\\"><i class=\\"material-icons\\">code</i>
-      <div class=\\"label\\">
-         JSON
-      </div>
       </a><a href=\\"#/blocks/9\\" class=\\"\\"><i class=\\"material-icons\\">chevron_left</i>
       <div class=\\"label\\">
          Previous Block
@@ -38,7 +34,15 @@ exports[`PageBlock has the expected html structure 1`] = `
       </div>
       </a>
    </div>
-      <a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a>
+      <a class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i>
+      <div class=\\"label\\">
+         Back
+      </div>
+      </a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i>
+      <div class=\\"label\\">
+         Help
+      </div>
+      </a>
    </div>
 </div>
 </div>
diff --git a/test/unit/specs/components/monitor/__snapshots__/PageBlocks.spec.js.snap b/test/unit/specs/components/monitor/__snapshots__/PageBlocks.spec.js.snap
index d9c45bc663..7153d2fcbe 100644
--- a/test/unit/specs/components/monitor/__snapshots__/PageBlocks.spec.js.snap
+++ b/test/unit/specs/components/monitor/__snapshots__/PageBlocks.spec.js.snap
@@ -26,7 +26,15 @@ exports[`PageBlocks has the expected html structure 1`] = `
                      </div>
       </a>
    </div>
-      <a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a>
+      <a class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i>
+      <div class=\\"label\\">
+         Back
+      </div>
+      </a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i>
+      <div class=\\"label\\">
+         Help
+      </div>
+      </a>
    </div>
 </div>
 </div>
diff --git a/test/unit/specs/components/staking/__snapshots__/PageBond.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageBond.spec.js.snap
index d559e3d1f2..e29f470808 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageBond.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageBond.spec.js.snap
@@ -41,23 +41,21 @@ exports[`PageBond has the expected html structure 1`] = `
               >
                 <div
                   class="main"
+                />
+                <a
+                  class="back"
                 >
-                  <a
-                    class="router-link-exact-active router-link-active"
-                    href="#/staking"
+                  <i
+                    class="material-icons"
                   >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                    <div
-                      class="label"
-                    >
-                      Back
-                    </div>
-                  </a>
-                </div>
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -66,6 +64,11 @@ exports[`PageBond has the expected html structure 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
diff --git a/test/unit/specs/components/staking/__snapshots__/PageDelegate.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageDelegate.spec.js.snap
index 1f18dca954..5d12148b9a 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageDelegate.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageDelegate.spec.js.snap
@@ -56,6 +56,20 @@ exports[`PageDelegate has the expected html structure 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -64,6 +78,11 @@ exports[`PageDelegate has the expected html structure 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
diff --git a/test/unit/specs/components/staking/__snapshots__/PageDelegates.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageDelegates.spec.js.snap
index 5f773d4ae4..340d047f75 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageDelegates.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageDelegates.spec.js.snap
@@ -30,7 +30,15 @@ exports[`PageDelegates has the expected html structure 1`] = `
       </div>
       </a>
    </div>
-      <a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a>
+      <a class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i>
+      <div class=\\"label\\">
+         Back
+      </div>
+      </a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i>
+      <div class=\\"label\\">
+         Help
+      </div>
+      </a>
    </div>
 </div>
 </div>
@@ -187,6 +195,20 @@ exports[`PageDelegates should filter the delegates 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -195,6 +217,11 @@ exports[`PageDelegates should filter the delegates 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap
index bf5bf776af..82d46c79e7 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap
@@ -67,6 +67,20 @@ exports[`PageBalances has the expected html structure 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -75,6 +89,11 @@ exports[`PageBalances has the expected html structure 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
@@ -371,6 +390,20 @@ exports[`PageBalances should filter the balances 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -379,6 +412,11 @@ exports[`PageBalances should filter the balances 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
index dd87b6ecec..5b5f2ba8ba 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
@@ -41,23 +41,21 @@ exports[`PageSend has the expected html structure 1`] = `
               >
                 <div
                   class="main"
+                />
+                <a
+                  class="back"
                 >
-                  <a
-                    class="router-link-exact-active router-link-active"
-                    href="#/"
+                  <i
+                    class="material-icons"
                   >
-                    <i
-                      class="material-icons"
-                    >
-                      arrow_back
-                    </i>
-                    <div
-                      class="label"
-                    >
-                      Back
-                    </div>
-                  </a>
-                </div>
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -66,6 +64,11 @@ exports[`PageSend has the expected html structure 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
diff --git a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
index a3d39615f0..fedb6611b5 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageTransactions.spec.js.snap
@@ -55,6 +55,20 @@ exports[`PageTransactions has the expected html structure 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -63,6 +77,11 @@ exports[`PageTransactions has the expected html structure 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>
@@ -144,6 +163,20 @@ exports[`PageTransactions should filter the transactions 1`] = `
                     </div>
                   </a>
                 </div>
+                <a
+                  class="back"
+                >
+                  <i
+                    class="material-icons"
+                  >
+                    arrow_back
+                  </i>
+                  <div
+                    class="label"
+                  >
+                    Back
+                  </div>
+                </a>
                 <a
                   class="help"
                 >
@@ -152,6 +185,11 @@ exports[`PageTransactions should filter the transactions 1`] = `
                   >
                     help_outline
                   </i>
+                  <div
+                    class="label"
+                  >
+                    Help
+                  </div>
                 </a>
               </div>
             </div>

From 8c89f9dbf4736f272006605932b46db87287654b Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 19:06:34 -0500
Subject: [PATCH 6/8] changelog updates for some PR's

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e265fcd51c..f5943f4e1c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,9 +35,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [0.4.0] - 2018-02-01
 ### Added
 * Added button styles for Success, Warning, and Danger states. @nylira
-* Added support for image icons. @faboweb 
+* Added support for image icons. @faboweb
 
 ### Changed
 * Improved primary button style. @nylira
 * Fixed the cut-off text bug in buttons. @nylira
-* Improves the `hover-bg` app variable color. @nylira 
+* Improves the `hover-bg` app variable color. @nylira
+
+## [0.4.1] - 2018-02-01
+###Fixed
+* Fix for Windows build crashing on startup. @faboweb
+
+## [0.4.2] - 2018-02-05
+###Added
+* Added back button to every page. @jolesbi
+
+###Changed
+* Updated transaction history to be more clear and descriptive. @jolesbi
+* Improved delegate profile page to accommodate candidates and validators. @jolesbi

From d90d71227bd24ed9b48af9d086db307e20fde861 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Mon, 5 Feb 2018 19:25:31 -0500
Subject: [PATCH 7/8] added a test

---
 test/unit/specs/components/monitor/PageBlock.spec.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/unit/specs/components/monitor/PageBlock.spec.js b/test/unit/specs/components/monitor/PageBlock.spec.js
index 1bd1e18274..37fa15213a 100644
--- a/test/unit/specs/components/monitor/PageBlock.spec.js
+++ b/test/unit/specs/components/monitor/PageBlock.spec.js
@@ -62,4 +62,16 @@ describe('PageBlock', () => {
   it('should dispatch getBlock when mounted', () => {
     expect(store.dispatch).toHaveBeenCalledWith('getBlock', wrapper.vm.$route.params.block)
   })
+
+  it('should return an empty object if there is no block', () => {
+    let {wrapper} = mount(PageBlock, {
+      getters: {
+        blockchain: () => ({
+          block: {}
+        })
+      }
+    })
+
+    expect(wrapper.vm.block).toEqual({})
+  })
 })

From a46987bf5aa892864240ff1e6472916de6d2fce1 Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Fri, 9 Feb 2018 19:07:05 +0000
Subject: [PATCH 8/8] added test for NiToolBar

---
 .../specs/components/common/NiToolBar.spec.js | 22 +++++++++++++++++++
 .../__snapshots__/NiToolBar.spec.js.snap      |  3 +++
 2 files changed, 25 insertions(+)
 create mode 100644 test/unit/specs/components/common/NiToolBar.spec.js
 create mode 100644 test/unit/specs/components/common/__snapshots__/NiToolBar.spec.js.snap

diff --git a/test/unit/specs/components/common/NiToolBar.spec.js b/test/unit/specs/components/common/NiToolBar.spec.js
new file mode 100644
index 0000000000..1beb1d4acf
--- /dev/null
+++ b/test/unit/specs/components/common/NiToolBar.spec.js
@@ -0,0 +1,22 @@
+import setup from '../../../helpers/vuex-setup'
+import NiToolBar from 'common/NiToolBar'
+
+describe('NiToolBar', () => {
+  let wrapper, store, instance
+  let {mount} = setup()
+
+  beforeEach(() => {
+    instance = mount(NiToolBar)
+    wrapper = instance.wrapper
+    store = instance.store
+  })
+
+  it('has the expected html structure', () => {
+    expect(wrapper.$el).toMatchSnapshot()
+  })
+
+  it('sets the helper modal', () => {
+    wrapper.vm.enableModalHelp()
+    expect(store.state.config.modals.help.active).toBe(true)
+  })
+})
diff --git a/test/unit/specs/components/common/__snapshots__/NiToolBar.spec.js.snap b/test/unit/specs/components/common/__snapshots__/NiToolBar.spec.js.snap
new file mode 100644
index 0000000000..66aceb6c0f
--- /dev/null
+++ b/test/unit/specs/components/common/__snapshots__/NiToolBar.spec.js.snap
@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NiToolBar has the expected html structure 1`] = `undefined`;