From 008314676d7957c4f35841d6e9ae744b8ff6b08c Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 1 Sep 2022 17:16:51 -0500
Subject: [PATCH] fix(admin): reactivity on next hourglass

---
 .../user-support/subscriptionAndPerks.vue     | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index 05856a31c5..9b4970586b 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -41,9 +41,6 @@
               step="1"
             >
           </label>
-          <span class="small">
-            Updates Hourglasses and Gem cap automatically. Next Mystic Hourglass updates on save.
-          </span>
         </div>
         <div>
           Months until renewal:
@@ -51,7 +48,7 @@
         </div>
           <div>
             Next Mystic Hourglass:
-            <strong>{{ nextHourGlassDate }}</strong>
+            <strong>{{ nextHourglassDate }}</strong>
           </div>
           <div class="form-inline">
             <label>
@@ -134,28 +131,23 @@ export default {
   data () {
     return {
       consecutiveMonths: 0,
-      startingHourglasses: 0,
       expand: false,
     };
   },
   computed: {
-    nextHourGlassDate () {
-      const currentPlanContext = getPlanContext(this.hero, new Date());
+    nextHourglassDate () {
+      const pendingHero = clone(this.hero);
+      pendingHero.purchased.plan.consecutive.count = this.consecutiveMonths;
+      const currentPlanContext = getPlanContext(pendingHero, new Date());
 
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
   watch: {
     consecutiveMonths () {
-      const startingMonths = this.hero.purchased.plan.consecutive.count;
-      const monthsAdded = Math.max(0, this.consecutiveMonths - startingMonths);
       this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
         Math.floor(this.consecutiveMonths / 3) * 5, 25,
       );
-      if (monthsAdded >= 0) {
-        this.hero.purchased.plan.consecutive.trinkets = this.startingHourglasses
-          + Math.floor(monthsAdded / 3);
-      }
       if (this.hero.purchased.plan.gemsBought
         > this.hero.purchased.plan.consecutive.gemCapExtra + 25) {
         this.hero.purchased.plan.gemsBought = this.hero.purchased.plan.consecutive.gemCapExtra + 25;
@@ -164,7 +156,6 @@ export default {
   },
   mounted () {
     this.consecutiveMonths = clone(this.hero.purchased.plan.consecutive.count);
-    this.startingHourglasses = clone(this.hero.purchased.plan.consecutive.trinkets);
   },
   methods: {
     dateFormat (date) {