Merge pull request #2262 from cosmos/release-candidate/v1.0.0-beta.18

automatic release created for v1.0.0-beta.18
luniehq · Mar 14, 2019 · 3a010ff · 3a010ff
2 parents 942bd16 + cc386ed
commit 3a010ff
Show file tree

Hide file tree

Showing 53 changed files with 1,437 additions and 886 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -261,7 +261,9 @@ workflows:
       - pendingUpdated:
           filters:
             branches:
-              ignore: release
+              ignore: 
+                - release
+                - master
 
       - security:
           filters:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0-beta.18] - 2019-03-14
+
+### Fixed
+
+- [#\2188](https://github.com/cosmos/voyager/issues/2188) Fixed issues with the way we were loading PageNetwork @jbibla
+- [#\2246](https://github.com/cosmos/voyager/issues/2246) Fix from moniker not visible on withdraw txs @faboweb
+
+### Added
+
+- [\#1959](https://github.com/cosmos/voyager/issues/1959) display transactions on block page @fedekunze
+
+### Changed
+
+- Ignore changelog check on master @faboweb
+- [#\2217](https://github.com/cosmos/voyager/issues/2217) Limit inputs to max precision @faboweb
+
 ## [1.0.0-beta.17] - 2019-03-13
 
 ### Changed

diff --git a/app/src/renderer/components/common/TmDataConnecting.vue b/app/src/renderer/components/common/TmDataConnecting.vue
@@ -1,19 +1,20 @@
 <template>
-  <tm-data-msg>
-    <div slot="title">
-      Waiting for connection
+  <div class="tm-data-msg">
+    <img class="tm-data-msg__icon" src="~assets/images/loader.svg">
+    <div class="tm-data-msg__text">
+      <div slot="title" class="tm-data-msg__title">
+        Finding connection
+      </div>
+      <div slot="subtitle" class="tm-data-msg__subtitle">
+        You are currently not connected to a node. We will load this information
+        when a connection is established.
+      </div>
     </div>
-    <div slot="subtitle">
-      You are currently not connected to a node. Voyager will load this data
-      when a connection is established.
-    </div>
-  </tm-data-msg>
+  </div>
 </template>
 
 <script>
-import TmDataMsg from "common/TmDataMsg"
 export default {
-  name: `tm-data-connecting`,
-  components: { TmDataMsg }
+  name: `tm-data-connecting`
 }
 </script>
diff --git a/app/src/renderer/components/common/TmFormMsg.vue b/app/src/renderer/components/common/TmFormMsg.vue
@@ -7,6 +7,7 @@
 </template>
 
 <script>
+import { prettyDecimals } from "../../scripts/num.js"
 export default {
   props: {
     type: {
@@ -52,7 +53,7 @@ export default {
           msg = `must contain only numerals`
           break
         case `between`:
-          msg = `must be between ${this.min} and ${this.max}`
+          msg = `must be between ${prettyDecimals(this.min)} and ${this.max}`
           break
         case `date`:
           msg = `must be a valid date`
@@ -149,4 +150,4 @@ export default {
   content: "priority_high";
   color: var(--warning);
 }
-</style>
+</style>
diff --git a/app/src/renderer/components/common/TmPage.vue b/app/src/renderer/components/common/TmPage.vue
@@ -1,17 +1,32 @@
 <template>
   <div class="tm-page">
-    <tm-page-header v-if="!hideHeader" :tabs="tabs">
-      <h2 v-if="title" slot="title">
+    <tm-page-header
+      v-if="!hideHeader"
+      :tabs="tabs"
+    >
+      <h2
+        v-if="title"
+        slot="title"
+      >
         {{ title }}
       </h2>
-      <h3 v-if="subtitle" slot="subtitle">
+      <h3
+        v-if="subtitle"
+        slot="subtitle"
+      >
         {{ subtitle }}
       </h3>
-      <slot slot="menu-body" name="menu-body">
+      <slot
+        slot="menu-body"
+        name="menu-body"
+      >
         <tm-balance v-if="session.signedIn" />
         <tool-bar :refresh="refreshable" />
       </slot>
-      <slot slot="header-buttons" name="header-buttons" />
+      <slot
+        slot="header-buttons"
+        name="header-buttons"
+      />
     </tm-page-header>
     <main class="tm-page-main">
       <card-sign-in-required v-if="signInRequired && !session.signedIn" />
@@ -20,13 +35,14 @@
         <tm-data-loading v-else-if="!loaded && loading" />
         <tm-data-error v-else-if="error" />
         <slot
-          v-else-if="
-            (!dataset || dataset.length === 0) && this.$slots['no-data']
-          "
+          v-else-if="dataEmpty && this.$slots['no-data']"
           name="no-data"
         />
-        <tm-data-empty v-else-if="!dataset || dataset.length === 0" />
-        <slot v-else name="managed-body" />
+        <tm-data-empty v-else-if="dataEmpty" />
+        <slot
+          v-else
+          name="managed-body"
+        />
       </template>
       <slot />
     </main>
@@ -86,8 +102,8 @@ export default {
       type: Boolean,
       default: undefined
     },
-    dataset: {
-      type: Array,
+    dataEmpty: {
+      type: Boolean,
       default: undefined
     },
     refresh: {

diff --git a/app/src/renderer/components/governance/ModalDeposit.vue b/app/src/renderer/components/governance/ModalDeposit.vue
@@ -50,7 +50,7 @@
 
 <script>
 import { mapGetters } from "vuex"
-import { uatoms, atoms } from "../../scripts/num.js"
+import { uatoms, atoms, SMALLEST } from "../../scripts/num.js"
 import { between, decimal } from "vuelidate/lib/validators"
 import TmField from "common/TmField"
 import TmFormGroup from "common/TmFormGroup"
@@ -100,7 +100,7 @@ export default {
       amount: {
         required: x => !!x && x !== `0`,
         decimal,
-        between: between(0, atoms(this.balance))
+        between: between(SMALLEST, atoms(this.balance))
       }
     }
   },

diff --git a/app/src/renderer/components/governance/ModalPropose.vue b/app/src/renderer/components/governance/ModalPropose.vue
@@ -106,7 +106,7 @@ import {
   between,
   decimal
 } from "vuelidate/lib/validators"
-import { uatoms, atoms } from "../../scripts/num.js"
+import { uatoms, atoms, SMALLEST } from "../../scripts/num.js"
 import { isEmpty, trim } from "lodash"
 import TmField from "common/TmField"
 import TmFormGroup from "common/TmFormGroup"
@@ -173,7 +173,7 @@ export default {
       amount: {
         required: x => !!x && x !== `0`,
         decimal,
-        between: between(0, atoms(this.balance))
+        between: between(SMALLEST, atoms(this.balance))
       }
     }
   },

diff --git a/app/src/renderer/components/governance/PageGovernance.vue b/app/src/renderer/components/governance/PageGovernance.vue
@@ -1,11 +1,5 @@
 <template>
-  <tm-page
-    :tabs="tabs"
-    :dataset="proposalList"
-    search="proposals"
-    class="governance"
-    data-title="Governance"
-  >
+  <tm-page :tabs="tabs" class="governance" data-title="Governance">
     <tm-btn
       v-if="session.signedIn"
       id="propose-btn"
@@ -54,9 +48,6 @@ export default {
       `connected`,
       `session`
     ]),
-    proposalList() {
-      return Object.values(this.proposals.proposals)
-    }
   },
   mounted() {
     this.ps = new PerfectScrollbar(this.$el.querySelector(`.tm-page-main`))

diff --git a/app/src/renderer/components/network/PageBlock.vue b/app/src/renderer/components/network/PageBlock.vue
@@ -30,30 +30,37 @@
 
       <div class="page-profile__section block">
         <div class="row">
-          <div class="column">
-            <dl class="info_dl colored_dl">
-              <dt>Transactions</dt>
-              <dd>
-                {{
-                  block.block && block.block.data.txs || `No Transactions`
-                }}
-              </dd>
-            </dl>
-          </div>
-        </div>
-      </div>
-
-      <div class="page-profile__section block">
-        <div class="row">
-          <div class="column">
-            <dl class="info_dl colored_dl">
-              <dt>Evidence</dt>
-              <dd>
-                {{
-                  block.block && block.block.evidence.evidence || `No Evidence`
-                }}
-              </dd>
-            </dl>
+          <div
+            class="column"
+          >
+            <h3>Transactions</h3>
+            <tm-data-msg
+              v-if="block.transactions && block.transactions.length === 0"
+              icon="info_outline"
+            >
+              <div slot="title">
+                No Transactions
+              </div>
+              <div slot="subtitle">
+                This block doesn't contain any transaction.
+              </div>
+            </tm-data-msg>
+            <li-any-transaction
+              v-for="tx in block.transactions"
+              :key="tx.txhash"
+              :validators="delegates.delegates"
+              validators-url="/staking/validators"
+              proposals-url="/governance"
+              :transaction="tx"
+              :address="session.address || ``"
+              :bonding-denom="bondDenom"
+              :height="block.block.header.height"
+              :time="block.block.header.time"
+              :unbonding-time="
+                getUnbondingTime(tx, delegation.unbondingDelegations)
+              "
+            />
+            <br>
           </div>
         </div>
       </div>
@@ -65,20 +72,34 @@
 import moment from "moment"
 import { mapGetters } from "vuex"
 import num from "scripts/num"
+import { getUnbondingTime } from "scripts/time"
 import TmDataError from "common/TmDataError"
 import TmPage from "common/TmPage"
+import LiAnyTransaction from "transactions/LiAnyTransaction"
+import TmDataMsg from "common/TmDataMsg"
 export default {
   name: `page-block`,
   components: {
     TmDataError,
-    TmPage
+    TmDataMsg,
+    TmPage,
+    LiAnyTransaction
   },
   data: () => ({
     num,
-    moment
+    moment,
+    getUnbondingTime
   }),
   computed: {
-    ...mapGetters([`connected`, `block`, `lastHeader`]),
+    ...mapGetters([
+      `connected`,
+      `block`,
+      `bondDenom`,
+      `lastHeader`,
+      `delegates`,
+      `delegation`,
+      `session`
+    ]),
     properties() {
       return [
         {
@@ -102,28 +123,23 @@ export default {
     }
   },
   watch: {
-    "$route.params.height": function() {
-      this.getBlock()
+    "$route.params.height": async function() {
+      await this.getBlock()
     }
   },
-  mounted() {
-    this.getBlock()
+  async mounted() {
+    await this.getBlock()
   },
   methods: {
     async getBlock({ $store, $route, $router, lastHeader } = this) {
       // query first for the block so we don't fail if the user started from this route and hasn't received any lastHeader yet
-      const blockInfo = await $store.dispatch(
-        `queryBlockInfo`,
-        $route.params.height
-      )
+      await $store.dispatch(`queryBlockInfo`, $route.params.height)
 
-      if (
-        !blockInfo &&
-        Number($route.params.height) > Number(lastHeader.height)
-      ) {
+      if (!this.block && $route.params.height > lastHeader.height) {
         $router.push(`/404`)
         return
       }
+      await $store.dispatch(`getBlockTxs`, $route.params.height)
     }
   }
 }

diff --git a/app/src/renderer/components/network/PageNetwork.vue b/app/src/renderer/components/network/PageNetwork.vue
@@ -1,7 +1,11 @@
 <template>
-  <tm-page data-title="Network">
-    <tm-data-error v-if="!connected" />
-    <template v-else>
+  <tm-page
+    :loading="!lastHeader"
+    :loaded="!!lastHeader"
+    :error="blocks.error"
+    data-title="Network"
+  >
+    <template slot="managed-body">
       <div class="page-profile__header page-profile__section network">
         <div class="row">
           <div class="page-profile__header__info">
@@ -100,13 +104,11 @@ import moment from "moment"
 import { mapGetters } from "vuex"
 import num from "scripts/num"
 import PanelSort from "staking/PanelSort"
-import TmDataError from "common/TmDataError"
 import TmPage from "common/TmPage"
 export default {
   name: `page-network`,
   components: {
     PanelSort,
-    TmDataError,
     TmPage
   },
   data: () => ({