From 54468ff4994a7cc6d875fca44053c950a5daf7fe Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Fri, 17 Aug 2018 06:20:45 -0500 Subject: [PATCH] Added existence check (#10595) --- .../components/achievements/login-incentives.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/website/client/components/achievements/login-incentives.vue b/website/client/components/achievements/login-incentives.vue index bebcfec947..cb6a9cbc59 100644 --- a/website/client/components/achievements/login-incentives.vue +++ b/website/client/components/achievements/login-incentives.vue @@ -6,21 +6,21 @@ b-modal#login-incentives(:title="data.message", size='md', :hide-footer="true") .row.reward-row .col-12 avatar.avatar(:member='user', :avatarOnly='true', :withBackground='true') - .text-center.col-12 + .text-center.col-12(v-if='nextReward') .reward-wrap(v-if="!data.rewardText") div(v-if="nextReward.rewardKey.length === 1", :class="nextReward.rewardKey[0]") .reward(v-for="reward in nextReward.rewardKey", v-if="nextReward.rewardKey.length > 1", :class='reward') .reward-wrap(v-if="data.rewardText") div(v-if="data.rewardKey.length === 1", :class="data.rewardKey[0]") .reward(v-for="reward in data.rewardKey", v-if="data.rewardKey.length > 1", :class='reward') - .col-12.text-center(v-if="data.nextRewardAt") + .col-12.text-center(v-if="data && data.nextRewardAt") h4 {{ $t('countLeft', {count: data.nextRewardAt - user.loginIncentives}) }} .row .col-12.text-center(v-if='data.rewardText') p {{ $t('earnedRewardForDevotion', {reward: data.rewardText}) }} .col-12.text-center p {{ $t('incentivesDescription') }} - .col-12.text-center(v-if="data.nextRewardAt") + .col-12.text-center(v-if="data && data.nextRewardAt") h3 {{ $t('nextRewardUnlocksIn', {numberOfCheckinsLeft: data.nextRewardAt - user.loginIncentives}) }} .modal-footer .col-12.text-center @@ -70,8 +70,9 @@ export default { user: 'user.data', }), nextReward () { - let nextRewardKey = this.loginIncentives[this.user.loginIncentives].nextRewardAt; - let nextReward = this.loginIncentives[nextRewardKey]; + if (!this.loginIncentives[this.user.loginIncentives]) return; + const nextRewardKey = this.loginIncentives[this.user.loginIncentives].nextRewardAt; + const nextReward = this.loginIncentives[nextRewardKey]; return nextReward; }, },