Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.191.0",
+  "version": "4.192.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.191.0",
+  "version": "4.192.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.13.16",

website/common/locales/en/gear.json

@@ -2175,7 +2175,7 @@
   "shieldArmoireChocolateFoodText": "Chocolate",
   "shieldArmoireChocolateFoodNotes": "Everybody likes a little chocolate, but some of your pets are keener than others... Increases Intelligence by <%= int %>. Enchanted Armoire: Pet Food Set (Item 8 of 10).",
   "shieldArmoireBlueCottonCandyFoodText": "Blue Cotton Candy",
-  "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 9).",
+  "shieldArmoireBlueCottonCandyFoodNotes": "A sweet treat for the pets with a sweet tooth. But who will like it best? Increases Constitution by <%= con %>. Enchanted Armoire: Pet Food Set (Item 9 of 10).",
 
   "back": "Back Accessory",
   "backCapitalized": "Back Accessory",

website/common/script/content/constants/events.js

@@ -10,11 +10,17 @@ const gemsPromo = {
 
 export const EVENTS = {
   noCurrentEvent2021: {
-    start: '2021-04-30T20:00-05:00',
+    start: '2021-05-31T20:00-05:00',
     end: '2021-08-23T08:00-05:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  potions202105: {
+    start: '2021-05-11T08:00-05:00',
+    end: '2021-05-31T20:00-05:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   spring2021: {
     start: '2021-03-23T08:00-05:00',
     end: '2021-04-30T20:00-05:00',

website/common/script/content/hatching-potions.js

@@ -86,18 +86,27 @@ const premium = {
     value: 2,
     text: t('hatchingPotionFairy'),
     limited: true,
+    event: EVENTS.potions202105,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMay'),
-      previousDate: t('mayYYYY', { year: 2017 }),
+      previousDate: t('mayYYYY', { year: 2020 }),
     }),
     canBuy () {
-      return moment().isBefore('2020-06-02');
+      return moment().isBefore(EVENTS.potions202105.end);
     },
   },
   Floral: {
     value: 2,
     text: t('hatchingPotionFloral'),
     limited: true,
+    event: EVENTS.potions202105,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndMay'),
+      previousDate: t('mayYYYY', { year: 2016 }),
+    }),
+    canBuy () {
+      return moment().isBefore(EVENTS.potions202105.end);
+    },
   },
   Aquatic: {
     value: 2,

website/common/script/libs/shops-seasonal.config.js

@@ -7,7 +7,7 @@ import {
 } from '../content/constants';
 
 const CURRENT_EVENT = find(
-  EVENTS, event => moment().isBetween(event.start, event.end) && Boolean(event.season),
+  EVENTS, event => moment().isBetween(event.start, event.end),
 );
 
 const SHOP_OPEN = CURRENT_EVENT && ['winter', 'spring', 'summer', 'fall'].includes(CURRENT_EVENT.season);
@@ -18,8 +18,8 @@ export default {
   currentSeason: SHOP_OPEN ? upperFirst(CURRENT_EVENT.season) : 'Closed',
 
   dateRange: {
-    start: SHOP_OPEN ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(),
-    end: SHOP_OPEN ? moment(CURRENT_EVENT.end) : moment().subtract(1, 'seconds').toDate(),
+    start: CURRENT_EVENT ? moment(CURRENT_EVENT.start) : moment().subtract(1, 'days').toDate(),
+    end: CURRENT_EVENT ? moment(CURRENT_EVENT.end) : moment().subtract(1, 'seconds').toDate(),
   },
 
   availableSets: SHOP_OPEN