Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.205.0",
+  "version": "4.205.2",
   "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.205.0",
+  "version": "4.205.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.15.5",

website/client/src/mixins/reportBug.js

@@ -5,7 +5,7 @@ export default {
     ...mapState({ user: 'user.data' }),
     bugReportMailto () {
       let subscriptionInfo = 'Not Subscribed';
-      if (this.user.purchased.plan.planId) {
+      if (this.user.purchased.plan.customerId) {
         subscriptionInfo = `
           Subscription: ${this.user.purchased.plan.planId}%0d%0a
           Payment Platform: ${this.user.purchased.plan.paymentMethod}%0d%0a

website/common/script/content/bundles.js

@@ -176,8 +176,9 @@ const bundles = {
       'penguin',
       'rooster',
     ],
+    event: EVENTS.bundle202109,
     canBuy () {
-      return moment().isBetween('2018-12-11', '2019-01-02');
+      return moment().isBefore(EVENTS.bundle202109.end);
     },
     type: 'quests',
     value: 7,

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

@@ -9,9 +9,9 @@ const gemsPromo = {
 };
 
 export const EVENTS = {
-  noCurrentEvent2021: {
-    start: '2021-08-31T20:00-04:00',
-    end: '2021-09-23T08:00-04:00',
+  bundle202109: {
+    start: '2021-09-13T08:00-04:00',
+    end: '2021-09-30T20:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },

website/common/script/content/shop-featuredItems.js

@@ -54,8 +54,8 @@ const featuredItems = {
         path: 'quests.slime',
       },
       {
-        type: 'quests',
-        path: 'quests.taskwoodsTerror1',
+        type: 'bundles',
+        path: 'bundles.birdBuddies',
       },
     ];
   },