From e395182c95eb945c00d26198b82adfa1f8d15020 Mon Sep 17 00:00:00 2001
From: Gerardo Saca <gsacavdm@microsoft.com>
Date: Wed, 18 Jan 2017 21:25:37 -0800
Subject: [PATCH] Fix User > Profile showing {getProgressDisplay()} - fixes
 #8412 (#8421)

* Fix User > Profile showing {getProgressDisplay()}

* Remove bad nextRewardAt check
---
 website/client-old/js/controllers/userCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client-old/js/controllers/userCtrl.js b/website/client-old/js/controllers/userCtrl.js
index a6be1053c8..f5eb24e5b2 100644
--- a/website/client-old/js/controllers/userCtrl.js
+++ b/website/client-old/js/controllers/userCtrl.js
@@ -93,8 +93,8 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$
 
     $scope.getProgressDisplay = function () {
       var currentLoginDay = Content.loginIncentives[$scope.profile.loginIncentives];
+      if (!currentLoginDay) return env.t('moreIncentivesComingSoon');
       var nextRewardAt = currentLoginDay.nextRewardAt;
-      if (!currentLoginDay || !nextRewardAt) return env.t('moreIncentivesComingSoon');
       if (!currentLoginDay.prevRewardKey) currentLoginDay.prevRewardKey = 0;
       return env.t('checkinProgressTitle') + ' ' + ($scope.profile.loginIncentives - currentLoginDay.prevRewardKey) + '/' + (nextRewardAt - currentLoginDay.prevRewardKey);
     };