From cb3b920f89308de22bf405586292f19266ea1e27 Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Fri, 22 Mar 2019 16:39:38 +0100
Subject: [PATCH 01/17] moved throttling into modules

---
 .../renderer/components/common/TmBalance.vue  | 10 ++--
 .../components/staking/TabMyDelegations.vue   | 17 ++-----
 .../components/staking/TabValidators.vue      | 38 ++++-----------
 app/src/renderer/vuex/getters.js              |  9 +++-
 app/src/renderer/vuex/modules/delegates.js    | 31 ++++++++----
 app/src/renderer/vuex/modules/distribution.js | 48 ++++++++++++++-----
 .../staking/TabMyDelegations.spec.js          |  6 +--
 .../components/staking/TabValidators.spec.js  |  6 +--
 test/unit/specs/store/distribution.spec.js    |  6 +--
 9 files changed, 94 insertions(+), 77 deletions(-)

diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue
index 07613afedb..feb85e8a43 100644
--- a/app/src/renderer/components/common/TmBalance.vue
+++ b/app/src/renderer/components/common/TmBalance.vue
@@ -45,7 +45,8 @@ export default {
   },
   data() {
     return {
-      num
+      num,
+      lastUpdate: 0
     }
   },
   computed: {
@@ -85,8 +86,11 @@ export default {
     lastHeader: {
       immediate: true,
       handler(newHeader) {
-        const waitTenBlocks = Number(newHeader.height) % 10 === 0
-        if (this.session.signedIn && waitTenBlocks) {
+        const height = Number(newHeader.height)
+        // run the update queries the first time and after every 10 blocks
+        const waitedTenBlocks = height - this.lastUpdate > 10
+        if (this.session.signedIn && (height === 0 || waitedTenBlocks)) {
+          this.lastUpdate = height
           this.$store.dispatch(`getTotalRewards`)
           this.$store.dispatch(`queryWalletBalances`)
         }
diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue
index b5b74a069d..44bc1a76b4 100644
--- a/app/src/renderer/components/staking/TabMyDelegations.vue
+++ b/app/src/renderer/components/staking/TabMyDelegations.vue
@@ -75,7 +75,8 @@ export default {
     unbondTransactions: `Transactions currently in the undelegation period`,
     validatorURL: `/staking/validators`,
     time,
-    num
+    num,
+    lastUpdate: 0
   }),
   computed: {
     ...mapGetters([
@@ -132,18 +133,8 @@ export default {
     },
     lastHeader: {
       immediate: true,
-      handler(newHeader) {
-        const waitTwentyBlocks = Number(newHeader.height) % 20 === 0
-        if (
-          waitTwentyBlocks &&
-          this.yourValidators &&
-          this.yourValidators.length > 0
-        ) {
-          this.$store.dispatch(
-            `getRewardsFromAllValidators`,
-            this.yourValidators
-          )
-        }
+      handler() {
+        this.$store.dispatch(`getRewardsFromMyValidators`)
       }
     }
   },
diff --git a/app/src/renderer/components/staking/TabValidators.vue b/app/src/renderer/components/staking/TabValidators.vue
index 5df836c5d3..e268a8da1b 100644
--- a/app/src/renderer/components/staking/TabValidators.vue
+++ b/app/src/renderer/components/staking/TabValidators.vue
@@ -24,28 +24,18 @@ export default {
     TmDataLoading,
     TmDataConnecting
   },
+  data: () => ({
+    lastUpdate: 0
+  }),
   computed: {
     ...mapGetters([
       `lastHeader`,
       `delegates`,
       `committedDelegations`,
       `connected`,
-      `session`
-    ]),
-    yourValidators(
-      {
-        committedDelegations,
-        delegates: { delegates },
-        session: { signedIn }
-      } = this
-    ) {
-      return (
-        signedIn &&
-        delegates.filter(
-          ({ operator_address }) => operator_address in committedDelegations
-        )
-      )
-    }
+      `session`,
+      `yourValidators`
+    ])
   },
   watch: {
     "session.signedIn": function(signedIn) {
@@ -53,25 +43,15 @@ export default {
     },
     lastHeader: {
       immediate: true,
-      handler(newHeader) {
-        const waitTwentyBlocks = Number(newHeader.height) % 20 === 0
-        if (
-          waitTwentyBlocks &&
-          this.yourValidators &&
-          this.yourValidators.length > 0
-        ) {
-          this.$store.dispatch(
-            `getRewardsFromAllValidators`,
-            this.yourValidators
-          )
-        }
+      handler() {
+        this.$store.dispatch(`getRewardsFromMyValidators`)
       }
     }
   },
   mounted() {
     this.$store.dispatch(`updateDelegates`)
     if (this.yourValidators) {
-      this.$store.dispatch(`getRewardsFromAllValidators`, this.yourValidators)
+      this.$store.dispatch(`getRewardsFromMyValidators`, this.yourValidators)
     }
   }
 }
diff --git a/app/src/renderer/vuex/getters.js b/app/src/renderer/vuex/getters.js
index 7ee5007c4a..81b50a611e 100644
--- a/app/src/renderer/vuex/getters.js
+++ b/app/src/renderer/vuex/getters.js
@@ -26,6 +26,11 @@ export const wallet = state => state.wallet
 
 // fee distribution
 export const distribution = state => state.distribution
+export const yourValidators = (state, getters) =>
+  state.session.signedIn &&
+  getters.delegates.delegates.filter(
+    ({ operator_address }) => operator_address in getters.committedDelegations
+  )
 
 // staking
 export const liquidAtoms = state =>
@@ -89,7 +94,7 @@ export const deposits = state => state.deposits.deposits
 export const governanceParameters = state => state.governanceParameters
 export const depositDenom = getters =>
   getters.governanceParameters.loaded &&
-    getters.governanceParameters.parameters.deposit.min_deposit
+  getters.governanceParameters.parameters.deposit.min_deposit
     ? getters.governanceParameters.parameters.deposit.min_deposit[0].denom
     : `uatom`
 
@@ -101,4 +106,4 @@ export const nodeUrl = state =>
   state.connection.connected ? state.connection.nodeUrl : undefined
 
 export const blocks = state => (state.blocks ? state.blocks.blocks : [])
-export const block = state => (state.blocks ? state.blocks.block : [])
\ No newline at end of file
+export const block = state => (state.blocks ? state.blocks.block : [])
diff --git a/app/src/renderer/vuex/modules/delegates.js b/app/src/renderer/vuex/modules/delegates.js
index be5dc7222b..f060bc75ba 100644
--- a/app/src/renderer/vuex/modules/delegates.js
+++ b/app/src/renderer/vuex/modules/delegates.js
@@ -11,7 +11,8 @@ export default ({ node }) => {
     globalPower: null,
     loading: false,
     loaded: false,
-    error: null
+    error: null,
+    lastDelegatesUpdate: 0
   }
   const state = JSON.parse(JSON.stringify(emptyState))
 
@@ -58,16 +59,28 @@ export default ({ node }) => {
     resetSessionData({ rootState }) {
       rootState.delegates = JSON.parse(JSON.stringify(emptyState))
     },
-    async updateSigningInfo({ commit }, validators) {
-      for (const validator of validators) {
-        if (validator.consensus_pubkey) {
-          const signing_info = await node.getValidatorSigningInfo(
-            validator.consensus_pubkey
-          )
-          if (!isEmpty(signing_info)) validator.signing_info = signing_info
+    async updateSigningInfo(
+      {
+        commit,
+        getters: { lastHeader }
+      },
+      validators
+    ) {
+      // throttle the update for validators for every 10 blocks
+      const waited10Blocks =
+        Number(lastHeader.height) - state.lastDelegatesUpdate > 10
+      if (state.lastDelegatesUpdate === 0 || waited10Blocks) {
+        state.lastDelegatesUpdate = Number(lastHeader.height)
+        for (const validator of validators) {
+          if (validator.consensus_pubkey) {
+            const signing_info = await node.getValidatorSigningInfo(
+              validator.consensus_pubkey
+            )
+            if (!isEmpty(signing_info)) validator.signing_info = signing_info
+          }
         }
+        commit(`setDelegates`, validators)
       }
-      commit(`setDelegates`, validators)
     },
     async getDelegates({ state, commit, dispatch, rootState }) {
       commit(`setDelegateLoading`, true)
diff --git a/app/src/renderer/vuex/modules/distribution.js b/app/src/renderer/vuex/modules/distribution.js
index 4d08bb7fa2..2ff0acfba9 100644
--- a/app/src/renderer/vuex/modules/distribution.js
+++ b/app/src/renderer/vuex/modules/distribution.js
@@ -7,6 +7,7 @@ export default ({ node }) => {
     loading: false,
     loaded: false,
     error: null,
+    lastValidatorRewardsUpdate: 0, // keep track of last update so we can throttle the interval
     /* totalRewards use the following format:
         {
             denom1: amount1,
@@ -69,9 +70,7 @@ export default ({ node }) => {
     resetSessionData({ rootState }) {
       rootState.distribution = JSON.parse(JSON.stringify(emptyState))
     },
-    async getTotalRewards(
-      { state, rootState: { session }, commit }
-    ) {
+    async getTotalRewards({ state, rootState: { session }, commit }) {
       state.loading = true
       try {
         const rewardsArray = await node.getDelegatorRewards(session.address)
@@ -86,7 +85,10 @@ export default ({ node }) => {
       state.loading = false
     },
     async withdrawAllRewards(
-      { rootState: { wallet }, dispatch },
+      {
+        rootState: { wallet },
+        dispatch
+      },
       { password, submitType }
     ) {
       await dispatch(`sendTx`, {
@@ -99,16 +101,38 @@ export default ({ node }) => {
       await dispatch(`queryWalletBalances`)
       await dispatch(`getAllTxs`)
     },
-    async getRewardsFromAllValidators({ state, dispatch }, validators) {
-      state.loading = true
-      await Promise.all(validators.map(validator =>
-        dispatch(`getRewardsFromValidator`, validator.operator_address)
-      ))
-      state.loading = false
-      state.loaded = true
+    async getRewardsFromMyValidators(
+      {
+        state,
+        dispatch,
+        getters: { lastHeader, yourValidators }
+      },
+      validators
+    ) {
+      // throttle the update of validator rewards to every 20 blocks
+      const waitedTwentyBlocks =
+        Number(lastHeader.height) - state.lastValidatorRewardsUpdate > 20
+      if (
+        (state.lastValidatorRewardsUpdate === 0 || waitedTwentyBlocks) &&
+        yourValidators &&
+        yourValidators.length > 0
+      ) {
+        state.loading = true
+        await Promise.all(
+          validators.map(validator =>
+            dispatch(`getRewardsFromValidator`, validator.operator_address)
+          )
+        )
+        state.loading = false
+        state.loaded = true
+      }
     },
     async getRewardsFromValidator(
-      { state, rootState: { session }, commit },
+      {
+        state,
+        rootState: { session },
+        commit
+      },
       validatorAddr
     ) {
       state.loading = true
diff --git a/test/unit/specs/components/staking/TabMyDelegations.spec.js b/test/unit/specs/components/staking/TabMyDelegations.spec.js
index 4ebb237cb2..da43f0791d 100644
--- a/test/unit/specs/components/staking/TabMyDelegations.spec.js
+++ b/test/unit/specs/components/staking/TabMyDelegations.spec.js
@@ -166,7 +166,7 @@ describe(`Component: TabMyDelegations`, () => {
             { $store, yourValidators },
             newHeader)
           expect($store.dispatch).not.toHaveBeenCalledWith(
-            `getRewardsFromAllValidators`,
+            `getRewardsFromMyValidators`,
             yourValidators
           )
         })
@@ -179,7 +179,7 @@ describe(`Component: TabMyDelegations`, () => {
             { $store, yourValidators },
             newHeader)
           expect($store.dispatch).not.toHaveBeenCalledWith(
-            `getRewardsFromAllValidators`,
+            `getRewardsFromMyValidators`,
             yourValidators
           )
         })
@@ -193,7 +193,7 @@ describe(`Component: TabMyDelegations`, () => {
               { $store, yourValidators },
               newHeader)
             expect($store.dispatch).toHaveBeenCalledWith(
-              `getRewardsFromAllValidators`,
+              `getRewardsFromMyValidators`,
               yourValidators
             )
           })
diff --git a/test/unit/specs/components/staking/TabValidators.spec.js b/test/unit/specs/components/staking/TabValidators.spec.js
index 7cc6fa6849..9d6f9a22c7 100644
--- a/test/unit/specs/components/staking/TabValidators.spec.js
+++ b/test/unit/specs/components/staking/TabValidators.spec.js
@@ -183,7 +183,7 @@ describe(`TabValidators`, () => {
           { $store, yourValidators },
           newHeader)
         expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromAllValidators`,
+          `getRewardsFromMyValidators`,
           yourValidators
         )
       })
@@ -196,7 +196,7 @@ describe(`TabValidators`, () => {
           { $store, yourValidators },
           newHeader)
         expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromAllValidators`,
+          `getRewardsFromMyValidators`,
           yourValidators
         )
       })
@@ -210,7 +210,7 @@ describe(`TabValidators`, () => {
             { $store, yourValidators },
             newHeader)
           expect($store.dispatch).toHaveBeenCalledWith(
-            `getRewardsFromAllValidators`,
+            `getRewardsFromMyValidators`,
             yourValidators
           )
         })
diff --git a/test/unit/specs/store/distribution.spec.js b/test/unit/specs/store/distribution.spec.js
index 81c90a9b62..ea09c95215 100644
--- a/test/unit/specs/store/distribution.spec.js
+++ b/test/unit/specs/store/distribution.spec.js
@@ -139,13 +139,13 @@ describe(`Module: Fee Distribution`, () => {
       })
     })
 
-    describe(`getRewardsFromAllValidators`, () => {
+    describe(`getRewardsFromMyValidators`, () => {
       it(`success`, async () => {
         const validators = [
           { operator_address: `cosmosvaloper1address1` },
           { operator_address: `cosmosvaloper1address2` },
         ]
-        await actions.getRewardsFromAllValidators(
+        await actions.getRewardsFromMyValidators(
           { state, dispatch },
           validators
         )
@@ -166,7 +166,7 @@ describe(`Module: Fee Distribution`, () => {
           { operator_address: `cosmosvaloper1address2` },
         ]
         dispatch = jest.fn(async () => Promise.reject(Error(`invalid address`)))
-        await expect(actions.getRewardsFromAllValidators(
+        await expect(actions.getRewardsFromMyValidators(
           { state, dispatch },
           validators)
         ).rejects.toThrowError(`invalid address`)

From 8419257874f48df537645dd6f027054790b5c2bb Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Fri, 22 Mar 2019 16:44:01 +0100
Subject: [PATCH 02/17] changelog

---
 PENDING.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/PENDING.md b/PENDING.md
index 30e03ef833..c6041c91b6 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -2,3 +2,7 @@
 
 - [\#1337](https://github.com/cosmos/voyager/issues/1337) Updated modals tests acording to standard @fedekunze
 - [\#2328](https://github.com/cosmos/voyager/pull/2328) Changed "Total Rewards" to "Pending Rewards" in the balance header @faboweb
+
+### Fixed
+
+- [\#2330](https://github.com/cosmos/voyager/issues/2330) Fixed rewards not updating as expected @faboweb
\ No newline at end of file

From 6fb84db382b22f2de5ed55496e26ee3053eb4362 Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 11:37:53 +0100
Subject: [PATCH 03/17] update li transactions

---
 .../transactions/LiAnyTransaction.vue         | 122 ++++++++++--------
 .../transactions/LiBankTransaction.vue        |  17 ++-
 .../LiDistributionTransaction.vue             |  19 +--
 .../transactions/LiGovTransaction.vue         |  23 ++--
 .../transactions/LiStakeTransaction.vue       |  17 ++-
 .../components/transactions/LiTransaction.vue |   2 +-
 test/unit/specs/store/json/txs.js             |   1 -
 7 files changed, 115 insertions(+), 86 deletions(-)

diff --git a/app/src/renderer/components/transactions/LiAnyTransaction.vue b/app/src/renderer/components/transactions/LiAnyTransaction.vue
index ee1af4f686..0881b2e2b5 100644
--- a/app/src/renderer/components/transactions/LiAnyTransaction.vue
+++ b/app/src/renderer/components/transactions/LiAnyTransaction.vue
@@ -1,46 +1,61 @@
 <template>
-  <li-bank-transaction
-    v-if="bankTx"
-    :transaction="transaction"
-    :bonding-denom="bondingDenom"
-    :address="address"
-    :fees="fees"
-  />
-  <li-stake-transaction
-    v-else-if="stakingTx"
-    :transaction="transaction"
-    :validators="validators"
-    :url="validatorsUrl"
-    :unbonding-time="unbondingTime"
-    :bonding-denom="bondingDenom"
-    :tx-type="type"
-    :fees="fees"
-  />
-  <li-gov-transaction
-    v-else-if="governanceTx"
-    :transaction="transaction"
-    :bonding-denom="bondingDenom"
-    :url="proposalsUrl"
-    :tx-type="type"
-    :fees="fees"
-  />
-  <li-distribution-transaction
-    v-else-if="distributionTx"
-    :transaction="transaction"
-    :url="validatorsUrl"
-    :bonding-denom="bondingDenom"
-    :tx-type="type"
-    :validators="validators"
-    :fees="fees"
-  />
-  <li-transaction
-    v-else
-    :time="transaction.time"
-    :block="transaction.height"
-    color="grey"
-  >
-    <span slot="caption">Unknown Transaction Type</span>
-  </li-transaction>
+  <div>
+    <div
+      v-for="(msg, index) in transaction.tx.value.msg"
+      :key="index"
+    >
+      <li-bank-transaction
+        v-if="bankTx(msg.type)"
+        :tx="msg.value"
+        :bonding-denom="bondingDenom"
+        :address="address"
+        :fees="fees"
+        :time="transaction.time"
+        :block="Number(transaction.height)"
+      />
+      <li-stake-transaction
+        v-else-if="stakingTx(msg.type)"
+        :tx="msg.value"
+        :validators="validators"
+        :url="validatorsUrl"
+        :unbonding-time="unbondingTime"
+        :bonding-denom="bondingDenom"
+        :tx-type="msg.type"
+        :fees="fees"
+        :time="transaction.time"
+        :block="Number(transaction.height)"
+      />
+      <li-gov-transaction
+        v-else-if="governanceTx(msg.type)"
+        :tx="msg.value"
+        :bonding-denom="bondingDenom"
+        :url="proposalsUrl"
+        :tx-type="msg.type"
+        :fees="fees"
+        :time="transaction.time"
+        :block="Number(transaction.height)"
+      />
+      <li-distribution-transaction
+        v-else-if="distributionTx(msg.type)"
+        :tx="msg.value"
+        :url="validatorsUrl"
+        :bonding-denom="bondingDenom"
+        :tx-type="msg.type"
+        :validators="validators"
+        :fees="fees"
+        :time="transaction.time"
+        :block="Number(transaction.height)"
+      />
+      <li-transaction
+        v-else
+        :time="transaction.time"
+        :block="Number(transaction.height)"
+        color="grey"
+      >
+        <span slot="caption">Unknown Transaction Type</span>
+      </li-transaction>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -90,19 +105,18 @@ export default {
     }
   },
   computed: {
-    type() {
-      return this.transaction.tx.value.msg[0].type
-    },
     fees() {
       return (
         this.transaction.tx.value.fee.amount &&
         this.transaction.tx.value.fee.amount[0]
       )
+    }
+  },
+  methods: {
+    bankTx(type) {
+      return [`cosmos-sdk/MsgSend`].includes(type)
     },
-    bankTx() {
-      return [`cosmos-sdk/MsgSend`].includes(this.type)
-    },
-    stakingTx() {
+    stakingTx(type) {
       return [
         `cosmos-sdk/MsgCreateValidator`,
         `cosmos-sdk/MsgEditValidator`,
@@ -110,21 +124,21 @@ export default {
         `cosmos-sdk/MsgUndelegate`,
         `cosmos-sdk/MsgBeginRedelegate`,
         `cosmos-sdk/MsgUnjail`
-      ].includes(this.type)
+      ].includes(type)
     },
-    governanceTx() {
+    governanceTx(type) {
       return [
         `cosmos-sdk/MsgSubmitProposal`,
         `cosmos-sdk/MsgDeposit`,
         `cosmos-sdk/MsgVote`
-      ].includes(this.type)
+      ].includes(type)
     },
-    distributionTx() {
+    distributionTx(type) {
       return [
         `cosmos-sdk/MsgSetWithdrawAddress`,
         `cosmos-sdk/MsgWithdrawDelegationReward`,
         `cosmos-sdk/MsgWithdrawValidatorCommission`
-      ].includes(this.type)
+      ].includes(type)
     }
   }
 }
diff --git a/app/src/renderer/components/transactions/LiBankTransaction.vue b/app/src/renderer/components/transactions/LiBankTransaction.vue
index d97c1d517c..15d3991e47 100644
--- a/app/src/renderer/components/transactions/LiBankTransaction.vue
+++ b/app/src/renderer/components/transactions/LiBankTransaction.vue
@@ -1,8 +1,8 @@
 <template>
   <li-transaction
     :color="`#ED553B`"
-    :time="transaction.time"
-    :block="transaction.height"
+    :time="time"
+    :block="block"
   >
     <template v-if="address === ''">
       <div slot="caption">
@@ -67,7 +67,7 @@ export default {
     LiTransaction
   },
   props: {
-    transaction: {
+    tx: {
       type: Object,
       required: true
     },
@@ -82,6 +82,14 @@ export default {
     bondingDenom: {
       type: String,
       required: true
+    },
+    time: {
+      type: String,
+      required: true
+    },
+    block: {
+      type: Number,
+      required: true
     }
   },
   data: () => ({
@@ -90,9 +98,6 @@ export default {
     shortAddress
   }),
   computed: {
-    tx() {
-      return this.transaction.tx.value.msg[0].value
-    },
     // TODO: sum relevant inputs/outputs
     sentSelf() {
       return this.tx.from_address === this.tx.to_address
diff --git a/app/src/renderer/components/transactions/LiDistributionTransaction.vue b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
index 7a1d344fdb..4ee7e22ca8 100644
--- a/app/src/renderer/components/transactions/LiDistributionTransaction.vue
+++ b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
@@ -1,8 +1,8 @@
 <template>
   <li-transaction
     :color="`#F2B134`"
-    :time="transaction.time"
-    :block="transaction.height"
+    :time="time"
+    :block="block"
   >
     <template v-if="txType === `cosmos-sdk/MsgWithdrawDelegationReward`">
       <div slot="caption">
@@ -57,7 +57,7 @@ export default {
   name: `li-distribution-transaction`,
   components: { LiTransaction },
   props: {
-    transaction: {
+    tx: {
       type: Object,
       required: true
     },
@@ -80,6 +80,14 @@ export default {
     validators: {
       type: Array,
       required: true
+    },
+    time: {
+      type: String,
+      required: true
+    },
+    block: {
+      type: Number,
+      required: true
     }
   },
   data: () => ({
@@ -87,11 +95,6 @@ export default {
     full,
     pretty
   }),
-  computed: {
-    tx() {
-      return this.transaction.tx.value.msg[0].value
-    }
-  },
   methods: {
     moniker(validatorAddr) {
       const validator = this.validators.find(
diff --git a/app/src/renderer/components/transactions/LiGovTransaction.vue b/app/src/renderer/components/transactions/LiGovTransaction.vue
index 24372e57bb..49dcb2d80b 100644
--- a/app/src/renderer/components/transactions/LiGovTransaction.vue
+++ b/app/src/renderer/components/transactions/LiGovTransaction.vue
@@ -1,8 +1,8 @@
 <template>
   <li-transaction
     :color="`#15CFCC`"
-    :time="transaction.time"
-    :block="transaction.height"
+    :time="time"
+    :block="block"
   >
     <template v-if="txType === `cosmos-sdk/MsgSubmitProposal`">
       <div slot="caption">
@@ -11,7 +11,7 @@
         <span>{{ tx.initial_deposit[0].denom }}s</span>
       </div>
       <div slot="details">
-        Title:<i>{{ tx.title }}</i>
+        Title: <i>{{ tx.title }}</i>
       </div>
       <div slot="fees">
         Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
@@ -63,7 +63,7 @@ export default {
   name: `li-gov-transaction`,
   components: { LiTransaction },
   props: {
-    transaction: {
+    tx: {
       type: Object,
       required: true
     },
@@ -82,16 +82,19 @@ export default {
     txType: {
       type: String,
       required: true
+    },
+    time: {
+      type: String,
+      required: true
+    },
+    block: {
+      type: Number,
+      required: true
     }
   },
   data: () => ({
     full,
     atoms
-  }),
-  computed: {
-    tx() {
-      return this.transaction.tx.value.msg[0].value
-    }
-  }
+  })
 }
 </script>
diff --git a/app/src/renderer/components/transactions/LiStakeTransaction.vue b/app/src/renderer/components/transactions/LiStakeTransaction.vue
index 371463c513..44a2eeec58 100644
--- a/app/src/renderer/components/transactions/LiStakeTransaction.vue
+++ b/app/src/renderer/components/transactions/LiStakeTransaction.vue
@@ -1,8 +1,8 @@
 <template>
   <li-transaction
     color="#47AB6C"
-    :time="transaction.time"
-    :block="transaction.height"
+    :time="time"
+    :block="block"
   >
     <template v-if="txType === `cosmos-sdk/MsgCreateValidator`">
       <div slot="caption">
@@ -143,7 +143,7 @@ export default {
   name: `li-stake-transaction`,
   components: { LiTransaction },
   props: {
-    transaction: {
+    tx: {
       type: Object,
       required: true
     },
@@ -170,6 +170,14 @@ export default {
     txType: {
       type: String,
       required: true
+    },
+    time: {
+      type: String,
+      default: null // TODO: fails with required: true
+    },
+    block: {
+      type: Number,
+      required: true
     }
   },
   data: () => ({
@@ -177,9 +185,6 @@ export default {
     full
   }),
   computed: {
-    tx() {
-      return this.transaction.tx.value.msg[0].value
-    },
     timeDiff() {
       // only show time diff if still waiting to be terminated
       if (this.state !== `locked`) return ``
diff --git a/app/src/renderer/components/transactions/LiTransaction.vue b/app/src/renderer/components/transactions/LiTransaction.vue
index 49796e7036..16c31ada99 100644
--- a/app/src/renderer/components/transactions/LiTransaction.vue
+++ b/app/src/renderer/components/transactions/LiTransaction.vue
@@ -44,7 +44,7 @@ export default {
       default: null // TODO: fails with required: true
     },
     block: {
-      type: [String, Number], // for convenience we allow strings and numbers
+      type: Number,
       required: true
     }
   },
diff --git a/test/unit/specs/store/json/txs.js b/test/unit/specs/store/json/txs.js
index bb4295aeac..5644f60992 100644
--- a/test/unit/specs/store/json/txs.js
+++ b/test/unit/specs/store/json/txs.js
@@ -209,7 +209,6 @@ export const stakingTxs = [
   },
   {
     hash: `not a real hash 5`,
-
     time: new Date(42000).toISOString(), // set by Voyager
     height: `568`,
     tx: {

From 153f1c97603bb1e7fc7b744678582ec09883270f Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 11:38:12 +0100
Subject: [PATCH 04/17] tests and snaps

---
 .../transactions/LiBankTransaction.spec.js    |  43 ++--
 .../LiDistributionTransaction.spec.js         |   8 +-
 .../transactions/LiGovTransaction.spec.js     |  35 ++-
 .../transactions/LiStakeTransaction.spec.js   |  16 +-
 .../LiBankTransaction.spec.js.snap            |  20 +-
 .../LiDistributionTransaction.spec.js.snap    |  16 +-
 .../LiGovTransaction.spec.js.snap             |  26 +--
 .../LiStakeTransaction.spec.js.snap           | 212 ++++++------------
 8 files changed, 161 insertions(+), 215 deletions(-)

diff --git a/test/unit/specs/components/transactions/LiBankTransaction.spec.js b/test/unit/specs/components/transactions/LiBankTransaction.spec.js
index 7590708045..cda12c28e3 100644
--- a/test/unit/specs/components/transactions/LiBankTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiBankTransaction.spec.js
@@ -5,40 +5,40 @@ import { bankTxs } from "../../store/json/txs"
 describe(`LiBankTransaction`, () => {
   let wrapper
   const propsData = {
-    transaction: bankTxs[0],
+    tx: bankTxs[0].tx.value.msg[0].value,
     bondingDenom: `uatom`,
     address: ``,
     fees: {
       amount: `3421`,
       denom: `uatom`
-    }
+    },
+    time: new Date(Date.now()).toISOString(),
+    block: 500
   }
 
-  it(`should show bank transaction when user hasn't signed in`, () => {
+  beforeEach(() => {
     wrapper = shallowMount(LiBankTransaction, {
       propsData,
       stubs: [`router-link`]
     })
+  })
+
+  it(`should show bank transaction when user hasn't signed in`, () => {
+
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
   it(`should show incoming transactions`, () => {
-    propsData.address = `B`
-    wrapper = shallowMount(LiBankTransaction, {
-      propsData,
-      stubs: [`router-link`]
-    })
+    wrapper.setProps({ address: `B` })
 
     expect(wrapper.vm.sent).toBe(false)
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
   it(`should show outgoing transactions`, () => {
-    propsData.transaction = bankTxs[1]
-    propsData.address = bankTxs[1].tx.value.msg[0].value.from_address
-    wrapper = shallowMount(LiBankTransaction, {
-      propsData,
-      stubs: [`router-link`]
+    wrapper.setProps({
+      tx: bankTxs[1].tx.value.msg[0].value,
+      address: bankTxs[1].tx.value.msg[0].value.from_address
     })
 
     expect(wrapper.vm.sent).toBe(true)
@@ -46,22 +46,19 @@ describe(`LiBankTransaction`, () => {
   })
 
   it(`should show outgoing transactions send to herself`, () => {
-    propsData.transaction = bankTxs[2]
-    propsData.address = `A`
-    wrapper = shallowMount(LiBankTransaction, {
-      propsData,
-      stubs: [`router-link`]
+    wrapper.setProps({
+      tx: bankTxs[2].tx.value.msg[0].value,
+      address: `A`
     })
     expect(wrapper.vm.sentSelf).toBe(true)
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
   it(`should show a bank transaction without fees`, () => {
-    propsData.transaction = bankTxs[2]
-    propsData.address = `A`
-    wrapper = shallowMount(LiBankTransaction, {
-      propsData: Object.assign({}, propsData, { fees: null }),
-      stubs: [`router-link`]
+    wrapper.setProps({
+      tx: bankTxs[2].tx.value.msg[0].value,
+      address: `A`,
+      fees: null
     })
     expect(wrapper.vm.sentSelf).toBe(true)
     expect(wrapper.vm.$el).toMatchSnapshot()
diff --git a/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js b/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
index a2a7bf1a37..4106474cc4 100644
--- a/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
@@ -9,7 +9,7 @@ describe(`LiDistributionTransaction`, () => {
     { operator_address: `cosmosvaloper1address2`, moniker: `billy` }
   ]
   const propsData = {
-    transaction: distributionTxs[0],
+    tx: distributionTxs[0].tx.value.msg[0].value,
     url: `/validator`,
     validators,
     bondingDenom: `uatom`,
@@ -18,6 +18,8 @@ describe(`LiDistributionTransaction`, () => {
       denom: `uatom`
     },
     txType: `cosmos-sdk/MsgWithdrawDelegationReward`,
+    time: new Date(Date.now()).toISOString(),
+    block: 500
   }
 
   beforeEach(() => {
@@ -40,7 +42,7 @@ describe(`LiDistributionTransaction`, () => {
   describe(`set withdraw address`, () => {
     beforeEach(() => {
       wrapper.setProps({
-        transaction: distributionTxs[1],
+        tx: distributionTxs[1].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgSetWithdrawAddress`
       })
     })
@@ -60,7 +62,7 @@ describe(`LiDistributionTransaction`, () => {
 
     beforeEach(() => {
       wrapper.setProps({
-        transaction: distributionTxs[2],
+        tx: distributionTxs[2].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgWithdrawValidatorCommission`
       })
       it(`with fees`, () => {
diff --git a/test/unit/specs/components/transactions/LiGovTransaction.spec.js b/test/unit/specs/components/transactions/LiGovTransaction.spec.js
index 05bcb8a11b..54e287edf5 100644
--- a/test/unit/specs/components/transactions/LiGovTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiGovTransaction.spec.js
@@ -5,28 +5,45 @@ import { governanceTxs } from "../../store/json/txs"
 describe(`LiGovTransaction`, () => {
   let wrapper
   const propsData = {
-    transaction: governanceTxs[0],
     url: `/proposals`,
     bondingDenom: `stake`,
-    txType: `cosmos-sdk/MsgSubmitProposal`
+    fees: {
+      amount: `3421`,
+      denom: `uatom`
+    },
+    tx: {},
+    txType: ``,
+    time: new Date(Date.now()).toISOString(),
+    block: 500
   }
 
+  beforeEach(() => {
+    wrapper = shallowMount(
+      LiGovTransaction, { propsData, stubs: [`router-link`] }
+    )
+  })
+
   it(`proposals`, () => {
-    wrapper = shallowMount(LiGovTransaction, { propsData, stubs: [`router-link`] })
+    wrapper.setProps({
+      tx: governanceTxs[0].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgSubmitProposal`
+    })
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
   it(`deposits`, () => {
-    propsData.transaction = governanceTxs[1]
-    propsData.txType = `cosmos-sdk/MsgDeposit`
-    wrapper = shallowMount(LiGovTransaction, { propsData, stubs: [`router-link`] })
+    wrapper.setProps({
+      tx: governanceTxs[1].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgDeposit`
+    })
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
   it(`votes`, () => {
-    propsData.transaction = governanceTxs[2]
-    propsData.txType = `cosmos-sdk/MsgVote`
-    wrapper = shallowMount(LiGovTransaction, { propsData, stubs: [`router-link`] })
+    wrapper.setProps({
+      tx: governanceTxs[2].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgVote`
+    })
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 })
diff --git a/test/unit/specs/components/transactions/LiStakeTransaction.spec.js b/test/unit/specs/components/transactions/LiStakeTransaction.spec.js
index 18fe091f04..f0871228e2 100644
--- a/test/unit/specs/components/transactions/LiStakeTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiStakeTransaction.spec.js
@@ -7,7 +7,7 @@ describe(`LiStakeTransaction`, () => {
   let wrapper
   const validators = state.candidates
   const propsData = {
-    transaction: stakingTxs[0],
+    tx: stakingTxs[0].tx.value.msg[0],
     txType: `cosmos-sdk/MsgCreateValidator`,
     validators,
     url: `/validator`,
@@ -15,7 +15,9 @@ describe(`LiStakeTransaction`, () => {
     fees: {
       amount: `3421`,
       denom: `uatom`
-    }
+    },
+    time: new Date(Date.now()).toISOString(),
+    block: 500
   }
 
   beforeEach(() => {
@@ -40,7 +42,7 @@ describe(`LiStakeTransaction`, () => {
 
     beforeEach(() => {
       wrapper.setProps({
-        transaction: stakingTxs[1],
+        tx: stakingTxs[1].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgEditValidator`,
         fees: {
           amount: `3421`,
@@ -64,7 +66,7 @@ describe(`LiStakeTransaction`, () => {
   describe(`delegations`, () => {
     beforeEach(() => {
       wrapper.setProps({
-        transaction: stakingTxs[2],
+        tx: stakingTxs[2].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgDelegate`,
         fees: {
           amount: `3421`,
@@ -101,7 +103,7 @@ describe(`LiStakeTransaction`, () => {
   describe(`unbonding delegations`, () => {
     beforeEach(() => {
       wrapper.setProps({
-        transaction: stakingTxs[3],
+        tx: stakingTxs[3].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgUndelegate`,
         fees: {
           amount: `3421`,
@@ -141,7 +143,7 @@ describe(`LiStakeTransaction`, () => {
 
     beforeEach(() => {
       wrapper.setProps({
-        transaction: stakingTxs[4],
+        tx: stakingTxs[4].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgBeginRedelegate`,
         fees: {
           amount: `3421`,
@@ -167,7 +169,7 @@ describe(`LiStakeTransaction`, () => {
   describe(`unjail`, () => {
     beforeEach(() => {
       wrapper.setProps({
-        transaction: stakingTxs[5],
+        tx: stakingTxs[5].tx.value.msg[0].value,
         txType: `cosmos-sdk/MsgUnjail`,
         fees: {
           amount: `3421`,
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiBankTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiBankTransaction.spec.js.snap
index b170aea1ab..ecdb504151 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiBankTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiBankTransaction.spec.js.snap
@@ -2,9 +2,9 @@
 
 exports[`LiBankTransaction should show a bank transaction without fees 1`] = `
 <li-transaction-stub
-  block="466"
+  block="500"
   color="#ED553B"
-  time="1970-01-01T00:00:01.142Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -41,9 +41,9 @@ exports[`LiBankTransaction should show a bank transaction without fees 1`] = `
 
 exports[`LiBankTransaction should show bank transaction when user hasn't signed in 1`] = `
 <li-transaction-stub
-  block="3436"
+  block="500"
   color="#ED553B"
-  time="1970-01-01T00:00:02.042Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -86,9 +86,9 @@ exports[`LiBankTransaction should show bank transaction when user hasn't signed
 
 exports[`LiBankTransaction should show incoming transactions 1`] = `
 <li-transaction-stub
-  block="3436"
+  block="500"
   color="#ED553B"
-  time="1970-01-01T00:00:02.042Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -126,9 +126,9 @@ exports[`LiBankTransaction should show incoming transactions 1`] = `
 
 exports[`LiBankTransaction should show outgoing transactions 1`] = `
 <li-transaction-stub
-  block="3438"
+  block="500"
   color="#ED553B"
-  time="1970-01-01T00:00:02.042Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -167,9 +167,9 @@ exports[`LiBankTransaction should show outgoing transactions 1`] = `
 
 exports[`LiBankTransaction should show outgoing transactions send to herself 1`] = `
 <li-transaction-stub
-  block="466"
+  block="500"
   color="#ED553B"
-  time="1970-01-01T00:00:01.142Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
index 9d40e0c359..1ebaf47872 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
@@ -2,9 +2,9 @@
 
 exports[`LiDistributionTransaction set withdraw address with fees 1`] = `
 <li-transaction-stub
-  block="1114"
+  block="500"
   color="#F2B134"
-  time="1970-01-01T00:00:43.300Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -34,9 +34,9 @@ exports[`LiDistributionTransaction set withdraw address with fees 1`] = `
 
 exports[`LiDistributionTransaction set withdraw address without fees 1`] = `
 <li-transaction-stub
-  block="1114"
+  block="500"
   color="#F2B134"
-  time="1970-01-01T00:00:43.300Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -66,9 +66,9 @@ exports[`LiDistributionTransaction set withdraw address without fees 1`] = `
 
 exports[`LiDistributionTransaction withdraw delegation rewards with fees 1`] = `
 <li-transaction-stub
-  block="1114"
+  block="500"
   color="#F2B134"
-  time="1970-01-01T00:00:43.300Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -104,9 +104,9 @@ exports[`LiDistributionTransaction withdraw delegation rewards with fees 1`] = `
 
 exports[`LiDistributionTransaction withdraw delegation rewards without fees 1`] = `
 <li-transaction-stub
-  block="1114"
+  block="500"
   color="#F2B134"
-  time="1970-01-01T00:00:43.300Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiGovTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiGovTransaction.spec.js.snap
index 1654403aa8..15b349041e 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiGovTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiGovTransaction.spec.js.snap
@@ -2,9 +2,9 @@
 
 exports[`LiGovTransaction deposits 1`] = `
 <li-transaction-stub
-  block="56675"
+  block="500"
   color="#15CFCC"
-  time="1970-01-01T00:00:42.567Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -36,11 +36,11 @@ exports[`LiGovTransaction deposits 1`] = `
     
       Network Fee: 
     <b>
-      0.000000
+      0.003421
     </b>
      
     <span>
-      stakes
+      uatoms
     </span>
   </div>
 </li-transaction-stub>
@@ -48,9 +48,9 @@ exports[`LiGovTransaction deposits 1`] = `
 
 exports[`LiGovTransaction proposals 1`] = `
 <li-transaction-stub
-  block="56673"
+  block="500"
   color="#15CFCC"
-  time="1970-01-01T00:00:42.540Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -67,7 +67,7 @@ exports[`LiGovTransaction proposals 1`] = `
    
   <div>
     
-      Title:
+      Title: 
     <i>
       Test Proposal
     </i>
@@ -77,11 +77,11 @@ exports[`LiGovTransaction proposals 1`] = `
     
       Network Fee: 
     <b>
-      0.000000
+      0.003421
     </b>
      
     <span>
-      stakes
+      uatoms
     </span>
   </div>
 </li-transaction-stub>
@@ -89,9 +89,9 @@ exports[`LiGovTransaction proposals 1`] = `
 
 exports[`LiGovTransaction votes 1`] = `
 <li-transaction-stub
-  block="56673"
+  block="500"
   color="#15CFCC"
-  time="1970-01-01T00:00:43.300Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
@@ -116,11 +116,11 @@ exports[`LiGovTransaction votes 1`] = `
     
       Network Fee: 
     <b>
-      0.000000
+      0.003421
     </b>
      
     <span>
-      stakes
+      uatoms
     </span>
   </div>
 </li-transaction-stub>
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
index 80e65251a3..b9a20b6204 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
@@ -2,20 +2,20 @@
 
 exports[`LiStakeTransaction create validator with fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:02.042Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
       Create validator
       
     <b>
-      1.000000
+      0.000000
     </b>
      
     <span>
-      uatoms
+      s
     </span>
   </div>
    
@@ -24,10 +24,10 @@ exports[`LiStakeTransaction create validator with fees 1`] = `
       Moniker:
       
     <router-link-stub
-      to="/validator/cosmosvaloper1qecshyc40kshszkwrtscgmsdd8tz3n4hrj9yf2"
+      to="/validator/undefined"
     >
       
-        cosmosvaloper1qecshyc40kshszkwrtscgmsdd8tz3n4hrj9yf2
+        
       
     </router-link-stub>
   </div>
@@ -48,20 +48,20 @@ exports[`LiStakeTransaction create validator with fees 1`] = `
 
 exports[`LiStakeTransaction create validator without fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:02.042Z"
+  time="1970-01-01T00:00:42.000Z"
 >
   <div>
     
       Create validator
       
     <b>
-      1.000000
+      0.000000
     </b>
      
     <span>
-      uatoms
+      s
     </span>
   </div>
    
@@ -70,10 +70,10 @@ exports[`LiStakeTransaction create validator without fees 1`] = `
       Moniker:
       
     <router-link-stub
-      to="/validator/cosmosvaloper1qecshyc40kshszkwrtscgmsdd8tz3n4hrj9yf2"
+      to="/validator/undefined"
     >
       
-        cosmosvaloper1qecshyc40kshszkwrtscgmsdd8tz3n4hrj9yf2
+        
       
     </router-link-stub>
   </div>
@@ -94,13 +94,11 @@ exports[`LiStakeTransaction create validator without fees 1`] = `
 
 exports[`LiStakeTransaction delegations with fees 1`] = `
 <li-transaction-stub
-  block="568"
+  block="500"
   color="#47AB6C"
   time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Delegation
       
@@ -113,9 +111,7 @@ exports[`LiStakeTransaction delegations with fees 1`] = `
     </span>
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       To
       
@@ -128,9 +124,7 @@ exports[`LiStakeTransaction delegations with fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -146,13 +140,11 @@ exports[`LiStakeTransaction delegations with fees 1`] = `
 
 exports[`LiStakeTransaction delegations without fees 1`] = `
 <li-transaction-stub
-  block="568"
+  block="500"
   color="#47AB6C"
   time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Delegation
       
@@ -165,9 +157,7 @@ exports[`LiStakeTransaction delegations without fees 1`] = `
     </span>
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       To
       
@@ -180,9 +170,7 @@ exports[`LiStakeTransaction delegations without fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -198,21 +186,17 @@ exports[`LiStakeTransaction delegations without fees 1`] = `
 
 exports[`LiStakeTransaction edit validator with fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:02.041Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Edit validator
     
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       Moniker:
       
@@ -225,9 +209,7 @@ exports[`LiStakeTransaction edit validator with fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -243,21 +225,17 @@ exports[`LiStakeTransaction edit validator with fees 1`] = `
 
 exports[`LiStakeTransaction edit validator without fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:02.041Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Edit validator
     
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       Moniker:
       
@@ -270,9 +248,7 @@ exports[`LiStakeTransaction edit validator without fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -288,13 +264,11 @@ exports[`LiStakeTransaction edit validator without fees 1`] = `
 
 exports[`LiStakeTransaction redelegations with fees 1`] = `
 <li-transaction-stub
-  block="567"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:45.000Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Redelegation
       
@@ -309,9 +283,7 @@ exports[`LiStakeTransaction redelegations with fees 1`] = `
     </span>
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -334,9 +306,7 @@ exports[`LiStakeTransaction redelegations with fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -352,13 +322,11 @@ exports[`LiStakeTransaction redelegations with fees 1`] = `
 
 exports[`LiStakeTransaction redelegations without fees 1`] = `
 <li-transaction-stub
-  block="567"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:45.000Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Redelegation
       
@@ -373,9 +341,7 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
     </span>
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -398,9 +364,7 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -416,13 +380,11 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
 
 exports[`LiStakeTransaction unbonding delegations should default to ended if no unbonding delegation is present 1`] = `
 <li-transaction-stub
-  block="569"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:04.200Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Undelegation
       
@@ -439,9 +401,7 @@ exports[`LiStakeTransaction unbonding delegations should default to ended if no
     <!---->
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -454,9 +414,7 @@ exports[`LiStakeTransaction unbonding delegations should default to ended if no
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -472,13 +430,11 @@ exports[`LiStakeTransaction unbonding delegations should default to ended if no
 
 exports[`LiStakeTransaction unbonding delegations should show unbonding delegations as ended 1`] = `
 <li-transaction-stub
-  block="569"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:04.200Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Undelegation
       
@@ -495,9 +451,7 @@ exports[`LiStakeTransaction unbonding delegations should show unbonding delegati
     <!---->
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -510,9 +464,7 @@ exports[`LiStakeTransaction unbonding delegations should show unbonding delegati
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -528,13 +480,11 @@ exports[`LiStakeTransaction unbonding delegations should show unbonding delegati
 
 exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
 <li-transaction-stub
-  block="569"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:04.200Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Undelegation
       
@@ -557,9 +507,7 @@ exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
     </span>
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -572,9 +520,7 @@ exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -590,13 +536,11 @@ exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
 
 exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
 <li-transaction-stub
-  block="569"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:04.200Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Undelegation
       
@@ -613,9 +557,7 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
     <!---->
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       From
       
@@ -628,9 +570,7 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -646,21 +586,17 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
 
 exports[`LiStakeTransaction unjail with fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:20.420Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Unjail
     
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       Moniker:
       
@@ -673,9 +609,7 @@ exports[`LiStakeTransaction unjail with fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>
@@ -691,21 +625,17 @@ exports[`LiStakeTransaction unjail with fees 1`] = `
 
 exports[`LiStakeTransaction unjail without fees 1`] = `
 <li-transaction-stub
-  block="193281"
+  block="500"
   color="#47AB6C"
-  time="1970-01-01T00:00:20.420Z"
+  time="1970-01-01T00:00:42.000Z"
 >
-  <div
-    slot="caption"
-  >
+  <div>
     
       Unjail
     
   </div>
    
-  <div
-    slot="details"
-  >
+  <div>
     
       Moniker:
       
@@ -718,9 +648,7 @@ exports[`LiStakeTransaction unjail without fees 1`] = `
     </router-link-stub>
   </div>
    
-  <div
-    slot="fees"
-  >
+  <div>
     
       Network Fee: 
     <b>

From e162bd4766b7be4b115d67e1ce37685ba01b0237 Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 12:16:04 +0100
Subject: [PATCH 05/17] update tabmydelegation

---
 .../components/staking/TabMyDelegations.vue   |  39 ++++---
 .../staking/TabMyDelegations.spec.js          |  23 ++--
 .../TabMyDelegations.spec.js.snap             |  22 ++--
 .../LiAnyTransaction.spec.js.snap             | 102 +++++++++++-------
 4 files changed, 114 insertions(+), 72 deletions(-)

diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue
index 469f9996dd..01b8a59610 100644
--- a/app/src/renderer/components/staking/TabMyDelegations.vue
+++ b/app/src/renderer/components/staking/TabMyDelegations.vue
@@ -28,22 +28,29 @@
       </h3>
       <div class="unbonding-transactions">
         <template v-for="transaction in unbondingTransactions">
-          <li-stake-transaction
-            :key="transaction.hash"
-            :transaction="transaction"
-            :validators="yourValidators"
-            :bonding-denom="bondDenom"
-            :url="validatorURL"
-            :fees="transaction.tx.value.fee.amount &&
-              transaction.tx.value.fee.amount[0]"
-            :unbonding-time="
-              time.getUnbondingTime(
-                transaction,
-                delegation.unbondingDelegations
-              )
-            "
-            tx-type="cosmos-sdk/MsgUndelegate"
-          />
+           <div
+            v-for="(msg, index) in transaction.tx.value.msg"
+            :key="index"
+          >
+            <li-stake-transaction
+              :key="transaction.hash"
+              :tx-type="msg.type"
+              :tx="msg.value"
+              :validators="yourValidators"
+              :bonding-denom="bondDenom"
+              :url="validatorURL"
+              :fees="transaction.tx.value.fee.amount &&
+                transaction.tx.value.fee.amount[0]"
+              :unbonding-time="
+                time.getUnbondingTime(
+                  transaction,
+                  delegation.unbondingDelegations
+                )
+              "
+              :time="transaction.time"
+              :block="Number(transaction.height)"
+            />
+          </div>
         </template>
       </div>
     </div>
diff --git a/test/unit/specs/components/staking/TabMyDelegations.spec.js b/test/unit/specs/components/staking/TabMyDelegations.spec.js
index a017da58e9..a2221f4e6c 100644
--- a/test/unit/specs/components/staking/TabMyDelegations.spec.js
+++ b/test/unit/specs/components/staking/TabMyDelegations.spec.js
@@ -56,19 +56,22 @@ describe(`Component: TabMyDelegations`, () => {
     })
 
     it(`should show unbonding validators and the current committed validator`, () => {
-      wrapper.setData({
-        time: {
-          // get unbonding time for an unbonding tx
-          getUnbondingTime: jest.fn(() => Date.now() + 10000)
-        }
-      })
-      $store.getters.delegation.unbondingDelegations = {
-        [validators[1].operator_address]: {
+
+      const unbondingTime = jest.fn(() => Date.now() + 10000)
+      const time = new Date(Date.now()).toISOString()
+      const ubds = {
+        [stakingTxs[3].tx.value.msg[0].value.validator_address]: {
           creation_height: `170`,
           min_time: new Date(Date.now()).toISOString()
         }
       }
-      $store.getters.transactions.staking = [stakingTxs[3]]
+      wrapper.setData({
+        unbondingTime,
+        time,
+        block: 500
+      })
+      wrapper.vm.delegation.unbondingDelegations = ubds
+      wrapper.vm.transactions.staking = [stakingTxs[3]]
 
       expect(wrapper.html()).toContain(`Pending Undelegations`)
       expect(wrapper.vm.$el).toMatchSnapshot()
@@ -102,7 +105,7 @@ describe(`Component: TabMyDelegations`, () => {
 
   describe(`computed`, () => {
     it(`unbondingTransactions`, async () => {
-      const address = validators[0].operator_address
+      const address = stakingTxs[3].tx.value.msg[0].value.validator_address
       const transactions = [stakingTxs[3]]
 
       expect(
diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index ca7c3d0e64..e8ad49de67 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -86,15 +86,19 @@ exports[`Component: TabMyDelegations view should show unbonding validators and t
     <div
       class="unbonding-transactions"
     >
-      <li-stake-transaction-stub
-        bondingdenom="uatom"
-        fees="[object Object]"
-        transaction="[object Object]"
-        txtype="cosmos-sdk/MsgUndelegate"
-        unbondingtime="52000"
-        url="/staking/validators"
-        validators=""
-      />
+      <div>
+        <li-stake-transaction-stub
+          block="569"
+          bondingdenom="uatom"
+          fees="[object Object]"
+          time="1970-01-01T00:00:04.200Z"
+          tx="[object Object]"
+          txtype="cosmos-sdk/MsgUndelegate"
+          unbondingtime="52000"
+          url="/staking/validators"
+          validators=""
+        />
+      </div>
     </div>
   </div>
 </div>
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
index ace1bcca7d..633483a92c 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
@@ -1,53 +1,81 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`LiAnyTransaction shows bank transactions 1`] = `
-<li-bank-transaction-stub
-  address="cosmos1address"
-  bondingdenom="atom"
-  fees="[object Object]"
-  transaction="[object Object]"
-/>
+<div>
+  <div>
+    <li-bank-transaction-stub
+      address="cosmos1address"
+      block="3436"
+      bondingdenom="atom"
+      fees="[object Object]"
+      time="1970-01-01T00:00:02.042Z"
+      tx="[object Object]"
+    />
+  </div>
+</div>
 `;
 
 exports[`LiAnyTransaction shows distribution transactions 1`] = `
-<li-distribution-transaction-stub
-  bondingdenom="atom"
-  fees="[object Object]"
-  transaction="[object Object]"
-  txtype="cosmos-sdk/MsgWithdrawDelegationReward"
-  url="/validators"
-  validators="[object Object],[object Object]"
-/>
+<div>
+  <div>
+    <li-distribution-transaction-stub
+      block="1114"
+      bondingdenom="atom"
+      fees="[object Object]"
+      time="1970-01-01T00:00:43.300Z"
+      tx="[object Object]"
+      txtype="cosmos-sdk/MsgWithdrawDelegationReward"
+      url="/validators"
+      validators="[object Object],[object Object]"
+    />
+  </div>
+</div>
 `;
 
 exports[`LiAnyTransaction shows governance transactions 1`] = `
-<li-gov-transaction-stub
-  bondingdenom="atom"
-  fees="[object Object]"
-  transaction="[object Object]"
-  txtype="cosmos-sdk/MsgSubmitProposal"
-/>
+<div>
+  <div>
+    <li-gov-transaction-stub
+      block="56673"
+      bondingdenom="atom"
+      fees="[object Object]"
+      time="1970-01-01T00:00:42.540Z"
+      tx="[object Object]"
+      txtype="cosmos-sdk/MsgSubmitProposal"
+    />
+  </div>
+</div>
 `;
 
 exports[`LiAnyTransaction shows staking transactions 1`] = `
-<li-stake-transaction-stub
-  bondingdenom="atom"
-  fees="[object Object]"
-  transaction="[object Object]"
-  txtype="cosmos-sdk/MsgCreateValidator"
-  url="/validators"
-  validators="[object Object],[object Object]"
-/>
+<div>
+  <div>
+    <li-stake-transaction-stub
+      block="193281"
+      bondingdenom="atom"
+      fees="[object Object]"
+      time="1970-01-01T00:00:02.042Z"
+      tx="[object Object]"
+      txtype="cosmos-sdk/MsgCreateValidator"
+      url="/validators"
+      validators="[object Object],[object Object]"
+    />
+  </div>
+</div>
 `;
 
 exports[`LiAnyTransaction shows unknown type transactions 1`] = `
-<li-transaction-stub
-  block="3436"
-  color="grey"
-  time="1970-01-01T00:00:02.042Z"
->
-  <span>
-    Unknown Transaction Type
-  </span>
-</li-transaction-stub>
+<div>
+  <div>
+    <li-transaction-stub
+      block="3436"
+      color="grey"
+      time="1970-01-01T00:00:02.042Z"
+    >
+      <span>
+        Unknown Transaction Type
+      </span>
+    </li-transaction-stub>
+  </div>
+</div>
 `;

From 4c6ebe7e1fdbe84c80e8614a07784195e34cfa2d Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 12:16:21 +0100
Subject: [PATCH 06/17] lint

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

diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue
index 01b8a59610..b9d2780284 100644
--- a/app/src/renderer/components/staking/TabMyDelegations.vue
+++ b/app/src/renderer/components/staking/TabMyDelegations.vue
@@ -28,7 +28,7 @@
       </h3>
       <div class="unbonding-transactions">
         <template v-for="transaction in unbondingTransactions">
-           <div
+          <div
             v-for="(msg, index) in transaction.tx.value.msg"
             :key="index"
           >

From e8fea99867adf08eabcaeb6e658124455b180433 Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 17:20:02 +0100
Subject: [PATCH 07/17] fix tests

---
 .../staking/TabMyDelegations.spec.js          | 27 +++++++++----------
 .../TabMyDelegations.spec.js.snap             |  2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/test/unit/specs/components/staking/TabMyDelegations.spec.js b/test/unit/specs/components/staking/TabMyDelegations.spec.js
index a2221f4e6c..505ad3d81f 100644
--- a/test/unit/specs/components/staking/TabMyDelegations.spec.js
+++ b/test/unit/specs/components/staking/TabMyDelegations.spec.js
@@ -57,19 +57,16 @@ describe(`Component: TabMyDelegations`, () => {
 
     it(`should show unbonding validators and the current committed validator`, () => {
 
-      const unbondingTime = jest.fn(() => Date.now() + 10000)
       const time = new Date(Date.now()).toISOString()
+      const height = stakingTxs[3].height
+      const address = stakingTxs[3].tx.value.msg[0].value.validator_address
       const ubds = {
-        [stakingTxs[3].tx.value.msg[0].value.validator_address]: {
-          creation_height: `170`,
-          min_time: new Date(Date.now()).toISOString()
-        }
+        [address]: [{
+          creation_height: height,
+          completion_time: time
+        }]
       }
-      wrapper.setData({
-        unbondingTime,
-        time,
-        block: 500
-      })
+
       wrapper.vm.delegation.unbondingDelegations = ubds
       wrapper.vm.transactions.staking = [stakingTxs[3]]
 
@@ -112,10 +109,12 @@ describe(`Component: TabMyDelegations`, () => {
         TabMyDelegations.computed.unbondingTransactions({
           delegation: {
             unbondingDelegations: {
-              [address]: {
-                creation_height: `170`,
-                min_time: new Date().toISOString()
-              }
+              [address]: [
+                {
+                  creation_height: stakingTxs[3].height,
+                  completion_time: new Date().toISOString()
+                }
+              ]
             }
           },
           transactions: {
diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index e8ad49de67..4977788851 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -94,7 +94,7 @@ exports[`Component: TabMyDelegations view should show unbonding validators and t
           time="1970-01-01T00:00:04.200Z"
           tx="[object Object]"
           txtype="cosmos-sdk/MsgUndelegate"
-          unbondingtime="52000"
+          unbondingtime="42000"
           url="/staking/validators"
           validators=""
         />

From 9248c151bdd3b2ce630c65d4dc7eb2f2a26435cf Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sat, 23 Mar 2019 17:20:26 +0100
Subject: [PATCH 08/17] pending

---
 PENDING.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PENDING.md b/PENDING.md
index e69de29bb2..aa40903b52 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -0,0 +1,3 @@
+### Added
+
+- [\#2149](https://github.com/cosmos/voyager/issues/2149) display multi-message transactions @fedekunze
\ No newline at end of file

From bc8976463edd4abc6a754c08ed6624a94c3463b6 Mon Sep 17 00:00:00 2001
From: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Date: Sat, 23 Mar 2019 18:04:24 +0100
Subject: [PATCH 09/17] Apply suggestions from code review

Co-Authored-By: faboweb <frznhope@gmail.com>
---
 app/src/renderer/vuex/modules/delegates.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/renderer/vuex/modules/delegates.js b/app/src/renderer/vuex/modules/delegates.js
index f060bc75ba..c93ceb2e1d 100644
--- a/app/src/renderer/vuex/modules/delegates.js
+++ b/app/src/renderer/vuex/modules/delegates.js
@@ -12,7 +12,7 @@ export default ({ node }) => {
     loading: false,
     loaded: false,
     error: null,
-    lastDelegatesUpdate: 0
+    lastValidatorsUpdate: 0
   }
   const state = JSON.parse(JSON.stringify(emptyState))
 
@@ -69,8 +69,8 @@ export default ({ node }) => {
       // throttle the update for validators for every 10 blocks
       const waited10Blocks =
         Number(lastHeader.height) - state.lastDelegatesUpdate > 10
-      if (state.lastDelegatesUpdate === 0 || waited10Blocks) {
-        state.lastDelegatesUpdate = Number(lastHeader.height)
+      if (state.lastValidatorsUpdate === 0 || waited10Blocks) {
+        state.lastValidatorsUpdate = Number(lastHeader.height)
         for (const validator of validators) {
           if (validator.consensus_pubkey) {
             const signing_info = await node.getValidatorSigningInfo(

From 931ea9ba5aba24c6e9f5ac6aa0a5c9df6f04e8a4 Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Sat, 23 Mar 2019 18:59:29 +0100
Subject: [PATCH 10/17] tests

---
 .../renderer/components/common/TmBalance.vue  |  5 +-
 app/src/renderer/vuex/getters.js              | 10 +-
 app/src/renderer/vuex/modules/distribution.js |  6 +-
 .../specs/components/common/TmBalance.spec.js | 19 +++-
 .../staking/TabMyDelegations.spec.js          | 15 ---
 .../components/staking/TabValidators.spec.js  | 92 ++++---------------
 test/unit/specs/store/delegates.spec.js       | 40 +++++++-
 test/unit/specs/store/distribution.spec.js    | 23 ++++-
 test/unit/specs/store/getters.spec.js         | 46 ++++++++--
 9 files changed, 143 insertions(+), 113 deletions(-)

diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue
index feb85e8a43..db171f8cfb 100644
--- a/app/src/renderer/components/common/TmBalance.vue
+++ b/app/src/renderer/components/common/TmBalance.vue
@@ -89,7 +89,10 @@ export default {
         const height = Number(newHeader.height)
         // run the update queries the first time and after every 10 blocks
         const waitedTenBlocks = height - this.lastUpdate > 10
-        if (this.session.signedIn && (height === 0 || waitedTenBlocks)) {
+        if (
+          this.session.signedIn &&
+          (this.lastUpdate === 0 || waitedTenBlocks)
+        ) {
           this.lastUpdate = height
           this.$store.dispatch(`getTotalRewards`)
           this.$store.dispatch(`queryWalletBalances`)
diff --git a/app/src/renderer/vuex/getters.js b/app/src/renderer/vuex/getters.js
index 81b50a611e..727e41edba 100644
--- a/app/src/renderer/vuex/getters.js
+++ b/app/src/renderer/vuex/getters.js
@@ -27,10 +27,10 @@ export const wallet = state => state.wallet
 // fee distribution
 export const distribution = state => state.distribution
 export const yourValidators = (state, getters) =>
-  state.session.signedIn &&
-  getters.delegates.delegates.filter(
-    ({ operator_address }) => operator_address in getters.committedDelegations
-  )
+  state.session.signedIn ?
+    getters.delegates.delegates.filter(
+      ({ operator_address }) => operator_address in getters.committedDelegations
+    ) : []
 
 // staking
 export const liquidAtoms = state =>
@@ -94,7 +94,7 @@ export const deposits = state => state.deposits.deposits
 export const governanceParameters = state => state.governanceParameters
 export const depositDenom = getters =>
   getters.governanceParameters.loaded &&
-  getters.governanceParameters.parameters.deposit.min_deposit
+    getters.governanceParameters.parameters.deposit.min_deposit
     ? getters.governanceParameters.parameters.deposit.min_deposit[0].denom
     : `uatom`
 
diff --git a/app/src/renderer/vuex/modules/distribution.js b/app/src/renderer/vuex/modules/distribution.js
index 2ff0acfba9..a5bc1431b0 100644
--- a/app/src/renderer/vuex/modules/distribution.js
+++ b/app/src/renderer/vuex/modules/distribution.js
@@ -106,8 +106,7 @@ export default ({ node }) => {
         state,
         dispatch,
         getters: { lastHeader, yourValidators }
-      },
-      validators
+      }
     ) {
       // throttle the update of validator rewards to every 20 blocks
       const waitedTwentyBlocks =
@@ -117,9 +116,10 @@ export default ({ node }) => {
         yourValidators &&
         yourValidators.length > 0
       ) {
+        state.lastValidatorRewardsUpdate = Number(lastHeader.height)
         state.loading = true
         await Promise.all(
-          validators.map(validator =>
+          yourValidators.map(validator =>
             dispatch(`getRewardsFromValidator`, validator.operator_address)
           )
         )
diff --git a/test/unit/specs/components/common/TmBalance.spec.js b/test/unit/specs/components/common/TmBalance.spec.js
index e73c1ab433..5a9b55284c 100644
--- a/test/unit/specs/components/common/TmBalance.spec.js
+++ b/test/unit/specs/components/common/TmBalance.spec.js
@@ -100,12 +100,27 @@ describe(`TmBalance`, () => {
     })
 
     describe(`should update balance and rewards `, () => {
-      it(`if user is signed in and wait for 10 blocks`, () => {
+      it(`if user is signed in initially`, () => {
         const $store = { dispatch: jest.fn() }
         const session = { signedIn: true }
         const newHeader = { height: `10` }
         TmBalance.watch.lastHeader.handler.call(
-          { session, $store },
+          { session, $store, lastUpdate: 0 },
+          newHeader)
+        expect($store.dispatch).toHaveBeenCalledWith(`getTotalRewards`)
+        expect($store.dispatch).toHaveBeenCalledWith(`queryWalletBalances`)
+      })
+
+      it(`if user is signed in and wait for 10 blocks`, () => {
+        const $store = { dispatch: jest.fn() }
+        const session = { signedIn: true }
+        const newHeader = { height: `20` }
+        TmBalance.watch.lastHeader.handler.call(
+          { session, $store, lastUpdate: 15 },
+          newHeader)
+        expect($store.dispatch).not.toHaveBeenCalled()
+        TmBalance.watch.lastHeader.handler.call(
+          { session, $store, lastUpdate: 5 },
           newHeader)
         expect($store.dispatch).toHaveBeenCalledWith(`getTotalRewards`)
         expect($store.dispatch).toHaveBeenCalledWith(`queryWalletBalances`)
diff --git a/test/unit/specs/components/staking/TabMyDelegations.spec.js b/test/unit/specs/components/staking/TabMyDelegations.spec.js
index da43f0791d..399675cf24 100644
--- a/test/unit/specs/components/staking/TabMyDelegations.spec.js
+++ b/test/unit/specs/components/staking/TabMyDelegations.spec.js
@@ -183,21 +183,6 @@ describe(`Component: TabMyDelegations`, () => {
             yourValidators
           )
         })
-
-        describe(`should update rewards `, () => {
-          it(`if has waited for 20 blocks and has delegations`, () => {
-            const $store = { dispatch: jest.fn() }
-            const yourValidators = [{}]
-            const newHeader = { height: `40` }
-            TabMyDelegations.watch.lastHeader.handler.call(
-              { $store, yourValidators },
-              newHeader)
-            expect($store.dispatch).toHaveBeenCalledWith(
-              `getRewardsFromMyValidators`,
-              yourValidators
-            )
-          })
-        })
       })
     })
   })
diff --git a/test/unit/specs/components/staking/TabValidators.spec.js b/test/unit/specs/components/staking/TabValidators.spec.js
index 9d6f9a22c7..a644a310b6 100644
--- a/test/unit/specs/components/staking/TabValidators.spec.js
+++ b/test/unit/specs/components/staking/TabValidators.spec.js
@@ -18,7 +18,8 @@ describe(`TabValidators`, () => {
       signedIn: true
     },
     connected: true,
-    lastHeader: { height: 20 }
+    lastHeader: { height: 20 },
+    yourValidators: validators
   }
 
   beforeEach(async () => {
@@ -54,7 +55,8 @@ describe(`TabValidators`, () => {
           signedIn: true
         },
         connected: false,
-        lastHeader: { height: 20 }
+        lastHeader: { height: 20 },
+        yourValidators: validators
       }
     }
 
@@ -83,7 +85,8 @@ describe(`TabValidators`, () => {
           signedIn: true
         },
         connected: true,
-        lastHeader: { height: 20 }
+        lastHeader: { height: 20 },
+        yourValidators: validators
       }
     }
 
@@ -112,7 +115,8 @@ describe(`TabValidators`, () => {
           signedIn: true
         },
         connected: true,
-        lastHeader: { height: 20 }
+        lastHeader: { height: 20 },
+        yourValidators: validators
       }
     }
 
@@ -145,76 +149,14 @@ describe(`TabValidators`, () => {
     expect(dispatch).toHaveBeenCalledWith(`updateDelegates`)
   })
 
-  describe(`yourValidators`, () => {
-    it(`should return validators if signed in`, () => {
-      expect(
-        TabValidators.computed.yourValidators({
-          committedDelegations: {
-            [validators[0].operator_address]: 1,
-            [validators[2].operator_address]: 2
-          },
-          delegates: { delegates: validators },
-          session: { signedIn: true }
-        })
-      ).toEqual([validators[0], validators[2]])
-    })
-
-    it(`should return false if not signed in`, () => {
-      expect(
-        TabValidators.computed.yourValidators({
-          committedDelegations: {
-            [validators[0].operator_address]: 1,
-            [validators[2].operator_address]: 2
-          },
-          delegates: { delegates: validators },
-          session: { signedIn: false }
-        })
-      ).toBe(false)
-    })
-  })
-
-  describe(`update rewards on new blocks`, () => {
-    describe(`shouldn't update`, () => {
-      it(`if hasn't waited for 20 blocks `, () => {
-        const $store = { dispatch: jest.fn() }
-        const yourValidators = [{}]
-        const newHeader = { height: `30` }
-        TabValidators.watch.lastHeader.handler.call(
-          { $store, yourValidators },
-          newHeader)
-        expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromMyValidators`,
-          yourValidators
-        )
-      })
-
-      it(`if user doesn't have any delegations `, () => {
-        const $store = { dispatch: jest.fn() }
-        const yourValidators = []
-        const newHeader = { height: `40` }
-        TabValidators.watch.lastHeader.handler.call(
-          { $store, yourValidators },
-          newHeader)
-        expect($store.dispatch).not.toHaveBeenCalledWith(
-          `getRewardsFromMyValidators`,
-          yourValidators
-        )
-      })
-
-      describe(`should update rewards `, () => {
-        it(`if has waited for 20 blocks and has delegations`, () => {
-          const $store = { dispatch: jest.fn() }
-          const yourValidators = [{}]
-          const newHeader = { height: `40` }
-          TabValidators.watch.lastHeader.handler.call(
-            { $store, yourValidators },
-            newHeader)
-          expect($store.dispatch).toHaveBeenCalledWith(
-            `getRewardsFromMyValidators`,
-            yourValidators
-          )
-        })
-      })
-    })
+  it(`should trigger reward updates on every block `, () => {
+    const $store = { dispatch: jest.fn() }
+    const newHeader = { height: `40` }
+    TabValidators.watch.lastHeader.handler.call(
+      { $store },
+      newHeader)
+    expect($store.dispatch).toHaveBeenCalledWith(
+      `getRewardsFromMyValidators`
+    )
   })
 })
diff --git a/test/unit/specs/store/delegates.spec.js b/test/unit/specs/store/delegates.spec.js
index 4192c0437e..6165d7caaa 100644
--- a/test/unit/specs/store/delegates.spec.js
+++ b/test/unit/specs/store/delegates.spec.js
@@ -138,7 +138,6 @@ describe(`Module: Delegates`, () => {
   it(`fetches the signing information from all delegates`, async () => {
     const { actions, mutations, state } = instance
     const commit = jest.fn()
-    const dispatch = jest.fn()
     mutations.setDelegates(state, [
       {
         operator_address: `foo`,
@@ -150,7 +149,7 @@ describe(`Module: Delegates`, () => {
       expect.objectContaining({ signing_info: expect.anything() })
     )
     await actions.updateSigningInfo(
-      { state, commit, dispatch },
+      { state, commit, getters: { lastHeader: { height: `43` } } },
       state.delegates
     )
 
@@ -159,6 +158,43 @@ describe(`Module: Delegates`, () => {
     )
   })
 
+  it(`throttles validator fetching to every 20 blocks`, async () => {
+    node = Object.assign({}, nodeMock, {
+      getValidatorSigningInfo: jest.fn()
+    })
+    instance = delegatesModule({ node })
+    const { actions, state } = instance
+    const commit = jest.fn()
+    state.lastValidatorsUpdate = 0
+    await actions.updateSigningInfo(
+      {
+        state, commit, getters: { lastHeader: { height: `43` } }
+      },
+      [
+        {
+          operator_address: `foo`,
+          consensus_pubkey: `bar`,
+          tokens: `10`
+        }
+      ]
+    )
+    expect(state.lastValidatorsUpdate).toBe(43)
+    node.getValidatorSigningInfo.mockClear()
+    await actions.updateSigningInfo(
+      {
+        state, commit, getters: { lastHeader: { height: `44` } }
+      },
+      [
+        {
+          operator_address: `foo`,
+          consensus_pubkey: `bar`,
+          tokens: `10`
+        }
+      ]
+    )
+    expect(node.getValidatorSigningInfo).not.toHaveBeenCalled()
+  })
+
   it(`should query for delegates on reconnection if was loading before`, async () => {
     const { actions } = delegatesModule({})
     const instance = {
diff --git a/test/unit/specs/store/distribution.spec.js b/test/unit/specs/store/distribution.spec.js
index ea09c95215..ad8e8b6e7f 100644
--- a/test/unit/specs/store/distribution.spec.js
+++ b/test/unit/specs/store/distribution.spec.js
@@ -146,8 +146,7 @@ describe(`Module: Fee Distribution`, () => {
           { operator_address: `cosmosvaloper1address2` },
         ]
         await actions.getRewardsFromMyValidators(
-          { state, dispatch },
-          validators
+          { state, dispatch, getters: { lastHeader: { height: `44` }, yourValidators: validators } }
         )
         expect(dispatch).toBeCalledTimes(2)
         expect(dispatch).toBeCalledWith(
@@ -167,11 +166,27 @@ describe(`Module: Fee Distribution`, () => {
         ]
         dispatch = jest.fn(async () => Promise.reject(Error(`invalid address`)))
         await expect(actions.getRewardsFromMyValidators(
-          { state, dispatch },
-          validators)
+          { state, dispatch, getters: { lastHeader: { height: `44` }, yourValidators: validators } }
+        )
         ).rejects.toThrowError(`invalid address`)
       })
 
+      it(`throttle to every 20 blocks`, async () => {
+        const validators = [
+          { operator_address: `cosmosvaloper1address1` },
+          { operator_address: `cosmosvaloper1address2` },
+        ]
+        state.lastValidatorRewardsUpdate = 0
+        await actions.getRewardsFromMyValidators(
+          { state, dispatch, getters: { lastHeader: { height: `43` }, yourValidators: validators } }
+        )
+        expect(state.lastValidatorRewardsUpdate).toBe(43)
+        dispatch.mockClear()
+        await actions.getRewardsFromMyValidators(
+          { state, dispatch, getters: { lastHeader: { height: `44` }, yourValidators: validators } }
+        )
+        expect(dispatch).not.toHaveBeenCalled()
+      })
     })
 
     describe(`getRewardsFromValidator`, () => {
diff --git a/test/unit/specs/store/getters.spec.js b/test/unit/specs/store/getters.spec.js
index 68f5cf7793..fb4a96ec2e 100644
--- a/test/unit/specs/store/getters.spec.js
+++ b/test/unit/specs/store/getters.spec.js
@@ -1,13 +1,16 @@
-import { oldBondedAtoms, liquidAtoms, totalAtoms, oldUnbondingAtoms } from "renderer/vuex/getters.js"
+import { oldBondedAtoms, liquidAtoms, totalAtoms, oldUnbondingAtoms, yourValidators } from "renderer/vuex/getters.js"
+import validators from "./json/validators.js"
 
 describe(`Store: getters`, () => {
   it(`liquidAtoms`, () => {
     const result = liquidAtoms({
       stakingParameters: { parameters: { bond_denom: `stake` } },
-      wallet: { balances: [{
-        denom: `stake`,
-        amount: 42
-      }] }
+      wallet: {
+        balances: [{
+          denom: `stake`,
+          amount: 42
+        }]
+      }
     })
 
     expect(result).toBe(42)
@@ -59,9 +62,40 @@ describe(`Store: getters`, () => {
           }, {
             balance: `12`
           }]
-        } }
+        }
+      }
     })
 
     expect(result.toNumber()).toBe(63)
   })
+
+  describe(`yourValidators`, () => {
+    it(`should return validators if signed in`, () => {
+      expect(
+        yourValidators({
+          session: { signedIn: true }
+        }, {
+          committedDelegations: {
+            [validators[0].operator_address]: 1,
+            [validators[2].operator_address]: 2
+          },
+          delegates: { delegates: validators }
+        })
+      ).toEqual([validators[0], validators[2]])
+    })
+
+    it(`should return false if not signed in`, () => {
+      expect(
+        yourValidators({
+          session: { signedIn: false }
+        }, {
+          committedDelegations: {
+            [validators[0].operator_address]: 1,
+            [validators[2].operator_address]: 2
+          },
+          delegates: { delegates: validators }
+        })
+      ).toEqual([])
+    })
+  })
 })
\ No newline at end of file

From 96f2cf42b8d7d5dab782a538665d3ed3127d2edc Mon Sep 17 00:00:00 2001
From: Federico Kunze <fekunze@berkeley.edu>
Date: Sun, 24 Mar 2019 15:37:20 +0100
Subject: [PATCH 11/17] bug fix and reuse lianytx

---
 .../components/staking/TabMyDelegations.vue   | 43 +++++------
 .../LiDistributionTransaction.vue             |  6 +-
 .../TabMyDelegations.spec.js.snap             | 23 +++---
 .../transactions/LiAnyTransaction.spec.js     |  2 +-
 .../LiDistributionTransaction.spec.js         | 71 +++++++------------
 .../LiAnyTransaction.spec.js.snap             | 14 +++-
 .../LiDistributionTransaction.spec.js.snap    | 32 +++++----
 test/unit/specs/store/json/txs.js             | 11 ++-
 8 files changed, 99 insertions(+), 103 deletions(-)

diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue
index bd60d15f74..ee3078bda4 100644
--- a/app/src/renderer/components/staking/TabMyDelegations.vue
+++ b/app/src/renderer/components/staking/TabMyDelegations.vue
@@ -27,30 +27,21 @@
         Pending Undelegations
       </h3>
       <div class="unbonding-transactions">
-        <template v-for="transaction in unbondingTransactions">
-          <div
-            v-for="(msg, index) in transaction.tx.value.msg"
-            :key="index"
-          >
-            <li-stake-transaction
-              :key="transaction.hash"
-              :tx-type="msg.type"
-              :tx="msg.value"
-              :validators="yourValidators"
-              :bonding-denom="bondDenom"
-              :url="validatorURL"
-              :fees="transaction.tx.value.fee.amount &&
-                transaction.tx.value.fee.amount[0]"
-              :unbonding-time="
-                time.getUnbondingTime(
-                  transaction,
-                  delegation.unbondingDelegations
-                )
-              "
-              :time="transaction.time"
-              :block="Number(transaction.height)"
-            />
-          </div>
+        <template>
+          <li-any-transaction
+            v-for="tx in unbondingTransactions"
+            :key="tx.txhash"
+            :validators="yourValidators"
+            :validators-url="`/staking/validators`"
+            :proposals-url="`/governance`"
+            :transaction="tx"
+            :address="session.address"
+            :bonding-denom="bondDenom"
+            :unbonding-time="
+              time.getUnbondingTime(tx, delegation.unbondingDelegations)
+            "
+          />
+          <br>
         </template>
       </div>
     </div>
@@ -60,7 +51,7 @@
 <script>
 import { mapGetters } from "vuex"
 import num from "scripts/num"
-import LiStakeTransaction from "../transactions/LiStakeTransaction"
+import LiAnyTransaction from "../transactions/LiAnyTransaction"
 import TmDataMsg from "common/TmDataMsg"
 import CardSignInRequired from "common/CardSignInRequired"
 import TmDataLoading from "common/TmDataLoading"
@@ -75,7 +66,7 @@ export default {
     TmDataMsg,
     TmDataConnecting,
     TmDataLoading,
-    LiStakeTransaction,
+    LiAnyTransaction,
     CardSignInRequired
   },
   data: () => ({
diff --git a/app/src/renderer/components/transactions/LiDistributionTransaction.vue b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
index bd18149fc4..58988889b7 100644
--- a/app/src/renderer/components/transactions/LiDistributionTransaction.vue
+++ b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
@@ -9,7 +9,7 @@
         Withdraw rewards
       </div>
       <div slot="details">
-        From&nbsp;<router-link :to="url + '/' + tx.validator_address">
+        From&nbsp;<router-link :to="`${url}/${tx.validator_address}`">
           {{ moniker(tx.validator_address) }}
         </router-link>
       </div>
@@ -39,13 +39,13 @@
         Withdraw validator commission
       </div>
       <div slot="details">
-        From<router-link :to="url + '/' + tx.validator_address">
+        From<router-link :to="`${url}/${tx.validator_address}`">
           {{ moniker(tx.validator_address) }}
         </router-link>
       </div>
       <div slot="fees">
         Network Fee:&nbsp;
-        <b>{{ convertedFees ? convertedFeesfees.amount : full(0) }}</b>
+        <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
         <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
       </div>
     </template>
diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index 6c9a7ed301..17e1fb39b2 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -86,19 +86,16 @@ exports[`Component: TabMyDelegations view should show unbonding validators and t
     <div
       class="unbonding-transactions"
     >
-      <div>
-        <li-stake-transaction-stub
-          block="569"
-          bondingdenom="uatom"
-          fees="[object Object]"
-          time="1970-01-01T00:00:04.200Z"
-          tx="[object Object]"
-          txtype="cosmos-sdk/MsgUndelegate"
-          unbondingtime="42000"
-          url="/staking/validators"
-          validators=""
-        />
-      </div>
+      <li-any-transaction-stub
+        bondingdenom="uatom"
+        proposalsurl="/governance"
+        transaction="[object Object]"
+        unbondingtime="42000"
+        validators=""
+        validatorsurl="/staking/validators"
+      />
+       
+      <br />
     </div>
   </div>
 </div>
diff --git a/test/unit/specs/components/transactions/LiAnyTransaction.spec.js b/test/unit/specs/components/transactions/LiAnyTransaction.spec.js
index 43ed0ba055..83a9b00859 100644
--- a/test/unit/specs/components/transactions/LiAnyTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiAnyTransaction.spec.js
@@ -46,7 +46,7 @@ describe(`LiAnyTransaction`, () => {
     expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
-  it(`shows distribution transactions`, () => {
+  it(`shows distribution transaction with multiple msgs`, () => {
     wrapper.setProps({
       transaction: distributionTxs[0]
     })
diff --git a/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js b/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
index 4106474cc4..961ddbe7f6 100644
--- a/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
+++ b/test/unit/specs/components/transactions/LiDistributionTransaction.spec.js
@@ -9,7 +9,7 @@ describe(`LiDistributionTransaction`, () => {
     { operator_address: `cosmosvaloper1address2`, moniker: `billy` }
   ]
   const propsData = {
-    tx: distributionTxs[0].tx.value.msg[0].value,
+    tx: {},
     url: `/validator`,
     validators,
     bondingDenom: `uatom`,
@@ -17,64 +17,47 @@ describe(`LiDistributionTransaction`, () => {
       amount: `3421`,
       denom: `uatom`
     },
-    txType: `cosmos-sdk/MsgWithdrawDelegationReward`,
+    txType: ``,
     time: new Date(Date.now()).toISOString(),
     block: 500
   }
 
   beforeEach(() => {
-    wrapper = shallowMount(LiDistributionTransaction, { propsData, stubs: [`router-link`] })
+    wrapper = shallowMount(LiDistributionTransaction,
+      { propsData, stubs: [`router-link`] }
+    )
   })
 
-  describe(`withdraw delegation rewards`, () => {
-    it(`with fees`, () => {
-      expect(wrapper.vm.$el).toMatchSnapshot()
-    })
-
-    it(`without fees`, () => {
-      wrapper.setProps({
-        fees: null
-      })
-      expect(wrapper.vm.$el).toMatchSnapshot()
+  it(`withdraw delegation rewards`, () => {
+    wrapper.setProps({
+      tx: distributionTxs[0].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgWithdrawDelegationReward`
     })
+    expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
-  describe(`set withdraw address`, () => {
-    beforeEach(() => {
-      wrapper.setProps({
-        tx: distributionTxs[1].tx.value.msg[0].value,
-        txType: `cosmos-sdk/MsgSetWithdrawAddress`
-      })
-    })
-    it(`with fees`, () => {
-      expect(wrapper.vm.$el).toMatchSnapshot()
+  it(`set withdraw address`, () => {
+    wrapper.setProps({
+      tx: distributionTxs[1].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgSetWithdrawAddress`
     })
+    expect(wrapper.vm.$el).toMatchSnapshot()
+  })
 
-    it(`without fees`, () => {
-      wrapper.setProps({
-        fees: null
-      })
-      expect(wrapper.vm.$el).toMatchSnapshot()
+  it(`withdraw validator commission`, () => {
+    wrapper.setProps({
+      tx: distributionTxs[2].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgWithdrawValidatorCommission`
     })
+    expect(wrapper.vm.$el).toMatchSnapshot()
   })
 
-  describe(`withdraw validator commission`, () => {
-
-    beforeEach(() => {
-      wrapper.setProps({
-        tx: distributionTxs[2].tx.value.msg[0].value,
-        txType: `cosmos-sdk/MsgWithdrawValidatorCommission`
-      })
-      it(`with fees`, () => {
-        expect(wrapper.vm.$el).toMatchSnapshot()
-      })
-
-      it(`without fees`, () => {
-        wrapper.setProps({
-          fees: null
-        })
-        expect(wrapper.vm.$el).toMatchSnapshot()
-      })
+  it(`transaction without fees`, () => {
+    wrapper.setProps({
+      tx: distributionTxs[0].tx.value.msg[0].value,
+      txType: `cosmos-sdk/MsgWithdrawDelegationReward`,
+      fees: null
     })
+    expect(wrapper.vm.$el).toMatchSnapshot()
   })
 })
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
index 633483a92c..5622fa6d34 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiAnyTransaction.spec.js.snap
@@ -15,7 +15,7 @@ exports[`LiAnyTransaction shows bank transactions 1`] = `
 </div>
 `;
 
-exports[`LiAnyTransaction shows distribution transactions 1`] = `
+exports[`LiAnyTransaction shows distribution transaction with multiple msgs 1`] = `
 <div>
   <div>
     <li-distribution-transaction-stub
@@ -29,6 +29,18 @@ exports[`LiAnyTransaction shows distribution transactions 1`] = `
       validators="[object Object],[object Object]"
     />
   </div>
+  <div>
+    <li-distribution-transaction-stub
+      block="1114"
+      bondingdenom="atom"
+      fees="[object Object]"
+      time="1970-01-01T00:00:43.300Z"
+      tx="[object Object]"
+      txtype="cosmos-sdk/MsgWithdrawDelegationReward"
+      url="/validators"
+      validators="[object Object],[object Object]"
+    />
+  </div>
 </div>
 `;
 
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
index 59f8481466..3bc6d43dd2 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LiDistributionTransaction set withdraw address with fees 1`] = `
+exports[`LiDistributionTransaction set withdraw address 1`] = `
 <li-transaction-stub
   block="500"
   color="#F2B134"
@@ -33,7 +33,7 @@ exports[`LiDistributionTransaction set withdraw address with fees 1`] = `
 </li-transaction-stub>
 `;
 
-exports[`LiDistributionTransaction set withdraw address without fees 1`] = `
+exports[`LiDistributionTransaction transaction without fees 1`] = `
 <li-transaction-stub
   block="500"
   color="#F2B134"
@@ -41,14 +41,20 @@ exports[`LiDistributionTransaction set withdraw address without fees 1`] = `
 >
   <div>
     
-      Update withdraw address
+      Withdraw rewards
     
   </div>
    
   <div>
     
-      To cosmos18ymm350peujvq2xy9ymyqj4v34ekvnk3wydrs3
-    
+      From 
+    <router-link-stub
+      to="/validator/cosmosvaloper18ymm350peujvq2xy9ymyqj4v34ekvnk3tsekuz"
+    >
+      
+        cosmosvaloper18ymm350peujvq2xy9ymyqj4v34ekvnk3tsekuz
+      
+    </router-link-stub>
   </div>
    
   <div>
@@ -66,7 +72,7 @@ exports[`LiDistributionTransaction set withdraw address without fees 1`] = `
 </li-transaction-stub>
 `;
 
-exports[`LiDistributionTransaction withdraw delegation rewards with fees 1`] = `
+exports[`LiDistributionTransaction withdraw delegation rewards 1`] = `
 <li-transaction-stub
   block="500"
   color="#F2B134"
@@ -105,7 +111,7 @@ exports[`LiDistributionTransaction withdraw delegation rewards with fees 1`] = `
 </li-transaction-stub>
 `;
 
-exports[`LiDistributionTransaction withdraw delegation rewards without fees 1`] = `
+exports[`LiDistributionTransaction withdraw validator commission 1`] = `
 <li-transaction-stub
   block="500"
   color="#F2B134"
@@ -113,18 +119,18 @@ exports[`LiDistributionTransaction withdraw delegation rewards without fees 1`]
 >
   <div>
     
-      Withdraw rewards
+      Withdraw validator commission
     
   </div>
    
   <div>
     
-      From 
+      From
     <router-link-stub
-      to="/validator/cosmosvaloper18ymm350peujvq2xy9ymyqj4v34ekvnk3tsekuz"
+      to="/validator/cosmos18ymm350peujvq2xy9ymyqj4v34ekvnk3wydrs3"
     >
       
-        cosmosvaloper18ymm350peujvq2xy9ymyqj4v34ekvnk3tsekuz
+        cosmos18ymm350peujvq2xy9ymyqj4v34ekvnk3wydrs3
       
     </router-link-stub>
   </div>
@@ -134,11 +140,11 @@ exports[`LiDistributionTransaction withdraw delegation rewards without fees 1`]
       Network Fee: 
       
     <b>
-      0.000000
+      0.003421
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
diff --git a/test/unit/specs/store/json/txs.js b/test/unit/specs/store/json/txs.js
index 5644f60992..7a79dd5770 100644
--- a/test/unit/specs/store/json/txs.js
+++ b/test/unit/specs/store/json/txs.js
@@ -514,6 +514,13 @@ export const distributionTxs = [
               delegator_address: `cosmos18ymm350peujvq2xy9ymyqj4v34ekvnk3wydrs3`,
               validator_address: `cosmosvaloper18ymm350peujvq2xy9ymyqj4v34ekvnk3tsekuz`
             }
+          },
+          {
+            type: `cosmos-sdk/MsgWithdrawDelegationReward`,
+            value: {
+              delegator_address: `cosmos18ymm350peujvq2xy9ymyqj4v34ekvnk3wydrs3`,
+              validator_address: `cosmosvaloper137eu59pl4r40f3qkcwu5pgav7usn0af0lpt5rx`
+            }
           }
         ],
         fee: {
@@ -543,7 +550,7 @@ export const distributionTxs = [
     tags: [
       {
         key: `action`,
-        value: `withdraw_delegator_reward`
+        value: `set_withdraw_address`
       },
       {
         key: `delegator`,
@@ -592,7 +599,7 @@ export const distributionTxs = [
     tags: [
       {
         key: `action`,
-        value: `withdraw_delegator_reward`
+        value: `withdraw_validator_rewards_all`
       },
       {
         key: `delegator`,

From 3d4daa3d896bb7c7be1e713b31bb19d97003863a Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Sun, 24 Mar 2019 16:07:41 +0100
Subject: [PATCH 12/17] fix console error with empty time on lidistribution

---
 .../components/transactions/LiDistributionTransaction.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/renderer/components/transactions/LiDistributionTransaction.vue b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
index 58988889b7..c732f7b889 100644
--- a/app/src/renderer/components/transactions/LiDistributionTransaction.vue
+++ b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
@@ -86,7 +86,7 @@ export default {
     },
     time: {
       type: String,
-      required: true
+      default: null
     },
     block: {
       type: Number,

From a18abb4fd2c92d0618a13d8e69ceb0b2508b196a Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Sun, 24 Mar 2019 16:15:29 +0100
Subject: [PATCH 13/17] handle transaction loading on pagetransaction on
 refresh

---
 app/src/renderer/components/wallet/PageTransactions.vue  | 9 +++++++--
 .../specs/components/wallet/PageTransactions.spec.js     | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
index 6ab7fb89c9..f9616f6a4e 100644
--- a/app/src/renderer/components/wallet/PageTransactions.vue
+++ b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -78,8 +78,13 @@ export default {
       return this.orderedTransactions.length === 0
     }
   },
-  mounted() {
-    this.refreshTransactions()
+  watch: {
+    "session.signedIn": {
+      immediate: true,
+      handler() {
+        this.refreshTransactions()
+      }
+    }
   },
   methods: {
     async refreshTransactions({ $store, session } = this) {
diff --git a/test/unit/specs/components/wallet/PageTransactions.spec.js b/test/unit/specs/components/wallet/PageTransactions.spec.js
index 5d95db0e6a..d7a31efefa 100644
--- a/test/unit/specs/components/wallet/PageTransactions.spec.js
+++ b/test/unit/specs/components/wallet/PageTransactions.spec.js
@@ -302,6 +302,14 @@ describe(`PageTransactions`, () => {
     expect($store.dispatch).not.toHaveBeenCalledWith(`getAllTxs`)
   })
 
+  it(`should load transactions when signing in`, () => {
+    const refreshTransactions = jest.fn()
+    PageTransactions.watch[`session.signedIn`].handler.call({
+      refreshTransactions
+    })
+    expect(refreshTransactions).toHaveBeenCalled()
+  })
+
   it(`should show transactions`, async () => {
     expect(wrapper.findAll(`li-any-transaction-stub`).length).toBe(6)
   })

From 4eb857b85099d9072a59f0aa406ad9007017acf6 Mon Sep 17 00:00:00 2001
From: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Date: Sun, 24 Mar 2019 19:16:40 +0100
Subject: [PATCH 14/17] Apply suggestions from code review

Co-Authored-By: faboweb <frznhope@gmail.com>
---
 app/src/renderer/components/common/TmBalance.vue | 2 +-
 app/src/renderer/vuex/modules/delegates.js       | 2 +-
 app/src/renderer/vuex/modules/distribution.js    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue
index db171f8cfb..1ee16bf3ea 100644
--- a/app/src/renderer/components/common/TmBalance.vue
+++ b/app/src/renderer/components/common/TmBalance.vue
@@ -88,7 +88,7 @@ export default {
       handler(newHeader) {
         const height = Number(newHeader.height)
         // run the update queries the first time and after every 10 blocks
-        const waitedTenBlocks = height - this.lastUpdate > 10
+        const waitedTenBlocks = height - this.lastUpdate >= 10
         if (
           this.session.signedIn &&
           (this.lastUpdate === 0 || waitedTenBlocks)
diff --git a/app/src/renderer/vuex/modules/delegates.js b/app/src/renderer/vuex/modules/delegates.js
index c93ceb2e1d..d001bc510a 100644
--- a/app/src/renderer/vuex/modules/delegates.js
+++ b/app/src/renderer/vuex/modules/delegates.js
@@ -68,7 +68,7 @@ export default ({ node }) => {
     ) {
       // throttle the update for validators for every 10 blocks
       const waited10Blocks =
-        Number(lastHeader.height) - state.lastDelegatesUpdate > 10
+        Number(lastHeader.height) - state.lastDelegatesUpdate >= 10
       if (state.lastValidatorsUpdate === 0 || waited10Blocks) {
         state.lastValidatorsUpdate = Number(lastHeader.height)
         for (const validator of validators) {
diff --git a/app/src/renderer/vuex/modules/distribution.js b/app/src/renderer/vuex/modules/distribution.js
index a5bc1431b0..41cf0776c6 100644
--- a/app/src/renderer/vuex/modules/distribution.js
+++ b/app/src/renderer/vuex/modules/distribution.js
@@ -110,7 +110,7 @@ export default ({ node }) => {
     ) {
       // throttle the update of validator rewards to every 20 blocks
       const waitedTwentyBlocks =
-        Number(lastHeader.height) - state.lastValidatorRewardsUpdate > 20
+        Number(lastHeader.height) - state.lastValidatorRewardsUpdate >= 20
       if (
         (state.lastValidatorRewardsUpdate === 0 || waitedTwentyBlocks) &&
         yourValidators &&

From aa30a29e17ac0ecc1919f1438dcc2e483e7e0ec8 Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Sun, 24 Mar 2019 22:03:20 +0100
Subject: [PATCH 15/17] fixed

---
 PENDING.md                                    |  3 +-
 .../renderer/components/common/TmBalance.vue  |  4 +-
 .../components/common/TmOnboarding.vue        |  7 ++-
 .../components/network/PageNetwork.vue        |  4 +-
 .../staking/ModalWithdrawAllRewards.vue       |  2 +-
 .../components/staking/PageValidator.vue      |  6 +-
 .../components/staking/TabMyDelegations.vue   |  4 +-
 .../staking/TabStakingParameters.vue          |  4 +-
 .../components/staking/TableValidators.vue    |  4 +-
 .../LiDistributionTransaction.vue             | 27 +++++++--
 .../transactions/LiStakeTransaction.vue       | 55 ++++++++++++++++---
 app/src/renderer/vuex/getters.js              |  3 +-
 .../TabMyDelegations.spec.js.snap             |  4 +-
 .../LiDistributionTransaction.spec.js.snap    |  2 +-
 .../LiStakeTransaction.spec.js.snap           | 24 ++++----
 15 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/PENDING.md b/PENDING.md
index 2975d18c07..419e116a75 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -5,4 +5,5 @@
 ### Fixed
 
 - [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed rewards not updating as expected @faboweb
-- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed transactions not loading when refreshing on PageTransactions @faboweb
\ No newline at end of file
+- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed transactions not loading when refreshing on PageTransactions @faboweb
+- Fixed rewards not showing @faboweb
\ No newline at end of file
diff --git a/app/src/renderer/components/common/TmBalance.vue b/app/src/renderer/components/common/TmBalance.vue
index 1ee16bf3ea..b70b0a4fc4 100644
--- a/app/src/renderer/components/common/TmBalance.vue
+++ b/app/src/renderer/components/common/TmBalance.vue
@@ -2,14 +2,14 @@
   <div class="header-balance">
     <div class="top">
       <div class="total-atoms top-section">
-        <h3>Total {{ bondDenom }}</h3>
+        <h3>Total {{ num.viewDenom(bondDenom) }}</h3>
         <h2 class="total-atoms__value">
           {{ totalAtomsDisplay }}
         </h2>
         <short-bech32 :address="session.address || ''" />
       </div>
       <div v-if="unbondedAtoms" class="unbonded-atoms top-section">
-        <h3>Available {{ bondDenom }}</h3>
+        <h3>Available {{ num.viewDenom(bondDenom) }}</h3>
         <h2>{{ unbondedAtoms }}</h2>
       </div>
       <div v-if="rewards" class="top-section">
diff --git a/app/src/renderer/components/common/TmOnboarding.vue b/app/src/renderer/components/common/TmOnboarding.vue
index e7f053ce58..9b6709a7aa 100644
--- a/app/src/renderer/components/common/TmOnboarding.vue
+++ b/app/src/renderer/components/common/TmOnboarding.vue
@@ -49,6 +49,7 @@
 
 <script>
 import { mapGetters } from "vuex"
+import num from "scripts/num"
 import PerfectScrollbar from "perfect-scrollbar"
 import TmBarDiscrete from "common/TmBarDiscrete"
 import TmBtn from "common/TmBtn"
@@ -64,9 +65,11 @@ export default {
       const nodes = [
         `This is a quick tour of the primary features of Cosmos Voyager.`,
         `You can send and receive Cosmos tokens from anyone around the world.`,
-        `You can delegate your ${
+        `You can delegate your ${num.viewDenom(
           this.bondDenom
-        } to Cosmos Validators to earn even more ${this.bondDenom}.`,
+        )} to Cosmos Validators to earn even more ${num.viewDenom(
+          this.bondDenom
+        )}.`,
         `Through governance, you can vote on the future of the Cosmos Network.`,
         `Start using Voyager to explore the Cosmos Network!`
       ]
diff --git a/app/src/renderer/components/network/PageNetwork.vue b/app/src/renderer/components/network/PageNetwork.vue
index 373ea55381..8f3d2f0a48 100644
--- a/app/src/renderer/components/network/PageNetwork.vue
+++ b/app/src/renderer/components/network/PageNetwork.vue
@@ -43,7 +43,7 @@
         <div class="row">
           <div class="column">
             <dl class="info_dl">
-              <dt>Total Liquid {{ bondDenom }}</dt>
+              <dt>Total Liquid {{ num.viewDenom(bondDenom) }}</dt>
               <dd id="loose_tokens">
                 {{
                   pool.pool && pool.pool.not_bonded_tokens
@@ -55,7 +55,7 @@
           </div>
           <div class="column">
             <dl class="info_dl">
-              <dt>Total Delegated {{ bondDenom }}</dt>
+              <dt>Total Delegated {{ num.viewDenom(bondDenom) }}</dt>
               <dd id="bonded_tokens">
                 {{
                   pool.pool && pool.pool.bonded_tokens
diff --git a/app/src/renderer/components/staking/ModalWithdrawAllRewards.vue b/app/src/renderer/components/staking/ModalWithdrawAllRewards.vue
index b0ca6889cd..8128f6a5a2 100644
--- a/app/src/renderer/components/staking/ModalWithdrawAllRewards.vue
+++ b/app/src/renderer/components/staking/ModalWithdrawAllRewards.vue
@@ -12,7 +12,7 @@
       field-id="amount"
       field-label="Amount"
     >
-      <span class="input-suffix">{{ bondDenom }}</span>
+      <span class="input-suffix">{{ num.viewDenom(bondDenom) }}</span>
       <tm-field
         id="amount"
         v-model="totalRewards"
diff --git a/app/src/renderer/components/staking/PageValidator.vue b/app/src/renderer/components/staking/PageValidator.vue
index a8d3b21118..44ca7f38cd 100644
--- a/app/src/renderer/components/staking/PageValidator.vue
+++ b/app/src/renderer/components/staking/PageValidator.vue
@@ -176,7 +176,7 @@
 import moment from "moment"
 import { calculateTokens } from "scripts/common"
 import { mapGetters } from "vuex"
-import { percent, pretty, atoms, full } from "scripts/num"
+import num, { percent, pretty, atoms, full } from "scripts/num"
 import TmBtn from "common/TmBtn"
 import { shortAddress, ratToBigNumber } from "scripts/common"
 import DelegationModal from "staking/DelegationModal"
@@ -233,7 +233,7 @@ export default {
       const totalBlocks = this.lastHeader.height
       const missedBlocks = this.validator.signing_info.missed_blocks_counter
       const signedBlocks = totalBlocks - missedBlocks
-      const uptime = (signedBlocks / totalBlocks) * 100
+      const uptime = signedBlocks / totalBlocks * 100
 
       return String(uptime).substring(0, 4) + `%`
     },
@@ -249,7 +249,7 @@ export default {
     myDelegation() {
       const { bondDenom, myBond } = this
       const myDelegation = full(myBond)
-      const myDelegationString = `${myDelegation} ${bondDenom}`
+      const myDelegationString = `${myDelegation} ${num.viewDenom(bondDenom)}`
       return Number(myBond) === 0 ? `--` : myDelegationString
     },
     powerRatio() {
diff --git a/app/src/renderer/components/staking/TabMyDelegations.vue b/app/src/renderer/components/staking/TabMyDelegations.vue
index 618f4f5c4c..ccc1796380 100644
--- a/app/src/renderer/components/staking/TabMyDelegations.vue
+++ b/app/src/renderer/components/staking/TabMyDelegations.vue
@@ -14,8 +14,8 @@
         No Active Delegations
       </div>
       <div slot="subtitle">
-        Looks like you haven't delegated any {{ bondDenom }}s yet. Head over to
-        the
+        Looks like you haven't delegated any {{ num.viewDenom(bondDenom) }}s
+        yet. Head over to the
         <router-link :to="{ name: 'Validators' }">
           validator list
         </router-link>
diff --git a/app/src/renderer/components/staking/TabStakingParameters.vue b/app/src/renderer/components/staking/TabStakingParameters.vue
index 1b09cb5ade..7c4c12814a 100644
--- a/app/src/renderer/components/staking/TabStakingParameters.vue
+++ b/app/src/renderer/components/staking/TabStakingParameters.vue
@@ -29,7 +29,7 @@
             <dl class="info_dl">
               <dt>Current Staking Token</dt>
               <dd id="bond_denom">
-                {{ bondDenom ? bondDenom : `--` }}
+                {{ bondDenom ? num.viewDenom(bondDenom) : `--` }}
               </dd>
             </dl>
           </div>
@@ -53,6 +53,7 @@
 
 <script>
 import { mapGetters } from "vuex"
+import num from "scripts/num"
 import TmDataConnecting from "common/TmDataConnecting"
 import TmDataLoading from "common/TmDataLoading"
 export default {
@@ -62,6 +63,7 @@ export default {
     TmDataLoading
   },
   data: () => ({
+    num,
     paramsTooltips: {
       description: `Staking parameters define the high level settings for staking`,
       unbonding_time: `Time to complete an undelegation transaction and claim rewards`,
diff --git a/app/src/renderer/components/staking/TableValidators.vue b/app/src/renderer/components/staking/TableValidators.vue
index 1e48b714a6..92290ae66a 100644
--- a/app/src/renderer/components/staking/TableValidators.vue
+++ b/app/src/renderer/components/staking/TableValidators.vue
@@ -100,9 +100,9 @@ export default {
         {
           title: `My Delegations`,
           value: `my_delegations`,
-          tooltip: `Number of ${
+          tooltip: `Number of ${num.viewDenom(
             this.bondDenom
-          } you have delegated to this validator`
+          )} you have delegated to this validator`
         },
         {
           title: `Rewards`,
diff --git a/app/src/renderer/components/transactions/LiDistributionTransaction.vue b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
index c732f7b889..a8766ff655 100644
--- a/app/src/renderer/components/transactions/LiDistributionTransaction.vue
+++ b/app/src/renderer/components/transactions/LiDistributionTransaction.vue
@@ -16,7 +16,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgSetWithdrawAddress`">
@@ -29,7 +35,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template
@@ -46,7 +58,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
   </li-transaction>
@@ -96,7 +114,8 @@ export default {
   data: () => ({
     atoms,
     full,
-    pretty
+    pretty,
+    num
   }),
   computed: {
     convertedFees() {
diff --git a/app/src/renderer/components/transactions/LiStakeTransaction.vue b/app/src/renderer/components/transactions/LiStakeTransaction.vue
index 09fe90af7c..8d962e6bc6 100644
--- a/app/src/renderer/components/transactions/LiStakeTransaction.vue
+++ b/app/src/renderer/components/transactions/LiStakeTransaction.vue
@@ -19,7 +19,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgEditValidator`">
@@ -35,7 +41,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgDelegate`">
@@ -53,7 +65,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgUndelegate`">
@@ -64,7 +82,7 @@
             calculatePrettifiedTokens(tx.validator_address, tx.shares_amount)
           }}
         </b>
-        <span>{{ bondingDenom }}s</span>
+        <span>{{ num.viewDenom(bondingDenom) }}s</span>
         <template v-if="timeDiff">
           <span class="tx-unbonding__time-diff">
             {{ timeDiff }}
@@ -80,7 +98,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgBeginRedelegate`">
@@ -94,7 +118,7 @@
             )
           }}
         </b>
-        <span>{{ bondingDenom }}s</span>
+        <span>{{ num.viewDenom(bondingDenom) }}s</span>
       </div>
       <div slot="details">
         From&nbsp;
@@ -109,7 +133,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
     <template v-else-if="txType === `cosmos-sdk/MsgUnjail`">
@@ -125,7 +155,13 @@
       <div slot="fees">
         Network Fee:&nbsp;
         <b>{{ convertedFees ? convertedFees.amount : full(0) }}</b>
-        <span>{{ convertedFees ? convertedFees.denom : bondingDenom }}s</span>
+        <span>
+          {{
+            convertedFees
+              ? convertedFees.denom
+              : num.viewDenom(bondingDenom)
+          }}s
+        </span>
       </div>
     </template>
   </li-transaction>
@@ -184,7 +220,8 @@ export default {
   },
   data: () => ({
     atoms,
-    full
+    full,
+    num
   }),
   computed: {
     timeDiff() {
diff --git a/app/src/renderer/vuex/getters.js b/app/src/renderer/vuex/getters.js
index 727e41edba..90787d3cd6 100644
--- a/app/src/renderer/vuex/getters.js
+++ b/app/src/renderer/vuex/getters.js
@@ -1,6 +1,5 @@
 import BN from "bignumber.js"
 import { calculateTokens } from "scripts/common"
-import num from "scripts/num"
 
 // ui
 export const filters = state => state.filters
@@ -85,7 +84,7 @@ export const pool = state => state.pool
 export const stakingParameters = state => state.stakingParameters
 export const bondDenom = getters =>
   getters.stakingParameters.parameters &&
-  num.viewDenom(getters.stakingParameters.parameters.bond_denom || `uatom`)
+  getters.stakingParameters.parameters.bond_denom || `uatom`
 
 // governance
 export const proposals = state => state.proposals
diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index 17e1fb39b2..9217e565a0 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -13,7 +13,7 @@ exports[`Component: TabMyDelegations view should show a message if not staked ye
      
     <div>
       
-      Looks like you haven't delegated any uatoms yet. Head over to
+      Looks like you haven't delegated any atoms yet. Head over to
       the
       
       <router-link-stub
@@ -58,7 +58,7 @@ exports[`Component: TabMyDelegations view should show unbonding validators and t
      
     <div>
       
-      Looks like you haven't delegated any uatoms yet. Head over to
+      Looks like you haven't delegated any atoms yet. Head over to
       the
       
       <router-link-stub
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
index 3bc6d43dd2..ff6fa7399a 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
@@ -66,7 +66,7 @@ exports[`LiDistributionTransaction transaction without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
index 9cc2a20af2..21f49c6e13 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
@@ -88,7 +88,7 @@ exports[`LiStakeTransaction create validator without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
@@ -182,7 +182,7 @@ exports[`LiStakeTransaction delegations without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
@@ -262,7 +262,7 @@ exports[`LiStakeTransaction edit validator without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
@@ -285,7 +285,7 @@ exports[`LiStakeTransaction redelegations with fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
    
@@ -344,7 +344,7 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
    
@@ -380,7 +380,7 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
@@ -403,7 +403,7 @@ exports[`LiStakeTransaction unbonding delegations should default to ended if no
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
      
     <!---->
@@ -454,7 +454,7 @@ exports[`LiStakeTransaction unbonding delegations should show unbonding delegati
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
      
     <!---->
@@ -505,7 +505,7 @@ exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
      
     <span
@@ -562,7 +562,7 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
      
     <!---->
@@ -590,7 +590,7 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>
@@ -670,7 +670,7 @@ exports[`LiStakeTransaction unjail without fees 1`] = `
     </b>
      
     <span>
-      uatoms
+      atoms
     </span>
   </div>
 </li-transaction-stub>

From d35312638b389e0c96a69eaf6d00bb3e355ef072 Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Sun, 24 Mar 2019 22:06:47 +0100
Subject: [PATCH 16/17] snaps

---
 .../TabMyDelegations.spec.js.snap             |  8 +--
 .../LiDistributionTransaction.spec.js.snap    | 16 ++++--
 .../LiStakeTransaction.spec.js.snap           | 56 ++++++++++++++-----
 3 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index 9217e565a0..7bd6a4a734 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -13,8 +13,8 @@ exports[`Component: TabMyDelegations view should show a message if not staked ye
      
     <div>
       
-      Looks like you haven't delegated any atoms yet. Head over to
-      the
+      Looks like you haven't delegated any atoms
+      yet. Head over to the
       
       <router-link-stub
         to="[object Object]"
@@ -58,8 +58,8 @@ exports[`Component: TabMyDelegations view should show unbonding validators and t
      
     <div>
       
-      Looks like you haven't delegated any atoms yet. Head over to
-      the
+      Looks like you haven't delegated any atoms
+      yet. Head over to the
       
       <router-link-stub
         to="[object Object]"
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
index ff6fa7399a..d1c2df82db 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiDistributionTransaction.spec.js.snap
@@ -27,7 +27,9 @@ exports[`LiDistributionTransaction set withdraw address 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -66,7 +68,9 @@ exports[`LiDistributionTransaction transaction without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -105,7 +109,9 @@ exports[`LiDistributionTransaction withdraw delegation rewards 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -144,7 +150,9 @@ exports[`LiDistributionTransaction withdraw validator commission 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
diff --git a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
index 21f49c6e13..9cd48a129c 100644
--- a/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
+++ b/test/unit/specs/components/transactions/__snapshots__/LiStakeTransaction.spec.js.snap
@@ -41,7 +41,9 @@ exports[`LiStakeTransaction create validator with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -88,7 +90,9 @@ exports[`LiStakeTransaction create validator without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -135,7 +139,9 @@ exports[`LiStakeTransaction delegations with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -182,7 +188,9 @@ exports[`LiStakeTransaction delegations without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -222,7 +230,9 @@ exports[`LiStakeTransaction edit validator with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -262,7 +272,9 @@ exports[`LiStakeTransaction edit validator without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -321,7 +333,9 @@ exports[`LiStakeTransaction redelegations with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -380,7 +394,9 @@ exports[`LiStakeTransaction redelegations without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -431,7 +447,9 @@ exports[`LiStakeTransaction unbonding delegations should default to ended if no
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -482,7 +500,9 @@ exports[`LiStakeTransaction unbonding delegations should show unbonding delegati
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -539,7 +559,9 @@ exports[`LiStakeTransaction unbonding delegations with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -590,7 +612,9 @@ exports[`LiStakeTransaction unbonding delegations without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -630,7 +654,9 @@ exports[`LiStakeTransaction unjail with fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>
@@ -670,7 +696,9 @@ exports[`LiStakeTransaction unjail without fees 1`] = `
     </b>
      
     <span>
-      atoms
+      
+        atoms
+      
     </span>
   </div>
 </li-transaction-stub>

From a38b5565425f8b8537a8a9c26f5d3b5c1dc237e0 Mon Sep 17 00:00:00 2001
From: Voyager Bot <voyager_bot@tendermint.com>
Date: Mon, 25 Mar 2019 00:00:58 +0000
Subject: [PATCH 17/17] Bump version for release.

---
 CHANGELOG.md | 12 ++++++++++++
 PENDING.md   |  9 ---------
 package.json |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc91bcbc2c..600862d14a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0-beta.27] - 2019-03-25
+
+### Added
+
+- [\#2149](https://github.com/cosmos/voyager/issues/2149) display multi-message transactions @fedekunze
+
+### Fixed
+
+- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed rewards not updating as expected @faboweb
+- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed transactions not loading when refreshing on PageTransactions @faboweb
+- Fixed rewards not showing @faboweb
+
 ## [1.0.0-beta.26] - 2019-03-22
 
 ### Changed
diff --git a/PENDING.md b/PENDING.md
index 419e116a75..e69de29bb2 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -1,9 +0,0 @@
-### Added
-
-- [\#2149](https://github.com/cosmos/voyager/issues/2149) display multi-message transactions @fedekunze
-
-### Fixed
-
-- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed rewards not updating as expected @faboweb
-- [\#2330](https://github.com/cosmos/voyager/pull/2330) Fixed transactions not loading when refreshing on PageTransactions @faboweb
-- Fixed rewards not showing @faboweb
\ No newline at end of file
diff --git a/package.json b/package.json
index 1898884a62..e4da28ebb3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cosmos-wallet",
   "productName": "Cosmos Wallet",
-  "version": "1.0.0-beta.26",
+  "version": "1.0.0-beta.27",
   "description": "Cosmos Wallet is a web based user interface for the Cosmos Hub.",
   "author": "All In Bits, Inc <hello@tendermint.com>",
   "license": "Apache-2.0",