update displaying reward for calculating reward epochs

BuildOnViction · Mar 20, 2019 · 2f70b48 · 2f70b48
1 parent bb7fed7
commit 2f70b48
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/apis/candidates.js b/apis/candidates.js
@@ -630,6 +630,11 @@ router.get('/:candidate/:owner/getRewards', [
 
         const candidate = req.params.candidate
         const owner = req.params.owner
+
+        const latestBlockNumber = await web3.eth.getBlockNumber()
+        const latestCheckpoint = latestBlockNumber - (latestBlockNumber % parseInt(config.get('blockchain.epoch')))
+        const currentEpoch = (parseInt(latestCheckpoint / config.get('blockchain.epoch')) + 1).toString()
+
         let limit = (req.query.limit) ? parseInt(req.query.limit) : 100
         const page = parseInt(req.query.page) || 1
         let skip
@@ -670,6 +675,10 @@ router.get('/:candidate/:owner/getRewards', [
                 if (!r.reward) {
                     r.rewardTime = mn.epochCreatedAt || ''
                 }
+                if (currentEpoch - r.epoch < 2) {
+                    r.masternodeReward = '-'
+                    r.signNumber = '-'
+                }
                 return r
             })
         }

diff --git a/app/components/candidates/View.vue b/app/components/candidates/View.vue
@@ -262,7 +262,8 @@
                     <template
                         slot="reward"
                         slot-scope="data">
-                        {{ formatCurrencySymbol(formatNumber(data.item.reward)) }}
+                        {{ !isNaN(data.item.reward)
+                        ? formatCurrencySymbol(formatNumber(data.item.reward)) : data.item.reward }}
                     </template>
 
                     <template
@@ -692,10 +693,12 @@ export default {
                 let items = []
 
                 mnRewards.data.items.map((r) => {
+                    const reward = !isNaN(r.masternodeReward || 0)
+                        ? new BigNumber(r.masternodeReward || 0).toFixed(6) : r.masternodeReward
                     items.push({
                         epoch: r.epoch,
-                        signNumber: r.signNumber || 0,
-                        reward: new BigNumber(r.masternodeReward || 0).toFixed(6),
+                        signNumber: r.signNumber ? r.signNumber : 0,
+                        reward: reward,
                         createdAt: r.rewardTime ? moment(r.rewardTime).fromNow() : 'N/A',
                         dateTooltip: moment(r.rewardTime).format('lll'),
                         status: r.status