Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.235.0",
+  "version": "4.235.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.235.0",
+  "version": "4.235.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.18.6",

website/common/script/content/appearance/sets.js

@@ -1,5 +1,6 @@
 import t from '../translation';
 import prefill from './prefill';
+import { EVENTS } from '../constants';
 
 export default prefill({
   baseHair1: { setPrice: 5, text: t('hairSet1') },
@@ -29,7 +30,7 @@ export default prefill({
     setPrice: 5, availableFrom: '2021-09-28T08:00-04:00', availableUntil: '2021-10-31T20:00-04:00', text: t('supernaturalSkins'),
   },
   splashySkins: {
-    setPrice: 5, availableFrom: '2021-07-13T08:00-04:00', availableUntil: '2021-07-31T20:00-04:00', text: t('splashySkins'),
+    setPrice: 5, availableFrom: '2022-07-05T08:00-05:00', availableUntil: EVENTS.summer2022.end, text: t('splashySkins'),
   },
   winterySkins: {
     setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winterySkins'),