Merge pull request #673 from pqv199x/fix-rewards

Update reward epoch displaying
BuildOnViction · Jun 27, 2019 · 3a19777 · 3a19777
2 parents efb7f33 + 0349806
commit 3a19777
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apis/candidates.js b/apis/candidates.js
@@ -646,14 +646,14 @@ router.get('/:candidate/:owner/getRewards', [
         const total = db.Status.countDocuments({
             candidate: candidate,
             epoch: {
-                $lt: currentEpoch - 2
+                $lte: currentEpoch - 2
             }
         })
 
         const epochData = await db.Status.find({
             candidate: candidate,
             epoch: {
-                $lt: currentEpoch - 2
+                $lte: currentEpoch - 2
             }
         }).sort({ epoch: -1 }).limit(limit).skip(skip).lean().exec()
         let masternodesEpochs = []

diff --git a/app/components/candidates/View.vue b/app/components/candidates/View.vue
@@ -293,7 +293,7 @@
                     :per-page="mnRewardsPerPage"
                     :show-empty="true"
                     :class="`tomo-table tomo-table--mnrewards${rewardLoading ? ' loading' : ''}`"
-                    empty-text="There are no rewards to show"
+                    :empty-text="`There are no ${(currentTab !== '' ? 'records' : 'rewards')} to show`"
                     stacked="md" >
 
                     <template