From 8dcf893b890fdd9d48caa1c687037bcbd2cb3f41 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:15:17 -0400
Subject: [PATCH 1/6] cleaned up modal styling

---
 .../renderer/components/common/TmModal.vue    | 49 ++++++--------
 .../components/common/TmModalHelp.vue         | 15 +----
 .../components/common/TmModalReceive.vue      | 12 ----
 .../wallet/TmModalSendConfirmation.vue        | 65 +++----------------
 4 files changed, 31 insertions(+), 110 deletions(-)

diff --git a/app/src/renderer/components/common/TmModal.vue b/app/src/renderer/components/common/TmModal.vue
index a8d916ae59..176857b018 100644
--- a/app/src/renderer/components/common/TmModal.vue
+++ b/app/src/renderer/components/common/TmModal.vue
@@ -47,45 +47,31 @@ export default {
   align-items center
   backdrop-filter blur(0.5em)
 
+  b
+    font-weight 500
+    color var(--bright)
+
   &.tm-modal-fullscreen
     display flex
 
-    .tm-modal-container
-      flex 1
-      height 100vh
-      max-height 100vh
-      max-width 40rem + 6rem
-      display flex
-      flex-flow column nowrap
-
-      .tm-modal-main
-        flex 1
-        overflow-y scroll
-        display block
-
 .tm-modal-container
   background var(--app-fg)
   box-shadow hsla(0,0,0,0.25) 0 0.25rem 1rem
-
   display flex
   flex-flow column nowrap
-
   min-width 20rem
-  min-height 20rem
-
   max-width 30rem
-  max-height 40rem
 
 .tm-modal-header
   display flex
   flex-flow row nowrap
   align-items center
   flex 0 0 3rem + 0.0625rem
+  padding 2rem 1rem
   background var(--app-nav)
 
 .tm-modal-icon
   height 3rem
-  flex 0 0 3rem
   display flex
   align-items center
   justify-content center
@@ -95,9 +81,9 @@ export default {
   &.tm-modal-close
     cursor pointer
     i
-      color var(--link)
+      color var(--txt)
     &:hover i
-      color var(--hover)
+      color var(--link)
 
 .tm-modal-icon + .tm-modal-title
   padding-left 0
@@ -105,11 +91,12 @@ export default {
 .tm-modal-title
   flex 1
   font-size h3
-  color var(--txt)
+  font-weight 500
+  color var(--bright)
   padding 0 1rem
 
-.tm-modal-main, .tm-modal-footer
-  padding 1rem
+.tm-modal-main
+  padding 2rem 1rem
 
 .tm-modal-main + .tm-modal-footer
   border-top px solid var(--bc)
@@ -125,16 +112,20 @@ export default {
 
 .tm-modal-main p
   margin-bottom 1rem
-
-.tm-modal-main > .tm-article-body
-  margin -1rem
+  padding 0 1rem
+  word-wrap break-word
+  color var(--txt)
 
 .tm-modal-footer
-  flex 0 0 4rem + px
+  padding 1rem
+
+  button
+    padding-left 1rem
+
   &:empty
     display none
 
 .tm-modal-footer > div
   display flex
-  justify-content space-between
+  justify-content flex-end
 </style>
diff --git a/app/src/renderer/components/common/TmModalHelp.vue b/app/src/renderer/components/common/TmModalHelp.vue
index d5c1e2b09c..e9caba07a6 100644
--- a/app/src/renderer/components/common/TmModalHelp.vue
+++ b/app/src/renderer/components/common/TmModalHelp.vue
@@ -1,13 +1,8 @@
 <template lang="pug">
 modal.tm-modal-help(v-if="active" :close="close")
   div(slot='title') Need Help?
-  p Something in the app not working correctly? Tell us what went wrong in developer chat or create an issue on our GitHub. Thanks for improving Cosmos Voyager!
-  tm-list-item(
-    title="Developer Chat"
-    href="https://riot.im/app/#/room/#cosmos:matrix.org")
-  tm-list-item(
-    title="GitHub Issues"
-    href="https://github.com/cosmos/voyager/issues")
+  p Something in the app not working correctly? Tell us what went wrong in our <a href="https://riot.im/app/#/room/#cosmos:matrix.org">developer chat</a> or create an issue on <a href="https://github.com/cosmos/voyager/issues">GitHub</a>.
+  p Thanks for improving Cosmos Voyager!
 </template>
 
 <script>
@@ -39,10 +34,4 @@ export default {
 
 .tm-modal.tm-modal-help
   z-index z(modalHelp)
-
-  .tm-modal-main
-    padding 2rem
-
-    p
-      margin 0 0 2rem
 </style>
diff --git a/app/src/renderer/components/common/TmModalReceive.vue b/app/src/renderer/components/common/TmModalReceive.vue
index 43c78ca857..8875cdc6b4 100644
--- a/app/src/renderer/components/common/TmModalReceive.vue
+++ b/app/src/renderer/components/common/TmModalReceive.vue
@@ -35,16 +35,4 @@ export default {
 
 .tm-modal.tm-modal-receive
   z-index z(modalError)
-
-  .tm-modal-main
-    padding 2rem
-
-    p
-      margin 0 0 2rem
-
-  .receive-modal
-    border 1px solid bc
-
-  .value
-    padding 0
 </style>
diff --git a/app/src/renderer/components/wallet/TmModalSendConfirmation.vue b/app/src/renderer/components/wallet/TmModalSendConfirmation.vue
index 720d81569b..ef269bfce3 100644
--- a/app/src/renderer/components/wallet/TmModalSendConfirmation.vue
+++ b/app/src/renderer/components/wallet/TmModalSendConfirmation.vue
@@ -1,25 +1,21 @@
 <template lang="pug">
 modal.tm-modal-send-confirmation(:close="close")
   div(slot='title') Confirm Your Transaction
-  tm-list-item(dt='Amount' :dd='amount + " " + denom')
-  tm-list-item(dt='Recipient' :dd='recipient' v-tooltip.top="recipient")
-  p
-  p Are you sure you want to send this transaction? Make sure to check the address again. This transaction cannot be undone.
+  p Please confirm that you would like to send <b>{{ amount + ' ' + denom}}</b> to <b>{{ recipient }}</b>.
+  p.warning This transaction cannot be undone.
 
-  .tm-modal-send-confirmation__footer
+  div(slot='footer')
+    tm-btn(
+          id="send-cancel-btn"
+          type='button'
+          @click.native="close"
+          value='Cancel')
     tm-btn(
           id="send-confirmation-btn"
-          icon='send'
           type='button'
           color="primary"
           @click.native="approve"
-          value='Approve Send')
-    tm-btn(
-          id="send-cancel-btn"
-          icon='cancel'
-          type='button'
-          @click.native="close"
-          value='Cancel Send')
+          value='Confirm')
 </template>
 
 <script>
@@ -43,46 +39,3 @@ export default {
   }
 }
 </script>
-
-<style lang="stylus">
-@import '~variables'
-
-.tm-modal-send-confirmation
-  &__row
-    > *
-      display inline-block
-
-    &__property
-      width 6rem
-      overflow hidden
-
-    &__value
-      width calc(100% - 6rem)
-      text-overflow ellipsis
-      overflow hidden
-      white-space nowrap
-
-  &__footer
-    flex-direction row
-    justify-content flex-start
-
-    .tm-btn
-      margin-right 1.5rem
-      margin-bottom 1rem
-      max-width 14rem
-
-      &:last-child
-        margin-bottom 0
-        margin-right 0
-
-@media screen and (min-width: 768px)
-  .tm-modal-send-confirmation
-    &__icon i.material-icons
-      font-size 20vw + 20vh
-
-    &__footer
-      min-width 31rem
-
-    &__footer .tm-btn
-      margin-bottom 0
-</style>

From 43af448ba2f63d11f000d3400e7f33f583c58de1 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:42:47 -0400
Subject: [PATCH 2/6] deleted some unused css, button stays in its lane

---
 app/src/renderer/components/common/TmPart.vue | 50 -------------------
 .../renderer/components/wallet/PageSend.vue   | 11 +++-
 app/src/renderer/styles/app.styl              |  3 --
 3 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/app/src/renderer/components/common/TmPart.vue b/app/src/renderer/components/common/TmPart.vue
index 7358509a27..a31ed974c9 100644
--- a/app/src/renderer/components/common/TmPart.vue
+++ b/app/src/renderer/components/common/TmPart.vue
@@ -17,53 +17,3 @@ export default {
   props: ["title"]
 }
 </script>
-
-<style lang="stylus">
-@require '~variables'
-
-.tm-part
-  position relative
-  max-width width-main-max
-  background var(--app-fg)
-  border-radius 2px
-  margin 1rem 0
-
-.tm-part-container,
-.tm-part-header,
-.tm-part-title,
-.tm-part-menu,
-.tm-part-main
-  &:empty
-    display none
-
-.tm-part-main
-  background: blue
-
-.tm-part-container
-  margin 0 auto
-
-.tm-part-header
-  padding 1rem 1rem 0.5rem
-  border-radius 2px
-  background var(--app-fg)
-
-.tm-part-header-container
-  display flex
-  align-items center
-
-.tm-part-title, .tm-part-menu
-  color var(--dim)
-  margin 0
-
-  a
-    color var(--link)
-
-    &:hover
-      color var(--hover)
-
-.tm-part-title
-  flex 1
-  color var(--dim)
-  font-size sm
-  font-weight 400
-</style>
diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
index 9aaa0add68..4012305148 100644
--- a/app/src/renderer/components/wallet/PageSend.vue
+++ b/app/src/renderer/components/wallet/PageSend.vue
@@ -50,7 +50,6 @@ tm-page(title='Send')
       br(v-if='mockedConnector')
 
     div(slot='footer')
-      div
       tm-btn(v-if='sending' value='Sending...' disabled color="primary")
       tm-btn(v-else @click='onSubmit' value="Send Tokens" color="primary")
 
@@ -214,3 +213,13 @@ export default {
   }
 }
 </script>
+
+<style lang="stylus">
+@require '~variables'
+
+.tm-form-footer
+  max-width width-main-max
+  display flex
+  justify-content flex-end
+
+</style>
diff --git a/app/src/renderer/styles/app.styl b/app/src/renderer/styles/app.styl
index e86b0fb207..328f9ff4da 100644
--- a/app/src/renderer/styles/app.styl
+++ b/app/src/renderer/styles/app.styl
@@ -81,9 +81,6 @@ input.tm-field
   height 100% !important
   border-left 1px solid var(--bc, #ddd);
 
-.tm-part-header
-  border 1px solid var(--bc-dim)
-
 .tm-part-main
   padding-right 0 !important
 

From 80a9d9aef4f2d735262ed4039a13434f67b5f28a Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:45:29 -0400
Subject: [PATCH 3/6] update snapshots

---
 .../__snapshots__/TmModalHelp.spec.js.snap    |  99 +++------------
 .../__snapshots__/PageSend.spec.js.snap       | 114 +++++-------------
 .../TmModalSendConfirmation.spec.js.snap      | 107 +++++-----------
 3 files changed, 69 insertions(+), 251 deletions(-)

diff --git a/test/unit/specs/components/common/__snapshots__/TmModalHelp.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmModalHelp.spec.js.snap
index 9c6ecc0985..92aceb62e5 100644
--- a/test/unit/specs/components/common/__snapshots__/TmModalHelp.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmModalHelp.spec.js.snap
@@ -32,92 +32,23 @@ exports[`TmModalHelp has the expected html structure 1`] = `
       class="tm-modal-main"
     >
       <p>
-        Something in the app not working correctly? Tell us what went wrong in developer chat or create an issue on our GitHub. Thanks for improving Cosmos Voyager!
-      </p>
-      <a
-        class="tm-li tm-li-link proposal-enter proposal-enter-active"
-        href="https://riot.im/app/#/room/#cosmos:matrix.org"
-      >
-        <div
-          class="tm-li-container"
+        Something in the app not working correctly? Tell us what went wrong in our 
+        <a
+          href="https://riot.im/app/#/room/#cosmos:matrix.org"
         >
-          <div
-            class="tm-li-thumb"
-          >
-            <!---->
-          </div>
-          <div
-            class="tm-li-label"
-          >
-            <div
-              class="tm-li-title"
-            >
-              Developer Chat
-            </div>
-            <div
-              class="tm-li-subtitle"
-            >
-              
-            </div>
-          </div>
-          <div
-            class="tm-li-icon"
-          >
-            <i
-              class="material-icons inactive"
-            >
-              chevron_right
-            </i>
-            <i
-              class="material-icons active"
-            >
-              my_location
-            </i>
-          </div>
-        </div>
-      </a>
-      <a
-        class="tm-li tm-li-link proposal-enter proposal-enter-active"
-        href="https://github.com/cosmos/voyager/issues"
-      >
-        <div
-          class="tm-li-container"
+          developer chat
+        </a>
+         or create an issue on 
+        <a
+          href="https://github.com/cosmos/voyager/issues"
         >
-          <div
-            class="tm-li-thumb"
-          >
-            <!---->
-          </div>
-          <div
-            class="tm-li-label"
-          >
-            <div
-              class="tm-li-title"
-            >
-              GitHub Issues
-            </div>
-            <div
-              class="tm-li-subtitle"
-            >
-              
-            </div>
-          </div>
-          <div
-            class="tm-li-icon"
-          >
-            <i
-              class="material-icons inactive"
-            >
-              chevron_right
-            </i>
-            <i
-              class="material-icons active"
-            >
-              my_location
-            </i>
-          </div>
-        </div>
-      </a>
+          GitHub
+        </a>
+        .
+      </p>
+      <p>
+        Thanks for improving Cosmos Voyager!
+      </p>
     </main>
     <footer
       class="tm-modal-footer"
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 096c8808a9..90d5ee59ef 100644
--- a/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
@@ -319,7 +319,6 @@ exports[`PageSend has the expected html structure 1`] = `
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -673,7 +672,6 @@ exports[`PageSend should show address required error 1`] = `
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -1007,7 +1005,6 @@ exports[`PageSend should show bech32 error when address length is too long 1`] =
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -1341,7 +1338,6 @@ exports[`PageSend should show bech32 error when address length is too short 1`]
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -1675,7 +1671,6 @@ exports[`PageSend should show bech32 error when alphanumeric is wrong 1`] = `
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -2022,7 +2017,6 @@ exports[`PageSend should trigger confirmation modal if form is corect 1`] = `
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
@@ -2072,116 +2066,63 @@ exports[`PageSend should trigger confirmation modal if form is corect 1`] = `
         <main
           class="tm-modal-main"
         >
-          <div
-            class="tm-li"
-          >
-            <div
-              class="tm-li-container"
-            >
-              <div
-                class="tm-li-thumb"
-              >
-                <!---->
-              </div>
-              <div
-                class="tm-li-dl"
-              >
-                <div
-                  class="tm-li-dt"
-                >
-                  Amount
-                </div>
-                <div
-                  class="tm-li-dd"
-                >
-                  2 mycoin
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            class="tm-li"
-          >
-            <div
-              class="tm-li-container"
-            >
-              <div
-                class="tm-li-thumb"
-              >
-                <!---->
-              </div>
-              <div
-                class="tm-li-dl"
-              >
-                <div
-                  class="tm-li-dt"
-                >
-                  Recipient
-                </div>
-                <div
-                  class="tm-li-dd"
-                >
-                  tb1mjt6dcdru8lgdz64h2fu0lrzvd5zv8sfcvkv2l
-                </div>
-              </div>
-            </div>
-          </div>
-          <p />
           <p>
-            Are you sure you want to send this transaction? Make sure to check the address again. This transaction cannot be undone.
+            Please confirm that you would like to send 
+            <b>
+              2 mycoin
+            </b>
+             to 
+            <b>
+              tb1mjt6dcdru8lgdz64h2fu0lrzvd5zv8sfcvkv2l
+            </b>
+            .
           </p>
-          <div
-            class="tm-modal-send-confirmation__footer"
+          <p
+            class="warning"
           >
+            This transaction cannot be undone.
+          </p>
+        </main>
+        <footer
+          class="tm-modal-footer"
+        >
+          <div>
             <button
               class="tm-btn"
-              id="send-confirmation-btn"
+              id="send-cancel-btn"
               type="button"
             >
               <span
-                class="tm-btn__container tm-btn--primary"
+                class="tm-btn__container"
               >
-                <i
-                  aria-hidden="true"
-                  class="tm-btn__icon material-icons"
-                >
-                  send
-                </i>
+                <!---->
                 <!---->
                 <span
                   class="tm-btn__value"
                 >
-                  Approve Send
+                  Cancel
                 </span>
               </span>
             </button>
             <button
               class="tm-btn"
-              id="send-cancel-btn"
+              id="send-confirmation-btn"
               type="button"
             >
               <span
-                class="tm-btn__container"
+                class="tm-btn__container tm-btn--primary"
               >
-                <i
-                  aria-hidden="true"
-                  class="tm-btn__icon material-icons"
-                >
-                  cancel
-                </i>
+                <!---->
                 <!---->
                 <span
                   class="tm-btn__value"
                 >
-                  Cancel Send
+                  Confirm
                 </span>
               </span>
             </button>
           </div>
-        </main>
-        <footer
-          class="tm-modal-footer"
-        />
+        </footer>
       </div>
     </div>
   </main>
@@ -2501,7 +2442,6 @@ exports[`PageSend should work without providing a default denom 1`] = `
           class="tm-form-footer"
         >
           <div>
-            <div />
             <button
               class="tm-btn"
             >
diff --git a/test/unit/specs/components/wallet/__snapshots__/TmModalSendConfirmation.spec.js.snap b/test/unit/specs/components/wallet/__snapshots__/TmModalSendConfirmation.spec.js.snap
index f87b4eadde..3b5a1eed27 100644
--- a/test/unit/specs/components/wallet/__snapshots__/TmModalSendConfirmation.spec.js.snap
+++ b/test/unit/specs/components/wallet/__snapshots__/TmModalSendConfirmation.spec.js.snap
@@ -31,116 +31,63 @@ exports[`TmModalSendConfirmation has the expected html structure 1`] = `
     <main
       class="tm-modal-main"
     >
-      <div
-        class="tm-li"
-      >
-        <div
-          class="tm-li-container"
-        >
-          <div
-            class="tm-li-thumb"
-          >
-            <!---->
-          </div>
-          <div
-            class="tm-li-dl"
-          >
-            <div
-              class="tm-li-dt"
-            >
-              Amount
-            </div>
-            <div
-              class="tm-li-dd"
-            >
-              12345 funkycoin
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="tm-li"
-      >
-        <div
-          class="tm-li-container"
-        >
-          <div
-            class="tm-li-thumb"
-          >
-            <!---->
-          </div>
-          <div
-            class="tm-li-dl"
-          >
-            <div
-              class="tm-li-dt"
-            >
-              Recipient
-            </div>
-            <div
-              class="tm-li-dd"
-            >
-              cosmosacc1tb1d4u5zerywfjhxuc9nudvw
-            </div>
-          </div>
-        </div>
-      </div>
-      <p />
       <p>
-        Are you sure you want to send this transaction? Make sure to check the address again. This transaction cannot be undone.
+        Please confirm that you would like to send 
+        <b>
+          12345 funkycoin
+        </b>
+         to 
+        <b>
+          cosmosacc1tb1d4u5zerywfjhxuc9nudvw
+        </b>
+        .
       </p>
-      <div
-        class="tm-modal-send-confirmation__footer"
+      <p
+        class="warning"
       >
+        This transaction cannot be undone.
+      </p>
+    </main>
+    <footer
+      class="tm-modal-footer"
+    >
+      <div>
         <button
           class="tm-btn"
-          id="send-confirmation-btn"
+          id="send-cancel-btn"
           type="button"
         >
           <span
-            class="tm-btn__container tm-btn--primary"
+            class="tm-btn__container"
           >
-            <i
-              aria-hidden="true"
-              class="tm-btn__icon material-icons"
-            >
-              send
-            </i>
+            <!---->
             <!---->
             <span
               class="tm-btn__value"
             >
-              Approve Send
+              Cancel
             </span>
           </span>
         </button>
         <button
           class="tm-btn"
-          id="send-cancel-btn"
+          id="send-confirmation-btn"
           type="button"
         >
           <span
-            class="tm-btn__container"
+            class="tm-btn__container tm-btn--primary"
           >
-            <i
-              aria-hidden="true"
-              class="tm-btn__icon material-icons"
-            >
-              cancel
-            </i>
+            <!---->
             <!---->
             <span
               class="tm-btn__value"
             >
-              Cancel Send
+              Confirm
             </span>
           </span>
         </button>
       </div>
-    </main>
-    <footer
-      class="tm-modal-footer"
-    />
+    </footer>
   </div>
 </div>
 `;

From 46dbade091ea28b61aadd93393579a7dc372287c Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:46:59 -0400
Subject: [PATCH 4/6] i'm jbibla now

---
 CHANGELOG.md | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4648ac5cb0..1d4d0bc999 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-* removed light theme option from preferences page @jolesbi
+* removed light theme option from preferences page @jbibla
 * enabled staked balance on PageWallet in production @faboweb
 * removed unused xmlhttprequest dependency @faboweb
 * LCD staking endpoints @fedekunze @faboweb
@@ -26,9 +26,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * testnets not properly available after download @faboweb
 * Tell the main process when we switch to the mock network. @NodeGuy
-* improved tooltip styling @jolesbi
+* improved tooltip styling @jbibla
 * Sort validators by "Your Votes" fixed @okwme
 * Overflow bonding bar bug @okwme
+* improved modal and wallet styling @jbibla
 
 ## [0.9.3] - 2018-08-02
 
@@ -40,14 +41,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 
-* button styling @jolesbi
+* button styling @jbibla
 * Switched to Gaia-7004 @faboweb
 * showing warning about out of range of atoms in bonding UI only once on top and renaming it @faboweb
 * blocking login if not connected to a node to prevent errors @faboweb
 
 ### Fixed
 
-* broken styles in light theme @jolesbi
+* broken styles in light theme @jbibla
 * slider in staking UI @faboweb
 * error with empty accounts @faboweb
 
@@ -107,7 +108,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Using vue-jest for transpiling in tests for better code coverage output @faboweb
 * Default to gaia-7001 @okwme
 * Changed `yarn testnet` to `yarn start` @okwme
-* Updated colors throughout @jolesbi
+* Updated colors throughout @jbibla
 * Update network @okwme
 
 ### Fixed
@@ -140,11 +141,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 
 * Use persistent peers and seeds from tendermint config @faboweb
-* Updated loading icon and loading states @jolesbi
+* Updated loading icon and loading states @jbibla
 * more components moved to `@tendermint/ui` @okwme
 * Removed COSMOS_MOCKED flag @faboweb
-* Improved readability and accessibility @jolesbi
-* Significant style and UI updates for dark and light themes @jolesbi
+* Improved readability and accessibility @jbibla
+* Significant style and UI updates for dark and light themes @jbibla
 * Doesn't show loading screen when validators are still stored @okwme
 * Improved CI @faboweb
 * Search bar fixed to top @okwme
@@ -179,7 +180,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Disabled error reporting in development @faboweb
 * Removed ci files from code coverage as they are badly testable @faboweb
-* Update genesis.json when conflicts are detected @jolesbi
+* Update genesis.json when conflicts are detected @jbibla
 * Hide IBC as it will not be ready for launch @faboweb
 * Updated e2e tests to not rely on flags to run @okwme
 * Not shrinking stacktrace anymore @faboweb
@@ -227,12 +228,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Build process now builds for all three platforms at the same time. @NodeGuy
 * The config.toml is now mocked to guarantee consistent unit tests @faboweb
 * The binary is now accepted if it has the same minor version instead of the path version. @faboweb
-* Hid staking button on wallet page @jolesbi
-* Increment version in package.json @jolesbi
+* Hid staking button on wallet page @jbibla
+* Increment version in package.json @jbibla
 * Profile page now settings with forked ni-vue-field @okwme @nylira
-* Added proper voyager logo to readme @jolesbi
+* Added proper voyager logo to readme @jbibla
 * Made search consistent @okwme
-* Change gaia-2 to gaia-5001 in readme @jolesbi
+* Change gaia-2 to gaia-5001 in readme @jbibla
 * Improved readme with better prerequisite instructions @nylira
 
 ### Fixes
@@ -301,7 +302,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * Added `mvp-features.md` to documentation. @nylira
 * Added full page error @nylira
-* Added receive button and receive modal @jolesbi
+* Added receive button and receive modal @jbibla
 * The validator hash now has to be approved by the user for security @faboweb
 * Transitioned to Docker for easier cross platform builds. @NodeGuy
 * New light theme for day time Voyaging 😎 🚀 @nylira
@@ -327,12 +328,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-* Added back button to every page. @jolesbi
+* Added back button to every page. @jbibla
 
 ### Changed
 
-* Updated transaction history to be more clear and descriptive. @jolesbi
-* Improved delegate profile page to accommodate candidates and validators. @jolesbi
+* Updated transaction history to be more clear and descriptive. @jbibla
+* Improved delegate profile page to accommodate candidates and validators. @jbibla
 
 ## [0.4.1] - 2018-02-01
 
@@ -379,4 +380,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
-* Added a changelog @jolesbi.
+* Added a changelog @jbibla.

From 07f2df4919c72729be8b38c5f5079acfa7cda13b Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:47:41 -0400
Subject: [PATCH 5/6] linty

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

diff --git a/app/src/renderer/components/staking/PageStaking.vue b/app/src/renderer/components/staking/PageStaking.vue
index fd8eb723dc..611cefd889 100644
--- a/app/src/renderer/components/staking/PageStaking.vue
+++ b/app/src/renderer/components/staking/PageStaking.vue
@@ -28,7 +28,7 @@ tm-page(title='Staking')
 <script>
 import { mapGetters } from "vuex"
 import num from "scripts/num"
-import { includes, orderBy, forEach } from "lodash"
+import { includes, orderBy } from "lodash"
 import Mousetrap from "mousetrap"
 import LiDelegate from "staking/LiDelegate"
 import { TmBtn, TmPage, TmDataEmpty, TmDataLoading } from "@tendermint/ui"

From eaf772b2971d43895c429d3823decef13c57a08a Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 10 Aug 2018 12:54:49 -0400
Subject: [PATCH 6/6] made modals wider

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

diff --git a/app/src/renderer/components/common/TmModal.vue b/app/src/renderer/components/common/TmModal.vue
index 176857b018..bb1c7bb6a0 100644
--- a/app/src/renderer/components/common/TmModal.vue
+++ b/app/src/renderer/components/common/TmModal.vue
@@ -60,7 +60,7 @@ export default {
   display flex
   flex-flow column nowrap
   min-width 20rem
-  max-width 30rem
+  max-width 40rem
 
 .tm-modal-header
   display flex