From 58ff8fb3bc78aaaaaae83d51999ececa4d21f10b Mon Sep 17 00:00:00 2001 From: Vu Pham Date: Thu, 27 Jun 2019 10:00:34 +0700 Subject: [PATCH] update reward epoch, messages --- apis/candidates.js | 4 ++-- app/components/candidates/View.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apis/candidates.js b/apis/candidates.js index aa768090..d48485ba 100644 --- 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 index 02fc02cf..25293630 100644 --- 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" >