Merge pull request #2240 from cosmos/fabo/merge-develop-to-master

Fabo/merge develop to master
luniehq · Mar 11, 2019 · a02b874 · a02b874
2 parents 03054d7 + 8ff908d
commit a02b874
Show file tree

Hide file tree

Showing 130 changed files with 3,378 additions and 278,791 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -226,21 +226,18 @@ jobs:
 
   # Create release.
   release:
-    docker:
-      - image: *docker-node
+    executor: node
     steps:
       - checkout
       - yarn-install
       - run: node tasks/createReleasePR.js
 
   # Publish the release to GitHub.
   publish:
-    docker:
-      - image: *docker-node
+    executor: node
     steps:
       - checkout
-      - attach_workspace:
-          at: builds/Gaia
+      - yarn-install
       - run:
           command: |
             mostRecentTag=$(git describe --abbrev=0 --tags)
@@ -253,9 +250,6 @@ jobs:
               git tag -d release-candidate
               git push --delete bot release-candidate
 
-              npm -g uninstall yarn ; npm -g install [email protected]
-              yarn install
-
               node tasks/publish.js
             fi
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0-beta.16] - 2019-03-11
+
+### Added
+
+- [\#2104](https://github.com/cosmos/voyager/issues/2104) fix transaction times @fedekunze
+- [\#1805](https://github.com/cosmos/voyager/issues/1805) support all transaction types @fedekunze
+- [#\2225](https://github.com/cosmos/voyager/pull/2225) local testnets now always have the same account with funds @faboweb
+- [\#2224](https://github.com/cosmos/voyager/issues/2224) persist the signed in address @faboweb
+
+### Changed
+
+- [#\2202](https://github.com/cosmos/voyager/pull/2202) Fix circle configuration for publishing @sabau
+- [#\2211](https://github.com/cosmos/voyager/pull/2211) simplified sidebar and mobile menu, cleaned up css, fixed tests @jbibla
+- [#\2225](https://github.com/cosmos/voyager/pull/2225) Moved to SDK version 0.33.0 @faboweb
+- [#\2154](https://github.com/cosmos/voyager/pull/2154) Added ledger button and style updates @jbibla
+
+### Fixed
+
+- [#\2202](https://github.com/cosmos/voyager/issues/2202) Fix number conversions @faboweb
+- Misc. style fixes @jbibla
+- [\#2104](https://github.com/cosmos/voyager/issues/2103) fix undelegation format changes @faboweb 
+- [\#2192](https://github.com/cosmos/voyager/pull/2192) hide tm-balance on PageProposal and PagePreferences if signed out @faboweb
+
 ## [1.0.0-beta.15] - 2019-03-07
 
 ### Changed
@@ -34,10 +57,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [\#1875](https://github.com/cosmos/voyager/issues/1875) optimistic updates for proposal creation @faboweb
 - [\#1876](https://github.com/cosmos/voyager/issues/1876) optimistic updates for depositing on proposals @faboweb
 
+- [\#2183](https://github.com/cosmos/voyager/issues/2183) Loading block to network block loader @jbibla
+- [\#1875](https://github.com/cosmos/voyager/issues/1875) optimistic updates for proposal creation @faboweb
+- [\#1876](https://github.com/cosmos/voyager/issues/1876) optimistic updates for depositing on proposals @faboweb
 
 ### Changed
 
 - [\#2128](https://github.com/cosmos/voyager/pull/2128) remove loading status on validator page when disconnected from the network @fedekunze
+- [\#2170](https://github.com/cosmos/voyager/pull/2170) bug with card-signed-in and explorer mode @jbibla
 - [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed votes showing wrong tally @faboweb
 - [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed not being able to deposit less then 1 atom not possible @faboweb
 - [\#2167](https://github.com/cosmos/voyager/pull/2167) fixed sorting of proposals @faboweb

diff --git a/PENDING.md b/PENDING.md
@@ -0,0 +1 @@
+
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ Thank you! 🚀
 
 For contributor:
 
-- [ ] Added entries in `CHANGELOG.md` with issue # and GitHub username
+- [ ] Added entries in `PENDING.md` with issue # and GitHub username
 - [ ] Reviewed `Files changed` in the github PR explorer
 - [ ] Attach screenshots of the UI components on the PR description (if applicable)
 - [ ] Scope of work approved for big PRs

diff --git a/app/src/renderer/assets/images/cosmos-wallet-logo.svg b/app/src/renderer/assets/images/cosmos-wallet-logo.svg
diff --git a/app/src/renderer/assets/images/loader.svg b/app/src/renderer/assets/images/loader.svg
diff --git a/app/src/renderer/components/common/ActionModal.vue b/app/src/renderer/components/common/ActionModal.vue
@@ -11,7 +11,7 @@
         <img
           class="icon action-modal-atom"
           src="~assets/images/cosmos-logo.png"
-        />
+        >
         <span class="action-modal-title">
           {{ session.signedIn ? title : `Sign in required` }}
         </span>
@@ -70,11 +70,12 @@
       </div>
 
       <div v-else-if="step === `sign`" class="action-modal-form">
-        <hardware-state v-if="sending" :loading="true">
-          Waiting for signature on app
-        </hardware-state>
-        <hardware-state v-else icon="usb">
-          Please unlock the Cosmos app on your Ledger&nbsp;Nano&nbsp;S
+        <hardware-state icon="usb" :loading="sending ? true : false">
+          {{
+            sending
+              ? `Please verify and sign the transaction on your Ledger`
+              : `Please plug in your Ledger&nbsp;Nano&nbsp;S and open the Cosmos app`
+          }}
         </hardware-state>
       </div>
 
@@ -91,7 +92,7 @@
               />
               <tm-btn
                 v-else-if="sending"
-                value="Sending..."
+                :value="step === `sign` ? `Waiting for Ledger` : `Sending...`"
                 disabled="disabled"
                 color="primary"
               />
@@ -112,7 +113,7 @@
               <tm-btn
                 v-else-if="selectedSignMethod === `ledger` && step === `sign`"
                 color="primary"
-                value="Sign"
+                value="Next"
                 @click.native="validateChangeStep"
               />
               <tm-btn

diff --git a/app/src/renderer/components/common/AppHeader.vue b/app/src/renderer/components/common/AppHeader.vue
@@ -1,23 +1,26 @@
 <template>
-  <nav id="app-header" :class="{ mobile: !desktop }">
+  <nav class="app-header" :class="{ mobile: !desktop }">
     <div class="container">
       <div class="header-item header-item-logo">
         <router-link to="/">
-          <img id="logo-white" src="~assets/images/cosmos-wordmark-white.svg">
-        </router-link> 
+          <img src="~assets/images/cosmos-wallet-logo.svg">
+        </router-link>
+        <template v-if="!desktop">
+          <div v-if="open" class="close-menu" @click="close()">
+            <i class="material-icons mobile-menu-action">close</i>
+          </div>
+          <div v-if="!open" class="open-menu" @click="show()">
+            <i class="material-icons mobile-menu-action">menu</i>
+          </div>
+        </template>
       </div>
-      <div v-if="!session.experimentalMode && session.insecureMode" id="develop-mode-warning">
+      <div
+        v-if="!session.experimentalMode && session.insecureMode"
+        id="develop-mode-warning"
+      >
         INSECURE MODE
       </div>
       <app-menu v-if="open || desktop" @close="close" />
-      <template v-if="!desktop">
-        <div v-if="open" class="header-item close-menu" @click="close()">
-          <i class="material-icons">close</i>
-        </div>
-        <div v-if="!open" class="header-item open-menu" @click="show()">
-          <i class="material-icons">menu</i>
-        </div>
-      </template>
     </div>
   </nav>
 </template>
@@ -72,74 +75,61 @@ export default {
 </script>
 
 <style>
-#app-header {
+.app-header {
   z-index: var(--z-appHeader);
   position: relative;
+  background: var(--app-nav);
+  display: flex;
+  flex: 0 0 var(--width-side);
+  min-width: 0;
 }
 
-#app-header .container {
-  -webkit-app-region: drag;
+.mobile-menu-action {
+  font-size: 1.5rem;
 }
 
-@media screen and (max-width: 1023px) {
-  #app-header {
+.app-header > .container {
+  flex: 1;
+  display: flex;
+  flex-flow: column nowrap;
+}
+
+.app-header .header-item-logo {
+  padding: 1.25rem;
+  font-size: 0;
+}
+
+.app-header .header-item-logo a {
+  display: inline-block;
+}
+
+.app-header .header-item-logo img {
+  height: 3rem;
+}
+
+@media screen and (max-width: 1024px) {
+  .app-header {
     position: fixed;
     top: 0;
     left: 0;
     width: 100%;
-    background: var(--app-bg);
-  }
-
-  #app-header > .container {
-    max-width: var(--aw);
-    margin: 0 auto;
-    display: flex;
-    flex-flow: row nowrap;
-    border-bottom: var(--px) solid var(--bc);
-    justify-content: space-between;
   }
 
-  #app-header .header-item {
-    height: calc(3rem - var(--px));
+  .app-header .header-item {
     display: flex;
     align-items: center;
-    justify-content: center;
-    padding: 0 1rem;
+    justify-content: space-between;
+    padding: 1rem;
     color: var(--link);
     cursor: pointer;
   }
 
-  #app-header .header-item i.material-icons {
-    width: 1rem;
-    font-size: var(--lg);
-  }
-
-  #app-header .header-item.header-item-logo img {
-    height: 1.5rem;
-  }
-}
-
-@media screen and (min-width: 1024px) {
-  #app-header {
-    display: flex;
-    flex: 0 0 var(--width-side);
-    min-width: 0;
-  }
-
-  #app-header > .container {
-    flex: 1;
-    display: flex;
-    flex-flow: column nowrap;
-  }
-
-  #app-header .header-item-logo {
-    border-bottom: var(--px) solid var(--bc);
-    padding: 2.5rem 1rem 1rem 1rem;
-    line-height: normal;
+  .app-header .header-item-logo {
+    padding: 0.75rem 1rem;
   }
 
-  #app-header .header-item-logo img {
-    height: 1.75rem;
+  .app-header .header-item-logo img {
+    height: 2rem;
   }
 }
 </style>
diff --git a/app/src/renderer/components/common/AppMenu.vue b/app/src/renderer/components/common/AppMenu.vue
@@ -95,7 +95,6 @@ export default {
 
 <style>
 .app-menu {
-  background: var(--app-nav);
   z-index: var(--z-appMenu);
   user-select: none;
   display: flex;
@@ -111,18 +110,20 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  border-bottom: 1px solid var(--bc-dim);
-  padding: 1rem;
-  color: var(--dim);
+  padding: 0.5rem 0.75rem;
+  margin: 0.5rem;
+  font-weight: 400;
+  color: var(--text);
+  border-radius: 0.25rem;
 }
 
 .app-menu .app-menu-item:hover {
   color: var(--bright);
-  background: var(--hover-bg);
+  background: var(--app-fg);
 }
 
 .app-menu .router-link-active {
-  background: var(--hover-bg);
+  background: var(--app-fg);
 }
 
 .app-menu .router-link-active i {
@@ -136,13 +137,15 @@ export default {
 
 @media screen and (max-width: 1023px) {
   .app-menu {
-    position: fixed;
-    top: 3rem;
-    left: 0;
-    bottom: 0;
-    width: 100vw;
     background: var(--app-bg);
-    user-select: none;
+  }
+
+  .app-menu .app-menu-item {
+    padding: 0.75rem;
+  }
+
+  .app-menu-title {
+    font-size: 1.5rem;
   }
 }