From 4ddfdb84acbbdf2eaf3e150810d1fe04317e5cd4 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 17 Nov 2022 14:57:58 -0500
Subject: [PATCH 01/87] get most of the right parts in the same place

---
 .../components/shared/number-increment.vue    | 119 ++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 website/client/src/components/shared/number-increment.vue

diff --git a/website/client/src/components/shared/number-increment.vue b/website/client/src/components/shared/number-increment.vue
new file mode 100644
index 0000000000..8596d204bc
--- /dev/null
+++ b/website/client/src/components/shared/number-increment.vue
@@ -0,0 +1,119 @@
+<template>
+  <div class="d-flex flex-row align-items-center justify-content-center">
+    <div
+      class="gray-circle"
+      @click="gift.gems.amount <= 0
+        ? gift.gems.amount = 0
+        : gift.gems.amount--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.negativeIcon"
+      ></div>
+    </div>
+    <div class="input-group">
+      <div class="input-group-prepend input-group-icon align-items-center">
+        <div
+          class="icon-gem"
+          v-html="icons.gemIcon"
+        ></div>
+      </div>
+      <input
+        id="gemsForm"
+        v-model.number="gift.gems.amount"
+        class="form-control"
+        max="9999"
+      >
+    </div>
+    <div
+      class="gray-circle"
+      @click="gift.gems.amount++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.positiveIcon"
+      ></div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+  @import '~@/assets/scss/colors.scss';
+
+  label {
+    color: $gray-50;
+    font-size: 0.875rem;
+    font-weight: bold;
+    line-height: 1.71;
+    margin: 12px 0 16px 0;
+    width: 100%;
+    text-align: center;
+  }
+
+  .input-group {
+    width: 94px;
+    height: 32px;
+    margin: 0px 16px 0px 16px;
+    padding: 0;
+    border-radius: 2px;
+    border: solid 1px $gray-400;
+    background-color: $white;
+  }
+
+  .gray-circle {
+    border-radius: 100%;
+    border: solid 2px $gray-300;
+    width: 32px;
+    height: 32px;
+    cursor: pointer;
+
+    &:hover {
+      border-color: $purple-400;
+    }
+  }
+
+  .gray-circle:hover{
+    .icon-positive, .icon-negative {
+      & ::v-deep svg path {
+        fill: $purple-400;
+      }
+    }
+  }
+
+  .icon-gem {
+    width: 16px;
+    height: 16px;
+    margin-bottom: 4px;
+  }
+
+  .icon-positive, .icon-negative {
+    width: 10px;
+    height: 10px;
+    margin: 4px auto;
+
+    & ::v-deep svg path {
+      fill: $gray-300;
+    }
+  }
+</style>
+
+<script>
+import gemIcon from '@/assets/svg/gem.svg';
+import goldIcon from '@/assets/svg/gold.svg';
+import positiveIcon from '@/assets/svg/positive.svg';
+import negativeIcon from '@/assets/svg/negative.svg';
+
+export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        goldIcon,
+        gemIcon,
+        positiveIcon,
+        negativeIcon,
+      }),
+    };
+  },
+};
+
+</script>

From 4f5a720c30ce42d8d6fd7e1a4b239ad396173eb3 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 18 Nov 2022 15:27:18 -0500
Subject: [PATCH 02/87] how to make component show up?

---
 ...mber-increment.vue => numberIncrement.vue} | 20 +++++++++----------
 .../src/components/shops/market/sellModal.vue |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)
 rename website/client/src/components/shared/{number-increment.vue => numberIncrement.vue} (87%)

diff --git a/website/client/src/components/shared/number-increment.vue b/website/client/src/components/shared/numberIncrement.vue
similarity index 87%
rename from website/client/src/components/shared/number-increment.vue
rename to website/client/src/components/shared/numberIncrement.vue
index 8596d204bc..91ad8670e0 100644
--- a/website/client/src/components/shared/number-increment.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -2,9 +2,9 @@
   <div class="d-flex flex-row align-items-center justify-content-center">
     <div
       class="gray-circle"
-      @click="gift.gems.amount <= 0
-        ? gift.gems.amount = 0
-        : gift.gems.amount--"
+      @click="gems.amount <= 0
+        ? gems.amount = 0
+        : gems.amount--"
     >
       <div
         class="icon-negative"
@@ -20,14 +20,14 @@
       </div>
       <input
         id="gemsForm"
-        v-model.number="gift.gems.amount"
+        v-model.number="gems.amount"
         class="form-control"
-        max="9999"
+        :max="itemContextToSell.itemCount"
       >
     </div>
     <div
       class="gray-circle"
-      @click="gift.gems.amount++"
+      @click="gems.amount++"
     >
       <div
         class="icon-positive"
@@ -107,10 +107,10 @@ export default {
   data () {
     return {
       icons: Object.freeze({
-        goldIcon,
-        gemIcon,
-        positiveIcon,
-        negativeIcon,
+        gold: gemIcon,
+        gem: goldIcon,
+        plus: positiveIcon,
+        minus: negativeIcon,
       }),
     };
   },
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index ba59ed6196..fa6822dfb2 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -165,12 +165,14 @@ import svgGem from '@/assets/svg/gem.svg';
 import BalanceInfo from '../balanceInfo.vue';
 import Item from '@/components/inventory/item';
 import CountBadge from '@/components/ui/countBadge';
+import numberIncrement from '@/components/shared/numberIncrement';
 
 export default {
   components: {
     BalanceInfo,
     Item,
     CountBadge,
+    numberIncrement,
   },
   data () {
     return {

From d1e1c09b4aead44a90ae29f87e6b8d8a1f6db82c Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 22 Nov 2022 15:28:48 -0500
Subject: [PATCH 03/87] add conditionals, add component to buy & sell modals

---
 .../src/components/shared/numberIncrement.vue | 115 ++++++++++++++++--
 .../client/src/components/shops/buyModal.vue  |   5 +
 .../src/components/shops/market/sellModal.vue |   3 +
 3 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 91ad8670e0..594728f523 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -1,37 +1,91 @@
 <template>
   <div class="d-flex flex-row align-items-center justify-content-center">
+    <!-- negative -->
     <div
+      v-if="buy-modal"
       class="gray-circle"
-      @click="gems.amount <= 0
-        ? gems.amount = 0
-        : gems.amount--"
+      @click="selectedAmountToBuy <= 0
+        ? selectedAmountToBuy = 0
+        : selectedAmountToBuy--"
     >
       <div
         class="icon-negative"
-        v-html="icons.negativeIcon"
+        v-html="icons.negative"
       ></div>
     </div>
+    <div
+      v-else-if="sell-modal"
+      class="gray-circle"
+      @click="selectedAmountToSell <= 0
+        ? selectedAmountToSell = 0
+        : selectedAmountToSell--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.negative"
+      ></div>
+    </div>
+    <div
+      v-else
+      class="gray-circle"
+      @click="gift.gems.amount <= 0
+        ? gift.gems.amount = 0
+        : gift.gems.amount--"
+    >
+      <div
+        class="icon-negative"
+        v-html="icons.negative"
+      ></div>
+    </div>
+    <!-- quantity -->
     <div class="input-group">
       <div class="input-group-prepend input-group-icon align-items-center">
         <div
+          v-if="send-gift"
           class="icon-gem"
-          v-html="icons.gemIcon"
+          v-html="icons.gem"
         ></div>
+        <div
+          v-else
+        >
+        </div>
       </div>
       <input
         id="gemsForm"
-        v-model.number="gems.amount"
+        v-model.number="variable"
         class="form-control"
-        :max="itemContextToSell.itemCount"
+        min="1"
       >
     </div>
+    <!-- positive -->
     <div
+      v-if="buy-modal"
       class="gray-circle"
-      @click="gems.amount++"
+      @click="selectedAmountToBuy++"
     >
       <div
         class="icon-positive"
-        v-html="icons.positiveIcon"
+        v-html="icons.positive"
+      ></div>
+    </div>
+    <div
+      v-else-if="sell-modal"
+      class="gray-circle"
+      @click="selectedAmountToSell++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.positive"
+      ></div>
+    </div>
+    <div
+      v-else
+      class="gray-circle"
+      @click="gift.gems.amount++"
+    >
+      <div
+        class="icon-positive"
+        v-html="icons.positive"
       ></div>
     </div>
   </div>
@@ -98,11 +152,17 @@
 </style>
 
 <script>
+// icons
 import gemIcon from '@/assets/svg/gem.svg';
 import goldIcon from '@/assets/svg/gold.svg';
 import positiveIcon from '@/assets/svg/positive.svg';
 import negativeIcon from '@/assets/svg/negative.svg';
 
+// modules
+// import keys from 'lodash/keys';
+
+import { mapState } from '@/libs/store';
+
 export default {
   data () {
     return {
@@ -112,8 +172,45 @@ export default {
         plus: positiveIcon,
         minus: negativeIcon,
       }),
+      selectedAmountToBuy: 1,
+      selectedAmountToSell: 1,
+      gift: {
+        type: 'gems',
+        gems: {
+          amount: 0,
+          fromBalance: true,
+        },
+      },
+      gemCost: 1,
     };
   },
+  computed: {
+    ...mapState({ user: 'user.data' }), // might not need this?
+    notEnoughCurrency () {
+      const notEnoughCurrency = !this.enoughCurrency(this.getPriceClass(),
+        this.item.value * this.selectedAmountToBuy);
+      return notEnoughCurrency;
+    },
+    userGold () {
+      const userGold = this.user.currency;
+      return userGold;
+    },
+    maxItemsToBuy () {
+      const maxItemsToBuy = this.userGold
+        ? this.userGold / this.item.currency
+        : this.notEnoughCurrency;
+      return maxItemsToBuy;
+    },
+
+    getPriceClass () {
+      if (this.priceType && this.icons[this.priceType]) {
+        return this.priceType;
+      } if (this.item.currency && this.icons[this.item.currency]) {
+        return this.item.currency;
+      }
+      return 'gold';
+    },
+  },
 };
 
 </script>
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 013c291d55..479868d519 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -78,6 +78,9 @@
           >
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
+          <div>
+            <number-increment />
+          </div>
           <div v-if="showAmountToBuy(item)">
             <div class="box">
               <input
@@ -377,6 +380,7 @@ import CountdownBanner from './countdownBanner';
 import currencyMixin from './_currencyMixin';
 import notifications from '@/mixins/notifications';
 import buyMixin from '@/mixins/buy';
+import numberIncrement from '@/components/shared/numberIncrement';
 
 import { mapState } from '@/libs/store';
 
@@ -408,6 +412,7 @@ export default {
     Avatar,
     PinBadge,
     CountdownBanner,
+    numberIncrement,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
   props: {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index fa6822dfb2..af37984dde 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -46,6 +46,9 @@
             <div>
               <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
             </div>
+            <div>
+              <number-increment />
+            </div>
             <div>
               <b-input
                 v-model="selectedAmountToSell"

From af574634b0a7c4f8a76c18198236b3a668cd69b7 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 29 Nov 2022 17:13:48 -0500
Subject: [PATCH 04/87] tried to make if/else logic simpler, ended up breaking
 everything.

---
 .../src/components/shared/numberIncrement.vue | 251 ++++++++++++------
 .../client/src/components/shops/buyModal.vue  |  32 +--
 .../src/components/shops/market/sellModal.vue |  14 +-
 .../components/shops/quests/buyQuestModal.vue |   6 +
 4 files changed, 202 insertions(+), 101 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 594728f523..a3cc5f6b2f 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -1,92 +1,146 @@
 <template>
-  <div class="d-flex flex-row align-items-center justify-content-center">
+  <div class="d-flex flex-row align-items-center justify-content-center number-increment">
     <!-- negative -->
+    <!-- buy modal -->
     <div
       v-if="buy-modal"
-      class="gray-circle"
-      @click="selectedAmountToBuy <= 0
-        ? selectedAmountToBuy = 0
-        : selectedAmountToBuy--"
     >
       <div
-        class="icon-negative"
-        v-html="icons.negative"
-      ></div>
-    </div>
-    <div
-      v-else-if="sell-modal"
-      class="gray-circle"
-      @click="selectedAmountToSell <= 0
-        ? selectedAmountToSell = 0
-        : selectedAmountToSell--"
-    >
-      <div
-        class="icon-negative"
-        v-html="icons.negative"
-      ></div>
-    </div>
-    <div
-      v-else
-      class="gray-circle"
-      @click="gift.gems.amount <= 0
-        ? gift.gems.amount = 0
-        : gift.gems.amount--"
-    >
-      <div
-        class="icon-negative"
-        v-html="icons.negative"
-      ></div>
-    </div>
-    <!-- quantity -->
-    <div class="input-group">
-      <div class="input-group-prepend input-group-icon align-items-center">
-        <div
-          v-if="send-gift"
-          class="icon-gem"
-          v-html="icons.gem"
-        ></div>
-        <div
-          v-else
-        >
-        </div>
-      </div>
-      <input
-        id="gemsForm"
-        v-model.number="variable"
-        class="form-control"
-        min="1"
+        class="gray-circle"
+        @click="selectedAmountToBuy--"
+        @keyup.native="preventNegative($event)"
       >
-    </div>
-    <!-- positive -->
-    <div
-      v-if="buy-modal"
-      class="gray-circle"
-      @click="selectedAmountToBuy++"
-    >
+        <div
+          class="icon-negative"
+          v-html="icons.svgNegative"
+        ></div>
+      </div>
+      <div class="input-group">
+        <div class="align-items-center">
+        </div>
+        <input
+          v-model="selectedAmountToBuy"
+          class="form-control alignment"
+          min="0"
+          step="1"
+          max="maxItemsToBuy"
+        >
+      </div>
       <div
-        class="icon-positive"
-        v-html="icons.positive"
-      ></div>
+        class="gray-circle"
+        @keyup="selectedAmountToBuy++"
+      >
+        <div
+          class="icon-positive"
+          v-html="icons.svgPositive"
+        ></div>
+      </div>
     </div>
+    <!-- sell modal -->
     <div
       v-else-if="sell-modal"
-      class="gray-circle"
-      @click="selectedAmountToSell++"
     >
       <div
-        class="icon-positive"
-        v-html="icons.positive"
-      ></div>
+        class="gray-circle"
+        @click="selectedAmountToSell--"
+        @keyup.native="preventNegative($event)"
+      >
+        <div
+          class="icon-negative"
+          v-html="icons.svgNegative"
+        ></div>
+      </div>
+      <div class="input-group">
+        <div class="align-items-center">
+        </div>
+        <input
+          v-model="selectedAmountToSell"
+          class="form-control alignment"
+          min="0"
+          step="1"
+          max="maxItemsToBuy"
+        >
+      </div>
+      <div
+        v-if="buy-modal"
+        class="gray-circle"
+        @click="selectedAmountToSell++"
+      >
+        <div
+          class="icon-positive"
+          v-html="icons.svgPositive"
+        ></div>
+      </div>
     </div>
+    <!-- buy quest modal -->
     <div
-      v-else
-      class="gray-circle"
-      @click="gift.gems.amount++"
+      v-else-if="buy-quest-modal"
     >
       <div
-        class="icon-positive"
-        v-html="icons.positive"
-      ></div>
+        class="gray-circle"
+        @click="selectedAmountToBuy--"
+        @keyup.native="preventNegative($event)"
+      >
+        <div
+          class="icon-negative"
+          v-html="icons.svgNegative"
+        ></div>
+      </div>
+      <div class="input-group">
+        <div class="align-items-center">
+        </div>
+        <input
+          v-model="selectedAmountToBuy"
+          class="form-control alignment"
+          min="0"
+          step="1"
+          max="maxItemsToBuy"
+        >
+      </div>
+      <div
+        class="gray-circle"
+        @keyup="selectedAmountToBuy++"
+      >
+        <div
+          class="icon-positive"
+          v-html="icons.svgPositive"
+        ></div>
+      </div>
+    </div>
+    <!-- gifting modal -->
+    <div
+      v-else-if="send-gift"
+    >
+      <div
+        class="gray-circle"
+        @click="gift.gems.amount--"
+        @keyup.native="preventNegative($event)"
+      >
+        <div
+          class="icon-negative"
+          v-html="icons.svgNegative"
+        ></div>
+      </div>
+      <div class="input-group">
+        <div class="align-items-center">
+        </div>
+        <input
+          v-model="selectedAmountToBuy"
+          class="form-control alignment"
+          min="0"
+          step="1"
+          max="maxGems"
+        >
+      </div>
+      <div
+        class="gray-circle"
+        @click="gift.gems.amount++"
+      >
+        <div
+          class="icon-positive"
+          v-html="icons.svgPositive"
+        ></div>
+      </div>
     </div>
   </div>
 </template>
@@ -94,6 +148,14 @@
 <style scoped lang="scss">
   @import '~@/assets/scss/colors.scss';
 
+  .number-increment {
+    padding-bottom: 12px;
+    }
+
+  .alignment {
+    text-align: center;
+  }
+
   label {
     color: $gray-50;
     font-size: 0.875rem;
@@ -149,28 +211,35 @@
       fill: $gray-300;
     }
   }
+
 </style>
 
 <script>
 // icons
-import gemIcon from '@/assets/svg/gem.svg';
-import goldIcon from '@/assets/svg/gold.svg';
-import positiveIcon from '@/assets/svg/positive.svg';
-import negativeIcon from '@/assets/svg/negative.svg';
+import svgGem from '@/assets/svg/gem.svg';
+import svgGold from '@/assets/svg/gold.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';
 
 // modules
 // import keys from 'lodash/keys';
 
 import { mapState } from '@/libs/store';
 
+const hideAmountSelectionForPurchaseTypes = [
+  'gear', 'backgrounds', 'mystery_set', 'card',
+  'rebirth_orb', 'fortify', 'armoire', 'keys',
+  'debuffPotion', 'pets', 'mounts',
+];
+
 export default {
   data () {
     return {
       icons: Object.freeze({
-        gold: gemIcon,
-        gem: goldIcon,
-        plus: positiveIcon,
-        minus: negativeIcon,
+        svgGem,
+        svgGold,
+        svgPositive,
+        svgNegative,
       }),
       selectedAmountToBuy: 1,
       selectedAmountToSell: 1,
@@ -201,7 +270,13 @@ export default {
         : this.notEnoughCurrency;
       return maxItemsToBuy;
     },
-
+    fromBal () {
+      return this.gift.type === 'gems' && this.gift.gems.fromBalance;
+    },
+    maxGems () {
+      const maxGems = this.fromBal ? this.userLoggedIn.balance * 4 : 9999;
+      return maxGems;
+    },
     getPriceClass () {
       if (this.priceType && this.icons[this.priceType]) {
         return this.priceType;
@@ -210,6 +285,20 @@ export default {
       }
       return 'gold';
     },
+    showAmountToBuy (item) {
+      if (hideAmountSelectionForPurchaseTypes.includes(item.purchaseType)) {
+        return false;
+      } return true;
+    },
+  },
+  methods: {
+    preventNegative ($event) {
+      const { value } = $event.target;
+
+      if (Number(value) < 0) {
+        this.selectedAmountToSell = 0;
+      }
+    },
   },
 };
 
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 479868d519..e5ac69e072 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -78,20 +78,9 @@
           >
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
-          <div>
-            <number-increment />
-          </div>
           <div v-if="showAmountToBuy(item)">
-            <div class="box">
-              <input
-                v-model.number="selectedAmountToBuy"
-                class="form-control"
-                type="number"
-                min="0"
-                step="1"
-              >
-            </div>
-            <span :class="{'notEnough': notEnoughCurrency}">
+            <number-increment />
+            <div :class="{'notEnough': notEnoughCurrency}">
               <span
                 class="svg-icon inline icon-32"
                 aria-hidden="true"
@@ -100,8 +89,8 @@
               <span
                 class="cost"
                 :class="getPriceClass()"
-              >{{ item.value }}</span>
-            </span>
+              >{{ item.value * showAmountToBuy(item) }}</span>
+            </div>
           </div>
           <div
             v-else
@@ -260,8 +249,8 @@
     }
 
     span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
+      height: 24px;
+      width: 24px;
 
       margin-right: 8px;
 
@@ -269,8 +258,8 @@
     }
 
     .cost {
-      width: 28px;
-      height: 32px;
+      width: 24px;
+      height: 24px;
       font-size: 24px;
       font-weight: bold;
       line-height: 1.33;
@@ -373,6 +362,8 @@ import svgGem from '@/assets/svg/gem.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
 import svgClock from '@/assets/svg/clock.svg';
 import svgWhiteClock from '@/assets/svg/clock-white.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';
 
 import BalanceInfo from './balanceInfo.vue';
 import PinBadge from '@/components/ui/pinBadge';
@@ -421,6 +412,7 @@ export default {
     },
     priceType: {
       type: String,
+      default: '',
     },
     withPin: {
       type: Boolean,
@@ -439,6 +431,8 @@ export default {
         hourglasses: svgHourglasses,
         clock: svgClock,
         whiteClock: svgWhiteClock,
+        positive: svgPositive,
+        negative: svgNegative,
       }),
 
       selectedAmountToBuy: 1,
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index af37984dde..7bfb0be6b6 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -47,7 +47,15 @@
               <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
             </div>
             <div>
-              <number-increment />
+              <number-increment
+                v-model="selectedAmountToSell"
+                class=""
+                type="number"
+                :max="itemContextToSell.itemCount"
+                min="1"
+                step="1"
+                @keyup.native="preventNegative($event)"
+              />
             </div>
             <div>
               <b-input
@@ -164,6 +172,8 @@
 import svgClose from '@/assets/svg/close.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgGem from '@/assets/svg/gem.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';
 
 import BalanceInfo from '../balanceInfo.vue';
 import Item from '@/components/inventory/item';
@@ -186,6 +196,8 @@ export default {
         close: svgClose,
         gold: svgGold,
         gem: svgGem,
+        svgPositive,
+        svgNegative,
       }),
     };
   },
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index b384773e17..b62fdd7b8f 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -33,6 +33,7 @@
           v-if="!item.locked"
           class="purchase-amount"
         >
+          <numberIncrement />
           <div class="how-many-to-buy">
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
@@ -272,6 +273,8 @@ import svgExperience from '@/assets/svg/experience.svg';
 import svgGem from '@/assets/svg/gem.svg';
 import svgGold from '@/assets/svg/gold.svg';
 import svgHourglasses from '@/assets/svg/hourglass.svg';
+import svgPositive from '@/assets/svg/positive.svg';
+import svgNegative from '@/assets/svg/negative.svg';
 
 import BalanceInfo from '../balanceInfo.vue';
 import currencyMixin from '../_currencyMixin';
@@ -301,6 +304,7 @@ export default {
     },
     priceType: {
       type: String,
+      default: '',
     },
     withPin: {
       type: Boolean,
@@ -315,6 +319,8 @@ export default {
         gem: svgGem,
         gold: svgGold,
         hourglass: svgHourglasses,
+        positive: svgPositive,
+        negative: svgNegative,
       }),
 
       isPinned: false,

From 4ba66c7018a11aae4507812282d943a316f466d2 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 30 Nov 2022 17:16:51 -0500
Subject: [PATCH 05/87] unbreaking what was broken yesterday

---
 .../src/components/shared/numberIncrement.vue | 227 +++---------------
 .../client/src/components/shops/buyModal.vue  |   3 +-
 .../src/components/shops/market/sellModal.vue |  19 +-
 .../components/shops/quests/buyQuestModal.vue |   3 +-
 4 files changed, 35 insertions(+), 217 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index a3cc5f6b2f..54309bffa0 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -1,146 +1,35 @@
 <template>
   <div class="d-flex flex-row align-items-center justify-content-center number-increment">
-    <!-- negative -->
     <!-- buy modal -->
     <div
-      v-if="buy-modal"
+      class="gray-circle"
+      @click="selectedAmountToBuy <= 0
+        ? selectedAmountToBuy = 0
+        : selectedAmountToBuy--"
     >
       <div
-        class="gray-circle"
-        @click="selectedAmountToBuy--"
-        @keyup.native="preventNegative($event)"
-      >
-        <div
-          class="icon-negative"
-          v-html="icons.svgNegative"
-        ></div>
-      </div>
-      <div class="input-group">
-        <div class="align-items-center">
-        </div>
-        <input
-          v-model="selectedAmountToBuy"
-          class="form-control alignment"
-          min="0"
-          step="1"
-          max="maxItemsToBuy"
-        >
-      </div>
-      <div
-        class="gray-circle"
-        @keyup="selectedAmountToBuy++"
-      >
-        <div
-          class="icon-positive"
-          v-html="icons.svgPositive"
-        ></div>
-      </div>
+        class="icon-negative"
+        v-html="icons.svgNegative"
+      ></div>
     </div>
-    <!-- sell modal -->
-    <div
-      v-else-if="sell-modal"
-    >
-      <div
-        class="gray-circle"
-        @click="selectedAmountToSell--"
-        @keyup.native="preventNegative($event)"
+    <div class="input-group">
+      <div class="align-items-center">
+      </div>
+      <input
+        v-model="selectedAmountToBuy"
+        class="form-control alignment"
+        min="0"
+        step="1"
       >
-        <div
-          class="icon-negative"
-          v-html="icons.svgNegative"
-        ></div>
-      </div>
-      <div class="input-group">
-        <div class="align-items-center">
-        </div>
-        <input
-          v-model="selectedAmountToSell"
-          class="form-control alignment"
-          min="0"
-          step="1"
-          max="maxItemsToBuy"
-        >
-      </div>
-      <div
-        v-if="buy-modal"
-        class="gray-circle"
-        @click="selectedAmountToSell++"
-      >
-        <div
-          class="icon-positive"
-          v-html="icons.svgPositive"
-        ></div>
-      </div>
     </div>
-    <!-- buy quest modal -->
     <div
-      v-else-if="buy-quest-modal"
+      class="gray-circle"
+      @click="selectedAmountToBuy++"
     >
       <div
-        class="gray-circle"
-        @click="selectedAmountToBuy--"
-        @keyup.native="preventNegative($event)"
-      >
-        <div
-          class="icon-negative"
-          v-html="icons.svgNegative"
-        ></div>
-      </div>
-      <div class="input-group">
-        <div class="align-items-center">
-        </div>
-        <input
-          v-model="selectedAmountToBuy"
-          class="form-control alignment"
-          min="0"
-          step="1"
-          max="maxItemsToBuy"
-        >
-      </div>
-      <div
-        class="gray-circle"
-        @keyup="selectedAmountToBuy++"
-      >
-        <div
-          class="icon-positive"
-          v-html="icons.svgPositive"
-        ></div>
-      </div>
-    </div>
-    <!-- gifting modal -->
-    <div
-      v-else-if="send-gift"
-    >
-      <div
-        class="gray-circle"
-        @click="gift.gems.amount--"
-        @keyup.native="preventNegative($event)"
-      >
-        <div
-          class="icon-negative"
-          v-html="icons.svgNegative"
-        ></div>
-      </div>
-      <div class="input-group">
-        <div class="align-items-center">
-        </div>
-        <input
-          v-model="selectedAmountToBuy"
-          class="form-control alignment"
-          min="0"
-          step="1"
-          max="maxGems"
-        >
-      </div>
-      <div
-        class="gray-circle"
-        @click="gift.gems.amount++"
-      >
-        <div
-          class="icon-positive"
-          v-html="icons.svgPositive"
-        ></div>
-      </div>
+        class="icon-positive"
+        v-html="icons.svgPositive"
+      ></div>
     </div>
   </div>
 </template>
@@ -156,15 +45,15 @@
     text-align: center;
   }
 
-  label {
-    color: $gray-50;
-    font-size: 0.875rem;
-    font-weight: bold;
-    line-height: 1.71;
-    margin: 12px 0 16px 0;
-    width: 100%;
-    text-align: center;
-  }
+  // label {
+  //   color: $gray-50;
+  //   font-size: 0.875rem;
+  //   font-weight: bold;
+  //   line-height: 1.71;
+  //   margin: 12px 0 16px 0;
+  //   width: 100%;
+  //   text-align: center;
+  // }
 
   .input-group {
     width: 94px;
@@ -221,17 +110,6 @@ import svgGold from '@/assets/svg/gold.svg';
 import svgPositive from '@/assets/svg/positive.svg';
 import svgNegative from '@/assets/svg/negative.svg';
 
-// modules
-// import keys from 'lodash/keys';
-
-import { mapState } from '@/libs/store';
-
-const hideAmountSelectionForPurchaseTypes = [
-  'gear', 'backgrounds', 'mystery_set', 'card',
-  'rebirth_orb', 'fortify', 'armoire', 'keys',
-  'debuffPotion', 'pets', 'mounts',
-];
-
 export default {
   data () {
     return {
@@ -242,61 +120,16 @@ export default {
         svgNegative,
       }),
       selectedAmountToBuy: 1,
-      selectedAmountToSell: 1,
-      gift: {
-        type: 'gems',
-        gems: {
-          amount: 0,
-          fromBalance: true,
-        },
-      },
-      gemCost: 1,
     };
   },
   computed: {
-    ...mapState({ user: 'user.data' }), // might not need this?
-    notEnoughCurrency () {
-      const notEnoughCurrency = !this.enoughCurrency(this.getPriceClass(),
-        this.item.value * this.selectedAmountToBuy);
-      return notEnoughCurrency;
-    },
-    userGold () {
-      const userGold = this.user.currency;
-      return userGold;
-    },
-    maxItemsToBuy () {
-      const maxItemsToBuy = this.userGold
-        ? this.userGold / this.item.currency
-        : this.notEnoughCurrency;
-      return maxItemsToBuy;
-    },
-    fromBal () {
-      return this.gift.type === 'gems' && this.gift.gems.fromBalance;
-    },
-    maxGems () {
-      const maxGems = this.fromBal ? this.userLoggedIn.balance * 4 : 9999;
-      return maxGems;
-    },
-    getPriceClass () {
-      if (this.priceType && this.icons[this.priceType]) {
-        return this.priceType;
-      } if (this.item.currency && this.icons[this.item.currency]) {
-        return this.item.currency;
-      }
-      return 'gold';
-    },
-    showAmountToBuy (item) {
-      if (hideAmountSelectionForPurchaseTypes.includes(item.purchaseType)) {
-        return false;
-      } return true;
-    },
   },
   methods: {
     preventNegative ($event) {
       const { value } = $event.target;
 
       if (Number(value) < 0) {
-        this.selectedAmountToSell = 0;
+        this.selectedAmount = 0;
       }
     },
   },
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 3def50268b..06b5ee464b 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -89,7 +89,7 @@
               <span
                 class="cost"
                 :class="getPriceClass()"
-              >{{ item.value * showAmountToBuy(item) }}</span>
+              >{{ item.value }}</span>
             </div>
           </div>
           <div
@@ -435,6 +435,7 @@ export default {
       }),
 
       selectedAmountToBuy: 1,
+      selectedAmount: 1,
       isPinned: false,
     };
   },
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 7bfb0be6b6..8b6329592f 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -47,26 +47,9 @@
               <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
             </div>
             <div>
-              <number-increment
-                v-model="selectedAmountToSell"
-                class=""
-                type="number"
-                :max="itemContextToSell.itemCount"
-                min="1"
-                step="1"
-                @keyup.native="preventNegative($event)"
-              />
+              <number-increment />
             </div>
             <div>
-              <b-input
-                v-model="selectedAmountToSell"
-                class="itemsToSell"
-                type="number"
-                :max="itemContextToSell.itemCount"
-                min="1"
-                step="1"
-                @keyup.native="preventNegative($event)"
-              />
               <span
                 class="svg-icon inline icon-32"
                 aria-hidden="true"
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index c573534153..7f0971e349 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -33,7 +33,6 @@
           v-if="!item.locked"
           class="purchase-amount"
         >
-          <numberIncrement />
           <div class="how-many-to-buy">
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
@@ -283,6 +282,7 @@ import buyMixin from '@/mixins/buy';
 import numberInvalid from '@/mixins/numberInvalid';
 import PinBadge from '@/components/ui/pinBadge';
 import CountdownBanner from '../countdownBanner';
+// import numberIncrement from '@/components/shared/numberIncrement';
 
 import questDialogContent from './questDialogContent';
 import QuestRewards from './questRewards';
@@ -296,6 +296,7 @@ export default {
     PinBadge,
     questDialogContent,
     CountdownBanner,
+    // numberIncrement,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid],
   props: {

From 6d6195ae6a7067fe034cbadb153025d47078df03 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 1 Dec 2022 14:43:08 -0500
Subject: [PATCH 06/87] props attempt

---
 .../src/components/shared/numberIncrement.vue | 47 +++++++------------
 .../client/src/components/shops/buyModal.vue  |  4 +-
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 54309bffa0..457b389d30 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -3,9 +3,9 @@
     <!-- buy modal -->
     <div
       class="gray-circle"
-      @click="selectedAmountToBuy <= 0
-        ? selectedAmountToBuy = 0
-        : selectedAmountToBuy--"
+      @click="setQuantity <= 0
+        ? setQuantity = 0
+        : setQuantity--"
     >
       <div
         class="icon-negative"
@@ -16,15 +16,15 @@
       <div class="align-items-center">
       </div>
       <input
-        v-model="selectedAmountToBuy"
         class="form-control alignment"
+        :quantity="1"
         min="0"
         step="1"
       >
     </div>
     <div
       class="gray-circle"
-      @click="selectedAmountToBuy++"
+      @click="setQuantity++"
     >
       <div
         class="icon-positive"
@@ -45,16 +45,6 @@
     text-align: center;
   }
 
-  // label {
-  //   color: $gray-50;
-  //   font-size: 0.875rem;
-  //   font-weight: bold;
-  //   line-height: 1.71;
-  //   margin: 12px 0 16px 0;
-  //   width: 100%;
-  //   text-align: center;
-  // }
-
   .input-group {
     width: 94px;
     height: 32px;
@@ -85,12 +75,6 @@
     }
   }
 
-  .icon-gem {
-    width: 16px;
-    height: 16px;
-    margin-bottom: 4px;
-  }
-
   .icon-positive, .icon-negative {
     width: 10px;
     height: 10px;
@@ -111,6 +95,15 @@ import svgPositive from '@/assets/svg/positive.svg';
 import svgNegative from '@/assets/svg/negative.svg';
 
 export default {
+  props: {
+    quantity: {
+      type: Number,
+      default: 1,
+    },
+    item: {
+      type: Object,
+    },
+  },
   data () {
     return {
       icons: Object.freeze({
@@ -119,19 +112,15 @@ export default {
         svgPositive,
         svgNegative,
       }),
-      selectedAmountToBuy: 1,
     };
   },
   computed: {
+    setQuantity () {
+      const setQuantity = this.item.value * this.quantity;
+      return setQuantity;
+    },
   },
   methods: {
-    preventNegative ($event) {
-      const { value } = $event.target;
-
-      if (Number(value) < 0) {
-        this.selectedAmount = 0;
-      }
-    },
   },
 };
 
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 06b5ee464b..26ded425bf 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -79,7 +79,9 @@
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
           <div v-if="showAmountToBuy(item)">
-            <number-increment />
+            <number-increment
+              :quantity="1"
+            />
             <div :class="{'notEnough': notEnoughCurrency}">
               <span
                 class="svg-icon inline icon-32"

From 892c9ad0401c59c2a635061f4ab996b754b79e88 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Dec 2022 11:47:57 -0500
Subject: [PATCH 07/87] trying to make clicky clicky work

---
 .../src/components/shared/numberIncrement.vue | 20 ++++++++-----------
 .../client/src/components/shops/buyModal.vue  |  1 +
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 457b389d30..73dbaf924d 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -3,9 +3,9 @@
     <!-- buy modal -->
     <div
       class="gray-circle"
-      @click="setQuantity <= 0
-        ? setQuantity = 0
-        : setQuantity--"
+      @click="quantity <= 0
+        ? quantity = 0
+        : quantity--"
     >
       <div
         class="icon-negative"
@@ -16,15 +16,17 @@
       <div class="align-items-center">
       </div>
       <input
+        v-model="quantity"
         class="form-control alignment"
         :quantity="1"
-        min="0"
+        min="1"
         step="1"
+        @input="$emit('update:quantity', $event.target.value)"
       >
     </div>
     <div
       class="gray-circle"
-      @click="setQuantity++"
+      @click="quantity++"
     >
       <div
         class="icon-positive"
@@ -100,9 +102,6 @@ export default {
       type: Number,
       default: 1,
     },
-    item: {
-      type: Object,
-    },
   },
   data () {
     return {
@@ -112,13 +111,10 @@ export default {
         svgPositive,
         svgNegative,
       }),
+      item: { },
     };
   },
   computed: {
-    setQuantity () {
-      const setQuantity = this.item.value * this.quantity;
-      return setQuantity;
-    },
   },
   methods: {
   },
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 26ded425bf..8050a8c574 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -81,6 +81,7 @@
           <div v-if="showAmountToBuy(item)">
             <number-increment
               :quantity="1"
+              @click="$emit('update:quantity', selectedAmountToBuy)"
             />
             <div :class="{'notEnough': notEnoughCurrency}">
               <span

From 523f044914c1b87af0059e97859333906d6ffe27 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 9 Dec 2022 17:04:16 -0500
Subject: [PATCH 08/87] css changes to buy modal

---
 habitica-images                               |  2 +-
 .../client/src/components/shops/buyModal.vue  | 77 ++++++++++++++++---
 2 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/habitica-images b/habitica-images
index d66a5ea922..f9c1439cd9 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit d66a5ea922d91815d4419b718ff38a80e11667f7
+Subproject commit f9c1439cd927486fa766982ad078e9feb323b9da
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 8050a8c574..3007fd46aa 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -72,6 +72,22 @@
           v-if="item.value > 0"
           class="purchase-amount"
         >
+          <div>
+            <span
+              class="cost"
+              :class="getPriceClass()"
+            >
+              <span
+                class="svg-icon inline icon-24"
+                aria-hidden="true"
+                v-html="icons[getPriceClass()]"
+              >
+              </span>
+              <span
+                :class="getPriceClass()"
+              >{{ item.value }}</span>
+            </span>
+          </div>
           <div
             v-if="showAmountToBuy(item)"
             class="how-many-to-buy"
@@ -85,12 +101,12 @@
             />
             <div :class="{'notEnough': notEnoughCurrency}">
               <span
-                class="svg-icon inline icon-32"
+                class="svg-icon inline icon-20 total"
                 aria-hidden="true"
                 v-html="icons[getPriceClass()]"
               ></span>
               <span
-                class="cost"
+                class="total"
                 :class="getPriceClass()"
               >{{ item.value }}</span>
             </div>
@@ -100,7 +116,7 @@
             class="d-flex align-items-middle"
           >
             <span
-              class="svg-icon inline icon-32 ml-auto my-auto"
+              class="svg-icon inline icon-24 ml-auto my-auto"
               aria-hidden="true"
               v-html="icons[getPriceClass()]"
             ></span>
@@ -251,7 +267,7 @@
       }
     }
 
-    span.svg-icon.inline.icon-32 {
+    span.svg-icon.inline.icon-24 {
       height: 24px;
       width: 24px;
 
@@ -260,14 +276,55 @@
       vertical-align: middle;
     }
 
-    .cost {
-      width: 24px;
-      height: 24px;
-      font-size: 24px;
-      font-weight: bold;
-      line-height: 1.33;
+    span.svg-icon.inline.icon-20 {
+      height: 20px;
+      width: 20px;
+
+      margin-right: 8px;
 
       vertical-align: middle;
+    }
+
+    .cost {
+      height: 40px;
+      font-size: 1.25rem;
+      font-weight: bold;
+      line-height: 1.4;
+
+      vertical-align: middle;
+
+      &.gems {
+        color: $gems-color;
+        border-radius: 20px;
+        padding: 8px 20px 8px 20px;
+        margin-top: 16px;
+        margin-bottom: 16px;
+        background-color: rgba(36, 204, 143, 0.15);
+      }
+
+      &.gold {
+        color: $gold-color;
+        border-radius: 20px;
+        padding: 8px 20px 8px 20px;
+        margin-top: 16px;
+        margin-bottom: 16px;
+        background-color: rgba(255, 190, 93, 0.15);
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+        border-radius: 20px;
+        padding: 8px 20px 8px 20px;
+        margin-top: 16px;
+        margin-bottom: 16px;
+        background-color: rgba(41, 149, 205, 0.15);
+      }
+    }
+
+    .total {
+      font-size: 0.825rem;
+      line-height: 1.71;
+      font-weight: bold;
 
       &.gems {
         color: $gems-color;

From 8628c774e5bc8b72a678376b8b60ad02bc7c07f8 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 13 Dec 2022 10:53:38 -0500
Subject: [PATCH 09/87] more css changes to buy modal

---
 .../client/src/components/shops/buyModal.vue  | 52 +++++++++++++------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 3007fd46aa..ae74dba7a9 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -72,7 +72,7 @@
           v-if="item.value > 0"
           class="purchase-amount"
         >
-          <div>
+          <div class="item-cost">
             <span
               class="cost"
               :class="getPriceClass()"
@@ -100,6 +100,7 @@
               @click="$emit('update:quantity', selectedAmountToBuy)"
             />
             <div :class="{'notEnough': notEnoughCurrency}">
+              <span class="total-text">Total:</span>
               <span
                 class="svg-icon inline icon-20 total"
                 aria-hidden="true"
@@ -212,10 +213,23 @@
 
     .modal-body {
       padding-bottom: 0px;
+      padding-left: 0px;
+    }
+
+    .modal-footer {
+      height: 48px;
+      background-color: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      display: block;
+      margin: 24px 0 0;
+      padding: 16px 24px;
+      align-content: center;
     }
 
     .modal-dialog {
-      width: 330px;
+      width: 448px;;
+      box-sizing: border-box;
     }
 
     .avatar {
@@ -225,6 +239,8 @@
 
     .content {
       text-align: center;
+      width: 448px;
+      // box-sizing: border-box
     }
 
     .item-wrapper {
@@ -233,7 +249,10 @@
 
     .inner-content {
       margin: 33px auto auto;
-      width: 282px;
+    }
+
+    .btn-primary {
+      margin-top: 16px;
     }
 
     .purchase-amount {
@@ -270,21 +289,22 @@
     span.svg-icon.inline.icon-24 {
       height: 24px;
       width: 24px;
-
       margin-right: 8px;
-
       vertical-align: middle;
     }
 
     span.svg-icon.inline.icon-20 {
       height: 20px;
       width: 20px;
-
       margin-right: 8px;
-
       vertical-align: middle;
     }
 
+    .item-cost {
+      padding-top: 16px;
+      padding-bottom: 16px;
+    }
+
     .cost {
       height: 40px;
       font-size: 1.25rem;
@@ -327,7 +347,7 @@
       font-weight: bold;
 
       &.gems {
-        color: $gems-color;
+        color: $green-10;
       }
 
       &.gold {
@@ -339,6 +359,14 @@
       }
     }
 
+    .total-text {
+      font-size: 0.825rem;
+      line-height: 1.71;
+      font-weight: bold;
+      height: 24px;
+      width: 37px;
+      padding-right: 8px;
+
     button.btn.btn-primary {
       margin-top: 24px;
       margin-bottom: 24px;
@@ -358,13 +386,6 @@
       color: $gray-200;
     }
 
-    .modal-footer {
-      height: 48px;
-      background-color: $gray-700;
-      border-bottom-right-radius: 8px;
-      border-bottom-left-radius: 8px;
-      display: block;
-    }
 
     .notEnough {
       pointer-events: none;
@@ -395,6 +416,7 @@
       padding-top: 0.15rem;
     }
   }
+}
 </style>
 
 <style lang="scss" scoped>

From 24032b57f60630ba74f40f1841ff56976f1750ce Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 15 Dec 2022 16:48:59 -0500
Subject: [PATCH 10/87] why clicky click no click?

---
 website/client/src/components/payments/sendGiftModal.vue | 2 +-
 website/client/src/components/shared/numberIncrement.vue | 4 +---
 website/client/src/components/shops/buyModal.vue         | 9 +++++----
 website/common/locales/en/groups.json                    | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/website/client/src/components/payments/sendGiftModal.vue b/website/client/src/components/payments/sendGiftModal.vue
index f266fd3273..04e28c254a 100644
--- a/website/client/src/components/payments/sendGiftModal.vue
+++ b/website/client/src/components/payments/sendGiftModal.vue
@@ -126,7 +126,7 @@
 
           <!-- the word "total" -->
           <div class="buy-gem-total">
-            {{ $t('sendGiftTotal') }}
+            {{ $t('sendTotal') }}
           </div>
 
           <!-- the actual dollar amount -->
diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 73dbaf924d..0cf0c002cb 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -18,10 +18,8 @@
       <input
         v-model="quantity"
         class="form-control alignment"
-        :quantity="1"
-        min="1"
         step="1"
-        @input="$emit('update:quantity', $event.target.value)"
+        @input="$emit('update:quantity', $event.target.selectedAmountToBuy)"
       >
     </div>
     <div
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index ae74dba7a9..b6f5af2e6f 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -96,11 +96,10 @@
           </div>
           <div v-if="showAmountToBuy(item)">
             <number-increment
-              :quantity="1"
-              @click="$emit('update:quantity', selectedAmountToBuy)"
+              @input="$emit('update:quantity', target.value.selectedAmountToBuy)"
             />
             <div :class="{'notEnough': notEnoughCurrency}">
-              <span class="total-text">Total:</span>
+              <span class="total-text">{{ $t('sendTotal') }}</span>
               <span
                 class="svg-icon inline icon-20 total"
                 aria-hidden="true"
@@ -109,7 +108,7 @@
               <span
                 class="total"
                 :class="getPriceClass()"
-              >{{ item.value }}</span>
+              >{{ item.value * selectedAmount }}</span>
             </div>
           </div>
           <div
@@ -488,6 +487,7 @@ export default {
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid, spellsMixin],
   props: {
+    // eslint-disable-next-line vue/require-default-prop
     item: {
       type: Object,
     },
@@ -519,6 +519,7 @@ export default {
       selectedAmountToBuy: 1,
       selectedAmount: 1,
       isPinned: false,
+      quantity: 1,
     };
   },
   computed: {
diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json
index e6ab1a4db2..eccd15fabb 100644
--- a/website/common/locales/en/groups.json
+++ b/website/common/locales/en/groups.json
@@ -129,7 +129,7 @@
   "sendGiftHeading": "Send Gift to <%= name %>",
   "sendGiftGemsBalance": "From <%= number %> Gems",
   "sendGiftCost": "Total: $<%= cost %> USD",
-  "sendGiftTotal": "Total:",
+  "sendTotal": "Total:",
   "sendGiftFromBalance": "From Balance",
   "sendGiftPurchase": "Purchase",
   "sendGiftLabel": "Would you like to send a gift message?",

From 4c943b75756d9272e9064006927dbce656b550ab Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 16 Dec 2022 16:51:19 -0500
Subject: [PATCH 11/87] number-increment works on buy modal and there was much
 rejoicing...

---
 .../src/components/shared/numberIncrement.vue   | 17 ++++++++++-------
 .../client/src/components/shops/buyModal.vue    |  5 +++--
 website/client/src/mixins/numberInvalid.js      |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 0cf0c002cb..10e613bdd6 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -19,7 +19,6 @@
         v-model="quantity"
         class="form-control alignment"
         step="1"
-        @input="$emit('update:quantity', $event.target.selectedAmountToBuy)"
       >
     </div>
     <div
@@ -95,12 +94,6 @@ import svgPositive from '@/assets/svg/positive.svg';
 import svgNegative from '@/assets/svg/negative.svg';
 
 export default {
-  props: {
-    quantity: {
-      type: Number,
-      default: 1,
-    },
-  },
   data () {
     return {
       icons: Object.freeze({
@@ -110,9 +103,19 @@ export default {
         svgNegative,
       }),
       item: { },
+      quantity: 1,
     };
   },
   computed: {
+    // validateQuantity () {
+    //   const validateQuantity = Number ? Number : NaN;
+    //   return validateQuantity;
+    // },
+  },
+  watch: {
+    quantity () {
+      this.$emit('updateQuantity', this.quantity);
+    },
   },
   methods: {
   },
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index b6f5af2e6f..93b098af42 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -96,7 +96,7 @@
           </div>
           <div v-if="showAmountToBuy(item)">
             <number-increment
-              @input="$emit('update:quantity', target.value.selectedAmountToBuy)"
+              @updateQuantity="selectedAmountToBuy = $event"
             />
             <div :class="{'notEnough': notEnoughCurrency}">
               <span class="total-text">{{ $t('sendTotal') }}</span>
@@ -108,7 +108,7 @@
               <span
                 class="total"
                 :class="getPriceClass()"
-              >{{ item.value * selectedAmount }}</span>
+              >{{ item.value * selectedAmountToBuy }}</span>
             </div>
           </div>
           <div
@@ -584,6 +584,7 @@ export default {
     onChange ($event) {
       this.$emit('change', $event);
     },
+
     buyItem () {
       // @TODO: I  think we should buying to the items.
       // Turn the items into classes, and use polymorphism
diff --git a/website/client/src/mixins/numberInvalid.js b/website/client/src/mixins/numberInvalid.js
index 74db1d8be5..6424c0c24d 100644
--- a/website/client/src/mixins/numberInvalid.js
+++ b/website/client/src/mixins/numberInvalid.js
@@ -1,7 +1,7 @@
 export default {
   computed: {
     numberInvalid () {
-      return this.selectedAmountToBuy < 1 || !Number.isInteger(this.selectedAmountToBuy);
+      return this.selectedAmountToBuy < 1 || !Number.isInteger(this.selectedAmountToBuy) || NaN;
     },
   },
 };

From 8374d61f52c4cdb96bc2739523bb45d1f08bbeb8 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 19 Dec 2022 17:26:49 -0500
Subject: [PATCH 12/87] why does NaN ask the user to buy gems?

---
 website/client/src/components/shops/buyModal.vue | 10 +++++++++-
 website/client/src/mixins/numberInvalid.js       |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 93b098af42..044e24e2dc 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -157,11 +157,19 @@
         >
           {{ $t('viewSubscriptions') }}
         </button>
+        <!-- this is where I'm trying to disable the button if the total is NaN -->
+<!--         <button
+          v-else-if="!Number.isNaN(item.value * selectedAmountToBuy)"
+          class="btn btn-primary"
+          :disabled="!Number.isNaN(item.value * selectedAmountToBuy)"
+        >
+          Please Enter A Number!
+        </button> -->
         <button
           v-else
           class="btn btn-primary"
           :disabled="item.key === 'gem' && gemsLeft === 0 ||
-            attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid || item.locked ||
+            attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid|| item.locked ||
             !preventHealthPotion ||
             !enoughCurrency(getPriceClass(), item.value * selectedAmountToBuy)"
           :class="{'notEnough': !preventHealthPotion ||
diff --git a/website/client/src/mixins/numberInvalid.js b/website/client/src/mixins/numberInvalid.js
index 6424c0c24d..2ec7b2fd71 100644
--- a/website/client/src/mixins/numberInvalid.js
+++ b/website/client/src/mixins/numberInvalid.js
@@ -1,7 +1,9 @@
 export default {
   computed: {
     numberInvalid () {
-      return this.selectedAmountToBuy < 1 || !Number.isInteger(this.selectedAmountToBuy) || NaN;
+      return this.selectedAmountToBuy < 1
+      || !Number.isInteger(this.selectedAmountToBuy)
+      || !Number.isNaN(this.item.value * this.selectedAmountToBuy);
     },
   },
 };

From 53eab7aa29a4f2e44ad4cdc8cda163303b77f38d Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 20 Dec 2022 16:53:51 -0500
Subject: [PATCH 13/87]  Working on styling

---
 habitica-images                               |  2 +-
 .../client/src/components/shops/buyModal.vue  | 33 ++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/habitica-images b/habitica-images
index f9c1439cd9..6b38812db4 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit f9c1439cd927486fa766982ad078e9feb323b9da
+Subproject commit 6b38812db483d762ee9b3a700d6737ea94099b57
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 044e24e2dc..6bccb4caa8 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -44,6 +44,7 @@
               :override-avatar-gear="getAvatarOverrides(item)"
               :sprites-margin="'0px auto 0px -24px'"
             />
+            <span class="owned">{{ $t('owned') }}: 250</span>
           </div>
           <item
             v-else-if="item.key != 'gem'"
@@ -157,19 +158,11 @@
         >
           {{ $t('viewSubscriptions') }}
         </button>
-        <!-- this is where I'm trying to disable the button if the total is NaN -->
-<!--         <button
-          v-else-if="!Number.isNaN(item.value * selectedAmountToBuy)"
-          class="btn btn-primary"
-          :disabled="!Number.isNaN(item.value * selectedAmountToBuy)"
-        >
-          Please Enter A Number!
-        </button> -->
         <button
           v-else
           class="btn btn-primary"
           :disabled="item.key === 'gem' && gemsLeft === 0 ||
-            attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid|| item.locked ||
+            attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid || item.locked ||
             !preventHealthPotion ||
             !enoughCurrency(getPriceClass(), item.value * selectedAmountToBuy)"
           :class="{'notEnough': !preventHealthPotion ||
@@ -244,6 +237,28 @@
       margin: 0 auto;
     }
 
+    .item {
+      width: 141px;
+      height: 147px;;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+      border-bottom-right-radius: 0px;
+      border-bottom-left-radius: 0px;
+    }
+
+     .item .owned {
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        width: 141px;
+        margin: 30 0 0;
+        background-color: $gray-600;
+        padding: 8px 41px;
+        border-bottom-right-radius: 4px;
+        border-bottom-left-radius: 4px;
+        max-width: 141px;
+      }
+
     .content {
       text-align: center;
       width: 448px;

From f4aa88e1ffe95ff52c09fba262adba5449d089ff Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 21 Dec 2022 16:58:22 -0500
Subject: [PATCH 14/87] more style updates to buy modal

---
 .../client/src/components/shops/buyModal.vue  | 71 +++++++++++--------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 6bccb4caa8..2302469ad4 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -44,7 +44,6 @@
               :override-avatar-gear="getAvatarOverrides(item)"
               :sprites-margin="'0px auto 0px -24px'"
             />
-            <span class="owned">{{ $t('owned') }}: 250</span>
           </div>
           <item
             v-else-if="item.key != 'gem'"
@@ -54,10 +53,20 @@
             :show-popover="false"
           />
         </slot>
+        <span
+          v-once
+          class="owned"
+          :class="totalOwned"
+        >
+          <!-- need to calculate totalOwned()  -->
+          {{ $t('owned') }}: 1
+        </span>
         <h4 class="title">
           {{ itemText }}
         </h4>
-        <div v-html="itemNotes"></div>
+        <div class="item-notes">
+          {{ itemNotes }}
+        </div>
         <slot
           name="additionalInfo"
           :item="item"
@@ -112,20 +121,6 @@
               >{{ item.value * selectedAmountToBuy }}</span>
             </div>
           </div>
-          <div
-            v-else
-            class="d-flex align-items-middle"
-          >
-            <span
-              class="svg-icon inline icon-24 ml-auto my-auto"
-              aria-hidden="true"
-              v-html="icons[getPriceClass()]"
-            ></span>
-            <span
-              class="cost mr-auto my-auto"
-              :class="getPriceClass()"
-            >{{ item.value }}</span>
-          </div>
         </div>
         <div
           v-if="item.key === 'gem'"
@@ -212,7 +207,7 @@
     @include centeredModal();
 
     .modal-body {
-      padding-bottom: 0px;
+      // padding-bottom: 0px;
       padding-left: 0px;
     }
 
@@ -237,27 +232,40 @@
       margin: 0 auto;
     }
 
+   .owned {
+      font-size: 0.75rem;
+      font-weight: bold;
+      line-height: 1.33;
+      background-color: $gray-600;
+      padding: 8px 41px;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
+      display: block;
+      width: 141px;
+      margin-left: 154px;
+      margin-top: -36px;
+      position: relative;
+      z-index: 1;
+    }
+
     .item {
       width: 141px;
-      height: 147px;;
+      height: 147px;
       border-top-left-radius: 4px;
       border-top-right-radius: 4px;
       border-bottom-right-radius: 0px;
       border-bottom-left-radius: 0px;
     }
 
-     .item .owned {
-        font-size: 0.75rem;
-        font-weight: bold;
-        line-height: 1.33;
-        width: 141px;
-        margin: 30 0 0;
-        background-color: $gray-600;
-        padding: 8px 41px;
-        border-bottom-right-radius: 4px;
-        border-bottom-left-radius: 4px;
-        max-width: 141px;
-      }
+    .item-notes {
+       padding-left: 48.5px;
+       padding-right: 48.5px;
+    }
+
+    .attributes-group {
+      margin: 24px;
+      border-radius: 4px;;
+    }
 
     .content {
       text-align: center;
@@ -596,6 +604,9 @@ export default {
     endDate () {
       return moment(this.item.event.end);
     },
+    totalOwned () {
+      return this.user.items;
+    },
   },
   watch: {
     item: function itemChanged () {

From a08c26b07644ba228829cc627f6619b138b03894 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 22 Dec 2022 16:50:55 -0500
Subject: [PATCH 15/87] calculations working, style updates to subscriber gem
 modal

---
 .../src/components/shared/numberIncrement.vue | 17 +++++--
 .../client/src/components/shops/buyModal.vue  | 47 +++++++++++++++----
 website/client/src/mixins/numberInvalid.js    |  3 +-
 website/common/locales/ach/subscriber.json    |  3 +-
 4 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index 10e613bdd6..d8e3a5525d 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -19,6 +19,7 @@
         v-model="quantity"
         class="form-control alignment"
         step="1"
+        type="number"
       >
     </div>
     <div
@@ -84,6 +85,18 @@
     }
   }
 
+/* Chrome, Safari, Edge, Opera */
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+  }
+
+/* Firefox */
+  input[type=number] {
+    -moz-appearance: textfield;
+  }
+
 </style>
 
 <script>
@@ -107,10 +120,6 @@ export default {
     };
   },
   computed: {
-    // validateQuantity () {
-    //   const validateQuantity = Number ? Number : NaN;
-    //   return validateQuantity;
-    // },
   },
   watch: {
     quantity () {
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 2302469ad4..513299dc5b 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -45,6 +45,13 @@
               :sprites-margin="'0px auto 0px -24px'"
             />
           </div>
+          <item
+            v-else-if="item.key === 'gem'"
+            class="flat bordered-item"
+            :item="item"
+            :item-content-class="item.class"
+            :show-popover="false"
+          />
           <item
             v-else-if="item.key != 'gem'"
             class="flat bordered-item"
@@ -54,12 +61,12 @@
           />
         </slot>
         <span
-          v-once
+          v-if="!showAvatar && user.items[item.purchaseType]"
           class="owned"
           :class="totalOwned"
         >
           <!-- need to calculate totalOwned()  -->
-          {{ $t('owned') }}: 1
+          {{ $t('owned') }}: {{ totalOwned }}
         </span>
         <h4 class="title">
           {{ itemText }}
@@ -122,13 +129,6 @@
             </div>
           </div>
         </div>
-        <div
-          v-if="item.key === 'gem'"
-          class="gems-left"
-        >
-          <strong v-if="gemsLeft > 0">{{ gemsLeft }} {{ $t('gemsRemaining') }}</strong>
-          <strong v-if="gemsLeft === 0">{{ $t('maxBuyGems') }}</strong>
-        </div>
         <div v-if="attemptingToPurchaseMoreGemsThanAreLeft">
           {{ $t('notEnoughGemsToBuy') }}
         </div>
@@ -185,6 +185,18 @@
         <span v-html="$t('nextFreeRebirth', {days: nextFreeRebirth})"></span>
       </div>
     </div>
+    <div
+      v-if="item.key === 'gem'"
+      class="gems-left d-flex justify-content-center align-items-center"
+    >
+      {{ $t('monthlyGems') }}
+      <span v-if="gemsLeft > 0">
+        {{ gemsLeft }} {{ $t('gemsRemaining') }}
+      </span>
+      <span v-if="gemsLeft === 0">
+        {{ $t('maxBuyGems') }}
+      </span>
+    </div>
     <div
       slot="modal-footer"
       class="d-flex"
@@ -209,6 +221,7 @@
     .modal-body {
       // padding-bottom: 0px;
       padding-left: 0px;
+      padding-right: 0px;
     }
 
     .modal-footer {
@@ -257,6 +270,11 @@
       border-bottom-left-radius: 0px;
     }
 
+    .item-content {
+      transform: scale(1.45, 1.45);
+      top: -16px;
+    }
+
     .item-notes {
        padding-left: 48.5px;
        padding-right: 48.5px;
@@ -446,6 +464,15 @@
       padding-top: 0.15rem;
     }
   }
+
+  .gems-left {
+    height: 32px;
+    background-color: $green-100;
+    font-size: 0.75rem;
+    margin-top: 24px;
+    margin-bottom: -40px;
+    color: $green-1;
+  }
 }
 </style>
 
@@ -605,7 +632,7 @@ export default {
       return moment(this.item.event.end);
     },
     totalOwned () {
-      return this.user.items;
+      return this.user.items[this.item.purchaseType][this.item.key] || 0;
     },
   },
   watch: {
diff --git a/website/client/src/mixins/numberInvalid.js b/website/client/src/mixins/numberInvalid.js
index 2ec7b2fd71..7364fdf8e2 100644
--- a/website/client/src/mixins/numberInvalid.js
+++ b/website/client/src/mixins/numberInvalid.js
@@ -2,8 +2,7 @@ export default {
   computed: {
     numberInvalid () {
       return this.selectedAmountToBuy < 1
-      || !Number.isInteger(this.selectedAmountToBuy)
-      || !Number.isNaN(this.item.value * this.selectedAmountToBuy);
+      || !Number.isInteger(this.selectedAmountToBuy);
     },
   },
 };
diff --git a/website/common/locales/ach/subscriber.json b/website/common/locales/ach/subscriber.json
index 4b2b4bc250..1d673a17ae 100755
--- a/website/common/locales/ach/subscriber.json
+++ b/website/common/locales/ach/subscriber.json
@@ -132,5 +132,6 @@
     "subscriptionBenefit6": "Earn Mystic Hourglasses for use in the Time Travelers' Shop!",
     "purchaseAll": "Purchase Set",
     "gemsRemaining": "gems remaining",
-    "notEnoughGemsToBuy": "You are unable to buy that amount of gems"
+    "notEnoughGemsToBuy": "You are unable to buy that amount of gems",
+    "monthlyGems": "Monthly Gems:"
 }

From a21f0837616b920e6166ec58f65b89ebcadc886d Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 25 Jan 2023 16:44:14 -0500
Subject: [PATCH 16/87] gem modal styling/functions

---
 .../client/src/components/shops/buyModal.vue  | 40 ++++++++++++++-----
 website/common/locales/ach/subscriber.json    |  1 -
 website/common/locales/en/subscriber.json     |  5 ++-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 513299dc5b..a773a6f81f 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -187,15 +187,22 @@
     </div>
     <div
       v-if="item.key === 'gem'"
-      class="gems-left d-flex justify-content-center align-items-center"
+      class="d-flex justify-content-center align-items-center"
     >
-      {{ $t('monthlyGems') }}
-      <span v-if="gemsLeft > 0">
-        {{ gemsLeft }} {{ $t('gemsRemaining') }}
-      </span>
-      <span v-if="gemsLeft === 0">
-        {{ $t('maxBuyGems') }}
-      </span>
+      <div
+        v-if="gemsLeft > 0"
+        class="gems-left d-flex justify-content-center align-items-center"
+      >
+        <strong>{{ $t('monthlyGems') }} &nbsp;</strong>
+        {{ gemsLeft }} / {{ totalGems }} {{ $t('gemsRemaining') }}
+      </div>
+      <div
+        v-if="gemsLeft === 0"
+        class="out-of-gems-banner d-flex justify-content-center align-items-center"
+      >
+        <strong>{{ $t('monthlyGems') }} &nbsp;</strong>
+        {{ gemsLeft }} / {{ totalGems }} {{ $t('gemsRemaining') }}
+      </div>
     </div>
     <div
       slot="modal-footer"
@@ -349,8 +356,7 @@
     }
 
     .item-cost {
-      padding-top: 16px;
-      padding-bottom: 16px;
+       padding-bottom: 16px;
     }
 
     .cost {
@@ -473,6 +479,15 @@
     margin-bottom: -40px;
     color: $green-1;
   }
+
+  .out-of-gems-banner {
+    height: 32px;
+    font-size: 0.75rem;
+    margin-top: 24px;
+    margin-bottom: -40px;
+    background-color: $yellow-100;
+    color: $yellow-1;
+  }
 }
 </style>
 
@@ -615,6 +630,11 @@ export default {
       return planGemLimits.convCap
         + this.user.purchased.plan.consecutive.gemCapExtra - this.user.purchased.plan.gemsBought;
     },
+    totalGems () {
+      if (!this.user.purchased.plan) return 0;
+      return planGemLimits.convCap
+        + this.user.purchased.plan.consecutive.gemCapExtra;
+    },
     attemptingToPurchaseMoreGemsThanAreLeft () {
       if (this.item && this.item.key && this.item.key === 'gem' && this.selectedAmountToBuy > this.gemsLeft) return true;
       return false;
diff --git a/website/common/locales/ach/subscriber.json b/website/common/locales/ach/subscriber.json
index 1d673a17ae..3c9a6e7697 100755
--- a/website/common/locales/ach/subscriber.json
+++ b/website/common/locales/ach/subscriber.json
@@ -133,5 +133,4 @@
     "purchaseAll": "Purchase Set",
     "gemsRemaining": "gems remaining",
     "notEnoughGemsToBuy": "You are unable to buy that amount of gems",
-    "monthlyGems": "Monthly Gems:"
 }
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 977bc08ef2..4a26167d82 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -190,7 +190,7 @@
     "subscriptionBenefit5": "Receive the Royal Purple Jackalope pet when you become a new subscriber.",
     "subscriptionBenefit6": "Earn Mystic Hourglasses to purchase items in the Time Traveler’s Shop!",
     "purchaseAll": "Purchase Set",
-    "gemsRemaining": "Gems remaining",
+    "gemsRemaining": "remaining",
     "notEnoughGemsToBuy": "You are unable to buy that amount of Gems",
     "subscribersReceiveBenefits": "Subscribers receive these useful benefits!",
     "monthlyMysteryItems": "Monthly Mystery Items",
@@ -213,5 +213,6 @@
     "haveNonRecurringSub": "You have a non-recurring gift subscription.",
     "switchToRecurring": "Switch to a recurring subscription?",
     "continueGiftSubBenefits": "Want to continue your benefits? You can start a new subscription before your gifted one runs out to keep your benefits active.",
-    "subscriptionCreditConversion": "Starting a new subscription will convert any remaining months to credit that will be used after the recurring subscription is canceled."
+    "subscriptionCreditConversion": "Starting a new subscription will convert any remaining months to credit that will be used after the recurring subscription is canceled.",
+    "monthlyGems": "Monthly Gems:"
 }

From 684cb59a7ca6ced391f46676a9d3a483744c69aa Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 6 Feb 2023 16:23:20 -0500
Subject: [PATCH 17/87] buyModal styling/functions

---
 .../src/components/shops/balanceInfo.vue      |  2 +-
 .../client/src/components/shops/buyModal.vue  | 36 +++++++++++++++----
 website/common/locales/en/subscriber.json     |  2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/website/client/src/components/shops/balanceInfo.vue b/website/client/src/components/shops/balanceInfo.vue
index c03eef4d93..aaa4b923d5 100644
--- a/website/client/src/components/shops/balanceInfo.vue
+++ b/website/client/src/components/shops/balanceInfo.vue
@@ -22,7 +22,7 @@
   @import '~@/assets/scss/colors.scss';
 
 span {
-  font-weight: normal;
+  font-weight: bold;
   font-size: 12px;
   line-height: 1.33;
   color: $gray-200;
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index a773a6f81f..a5bb3aec6d 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -88,6 +88,7 @@
         <div
           v-if="item.value > 0"
           class="purchase-amount"
+          :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
         >
           <div class="item-cost">
             <span
@@ -108,10 +109,14 @@
           <div
             v-if="showAmountToBuy(item)"
             class="how-many-to-buy"
+            :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
           >
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
-          <div v-if="showAmountToBuy(item)">
+          <div
+            v-if="showAmountToBuy(item)"
+            :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
+          >
             <number-increment
               @updateQuantity="selectedAmountToBuy = $event"
             />
@@ -129,7 +134,10 @@
             </div>
           </div>
         </div>
-        <div v-if="attemptingToPurchaseMoreGemsThanAreLeft">
+        <div
+          v-if="attemptingToPurchaseMoreGemsThanAreLeft"
+          class="no-more-gems"
+        >
           {{ $t('notEnoughGemsToBuy') }}
         </div>
         <div
@@ -153,6 +161,11 @@
         >
           {{ $t('viewSubscriptions') }}
         </button>
+        <button
+          v-else-if="attemptingToPurchaseMoreGemsThanAreLeft"
+          :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
+        >
+        </button>
         <button
           v-else
           class="btn btn-primary"
@@ -208,9 +221,9 @@
       slot="modal-footer"
       class="d-flex"
     >
-      <span class="balance mr-auto">{{ $t('yourBalance') }}</span>
+      <span class="mr-auto balance">{{ $t('yourBalance') }}</span>
       <balanceInfo
-        class="ml-auto"
+        class="ml-auto balance"
         :currency-needed="getPriceClass()"
         :amount-needed="item.value"
       />
@@ -340,6 +353,12 @@
         }
       }
     }
+    .no-more-gems {
+      color: $yellow-5;
+      font-size: 0.875em;
+      line-height: 1.33;
+      margin: 16px 48px 0 48px;
+    }
 
     span.svg-icon.inline.icon-24 {
       height: 24px;
@@ -431,16 +450,17 @@
       }
     }
 
-    .balance {
+    span.balance {
       width: 74px;
       height: 16px;
-      font-size: 12px;
+      font-size: 0.75em;
       font-weight: bold;
       line-height: 1.33;
       color: $gray-200;
+      margin-bottom: 16px;
+      margin-top: 16px;
     }
 
-
     .notEnough {
       pointer-events: none;
       opacity: 0.55;
@@ -478,6 +498,7 @@
     margin-top: 24px;
     margin-bottom: -40px;
     color: $green-1;
+    width: 100%;
   }
 
   .out-of-gems-banner {
@@ -487,6 +508,7 @@
     margin-bottom: -40px;
     background-color: $yellow-100;
     color: $yellow-1;
+    width: 100%;
   }
 }
 </style>
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 287315df4f..6dc1aece5e 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -192,7 +192,7 @@
     "subscriptionBenefit6": "Earn Mystic Hourglasses to purchase items in the Time Traveler’s Shop!",
     "purchaseAll": "Purchase Set",
     "gemsRemaining": "remaining",
-    "notEnoughGemsToBuy": "You are unable to buy that amount of Gems",
+    "notEnoughGemsToBuy": "No more Gems available for purchase this month. More will become avalable within the first 3 days of each month.",
     "subscribersReceiveBenefits": "Subscribers receive these useful benefits!",
     "monthlyMysteryItems": "Monthly Mystery Items",
     "doubleDropCap": "Double the Drops",

From 23f7dd94b646b8ef5b097ec74a08d414630c6595 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 7 Feb 2023 15:24:53 -0500
Subject: [PATCH 18/87] more stylin' of the buy modal

---
 .../client/src/components/shops/buyModal.vue  | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index a5bb3aec6d..4cc9efae20 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -185,6 +185,7 @@
     <countdown-banner
       v-if="item.event && item.owned == null"
       :end-date="endDate"
+      class="limitedTime available"
     />
     <div
       v-if="item.key === 'rebirth_orb' && item.value > 0 && user.stats.lvl >= 100"
@@ -221,7 +222,7 @@
       slot="modal-footer"
       class="d-flex"
     >
-      <span class="mr-auto balance">{{ $t('yourBalance') }}</span>
+      <span class="balance mr-auto">{{ $t('yourBalance') }}</span>
       <balanceInfo
         class="ml-auto balance"
         :currency-needed="getPriceClass()"
@@ -253,6 +254,17 @@
       margin: 24px 0 0;
       padding: 16px 24px;
       align-content: center;
+
+      .balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+      }
     }
 
     .modal-dialog {
@@ -450,17 +462,6 @@
       }
     }
 
-    span.balance {
-      width: 74px;
-      height: 16px;
-      font-size: 0.75em;
-      font-weight: bold;
-      line-height: 1.33;
-      color: $gray-200;
-      margin-bottom: 16px;
-      margin-top: 16px;
-    }
-
     .notEnough {
       pointer-events: none;
       opacity: 0.55;
@@ -510,6 +511,15 @@
     color: $yellow-1;
     width: 100%;
   }
+
+  .limitedTime {
+    height: 32px;
+    width: 446px;
+    font-size: 0.75rem;
+    margin: 24px 0 -40px 0;
+    background-color: $purple-300;
+    color: $white;
+  }
 }
 </style>
 

From 20df5eeb8f345e7cb39a4955e1ffd8fc1c9bfd10 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 8 Feb 2023 15:16:17 -0500
Subject: [PATCH 19/87] buy modal complete!

---
 website/client/src/components/shared/numberIncrement.vue | 3 +++
 website/client/src/components/shops/buyModal.vue         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index d8e3a5525d..e2e00afd93 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -127,6 +127,9 @@ export default {
     },
   },
   methods: {
+    setDefaults () {
+      this.input = 1;
+    },
   },
 };
 
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 4cc9efae20..99110f71c8 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -794,6 +794,7 @@ export default {
       }
     },
     hideDialog () {
+      this.selectedAmountToBuy = 1;
       this.$root.$emit('bv::hide::modal', 'buy-modal');
     },
     getPriceClass () {

From fd7f3a646e48345878adc700d6d1958116c1eb23 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 14 Feb 2023 17:22:05 -0500
Subject: [PATCH 20/87] add functionality and styling to sellModal and
 questModal

---
 .../client/src/components/shops/buyModal.vue  |  14 +-
 .../src/components/shops/market/sellModal.vue |  95 +++++++--
 .../components/shops/quests/buyQuestModal.vue | 185 +++++++++++++-----
 3 files changed, 230 insertions(+), 64 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 99110f71c8..08384510ed 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -17,7 +17,7 @@
     </span>
     <div>
       <span
-        class="svg-icon icon-12 close-icon"
+        class="svg-icon icon-16 close-icon"
         aria-hidden="true"
         tabindex="0"
         @click="hideDialog()"
@@ -320,7 +320,6 @@
     .content {
       text-align: center;
       width: 448px;
-      // box-sizing: border-box
     }
 
     .item-wrapper {
@@ -382,6 +381,13 @@
     span.svg-icon.inline.icon-20 {
       height: 20px;
       width: 20px;
+      margin-right: 4px;
+      vertical-align: middle;
+    }
+
+    span.svg-icon.inline.icon-16 {
+      height: 16px;
+      width: 16px;
       margin-right: 8px;
       vertical-align: middle;
     }
@@ -395,7 +401,6 @@
       font-size: 1.25rem;
       font-weight: bold;
       line-height: 1.4;
-
       vertical-align: middle;
 
       &.gems {
@@ -450,7 +455,7 @@
       font-weight: bold;
       height: 24px;
       width: 37px;
-      padding-right: 8px;
+      padding-right: 4px;
 
     button.btn.btn-primary {
       margin-top: 24px;
@@ -471,7 +476,6 @@
       margin-top: 8px;
       border-radius: 2px;
       background-color: $gray-500;
-
       margin: 10px 0 24px;
     }
 
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 8b6329592f..d6148e8edf 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -6,7 +6,7 @@
   >
     <div class="close">
       <span
-        class="svg-icon inline icon-10"
+        class="svg-icon inline icon-16"
         aria-hidden="true"
         @click="hideDialog()"
         v-html="icons.close"
@@ -14,7 +14,7 @@
     </div>
     <div
       v-if="item"
-      class="content"
+      class="content bordered-item"
     >
       <div class="inner-content">
         <item
@@ -43,19 +43,36 @@
             <div class="text">
               {{ item.notes() }}
             </div>
+            <div class="item-cost">
+              <span class="cost gold">
+                <span
+                  class="svg-icon inline icon-24"
+                  aria-hidden="true"
+                  v-html="icons.gold"
+                ></span>
+                <span>{{ item.value }}</span>
+              </span>
+            </div>
             <div>
               <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
             </div>
             <div>
-              <number-increment />
+              <number-increment
+                @updateQuantity="selectedAmountToSell = $event"
+              />
             </div>
             <div>
+              <span class="total-text">
+                {{ $t('sendTotal') }}
+              </span>
               <span
-                class="svg-icon inline icon-32"
+                class="svg-icon inline icon-20"
                 aria-hidden="true"
                 v-html="icons.gold"
               ></span>
-              <span class="value">{{ item.value }}</span>
+              <span class="total gold">
+                {{ item.value * selectedAmountToSell }}
+              </span>
             </div>
             <button
               class="btn btn-primary"
@@ -104,24 +121,72 @@
     span.svg-icon.inline.icon-32 {
       height: 32px;
       width: 32px;
-
       margin-left: 24px;
       margin-right: 8px;
-
       vertical-align: middle;
     }
 
-    .value {
-      width: 28px;
-      height: 32px;
-      font-size: 24px;
-      font-weight: bold;
-      line-height: 1.33;
-      color: #df911e;
-
+    span.svg-icon.inline.icon-24 {
+      height: 24px;
+      width: 24px;
+      margin-right: 8px;
       vertical-align: middle;
     }
 
+    span.svg-icon.inline.icon-20 {
+      height: 20px;
+      width: 20px;
+      margin-right: 4px;
+      vertical-align: middle;
+    }
+
+    span.svg-icon.inline.icon-16 {
+      height: 16px;
+      width: 16px;
+      margin-right: 8px;
+      vertical-align: middle;
+    }
+
+  .item-cost {
+    padding-bottom: 16px;
+    }
+
+    .cost {
+      height: 40px;
+      font-size: 1.25rem;
+      font-weight: bold;
+      line-height: 1.4;
+      vertical-align: middle;
+
+      &.gold {
+        color: $gold-color;
+        border-radius: 20px;
+        padding: 8px 20px 8px 20px;
+        margin-top: 16px;
+        margin-bottom: 16px;
+        background-color: rgba(255, 190, 93, 0.15);
+      }
+    }
+
+    .total {
+      font-size: 0.825rem;
+      line-height: 1.71;
+      font-weight: bold;
+
+      &.gold {
+        color: $gold-color;
+      }
+    }
+
+    .total-text {
+      font-size: 0.825rem;
+      line-height: 1.71;
+      font-weight: bold;
+      height: 24px;
+      width: 37px;
+      padding-right: 4px;
+    }
+
     button.btn.btn-primary {
       margin-top: 24px;
       margin-bottom: 24px;
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index 7f0971e349..0ba035164c 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -33,6 +33,22 @@
           v-if="!item.locked"
           class="purchase-amount"
         >
+          <div class="item-cost">
+            <span
+              class="cost"
+              :class="priceType"
+            >
+              <span
+                class="svg-icon inline icon-24"
+                aria-hidden="true"
+                v-html="icons[priceType]"
+              >
+              </span>
+              <span
+                :class="priceType"
+              >{{ item.value }}</span>
+            </span>
+          </div>
           <div class="how-many-to-buy">
             <strong>{{ $t('howManyToBuy') }}</strong>
           </div>
@@ -42,24 +58,25 @@
           >
             {{ item.addlNotes }}
           </div>
-          <div class="box">
-            <input
-              v-model.number="selectedAmountToBuy"
-              class="form-control"
-              type="number"
-              min="0"
-              step="1"
-            >
+          <div>
+            <number-increment
+              @updateQuantity="selectedAmountToBuy = $event"
+            />
+          </div>
+          <div>
+            <span class="total-text">
+              {{ $t('sendTotal') }}
+            </span>
+            <span
+              class="svg-icon inline icon-20"
+              aria-hidden="true"
+              v-html="currencyIcon"
+            ></span>
+            <span
+              class="total"
+              :class="priceType"
+            >{{ item.value * selectedAmountToBuy }}</span>
           </div>
-          <span
-            class="svg-icon inline icon-32"
-            aria-hidden="true"
-            v-html="currencyIcon"
-          ></span>
-          <span
-            class="value"
-            :class="priceType"
-          >{{ item.value }}</span>
         </div>
         <button
           v-if="priceType === 'gems'
@@ -152,13 +169,6 @@
       height: 100%;
     }
 
-    span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
-      margin-right: 8px;
-      vertical-align: middle;
-    }
-
     button.btn.btn-primary {
       margin-top: 24px;
       margin-bottom: 24px;
@@ -198,28 +208,115 @@
         margin-bottom: 16px;
       }
 
-      .box {
-        display: inline-block;
-        width: 74px;
-        height: 40px;
-        border-radius: 2px;
-        background-color: #ffffff;
-        box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
-        margin-right: 24px;
-
-        input {
-          width: 100%;
-          border: none;
+      .item-cost {
+        padding-bottom: 16px;
         }
 
-        input::-webkit-contacts-auto-fill-button {
-          visibility: hidden;
-          display: none !important;
-          pointer-events: none;
-          position: absolute;
-          right: 0;
+        .cost {
+          height: 40px;
+          font-size: 1.25rem;
+          font-weight: bold;
+          line-height: 1.4;
+          vertical-align: middle;
+
+          &.gems {
+            color: $gems-color;
+            border-radius: 20px;
+            padding: 8px 20px 8px 20px;
+            margin-top: 16px;
+            margin-bottom: 16px;
+            background-color: rgba(36, 204, 143, 0.15);
+          }
+
+          &.gold {
+            color: $gold-color;
+            border-radius: 20px;
+            padding: 8px 20px 8px 20px;
+            margin-top: 16px;
+            margin-bottom: 16px;
+            background-color: rgba(255, 190, 93, 0.15);
+          }
+
+          &.hourglasses {
+            color: $hourglass-color;
+            border-radius: 20px;
+            padding: 8px 20px 8px 20px;
+            margin-top: 16px;
+            margin-bottom: 16px;
+            background-color: rgba(41, 149, 205, 0.15);
+      }
+        }
+
+      .total {
+        font-size: 0.825rem;
+        line-height: 1.71;
+        font-weight: bold;
+
+        &.gold {
+          color: $gold-color;
+        }
+
+        &.gems {
+          color: $gems-color;
+        }
+
+        & .hourglasses {
+          color: $hourglass-color;
         }
       }
+
+      .total-text {
+        font-size: 0.825rem;
+        line-height: 1.71;
+        font-weight: bold;
+        height: 24px;
+        width: 37px;
+        padding-right: 4px;
+      }
+
+  span.svg-icon.inline.icon-20 {
+      height: 20px;
+      width: 20px;
+      margin-right: 4px;
+      vertical-align: middle;
+    }
+
+  span.svg-icon.inline.icon-24 {
+    height: 24px;
+    width: 24px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+
+  span.svg-icon.inline.icon-32 {
+    height: 32px;
+    width: 32px;
+    margin-right: 8px;
+    vertical-align: middle;
+  }
+
+      // .box {
+      //   display: inline-block;
+      //   width: 74px;
+      //   height: 40px;
+      //   border-radius: 2px;
+      //   background-color: #ffffff;
+      //   box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
+      //   margin-right: 24px;
+
+      //   input {
+      //     width: 100%;
+      //     border: none;
+      //   }
+
+      //   input::-webkit-contacts-auto-fill-button {
+      //     visibility: hidden;
+      //     display: none !important;
+      //     pointer-events: none;
+      //     position: absolute;
+      //     right: 0;
+      //   }
+      // }
     }
 
     @media only screen and (max-width: 1000px) {
@@ -282,7 +379,7 @@ import buyMixin from '@/mixins/buy';
 import numberInvalid from '@/mixins/numberInvalid';
 import PinBadge from '@/components/ui/pinBadge';
 import CountdownBanner from '../countdownBanner';
-// import numberIncrement from '@/components/shared/numberIncrement';
+import numberIncrement from '@/components/shared/numberIncrement';
 
 import questDialogContent from './questDialogContent';
 import QuestRewards from './questRewards';
@@ -296,7 +393,7 @@ export default {
     PinBadge,
     questDialogContent,
     CountdownBanner,
-    // numberIncrement,
+    numberIncrement,
   },
   mixins: [buyMixin, currencyMixin, notifications, numberInvalid],
   props: {

From c349de690815b018216352f2cfd96b0042ab356f Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 15 Feb 2023 12:54:26 -0500
Subject: [PATCH 21/87] finish up sellModal and questModal (also Time
 Travelers)

---
 .../components/shops/quests/buyQuestModal.vue | 37 ++++---------------
 1 file changed, 7 insertions(+), 30 deletions(-)

diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index 0ba035164c..b9e97ecbd7 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -273,6 +273,7 @@
         width: 37px;
         padding-right: 4px;
       }
+    }
 
   span.svg-icon.inline.icon-20 {
       height: 20px;
@@ -295,30 +296,6 @@
     vertical-align: middle;
   }
 
-      // .box {
-      //   display: inline-block;
-      //   width: 74px;
-      //   height: 40px;
-      //   border-radius: 2px;
-      //   background-color: #ffffff;
-      //   box-shadow: 0 2px 2px 0 rgba(26, 24, 29, 0.16), 0 1px 4px 0 rgba(26, 24, 29, 0.12);
-      //   margin-right: 24px;
-
-      //   input {
-      //     width: 100%;
-      //     border: none;
-      //   }
-
-      //   input::-webkit-contacts-auto-fill-button {
-      //     visibility: hidden;
-      //     display: none !important;
-      //     pointer-events: none;
-      //     position: absolute;
-      //     right: 0;
-      //   }
-      // }
-    }
-
     @media only screen and (max-width: 1000px) {
       .modal-dialog {
         max-width: 80%;
@@ -333,7 +310,7 @@
   }
 </style>
 
-<style lang="scss" scoped>
+<!-- <style lang="scss" scoped>
   @import '~@/assets/scss/colors.scss';
 
   .value {
@@ -357,7 +334,7 @@
       color: $hourglass-color;
     }
   }
-</style>
+</style> -->
 
 <script>
 import moment from 'moment';
@@ -414,9 +391,9 @@ export default {
         clock: svgClock,
         close: svgClose,
         experience: svgExperience,
-        gem: svgGem,
+        gems: svgGem,
         gold: svgGold,
-        hourglass: svgHourglasses,
+        hourglasses: svgHourglasses,
         positive: svgPositive,
         negative: svgNegative,
       }),
@@ -443,8 +420,8 @@ export default {
     },
     currencyIcon () {
       if (this.priceType === 'gold') return this.icons.gold;
-      if (this.priceType === 'hourglasses') return this.icons.hourglass;
-      return this.icons.gem;
+      if (this.priceType === 'hourglasses') return this.icons.hourglasses;
+      return this.icons.gems;
     },
     endDate () {
       return moment(this.item.event.end);

From 1ac4466c24250f3f1904fb06622909527ade4d80 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 2 Mar 2023 14:33:27 -0500
Subject: [PATCH 22/87] trying to make more components for the buy/sell modals

---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 55 +++++++++++
 .../client/src/components/shared/itemCost.vue | 93 +++++++++++++++++++
 .../src/components/shared/purchaseTotal.vue   |  0
 .../client/src/components/shops/buyModal.vue  |  1 +
 5 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 website/client/src/components/shared/itemCost.vue
 create mode 100644 website/client/src/components/shared/purchaseTotal.vue

diff --git a/habitica-images b/habitica-images
index 0393ffa0b9..fae9d4f130 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 0393ffa0b95ce9ed4fa04646db56bf1882e29bb1
+Subproject commit fae9d4f1301959a14a07d74d86b828175209290a
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index b65af5b396..cc08b248ed 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -1369,6 +1369,11 @@
   width: 141px;
   height: 147px;
 }
+.background_jungle_watering_hole {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_jungle_watering_hole.png');
+  width: 141px;
+  height: 147px;
+}
 .background_kelp_forest {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_kelp_forest.png');
   width: 141px;
@@ -1404,6 +1409,11 @@
   width: 141px;
   height: 147px;
 }
+.background_mangrove_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_mangrove_forest.png');
+  width: 141px;
+  height: 147px;
+}
 .background_marble_temple {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_marble_temple.png');
   width: 141px;
@@ -1514,6 +1524,11 @@
   width: 141px;
   height: 147px;
 }
+.background_old_timey_basketball_court {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_old_timey_basketball_court.png');
+  width: 141px;
+  height: 147px;
+}
 .background_on_a_castle_wall {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_on_a_castle_wall.png');
   width: 141px;
@@ -3025,6 +3040,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_jungle_watering_hole {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_jungle_watering_hole.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_kelp_forest {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_kelp_forest.png');
   width: 68px;
@@ -3060,6 +3080,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_mangrove_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_mangrove_forest.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_marble_temple {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_marble_temple.png');
   width: 68px;
@@ -3170,6 +3195,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_old_timey_basketball_court {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_old_timey_basketball_court.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_on_a_castle_wall {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_on_a_castle_wall.png');
   width: 68px;
@@ -18320,6 +18350,11 @@
   width: 90px;
   height: 90px;
 }
+.broad_armor_armoire_basketballUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_basketballUniform.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_bathtub {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_bathtub.png');
   width: 114px;
@@ -19205,6 +19240,11 @@
   width: 114px;
   height: 90px;
 }
+.shield_armoire_basketball {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_basketball.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_birthdayBanner {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_birthdayBanner.png');
   width: 114px;
@@ -19575,6 +19615,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_armoire_basketballUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_basketballUniform.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_bathtub {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_bathtub.png');
   width: 68px;
@@ -20475,6 +20520,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_armoire_basketball {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_basketball.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_armoire_birthdayBanner {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_birthdayBanner.png');
   width: 68px;
@@ -21305,6 +21355,11 @@
   width: 90px;
   height: 90px;
 }
+.slim_armor_armoire_basketballUniform {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_basketballUniform.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_bathtub {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_bathtub.png');
   width: 114px;
diff --git a/website/client/src/components/shared/itemCost.vue b/website/client/src/components/shared/itemCost.vue
new file mode 100644
index 0000000000..c85c19ee82
--- /dev/null
+++ b/website/client/src/components/shared/itemCost.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="item-cost">
+    <span
+      class="cost"
+      :class="getPriceClass()"
+    >
+      <span
+        class="svg-icon inline icon-24"
+        aria-hidden="true"
+        v-html="icons[getPriceClass()]"
+      >
+      </span>
+      <span
+        :class="getPriceClass()"
+      >{{ item.value }}</span>
+    </span>
+  </div>
+</template>
+
+
+<style lang="scss">
+  @import '~@/assets/scss/colors.scss';
+  @import '~@/assets/scss/mixins.scss';
+
+.item-cost {
+ padding-bottom: 16px;
+}
+
+  .cost {
+    height: 40px;
+    font-size: 1.25rem;
+    font-weight: bold;
+    line-height: 1.4;
+    vertical-align: middle;
+
+    &.gems {
+      color: $gems-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(36, 204, 143, 0.15);
+    }
+
+    &.gold {
+      color: $gold-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(255, 190, 93, 0.15);
+    }
+
+    &.hourglasses {
+      color: $hourglass-color;
+      border-radius: 20px;
+      padding: 8px 20px 8px 20px;
+      margin-top: 16px;
+      margin-bottom: 16px;
+      background-color: rgba(41, 149, 205, 0.15);
+    }
+  }
+</style>
+
+<script>
+import svgClose from '@/assets/svg/close.svg';
+import svgGold from '@/assets/svg/gold.svg';
+import svgGem from '@/assets/svg/gem.svg';
+
+export default {
+  data () {
+    return {
+      icons: Object.freeze({
+        close: svgClose,
+        gold: svgGold,
+        gems: svgGem,
+      }),
+      selectedAmountToBuy: 1,
+      selectedAmount: 1,
+    };
+  },
+  methods: {
+    getPriceClass () {
+      if (this.priceType && this.icons[this.priceType]) {
+        return this.priceType;
+      } if (this.item.currency && this.icons[this.item.currency]) {
+        return this.item.currency;
+      }
+      return 'gold';
+    },
+  },
+};
+</script>
diff --git a/website/client/src/components/shared/purchaseTotal.vue b/website/client/src/components/shared/purchaseTotal.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 08384510ed..3ae7e6f61a 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -106,6 +106,7 @@
               >{{ item.value }}</span>
             </span>
           </div>
+
           <div
             v-if="showAmountToBuy(item)"
             class="how-many-to-buy"

From 76fa6ec1b8298e3ff39f7228da8c2f73d0ebf30b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 9 Mar 2023 15:54:26 -0500
Subject: [PATCH 23/87] updates to snumberIncrement, buyModal, and sellModal

---
 .../src/components/shared/numberIncrement.vue |  7 +--
 .../client/src/components/shops/buyModal.vue  |  6 +--
 .../src/components/shops/market/sellModal.vue | 46 +++++++++++++++----
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index e2e00afd93..e1fa888927 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -48,6 +48,7 @@
   .input-group {
     width: 94px;
     height: 32px;
+    width: 48px;
     margin: 0px 16px 0px 16px;
     padding: 0;
     border-radius: 2px;
@@ -63,14 +64,14 @@
     cursor: pointer;
 
     &:hover {
-      border-color: $purple-400;
+      border-color: $purple-300;
     }
   }
 
   .gray-circle:hover{
     .icon-positive, .icon-negative {
       & ::v-deep svg path {
-        fill: $purple-400;
+        fill: $purple-300;
       }
     }
   }
@@ -78,7 +79,7 @@
   .icon-positive, .icon-negative {
     width: 10px;
     height: 10px;
-    margin: 4px auto;
+    margin: 3px auto;
 
     & ::v-deep svg path {
       fill: $gray-300;
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 3ae7e6f61a..cf5357cda1 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -315,7 +315,7 @@
 
     .attributes-group {
       margin: 24px;
-      border-radius: 4px;;
+      border-radius: 4px;
     }
 
     .content {
@@ -405,7 +405,7 @@
       vertical-align: middle;
 
       &.gems {
-        color: $gems-color;
+        color: $green-10;
         border-radius: 20px;
         padding: 8px 20px 8px 20px;
         margin-top: 16px;
@@ -414,7 +414,7 @@
       }
 
       &.gold {
-        color: $gold-color;
+        color: $yellow-5;
         border-radius: 20px;
         padding: 8px 20px 8px 20px;
         margin-top: 16px;
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index d6148e8edf..e3851ac994 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -22,13 +22,11 @@
           :item="item"
           :item-content-class="itemContextToSell.itemClass"
           :show-popover="false"
-        >
-          <countBadge
-            slot="itemBadge"
-            :show="true"
-            :count="itemContextToSell.itemCount"
-          />
-        </item>
+        />
+        <span class="owned">
+          <!-- need to calculate totalOwned()  -->
+          {{ $t('owned') }}: {{ itemContextToSell.itemCount }}
+        </span>
         <h4 class="title">
           {{ itemContextToSell.itemName }}
         </h4>
@@ -106,7 +104,7 @@
     }
 
     .modal-dialog {
-      width: 330px;
+      width: 448px;;
     }
 
     .content {
@@ -118,6 +116,36 @@
       width: 282px;
     }
 
+    .owned {
+      font-size: 0.75rem;
+      font-weight: bold;
+      line-height: 1.33;
+      background-color: $gray-600;
+      padding: 8px 41px;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
+      display: block;
+      width: 141px;
+      margin-left: 70px;
+      margin-top: -36px;
+      position: relative;
+      z-index: 1;
+    }
+
+    .item {
+      width: 141px;
+      height: 147px;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+      border-bottom-right-radius: 0px;
+      border-bottom-left-radius: 0px;
+    }
+
+    .item-content {
+      transform: scale(1.45, 1.45);
+      top: -16px;
+    }
+
     span.svg-icon.inline.icon-32 {
       height: 32px;
       width: 32px;
@@ -225,14 +253,12 @@ import svgNegative from '@/assets/svg/negative.svg';
 
 import BalanceInfo from '../balanceInfo.vue';
 import Item from '@/components/inventory/item';
-import CountBadge from '@/components/ui/countBadge';
 import numberIncrement from '@/components/shared/numberIncrement';
 
 export default {
   components: {
     BalanceInfo,
     Item,
-    CountBadge,
     numberIncrement,
   },
   data () {

From cc81629f09d0d2bfb453bd105ecf1e2219fd09f2 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Sat, 18 Mar 2023 17:18:41 -0400
Subject: [PATCH 24/87] updates to buyModal styling

---
 .../src/components/shared/numberIncrement.vue |  2 +-
 .../client/src/components/shops/buyModal.vue  | 21 ++++++--
 .../src/components/shops/market/sellModal.vue | 48 ++++++++++++++-----
 website/common/locales/en/npc.json            |  1 +
 4 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index e1fa888927..b2fd5f989c 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -79,7 +79,7 @@
   .icon-positive, .icon-negative {
     width: 10px;
     height: 10px;
-    margin: 3px auto;
+    margin: 4px auto;
 
     & ::v-deep svg path {
       fill: $gray-300;
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index cf5357cda1..15cd56e0d8 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -269,7 +269,7 @@
     }
 
     .modal-dialog {
-      width: 448px;;
+      width: 448px;
       box-sizing: border-box;
     }
 
@@ -301,6 +301,12 @@
       border-top-right-radius: 4px;
       border-bottom-right-radius: 0px;
       border-bottom-left-radius: 0px;
+      cursor: default;
+    }
+
+    .title {
+      color: $gray-10;
+      font-size: 1.25rem;
     }
 
     .item-content {
@@ -386,11 +392,18 @@
       vertical-align: middle;
     }
 
-    span.svg-icon.inline.icon-16 {
+    span.svg-icon.icon-16 {
       height: 16px;
       width: 16px;
-      margin-right: 8px;
-      vertical-align: middle;
+    }
+
+    .close-icon {
+      fill: $gray-200;
+      stroke-width: 0px;
+
+      &:hover {
+        fill: $gray-100;
+      }
     }
 
     .item-cost {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index e3851ac994..3cca50d365 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -31,14 +31,14 @@
           {{ itemContextToSell.itemName }}
         </h4>
         <div v-if="item.key === 'Saddle'">
-          <div class="text">
+          <div class="item-notes">
             {{ item.sellWarningNote() }}
           </div>
           <br>
         </div>
         <div v-else>
           <div>
-            <div class="text">
+            <div class="item-notes">
               {{ item.notes() }}
             </div>
             <div class="item-cost">
@@ -52,7 +52,11 @@
               </span>
             </div>
             <div>
-              <b class="how-many-to-sell">{{ $t('howManyToSell') }}</b>
+              <span
+                class="how-many-to-sell"
+              >
+                {{ $t('howManyToSell') }}
+              </span>
             </div>
             <div>
               <number-increment
@@ -76,7 +80,7 @@
               class="btn btn-primary"
               @click="sellItems()"
             >
-              {{ $t('sell') }}
+              {{ $t('sellItems') }}
             </button>
           </div>
         </div>
@@ -104,13 +108,19 @@
     }
 
     .modal-dialog {
-      width: 448px;;
+      width: 448px;
     }
 
     .content {
       text-align: center;
 
     }
+
+    .title {
+      color: $gray-10;
+      font-size: 1.25rem;
+    }
+
     .inner-content {
       margin: 33px auto auto;
       width: 282px;
@@ -126,8 +136,8 @@
       border-bottom-left-radius: 4px;
       display: block;
       width: 141px;
-      margin-left: 70px;
-      margin-top: -36px;
+      margin-left: 71px;
+      margin-top: -48px;
       position: relative;
       z-index: 1;
     }
@@ -139,11 +149,18 @@
       border-top-right-radius: 4px;
       border-bottom-right-radius: 0px;
       border-bottom-left-radius: 0px;
+      cursor: default;
+      margin-top: 8px;
     }
 
     .item-content {
       transform: scale(1.45, 1.45);
-      top: -16px;
+      top: -16pp;
+    }
+
+    .item-notes {
+     line-height: 1.71;
+     margin-bottom: 16px;
     }
 
     span.svg-icon.inline.icon-32 {
@@ -168,11 +185,18 @@
       vertical-align: middle;
     }
 
-    span.svg-icon.inline.icon-16 {
+    span.svg-icon.icon-16 {
       height: 16px;
       width: 16px;
-      margin-right: 8px;
-      vertical-align: middle;
+    }
+
+    .close {
+      fill: $gray-200;
+      stroke-width: 0px;
+
+      &:hover {
+        fill: $gray-100;
+      }
     }
 
   .item-cost {
@@ -240,6 +264,8 @@
     .how-many-to-sell {
       margin-bottom: 16px;
       display: block;
+      font-size: 0.875rem;
+      font-weight: bold;
     }
   }
 </style>
diff --git a/website/common/locales/en/npc.json b/website/common/locales/en/npc.json
index 0ebe1a9b7f..8688c0f12c 100644
--- a/website/common/locales/en/npc.json
+++ b/website/common/locales/en/npc.json
@@ -31,6 +31,7 @@
   "howManyToSell": "How many would you like to sell?",
   "yourBalance": "Your balance:",
   "sell": "Sell",
+  "sellItems": "Sell Items",
   "buyNow": "Buy Now",
   "sortByNumber": "Number",
   "featuredItems": "Featured Items!",

From 9cc4fc19d3c5a9baf684d643d3d19754b7bf7566 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 21 Mar 2023 11:26:31 -0400
Subject: [PATCH 25/87] more tiny updates

---
 website/client/src/components/shops/buyModal.vue         | 1 +
 website/client/src/components/shops/market/sellModal.vue | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 15cd56e0d8..8f6f6ecf24 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -714,6 +714,7 @@ export default {
   methods: {
     onChange ($event) {
       this.$emit('change', $event);
+      this.selectedAmountToBuy = 1;
     },
 
     buyItem () {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 3cca50d365..581b94f4c6 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -18,13 +18,12 @@
     >
       <div class="inner-content">
         <item
-          class="flat"
+          class="flat bordered-item"
           :item="item"
           :item-content-class="itemContextToSell.itemClass"
           :show-popover="false"
         />
         <span class="owned">
-          <!-- need to calculate totalOwned()  -->
           {{ $t('owned') }}: {{ itemContextToSell.itemCount }}
         </span>
         <h4 class="title">
@@ -155,7 +154,7 @@
 
     .item-content {
       transform: scale(1.45, 1.45);
-      top: -16pp;
+      top: -16px;
     }
 
     .item-notes {

From 5afb46f23712dd0278924503246c5c4f28fb956a Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 21 Mar 2023 16:08:26 -0400
Subject: [PATCH 26/87] fix close icon on buy & sell and keyboard input into
 number increment component is now a number, not a string

---
 website/client/src/components/shops/buyModal.vue      |  6 +++---
 .../client/src/components/shops/market/sellModal.vue  | 11 ++++++-----
 website/client/src/mixins/numberInvalid.js            |  5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 8f6f6ecf24..13ca7f097c 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -17,7 +17,7 @@
     </span>
     <div>
       <span
-        class="svg-icon icon-16 close-icon"
+        class="svg-icon close-icon icon-16 color"
         aria-hidden="true"
         tabindex="0"
         @click="hideDialog()"
@@ -398,11 +398,11 @@
     }
 
     .close-icon {
-      fill: $gray-200;
+      color: $gray-200;
       stroke-width: 0px;
 
       &:hover {
-        fill: $gray-100;
+          color: $gray-100;
       }
     }
 
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 581b94f4c6..a4a319fe0a 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -4,9 +4,9 @@
     :hide-header="true"
     @change="onChange($event)"
   >
-    <div class="close">
+    <div>
       <span
-        class="svg-icon inline icon-16"
+        class="svg-icon close-icon icon-16 color"
         aria-hidden="true"
         @click="hideDialog()"
         v-html="icons.close"
@@ -189,12 +189,13 @@
       width: 16px;
     }
 
-    .close {
-      fill: $gray-200;
+    .close-icon {
+      color: $gray-200;
       stroke-width: 0px;
+      cursor: pointer;
 
       &:hover {
-        fill: $gray-100;
+        color: $gray-100;
       }
     }
 
diff --git a/website/client/src/mixins/numberInvalid.js b/website/client/src/mixins/numberInvalid.js
index 7364fdf8e2..e8b0e14cc8 100644
--- a/website/client/src/mixins/numberInvalid.js
+++ b/website/client/src/mixins/numberInvalid.js
@@ -1,8 +1,9 @@
 export default {
   computed: {
     numberInvalid () {
-      return this.selectedAmountToBuy < 1
-      || !Number.isInteger(this.selectedAmountToBuy);
+      const inputNumber = Number(this.selectedAmountToBuy);
+      return inputNumber < 1
+      || !Number.isInteger(inputNumber);
     },
   },
 };

From 83dcf8d56a46b2bd07493f81022b51fb83107446 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 22 Mar 2023 13:15:11 -0400
Subject: [PATCH 27/87] tightening up spacing on buyModal, fixing footer

---
 .../src/components/shops/balanceInfo.vue      |  7 ++--
 .../client/src/components/shops/buyModal.vue  |  8 ++---
 .../src/components/shops/market/sellModal.vue | 34 ++++++++++++++-----
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/website/client/src/components/shops/balanceInfo.vue b/website/client/src/components/shops/balanceInfo.vue
index aaa4b923d5..f180d7292b 100644
--- a/website/client/src/components/shops/balanceInfo.vue
+++ b/website/client/src/components/shops/balanceInfo.vue
@@ -22,10 +22,11 @@
   @import '~@/assets/scss/colors.scss';
 
 span {
-  font-weight: bold;
-  font-size: 12px;
+  font-size: 0.75rem;
   line-height: 1.33;
-  color: $gray-200;
+  color: $gray-100;
+  margin-bottom: 16px;
+  margin-top: -4px;
 
   display: inline-block;
 }
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 13ca7f097c..7efa2fdf6d 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -221,11 +221,11 @@
     </div>
     <div
       slot="modal-footer"
-      class="d-flex"
+      class="clearfix"
     >
-      <span class="balance mr-auto">{{ $t('yourBalance') }}</span>
+      <span class="balance float-left">{{ $t('yourBalance') }}</span>
       <balanceInfo
-        class="ml-auto balance"
+        class="float-right"
         :currency-needed="getPriceClass()"
         :amount-needed="item.value"
       />
@@ -455,7 +455,7 @@
       }
 
       &.gold {
-        color: $gold-color;
+        color: $yellow-5;
       }
 
       &.hourglasses {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index a4a319fe0a..0b5be8d77d 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -62,12 +62,12 @@
                 @updateQuantity="selectedAmountToSell = $event"
               />
             </div>
-            <div>
+            <div class="total-row">
               <span class="total-text">
                 {{ $t('sendTotal') }}
               </span>
               <span
-                class="svg-icon inline icon-20"
+                class="svg-icon inline icon-24"
                 aria-hidden="true"
                 v-html="icons.gold"
               ></span>
@@ -90,7 +90,9 @@
       class="clearfix"
     >
       <span class="balance float-left">{{ $t('yourBalance') }}</span>
-      <balanceInfo class="float-right" />
+      <balanceInfo
+        class="float-right"
+      />
     </div>
   </b-modal>
 </template>
@@ -112,12 +114,12 @@
 
     .content {
       text-align: center;
-
     }
 
     .title {
       color: $gray-10;
       font-size: 1.25rem;
+      margin-top: 28px;
     }
 
     .inner-content {
@@ -141,6 +143,10 @@
       z-index: 1;
     }
 
+    .item-wrapper {
+      margin-top: -10px;
+    }
+
     .item {
       width: 141px;
       height: 147px;
@@ -201,6 +207,7 @@
 
   .item-cost {
     padding-bottom: 16px;
+    padding-top: 8px;
     }
 
     .cost {
@@ -220,28 +227,36 @@
       }
     }
 
+    .total-row {
+      padding-top: 4px;
+      padding-bottom: 4px;
+    }
+
     .total {
-      font-size: 0.825rem;
+      font-size: 0.875rem;
       line-height: 1.71;
       font-weight: bold;
 
       &.gold {
-        color: $gold-color;
+        color: $yellow-5;
+        margin-left: -4px;
       }
     }
 
     .total-text {
+      color: $gray-50;
       font-size: 0.825rem;
-      line-height: 1.71;
       font-weight: bold;
+      line-height: 1.71;
       height: 24px;
       width: 37px;
       padding-right: 4px;
+      // margin-left: -4px;
     }
 
     button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
+      margin-top: 16px;
+      margin-bottom: 0px;
     }
 
     .balance {
@@ -263,6 +278,7 @@
 
     .how-many-to-sell {
       margin-bottom: 16px;
+      margin-top: 8px;
       display: block;
       font-size: 0.875rem;
       font-weight: bold;

From 09a0d2b3b88a3251b87fd614a6d687d688adcfde Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 23 Mar 2023 16:01:33 -0400
Subject: [PATCH 28/87] change spacing on buyModal

---
 .../client/src/components/shops/buyModal.vue  | 82 +++++++++++--------
 website/common/locales/en/generic.json        |  2 +-
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 7efa2fdf6d..fe78766168 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -66,7 +66,7 @@
           :class="totalOwned"
         >
           <!-- need to calculate totalOwned()  -->
-          {{ $t('owned') }}: {{ totalOwned }}
+          {{ $t('owned') }}: <span class="user-owned">{{ totalOwned }}</span>
         </span>
         <h4 class="title">
           {{ itemText }}
@@ -119,12 +119,13 @@
             :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
           >
             <number-increment
+              class="number-increment"
               @updateQuantity="selectedAmountToBuy = $event"
             />
             <div :class="{'notEnough': notEnoughCurrency}">
               <span class="total-text">{{ $t('sendTotal') }}</span>
               <span
-                class="svg-icon inline icon-20 total"
+                class="svg-icon inline icon-24 total"
                 aria-hidden="true"
                 v-html="icons[getPriceClass()]"
               ></span>
@@ -281,17 +282,22 @@
    .owned {
       font-size: 0.75rem;
       font-weight: bold;
-      line-height: 1.33;
+      height: 32px;
+      line-height: 1.71;
       background-color: $gray-600;
       padding: 8px 41px;
       border-bottom-right-radius: 4px;
       border-bottom-left-radius: 4px;
       display: block;
       width: 141px;
-      margin-left: 154px;
+      margin-left: 153px;
       margin-top: -36px;
       position: relative;
       z-index: 1;
+
+      .user-amount {
+        font-weight: normal !important;
+      }
     }
 
     .item {
@@ -304,24 +310,27 @@
       cursor: default;
     }
 
-    .title {
-      color: $gray-10;
-      font-size: 1.25rem;
-    }
-
     .item-content {
       transform: scale(1.45, 1.45);
-      top: -16px;
+      top: -25.67px;
+      left: 1px;
+    }
+
+    .title {
+      height: 28px;
+      color: $gray-10;
+      font-size: 1.25rem;
+      margin-top: 25px;
+      margin-bottom: 0px;
     }
 
     .item-notes {
+       height: 48px;
+       margin-top: 8px;
        padding-left: 48.5px;
        padding-right: 48.5px;
-    }
-
-    .attributes-group {
-      margin: 24px;
-      border-radius: 4px;
+       line-height: 1.71;
+       font-size: 0.875;
     }
 
     .content {
@@ -334,7 +343,7 @@
     }
 
     .inner-content {
-      margin: 33px auto auto;
+      margin: 32px auto auto;
     }
 
     .btn-primary {
@@ -342,10 +351,15 @@
     }
 
     .purchase-amount {
-      margin-top: 24px;
+      margin-top: 0px;
 
       .how-many-to-buy {
-        margin-bottom: 16px;
+        margin-top: 24px;
+        height: 24px;
+      }
+
+      .number-increment {
+        margin-top: 16px;
       }
 
       .box {
@@ -407,48 +421,50 @@
     }
 
     .item-cost {
-       padding-bottom: 16px;
+       position: relative;
+       margin-top: 20px;
+       left: 2px;
     }
 
     .cost {
       height: 40px;
       font-size: 1.25rem;
       font-weight: bold;
-      line-height: 1.4;
       vertical-align: middle;
+      padding: 8px 20px 8px 20px;
 
       &.gems {
         color: $green-10;
-        border-radius: 20px;
-        padding: 8px 20px 8px 20px;
-        margin-top: 16px;
-        margin-bottom: 16px;
         background-color: rgba(36, 204, 143, 0.15);
+        line-height: 1.4;
+        margin: 0 0 0 4px;
+        border-radius: 20px;
       }
 
       &.gold {
         color: $yellow-5;
+        background-color: rgba(255, 190, 93, 0.15);
         border-radius: 20px;
         padding: 8px 20px 8px 20px;
         margin-top: 16px;
         margin-bottom: 16px;
-        background-color: rgba(255, 190, 93, 0.15);
       }
 
       &.hourglasses {
         color: $hourglass-color;
+        background-color: rgba(41, 149, 205, 0.15);
         border-radius: 20px;
         padding: 8px 20px 8px 20px;
         margin-top: 16px;
         margin-bottom: 16px;
-        background-color: rgba(41, 149, 205, 0.15);
       }
     }
 
     .total {
-      font-size: 0.825rem;
-      line-height: 1.71;
       font-weight: bold;
+      font-size: 0.875rem;
+      height: 24px;
+      line-height: 1.71;
 
       &.gems {
         color: $green-10;
@@ -464,10 +480,10 @@
     }
 
     .total-text {
-      font-size: 0.825rem;
-      line-height: 1.71;
       font-weight: bold;
+      font-size: 0.875rem;
       height: 24px;
+      line-height: 1.71;
       width: 37px;
       padding-right: 4px;
 
@@ -505,9 +521,9 @@
       margin: auto -1rem -1rem;
     }
 
-    .pt-015 {
-      padding-top: 0.15rem;
-    }
+    // .pt-015 {
+    //   padding-top: 0.15rem;
+    // }
   }
 
   .gems-left {
diff --git a/website/common/locales/en/generic.json b/website/common/locales/en/generic.json
index 67b27d5633..4b0a4c26b1 100644
--- a/website/common/locales/en/generic.json
+++ b/website/common/locales/en/generic.json
@@ -208,7 +208,7 @@
   "userSentMessage": "<span class=\"notification-bold\"><%- user %></span> sent you a message",
   "letsgo": "Let's Go!",
   "selected": "Selected",
-  "howManyToBuy": "How many would you like to buy?",
+  "howManyToBuy": "How many would you like to purchase?",
   "contactForm": "Contact the Moderation Team",
   "loadEarlierMessages": "Load Earlier Messages",
   "askQuestion": "Ask a Question",

From 3c7ca560898ad63922995b1b9a7f0d81007683a2 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 27 Mar 2023 15:58:56 -0400
Subject: [PATCH 29/87] buyModal styling

---
 .../src/components/shared/numberIncrement.vue |  2 +-
 .../client/src/components/shops/buyModal.vue  | 86 +++++++++++++------
 2 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/website/client/src/components/shared/numberIncrement.vue b/website/client/src/components/shared/numberIncrement.vue
index b2fd5f989c..34b9b966df 100644
--- a/website/client/src/components/shared/numberIncrement.vue
+++ b/website/client/src/components/shared/numberIncrement.vue
@@ -38,7 +38,7 @@
   @import '~@/assets/scss/colors.scss';
 
   .number-increment {
-    padding-bottom: 12px;
+    padding-bottom: 0px;
     }
 
   .alignment {
diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index fe78766168..6743f16759 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -65,8 +65,7 @@
           class="owned"
           :class="totalOwned"
         >
-          <!-- need to calculate totalOwned()  -->
-          {{ $t('owned') }}: <span class="user-owned">{{ totalOwned }}</span>
+          {{ $t('owned') }}: <span class="user-amount">{{ totalOwned }}</span>
         </span>
         <h4 class="title">
           {{ itemText }}
@@ -122,15 +121,18 @@
               class="number-increment"
               @updateQuantity="selectedAmountToBuy = $event"
             />
-            <div :class="{'notEnough': notEnoughCurrency}">
+            <div
+              :class="{'notEnough': notEnoughCurrency}"
+              class="total"
+            >
               <span class="total-text">{{ $t('sendTotal') }}</span>
               <span
-                class="svg-icon inline icon-24 total"
+                class="svg-icon inline icon-24"
                 aria-hidden="true"
                 v-html="icons[getPriceClass()]"
               ></span>
               <span
-                class="total"
+                class="total-text"
                 :class="getPriceClass()"
               >{{ item.value * selectedAmountToBuy }}</span>
             </div>
@@ -224,9 +226,9 @@
       slot="modal-footer"
       class="clearfix"
     >
-      <span class="balance float-left">{{ $t('yourBalance') }}</span>
+      <span class="user-balance float-left">{{ $t('yourBalance') }}</span>
       <balanceInfo
-        class="float-right"
+        class="currency-totals"
         :currency-needed="getPriceClass()"
         :amount-needed="item.value"
       />
@@ -242,9 +244,9 @@
     @include centeredModal();
 
     .modal-body {
-      // padding-bottom: 0px;
       padding-left: 0px;
       padding-right: 0px;
+      padding-bottom: 0px;
     }
 
     .modal-footer {
@@ -257,7 +259,7 @@
       padding: 16px 24px;
       align-content: center;
 
-      .balance {
+      .user-balance {
         width: 150px;
         height: 16px;
         font-size: 0.75rem;
@@ -266,6 +268,12 @@
         color: $gray-100;
         margin-bottom: 16px;
         margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
       }
     }
 
@@ -274,6 +282,11 @@
       box-sizing: border-box;
     }
 
+    .badge-dialog {
+      left: -8px;
+      top: -8px;
+    }
+
     .avatar {
       cursor: default;
       margin: 0 auto;
@@ -283,14 +296,16 @@
       font-size: 0.75rem;
       font-weight: bold;
       height: 32px;
+      width: 141px;
+      margin-left: 153px;
       line-height: 1.71;
       background-color: $gray-600;
       padding: 8px 41px;
       border-bottom-right-radius: 4px;
       border-bottom-left-radius: 4px;
       display: block;
-      width: 141px;
-      margin-left: 153px;
+      justify-content: center;
+      text-align: center;
       margin-top: -36px;
       position: relative;
       z-index: 1;
@@ -321,7 +336,6 @@
       color: $gray-10;
       font-size: 1.25rem;
       margin-top: 25px;
-      margin-bottom: 0px;
     }
 
     .item-notes {
@@ -423,7 +437,13 @@
     .item-cost {
        position: relative;
        margin-top: 20px;
-       left: 2px;
+    }
+
+    .attributes-group {
+      margin: 24px;
+      border-radius: 4px;
+      line-height: 1.71;
+      font-size: 0.875;
     }
 
     .cost {
@@ -437,34 +457,31 @@
         color: $green-10;
         background-color: rgba(36, 204, 143, 0.15);
         line-height: 1.4;
-        margin: 0 0 0 4px;
+        margin: 0 0 0 -4px;
         border-radius: 20px;
       }
 
       &.gold {
         color: $yellow-5;
         background-color: rgba(255, 190, 93, 0.15);
+        line-height: 1.4;
+        margin: 0 0 0 -4px;
         border-radius: 20px;
-        padding: 8px 20px 8px 20px;
-        margin-top: 16px;
-        margin-bottom: 16px;
       }
 
       &.hourglasses {
         color: $hourglass-color;
         background-color: rgba(41, 149, 205, 0.15);
+        line-height: 1.4;
+        margin: 0 0 0 -4px;
         border-radius: 20px;
-        padding: 8px 20px 8px 20px;
-        margin-top: 16px;
-        margin-bottom: 16px;
       }
     }
 
     .total {
       font-weight: bold;
       font-size: 0.875rem;
-      height: 24px;
-      line-height: 1.71;
+      margin-top:16px;
 
       &.gems {
         color: $green-10;
@@ -479,23 +496,36 @@
       }
     }
 
-    .total-text {
+  .total-text {
+      color: $gray-50;
       font-weight: bold;
       font-size: 0.875rem;
       height: 24px;
       line-height: 1.71;
-      width: 37px;
       padding-right: 4px;
 
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+      }
+  }
+
     button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
-      min-width: 6rem;
+      margin-top: 14px;
+      padding: 4px 16px;
+      height: 32px;
 
       &:focus {
         border: 2px solid black;
       }
-    }
+
 
     .notEnough {
       pointer-events: none;

From 7e9506391fbbe84672bf556b70d275c70dbd30f7 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 27 Mar 2023 16:13:06 -0400
Subject: [PATCH 30/87] more buyModal styling

---
 .../client/src/components/shops/buyModal.vue  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 6743f16759..086b556a2a 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -60,13 +60,14 @@
             :show-popover="false"
           />
         </slot>
-        <span
+        <div
           v-if="!showAvatar && user.items[item.purchaseType]"
           class="owned"
           :class="totalOwned"
         >
-          {{ $t('owned') }}: <span class="user-amount">{{ totalOwned }}</span>
-        </span>
+          <!-- eslint-disable-next-line max-len -->
+          <span class="owned-text">{{ $t('owned') }}: <span class="user-amount">{{ totalOwned }}</span></span>
+        </div>
         <h4 class="title">
           {{ itemText }}
         </h4>
@@ -293,23 +294,25 @@
     }
 
    .owned {
-      font-size: 0.75rem;
-      font-weight: bold;
       height: 32px;
       width: 141px;
+      margin-top: -36px;
       margin-left: 153px;
-      line-height: 1.71;
+      padding-top: 6px;
       background-color: $gray-600;
-      padding: 8px 41px;
       border-bottom-right-radius: 4px;
       border-bottom-left-radius: 4px;
       display: block;
-      justify-content: center;
       text-align: center;
-      margin-top: -36px;
       position: relative;
       z-index: 1;
 
+      .owned-text {
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.71;
+      }
+
       .user-amount {
         font-weight: normal !important;
       }

From c1a0f8a8d162ace682ab7e79abde39f9f6fb4c7b Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 28 Mar 2023 15:07:49 -0400
Subject: [PATCH 31/87] style: buyModal, sellModal, buyQuestModal, questRewards

---
 .../client/src/components/shops/buyModal.vue  | 114 ++++++------
 .../src/components/shops/market/sellModal.vue | 174 +++++++++++-------
 .../components/shops/quests/buyQuestModal.vue | 158 ++++++++++------
 .../components/shops/quests/questRewards.vue  |   3 -
 4 files changed, 267 insertions(+), 182 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 086b556a2a..8b279be27c 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -256,7 +256,7 @@
       border-bottom-right-radius: 8px;
       border-bottom-left-radius: 8px;
       display: block;
-      margin: 24px 0 0;
+      margin: 0;
       padding: 16px 24px;
       align-content: center;
 
@@ -332,6 +332,12 @@
       transform: scale(1.45, 1.45);
       top: -25.67px;
       left: 1px;
+
+      &.shop_gem {
+        transform: scale(1.45, 1.45);
+        top: -2px;
+       left: 0px;
+      }
     }
 
     .title {
@@ -347,7 +353,7 @@
        padding-left: 48.5px;
        padding-right: 48.5px;
        line-height: 1.71;
-       font-size: 0.875;
+       font-size: 0.875rem;
     }
 
     .content {
@@ -443,12 +449,19 @@
     }
 
     .attributes-group {
-      margin: 24px;
+      margin: 32px;
       border-radius: 4px;
       line-height: 1.71;
       font-size: 0.875;
     }
 
+    .attributesGrid {
+      margin-top: 28px;
+      border-radius: 2px;
+      background-color: $gray-500;
+      // margin: 10px 0 24px;
+    }
+
     .cost {
       height: 40px;
       font-size: 1.25rem;
@@ -484,7 +497,7 @@
     .total {
       font-weight: bold;
       font-size: 0.875rem;
-      margin-top:16px;
+      margin-top: 16px;
 
       &.gems {
         color: $green-10;
@@ -528,66 +541,59 @@
       &:focus {
         border: 2px solid black;
       }
-
-
-    .notEnough {
-      pointer-events: none;
-      opacity: 0.55;
     }
 
-    .attributesGrid {
-      margin-top: 8px;
-      border-radius: 2px;
-      background-color: $gray-500;
-      margin: 10px 0 24px;
-    }
+      .notEnough {
+        pointer-events: none;
+        opacity: 0.55;
+      }
+
+
+      .gems-left {
+        margin-top: .5em;
+      }
+
+      .free-rebirth {
+        background-color: $yellow-5;
+        color: $white;
+        height: 2rem;
+        line-height: 16px;
+        margin: auto -1rem -1rem;
+      }
+
+      // .pt-015 {
+      //   padding-top: 0.15rem;
+      // }
+
 
     .gems-left {
-      margin-top: .5em;
+      height: 32px;
+      background-color: $green-100;
+      font-size: 0.75rem;
+      margin-top: 24px;
+      color: $green-1;
+      width: 100%;
     }
 
-    .free-rebirth {
-      background-color: $yellow-5;
+    .out-of-gems-banner {
+      height: 32px;
+      font-size: 0.75rem;
+      margin-top: 24px;
+      background-color: $yellow-100;
+      color: $yellow-1;
+      width: 100%;
+    }
+
+    .limitedTime {
+      height: 32px;
+      width: 446px;
+      font-size: 0.75rem;
+      margin: 24px 0 0 0;
+      background-color: $purple-300;
       color: $white;
-      height: 2rem;
-      line-height: 16px;
-      margin: auto -1rem -1rem;
     }
-
-    // .pt-015 {
-    //   padding-top: 0.15rem;
-    // }
   }
 
-  .gems-left {
-    height: 32px;
-    background-color: $green-100;
-    font-size: 0.75rem;
-    margin-top: 24px;
-    margin-bottom: -40px;
-    color: $green-1;
-    width: 100%;
-  }
-
-  .out-of-gems-banner {
-    height: 32px;
-    font-size: 0.75rem;
-    margin-top: 24px;
-    margin-bottom: -40px;
-    background-color: $yellow-100;
-    color: $yellow-1;
-    width: 100%;
-  }
-
-  .limitedTime {
-    height: 32px;
-    width: 446px;
-    font-size: 0.75rem;
-    margin: 24px 0 -40px 0;
-    background-color: $purple-300;
-    color: $white;
-  }
-}
 </style>
 
 <style lang="scss" scoped>
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 0b5be8d77d..8108bf9c2f 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -71,7 +71,7 @@
                 aria-hidden="true"
                 v-html="icons.gold"
               ></span>
-              <span class="total gold">
+              <span class="total-text gold">
                 {{ item.value * selectedAmountToSell }}
               </span>
             </div>
@@ -89,9 +89,9 @@
       slot="modal-footer"
       class="clearfix"
     >
-      <span class="balance float-left">{{ $t('yourBalance') }}</span>
+      <span class="user-balance float-left">{{ $t('yourBalance') }}</span>
       <balanceInfo
-        class="float-right"
+        class="float-right currency-totals"
       />
     </div>
   </b-modal>
@@ -112,14 +112,42 @@
       width: 448px;
     }
 
-    .content {
-      text-align: center;
+    .modal-body {
+      padding-left: 0px;
+      padding-right: 0px;
+      padding-bottom: 0px;
     }
 
-    .title {
-      color: $gray-10;
-      font-size: 1.25rem;
-      margin-top: 28px;
+    .modal-footer {
+      height: 48px;
+      background-color: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      display: block;
+      margin: 24px 0 0;
+      padding: 16px 24px;
+      align-content: center;
+
+      .user-balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
+      }
+    }
+
+    .content {
+      text-align: center;
     }
 
     .inner-content {
@@ -160,12 +188,22 @@
 
     .item-content {
       transform: scale(1.45, 1.45);
-      top: -16px;
+      top: -25px;
+      left: 1px;
+    }
+
+    .title {
+      color: $gray-10;
+      font-size: 1.25rem;
+      margin-top: 26px;
+      margin-bottom: 0px;
     }
 
     .item-notes {
-     line-height: 1.71;
-     margin-bottom: 16px;
+       height: 48px;
+       margin-top: 12px;
+       line-height: 1.71;
+       font-size: 0.875rem;
     }
 
     span.svg-icon.inline.icon-32 {
@@ -208,82 +246,80 @@
   .item-cost {
     padding-bottom: 16px;
     padding-top: 8px;
+    margin-top: 12px;
     }
 
     .cost {
       height: 40px;
       font-size: 1.25rem;
       font-weight: bold;
-      line-height: 1.4;
       vertical-align: middle;
-
-      &.gold {
-        color: $gold-color;
-        border-radius: 20px;
-        padding: 8px 20px 8px 20px;
-        margin-top: 16px;
-        margin-bottom: 16px;
-        background-color: rgba(255, 190, 93, 0.15);
-      }
-    }
-
-    .total-row {
-      padding-top: 4px;
-      padding-bottom: 4px;
-    }
-
-    .total {
-      font-size: 0.875rem;
-      line-height: 1.71;
-      font-weight: bold;
+      padding: 8px 20px 8px 20px;
 
       &.gold {
         color: $yellow-5;
-        margin-left: -4px;
+        background-color: rgba(255, 190, 93, 0.15);
+        line-height: 1.4;
+        margin: 0 0 0 -4px;
+        border-radius: 20px;
       }
     }
+  }
+
+  .how-many-to-sell {
+    margin-top: 12px;
+    display: block;
+    font-size: 0.875rem;
+    font-weight: bold !important;
+  }
+
+  .number-increment {
+     margin-top: 14px;
+  }
+
+  .total-row {
+    font-weight: bold;
+    font-size: 0.875rem;
+    margin-top: 16px;
+
+    &.gold {
+      color: $yellow-5;
+    }
+  }
 
     .total-text {
       color: $gray-50;
-      font-size: 0.825rem;
       font-weight: bold;
-      line-height: 1.71;
-      height: 24px;
-      width: 37px;
-      padding-right: 4px;
-      // margin-left: -4px;
-    }
-
-    button.btn.btn-primary {
-      margin-top: 16px;
-      margin-bottom: 0px;
-    }
-
-    .balance {
-      width: 74px;
-      height: 16px;
-      font-size: 12px;
-      font-weight: bold;
-      line-height: 1.33;
-      color: $gray-200;
-    }
-
-    .modal-footer {
-      height: 48px;
-      background-color: $gray-700;
-      border-bottom-right-radius: 8px;
-      border-bottom-left-radius: 8px;
-      display: block;
-    }
-
-    .how-many-to-sell {
-      margin-bottom: 16px;
-      margin-top: 8px;
-      display: block;
       font-size: 0.875rem;
-      font-weight: bold;
+      height: 24px;
+      line-height: 1.71;
+      padding-right: 4px;
+
+    &.gold {
+      color: $yellow-5;
     }
   }
+
+  button.btn.btn-primary {
+    margin-top: 14px;
+    padding: 4px 16px;
+    height: 32px;
+
+    &:focus {
+      border: 2px solid black;
+    }
+
+  .balance {
+    width: 74px;
+    height: 16px;
+    font-size: 12px;
+    font-weight: bold;
+    line-height: 1.33;
+    color: $gray-200;
+  }
+
+
+}
 </style>
 
 <script>
diff --git a/website/client/src/components/shops/quests/buyQuestModal.vue b/website/client/src/components/shops/quests/buyQuestModal.vue
index b9e97ecbd7..c422199b2d 100644
--- a/website/client/src/components/shops/quests/buyQuestModal.vue
+++ b/website/client/src/components/shops/quests/buyQuestModal.vue
@@ -63,7 +63,7 @@
               @updateQuantity="selectedAmountToBuy = $event"
             />
           </div>
-          <div>
+          <div class="total-row">
             <span class="total-text">
               {{ $t('sendTotal') }}
             </span>
@@ -129,6 +129,40 @@
       margin-top: 1rem;
     }
 
+    .modal-body {
+      padding-left: 0px;
+      padding-right: 0px;
+      padding-bottom: 0px;
+    }
+
+    .modal-footer {
+      height: 48px;
+      background-color: $gray-700;
+      border-bottom-right-radius: 8px;
+      border-bottom-left-radius: 8px;
+      display: block;
+      margin-top: 24px;
+      padding: 16px 24px;
+      align-content: center;
+
+      .user-balance {
+        width: 150px;
+        height: 16px;
+        font-size: 0.75rem;
+        font-weight: bold;
+        line-height: 1.33;
+        color: $gray-100;
+        margin-bottom: 16px;
+        margin-top: -4px;
+        margin-left: -4px;
+      }
+
+      .currency-totals {
+        margin-right: -8px;
+        float: right;
+      }
+    }
+
     .modal-dialog {
       margin-top: 8%;
       width: 448px !important;
@@ -146,8 +180,13 @@
       margin: 33px auto auto;
     }
 
-    .modal-body {
-      padding-bottom: 0px;
+    .item-notes {
+      height: 48px;
+      margin-top: 8px;
+      padding-left: 48.5px;
+      padding-right: 48.5px;
+      line-height: 1.71;
+      font-size: 0.875rem;
     }
 
     .questInfo {
@@ -170,8 +209,13 @@
     }
 
     button.btn.btn-primary {
-      margin-top: 24px;
-      margin-bottom: 24px;
+      margin-top: 14px;
+      padding: 4px 16px;
+      height: 32px;
+
+      &:focus {
+        border: 2px solid black;
+      }
     }
 
     .balance {
@@ -183,19 +227,6 @@
       color: $gray-200;
     }
 
-    .modal-footer {
-      height: 48px;
-      background-color: $gray-700;
-      border-bottom-right-radius: 8px;
-      border-bottom-left-radius: 8px;
-      display: block;
-      padding: 1rem 1.5rem;
-
-      &> * {
-        margin: 0;
-      }
-    }
-
     .notEnough {
       pointer-events: none;
       opacity: 0.55;
@@ -216,62 +247,76 @@
           height: 40px;
           font-size: 1.25rem;
           font-weight: bold;
-          line-height: 1.4;
           vertical-align: middle;
+          padding: 8px 20px 8px 20px;
 
           &.gems {
-            color: $gems-color;
-            border-radius: 20px;
-            padding: 8px 20px 8px 20px;
-            margin-top: 16px;
-            margin-bottom: 16px;
+            color: $green-10;
             background-color: rgba(36, 204, 143, 0.15);
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
           }
 
           &.gold {
-            color: $gold-color;
-            border-radius: 20px;
-            padding: 8px 20px 8px 20px;
-            margin-top: 16px;
-            margin-bottom: 16px;
+            color: $yellow-5;
             background-color: rgba(255, 190, 93, 0.15);
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
           }
 
           &.hourglasses {
             color: $hourglass-color;
-            border-radius: 20px;
-            padding: 8px 20px 8px 20px;
-            margin-top: 16px;
-            margin-bottom: 16px;
             background-color: rgba(41, 149, 205, 0.15);
-      }
-        }
+            line-height: 1.4;
+            margin: 0 0 0 -4px;
+            border-radius: 20px;
+            }
+          }
 
-      .total {
-        font-size: 0.825rem;
-        line-height: 1.71;
-        font-weight: bold;
+    .total-row {
+      font-weight: bold;
+      font-size: 0.875rem;
+      margin-top: 16px;
+    }
 
-        &.gold {
-          color: $gold-color;
-        }
+    .total {
+      font-weight: bold;
+      font-size: 0.875rem;
+      margin-top: 16px;
 
-        &.gems {
-          color: $gems-color;
-        }
-
-        & .hourglasses {
-          color: $hourglass-color;
-        }
+      &.gems {
+        color: $green-10;
       }
 
-      .total-text {
-        font-size: 0.825rem;
-        line-height: 1.71;
-        font-weight: bold;
-        height: 24px;
-        width: 37px;
-        padding-right: 4px;
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
+      }
+    }
+
+    .total-text {
+      color: $gray-50;
+      font-weight: bold;
+      font-size: 0.875rem;
+      height: 24px;
+      line-height: 1.71;
+      padding-right: 4px;
+
+      &.gems {
+        color: $green-10;
+      }
+
+      &.gold {
+        color: $yellow-5;
+      }
+
+      &.hourglasses {
+        color: $hourglass-color;
       }
     }
 
@@ -308,6 +353,7 @@
       }
     }
   }
+}
 </style>
 
 <!-- <style lang="scss" scoped>
diff --git a/website/client/src/components/shops/quests/questRewards.vue b/website/client/src/components/shops/quests/questRewards.vue
index abba5bcc6a..21568f3bfa 100644
--- a/website/client/src/components/shops/quests/questRewards.vue
+++ b/website/client/src/components/shops/quests/questRewards.vue
@@ -177,9 +177,6 @@ export default {
   @import '~@/assets/scss/colors.scss';
 
   .quest-rewards {
-    margin-left: -1rem;
-    margin-right: -1rem;
-
     background-color: $gray-700;
   }
 

From ac3b953633333af4f1ac81fb5bc18d1dba6a8fac Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 30 Mar 2023 09:07:37 -0400
Subject: [PATCH 32/87] style: vertical spacing tweaks

---
 website/client/src/components/shops/buyModal.vue         | 3 +--
 website/client/src/components/shops/market/sellModal.vue | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 8b279be27c..519657acad 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -256,7 +256,7 @@
       border-bottom-right-radius: 8px;
       border-bottom-left-radius: 8px;
       display: block;
-      margin: 0;
+      margin: 24px 0 0 0;
       padding: 16px 24px;
       align-content: center;
 
@@ -348,7 +348,6 @@
     }
 
     .item-notes {
-       height: 48px;
        margin-top: 8px;
        padding-left: 48.5px;
        padding-right: 48.5px;
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 8108bf9c2f..3b8dfbd051 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -24,7 +24,7 @@
           :show-popover="false"
         />
         <span class="owned">
-          {{ $t('owned') }}: {{ itemContextToSell.itemCount }}
+          {{ $t('owned') }}: <span class="user-amount">{{ itemContextToSell.itemCount }}</span>
         </span>
         <h4 class="title">
           {{ itemContextToSell.itemName }}
@@ -169,6 +169,10 @@
       margin-top: -48px;
       position: relative;
       z-index: 1;
+
+      .user-amount {
+        font-weight: normal !important;
+      }
     }
 
     .item-wrapper {
@@ -200,7 +204,6 @@
     }
 
     .item-notes {
-       height: 48px;
        margin-top: 12px;
        line-height: 1.71;
        font-size: 0.875rem;

From 44265ac616c9992c7c2bdfb7b81d9d14c24b4d68 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 3 Apr 2023 14:56:43 -0400
Subject: [PATCH 33/87] style: more spacing updates

---
 website/client/src/components/shops/buyModal.vue  | 15 +++++++--------
 .../src/components/shops/market/sellModal.vue     |  7 ++++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 519657acad..5a1cffd91c 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -465,7 +465,7 @@
       height: 40px;
       font-size: 1.25rem;
       font-weight: bold;
-      vertical-align: middle;
+      align-items: center;
       padding: 8px 20px 8px 20px;
 
       &.gems {
@@ -517,7 +517,8 @@
       font-size: 0.875rem;
       height: 24px;
       line-height: 1.71;
-      padding-right: 4px;
+      margin-right: 4px;
+      margin-left: -4px;
 
       &.gems {
         color: $green-10;
@@ -533,7 +534,7 @@
   }
 
     button.btn.btn-primary {
-      margin-top: 14px;
+      margin-top: 16px;
       padding: 4px 16px;
       height: 32px;
 
@@ -547,11 +548,6 @@
         opacity: 0.55;
       }
 
-
-      .gems-left {
-        margin-top: .5em;
-      }
-
       .free-rebirth {
         background-color: $yellow-5;
         color: $white;
@@ -572,6 +568,7 @@
       margin-top: 24px;
       color: $green-1;
       width: 100%;
+      margin-bottom: -24px;
     }
 
     .out-of-gems-banner {
@@ -581,6 +578,7 @@
       background-color: $yellow-100;
       color: $yellow-1;
       width: 100%;
+      margin-bottom: -24px;
     }
 
     .limitedTime {
@@ -590,6 +588,7 @@
       margin: 24px 0 0 0;
       background-color: $purple-300;
       color: $white;
+      margin-bottom: -24px;
     }
   }
 
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 3b8dfbd051..0c225dba45 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -160,7 +160,7 @@
       font-weight: bold;
       line-height: 1.33;
       background-color: $gray-600;
-      padding: 8px 41px;
+      padding: 8px 8px;
       border-bottom-right-radius: 4px;
       border-bottom-left-radius: 4px;
       display: block;
@@ -296,7 +296,8 @@
       font-size: 0.875rem;
       height: 24px;
       line-height: 1.71;
-      padding-right: 4px;
+      margin-right: 4px;
+      margin-left: -4px;
 
     &.gold {
       color: $yellow-5;
@@ -304,7 +305,7 @@
   }
 
   button.btn.btn-primary {
-    margin-top: 14px;
+    margin-top: 16px;
     padding: 4px 16px;
     height: 32px;
 

From 0644032a4fcae62a872a917b81155ca0da39dd3c Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 5 Apr 2023 13:50:14 -0400
Subject: [PATCH 34/87] style: more spacing updates

---
 .../client/src/components/shops/buyModal.vue  | 20 +++++++++++--------
 .../src/components/shops/market/sellModal.vue | 13 ++++++------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 5a1cffd91c..7a51af4f5f 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -442,10 +442,6 @@
       }
     }
 
-    .item-cost {
-       position: relative;
-       margin-top: 20px;
-    }
 
     .attributes-group {
       margin: 32px;
@@ -461,35 +457,43 @@
       // margin: 10px 0 24px;
     }
 
+    .item-cost {
+       display: inner-flex;
+       margin-top: 20px;
+    }
+
     .cost {
       height: 40px;
       font-size: 1.25rem;
       font-weight: bold;
       align-items: center;
-      padding: 8px 20px 8px 20px;
+      padding: 6px 20px;
 
       &.gems {
         color: $green-10;
         background-color: rgba(36, 204, 143, 0.15);
         line-height: 1.4;
-        margin: 0 0 0 -4px;
+        margin-left: -4px;
         border-radius: 20px;
+        display: inline-block;
       }
 
       &.gold {
         color: $yellow-5;
         background-color: rgba(255, 190, 93, 0.15);
         line-height: 1.4;
-        margin: 0 0 0 -4px;
+        margin-left: -4px;
         border-radius: 20px;
+        display: inline-block;
       }
 
       &.hourglasses {
         color: $hourglass-color;
         background-color: rgba(41, 149, 205, 0.15);
         line-height: 1.4;
-        margin: 0 0 0 -4px;
+        margin-left: -4px;
         border-radius: 20px;
+        display: inline-block;
       }
     }
 
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 0c225dba45..cdd3f802e8 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -247,9 +247,8 @@
     }
 
   .item-cost {
-    padding-bottom: 16px;
-    padding-top: 8px;
-    margin-top: 12px;
+     display: inner-flex;
+     margin-top: 20px;
     }
 
     .cost {
@@ -257,20 +256,22 @@
       font-size: 1.25rem;
       font-weight: bold;
       vertical-align: middle;
-      padding: 8px 20px 8px 20px;
+      padding: 6px 20px;
+      display: inline-flex;
 
       &.gold {
         color: $yellow-5;
         background-color: rgba(255, 190, 93, 0.15);
         line-height: 1.4;
-        margin: 0 0 0 -4px;
+        margin-left: -4px;
         border-radius: 20px;
+        display: inline-block;
       }
     }
   }
 
   .how-many-to-sell {
-    margin-top: 12px;
+    margin-top: 24px;
     display: block;
     font-size: 0.875rem;
     font-weight: bold !important;

From 54df8397a7dbd6c14fc8ffe74511fb61dca194f1 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 6 Apr 2023 17:00:37 -0400
Subject: [PATCH 35/87] fixes to svg and other spacing

---
 .../client/src/components/shops/buyModal.vue  | 65 +++++++++----------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 7a51af4f5f..190b37e6e0 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -90,6 +90,7 @@
           class="purchase-amount"
           :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
         >
+          <!-- this is where the pretty item cost element lives -->
           <div class="item-cost">
             <span
               class="cost"
@@ -128,7 +129,7 @@
             >
               <span class="total-text">{{ $t('sendTotal') }}</span>
               <span
-                class="svg-icon inline icon-24"
+                class="svg-icon total icon-24"
                 aria-hidden="true"
                 v-html="icons[getPriceClass()]"
               ></span>
@@ -375,10 +376,10 @@
     .purchase-amount {
       margin-top: 0px;
 
-      .how-many-to-buy {
-        margin-top: 24px;
-        height: 24px;
-      }
+      // .how-many-to-buy {
+      //   margin-top: 24px;
+      //   height: 24px;
+      // }
 
       .number-increment {
         margin-top: 16px;
@@ -414,18 +415,22 @@
       margin: 16px 48px 0 48px;
     }
 
+// for cost icon of a single item
     span.svg-icon.inline.icon-24 {
+      display: inline-block;
       height: 24px;
       width: 24px;
-      margin-right: 8px;
-      vertical-align: middle;
-    }
-
-    span.svg-icon.inline.icon-20 {
-      height: 20px;
-      width: 20px;
       margin-right: 4px;
-      vertical-align: middle;
+      padding-top: 4px;
+    }
+// for the total user cost
+    span.svg-icon.total.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-left: 6px;
+      margin-right: 8px;
+      padding-top: 6px;
     }
 
     span.svg-icon.icon-16 {
@@ -442,7 +447,6 @@
       }
     }
 
-
     .attributes-group {
       margin: 32px;
       border-radius: 4px;
@@ -458,49 +462,45 @@
     }
 
     .item-cost {
-       display: inner-flex;
-       margin-top: 20px;
+      display: inline-flex;
+      margin: 16px 0;
+      align-items: center;
+      height: 40px;
     }
 
     .cost {
-      height: 40px;
+      display: inline-block;
+      font-family: sans-serif;
       font-size: 1.25rem;
       font-weight: bold;
-      align-items: center;
       padding: 6px 20px;
+      line-height: 1.4;
+      border-radius: 20px;
 
       &.gems {
         color: $green-10;
         background-color: rgba(36, 204, 143, 0.15);
-        line-height: 1.4;
-        margin-left: -4px;
-        border-radius: 20px;
-        display: inline-block;
+        align-items: center;
       }
 
       &.gold {
         color: $yellow-5;
         background-color: rgba(255, 190, 93, 0.15);
-        line-height: 1.4;
-        margin-left: -4px;
-        border-radius: 20px;
-        display: inline-block;
+        align-items: center;
       }
 
       &.hourglasses {
         color: $hourglass-color;
         background-color: rgba(41, 149, 205, 0.15);
-        line-height: 1.4;
-        margin-left: -4px;
-        border-radius: 20px;
-        display: inline-block;
+        align-items: center;
       }
     }
 
     .total {
       font-weight: bold;
       font-size: 0.875rem;
-      margin-top: 16px;
+      padding-top: 2px;
+      margin-top: 4px;
 
       &.gems {
         color: $green-10;
@@ -519,10 +519,7 @@
       color: $gray-50;
       font-weight: bold;
       font-size: 0.875rem;
-      height: 24px;
       line-height: 1.71;
-      margin-right: 4px;
-      margin-left: -4px;
 
       &.gems {
         color: $green-10;

From 0c85835dc24478fbf0ca12e68ad0c51ff38e6cd6 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Fri, 7 Apr 2023 10:41:43 -0400
Subject: [PATCH 36/87] update to sellModal, buyModal, and
 questDialogContent.vue

---
 .../client/src/components/shops/buyModal.vue  | 10 ++--
 .../src/components/shops/market/sellModal.vue | 56 ++++++++-----------
 .../shops/quests/questDialogContent.vue       | 12 ++--
 3 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index 190b37e6e0..b9e915e292 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -113,7 +113,7 @@
             class="how-many-to-buy"
             :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
           >
-            <strong>{{ $t('howManyToBuy') }}</strong>
+            {{ $t('howManyToBuy') }}
           </div>
           <div
             v-if="showAmountToBuy(item)"
@@ -376,10 +376,9 @@
     .purchase-amount {
       margin-top: 0px;
 
-      // .how-many-to-buy {
-      //   margin-top: 24px;
-      //   height: 24px;
-      // }
+      .how-many-to-buy {
+        font-weight: bold !important;
+      }
 
       .number-increment {
         margin-top: 16px;
@@ -458,7 +457,6 @@
       margin-top: 28px;
       border-radius: 2px;
       background-color: $gray-500;
-      // margin: 10px 0 24px;
     }
 
     .item-cost {
diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index cdd3f802e8..abb6d21350 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -67,7 +67,7 @@
                 {{ $t('sendTotal') }}
               </span>
               <span
-                class="svg-icon inline icon-24"
+                class="svg-icon total icon-24"
                 aria-hidden="true"
                 v-html="icons.gold"
               ></span>
@@ -209,26 +209,22 @@
        font-size: 0.875rem;
     }
 
-    span.svg-icon.inline.icon-32 {
-      height: 32px;
-      width: 32px;
-      margin-left: 24px;
-      margin-right: 8px;
-      vertical-align: middle;
-    }
-
+// for cost icon of a single item
     span.svg-icon.inline.icon-24 {
+      display: inline-block;
       height: 24px;
       width: 24px;
-      margin-right: 8px;
-      vertical-align: middle;
-    }
-
-    span.svg-icon.inline.icon-20 {
-      height: 20px;
-      width: 20px;
       margin-right: 4px;
-      vertical-align: middle;
+      padding-top: 4px;
+    }
+// for the total user cost
+    span.svg-icon.total.icon-24 {
+      display: inline-block;
+      height: 24px;
+      width: 24px;
+      margin-left: 6px;
+      margin-right: 8px;
+      padding-top: 6px;
     }
 
     span.svg-icon.icon-16 {
@@ -247,38 +243,35 @@
     }
 
   .item-cost {
-     display: inner-flex;
-     margin-top: 20px;
+      display: inline-flex;
+      margin: 16px 0;
+      align-items: center;
+      height: 40px;
     }
 
     .cost {
-      height: 40px;
+      display: inline-block;
+      font-family: sans-serif;
       font-size: 1.25rem;
       font-weight: bold;
-      vertical-align: middle;
       padding: 6px 20px;
-      display: inline-flex;
+      line-height: 1.4;
+      border-radius: 20px;
 
       &.gold {
         color: $yellow-5;
         background-color: rgba(255, 190, 93, 0.15);
-        line-height: 1.4;
-        margin-left: -4px;
-        border-radius: 20px;
-        display: inline-block;
+        align-items: center;
       }
     }
   }
 
   .how-many-to-sell {
-    margin-top: 24px;
-    display: block;
-    font-size: 0.875rem;
     font-weight: bold !important;
   }
 
   .number-increment {
-     margin-top: 14px;
+     margin-top: 16px;
   }
 
   .total-row {
@@ -295,10 +288,7 @@
       color: $gray-50;
       font-weight: bold;
       font-size: 0.875rem;
-      height: 24px;
       line-height: 1.71;
-      margin-right: 4px;
-      margin-left: -4px;
 
     &.gold {
       color: $yellow-5;
diff --git a/website/client/src/components/shops/quests/questDialogContent.vue b/website/client/src/components/shops/quests/questDialogContent.vue
index effd689bb9..b5b57e3f6a 100644
--- a/website/client/src/components/shops/quests/questDialogContent.vue
+++ b/website/client/src/components/shops/quests/questDialogContent.vue
@@ -33,17 +33,17 @@
 
   h3 {
     color: $gray-10;
-    margin-bottom: 0.25rem;
+    margin-bottom: 4pxrem;
   }
 
   .quest-image {
     margin: 0 auto;
-    margin-bottom: 1em;
-    margin-top: 1.5em;
+    margin-bottom: 16px;
+    margin-top: 24px;
   }
 
   .text {
-    margin-bottom: 1rem;
+    margin: 16px 16px;
     overflow-y: auto;
     text-overflow: ellipsis;
   }
@@ -54,10 +54,10 @@
     line-height: 1.71;
     color: $gray-50;
     text-align: center;
-    margin-bottom: 0.5rem;
+    margin-bottom: 8px;
 
     ::v-deep .user-label {
-      font-size: 14px;
+      font-size: 0.875rem;
     }
   }
 

From 13e87b1ea05dea99f69482a8539c534e19b5e436 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 2 May 2023 10:11:57 -0500
Subject: [PATCH 37/87] fix(tests): linting

---
 .../api/v3/integration/groups/POST-groups_groupId_join.test.js | 1 -
 test/api/v3/integration/groups/POST-groups_invite.test.js      | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
index bbad7a8401..2c6313154b 100644
--- a/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
+++ b/test/api/v3/integration/groups/POST-groups_groupId_join.test.js
@@ -2,7 +2,6 @@ import { v4 as generateUUID } from 'uuid';
 import {
   generateUser,
   createAndPopulateGroup,
-  checkExistence,
   translate as t,
 } from '../../../../helpers/api-integration/v3';
 
diff --git a/test/api/v3/integration/groups/POST-groups_invite.test.js b/test/api/v3/integration/groups/POST-groups_invite.test.js
index 58a478be00..179e6dfdee 100644
--- a/test/api/v3/integration/groups/POST-groups_invite.test.js
+++ b/test/api/v3/integration/groups/POST-groups_invite.test.js
@@ -626,7 +626,8 @@ describe('Post /groups/:groupId/invite', () => {
   });
 
   describe('party size limits', () => {
-    let party, partyLeader;
+    let party;
+    let partyLeader;
 
     beforeEach(async () => {
       group = await createAndPopulateGroup({

From 06ac6ae80c18ae916244e732d5fe520f040c1989 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 2 May 2023 13:23:31 -0400
Subject: [PATCH 38/87] fix(html): fix behavior of buyModal when gems are being
 purchased; typo correction

---
 website/client/src/components/shops/buyModal.vue | 14 +++-----------
 website/common/locales/en/subscriber.json        |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/website/client/src/components/shops/buyModal.vue b/website/client/src/components/shops/buyModal.vue
index b9e915e292..7120dbabdd 100644
--- a/website/client/src/components/shops/buyModal.vue
+++ b/website/client/src/components/shops/buyModal.vue
@@ -86,9 +86,8 @@
           />
         </slot>
         <div
-          v-if="item.value > 0"
+          v-if="item.value > 0 && !(item.key === 'gem' && gemsLeft < 1)"
           class="purchase-amount"
-          :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
         >
           <!-- this is where the pretty item cost element lives -->
           <div class="item-cost">
@@ -111,13 +110,11 @@
           <div
             v-if="showAmountToBuy(item)"
             class="how-many-to-buy"
-            :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
           >
             {{ $t('howManyToBuy') }}
           </div>
           <div
             v-if="showAmountToBuy(item)"
-            :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
           >
             <number-increment
               class="number-increment"
@@ -141,7 +138,7 @@
           </div>
         </div>
         <div
-          v-if="attemptingToPurchaseMoreGemsThanAreLeft"
+          v-if="item.key === 'gem' && gemsLeft < 1"
           class="no-more-gems"
         >
           {{ $t('notEnoughGemsToBuy') }}
@@ -168,12 +165,7 @@
           {{ $t('viewSubscriptions') }}
         </button>
         <button
-          v-else-if="attemptingToPurchaseMoreGemsThanAreLeft"
-          :hidden="attemptingToPurchaseMoreGemsThanAreLeft"
-        >
-        </button>
-        <button
-          v-else
+          v-else-if="!(item.key === 'gem' && gemsLeft < 1)"
           class="btn btn-primary"
           :disabled="item.key === 'gem' && gemsLeft === 0 ||
             attemptingToPurchaseMoreGemsThanAreLeft || numberInvalid || item.locked ||
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index ddd0b689c6..04ff983479 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -195,7 +195,7 @@
     "subscriptionBenefit6": "Earn Mystic Hourglasses to purchase items in the Time Traveler’s Shop!",
     "purchaseAll": "Purchase Set",
     "gemsRemaining": "remaining",
-    "notEnoughGemsToBuy": "No more Gems available for purchase this month. More will become avalable within the first 3 days of each month.",
+    "notEnoughGemsToBuy": "No more Gems available for purchase this month. More will become available within the first 3 days of each month.",
     "subscribersReceiveBenefits": "Subscribers receive these useful benefits!",
     "monthlyMysteryItems": "Monthly Mystery Items",
     "doubleDropCap": "Double the Drops",

From c77dd5f200d51d5e9059c74f1f8da53ff2bd9a66 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 2 May 2023 16:52:50 -0500
Subject: [PATCH 39/87] fix(analytics): move lfp events out of mounted

---
 .../client/src/components/groups/createPartyModal.vue  |  6 ------
 .../client/src/components/groups/lookingForParty.vue   |  8 --------
 website/client/src/components/header/index.vue         |  7 +++++++
 website/client/src/router/index.js                     | 10 ++++++++++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/website/client/src/components/groups/createPartyModal.vue b/website/client/src/components/groups/createPartyModal.vue
index 17c0184331..c1021b47e7 100644
--- a/website/client/src/components/groups/createPartyModal.vue
+++ b/website/client/src/components/groups/createPartyModal.vue
@@ -264,12 +264,6 @@ export default {
   },
   mounted () {
     this.seeking = Boolean(this.user.party.seeking);
-    Analytics.track({
-      eventName: 'Start a Party button',
-      eventAction: 'Start a Party button',
-      eventCategory: 'behavior',
-      hitType: 'event',
-    }, { trackOnClient: true });
   },
   methods: {
     async createParty () {
diff --git a/website/client/src/components/groups/lookingForParty.vue b/website/client/src/components/groups/lookingForParty.vue
index eda06f5759..fd22c7656a 100644
--- a/website/client/src/components/groups/lookingForParty.vue
+++ b/website/client/src/components/groups/lookingForParty.vue
@@ -243,8 +243,6 @@ import rogueIcon from '@/assets/svg/rogue.svg';
 import healerIcon from '@/assets/svg/healer.svg';
 import wizardIcon from '@/assets/svg/wizard.svg';
 
-import * as Analytics from '@/libs/analytics';
-
 export default {
   components: {
     Avatar,
@@ -287,12 +285,6 @@ export default {
         section: this.$t('lookingForPartyTitle'),
       });
       this.seekers = await this.$store.dispatch('party:lookingForParty');
-      await Analytics.track({
-        hitType: 'event',
-        eventName: 'View Find Members',
-        eventAction: 'View Find Members',
-        eventCategory: 'behavior',
-      }, { trackOnClient: true });
       this.canLoadMore = this.seekers.length === 30;
       this.loading = false;
     }
diff --git a/website/client/src/components/header/index.vue b/website/client/src/components/header/index.vue
index ebf2362e32..69da953390 100644
--- a/website/client/src/components/header/index.vue
+++ b/website/client/src/components/header/index.vue
@@ -122,6 +122,7 @@
 
 <script>
 import orderBy from 'lodash/orderBy';
+import * as Analytics from '@/libs/analytics';
 import { mapGetters, mapActions } from '@/libs/store';
 import MemberDetails from '../memberDetails';
 import createPartyModal from '../groups/createPartyModal';
@@ -237,6 +238,12 @@ export default {
         this.$router.push('/looking-for-party');
       } else {
         this.$root.$emit('bv::show::modal', 'create-party-modal');
+        Analytics.track({
+          eventName: 'Start a Party button',
+          eventAction: 'Start a Party button',
+          eventCategory: 'behavior',
+          hitType: 'event',
+        }, { trackOnClient: true });
       }
     },
     loadMembers (payload = null) {
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index 4a478e1047..57828f998d 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
+import * as Analytics from '@/libs/analytics';
 import getStore from '@/store';
 import handleRedirect from './handleRedirect';
 
@@ -439,6 +440,15 @@ router.beforeEach(async (to, from, next) => {
     router.app.$root.$emit('update-party');
   }
 
+  if (to.name === 'lookingForParty') {
+    Analytics.track({
+      hitType: 'event',
+      eventName: 'View Find Members',
+      eventAction: 'View Find Members',
+      eventCategory: 'behavior',
+    }, { trackOnClient: true });
+  }
+
   // Redirect old guild urls
   if (to.hash.indexOf('#/options/groups/guilds/') !== -1) {
     const splits = to.hash.split('/');

From 9f9e6c495020916c33ec46a5a055988565e39c19 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 3 May 2023 16:00:58 -0500
Subject: [PATCH 40/87] feat(links): skip modal for user's own tasks

---
 website/client/src/components/tasks/task.vue | 1 +
 website/client/src/mixins/externalLinks.js   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index 520c51568c..ece67dd374 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -6,6 +6,7 @@
         'groupTask': task.group.id,
         'task-not-editable': !teamManagerAccess,
         'task-not-scoreable': showTaskLockIcon,
+        'link-exempt': !isChallengeTask && !isGroupTask,
       }, `type_${task.type}`
       ]"
       @click="castEnd($event, task)"
diff --git a/website/client/src/mixins/externalLinks.js b/website/client/src/mixins/externalLinks.js
index 2a2c0a7b8c..40895cd4f9 100644
--- a/website/client/src/mixins/externalLinks.js
+++ b/website/client/src/mixins/externalLinks.js
@@ -16,6 +16,7 @@ export default {
         }
 
         if ((link.classList.value.indexOf('external-link') === -1)
+          && (!link.offsetParent || link.offsetParent.classList.value.indexOf('link-exempt') === -1)
           && domainIndex !== 1
           && !some(TRUSTED_DOMAINS.split(','), domain => link.href.indexOf(domain) === domainIndex)) {
           link.classList.add('external-link');

From 8183699cb73a2ea13cdb8eaea6b2cee50d1d069e Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 3 May 2023 16:04:22 -0500
Subject: [PATCH 41/87] feat(analytics): differentiate party CTA scenarios

---
 website/client/src/components/header/index.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/website/client/src/components/header/index.vue b/website/client/src/components/header/index.vue
index 69da953390..cf159c0a2f 100644
--- a/website/client/src/components/header/index.vue
+++ b/website/client/src/components/header/index.vue
@@ -235,15 +235,23 @@ export default {
     },
     createOrInviteParty () {
       if (this.user.party._id) {
-        this.$router.push('/looking-for-party');
-      } else {
-        this.$root.$emit('bv::show::modal', 'create-party-modal');
         Analytics.track({
-          eventName: 'Start a Party button',
-          eventAction: 'Start a Party button',
+          eventName: 'Header Party CTA',
+          eventAction: 'Header Party CTA',
           eventCategory: 'behavior',
           hitType: 'event',
+          state: 'Find Party Members',
         }, { trackOnClient: true });
+        this.$router.push('/looking-for-party');
+      } else {
+        Analytics.track({
+          eventName: 'Header Party CTA',
+          eventAction: 'Header Party CTA',
+          eventCategory: 'behavior',
+          hitType: 'event',
+          state: 'Get Started',
+        }, { trackOnClient: true });
+        this.$root.$emit('bv::show::modal', 'create-party-modal');
       }
     },
     loadMembers (payload = null) {

From d92a03048b1611b0792c81a0c1bfa1376e6822d2 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 4 May 2023 14:20:49 -0500
Subject: [PATCH 42/87] fix(analytics): tweak CTA event

---
 website/client/src/components/header/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/website/client/src/components/header/index.vue b/website/client/src/components/header/index.vue
index cf159c0a2f..7d95387d9c 100644
--- a/website/client/src/components/header/index.vue
+++ b/website/client/src/components/header/index.vue
@@ -233,24 +233,24 @@ export default {
         this.expandedMember = memberId;
       }
     },
-    createOrInviteParty () {
+    async createOrInviteParty () {
       if (this.user.party._id) {
-        Analytics.track({
+        await Analytics.track({
           eventName: 'Header Party CTA',
           eventAction: 'Header Party CTA',
           eventCategory: 'behavior',
           hitType: 'event',
           state: 'Find Party Members',
-        }, { trackOnClient: true });
+        });
         this.$router.push('/looking-for-party');
       } else {
-        Analytics.track({
+        await Analytics.track({
           eventName: 'Header Party CTA',
           eventAction: 'Header Party CTA',
           eventCategory: 'behavior',
           hitType: 'event',
           state: 'Get Started',
-        }, { trackOnClient: true });
+        });
         this.$root.$emit('bv::show::modal', 'create-party-modal');
       }
     },

From 7e210c56b08e4f59bbb7d8247f3261a0fa93fdd2 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 4 May 2023 16:29:54 -0400
Subject: [PATCH 43/87] fix(to do dates): change formatDueDate () to show exact
 due dates

---
 website/client/src/components/tasks/task.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index 520c51568c..ed3bfa32ea 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -1128,10 +1128,7 @@ export default {
       return this.calculateTimeTillDue().asDays() <= 0;
     },
     formatDueDate () {
-      const timeTillDue = this.calculateTimeTillDue();
-      const dueIn = timeTillDue.asDays() === 0 ? this.$t('today') : timeTillDue.humanize(true);
-
-      return this.task.date && this.$t('dueIn', { dueIn });
+      return moment(this.task.date).format(this.user.preferences.dateFormat.toUpperCase());
     },
     edit (e, task) {
       if (this.isRunningYesterdailies) return;

From 0e0cd99ded24d03d4d2873ddc3cac3ece4dcdaef Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 4 May 2023 16:35:27 -0400
Subject: [PATCH 44/87] fix(to do dates): Add the word "Due" to the HTML

---
 website/client/src/components/tasks/task.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index ed3bfa32ea..86dc665e1e 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -243,7 +243,7 @@
                 class="svg-icon calendar"
                 v-html="icons.calendar"
               ></div>
-              <span>{{ formatDueDate() }}</span>
+              <span>Due {{ formatDueDate() }}</span>
             </div>
             <div class="icons-right d-flex justify-content-end">
               <div

From 479cfb76efd6d7139d5bdab821329afbbcfc9c89 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 4 May 2023 16:40:11 -0400
Subject: [PATCH 45/87] fix(to do dates): locate a string for "Due"

---
 website/client/src/components/tasks/task.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index 86dc665e1e..1efd89a5fb 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -243,7 +243,7 @@
                 class="svg-icon calendar"
                 v-html="icons.calendar"
               ></div>
-              <span>Due {{ formatDueDate() }}</span>
+              <span>{{ $t('due') }} {{ formatDueDate() }}</span>
             </div>
             <div class="icons-right d-flex justify-content-end">
               <div

From 49f45d27e3dfa09ef3072c91456f204b1a320dc9 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 4 May 2023 16:08:53 -0500
Subject: [PATCH 46/87] 4.269.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5ff806b39..e2a8d71df9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.269.0",
+  "version": "4.269.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0c999dbdfa..5a6afb27c3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.269.0",
+  "version": "4.269.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.20.12",

From b026daec90d59fec07268bfb2ad77d7501d7a9ff Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 5 May 2023 16:27:19 -0500
Subject: [PATCH 47/87] fix(rya): wait for DOM finished before update

---
 website/client/src/components/tasks/yesterdailyModal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/client/src/components/tasks/yesterdailyModal.vue b/website/client/src/components/tasks/yesterdailyModal.vue
index a0f5ae4ab2..a43230a177 100644
--- a/website/client/src/components/tasks/yesterdailyModal.vue
+++ b/website/client/src/components/tasks/yesterdailyModal.vue
@@ -110,7 +110,9 @@ export default {
     };
   },
   updated () {
-    this.handleExternalLinks();
+    window.setTimeout(() => {
+      this.handleExternalLinks();
+    }, 500);
   },
   computed: {
     ...mapState({ user: 'user.data' }),

From 453bf3a961ad19ec80a211ad2211e2b297a028f8 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Tue, 9 May 2023 11:26:00 -0400
Subject: [PATCH 48/87] feat(content): add May Backgrounds and Enchanted
 Armoire items (#14628)

---
 habitica-images                               |  2 +-
 .../assets/css/sprites/spritesmith-main.css   | 75 +++++++++++++++++++
 website/common/locales/en/backgrounds.json    |  8 ++
 website/common/locales/en/gear.json           | 10 ++-
 .../script/content/appearance/backgrounds.js  |  5 ++
 .../script/content/gear/sets/armoire.js       | 16 ++++
 6 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/habitica-images b/habitica-images
index 311cb01059..dac6a71d1f 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 311cb010591a9de368a1ab5db7506d2d3efbb10b
+Subproject commit dac6a71d1fa2500bf8f3ec18bf917cbe91d82d64
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 8a5531760f..b3c0c74c78 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -820,6 +820,11 @@
   width: 141px;
   height: 147px;
 }
+.background_cretaceous_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_cretaceous_forest.png');
+  width: 141px;
+  height: 147px;
+}
 .background_crosscountry_ski_trail {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_crosscountry_ski_trail.png');
   width: 141px;
@@ -1054,6 +1059,11 @@
   width: 141px;
   height: 147px;
 }
+.background_flying_over_hedge_maze {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_hedge_maze.png');
+  width: 141px;
+  height: 147px;
+}
 .background_flying_over_icy_steppes {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_flying_over_icy_steppes.png');
   width: 141px;
@@ -1329,6 +1339,11 @@
   width: 141px;
   height: 147px;
 }
+.background_in_a_painting {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_a_painting.png');
+  width: 141px;
+  height: 147px;
+}
 .background_in_an_ancient_tomb {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/background_in_an_ancient_tomb.png');
   width: 141px;
@@ -2506,6 +2521,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_cretaceous_forest {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_cretaceous_forest.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_crosscountry_ski_trail {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_crosscountry_ski_trail.png');
   width: 68px;
@@ -2740,6 +2760,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_flying_over_hedge_maze {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_hedge_maze.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_flying_over_icy_steppes {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_flying_over_icy_steppes.png');
   width: 68px;
@@ -3015,6 +3040,11 @@
   width: 68px;
   height: 68px;
 }
+.icon_background_in_a_painting {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_a_painting.png');
+  width: 68px;
+  height: 68px;
+}
 .icon_background_in_an_ancient_tomb {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/icon_background_in_an_ancient_tomb.png');
   width: 68px;
@@ -18640,6 +18670,11 @@
   width: 90px;
   height: 90px;
 }
+.broad_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_paintersApron.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_armoire_pirateOutfit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_armoire_pirateOutfit.png');
   width: 114px;
@@ -19130,6 +19165,11 @@
   width: 90px;
   height: 90px;
 }
+.head_armoire_paintersBeret {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paintersBeret.png');
+  width: 114px;
+  height: 90px;
+}
 .head_armoire_paperBag {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/head_armoire_paperBag.png');
   width: 90px;
@@ -19470,6 +19510,11 @@
   width: 90px;
   height: 90px;
 }
+.shield_armoire_paintersPalette {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_paintersPalette.png');
+  width: 114px;
+  height: 90px;
+}
 .shield_armoire_perchingFalcon {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shield_armoire_perchingFalcon.png');
   width: 90px;
@@ -19910,6 +19955,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_paintersApron.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_armor_armoire_pirateOutfit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_armoire_pirateOutfit.png');
   width: 68px;
@@ -20415,6 +20465,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_head_armoire_paintersBeret {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paintersBeret.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_head_armoire_paperBag {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_head_armoire_paperBag.png');
   width: 68px;
@@ -20755,6 +20810,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_shield_armoire_paintersPalette {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_paintersPalette.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_shield_armoire_perchingFalcon {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_shield_armoire_perchingFalcon.png');
   width: 68px;
@@ -21200,6 +21260,11 @@
   width: 68px;
   height: 68px;
 }
+.shop_weapon_armoire_paintbrush {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paintbrush.png');
+  width: 68px;
+  height: 68px;
+}
 .shop_weapon_armoire_paperCutter {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_armoire_paperCutter.png');
   width: 68px;
@@ -21655,6 +21720,11 @@
   width: 90px;
   height: 90px;
 }
+.slim_armor_armoire_paintersApron {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_paintersApron.png');
+  width: 114px;
+  height: 90px;
+}
 .slim_armor_armoire_pirateOutfit {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_armoire_pirateOutfit.png');
   width: 114px;
@@ -22110,6 +22180,11 @@
   width: 114px;
   height: 90px;
 }
+.weapon_armoire_paintbrush {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paintbrush.png');
+  width: 114px;
+  height: 90px;
+}
 .weapon_armoire_paperCutter {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_armoire_paperCutter.png');
   width: 114px;
diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json
index e0f8c4b297..f04714906f 100644
--- a/website/common/locales/en/backgrounds.json
+++ b/website/common/locales/en/backgrounds.json
@@ -875,6 +875,14 @@
   "backgroundUnderWisteriaText": "Under Wisteria",
   "backgroundUnderWisteriaNotes": "Relax Under Wisteria.",
 
+  "backgrounds052023": "SET 108: Released May 2023",
+  "backgroundInAPaintingText": "In A Painting",
+  "backgroundInAPaintingNotes": "Enjoy creative pursuits Inside a Painting.",
+  "backgroundFlyingOverHedgeMazeText": "Flying Over Hedge Maze",
+  "backgroundFlyingOverHedgeMazeNotes": "Marvel while Flying over a Hedge Maze.",
+  "backgroundCretaceousForestText": "Cretaceous Forest",
+  "backgroundCretaceousForestNotes": "Take in the ancient greenery of a Cretaceous Forest.",
+
   "timeTravelBackgrounds": "Steampunk Backgrounds",
   "backgroundAirshipText": "Airship",
   "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index dde67616f2..28a2b6a77f 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -694,6 +694,8 @@
   "weaponArmoireMagicSpatulaNotes": "Watch your food fly and flip in the air. You get good luck for the day if it magically flips over three times and then lands back on your spatula. Increases Perception by <%= per %>. Enchanted Armoire: Cooking Implements Set (Item 1 of 2).",
   "weaponArmoireFinelyCutGemText": "Finely Cut Gem",
   "weaponArmoireFinelyCutGemNotes": "What a find! This stunning, precision-cut gem will be the prize of your collection. And it might contain some special magic, just waiting for you to tap into it. Increases Constitution by <%= con %>. Enchanted Armoire: Jeweler Set (Item 4 of 4).",
+  "weaponArmoirePaintbrushText": "Paintbrush",
+  "weaponArmoirePaintbrushNotes": "A jolt of pure inspiration rushes through you when you pick up this brush, allowing you to paint anything you can imagine. Increases Intelligence by <%= int %>. Enchanted Armoire: Painter Set (Item 3 of 4).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -1453,6 +1455,8 @@
   "armorArmoireTeaGownNotes": "You’re resilient, creative, brilliant, and so fashionable! Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Tea Party Set (Item 1 of 3).",  
   "armorArmoireBasketballUniformText": "Basketball Uniform",
   "armorArmoireBasketballUniformNotes": "Wondering what’s printed on the back of this uniform? It’s your lucky number, of course! Increases Perception by <% per %>. Enchanted Armoire: Old Timey Basketball Set (Item 1 of 2).",
+  "armorArmoirePaintersApronText": "Painter's Apron",
+  "armorArmoirePaintersApronNotes": "This apron can protect your clothes from paint and your creative projects from harsh critiques. Increases Constitution by <%= con %>. Enchanted Armoire: Painter Set (Item 1 of 4).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -2232,6 +2236,8 @@
   "headArmoireTeaHatNotes": "This elegant hat is both fancy and functional. Increases Perception by <%= per %>. Enchanted Armoire: Tea Party Set (Item 2 of 3).",
   "headArmoireBeaniePropellerHatText": "Beanie Propeller Hat",
   "headArmoireBeaniePropellerHatNotes": "This isn’t the time to keep your feet on the ground! Spin this little propeller and rise as high as your ambitions will take you. Increases all stats by <%= attrs %>. Enchanted Armoire: Independent Item.",
+  "headArmoirePaintersBeretText": "Painter's Beret",
+  "headArmoirePaintersBeretNotes": "See the world with a more artistic eye when you wear this jaunty beret. Increases Perception by <%= per %>. Enchanted Armoire: Painter Set (Item 2 of 4).",  
 
   "offhand": "off-hand item",
   "offHandCapitalized": "Off-Hand Item",
@@ -2646,7 +2652,9 @@
   "shieldArmoireTeaKettleText": "Tea Kettle",
   "shieldArmoireTeaKettleNotes": "All your favorite, flavorful teas can be brewed in this kettle. Are you in the mood for black tea, green tea, oolong, or perhaps an herbal infusion? Increases Constitution by <%= con %>. Enchanted Armoire: Tea Party Set (Item 3 of 3).",
   "shieldArmoireBasketballText": "Basketball",
-  "shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",  
+  "shieldArmoireBasketballNotes": "Swish! Whenever you shoot this magic basketball, there will be nothing but net. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Old Timey Basketball Set (Item 2 of 2).",
+  "shieldArmoirePaintersPaletteText": "Painter's Palette",
+  "shieldArmoirePaintersPaletteNotes": "Paints in all colors of the rainbow are at your disposal. Is it magic that makes them so vivid when you use them, or is it your talent? Increases Strength by <%= str %>. Enchanted Armoire: Painter Set (Item 4 of 4).",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",
diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js
index 1a1ddd05a8..c5f769e073 100644
--- a/website/common/script/content/appearance/backgrounds.js
+++ b/website/common/script/content/appearance/backgrounds.js
@@ -555,6 +555,11 @@ const backgrounds = {
     springtime_shower: { },
     under_wisteria: { },
   },
+  backgrounds052023: {
+    in_a_painting: { },
+    flying_over_hedge_maze: { },
+    cretaceous_forest: { },
+  },
   eventBackgrounds: {
     birthday_bash: {
       price: 0,
diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
index df27c95e7a..4efc4ce3e2 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -420,6 +420,10 @@ const armor = {
     per: 10,
     set: 'oldTimeyBasketball',
   },
+  paintersApron: {
+    con: 10,
+    set: 'painters',
+  },
 };
 
 const body = {
@@ -851,6 +855,10 @@ const head = {
     str: 3,
     int: 3,
   },
+  paintersBeret: {
+    per: 9,
+    set: 'painters',
+  },
 };
 
 const shield = {
@@ -1161,6 +1169,10 @@ const shield = {
     str: 5,
     set: 'oldTimeyBasketball',
   },
+  paintersPalette: {
+    str: 7,
+    set: 'painters',
+  },
 };
 
 const headAccessory = {
@@ -1603,6 +1615,10 @@ const weapon = {
     con: 10,
     set: 'jewelers',
   },
+  paintbrush: {
+    int: 8,
+    set: 'painters',
+  },
 };
 
 forEach({

From f3348aca4ccc12f77e9aacdfde578e1377819ed0 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 9 May 2023 10:29:19 -0500
Subject: [PATCH 49/87] 4.270.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2a8d71df9..b8951a0708 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.269.1",
+  "version": "4.270.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5a6afb27c3..bb3c7519d8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.269.1",
+  "version": "4.270.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.20.12",

From 0a23dd53117552085acd535a9331445814956485 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Thu, 11 May 2023 16:25:11 -0400
Subject: [PATCH 50/87] attempt to fix sellModal

---
 .../client/src/components/shops/market/sellModal.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index abb6d21350..3e59b027e3 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -77,6 +77,7 @@
             </div>
             <button
               class="btn btn-primary"
+              :disabled="maxOwned > selectedAmountToSell"
               @click="sellItems()"
             >
               {{ $t('sellItems') }}
@@ -375,6 +376,17 @@ export default {
         this.selectedAmountToSell = 0;
       }
     },
+    // preventSellingMoreThanOwned ($event) {
+    //   const { value } = $event.target;
+    //   if (Number(value) < this.selectedAmountToSell) {
+    //     this.selectedAmountToSell = this.itemCount;
+    //     console.log('yay');
+    //   }
+    // },
+    maxOwned () {
+      const maxOwned = this.itemContextToSell.itemCount;
+      return maxOwned;
+    },
     sellItems () {
       if (!Number.isInteger(Number(this.selectedAmountToSell))) {
         this.selectedAmountToSell = 0;

From 63ea21c46dfa892f4389640a2e4840a6b4a92ce0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:03:29 -0500
Subject: [PATCH 51/87] build(deps): bump stripe from 11.10.0 to 12.5.0
 (#14646)

Bumps [stripe](https://github.com/stripe/stripe-node) from 11.10.0 to 12.5.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v11.10.0...v12.5.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 252ccb4a1d..4fdc7b69ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14370,18 +14370,18 @@
       }
     },
     "stripe": {
-      "version": "11.10.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-11.10.0.tgz",
-      "integrity": "sha512-uzQuj/Vangpp8fgkaEr6oRNfPToo5xamOhc7wxFGF/RUm7VKm/IGzoZ0cCtnGHCs5/O1AjMQsTZApgUARRVHOw==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.5.0.tgz",
+      "integrity": "sha512-eDBh4bv+Uo+GdhjnQ246lM5KaOReoBzxFltgW0HJqco/QEAgSYxZPOpFbd5+gJnZlRqHSB5B+Zqw273SlbdPag==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "version": "6.11.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
+          "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
           "requires": {
             "side-channel": "^1.0.4"
           }
diff --git a/package.json b/package.json
index 0d5b651d85..3548d77291 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
-    "stripe": "^11.10.0",
+    "stripe": "^12.5.0",
     "superagent": "^8.0.6",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",

From 8cd6e1654f371b703e387fe49903696193bcc4df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:05:20 -0500
Subject: [PATCH 52/87] build(deps): bump @babel/core from 7.21.4 to 7.21.8
 (#14630)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.21.4 to 7.21.8.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.8/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 170 ++++++++++++++++++++++++++++------------------
 package.json      |   2 +-
 2 files changed, 104 insertions(+), 68 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4fdc7b69ad..d2b2307a0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,20 +27,20 @@
       "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="
     },
     "@babel/core": {
-      "version": "7.21.4",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.4.tgz",
-      "integrity": "sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==",
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz",
+      "integrity": "sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==",
       "requires": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.21.4",
-        "@babel/generator": "^7.21.4",
-        "@babel/helper-compilation-targets": "^7.21.4",
-        "@babel/helper-module-transforms": "^7.21.2",
-        "@babel/helpers": "^7.21.0",
-        "@babel/parser": "^7.21.4",
+        "@babel/generator": "^7.21.5",
+        "@babel/helper-compilation-targets": "^7.21.5",
+        "@babel/helper-module-transforms": "^7.21.5",
+        "@babel/helpers": "^7.21.5",
+        "@babel/parser": "^7.21.8",
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.4",
-        "@babel/types": "^7.21.4",
+        "@babel/traverse": "^7.21.5",
+        "@babel/types": "^7.21.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -57,33 +57,38 @@
           }
         },
         "@babel/compat-data": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.4.tgz",
-          "integrity": "sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g=="
+          "version": "7.21.7",
+          "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz",
+          "integrity": "sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="
         },
         "@babel/generator": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz",
-          "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
+          "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
           "requires": {
-            "@babel/types": "^7.21.4",
+            "@babel/types": "^7.21.5",
             "@jridgewell/gen-mapping": "^0.3.2",
             "@jridgewell/trace-mapping": "^0.3.17",
             "jsesc": "^2.5.1"
           }
         },
         "@babel/helper-compilation-targets": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz",
-          "integrity": "sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz",
+          "integrity": "sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==",
           "requires": {
-            "@babel/compat-data": "^7.21.4",
+            "@babel/compat-data": "^7.21.5",
             "@babel/helper-validator-option": "^7.21.0",
             "browserslist": "^4.21.3",
             "lru-cache": "^5.1.1",
             "semver": "^6.3.0"
           }
         },
+        "@babel/helper-environment-visitor": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
+          "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
+        },
         "@babel/helper-function-name": {
           "version": "7.21.0",
           "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
@@ -93,21 +98,42 @@
             "@babel/types": "^7.21.0"
           }
         },
-        "@babel/helper-module-transforms": {
-          "version": "7.21.2",
-          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
-          "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+        "@babel/helper-module-imports": {
+          "version": "7.21.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
+          "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
           "requires": {
-            "@babel/helper-environment-visitor": "^7.18.9",
-            "@babel/helper-module-imports": "^7.18.6",
-            "@babel/helper-simple-access": "^7.20.2",
+            "@babel/types": "^7.21.4"
+          }
+        },
+        "@babel/helper-module-transforms": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz",
+          "integrity": "sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==",
+          "requires": {
+            "@babel/helper-environment-visitor": "^7.21.5",
+            "@babel/helper-module-imports": "^7.21.4",
+            "@babel/helper-simple-access": "^7.21.5",
             "@babel/helper-split-export-declaration": "^7.18.6",
             "@babel/helper-validator-identifier": "^7.19.1",
             "@babel/template": "^7.20.7",
-            "@babel/traverse": "^7.21.2",
-            "@babel/types": "^7.21.2"
+            "@babel/traverse": "^7.21.5",
+            "@babel/types": "^7.21.5"
           }
         },
+        "@babel/helper-simple-access": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz",
+          "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==",
+          "requires": {
+            "@babel/types": "^7.21.5"
+          }
+        },
+        "@babel/helper-string-parser": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+          "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
+        },
         "@babel/helper-validator-identifier": {
           "version": "7.19.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
@@ -129,9 +155,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz",
-          "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="
+          "version": "7.21.8",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+          "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
         },
         "@babel/template": {
           "version": "7.20.7",
@@ -144,28 +170,28 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz",
-          "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
+          "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
           "requires": {
             "@babel/code-frame": "^7.21.4",
-            "@babel/generator": "^7.21.4",
-            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/generator": "^7.21.5",
+            "@babel/helper-environment-visitor": "^7.21.5",
             "@babel/helper-function-name": "^7.21.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.21.4",
-            "@babel/types": "^7.21.4",
+            "@babel/parser": "^7.21.5",
+            "@babel/types": "^7.21.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz",
-          "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -660,13 +686,13 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.21.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
-      "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz",
+      "integrity": "sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==",
       "requires": {
         "@babel/template": "^7.20.7",
-        "@babel/traverse": "^7.21.0",
-        "@babel/types": "^7.21.0"
+        "@babel/traverse": "^7.21.5",
+        "@babel/types": "^7.21.5"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -678,16 +704,21 @@
           }
         },
         "@babel/generator": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz",
-          "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
+          "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
           "requires": {
-            "@babel/types": "^7.21.4",
+            "@babel/types": "^7.21.5",
             "@jridgewell/gen-mapping": "^0.3.2",
             "@jridgewell/trace-mapping": "^0.3.17",
             "jsesc": "^2.5.1"
           }
         },
+        "@babel/helper-environment-visitor": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
+          "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
+        },
         "@babel/helper-function-name": {
           "version": "7.21.0",
           "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
@@ -697,6 +728,11 @@
             "@babel/types": "^7.21.0"
           }
         },
+        "@babel/helper-string-parser": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+          "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
+        },
         "@babel/helper-validator-identifier": {
           "version": "7.19.1",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
@@ -713,9 +749,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz",
-          "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="
+          "version": "7.21.8",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+          "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
         },
         "@babel/template": {
           "version": "7.20.7",
@@ -728,28 +764,28 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.4.tgz",
-          "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
+          "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
           "requires": {
             "@babel/code-frame": "^7.21.4",
-            "@babel/generator": "^7.21.4",
-            "@babel/helper-environment-visitor": "^7.18.9",
+            "@babel/generator": "^7.21.5",
+            "@babel/helper-environment-visitor": "^7.21.5",
             "@babel/helper-function-name": "^7.21.0",
             "@babel/helper-hoist-variables": "^7.18.6",
             "@babel/helper-split-export-declaration": "^7.18.6",
-            "@babel/parser": "^7.21.4",
-            "@babel/types": "^7.21.4",
+            "@babel/parser": "^7.21.5",
+            "@babel/types": "^7.21.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0"
           }
         },
         "@babel/types": {
-          "version": "7.21.4",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz",
-          "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
diff --git a/package.json b/package.json
index 3548d77291..dd5b465498 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "version": "4.270.0",
   "main": "./website/server/index.js",
   "dependencies": {
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.21.8",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
     "@google-cloud/trace-agent": "^7.1.2",

From 102e6a64adf05743d0c9423d8b37b5bafcd2b60f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:07:36 -0500
Subject: [PATCH 53/87] chore(deps): bump sass from 1.34.0 to 1.62.1 in
 /website/client (#14614)

Bumps [sass](https://github.com/sass/dart-sass) from 1.34.0 to 1.62.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.34.0...1.62.1)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 41 +++++++++++++++++++-------------
 website/client/package.json      |  2 +-
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 8cc351c0ea..6cc83a45b8 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -21071,6 +21071,11 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
     },
+    "immutable": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz",
+      "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="
+    },
     "import-cwd": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -27361,17 +27366,19 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "sass": {
-      "version": "1.34.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
-      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
+      "version": "1.62.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz",
+      "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==",
       "requires": {
-        "chokidar": ">=3.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
       },
       "dependencies": {
         "anymatch": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+          "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
           "requires": {
             "normalize-path": "^3.0.0",
             "picomatch": "^2.0.4"
@@ -27391,18 +27398,18 @@
           }
         },
         "chokidar": {
-          "version": "3.5.1",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-          "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
           "requires": {
-            "anymatch": "~3.1.1",
+            "anymatch": "~3.1.2",
             "braces": "~3.0.2",
-            "fsevents": "~2.3.1",
-            "glob-parent": "~5.1.0",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
             "is-binary-path": "~2.1.0",
             "is-glob": "~4.0.1",
             "normalize-path": "~3.0.0",
-            "readdirp": "~3.5.0"
+            "readdirp": "~3.6.0"
           }
         },
         "fill-range": {
@@ -27441,9 +27448,9 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
         },
         "readdirp": {
-          "version": "3.5.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-          "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
           "requires": {
             "picomatch": "^2.2.1"
           }
diff --git a/website/client/package.json b/website/client/package.json
index 3ce61b456f..88ebe03f64 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -46,7 +46,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
-    "sass": "^1.34.0",
+    "sass": "^1.62.1",
     "sass-loader": "^8.0.2",
     "smartbanner.js": "^1.19.2",
     "stopword": "^2.0.8",

From 021180fa59eb219b347cf82c3abfbdae0666f1ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:13:53 -0500
Subject: [PATCH 54/87] build(deps): bump uuid from 8.3.2 to 9.0.0 in
 /website/client (#14227)

Bumps [uuid](https://github.com/uuidjs/uuid) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v8.3.2...v9.0.0)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 6cc83a45b8..ddec215c08 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -30272,9 +30272,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+      "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="
     },
     "uuid-browser": {
       "version": "3.1.0",
diff --git a/website/client/package.json b/website/client/package.json
index 88ebe03f64..271d52a16a 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -54,7 +54,7 @@
     "svg-url-loader": "^7.1.1",
     "svgo": "^1.3.2",
     "svgo-loader": "^2.2.1",
-    "uuid": "^8.3.2",
+    "uuid": "^9.0.0",
     "validator": "^13.9.0",
     "vue": "^2.7.10",
     "vue-cli-plugin-storybook": "2.1.0",

From fc16ffbf2d17225d985be746617bb6acf25ec2f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:22:06 -0500
Subject: [PATCH 55/87] build(deps): bump dompurify from 2.4.3 to 3.0.3 in
 /website/client (#14639)

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.3 to 3.0.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.4.3...3.0.3)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index ddec215c08..83c7b29bec 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -17952,9 +17952,9 @@
       }
     },
     "dompurify": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.4.3.tgz",
-      "integrity": "sha512-q6QaLcakcRjebxjg8/+NP+h0rPfatOgOzc46Fst9VAA3jF2ApfKBNKMzdP4DYTqtUMXSCd5pRS/8Po/OmoCHZQ=="
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.0.3.tgz",
+      "integrity": "sha512-axQ9zieHLnAnHh0sfAamKYiqXMJAVwu+LM/alQ7WDagoWessyWvMSFyW65CqF3owufNu8HBcE4cM2Vflu7YWcQ=="
     },
     "domutils": {
       "version": "1.7.0",
diff --git a/website/client/package.json b/website/client/package.json
index 271d52a16a..3b87d1b8ba 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -33,7 +33,7 @@
     "bootstrap-vue": "^2.23.1",
     "chai": "^4.3.7",
     "core-js": "^3.30.1",
-    "dompurify": "^2.4.3",
+    "dompurify": "^3.0.3",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",
     "eslint-plugin-mocha": "^5.3.0",

From 1498eba8d427cea736b87e3ce5ff2659e7afd4d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:28:41 -0500
Subject: [PATCH 56/87] build(deps): bump @babel/preset-env from 7.20.2 to
 7.21.5 (#14616)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.20.2 to 7.21.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.5/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 783 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 388 insertions(+), 397 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2b2307a0a..8c5cd267c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,9 +22,9 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz",
-      "integrity": "sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="
+      "version": "7.21.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz",
+      "integrity": "sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA=="
     },
     "@babel/core": {
       "version": "7.21.8",
@@ -246,12 +246,13 @@
       }
     },
     "@babel/generator": {
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.4.tgz",
-      "integrity": "sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz",
+      "integrity": "sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==",
       "requires": {
-        "@babel/types": "^7.20.2",
+        "@babel/types": "^7.21.5",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "dependencies": {
@@ -261,23 +262,32 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
         },
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+        "@jridgewell/resolve-uri": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+          "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
+        },
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
+        },
+        "@jridgewell/trace-mapping": {
+          "version": "0.3.18",
+          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+          "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
           "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
+            "@jridgewell/resolve-uri": "3.1.0",
+            "@jridgewell/sourcemap-codec": "1.4.14"
           }
         }
       }
@@ -291,12 +301,11 @@
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz",
+      "integrity": "sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.21.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -305,11 +314,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -317,69 +326,75 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.20.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz",
-      "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz",
+      "integrity": "sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==",
       "requires": {
-        "@babel/compat-data": "^7.20.0",
-        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/compat-data": "^7.21.5",
+        "@babel/helper-validator-option": "^7.21.0",
         "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
       },
       "dependencies": {
-        "browserslist": {
-          "version": "4.21.4",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
           "requires": {
-            "caniuse-lite": "^1.0.30001400",
-            "electron-to-chromium": "^1.4.251",
-            "node-releases": "^2.0.6",
-            "update-browserslist-db": "^1.0.9"
+            "yallist": "^3.0.2"
           }
         },
-        "caniuse-lite": {
-          "version": "1.0.30001431",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
-          "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ=="
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
         },
-        "update-browserslist-db": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-          "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-          "requires": {
-            "escalade": "^3.1.1",
-            "picocolors": "^1.0.0"
-          }
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz",
-      "integrity": "sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==",
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz",
+      "integrity": "sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-function-name": "^7.21.0",
+        "@babel/helper-member-expression-to-functions": "^7.21.5",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-replace-supers": "^7.21.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz",
+      "integrity": "sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+        }
       }
     },
     "@babel/helper-define-polyfill-provider": {
@@ -403,25 +418,17 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz",
+      "integrity": "sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ=="
     },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+      "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/types": "^7.21.0"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -430,11 +437,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -450,11 +457,11 @@
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz",
+      "integrity": "sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==",
       "requires": {
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.21.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -463,11 +470,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -475,26 +482,11 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.21.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
+      "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
       "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz",
-      "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==",
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.20.2",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.20.1",
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.21.4"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -503,11 +495,43 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
+            "@babel/helper-validator-identifier": "^7.19.1",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
+      }
+    },
+    "@babel/helper-module-transforms": {
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz",
+      "integrity": "sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==",
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-module-imports": "^7.21.4",
+        "@babel/helper-simple-access": "^7.21.5",
+        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.5",
+        "@babel/types": "^7.21.5"
+      },
+      "dependencies": {
+        "@babel/helper-validator-identifier": {
+          "version": "7.19.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+          "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
+        },
+        "@babel/types": {
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
+          "requires": {
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -523,9 +547,9 @@
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
-      "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ=="
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz",
+      "integrity": "sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg=="
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.18.9",
@@ -544,11 +568,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -556,15 +580,16 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz",
+      "integrity": "sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==",
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
+        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-member-expression-to-functions": "^7.21.5",
         "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.20.7",
+        "@babel/traverse": "^7.21.5",
+        "@babel/types": "^7.21.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -573,11 +598,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -585,11 +610,11 @@
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
-      "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz",
+      "integrity": "sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==",
       "requires": {
-        "@babel/types": "^7.20.2"
+        "@babel/types": "^7.21.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -598,11 +623,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -623,11 +648,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -643,9 +668,9 @@
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz",
+      "integrity": "sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w=="
     },
     "@babel/helper-validator-identifier": {
       "version": "7.10.4",
@@ -653,19 +678,19 @@
       "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+      "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz",
+      "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==",
       "requires": {
         "@babel/helper-function-name": "^7.19.0",
         "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/traverse": "^7.20.5",
+        "@babel/types": "^7.20.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -674,11 +699,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -844,9 +869,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.20.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.3.tgz",
-      "integrity": "sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg=="
+      "version": "7.21.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz",
+      "integrity": "sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.18.6",
@@ -857,22 +882,22 @@
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz",
+      "integrity": "sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.20.7"
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz",
-      "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
       "requires": {
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-remap-async-to-generator": "^7.18.9",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
@@ -887,12 +912,12 @@
       }
     },
     "@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz",
+      "integrity": "sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
@@ -924,11 +949,11 @@
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz",
+      "integrity": "sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
@@ -951,15 +976,15 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz",
-      "integrity": "sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
       "requires": {
-        "@babel/compat-data": "^7.20.1",
-        "@babel/helper-compilation-targets": "^7.20.0",
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-compilation-targets": "^7.20.7",
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.1"
+        "@babel/plugin-transform-parameters": "^7.20.7"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
@@ -972,12 +997,12 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
+      "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
@@ -991,13 +1016,13 @@
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz",
+      "integrity": "sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.21.0",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
@@ -1058,6 +1083,14 @@
         "@babel/helper-plugin-utils": "^7.19.0"
       }
     },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      }
+    },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
@@ -1131,21 +1164,21 @@
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz",
+      "integrity": "sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz",
+      "integrity": "sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==",
       "requires": {
         "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-remap-async-to-generator": "^7.18.9"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -1157,41 +1190,42 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz",
-      "integrity": "sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz",
+      "integrity": "sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz",
-      "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==",
+      "version": "7.21.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz",
+      "integrity": "sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==",
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.20.0",
+        "@babel/helper-compilation-targets": "^7.20.7",
         "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-optimise-call-expression": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-replace-supers": "^7.19.1",
+        "@babel/helper-replace-supers": "^7.20.7",
         "@babel/helper-split-export-declaration": "^7.18.6",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz",
+      "integrity": "sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/template": "^7.20.7"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz",
-      "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz",
+      "integrity": "sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.20.2"
       }
@@ -1223,11 +1257,11 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz",
+      "integrity": "sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
     "@babel/plugin-transform-function-name": {
@@ -1257,32 +1291,32 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "version": "7.20.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz",
+      "integrity": "sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-module-transforms": "^7.20.11",
+        "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz",
+      "integrity": "sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==",
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
+        "@babel/helper-module-transforms": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-simple-access": "^7.21.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "version": "7.20.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz",
+      "integrity": "sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==",
       "requires": {
         "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
+        "@babel/helper-module-transforms": "^7.20.11",
+        "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/helper-validator-identifier": "^7.19.1"
       },
       "dependencies": {
@@ -1303,12 +1337,12 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz",
+      "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==",
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.20.5",
+        "@babel/helper-plugin-utils": "^7.20.2"
       }
     },
     "@babel/plugin-transform-new-target": {
@@ -1329,9 +1363,9 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.20.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz",
-      "integrity": "sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==",
+      "version": "7.21.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz",
+      "integrity": "sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==",
       "requires": {
         "@babel/helper-plugin-utils": "^7.20.2"
       }
@@ -1345,12 +1379,12 @@
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz",
+      "integrity": "sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "regenerator-transform": "^0.15.1"
       }
     },
     "@babel/plugin-transform-reserved-words": {
@@ -1370,12 +1404,12 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz",
+      "integrity": "sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
@@ -1403,11 +1437,11 @@
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz",
+      "integrity": "sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==",
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.21.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
@@ -1420,30 +1454,30 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.20.2",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz",
-      "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.21.5.tgz",
+      "integrity": "sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==",
       "requires": {
-        "@babel/compat-data": "^7.20.1",
-        "@babel/helper-compilation-targets": "^7.20.0",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/compat-data": "^7.21.5",
+        "@babel/helper-compilation-targets": "^7.21.5",
+        "@babel/helper-plugin-utils": "^7.21.5",
+        "@babel/helper-validator-option": "^7.21.0",
         "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.20.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.20.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.20.7",
         "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
+        "@babel/plugin-proposal-class-static-block": "^7.21.0",
         "@babel/plugin-proposal-dynamic-import": "^7.18.6",
         "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
         "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.20.7",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
         "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
+        "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
         "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+        "@babel/plugin-proposal-optional-chaining": "^7.21.0",
         "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1451,6 +1485,7 @@
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-import-assertions": "^7.20.0",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1460,40 +1495,40 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.21.5",
+        "@babel/plugin-transform-async-to-generator": "^7.20.7",
         "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.20.2",
-        "@babel/plugin-transform-classes": "^7.20.2",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.20.2",
+        "@babel/plugin-transform-block-scoping": "^7.21.0",
+        "@babel/plugin-transform-classes": "^7.21.0",
+        "@babel/plugin-transform-computed-properties": "^7.21.5",
+        "@babel/plugin-transform-destructuring": "^7.21.3",
         "@babel/plugin-transform-dotall-regex": "^7.18.6",
         "@babel/plugin-transform-duplicate-keys": "^7.18.9",
         "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
+        "@babel/plugin-transform-for-of": "^7.21.5",
         "@babel/plugin-transform-function-name": "^7.18.9",
         "@babel/plugin-transform-literals": "^7.18.9",
         "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.19.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.19.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.6",
+        "@babel/plugin-transform-modules-amd": "^7.20.11",
+        "@babel/plugin-transform-modules-commonjs": "^7.21.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.20.11",
         "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.20.5",
         "@babel/plugin-transform-new-target": "^7.18.6",
         "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.20.1",
+        "@babel/plugin-transform-parameters": "^7.21.3",
         "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
+        "@babel/plugin-transform-regenerator": "^7.21.5",
         "@babel/plugin-transform-reserved-words": "^7.18.6",
         "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
+        "@babel/plugin-transform-spread": "^7.20.7",
         "@babel/plugin-transform-sticky-regex": "^7.18.6",
         "@babel/plugin-transform-template-literals": "^7.18.9",
         "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+        "@babel/plugin-transform-unicode-escapes": "^7.21.5",
         "@babel/plugin-transform-unicode-regex": "^7.18.6",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.20.2",
+        "@babel/types": "^7.21.5",
         "babel-plugin-polyfill-corejs2": "^0.3.3",
         "babel-plugin-polyfill-corejs3": "^0.6.0",
         "babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -1507,11 +1542,11 @@
           "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -1547,35 +1582,33 @@
         "source-map-support": "^0.5.16"
       }
     },
+    "@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
+    },
     "@babel/runtime": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz",
-      "integrity": "sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz",
+      "integrity": "sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==",
       "requires": {
-        "regenerator-runtime": "^0.13.10"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.13.10",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-          "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="
-        }
+        "regenerator-runtime": "^0.13.11"
       }
     },
     "@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz",
+      "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
       "requires": {
         "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "version": "7.21.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+          "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
           "requires": {
             "@babel/highlight": "^7.18.6"
           }
@@ -1596,11 +1629,11 @@
           }
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -1618,26 +1651,26 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.20.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.1.tgz",
-      "integrity": "sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==",
+      "version": "7.21.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz",
+      "integrity": "sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==",
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.20.1",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
+        "@babel/code-frame": "^7.21.4",
+        "@babel/generator": "^7.21.5",
+        "@babel/helper-environment-visitor": "^7.21.5",
+        "@babel/helper-function-name": "^7.21.0",
         "@babel/helper-hoist-variables": "^7.18.6",
         "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.20.1",
-        "@babel/types": "^7.20.0",
+        "@babel/parser": "^7.21.5",
+        "@babel/types": "^7.21.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.18.6",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
-          "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+          "version": "7.21.4",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz",
+          "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
           "requires": {
             "@babel/highlight": "^7.18.6"
           }
@@ -1658,11 +1691,11 @@
           }
         },
         "@babel/types": {
-          "version": "7.20.2",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.2.tgz",
-          "integrity": "sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==",
+          "version": "7.21.5",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz",
+          "integrity": "sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==",
           "requires": {
-            "@babel/helper-string-parser": "^7.19.4",
+            "@babel/helper-string-parser": "^7.21.5",
             "@babel/helper-validator-identifier": "^7.19.1",
             "to-fast-properties": "^2.0.0"
           }
@@ -5178,38 +5211,11 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "version": "3.30.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz",
+      "integrity": "sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==",
       "requires": {
-        "browserslist": "^4.21.4"
-      },
-      "dependencies": {
-        "browserslist": {
-          "version": "4.21.4",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
-          "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
-          "requires": {
-            "caniuse-lite": "^1.0.30001400",
-            "electron-to-chromium": "^1.4.251",
-            "node-releases": "^2.0.6",
-            "update-browserslist-db": "^1.0.9"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001431",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001431.tgz",
-          "integrity": "sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ=="
-        },
-        "update-browserslist-db": {
-          "version": "1.0.10",
-          "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-          "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
-          "requires": {
-            "escalade": "^3.1.1",
-            "picocolors": "^1.0.0"
-          }
-        }
+        "browserslist": "^4.21.5"
       }
     },
     "core-util-is": {
@@ -5968,11 +5974,6 @@
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
-    "electron-to-chromium": {
-      "version": "1.4.254",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.254.tgz",
-      "integrity": "sha512-Sh/7YsHqQYkA6ZHuHMy24e6TE4eX6KZVsZb9E/DvU1nQRIrH4BflO/4k+83tfdYvDl+MObvlqHPRICzEdC9c6Q=="
-    },
     "emitter-listener": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/emitter-listener/-/emitter-listener-1.1.2.tgz",
@@ -11627,11 +11628,6 @@
         "request": ">=2.76.0 <3.0.0"
       }
     },
-    "node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
-    },
     "nodemon": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.4.tgz",
@@ -12930,9 +12926,9 @@
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
@@ -12957,16 +12953,16 @@
       "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
     },
     "regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "requires": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       }
     },
     "registry-auth-token": {
@@ -12985,11 +12981,6 @@
         "rc": "^1.2.8"
       }
     },
-    "regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
-    },
     "regjsparser": {
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
@@ -15306,9 +15297,9 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA=="
     },
     "unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
diff --git a/package.json b/package.json
index dd5b465498..849a9b5e1c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",
-    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-env": "^7.21.5",
     "@babel/register": "^7.21.0",
     "@google-cloud/trace-agent": "^7.1.2",
     "@parse/node-apn": "^5.1.3",

From f1b98a530d7c7806d65006b2877eafebae2393f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:29:16 -0500
Subject: [PATCH 57/87] build(deps): bump jsonwebtoken from 8.5.1 to 9.0.0
 (#14418)

Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 74 +++++++++++++++++++++++++++++++++++------------
 package.json      |  2 +-
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8c5cd267c6..fda5f6dff6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2213,6 +2213,42 @@
             "ms": "2.1.2"
           }
         },
+        "jsonwebtoken": {
+          "version": "8.5.1",
+          "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
+          "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+          "requires": {
+            "jws": "^3.2.2",
+            "lodash.includes": "^4.3.0",
+            "lodash.isboolean": "^3.0.3",
+            "lodash.isinteger": "^4.0.4",
+            "lodash.isnumber": "^3.0.3",
+            "lodash.isplainobject": "^4.0.6",
+            "lodash.isstring": "^4.0.1",
+            "lodash.once": "^4.0.0",
+            "ms": "^2.1.1",
+            "semver": "^5.6.0"
+          }
+        },
+        "jwa": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+          "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+          "requires": {
+            "buffer-equal-constant-time": "1.0.1",
+            "ecdsa-sig-formatter": "1.0.11",
+            "safe-buffer": "^5.0.1"
+          }
+        },
+        "jws": {
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+          "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+          "requires": {
+            "jwa": "^1.4.1",
+            "safe-buffer": "^5.0.1"
+          }
+        },
         "node-forge": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz",
@@ -9930,20 +9966,14 @@
       }
     },
     "jsonwebtoken": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz",
-      "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==",
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+      "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
       "requires": {
         "jws": "^3.2.2",
-        "lodash.includes": "^4.3.0",
-        "lodash.isboolean": "^3.0.3",
-        "lodash.isinteger": "^4.0.4",
-        "lodash.isnumber": "^3.0.3",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.isstring": "^4.0.1",
-        "lodash.once": "^4.0.0",
+        "lodash": "^4.17.21",
         "ms": "^2.1.1",
-        "semver": "^5.6.0"
+        "semver": "^7.3.8"
       },
       "dependencies": {
         "jwa": {
@@ -9964,6 +9994,14 @@
             "jwa": "^1.4.1",
             "safe-buffer": "^5.0.1"
           }
+        },
+        "semver": {
+          "version": "7.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
+          "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -10267,37 +10305,37 @@
     "lodash.includes": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz",
-      "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8="
+      "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="
     },
     "lodash.isboolean": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz",
-      "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY="
+      "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="
     },
     "lodash.isinteger": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz",
-      "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M="
+      "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="
     },
     "lodash.isnumber": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz",
-      "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w="
+      "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="
     },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
+      "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="
     },
     "lodash.isstring": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE="
+      "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="
     },
     "lodash.once": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-      "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w="
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="
     },
     "log-driver": {
       "version": "1.2.7",
diff --git a/package.json b/package.json
index 849a9b5e1c..09b841b3a4 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "image-size": "^1.0.2",
     "in-app-purchase": "^1.11.3",
     "js2xmlparser": "^5.0.0",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
     "jwks-rsa": "^2.1.5",
     "lodash": "^4.17.21",
     "merge-stream": "^2.0.0",

From 0f4816c67405d7353fcfbf146acadb990c161b0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:35:06 -0500
Subject: [PATCH 58/87] build(deps): bump intro.js from 6.0.0 to 7.0.1 in
 /website/client (#14558)

Bumps [intro.js](https://github.com/usablica/intro.js) from 6.0.0 to 7.0.1.
- [Release notes](https://github.com/usablica/intro.js/releases)
- [Changelog](https://github.com/usablica/intro.js/blob/master/tsconfig.release.json)
- [Commits](https://github.com/usablica/intro.js/compare/v6.0.0...v7.0.1)

---
updated-dependencies:
- dependency-name: intro.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 83c7b29bec..01fd239091 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -21436,9 +21436,9 @@
       "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
     },
     "intro.js": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-6.0.0.tgz",
-      "integrity": "sha512-ZUiR6BoLSvPSlLG0boewnWVgji1fE1gBvP/pyw5pgCKXEDQz1mMeUxarggClPNs71UTq364LwSk9zxz17A9gaQ=="
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-7.0.1.tgz",
+      "integrity": "sha512-1oqz6aOz9cGQ3CrtVYhCSo6AkjnXUn302kcIWLaZ3TI4kKssRXDwDSz4VRoGcfC1jN+WfaSJXRBrITz+QVEBzg=="
     },
     "invariant": {
       "version": "2.2.4",
diff --git a/website/client/package.json b/website/client/package.json
index 3b87d1b8ba..20f9baf526 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -41,7 +41,7 @@
     "habitica-markdown": "^3.0.0",
     "hellojs": "^1.20.0",
     "inspectpack": "^4.7.1",
-    "intro.js": "^6.0.0",
+    "intro.js": "^7.0.1",
     "jquery": "^3.6.4",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",

From 308d55777050e96a3b15ae64958d4d7e8357de4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:35:21 -0500
Subject: [PATCH 59/87] build(deps): bump superagent from 8.0.6 to 8.0.9
 (#14473)

Bumps [superagent](https://github.com/ladjs/superagent) from 8.0.6 to 8.0.9.
- [Release notes](https://github.com/ladjs/superagent/releases)
- [Changelog](https://github.com/ladjs/superagent/blob/master/HISTORY.md)
- [Commits](https://github.com/ladjs/superagent/compare/v8.0.6...v8.0.9)

---
updated-dependencies:
- dependency-name: superagent
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 34 +++++++++++++++++-----------------
 package.json      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fda5f6dff6..a011974d3b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7486,9 +7486,9 @@
       }
     },
     "formidable": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.1.tgz",
-      "integrity": "sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
+      "integrity": "sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==",
       "requires": {
         "dezalgo": "^1.0.4",
         "hexoid": "^1.0.0",
@@ -7497,9 +7497,9 @@
       },
       "dependencies": {
         "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "version": "6.11.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
+          "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
           "requires": {
             "side-channel": "^1.0.4"
           }
@@ -14464,16 +14464,16 @@
       "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ=="
     },
     "superagent": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.6.tgz",
-      "integrity": "sha512-HqSe6DSIh3hEn6cJvCkaM1BLi466f1LHi4yubR0tpewlMpk4RUFFy35bKz8SsPBwYfIIJy5eclp+3tCYAuX0bw==",
+      "version": "8.0.9",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.9.tgz",
+      "integrity": "sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==",
       "requires": {
         "component-emitter": "^1.3.0",
-        "cookiejar": "^2.1.3",
+        "cookiejar": "^2.1.4",
         "debug": "^4.3.4",
         "fast-safe-stringify": "^2.1.1",
         "form-data": "^4.0.0",
-        "formidable": "^2.1.1",
+        "formidable": "^2.1.2",
         "methods": "^1.1.2",
         "mime": "2.6.0",
         "qs": "^6.11.0",
@@ -14489,17 +14489,17 @@
           }
         },
         "qs": {
-          "version": "6.11.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-          "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+          "version": "6.11.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
+          "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
           "requires": {
             "side-channel": "^1.0.4"
           }
         },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz",
+          "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==",
           "requires": {
             "lru-cache": "^6.0.0"
           }
diff --git a/package.json b/package.json
index 09b841b3a4..de96374d52 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
     "stripe": "^12.5.0",
-    "superagent": "^8.0.6",
+    "superagent": "^8.0.9",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
     "uuid": "^9.0.0",

From 48bb3e28869df503e977ecb935ba0e5148a33a80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 May 2023 16:47:35 -0500
Subject: [PATCH 60/87] build(deps): bump core-js from 3.30.1 to 3.30.2 in
 /website/client (#14635)

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.30.1 to 3.30.2.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.30.2/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index 01fd239091..abcb170353 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -16901,9 +16901,9 @@
       }
     },
     "core-js": {
-      "version": "3.30.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.1.tgz",
-      "integrity": "sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ=="
+      "version": "3.30.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz",
+      "integrity": "sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg=="
     },
     "core-js-compat": {
       "version": "3.11.0",
diff --git a/website/client/package.json b/website/client/package.json
index 20f9baf526..92198c28ba 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -32,7 +32,7 @@
     "bootstrap": "^4.6.0",
     "bootstrap-vue": "^2.23.1",
     "chai": "^4.3.7",
-    "core-js": "^3.30.1",
+    "core-js": "^3.30.2",
     "dompurify": "^3.0.3",
     "eslint": "^6.8.0",
     "eslint-config-habitrpg": "^6.2.0",

From daccade2e24562558c17093c0f4b17fe236f7513 Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Mon, 15 May 2023 12:03:58 -0400
Subject: [PATCH 61/87] disabled sell button when user tries to sell more items
 than they own

---
 website/client/src/components/shops/market/sellModal.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/website/client/src/components/shops/market/sellModal.vue b/website/client/src/components/shops/market/sellModal.vue
index 3e59b027e3..6bbc95599c 100644
--- a/website/client/src/components/shops/market/sellModal.vue
+++ b/website/client/src/components/shops/market/sellModal.vue
@@ -77,7 +77,7 @@
             </div>
             <button
               class="btn btn-primary"
-              :disabled="maxOwned > selectedAmountToSell"
+              :disabled="selectedAmountToSell > itemContextToSell.itemCount"
               @click="sellItems()"
             >
               {{ $t('sellItems') }}
@@ -376,13 +376,6 @@ export default {
         this.selectedAmountToSell = 0;
       }
     },
-    // preventSellingMoreThanOwned ($event) {
-    //   const { value } = $event.target;
-    //   if (Number(value) < this.selectedAmountToSell) {
-    //     this.selectedAmountToSell = this.itemCount;
-    //     console.log('yay');
-    //   }
-    // },
     maxOwned () {
       const maxOwned = this.itemContextToSell.itemCount;
       return maxOwned;

From 9b8f213c636670249d3541c0a2f8b8fedf3a09de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 13:46:41 -0400
Subject: [PATCH 62/87] build(deps): bump jquery from 3.6.4 to 3.7.0 in
 /website/client (#14653)

Bumps [jquery](https://github.com/jquery/jquery) from 3.6.4 to 3.7.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.4...3.7.0)

---
updated-dependencies:
- dependency-name: jquery
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 website/client/package-lock.json | 6 +++---
 website/client/package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/client/package-lock.json b/website/client/package-lock.json
index abcb170353..888ebca5ad 100644
--- a/website/client/package-lock.json
+++ b/website/client/package-lock.json
@@ -22018,9 +22018,9 @@
       }
     },
     "jquery": {
-      "version": "3.6.4",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz",
-      "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ=="
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz",
+      "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
     },
     "js-message": {
       "version": "1.0.5",
diff --git a/website/client/package.json b/website/client/package.json
index 92198c28ba..31343b778d 100644
--- a/website/client/package.json
+++ b/website/client/package.json
@@ -42,7 +42,7 @@
     "hellojs": "^1.20.0",
     "inspectpack": "^4.7.1",
     "intro.js": "^7.0.1",
-    "jquery": "^3.6.4",
+    "jquery": "^3.7.0",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",

From 17f6054ef0036697e4df94f1153cb3a5e3175893 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Mon, 15 May 2023 16:59:49 -0400
Subject: [PATCH 63/87] feat(content): add May magic hatching potions (#14641)

---
 website/common/script/content/constants/events.js   |  6 +++++-
 website/common/script/content/hatching-potions.js   | 12 ++++++------
 website/common/script/content/shop-featuredItems.js | 10 +++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 84896195bc..2349bcbffc 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -10,11 +10,15 @@ const gemsPromo = {
 
 export const EVENTS = {
   noEvent: {
-    start: '2023-05-01T23:59-04:00',
+    start: '2023-05-31T23:59-04:00',
     end: '2023-06-22T08:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  potions202305: {
+    start:'2023-05-16T08:00-04:00',
+    end:'2023-05-31T23:59-04:00',
+  },
   aprilFools2023: {
     start: '2023-04-01T08:00-04:00',
     end: '2023-04-02T08:00-04:00',
diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js
index 60d1cf21eb..00ddd38cf9 100644
--- a/website/common/script/content/hatching-potions.js
+++ b/website/common/script/content/hatching-potions.js
@@ -88,26 +88,26 @@ const premium = {
     value: 2,
     text: t('hatchingPotionFairy'),
     limited: true,
-    event: EVENTS.potions202105,
+    event: EVENTS.potions202305,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMay'),
-      previousDate: t('mayYYYY', { year: 2020 }),
+      previousDate: t('mayYYYY', { year: 2021 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.potions202105.end);
+      return moment().isBefore(EVENTS.potions202305.end);
     },
   },
   Floral: {
     value: 2,
     text: t('hatchingPotionFloral'),
     limited: true,
-    event: EVENTS.potions202205,
+    event: EVENTS.potions202305,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMay'),
-      previousDate: t('mayYYYY', { year: 2021 }),
+      previousDate: t('mayYYYY', { year: 2022 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.potions202205.end);
+      return moment().isBefore(EVENTS.potions202305.end);
     },
   },
   Aquatic: {
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 4f0c2e58a3..57ca7da7ff 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.spring2023.start, EVENTS.spring2023.end)) {
+    if (moment().isBetween(EVENTS.potions202305.start, EVENTS.potions202305.end)) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.PolkaDot',
+          path: 'premiumHatchingPotions.Fairy',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.BirchBark',
+          path: 'premiumHatchingPotions.Floral',
         },
         {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Rainbow',
+          type: 'hatchingPotions',
+          path: 'hatchingPotions.Golden',
         },
       ];
     }

From e3a1ea6180c7145b59c7d36bc30e609870283bef Mon Sep 17 00:00:00 2001
From: negue <negue@users.noreply.github.com>
Date: Mon, 15 May 2023 23:01:32 +0200
Subject: [PATCH 64/87] save task column filter (#14587)

* save task column filter

* remove old setting

* fix tests
---
 .../client/src/components/settings/site.vue   | 16 -----------
 .../client/src/components/tasks/column.vue    | 19 ++++++++-----
 .../unit/components/tasks/column.spec.js      | 27 ++++++++++++++++++-
 .../tests/unit/components/tasks/task.spec.js  |  8 +++++-
 website/common/locales/en/settings.json       |  2 --
 website/server/models/user/schema.js          |  7 +++++
 6 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue
index f05282cd01..60c137e67c 100644
--- a/website/client/src/components/settings/site.vue
+++ b/website/client/src/components/settings/site.vue
@@ -144,22 +144,6 @@
             >{{ $t('startAdvCollapsed') }}</span>
           </label>
         </div>
-        <div class="checkbox">
-          <label>
-            <input
-              v-model="user.preferences.dailyDueDefaultView"
-              type="checkbox"
-              class="mr-2"
-              @change="set('dailyDueDefaultView')"
-            >
-            <span
-              class="hint"
-              popover-trigger="mouseenter"
-              popover-placement="right"
-              :popover="$t('dailyDueDefaultViewPop')"
-            >{{ $t('dailyDueDefaultView') }}</span>
-          </label>
-        </div>
         <div
           v-if="party.memberCount === 1"
           class="checkbox"
diff --git a/website/client/src/components/tasks/column.vue b/website/client/src/components/tasks/column.vue
index b40b0c739f..d64420e123 100644
--- a/website/client/src/components/tasks/column.vue
+++ b/website/client/src/components/tasks/column.vue
@@ -521,7 +521,12 @@ export default {
     // Get Category Filter Labels
     this.typeFilters = getFilterLabels(this.type, this.challenge);
     // Set default filter for task column
-    this.activateFilter(this.type);
+
+    if (this.challenge) {
+      this.activateFilter(this.type);
+    } else {
+      this.activateFilter(this.type, this.user.preferences.tasks.activeFilter[this.type], true);
+    }
   },
   mounted () {
     this.setColumnBackgroundVisibility();
@@ -661,7 +666,7 @@ export default {
     taskSummary (task) {
       this.$emit('taskSummary', task);
     },
-    activateFilter (type, filter = '') {
+    activateFilter (type, filter = '', skipSave = false) {
       // Needs a separate API call as this data may not reside in store
       if (type === 'todo' && filter === 'complete2') {
         if (this.group && this.group._id) {
@@ -677,14 +682,16 @@ export default {
       // as default filter for daily
       // and set the filter as 'due' only when the component first
       // loads and not on subsequent reloads.
-      if (
-        type === 'daily' && filter === '' && !this.challenge
-        && this.user.preferences.dailyDueDefaultView
-      ) {
+      if (type === 'daily' && filter === '' && !this.challenge) {
         filter = 'due'; // eslint-disable-line no-param-reassign
       }
 
       this.activeFilter = getActiveFilter(type, filter, this.challenge);
+
+      if (!skipSave && !this.challenge) {
+        const propertyToUpdate = `preferences.tasks.activeFilter.${type}`;
+        this.$store.dispatch('user:set', { [propertyToUpdate]: filter });
+      }
     },
     setColumnBackgroundVisibility () {
       this.$nextTick(() => {
diff --git a/website/client/tests/unit/components/tasks/column.spec.js b/website/client/tests/unit/components/tasks/column.spec.js
index 2fbea418ef..a44bf4be4d 100644
--- a/website/client/tests/unit/components/tasks/column.spec.js
+++ b/website/client/tests/unit/components/tasks/column.spec.js
@@ -21,6 +21,18 @@ describe('Task Column', () => {
         getters: {
           'tasks:getFilteredTaskList': () => [],
         },
+
+        state: {
+          user: {
+            data: {
+              preferences: {
+                tasks: {
+                  activeFilter: {},
+                },
+              },
+            },
+          },
+        },
       },
       mocks,
       stubs,
@@ -76,7 +88,20 @@ describe('Task Column', () => {
         'tasks:getFilteredTaskList': () => () => habits,
       };
 
-      const store = new Store({ getters });
+      const store = new Store({
+        getters,
+        state: {
+          user: {
+            data: {
+              preferences: {
+                tasks: {
+                  activeFilter: {},
+                },
+              },
+            },
+          },
+        },
+      });
 
       wrapper = makeWrapper({ store });
     });
diff --git a/website/client/tests/unit/components/tasks/task.spec.js b/website/client/tests/unit/components/tasks/task.spec.js
index 9349d7ea2f..bba52c2e41 100644
--- a/website/client/tests/unit/components/tasks/task.spec.js
+++ b/website/client/tests/unit/components/tasks/task.spec.js
@@ -22,7 +22,13 @@ describe('Task', () => {
         state: {
           user: {
             data: {
-              preferences: {},
+              preferences: {
+                tasks: {
+                  activeFilter: {
+
+                  },
+                },
+              },
               ...additionalUserData,
             },
           },
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index 3c93d6c000..7dba6eca24 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -5,8 +5,6 @@
     "helpWithTranslation": "Would you like to help with the translation of Habitica? Great! Then visit <a href=\"/groups/guild/7732f64c-33ee-4cce-873c-fc28f147a6f7\">the Aspiring Linguists Guild</a>!",
     "stickyHeader": "Sticky header",
     "newTaskEdit": "Open new tasks in edit mode",
-    "dailyDueDefaultView": "Set Dailies default to 'due' tab",
-    "dailyDueDefaultViewPop": "With this option set, the Dailies tasks will default to 'due' instead of 'all'",
     "reverseChatOrder": "Show chat messages in reverse order",
     "startAdvCollapsed": "Advanced Settings in tasks start collapsed",
     "startAdvCollapsedPop": "With this option set, Advanced Settings will be hidden when you first open a task for editing.",
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index 5ed98a11d9..a0148bc7dc 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -534,6 +534,7 @@ export default new Schema({
     stickyHeader: { $type: Boolean, default: true },
     disableClasses: { $type: Boolean, default: false },
     newTaskEdit: { $type: Boolean, default: false },
+    // not used anymore, now the current filter is saved in preferences.activeFilter
     dailyDueDefaultView: { $type: Boolean, default: false },
     advancedCollapsed: { $type: Boolean, default: false },
     toolbarCollapsed: { $type: Boolean, default: false },
@@ -594,6 +595,12 @@ export default new Schema({
       mirrorGroupTasks: [
         { $type: String, validate: [v => validator.isUUID(v), 'Invalid group UUID.'], ref: 'Group' },
       ],
+      activeFilter: {
+        habit: { $type: String, default: 'all' },
+        daily: { $type: String, default: 'all' },
+        todo: { $type: String, default: 'remaining' },
+        reward: { $type: String, default: 'all' },
+      },
     },
     improvementCategories: {
       $type: Array,

From f968bdd3a9f477f45268a33f5e11eb076f2392fd Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 15 May 2023 16:02:24 -0500
Subject: [PATCH 65/87] fix(analytics): re-enable group chat tracking

---
 website/server/controllers/api-v3/chat.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/server/controllers/api-v3/chat.js b/website/server/controllers/api-v3/chat.js
index 72df0f719d..c3922bb843 100644
--- a/website/server/controllers/api-v3/chat.js
+++ b/website/server/controllers/api-v3/chat.js
@@ -282,6 +282,8 @@ api.postChat = {
       analyticsObject.groupName = group.name;
     }
 
+    res.analytics.track('group chat', analyticsObject);
+
     if (chatUpdated) {
       res.respond(200, { chat: chatRes.chat });
     } else {

From f0637dcf494fce9d3e34017f24051d0df3f5bbc2 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 15 May 2023 16:15:22 -0500
Subject: [PATCH 66/87] 4.270.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a011974d3b..b2fff16372 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.270.0",
+  "version": "4.270.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index de96374d52..33a7b021a8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.270.0",
+  "version": "4.270.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From 8150fef993ec2b6e5927c72f7dacb47f6519aae2 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 16 May 2023 19:21:45 +0200
Subject: [PATCH 67/87] Database Access optimisations (#14544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Optimize database access during spell casting

* load less data when casting spells

* Begin migrating update calls to updateOne and updateMany

* Only update user objects that don’t have notification yet

* fix test

* fix spy

* Don’t unnecessarily update user when requesting invalid guild

* fix sort order for middlewares to not load user twice every request

* fix tests

* fix integration test

* fix skill usage not always deducting mp

* addtest case for blessing spell

* fix healAll

* fix lint

* Fix error for when some spells are used outside of party

* Add check to not run bulk spells in web client

* fix(tags): change const to let

---------

Co-authored-by: SabreCat <sabe@habitica.com>
---
 test/api/unit/middlewares/cronMiddleware.js   |  2 +-
 test/api/unit/models/group.test.js            | 36 +++++-----
 .../user/POST-user_class_cast_spellId.test.js | 68 +++++++++++++++++++
 website/client/src/mixins/spells.js           |  2 +-
 website/common/script/content/spells.js       | 62 +++++++----------
 website/server/controllers/api-v3/quests.js   | 14 ++--
 website/server/controllers/api-v3/tags.js     |  6 +-
 website/server/controllers/api-v3/tasks.js    |  6 +-
 website/server/libs/baseModel.js              | 10 ++-
 website/server/libs/pushNotifications.js      |  2 +-
 website/server/libs/routes.js                 |  3 +-
 website/server/libs/spells.js                 | 49 +++++++++----
 website/server/libs/tasks/index.js            |  2 +-
 website/server/libs/user/index.js             |  6 +-
 website/server/libs/webhook.js                |  2 +-
 website/server/middlewares/cron.js            | 10 +--
 website/server/models/challenge.js            | 31 +++++----
 website/server/models/group.js                | 32 +++++----
 website/server/models/user/hooks.js           |  7 ++
 website/server/models/user/methods.js         |  6 +-
 20 files changed, 223 insertions(+), 133 deletions(-)

diff --git a/test/api/unit/middlewares/cronMiddleware.js b/test/api/unit/middlewares/cronMiddleware.js
index fea4384c26..9df810c9fd 100644
--- a/test/api/unit/middlewares/cronMiddleware.js
+++ b/test/api/unit/middlewares/cronMiddleware.js
@@ -242,7 +242,7 @@ describe('cron middleware', () => {
 
     sandbox.spy(cronLib, 'recoverCron');
 
-    sandbox.stub(User, 'update')
+    sandbox.stub(User, 'updateOne')
       .withArgs({
         _id: user._id,
         $or: [
diff --git a/test/api/unit/models/group.test.js b/test/api/unit/models/group.test.js
index 24cf64a250..77a535fd0b 100644
--- a/test/api/unit/models/group.test.js
+++ b/test/api/unit/models/group.test.js
@@ -1732,7 +1732,7 @@ describe('Group Model', () => {
         });
 
         it('updates participting members (not including user)', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateMany');
 
           await party.startQuest(nonParticipatingMember);
 
@@ -1740,7 +1740,7 @@ describe('Group Model', () => {
             questLeader._id, participatingMember._id, sleepingParticipatingMember._id,
           ];
 
-          expect(User.update).to.be.calledWith(
+          expect(User.updateMany).to.be.calledWith(
             { _id: { $in: members } },
             {
               $set: {
@@ -1753,11 +1753,11 @@ describe('Group Model', () => {
         });
 
         it('updates non-user quest leader and decrements quest scroll', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateOne');
 
           await party.startQuest(participatingMember);
 
-          expect(User.update).to.be.calledWith(
+          expect(User.updateOne).to.be.calledWith(
             { _id: questLeader._id },
             {
               $inc: {
@@ -1819,29 +1819,29 @@ describe('Group Model', () => {
         };
 
         it('doesn\'t retry successful operations', async () => {
-          sandbox.stub(User, 'update').returns(successfulMock);
+          sandbox.stub(User, 'updateOne').returns(successfulMock);
 
           await party.finishQuest(quest);
 
-          expect(User.update).to.be.calledThrice;
+          expect(User.updateOne).to.be.calledThrice;
         });
 
         it('stops retrying when a successful update has occurred', async () => {
-          const updateStub = sandbox.stub(User, 'update');
+          const updateStub = sandbox.stub(User, 'updateOne');
           updateStub.onCall(0).returns(failedMock);
           updateStub.returns(successfulMock);
 
           await party.finishQuest(quest);
 
-          expect(User.update.callCount).to.equal(4);
+          expect(User.updateOne.callCount).to.equal(4);
         });
 
         it('retries failed updates at most five times per user', async () => {
-          sandbox.stub(User, 'update').returns(failedMock);
+          sandbox.stub(User, 'updateOne').returns(failedMock);
 
           await expect(party.finishQuest(quest)).to.eventually.be.rejected;
 
-          expect(User.update.callCount).to.eql(15); // for 3 users
+          expect(User.updateOne.callCount).to.eql(15); // for 3 users
         });
       });
 
@@ -2088,17 +2088,17 @@ describe('Group Model', () => {
 
       context('Party quests', () => {
         it('updates participating members with rewards', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateOne');
           await party.finishQuest(quest);
 
-          expect(User.update).to.be.calledThrice;
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledThrice;
+          expect(User.updateOne).to.be.calledWithMatch({
             _id: questLeader._id,
           });
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledWithMatch({
             _id: participatingMember._id,
           });
-          expect(User.update).to.be.calledWithMatch({
+          expect(User.updateOne).to.be.calledWithMatch({
             _id: sleepingParticipatingMember._id,
           });
         });
@@ -2173,11 +2173,11 @@ describe('Group Model', () => {
         });
 
         it('updates all users with rewards', async () => {
-          sandbox.spy(User, 'update');
+          sandbox.spy(User, 'updateMany');
           await party.finishQuest(tavernQuest);
 
-          expect(User.update).to.be.calledOnce;
-          expect(User.update).to.be.calledWithMatch({});
+          expect(User.updateMany).to.be.calledOnce;
+          expect(User.updateMany).to.be.calledWithMatch({});
         });
 
         it('sets quest completed to the world quest key', async () => {
diff --git a/test/api/v4/user/POST-user_class_cast_spellId.test.js b/test/api/v4/user/POST-user_class_cast_spellId.test.js
index 8602cb7c2a..dd2ccd21da 100644
--- a/test/api/v4/user/POST-user_class_cast_spellId.test.js
+++ b/test/api/v4/user/POST-user_class_cast_spellId.test.js
@@ -202,18 +202,86 @@ describe('POST /user/class/cast/:spellId', () => {
     await group.groupLeader.post('/user/class/cast/mpheal');
 
     promises = [];
+    promises.push(group.groupLeader.sync());
     promises.push(group.members[0].sync());
     promises.push(group.members[1].sync());
     promises.push(group.members[2].sync());
     promises.push(group.members[3].sync());
     await Promise.all(promises);
 
+    expect(group.groupLeader.stats.mp).to.be.equal(170); // spell caster
     expect(group.members[0].stats.mp).to.be.greaterThan(0); // warrior
     expect(group.members[1].stats.mp).to.equal(0); // wizard
     expect(group.members[2].stats.mp).to.be.greaterThan(0); // rogue
     expect(group.members[3].stats.mp).to.be.greaterThan(0); // healer
   });
 
+  const spellList = [
+    {
+      className: 'warrior',
+      spells: [['smash', 'task'], ['defensiveStance'], ['valorousPresence'], ['intimidate']],
+    },
+    {
+      className: 'wizard',
+      spells: [['fireball', 'task'], ['mpheal'], ['earth'], ['frost']],
+    },
+    {
+      className: 'healer',
+      spells: [['heal'], ['brightness'], ['protectAura'], ['healAll']],
+    },
+    {
+      className: 'rogue',
+      spells: [['pickPocket', 'task'], ['backStab', 'task'], ['toolsOfTrade'], ['stealth']],
+    },
+  ];
+
+  spellList.forEach(async habitClass => {
+    describe(`For a ${habitClass.className}`, async () => {
+      habitClass.spells.forEach(async spell => {
+        describe(`Using ${spell[0]}`, async () => {
+          it('Deducts MP from spell caster', async () => {
+            const { groupLeader } = await createAndPopulateGroup({
+              groupDetails: { type: 'party', privacy: 'private' },
+              members: 3,
+            });
+            await groupLeader.update({
+              'stats.mp': 200, 'stats.class': habitClass.className, 'stats.lvl': 20, 'stats.hp': 40,
+            });
+            // need this for task spells and for stealth
+            const task = await groupLeader.post('/tasks/user', {
+              text: 'test habit',
+              type: 'daily',
+            });
+            if (spell.length === 2 && spell[1] === 'task') {
+              await groupLeader.post(`/user/class/cast/${spell[0]}?targetId=${task._id}`);
+            } else {
+              await groupLeader.post(`/user/class/cast/${spell[0]}`);
+            }
+            await groupLeader.sync();
+            expect(groupLeader.stats.mp).to.be.lessThan(200);
+          });
+          it('works without a party', async () => {
+            await user.update({
+              'stats.mp': 200, 'stats.class': habitClass.className, 'stats.lvl': 20, 'stats.hp': 40,
+            });
+            // need this for task spells and for stealth
+            const task = await user.post('/tasks/user', {
+              text: 'test habit',
+              type: 'daily',
+            });
+            if (spell.length === 2 && spell[1] === 'task') {
+              await user.post(`/user/class/cast/${spell[0]}?targetId=${task._id}`);
+            } else {
+              await user.post(`/user/class/cast/${spell[0]}`);
+            }
+            await user.sync();
+            expect(user.stats.mp).to.be.lessThan(200);
+          });
+        });
+      });
+    });
+  });
+
   it('cast bulk', async () => {
     let { group, groupLeader } = await createAndPopulateGroup({ // eslint-disable-line prefer-const
       groupDetails: { type: 'party', privacy: 'private' },
diff --git a/website/client/src/mixins/spells.js b/website/client/src/mixins/spells.js
index a34b69836e..0b2c445b02 100644
--- a/website/client/src/mixins/spells.js
+++ b/website/client/src/mixins/spells.js
@@ -114,7 +114,7 @@ export default {
       this.castCancel();
 
       // the selected member doesn't have the flags property which sets `cardReceived`
-      if (spell.pinType !== 'card') {
+      if (spell.pinType !== 'card' && spell.bulk !== true) {
         try {
           spell.cast(this.user, target, {});
         } catch (e) {
diff --git a/website/common/script/content/spells.js b/website/common/script/content/spells.js
index 33233d283e..a8205e13e9 100644
--- a/website/common/script/content/spells.js
+++ b/website/common/script/content/spells.js
@@ -77,13 +77,11 @@ spells.wizard = {
     lvl: 12,
     target: 'party',
     notes: t('spellWizardMPHealNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).int;
-        if (user._id !== member._id && member.stats.class !== 'wizard') {
-          member.stats.mp += Math.ceil(diminishingReturns(bonus, 25, 125));
-        }
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).int;
+      data.query['stats.class'] = { $ne: 'wizard' };
+      data.update = { $inc: { 'stats.mp': Math.ceil(diminishingReturns(bonus, 25, 125)) } };
     },
   },
   earth: { // Earthquake
@@ -92,12 +90,10 @@ spells.wizard = {
     lvl: 13,
     target: 'party',
     notes: t('spellWizardEarthNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).int - user.stats.buffs.int;
-        if (!member.stats.buffs.int) member.stats.buffs.int = 0;
-        member.stats.buffs.int += Math.ceil(diminishingReturns(bonus, 30, 200));
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).int - user.stats.buffs.int;
+      data.update = { $inc: { 'stats.buffs.int': Math.ceil(diminishingReturns(bonus, 30, 200)) } };
     },
   },
   frost: { // Chilling Frost
@@ -147,12 +143,10 @@ spells.warrior = {
     lvl: 13,
     target: 'party',
     notes: t('spellWarriorValorousPresenceNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).str - user.stats.buffs.str;
-        if (!member.stats.buffs.str) member.stats.buffs.str = 0;
-        member.stats.buffs.str += Math.ceil(diminishingReturns(bonus, 20, 200));
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).str - user.stats.buffs.str;
+      data.update = { $inc: { 'stats.buffs.str': Math.ceil(diminishingReturns(bonus, 20, 200)) } };
     },
   },
   intimidate: { // Intimidating Gaze
@@ -161,12 +155,10 @@ spells.warrior = {
     lvl: 14,
     target: 'party',
     notes: t('spellWarriorIntimidateNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).con - user.stats.buffs.con;
-        if (!member.stats.buffs.con) member.stats.buffs.con = 0;
-        member.stats.buffs.con += Math.ceil(diminishingReturns(bonus, 24, 200));
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).con - user.stats.buffs.con;
+      data.update = { $inc: { 'stats.buffs.con': Math.ceil(diminishingReturns(bonus, 24, 200)) } };
     },
   },
 };
@@ -203,12 +195,10 @@ spells.rogue = {
     lvl: 13,
     target: 'party',
     notes: t('spellRogueToolsOfTradeNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).per - user.stats.buffs.per;
-        if (!member.stats.buffs.per) member.stats.buffs.per = 0;
-        member.stats.buffs.per += Math.ceil(diminishingReturns(bonus, 100, 50));
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).per - user.stats.buffs.per;
+      data.update = { $inc: { 'stats.buffs.per': Math.ceil(diminishingReturns(bonus, 100, 50)) } };
     },
   },
   stealth: { // Stealth
@@ -257,12 +247,10 @@ spells.healer = {
     lvl: 13,
     target: 'party',
     notes: t('spellHealerProtectAuraNotes'),
-    cast (user, target) {
-      each(target, member => {
-        const bonus = statsComputed(user).con - user.stats.buffs.con;
-        if (!member.stats.buffs.con) member.stats.buffs.con = 0;
-        member.stats.buffs.con += Math.ceil(diminishingReturns(bonus, 200, 200));
-      });
+    bulk: true,
+    cast (user, data) {
+      const bonus = statsComputed(user).con - user.stats.buffs.con;
+      data.update = { $inc: { 'stats.buffs.con': Math.ceil(diminishingReturns(bonus, 200, 200)) } };
     },
   },
   healAll: { // Blessing
diff --git a/website/server/controllers/api-v3/quests.js b/website/server/controllers/api-v3/quests.js
index 16fc0b8af1..2e073fa4ff 100644
--- a/website/server/controllers/api-v3/quests.js
+++ b/website/server/controllers/api-v3/quests.js
@@ -93,7 +93,7 @@ api.inviteToQuest = {
     user.party.quest.RSVPNeeded = false;
     user.party.quest.key = questKey;
 
-    await User.update({
+    await User.updateMany({
       'party._id': group._id,
       _id: { $ne: user._id },
     }, {
@@ -101,7 +101,7 @@ api.inviteToQuest = {
         'party.quest.RSVPNeeded': true,
         'party.quest.key': questKey,
       },
-    }, { multi: true }).exec();
+    }).exec();
 
     _.each(members, member => {
       group.quest.members[member._id] = null;
@@ -409,10 +409,9 @@ api.cancelQuest = {
     const [savedGroup] = await Promise.all([
       group.save(),
       newChatMessage.save(),
-      User.update(
+      User.updateMany(
         { 'party._id': groupId },
         Group.cleanQuestParty(),
-        { multi: true },
       ).exec(),
     ]);
 
@@ -467,12 +466,11 @@ api.abortQuest = {
     });
     await newChatMessage.save();
 
-    const memberUpdates = User.update({
+    const memberUpdates = User.updateMany({
       'party._id': groupId,
-    }, Group.cleanQuestParty(),
-    { multi: true }).exec();
+    }, Group.cleanQuestParty()).exec();
 
-    const questLeaderUpdate = User.update({
+    const questLeaderUpdate = User.updateOne({
       _id: group.quest.leader,
     }, {
       $inc: {
diff --git a/website/server/controllers/api-v3/tags.js b/website/server/controllers/api-v3/tags.js
index 2c38ed5a5f..05ea250de6 100644
--- a/website/server/controllers/api-v3/tags.js
+++ b/website/server/controllers/api-v3/tags.js
@@ -227,7 +227,7 @@ api.deleteTag = {
     const tagFound = find(user.tags, tag => tag.id === req.params.tagId);
     if (!tagFound) throw new NotFound(res.t('tagNotFound'));
 
-    await user.update({
+    await user.updateOne({
       $pull: { tags: { id: tagFound.id } },
     }).exec();
 
@@ -237,13 +237,13 @@ api.deleteTag = {
     user._v += 1;
 
     // Remove from all the tasks TODO test
-    await Tasks.Task.update({
+    await Tasks.Task.updateMany({
       userId: user._id,
     }, {
       $pull: {
         tags: tagFound.id,
       },
-    }, { multi: true }).exec();
+    }).exec();
 
     res.respond(200, {});
   },
diff --git a/website/server/controllers/api-v3/tasks.js b/website/server/controllers/api-v3/tasks.js
index c937f5efb0..2745d10884 100644
--- a/website/server/controllers/api-v3/tasks.js
+++ b/website/server/controllers/api-v3/tasks.js
@@ -840,7 +840,7 @@ api.moveTask = {
     // Cannot send $pull and $push on same field in one single op
     const pullQuery = { $pull: {} };
     pullQuery.$pull[`tasksOrder.${task.type}s`] = task.id;
-    await owner.update(pullQuery).exec();
+    await owner.updateOne(pullQuery).exec();
 
     let position = to;
     if (to === -1) position = order.length - 1; // push to bottom
@@ -850,7 +850,7 @@ api.moveTask = {
       $each: [task._id],
       $position: position,
     };
-    await owner.update(updateQuery).exec();
+    await owner.updateOne(updateQuery).exec();
 
     // Update the user version field manually,
     // it cannot be updated in the pre update hook
@@ -1434,7 +1434,7 @@ api.deleteTask = {
 
       const pullQuery = { $pull: {} };
       pullQuery.$pull[`tasksOrder.${task.type}s`] = task._id;
-      const taskOrderUpdate = (challenge || user).update(pullQuery).exec();
+      const taskOrderUpdate = (challenge || user).updateOne(pullQuery).exec();
 
       // Update the user version field manually,
       // it cannot be updated in the pre update hook
diff --git a/website/server/libs/baseModel.js b/website/server/libs/baseModel.js
index 544eba8f77..c05125b8c8 100644
--- a/website/server/libs/baseModel.js
+++ b/website/server/libs/baseModel.js
@@ -37,7 +37,15 @@ export default function baseModel (schema, options = {}) {
     });
 
     schema.pre('update', function preUpdateModel () {
-      this.update({}, { $set: { updatedAt: new Date() } });
+      this.set({}, { $set: { updatedAt: new Date() } });
+    });
+
+    schema.pre('updateOne', function preUpdateModel () {
+      this.set({}, { $set: { updatedAt: new Date() } });
+    });
+
+    schema.pre('updateMany', function preUpdateModel () {
+      this.set({}, { $set: { updatedAt: new Date() } });
     });
   }
 
diff --git a/website/server/libs/pushNotifications.js b/website/server/libs/pushNotifications.js
index 0be37b7fdc..1ef9e7f387 100644
--- a/website/server/libs/pushNotifications.js
+++ b/website/server/libs/pushNotifications.js
@@ -21,7 +21,7 @@ const apnProvider = APN_ENABLED ? new apn.Provider({
 }) : undefined;
 
 function removePushDevice (user, pushDevice) {
-  return User.update({ _id: user._id }, {
+  return User.updateOne({ _id: user._id }, {
     $pull: { pushDevices: { regId: pushDevice.regId } },
   }).exec().catch(err => {
     logger.error(err, `Error removing pushDevice ${pushDevice.regId} for user ${user._id}`);
diff --git a/website/server/libs/routes.js b/website/server/libs/routes.js
index f46ba997ed..5b4bb9abb7 100644
--- a/website/server/libs/routes.js
+++ b/website/server/libs/routes.js
@@ -24,7 +24,7 @@ export function readController (router, controller, overrides = []) {
 
     // If an authentication middleware is used run getUserLanguage after it, otherwise before
     // for cron instead use it only if an authentication middleware is present
-    const authMiddlewareIndex = _.findIndex(middlewares, middleware => {
+    let authMiddlewareIndex = _.findIndex(middlewares, middleware => {
       if (middleware.name.indexOf('authWith') === 0) { // authWith{Headers|Session|Url|...}
         return true;
       }
@@ -36,6 +36,7 @@ export function readController (router, controller, overrides = []) {
     // disable caching for all routes with mandatory or optional authentication
     if (authMiddlewareIndex !== -1) {
       middlewares.unshift(disableCache);
+      authMiddlewareIndex += 1;
     }
 
     if (action.noLanguage !== true) { // unless getting the language is explictly disabled
diff --git a/website/server/libs/spells.js b/website/server/libs/spells.js
index 4a132f290b..c31bb61e1b 100644
--- a/website/server/libs/spells.js
+++ b/website/server/libs/spells.js
@@ -11,7 +11,7 @@ import {
 } from '../models/group';
 import apiError from './apiError';
 
-const partyMembersFields = 'profile.name stats achievements items.special notifications flags pinnedItems';
+const partyMembersFields = 'profile.name stats achievements items.special pinnedItems notifications flags';
 // Excluding notifications and flags from the list of public fields to return.
 const partyMembersPublicFields = 'profile.name stats achievements items.special';
 
@@ -74,12 +74,13 @@ async function castSelfSpell (req, user, spell, quantity = 1) {
   await user.save();
 }
 
-async function castPartySpell (req, party, partyMembers, user, spell, quantity = 1) {
+async function getPartyMembers (user, party) {
+  let partyMembers;
   if (!party) {
     // Act as solo party
-    partyMembers = [user]; // eslint-disable-line no-param-reassign
+    partyMembers = [user];
   } else {
-    partyMembers = await User // eslint-disable-line no-param-reassign
+    partyMembers = await User
       .find({
         'party._id': party._id,
         _id: { $ne: user._id }, // add separately
@@ -89,22 +90,40 @@ async function castPartySpell (req, party, partyMembers, user, spell, quantity =
 
     partyMembers.unshift(user);
   }
-
-  for (let i = 0; i < quantity; i += 1) {
-    spell.cast(user, partyMembers, req);
-  }
-  await Promise.all(partyMembers.map(m => m.save()));
-
   return partyMembers;
 }
 
-async function castUserSpell (res, req, party, partyMembers, targetId, user, spell, quantity = 1) {
+async function castPartySpell (req, party, user, spell, quantity = 1) {
+  let partyMembers;
+  if (spell.bulk) {
+    const data = { };
+    if (party) {
+      data.query = { 'party._id': party._id };
+    } else {
+      data.query = { _id: user._id };
+    }
+    spell.cast(user, data);
+    await User.updateMany(data.query, data.update);
+    await user.save();
+    partyMembers = await getPartyMembers(user, party);
+  } else {
+    partyMembers = await getPartyMembers(user, party);
+    for (let i = 0; i < quantity; i += 1) {
+      spell.cast(user, partyMembers, req);
+    }
+    await Promise.all(partyMembers.map(m => m.save()));
+  }
+  return partyMembers;
+}
+
+async function castUserSpell (res, req, party, targetId, user, spell, quantity = 1) {
+  let partyMembers;
   if (!party && (!targetId || user._id === targetId)) {
-    partyMembers = user; // eslint-disable-line no-param-reassign
+    partyMembers = user;
   } else {
     if (!targetId) throw new BadRequest(res.t('targetIdUUID'));
     if (!party) throw new NotFound(res.t('partyNotFound'));
-    partyMembers = await User // eslint-disable-line no-param-reassign
+    partyMembers = await User
       .findOne({ _id: targetId, 'party._id': party._id })
       .select(partyMembersFields)
       .exec();
@@ -195,10 +214,10 @@ async function castSpell (req, res, { isV3 = false }) {
     let partyMembers;
 
     if (targetType === 'party') {
-      partyMembers = await castPartySpell(req, party, partyMembers, user, spell, quantity);
+      partyMembers = await castPartySpell(req, party, user, spell, quantity);
     } else {
       partyMembers = await castUserSpell(
-        res, req, party, partyMembers,
+        res, req, party,
         targetId, user, spell, quantity,
       );
     }
diff --git a/website/server/libs/tasks/index.js b/website/server/libs/tasks/index.js
index d32280fd3c..aad3a1ddfc 100644
--- a/website/server/libs/tasks/index.js
+++ b/website/server/libs/tasks/index.js
@@ -114,7 +114,7 @@ async function createTasks (req, res, options = {}) {
     };
   }
 
-  await owner.update(taskOrderUpdateQuery).exec();
+  await owner.updateOne(taskOrderUpdateQuery).exec();
 
   // tasks with aliases need to be validated asynchronously
   await validateTaskAlias(toSave, res);
diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index 28d218cda4..20f1616310 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -121,7 +121,7 @@ async function checkNewInputForProfanity (user, res, newValue) {
 export async function update (req, res, { isV3 = false }) {
   const { user } = res.locals;
 
-  const promisesForTagsRemoval = [];
+  let promisesForTagsRemoval = [];
 
   if (req.body['party.seeking'] !== undefined && req.body['party.seeking'] !== null) {
     user.invitations.party = {};
@@ -218,13 +218,13 @@ export async function update (req, res, { isV3 = false }) {
       // Remove from all the tasks
       // NOTE each tag to remove requires a query
 
-      promisesForTagsRemoval.push(removedTagsIds.map(tagId => Tasks.Task.update({
+      promisesForTagsRemoval = removedTagsIds.map(tagId => Tasks.Task.updateMany({
         userId: user._id,
       }, {
         $pull: {
           tags: tagId,
         },
-      }, { multi: true }).exec()));
+      }).exec());
     } else if (key === 'flags.newStuff' && val === false) {
       // flags.newStuff was removed from the user schema and is only returned for compatibility
       // reasons but we're keeping the ability to set it in API v3
diff --git a/website/server/libs/webhook.js b/website/server/libs/webhook.js
index 89e99a5aa4..d22307b160 100644
--- a/website/server/libs/webhook.js
+++ b/website/server/libs/webhook.js
@@ -61,7 +61,7 @@ function sendWebhook (webhook, body, user) {
       };
     }
 
-    return User.update({
+    return User.updateOne({
       _id: user._id,
       'webhooks.id': webhook.id,
     }, update).exec();
diff --git a/website/server/middlewares/cron.js b/website/server/middlewares/cron.js
index 7c837c9632..a9e584d069 100644
--- a/website/server/middlewares/cron.js
+++ b/website/server/middlewares/cron.js
@@ -16,7 +16,7 @@ async function checkForActiveCron (user, now) {
 
   // To avoid double cron we first set _cronSignature
   // and then check that it's not changed while processing
-  const userUpdateResult = await User.update({
+  const userUpdateResult = await User.updateOne({
     _id: user._id,
     $or: [ // Make sure last cron was successful or failed before cronRetryTime
       { _cronSignature: 'NOT_RUNNING' },
@@ -36,7 +36,7 @@ async function checkForActiveCron (user, now) {
 }
 
 async function updateLastCron (user, now) {
-  await User.update({
+  await User.updateOne({
     _id: user._id,
   }, {
     lastCron: now, // setting lastCron now so we don't risk re-running parts of cron if it fails
@@ -44,7 +44,7 @@ async function updateLastCron (user, now) {
 }
 
 async function unlockUser (user) {
-  await User.update({
+  await User.updateOne({
     _id: user._id,
   }, {
     _cronSignature: 'NOT_RUNNING',
@@ -125,7 +125,7 @@ async function cronAsync (req, res) {
     await Group.processQuestProgress(user, progress);
 
     // Set _cronSignature, lastCron and auth.timestamps.loggedin to signal end of cron
-    await User.update({
+    await User.updateOne({
       _id: user._id,
     }, {
       $set: {
@@ -153,7 +153,7 @@ async function cronAsync (req, res) {
       // For any other error make sure to reset _cronSignature
       // so that it doesn't prevent cron from running
       // at the next request
-      await User.update({
+      await User.updateOne({
         _id: user._id,
       }, {
         _cronSignature: 'NOT_RUNNING',
diff --git a/website/server/models/challenge.js b/website/server/models/challenge.js
index 4d7ce99fad..f7c3aa4aac 100644
--- a/website/server/models/challenge.js
+++ b/website/server/models/challenge.js
@@ -102,7 +102,7 @@ schema.methods.addToUser = async function addChallengeToUser (user) {
   // Add challenge to users challenges atomically (with a condition that checks that it
   // is not there already) to prevent multiple concurrent requests from passing through
   // see https://github.com/HabitRPG/habitica/issues/11295
-  const result = await User.update(
+  const result = await User.updateOne(
     {
       _id: user._id,
       challenges: { $nin: [this._id] },
@@ -249,7 +249,7 @@ async function _addTaskFn (challenge, tasks, memberId) {
     },
   };
   const updateUserParams = { ...updateTasksOrderQ, ...addToChallengeTagSet };
-  toSave.unshift(User.update({ _id: memberId }, updateUserParams).exec());
+  toSave.unshift(User.updateOne({ _id: memberId }, updateUserParams).exec());
 
   return Promise.all(toSave);
 }
@@ -278,11 +278,11 @@ schema.methods.updateTask = async function challengeUpdateTask (task) {
   const taskSchema = Tasks[task.type];
   // Updating instead of loading and saving for performances,
   // risks becoming a problem if we introduce more complexity in tasks
-  await taskSchema.update({
+  await taskSchema.updateMany({
     userId: { $exists: true },
     'challenge.id': challenge.id,
     'challenge.taskId': task._id,
-  }, updateCmd, { multi: true }).exec();
+  }, updateCmd).exec();
 };
 
 // Remove a task from challenge members
@@ -290,13 +290,13 @@ schema.methods.removeTask = async function challengeRemoveTask (task) {
   const challenge = this;
 
   // Set the task as broken
-  await Tasks.Task.update({
+  await Tasks.Task.updateMany({
     userId: { $exists: true },
     'challenge.id': challenge.id,
     'challenge.taskId': task._id,
   }, {
     $set: { 'challenge.broken': 'TASK_DELETED' },
-  }, { multi: true }).exec();
+  }).exec();
 };
 
 // Unlink challenges tasks (and the challenge itself) from user. TODO rename to 'leave'
@@ -311,9 +311,9 @@ schema.methods.unlinkTasks = async function challengeUnlinkTasks (user, keep, sa
   this.memberCount -= 1;
 
   if (keep === 'keep-all') {
-    await Tasks.Task.update(findQuery, {
+    await Tasks.Task.updateMany(findQuery, {
       $set: { challenge: {} },
-    }, { multi: true }).exec();
+    }).exec();
 
     const promises = [this.save()];
 
@@ -356,11 +356,12 @@ schema.methods.closeChal = async function closeChal (broken = {}) {
 
   // Refund the leader if the challenge is deleted (no winner chosen)
   if (brokenReason === 'CHALLENGE_DELETED') {
-    await User.update({ _id: challenge.leader }, { $inc: { balance: challenge.prize / 4 } }).exec();
+    await User.updateOne({ _id: challenge.leader }, { $inc: { balance: challenge.prize / 4 } })
+      .exec();
   }
 
   // Update the challengeCount on the group
-  await Group.update({ _id: challenge.group }, { $inc: { challengeCount: -1 } }).exec();
+  await Group.updateOne({ _id: challenge.group }, { $inc: { challengeCount: -1 } }).exec();
 
   // Award prize to winner and notify
   if (winner) {
@@ -370,7 +371,7 @@ schema.methods.closeChal = async function closeChal (broken = {}) {
     // reimburse the leader
     const winnerCanGetGems = await winner.canGetGems();
     if (!winnerCanGetGems) {
-      await User.update(
+      await User.updateOne(
         { _id: challenge.leader },
         { $inc: { balance: challenge.prize / 4 } },
       ).exec();
@@ -408,22 +409,22 @@ schema.methods.closeChal = async function closeChal (broken = {}) {
     Tasks.Task.remove({ 'challenge.id': challenge._id, userId: { $exists: false } }).exec(),
     // Set the challenge tag to non-challenge status
     // and remove the challenge from the user's challenges
-    User.update({
+    User.updateMany({
       challenges: challenge._id,
       'tags.id': challenge._id,
     }, {
       $set: { 'tags.$.challenge': false },
       $pull: { challenges: challenge._id },
-    }, { multi: true }).exec(),
+    }).exec(),
     // Break users' tasks
-    Tasks.Task.update({
+    Tasks.Task.updateMany({
       'challenge.id': challenge._id,
     }, {
       $set: {
         'challenge.broken': brokenReason,
         'challenge.winner': winner && winner.profile.name,
       },
-    }, { multi: true }).exec(),
+    }).exec(),
   ];
 
   Promise.all(backgroundTasks);
diff --git a/website/server/models/group.js b/website/server/models/group.js
index 030a16ce53..a4f8f939fb 100644
--- a/website/server/models/group.js
+++ b/website/server/models/group.js
@@ -268,10 +268,13 @@ schema.statics.getGroup = async function getGroup (options = {}) {
     if (groupId === user.party._id) {
       // reset party object to default state
       user.party = {};
+      await user.save();
     } else {
-      removeFromArray(user.guilds, groupId);
+      const item = removeFromArray(user.guilds, groupId);
+      if (item) {
+        await user.save();
+      }
     }
-    await user.save();
   }
 
   return group;
@@ -659,7 +662,7 @@ schema.methods.handleQuestInvitation = async function handleQuestInvitation (use
   // to prevent multiple concurrent requests overriding updates
   // see https://github.com/HabitRPG/habitica/issues/11398
   const Group = this.constructor;
-  const result = await Group.update(
+  const result = await Group.updateOne(
     {
       _id: this._id,
       [`quest.members.${user._id}`]: { $type: 10 }, // match BSON Type Null (type number 10)
@@ -707,7 +710,7 @@ schema.methods.startQuest = async function startQuest (user) {
 
   // Persist quest.members early to avoid simultaneous handling of accept/reject
   // while processing the rest of this script
-  await this.update({ $set: { 'quest.members': this.quest.members } }).exec();
+  await this.updateOne({ $set: { 'quest.members': this.quest.members } }).exec();
 
   const nonUserQuestMembers = _.keys(this.quest.members);
   removeFromArray(nonUserQuestMembers, user._id);
@@ -747,7 +750,7 @@ schema.methods.startQuest = async function startQuest (user) {
     user.markModified('items.quests');
     promises.push(user.save());
   } else { // another user is starting the quest, update the leader separately
-    promises.push(User.update({ _id: this.quest.leader }, {
+    promises.push(User.updateOne({ _id: this.quest.leader }, {
       $inc: {
         [`items.quests.${this.quest.key}`]: -1,
       },
@@ -755,7 +758,7 @@ schema.methods.startQuest = async function startQuest (user) {
   }
 
   // update the remaining users
-  promises.push(User.update({
+  promises.push(User.updateMany({
     _id: { $in: nonUserQuestMembers },
   }, {
     $set: {
@@ -763,16 +766,15 @@ schema.methods.startQuest = async function startQuest (user) {
       'party.quest.progress.down': 0,
       'party.quest.completed': null,
     },
-  }, { multi: true }).exec());
+  }).exec());
 
   await Promise.all(promises);
 
   // update the users who are not participating
   // Do not block updates
-  User.update({
+  User.updateMany({
     _id: { $in: nonMembers },
-  }, _cleanQuestParty(),
-  { multi: true }).exec();
+  }, _cleanQuestParty()).exec();
 
   const newMessage = this.sendChat({
     message: `\`${shared.i18n.t('chatQuestStarted', { questName: quest.text('en') }, 'en')}\``,
@@ -903,7 +905,7 @@ function _getUserUpdateForQuestReward (itemToAward, allAwardedItems) {
 async function _updateUserWithRetries (userId, updates, numTry = 1, query = {}) {
   query._id = userId;
   try {
-    return await User.update(query, updates).exec();
+    return await User.updateOne(query, updates).exec();
   } catch (err) {
     if (numTry < MAX_UPDATE_RETRIES) {
       numTry += 1; // eslint-disable-line no-param-reassign
@@ -949,7 +951,7 @@ schema.methods.finishQuest = async function finishQuest (quest) {
   this.markModified('quest');
 
   if (this._id === TAVERN_ID) {
-    return User.update({}, updates, { multi: true }).exec();
+    return User.updateMany({}, updates).exec();
   }
 
   const promises = participants.map(userId => {
@@ -1389,10 +1391,10 @@ schema.methods.leave = async function leaveGroup (user, keep = 'keep-all', keepC
   const userUpdate = { $pull: { 'preferences.tasks.mirrorGroupTasks': group._id } };
   if (group.type === 'guild') {
     userUpdate.$pull.guilds = group._id;
-    promises.push(User.update({ _id: user._id }, userUpdate).exec());
+    promises.push(User.updateOne({ _id: user._id }, userUpdate).exec());
   } else {
     userUpdate.$set = { party: {} };
-    promises.push(User.update({ _id: user._id }, userUpdate).exec());
+    promises.push(User.updateOne({ _id: user._id }, userUpdate).exec());
 
     update.$unset = { [`quest.members.${user._id}`]: 1 };
   }
@@ -1508,7 +1510,7 @@ schema.methods.unlinkTask = async function groupUnlinkTask (
   const promises = [unlinkingTask.save()];
 
   if (keep === 'keep-all') {
-    await Tasks.Task.update(findQuery, {
+    await Tasks.Task.updateOne(findQuery, {
       $set: { group: {} },
     }).exec();
 
diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js
index 0ad198ac12..e1b00de15b 100644
--- a/website/server/models/user/hooks.js
+++ b/website/server/models/user/hooks.js
@@ -392,6 +392,13 @@ schema.pre('update', function preUpdateUser () {
   this.update({}, { $inc: { _v: 1 } });
 });
 
+schema.pre('updateOne', function preUpdateUser () {
+  this.updateOne({}, { $inc: { _v: 1 } });
+});
+schema.pre('updateMany', function preUpdateUser () {
+  this.updateMany({}, { $inc: { _v: 1 } });
+});
+
 schema.post('save', function postSaveUser () {
   // Send a webhook notification when the user has leveled up
   if (this._tmp && this._tmp.leveledUp && this._tmp.leveledUp.length > 0) {
diff --git a/website/server/models/user/methods.js b/website/server/models/user/methods.js
index b1f1cd19b2..6272c84b72 100644
--- a/website/server/models/user/methods.js
+++ b/website/server/models/user/methods.js
@@ -225,10 +225,9 @@ schema.statics.pushNotification = async function pushNotification (
     throw validationResult;
   }
 
-  await this.update(
+  await this.updateMany(
     query,
     { $push: { notifications: newNotification.toObject() } },
-    { multi: true },
   ).exec();
 };
 
@@ -274,13 +273,12 @@ schema.statics.addAchievementUpdate = async function addAchievementUpdate (query
   const validationResult = newNotification.validateSync();
   if (validationResult) throw validationResult;
 
-  await this.update(
+  await this.updateMany(
     query,
     {
       $push: { notifications: newNotification.toObject() },
       $set: { [`achievements.${achievement}`]: true },
     },
-    { multi: true },
   ).exec();
 };
 

From d176c313824ffb9480bb2e5324f29c673bd6d263 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 16 May 2023 12:22:21 -0500
Subject: [PATCH 68/87] 4.270.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2fff16372..f0cb6492d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.270.1",
+  "version": "4.270.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 33a7b021a8..33ab1cfbcc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.270.1",
+  "version": "4.270.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From 2a054a25ee557cbda526fdf9f72f1c89194d6846 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 16 May 2023 14:15:34 -0500
Subject: [PATCH 69/87] fix(test): include user pref needed for date

---
 website/client/tests/unit/components/tasks/task.spec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/client/tests/unit/components/tasks/task.spec.js b/website/client/tests/unit/components/tasks/task.spec.js
index 9349d7ea2f..5ad0e9e3fa 100644
--- a/website/client/tests/unit/components/tasks/task.spec.js
+++ b/website/client/tests/unit/components/tasks/task.spec.js
@@ -22,7 +22,9 @@ describe('Task', () => {
         state: {
           user: {
             data: {
-              preferences: {},
+              preferences: {
+                dateFormat: 'MM/dd/yyyy',
+              },
               ...additionalUserData,
             },
           },

From a71e44b3312cf4804132dfe4e0122c38be63fd14 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 16 May 2023 14:27:15 -0500
Subject: [PATCH 70/87] fix(test): remove test for old function

---
 .../tests/unit/components/tasks/task.spec.js  | 90 -------------------
 1 file changed, 90 deletions(-)
 delete mode 100644 website/client/tests/unit/components/tasks/task.spec.js

diff --git a/website/client/tests/unit/components/tasks/task.spec.js b/website/client/tests/unit/components/tasks/task.spec.js
deleted file mode 100644
index 5ad0e9e3fa..0000000000
--- a/website/client/tests/unit/components/tasks/task.spec.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import moment from 'moment';
-
-import Task from '@/components/tasks/task.vue';
-import Store from '@/libs/store';
-
-const localVue = createLocalVue();
-localVue.use(Store);
-
-describe('Task', () => {
-  let wrapper;
-
-  function makeWrapper (additionalTaskData = {}, additionalUserData = {}) {
-    return shallowMount(Task, {
-      propsData: {
-        task: {
-          group: {},
-          ...additionalTaskData,
-        },
-      },
-      store: {
-        state: {
-          user: {
-            data: {
-              preferences: {
-                dateFormat: 'MM/dd/yyyy',
-              },
-              ...additionalUserData,
-            },
-          },
-        },
-        getters: {
-          'tasks:getTaskClasses': () => ({}),
-          'tasks:canEdit': () => ({}),
-          'tasks:canDelete': () => ({}),
-        },
-      },
-      mocks: { $t: (key, params) => key + (params ? JSON.stringify(params) : '') },
-      directives: { 'b-tooltip': {} },
-      localVue,
-    });
-  }
-
-  it('returns a vue instance', () => {
-    wrapper = makeWrapper();
-    expect(wrapper.isVueInstance()).to.be.true;
-  });
-
-  describe('Due date calculation', () => {
-    let clock;
-
-    function setClockTo (time) {
-      const now = moment(time);
-      clock = sinon.useFakeTimers(now.toDate());
-      return now;
-    }
-
-    afterEach(() => {
-      clock.restore();
-    });
-
-    it('formats due date to today if due today', () => {
-      const now = setClockTo('2019-09-17T17:57:00+02:00');
-      wrapper = makeWrapper({ date: now });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"today"}');
-    });
-
-    it('formats due date to tomorrow if due tomorrow', () => {
-      const now = setClockTo('2012-06-12T14:17:28Z');
-      wrapper = makeWrapper({ date: now.add(1, 'day') });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in a day"}');
-    });
-
-    it('formats due date to 5 days if due in 5 days', () => {
-      const now = setClockTo();
-      wrapper = makeWrapper({ date: now.add(5, 'days') });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in 5 days"}');
-    });
-
-    it('formats due date to tomorrow if today but before dayStart', () => {
-      const now = setClockTo('2019-06-12T04:23:37+02:00');
-      wrapper = makeWrapper({ date: now.add(8, 'hours') }, { preferences: { dayStart: 7 } });
-
-      expect(wrapper.vm.formatDueDate()).to.equal('dueIn{"dueIn":"in a day"}');
-    });
-  });
-});

From 0b0cbb45f455453d998eaf7f436ef92895bda0ab Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 17 May 2023 10:49:37 -0400
Subject: [PATCH 71/87] feat(content): add May pet quest bundle

---
 website/common/script/content/bundles.js            | 4 ++--
 website/common/script/content/constants/events.js   | 4 ++++
 website/common/script/content/shop-featuredItems.js | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/website/common/script/content/bundles.js b/website/common/script/content/bundles.js
index 4576c5e727..f9b3666fab 100644
--- a/website/common/script/content/bundles.js
+++ b/website/common/script/content/bundles.js
@@ -178,9 +178,9 @@ const bundles = {
       'penguin',
       'rooster',
     ],
-    event: EVENTS.bundle202109,
+    event: EVENTS.bundle202305,
     canBuy () {
-      return moment().isBefore(EVENTS.bundle202109.end);
+      return moment().isBefore(EVENTS.bundle202305.end);
     },
     type: 'quests',
     value: 7,
diff --git a/website/common/script/content/constants/events.js b/website/common/script/content/constants/events.js
index 2349bcbffc..d68c78ee21 100644
--- a/website/common/script/content/constants/events.js
+++ b/website/common/script/content/constants/events.js
@@ -15,6 +15,10 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202305: {
+    start:'2023-05-23T08:00-04:00',
+    end:'2023-05-31T23:59-04:00',
+  },
   potions202305: {
     start:'2023-05-16T08:00-04:00',
     end:'2023-05-31T23:59-04:00',
diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
index 57ca7da7ff..13eb8ddff9 100644
--- a/website/common/script/content/shop-featuredItems.js
+++ b/website/common/script/content/shop-featuredItems.js
@@ -45,19 +45,19 @@ const featuredItems = {
     ];
   },
   quests () { // start date is 3/28
-    if (moment().isBetween(EVENTS.bundle202303.start, EVENTS.bundle202303.end)) {
+    if (moment().isBetween(EVENTS.bundle202305.start, EVENTS.bundle202305.end)) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.jungleBuddies',
+          path: 'bundles.birdBuddies',
         },
         {
           type: 'quests',
-          path: 'quests.kraken',
+          path: 'quests.harpy',
         },
         {
           type: 'quests',
-          path: 'quests.nudibranch',
+          path: 'quests.owl',
         },
       ];
     }

From 7c1c18a329afca149a8679302b998c6fb3c784de Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Wed, 17 May 2023 13:29:26 -0400
Subject: [PATCH 72/87] fix(styling): update colors to be a11y-friendly and to
 show items due today in gray

---
 website/client/src/components/tasks/task.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index 1efd89a5fb..82296d423d 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -700,7 +700,7 @@
 
   .icons {
     margin-top: 4px;
-    color: $gray-300;
+    color: $gray-100;
     font-style: normal;
 
     &-right {
@@ -759,7 +759,7 @@
   }
 
   .due-overdue {
-    color: $red-50;
+    color: $maroon-10;
   }
 
   .calendar.svg-icon {
@@ -899,6 +899,7 @@
 </style>
 <!-- eslint-enable max-len -->
 
+
 <script>
 import moment from 'moment';
 import { v4 as uuid } from 'uuid';
@@ -1125,7 +1126,7 @@ export default {
       return moment.duration(endOfDueDate.diff(endOfToday));
     },
     checkIfOverdue () {
-      return this.calculateTimeTillDue().asDays() <= 0;
+      return this.calculateTimeTillDue().asDays() < 0;
     },
     formatDueDate () {
       return moment(this.task.date).format(this.user.preferences.dateFormat.toUpperCase());

From b63f2fa1fac5ab7def5d7ce34fe297a3740fde54 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Fri, 19 May 2023 14:54:30 -0500
Subject: [PATCH 73/87] fix(analytics): add missing headers to 3 events

---
 website/server/libs/user/index.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index 20f1616310..13f38006d7 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -130,6 +130,7 @@ export async function update (req, res, { isV3 = false }) {
       uuid: user._id,
       hitType: 'event',
       category: 'behavior',
+      headers: req.headers,
     });
   }
 
@@ -187,6 +188,7 @@ export async function update (req, res, { isV3 = false }) {
         uuid: user._id,
         hitType: 'event',
         category: 'behavior',
+        headers: req.headers,u
       });
     } else if (key === 'tags') {
       if (!Array.isArray(val)) throw new BadRequest('Tag list must be an array.');
@@ -274,6 +276,7 @@ export async function reset (req, res, { isV3 = false }) {
     uuid: user._id,
     hitType: 'event',
     category: 'behavior',
+    headers: req.headers,
   });
 
   res.respond(200, ...resetRes);

From deebc09a7917c38feef173d4bf8b9db9a8946dec Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 22 May 2023 09:54:10 -0500
Subject: [PATCH 74/87] fix(analytics): typo

---
 website/server/libs/user/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/server/libs/user/index.js b/website/server/libs/user/index.js
index 13f38006d7..e3f9e8d604 100644
--- a/website/server/libs/user/index.js
+++ b/website/server/libs/user/index.js
@@ -188,7 +188,7 @@ export async function update (req, res, { isV3 = false }) {
         uuid: user._id,
         hitType: 'event',
         category: 'behavior',
-        headers: req.headers,u
+        headers: req.headers,
       });
     } else if (key === 'tags') {
       if (!Array.isArray(val)) throw new BadRequest('Tag list must be an array.');

From fe5d4a05519e68ad8e2df447f3ea5149062d522a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:34:28 -0400
Subject: [PATCH 75/87] build(deps-dev): bump sinon from 15.0.4 to 15.1.0
 (#14661)

Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.4 to 15.1.0.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 27 ++++++++-------------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b2fff16372..8bbed3357b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2281,23 +2281,12 @@
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
-      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz",
+      "integrity": "sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^2.0.0"
-      },
-      "dependencies": {
-        "@sinonjs/commons": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-          "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
-          "dev": true,
-          "requires": {
-            "type-detect": "4.0.8"
-          }
-        }
+        "@sinonjs/commons": "^3.0.0"
       }
     },
     "@sinonjs/samsam": {
@@ -13776,13 +13765,13 @@
       }
     },
     "sinon": {
-      "version": "15.0.4",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.4.tgz",
-      "integrity": "sha512-uzmfN6zx3GQaria1kwgWGeKiXSSbShBbue6Dcj0SI8fiCNFbiUDqKl57WFlY5lyhxZVUKmXvzgG2pilRQCBwWg==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.0.tgz",
+      "integrity": "sha512-cS5FgpDdE9/zx7no8bxROHymSlPLZzq0ChbbLk1DrxBfc+eTeBK3y8nIL+nu/0QeYydhhbLIr7ecHJpywjQaoQ==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^3.0.0",
-        "@sinonjs/fake-timers": "^10.0.2",
+        "@sinonjs/fake-timers": "^10.2.0",
         "@sinonjs/samsam": "^8.0.0",
         "diff": "^5.1.0",
         "nise": "^5.1.4",
diff --git a/package.json b/package.json
index 33a7b021a8..8848112414 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "monk": "^7.3.4",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.7",
-    "sinon": "^15.0.4",
+    "sinon": "^15.1.0",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
   },

From 8ba7117fa5f5a8dec342657e06a97e6a3f934f82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 12:35:07 -0400
Subject: [PATCH 76/87] build(deps): bump stripe from 12.5.0 to 12.6.0 (#14662)

Bumps [stripe](https://github.com/stripe/stripe-node) from 12.5.0 to 12.6.0.
- [Release notes](https://github.com/stripe/stripe-node/releases)
- [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-node/compare/v12.5.0...v12.6.0)

---
updated-dependencies:
- dependency-name: stripe
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 12 ++++++------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8bbed3357b..5b28ed5d4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14424,18 +14424,18 @@
       }
     },
     "stripe": {
-      "version": "12.5.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.5.0.tgz",
-      "integrity": "sha512-eDBh4bv+Uo+GdhjnQ246lM5KaOReoBzxFltgW0HJqco/QEAgSYxZPOpFbd5+gJnZlRqHSB5B+Zqw273SlbdPag==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.6.0.tgz",
+      "integrity": "sha512-aJat4pGA6fr5DvuojRVXMaOCAw8ceS3UQM4ux1BMUViG686NmOAf1psEh6Wu+NFUifoy6kV7+4APq66OlTWtTw==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.11.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
-          "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
+          "version": "6.11.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
           "requires": {
             "side-channel": "^1.0.4"
           }
diff --git a/package.json b/package.json
index 8848112414..998e3e3c17 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
-    "stripe": "^12.5.0",
+    "stripe": "^12.6.0",
     "superagent": "^8.0.9",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",

From bedce203ee5b551e404ef3ff82ad3d4faef61aa3 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 22 May 2023 13:28:31 -0500
Subject: [PATCH 77/87] 4.270.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0cb6492d5..d5f6262415 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.270.2",
+  "version": "4.270.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 33ab1cfbcc..9b82e60da7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.270.2",
+  "version": "4.270.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From a7bde803499265bfcb056a37147c6c13d55bdb40 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Mon, 22 May 2023 15:13:49 -0500
Subject: [PATCH 78/87] Squashed commit of the following:

commit 27287ac3aab594de7fbd96cd9c6a169289979bea
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:59:20 2023 -0400

    fix(typo): typos fixed

commit a4df8097cfbcaf6497119e2922f2a55cdabe200e
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:57:17 2023 -0400

    feat(content): add migration script

commit 23ff7845c1f03153f2b0688fafea686760b278a2
Merge: d02644e21b 8ba7117fa5
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Mon May 22 15:42:32 2023 -0400

    Merge branch 'develop' into achievement-dinosaur-dynasty

commit 8ba7117fa5f5a8dec342657e06a97e6a3f934f82
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 22 12:35:07 2023 -0400

    build(deps): bump stripe from 12.5.0 to 12.6.0 (#14662)

    Bumps [stripe](https://github.com/stripe/stripe-node) from 12.5.0 to 12.6.0.
    - [Release notes](https://github.com/stripe/stripe-node/releases)
    - [Changelog](https://github.com/stripe/stripe-node/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/stripe/stripe-node/compare/v12.5.0...v12.6.0)

    ---
    updated-dependencies:
    - dependency-name: stripe
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit fe5d4a05519e68ad8e2df447f3ea5149062d522a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 22 12:34:28 2023 -0400

    build(deps-dev): bump sinon from 15.0.4 to 15.1.0 (#14661)

    Bumps [sinon](https://github.com/sinonjs/sinon) from 15.0.4 to 15.1.0.
    - [Release notes](https://github.com/sinonjs/sinon/releases)
    - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
    - [Commits](https://github.com/sinonjs/sinon/compare/v15.0.4...v15.1.0)

    ---
    updated-dependencies:
    - dependency-name: sinon
      dependency-type: direct:development
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit d02644e21b3e2b76829e72b96b3a69b8ec8ea34d
Author: CuriousMagpie <eilatan@gmail.com>
Date:   Wed May 17 11:36:28 2023 -0400

    feat(content): add dinosaur dynasty achievement
---
 habitica-images                               |   2 +-
 .../2023/20230522_pet_group_achievements.js   | 158 ++++++++++++++++++
 package-lock.json                             |  39 ++---
 package.json                                  |   4 +-
 .../assets/css/sprites/spritesmith-main.css   |   5 +
 website/common/locales/en/achievements.json   |   5 +-
 website/common/script/content/achievements.js |   5 +
 .../constants/animalSetAchievements.js        |  17 ++
 website/common/script/libs/achievements.js    |   1 +
 website/server/models/user/schema.js          |   1 +
 10 files changed, 208 insertions(+), 29 deletions(-)
 create mode 100644 migrations/archive/2023/20230522_pet_group_achievements.js

diff --git a/habitica-images b/habitica-images
index dac6a71d1f..3cda1c1a27 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit dac6a71d1fa2500bf8f3ec18bf917cbe91d82d64
+Subproject commit 3cda1c1a27ef51e735ea0f6edd848f001321ec0f
diff --git a/migrations/archive/2023/20230522_pet_group_achievements.js b/migrations/archive/2023/20230522_pet_group_achievements.js
new file mode 100644
index 0000000000..59c6fe7d1d
--- /dev/null
+++ b/migrations/archive/2023/20230522_pet_group_achievements.js
@@ -0,0 +1,158 @@
+/* eslint-disable no-console */
+const MIGRATION_NAME = '20230522_pet_group_achievements';
+import { model as User } from '../../../website/server/models/user';
+
+const progressCount = 1000;
+let count = 0;
+
+async function updateUser (user) {
+  count++;
+
+  const set = {
+    migration: MIGRATION_NAME,
+  };
+
+  if (user && user.items && user.items.pets) {
+    const pets = user.items.pets;
+    if (pets['Parrot-Base']
+      && pets['Parrot-CottonCandyBlue']
+      && pets['Parrot-CottonCandyPink']
+      && pets['Parrot-Desert']
+      && pets['Parrot-Golden']
+      && pets['Parrot-Red']
+      && pets['Parrot-Shade']
+      && pets['Parrot-Skeleton']
+      && pets['Parrot-White']
+      && pets['Parrot-Zombie']
+      && pets['Rooster-Base']
+      && pets['Rooster-CottonCandyBlue']
+      && pets['Rooster-CottonCandyPink']
+      && pets['Rooster-Desert']
+      && pets['Rooster-Golden']
+      && pets['Rooster-Red']
+      && pets['Rooster-Shade']
+      && pets['Rooster-Skeleton']
+      && pets['Rooster-White']
+      && pets['Rooster-Zombie']
+      && pets['Triceratops-Base']
+      && pets['Triceratops-CottonCandyBlue']
+      && pets['Triceratops-CottonCandyPink']
+      && pets['Triceratops-Desert']
+      && pets['Triceratops-Golden']
+      && pets['Triceratops-Red']
+      && pets['Triceratops-Shade']
+      && pets['Triceratops-Skeleton']
+      && pets['Triceratops-White']
+      && pets['Triceratops-Zombie']
+      && pets['TRex-Base']
+      && pets['TRex-CottonCandyBlue']
+      && pets['TRex-CottonCandyPink']
+      && pets['TRex-Desert']
+      && pets['TRex-Golden']
+      && pets['TRex-Red']
+      && pets['TRex-Shade']
+      && pets['TRex-Skeleton']
+      && pets['TRex-White']
+      && pets['TRex-Zombie']
+      && pets['Pterodactyl-Base']
+      && pets['Pterodactyl-CottonCandyBlue']
+      && pets['Pterodactyl-CottonCandyPink']
+      && pets['Pterodactyl-Desert']
+      && pets['Pterodactyl-Golden']
+      && pets['Pterodactyl-Red']
+      && pets['Pterodactyl-Shade']
+      && pets['Pterodactyl-Skeleton']
+      && pets['Pterodactyl-White']
+      && pets['Pterodactyl-Zombie']
+      && pets['Owl-Base']
+      && pets['Owl-CottonCandyBlue']
+      && pets['Owl-CottonCandyPink']
+      && pets['Owl-Desert']
+      && pets['Owl-Golden']
+      && pets['Owl-Red']
+      && pets['Owl-Shade']
+      && pets['Owl-Skeleton']
+      && pets['Owl-White']
+      && pets['Owl-Zombie']
+      && pets['Velociraptor-Base']
+      && pets['Velociraptor-CottonCandyBlue']
+      && pets['Velociraptor-CottonCandyPink']
+      && pets['Velociraptor-Desert']
+      && pets['Velociraptor-Golden']
+      && pets['Velociraptor-Red']
+      && pets['Velociraptor-Shade']
+      && pets['Velociraptor-Skeleton']
+      && pets['Velociraptor-White']
+      && pets['Velociraptor-Zombie']
+      && pets['Penguin-Base']
+      && pets['Penguin-CottonCandyBlue']
+      && pets['Penguin-CottonCandyPink']
+      && pets['Penguin-Desert']
+      && pets['Penguin-Golden']
+      && pets['Penguin-Red']
+      && pets['Penguin-Shade']
+      && pets['Penguin-Skeleton']
+      && pets['Penguin-White']
+      && pets['Penguin-Zombie']
+      && pets['Falcon-Base']
+      && pets['Falcon-CottonCandyBlue']
+      && pets['Falcon-CottonCandyPink']
+      && pets['Falcon-Desert']
+      && pets['Falcon-Golden']
+      && pets['Falcon-Red']
+      && pets['Falcon-Shade']
+      && pets['Falcon-Skeleton']
+      && pets['Falcon-White']
+      && pets['Falcon-Zombie']
+      && pets['Peacock-Base']
+      && pets['Peacock-CottonCandyBlue']
+      && pets['Peacock-CottonCandyPink']
+      && pets['Peacock-Desert']
+      && pets['Peacock-Golden']
+      && pets['Peacock-Red']
+      && pets['Peacock-Shade']
+      && pets['Peacock-Skeleton']
+      && pets['Peacock-White']
+      && pets['Peacock-Zombie']) {
+        set['achievements.dinosaurDynasty'] = true;
+      }
+  }
+
+  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+
+  return await User.update({ _id: user._id }, { $set: set }).exec();
+}
+
+export default async function processUsers () {
+  let query = {
+    // migration: { $ne: MIGRATION_NAME },
+    'auth.timestamps.loggedin': { $gt: new Date('2023-04-15') },
+  };
+
+  const fields = {
+    _id: 1,
+    items: 1,
+  };
+
+  while (true) { // eslint-disable-line no-constant-condition
+    const users = await User // eslint-disable-line no-await-in-loop
+      .find(query)
+      .limit(250)
+      .sort({_id: 1})
+      .select(fields)
+      .lean()
+      .exec();
+
+    if (users.length === 0) {
+      console.warn('All appropriate users found and modified.');
+      console.warn(`\n${count} users processed\n`);
+      break;
+    } else {
+      query._id = {
+        $gt: users[users.length - 1]._id,
+      };
+    }
+
+    await Promise.all(users.map(updateUser)); // eslint-disable-line no-await-in-loop
+  }
+};
diff --git a/package-lock.json b/package-lock.json
index d5f6262415..28b14e04c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2281,23 +2281,12 @@
       }
     },
     "@sinonjs/fake-timers": {
-      "version": "10.0.2",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz",
-      "integrity": "sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.2.0.tgz",
+      "integrity": "sha512-OPwQlEdg40HAj5KNF8WW6q2KG4Z+cBCZb3m4ninfTZKaBmbIJodviQsDBoYMPHkOyJJMHnOJo5j2+LKDOhOACg==",
       "dev": true,
       "requires": {
-        "@sinonjs/commons": "^2.0.0"
-      },
-      "dependencies": {
-        "@sinonjs/commons": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-2.0.0.tgz",
-          "integrity": "sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==",
-          "dev": true,
-          "requires": {
-            "type-detect": "4.0.8"
-          }
-        }
+        "@sinonjs/commons": "^3.0.0"
       }
     },
     "@sinonjs/samsam": {
@@ -13776,13 +13765,13 @@
       }
     },
     "sinon": {
-      "version": "15.0.4",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.0.4.tgz",
-      "integrity": "sha512-uzmfN6zx3GQaria1kwgWGeKiXSSbShBbue6Dcj0SI8fiCNFbiUDqKl57WFlY5lyhxZVUKmXvzgG2pilRQCBwWg==",
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.1.0.tgz",
+      "integrity": "sha512-cS5FgpDdE9/zx7no8bxROHymSlPLZzq0ChbbLk1DrxBfc+eTeBK3y8nIL+nu/0QeYydhhbLIr7ecHJpywjQaoQ==",
       "dev": true,
       "requires": {
         "@sinonjs/commons": "^3.0.0",
-        "@sinonjs/fake-timers": "^10.0.2",
+        "@sinonjs/fake-timers": "^10.2.0",
         "@sinonjs/samsam": "^8.0.0",
         "diff": "^5.1.0",
         "nise": "^5.1.4",
@@ -14435,18 +14424,18 @@
       }
     },
     "stripe": {
-      "version": "12.5.0",
-      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.5.0.tgz",
-      "integrity": "sha512-eDBh4bv+Uo+GdhjnQ246lM5KaOReoBzxFltgW0HJqco/QEAgSYxZPOpFbd5+gJnZlRqHSB5B+Zqw273SlbdPag==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/stripe/-/stripe-12.6.0.tgz",
+      "integrity": "sha512-aJat4pGA6fr5DvuojRVXMaOCAw8ceS3UQM4ux1BMUViG686NmOAf1psEh6Wu+NFUifoy6kV7+4APq66OlTWtTw==",
       "requires": {
         "@types/node": ">=8.1.0",
         "qs": "^6.11.0"
       },
       "dependencies": {
         "qs": {
-          "version": "6.11.1",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
-          "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
+          "version": "6.11.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
+          "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
           "requires": {
             "side-channel": "^1.0.4"
           }
diff --git a/package.json b/package.json
index 9b82e60da7..b82b0ba176 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "remove-markdown": "^0.5.0",
     "rimraf": "^3.0.2",
     "short-uuid": "^4.2.2",
-    "stripe": "^12.5.0",
+    "stripe": "^12.6.0",
     "superagent": "^8.0.9",
     "universal-analytics": "^0.5.3",
     "useragent": "^2.1.9",
@@ -122,7 +122,7 @@
     "monk": "^7.3.4",
     "require-again": "^2.0.0",
     "run-rs": "^0.7.7",
-    "sinon": "^15.0.4",
+    "sinon": "^15.1.0",
     "sinon-chai": "^3.7.0",
     "sinon-stub-promise": "^4.0.0"
   },
diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index b3c0c74c78..271abcba15 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -138,6 +138,11 @@
   width: 48px;
   height: 52px;
 }
+.achievement-dinosaurDynasty2x {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-dinosaurDynasty2x.png');
+  width: 68px;
+  height: 68px;
+}
 .achievement-domesticated2x {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-domesticated2x.png');
   width: 60px;
diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json
index 7650882af5..7e4aba8355 100644
--- a/website/common/locales/en/achievements.json
+++ b/website/common/locales/en/achievements.json
@@ -147,5 +147,8 @@
   "achievementPolarProModalText": "You collected all the Polar Pets!",
   "achievementPlantParent": "Plant Parent",
   "achievementPlantParentText": "Has hatched all standard colors of Plant pets: Cactus and Treeling!",
-  "achievementPlantParentModalText": "You collected all the Plant Pets!"
+  "achievementPlantParentModalText": "You collected all the Plant Pets!",
+  "achievementDinosaurDynasty": "Dinosaur Dynasty",
+  "achievementDinosaurDynastyText": "Has hatched all standard colors of bird and dinosaur pets: Falcon, Owl, Parrot, Peacock, Penguin, Rooster, Pterodactyl, T-Rex, Triceratops, and Velociraptor!",
+  "achievementDinosaurDynastyModalText": "You collected all the bird and dinosaur pets!"
 }
diff --git a/website/common/script/content/achievements.js b/website/common/script/content/achievements.js
index dfc0e46df4..a7e843d23d 100644
--- a/website/common/script/content/achievements.js
+++ b/website/common/script/content/achievements.js
@@ -178,6 +178,11 @@ const animalSetAchievs = {
     titleKey: 'achievementBirdsOfAFeather',
     textKey: 'achievementBirdsOfAFeatherText',
   },
+  dinosaurDynasty: {
+    icon: 'achievement-dinosaurDynasty',
+    titleKey: 'achievementDinosaurDynasty',
+    textKey: 'achievementDinosaurDynastyText',
+  },
   domesticated: {
     icon: 'achievement-domesticated',
     titleKey: 'achievementDomesticated',
diff --git a/website/common/script/content/constants/animalSetAchievements.js b/website/common/script/content/constants/animalSetAchievements.js
index 6f6569ff5b..dc49609d12 100644
--- a/website/common/script/content/constants/animalSetAchievements.js
+++ b/website/common/script/content/constants/animalSetAchievements.js
@@ -26,6 +26,23 @@ const ANIMAL_SET_ACHIEVEMENTS = {
     achievementKey: 'birdsOfAFeather',
     notificationType: 'ACHIEVEMENT_ANIMAL_SET',
   },
+  dinosaurDynasty: {
+    type: 'pet',
+    species: [
+      'Falcon',
+      'Owl',
+      'Parrot',
+      'Peacock',
+      'Penguin',
+      'Rooster',
+      'Pterodactyl',
+      'TRex',
+      'Triceratops',
+      'Velociraptor',
+    ],
+    achievementKey: 'dinosaurDynasty',
+    notificationType: 'ACHIEVEMENT_ANIMAL_SET',
+  },
   domesticated: {
     type: 'pet',
     species: [
diff --git a/website/common/script/libs/achievements.js b/website/common/script/libs/achievements.js
index d02f8b2c2a..d28155e6e5 100644
--- a/website/common/script/libs/achievements.js
+++ b/website/common/script/libs/achievements.js
@@ -222,6 +222,7 @@ function _getBasicAchievements (user, language) {
   _addSimple(result, user, { path: 'boneToPick', language });
   _addSimple(result, user, { path: 'polarPro', language });
   _addSimple(result, user, { path: 'plantParent', language });
+  _addSimple(result, user, { path: 'dinosaurDynasty', language });
 
   _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
   _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js
index a0148bc7dc..8a98ee17ce 100644
--- a/website/server/models/user/schema.js
+++ b/website/server/models/user/schema.js
@@ -154,6 +154,7 @@ export default new Schema({
     boneToPick: Boolean,
     polarPro: Boolean,
     plantParent: Boolean,
+    dinosaurDynasty: Boolean,
     // Onboarding Guide
     createdTask: Boolean,
     completedTask: Boolean,

From f755d4c133d4a7c5447ab7754cf20f92391b242f Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 23 May 2023 09:07:47 -0500
Subject: [PATCH 79/87] 4.271.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28b14e04c9..2887b6791f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.270.3",
+  "version": "4.271.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b82b0ba176..4e77dc2efe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.270.3",
+  "version": "4.271.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From 86b15cb5806e7c279560ef5aeb4fbd97cf4d80fb Mon Sep 17 00:00:00 2001
From: CuriousMagpie <eilatan@gmail.com>
Date: Tue, 23 May 2023 15:19:26 -0400
Subject: [PATCH 80/87] fix(style): css fix, today if-statement added

---
 website/client/src/components/tasks/task.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue
index deb8942bfb..66a15c97ec 100644
--- a/website/client/src/components/tasks/task.vue
+++ b/website/client/src/components/tasks/task.vue
@@ -241,7 +241,7 @@
             >
               <div
                 v-b-tooltip.hover.bottom="$t('dueDate')"
-                class="svg-icon calendar"
+                class="svg-icon calendar my-auto"
                 v-html="icons.calendar"
               ></div>
               <span>{{ $t('due') }} {{ formatDueDate() }}</span>
@@ -899,8 +899,7 @@
   }
 </style>
 <!-- eslint-enable max-len -->
-
-
+<!-- eslint-disable-next-line vue/component-tags-order -->
 <script>
 import moment from 'moment';
 import { v4 as uuid } from 'uuid';
@@ -1130,6 +1129,9 @@ export default {
       return this.calculateTimeTillDue().asDays() < 0;
     },
     formatDueDate () {
+      if (moment().isSame(this.task.date, 'day')) {
+        return this.$t('today');
+      }
       return moment(this.task.date).format(this.user.preferences.dateFormat.toUpperCase());
     },
     edit (e, task) {

From d4a5823916b0346097fbe9d10724030759472c97 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 24 May 2023 20:29:42 +0200
Subject: [PATCH 81/87] Fix one-off issue for monthly subs (#14643)

* Fix initial plan.consecutive.offset for 1 month subs

* fix initial values for group plan subs

* Make perkMonthCount editable in admin panel

* Add aditional info to admin panel

* Implement automatic fix for affected users

* fix(lint): exclusive test, code style

* fixes

* fix issue with initialization

---------

Co-authored-by: SabreCat <sabe@habitica.com>
---
 test/api/unit/libs/payments/payments.test.js  | 12 +++++++++++-
 .../user-support/subscriptionAndPerks.vue     | 19 +++++++++++++++++--
 website/server/libs/payments/groupPayments.js |  1 +
 website/server/libs/payments/subscriptions.js |  7 ++++++-
 website/server/models/subscriptionPlan.js     |  9 ++++++++-
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/test/api/unit/libs/payments/payments.test.js b/test/api/unit/libs/payments/payments.test.js
index 697a13fe1b..438b8def23 100644
--- a/test/api/unit/libs/payments/payments.test.js
+++ b/test/api/unit/libs/payments/payments.test.js
@@ -748,9 +748,19 @@ describe('payments/index', () => {
       });
 
       it('does not add to plans.consecutive.offset if 1 month subscription', async () => {
+        data.sub.key = 'basic_earned';
         await api.createSubscription(data);
 
-        expect(user.purchased.plan.extraMonths).to.eql(0);
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
+      });
+
+      it('resets plans.consecutive.offset if 1 month subscription', async () => {
+        user.purchased.plan.consecutive.offset = 1;
+        await user.save();
+        data.sub.key = 'basic_earned';
+        await api.createSubscription(data);
+
+        expect(user.purchased.plan.consecutive.offset).to.eql(0);
       });
 
       it('adds 5 to plan.consecutive.gemCapExtra for 3 month block', async () => {
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 9e7ffff117..5c5e3e8a43 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -17,10 +17,18 @@
           Payment schedule ("basic-earned" is monthly):
           <strong>{{ hero.purchased.plan.planId }}</strong>
         </div>
+        <div v-if="hero.purchased.plan.planId == 'group_plan_auto'">
+          Group plan ID:
+          <strong>{{ hero.purchased.plan.owner }}</strong>
+        </div>
         <div v-if="hero.purchased.plan.dateCreated">
           Creation date:
           <strong>{{ dateFormat(hero.purchased.plan.dateCreated) }}</strong>
         </div>
+        <div v-if="hero.purchased.plan.dateCurrentTypeCreated">
+          Start date for current subscription type:
+          <strong>{{ dateFormat(hero.purchased.plan.dateCurrentTypeCreated) }}</strong>
+        </div>
         <div>
           Termination date:
           <strong
@@ -46,9 +54,16 @@
           Perk offset months:
           <strong>{{ hero.purchased.plan.consecutive.offset }}</strong>
         </div>
-        <div>
+        <div class="form-inline">
           Perk month count:
-          <strong>{{ hero.purchased.plan.perkMonthCount }}</strong>
+          <input
+              v-model="hero.purchased.plan.perkMonthCount"
+              class="form-control"
+              type="number"
+              min="0"
+              max="2"
+              step="1"
+            >
         </div>
         <div>
           Next Mystic Hourglass:
diff --git a/website/server/libs/payments/groupPayments.js b/website/server/libs/payments/groupPayments.js
index b59566c2fb..dfd7f7eea5 100644
--- a/website/server/libs/payments/groupPayments.js
+++ b/website/server/libs/payments/groupPayments.js
@@ -180,6 +180,7 @@ async function addSubToGroupUser (member, group) {
   }
 
   // save unused hourglass and mystery items
+  plan.perkMonthCount = memberPlan.perkMonthCount;
   plan.consecutive.trinkets = memberPlan.consecutive.trinkets;
   plan.mysteryItems = memberPlan.mysteryItems;
 
diff --git a/website/server/libs/payments/subscriptions.js b/website/server/libs/payments/subscriptions.js
index ce609e022d..41e2d1ff26 100644
--- a/website/server/libs/payments/subscriptions.js
+++ b/website/server/libs/payments/subscriptions.js
@@ -253,13 +253,18 @@ async function createSubscription (data) {
   } = await prepareSubscriptionValues(data);
 
   // Block sub perks
-  if (months > 0 && (!data.gift || !isNewSubscription)) {
+  if (months > 1 && (!data.gift || !isNewSubscription)) {
     if (!data.gift && !groupId) {
       plan.consecutive.offset = block.months;
     }
+  } else if (months === 1) {
+    plan.consecutive.offset = 0;
   }
   if (months > 1 || data.gift) {
     await plan.incrementPerkCounterAndReward(recipient._id, months);
+  } else {
+    // Make sure the perkMonthCount field is initialized.
+    await plan.incrementPerkCounterAndReward(recipient._id, 0);
   }
 
   if (recipient !== group) {
diff --git a/website/server/models/subscriptionPlan.js b/website/server/models/subscriptionPlan.js
index 31849ceb94..8bc7daa587 100644
--- a/website/server/models/subscriptionPlan.js
+++ b/website/server/models/subscriptionPlan.js
@@ -56,13 +56,20 @@ schema.methods.incrementPerkCounterAndReward = async function incrementPerkCount
   if (typeof adding === 'string' || adding instanceof String) {
     addingNumber = parseInt(adding, 10);
   }
+  const isSingleMonthPlan = this.planId === 'basic_earned' || this.planId === 'group_plan_auto' || this.planId === 'group_monthly';
   // if perkMonthCount wasn't used before, initialize it.
   if (this.perkMonthCount === undefined || this.perkMonthCount === -1) {
-    if (this.planId === 'basic_earned') {
+    if (isSingleMonthPlan && this.consecutive.count > 0) {
       this.perkMonthCount = (this.consecutive.count - 1) % SUBSCRIPTION_BASIC_BLOCK_LENGTH;
     } else {
       this.perkMonthCount = 0;
     }
+  } else if (isSingleMonthPlan) {
+    const expectedPerkMonthCount = (this.consecutive.count - 1) % SUBSCRIPTION_BASIC_BLOCK_LENGTH;
+    if (this.perkMonthCount === (expectedPerkMonthCount - 1)) {
+      // User was affected by a bug that makes their perkMonthCount off by one
+      this.perkMonthCount += 1;
+    }
   }
   this.perkMonthCount += addingNumber;
 

From 5745e3df5f635badb76278ae186e7fccaf4e4988 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Wed, 24 May 2023 13:30:21 -0500
Subject: [PATCH 82/87] 4.271.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2887b6791f..90e371ee80 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.271.0",
+  "version": "4.271.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 4e77dc2efe..d1cbce5350 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.271.0",
+  "version": "4.271.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From 69c538858b61d0df36c4d1757c19633b07a52e1a Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Thu, 25 May 2023 14:42:53 -0500
Subject: [PATCH 83/87] 4.271.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 90e371ee80..3df0de8818 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.271.1",
+  "version": "4.271.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d1cbce5350..bbd744a2c9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.271.1",
+  "version": "4.271.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",

From deba7b6220d43dbb4dc1ddc2091a67ee8af36163 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 30 May 2023 14:50:13 -0500
Subject: [PATCH 84/87] feat(faq): update for mobile workflows

---
 website/common/locales/en/faq.json | 60 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/website/common/locales/en/faq.json b/website/common/locales/en/faq.json
index b648b36765..ce5194df2c 100644
--- a/website/common/locales/en/faq.json
+++ b/website/common/locales/en/faq.json
@@ -48,9 +48,9 @@
   "webFaqAnswer8": "The blue bar that appeared when you hit level 10 and chose a Class is your Mana bar. As you continue to level up, you will unlock special Skills that cost Mana to use. Each Class has different Skills, which appear after level 11 in the action bar at the bottom of the screen. Unlike your Health bar, your Mana bar does not reset when you gain a level. Instead, Mana is gained when you complete good Habits, Dailies, and To Do's, and lost when you indulge bad Habits. You'll also regain some Mana overnight -- the more Dailies you completed, the more you will gain.",
 
   "faqQuestion9": "How do I take on Quests?",
-  "iosFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
-  "androidFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
-  "webFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
+  "iosFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
+  "androidFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
+  "webFaqAnswer9": "First, you need to join or start a Party by selecting \"Party\" in the navigation menu. Although you can take on Quests alone, we recommend playing with others to make the Quest faster and boost your motivation with extra accountability.\n\nOnce you’re in a Party, you can invite Party members to any Quest scrolls in your Inventory. After everyone accepts, the Quest will begin. To progress, complete your tasks as you normally would! You’ll either build up damage against a monster if you’re taking on a Boss Quest, or have a chance to find items if you’re taking on a Collection Quest. All pending progress is applied the next day.\n\nWhen your Party members do enough damage or collect all items, the Quest ends and everyone will receive their rewards!",
 
   "faqQuestion10": "What are Gems, and how do I get them?",
   "iosFaqAnswer10": "Gems are purchased with real money from Menu > Purchase Gems. When you buy Gems, you are helping us to keep Habitica running. We’re very grateful for every bit of support!\n\n In addition to buying Gems directly, there are three other ways players can gain Gems:\n\n * Win a Challenge that has been set up by another player. Go to Menu > Challenges to join some.\n * Subscribe and unlock the ability to buy a certain number of Gems per month.\n * Contribute your skills to the Habitica project. See this wiki page for more details: [Contributing to Habitica](https://habitica.fandom.com/wiki/Contributing_to_Habitica).\n\n Keep in mind that items purchased with Gems do not offer any statistical advantages, so players can still make use of the app without them!",
@@ -75,29 +75,29 @@
   "parties": "Parties",
 
   "faqQuestion14": "How do I find a Party when I'm not in one?",
-  "iosFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.",
-  "androidFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.",
-  "webFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation then choose the option that works for you.",
+  "iosFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
+  "androidFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
+  "webFaqAnswer14": "If you want to experience Habitica with others but don’t know other players, searching for a Party is your best option! If you already know other players that have a Party, you can share your @username with them to be invited. Alternatively, you can create a new Party and invite them with their @username or email address.\n\nTo create or search for a Party, select “Party” in the navigation menu, then choose the option that works for you.",
 
   "faqQuestion15": "How does searching for a Party work?",
-  "iosFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
-  "androidFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
-  "webFaqAnswer15": "After selecting “Look for a Party” in the Party pop-up, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+  "iosFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+  "androidFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
+  "webFaqAnswer15": "After selecting “Look for a Party”, you’ll be added to a list of players that want to join a Party. Party leaders can view this list and send invitations. Once you receive an invitation, you can accept it from your notifications to join the Party of your choosing!\n\nYou may get multiple invitations to different Parties. However, you can only be a member of one Party at a time.",
 
   "faqQuestion16": "How long can I search for a Party after joining the list?",
-  "iosFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.",
-  "androidFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.",
-  "webFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first.",
+  "iosFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
+  "androidFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
+  "webFaqAnswer16": "You will remain in the list until you accept an invite to a Party or don’t login for 7 days, whichever comes first. If you log in after being inactive for 7 days, we’ll automatically add you back to the list as long as you don't have a pending invite.",
 
   "faqQuestion17": "Can I stop searching for a Party?",
-  "iosFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.",
-  "androidFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.",
-  "webFaqAnswer17": "You can leave the list at any time. To stop searching for Party on the website, select the “Party” link in the navigation then click “Leave” in the pop-up.",
+  "iosFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
+  "androidFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
+  "webFaqAnswer17": "If you no longer want to find a Party, you can stop searching at any time.\n\nTo stop searching for a Party on Habitica’s website:\n\n1. Select the “Party” link in the navigation.\n2. Click “Leave” in the pop-up.\n\nTo stop searching for a Party on the Android app:\n1. Tap on “Party” from the menu.\n2. Tap “Leave” at the bottom of the screen.",
 
   "faqQuestion18": "I have a Party, how do I find more members?",
-  "iosFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
-  "androidFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
-  "webFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. This will display a list of Habitica players that are actively looking for a Party and can be invited to join.\n\nYou'll see some information, such as language, class, level, and how many days they have used Habitica to help find a good fit for your Party. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+  "iosFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+  "androidFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
+  "webFaqAnswer18": "If you are using Habitica’s website, select “Find Members” from the Party dropdown. If you’re using the Android app, tap “Find Members” above your Party’s member list. This will display a list of players that are actively looking for a Party and can be invited to join.\n\nTo help find a good fit for your Party, you'll see some information, such as language, class, level, and how many days they have used Habitica. If you’d like to chat with someone before sending an invite, you can view their Profile and send a message.",
 
   "faqQuestion19": "How many members can I invite to my Party?",
   "iosFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.",
@@ -105,19 +105,19 @@
   "webFaqAnswer19": "Parties have a maximum limit of 30 members and a minimum of 1 member. Pending invites count towards the member count. For example, 29 members and 1 pending invite would count as 30 members. To clear a pending invite, the invited player must accept or decline, or the Party leader must cancel the invite.",
 
   "faqQuestion20": "Can I invite someone I already know?",
-  "iosFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
-  "androidFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
-  "webFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\n## On Habitica’s website\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\n## On iOS and Android\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+  "iosFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+  "androidFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
+  "webFaqAnswer20": "Yes! If you already have a Habitica player’s username or email address, you can invite them to join your Party. Here’s how to send an invite on the different platforms:\n\nOn Habitica’s website:\n\nNavigate to your Party and click “Invite to Party” on the right-hand side of the page.\n\nOn the Android app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Find Members” then tap the “By Invite” tab.\n\nOn the iOS app:\n\nTap “Party” from the Menu. Scroll to the Members section and tap “Invite a Member”.",
 
   "faqQuestion21": "How do I cancel a pending invitation to my Party?",
-  "iosFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!",
-  "androidFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!",
-  "webFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party\n\n2. Click the “Invites” tab\n\n3. Click the three dots beside the user’s invite you wish to cancel\n\n4. Choose “Cancel Invite”\n\n\n\nYou’ll be able to cancel a pending invitation from the mobile apps soon as well!",
+  "iosFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
+  "androidFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
+  "webFaqAnswer21": "To cancel a pending invitation on Habitica’s website:\n\n1. Click on Member list when viewing your Party.\n2. Click the “Invites” tab.\n3. Click the three dots beside the user’s invite you wish to cancel.\n4. Choose “Cancel Invite”\n\nTo cancel a pending invitation on the Android app:\n\n1. Scroll down to your Member list when viewing your Party.\n2. At the bottom of the list, you’ll see your pending invites.\n3. Tap the “Cancel invitation” button.\n\nYou’ll be able to cancel a pending invitation from the iOS app soon as well!",
 
   "faqQuestion22": "How do I stop unwanted invitations?",
-  "iosFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
-  "androidFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
-  "webFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+  "iosFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+  "androidFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
+  "webFaqAnswer22": "Once you join a Party you’ll stop receiving any more invitations. If you want to prevent invites and future communications from a specific player, view their profile and click the Block button. On mobile profiles, tap the three dots in the top corner then select “Block”.\n\nIf you encounter a situation where you believe another player has broken our Community Guidelines in their name, profile, or a message they sent, please report any messages or reach out to us at admin@habitica.com.",
 
   "faqQuestion23": "How do I filter the list of members searching for a Party?",
   "iosFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.",
@@ -125,9 +125,9 @@
   "webFaqAnswer23": "At the moment there is no way to filter the list of members searching for a Party. However, we have plans to introduce filters in the future, such as class, level, and language.",
 
   "faqQuestion24": "How do I search for a Party on Android or iOS?",
-  "iosFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.",
-  "androidFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.",
-  "webFaqAnswer24": "We’re working on adding the ability to search for a Party and find Party members on mobile soon! Keep an eye out for Android version 4.2 and iOS version 3.8.",
+  "iosFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
+  "androidFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
+  "webFaqAnswer24": "We added the ability to look for a Party and find Party members in Android version 4.2! Be sure you’re updated to the latest version to check it out. Solo players can look for a Party from the Party screen when they aren’t in one. Party leaders can browse the list of players looking for an invite by tapping “Find Members” above their Party’s member list.\n\nSupport for the feature is coming to iOS in version 3.8, so keep an eye out soon!",
 
   "iosFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",
   "androidFaqStillNeedHelp": "If you have a question that isn't on this list or on the [Wiki FAQ](https://habitica.fandom.com/wiki/FAQ), come ask in the Tavern chat under Menu > Tavern! We're happy to help.",

From ba883ae104f2b5fec5a17e17403703198ae7f11f Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 30 May 2023 14:55:00 -0500
Subject: [PATCH 85/87] chore(subproj): update habitica-images

---
 habitica-images | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/habitica-images b/habitica-images
index 3cda1c1a27..20ac2874d5 160000
--- a/habitica-images
+++ b/habitica-images
@@ -1 +1 @@
-Subproject commit 3cda1c1a27ef51e735ea0f6edd848f001321ec0f
+Subproject commit 20ac2874d5f9f835c8a2885795ee7e17da72506c

From 867eed176e528319b850623ccc8d121774377fd3 Mon Sep 17 00:00:00 2001
From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com>
Date: Tue, 30 May 2023 16:26:16 -0400
Subject: [PATCH 86/87] feat(content): add June subscriber items (#14669)

Co-authored-by: SabreCat <sabe@habitica.com>
---
 .../assets/css/sprites/spritesmith-main.css   | 30 +++++++++++++++++++
 website/common/locales/en/gear.json           |  6 +++-
 website/common/locales/en/subscriber.json     |  1 +
 .../script/content/gear/sets/mystery.js       |  2 ++
 4 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css
index 271abcba15..589aaccdfa 100644
--- a/website/client/src/assets/css/sprites/spritesmith-main.css
+++ b/website/client/src/assets/css/sprites/spritesmith-main.css
@@ -28010,6 +28010,36 @@
   width: 68px;
   height: 68px;
 }
+.broad_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
+.shop_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_armor_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_set_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_set_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.shop_weapon_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_weapon_mystery_202306.png');
+  width: 68px;
+  height: 68px;
+}
+.slim_armor_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/slim_armor_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
+.weapon_mystery_202306 {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/weapon_mystery_202306.png');
+  width: 114px;
+  height: 90px;
+}
 .broad_armor_mystery_301404 {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/broad_armor_mystery_301404.png');
   width: 90px;
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 28a2b6a77f..3cc49c3fea 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -506,7 +506,9 @@
   "weaponMystery202211Text": "Electromancer Staff",
   "weaponMystery202211Notes": "Harness the awesome power of a lightning storm with this staff. Confers no benefit. November 2022 Subscriber Item.",
   "weaponMystery202212Text": "Glacial Wand",
-  "weaponMystery202212Notes": "The glowing snowflake in this wand holds the power to warm hearts on even the coldest winter night! Confers no benefit. December 2022 Subscriber Item.",  
+  "weaponMystery202212Notes": "The glowing snowflake in this wand holds the power to warm hearts on even the coldest winter night! Confers no benefit. December 2022 Subscriber Item.",
+  "weaponMystery202306Text": "Rainbow Umbrella",
+  "weaponMystery202306Notes": "Shine proud and bring a shimmering prism of color wherever you go! Confers no benefit. June 2023 Subscriber Item.",  
   "weaponMystery301404Text": "Steampunk Cane",
   "weaponMystery301404Notes": "Excellent for taking a turn about town. March 3015 Subscriber Item. Confers no benefit.",
 
@@ -1267,6 +1269,8 @@
   "armorMystery202212Notes": "The universe can be cold, but this charming dress will keep you cozy as you fly. Confers no benefit. December 2022 Subscriber Item.",
   "armorMystery202304Text": "Tiptop Teapot Armor",
   "armorMystery202304Notes": "Here is your handle and here is your spout! Confers no benefit. April 2023 Subscriber Item.",
+  "armorMystery202306Text": "Rainbow Parka",
+  "armorMystery202306Notes": "No one’s going to rain on your parade! And if they try, you’ll stay colorful and dry! Confers no benefit. June 2023 Subscriber Item.",
 
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json
index 04ff983479..165ebafe44 100644
--- a/website/common/locales/en/subscriber.json
+++ b/website/common/locales/en/subscriber.json
@@ -150,6 +150,7 @@
     "mysterySet202303": "Mane Character Set",
     "mysterySet202304": "Tiptop Teapot Set",
     "mysterySet202305": "Eventide Dragon Set",
+    "mysterySet202306": "Razzle Dazzle Rainbow Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",
diff --git a/website/common/script/content/gear/sets/mystery.js b/website/common/script/content/gear/sets/mystery.js
index 0800c2363d..c80002ac24 100644
--- a/website/common/script/content/gear/sets/mystery.js
+++ b/website/common/script/content/gear/sets/mystery.js
@@ -61,6 +61,7 @@ const armor = {
   202210: { },
   202212: { },
   202304: { },
+  202306: { },
   301404: { },
   301703: { },
   301704: { },
@@ -267,6 +268,7 @@ const weapon = {
   202201: { },
   202212: { },
   202209: { },
+  202306: { },
   301404: { },
 };
 

From a5602eec8d51f3d4662253bf7c39896ed29a2a24 Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 30 May 2023 15:28:16 -0500
Subject: [PATCH 87/87] 4.272.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3df0de8818..87c4562e34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.271.2",
+  "version": "4.272.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index bbd744a2c9..a5983b0004 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.271.2",
+  "version": "4.272.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.21.8",