diff --git a/package-lock.json b/package-lock.json index a8df13057e..06b7c9d759 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.243.0", + "version": "4.244.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3e65e3feac..24e025c9d2 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.243.0", + "version": "4.244.1", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.18.13", diff --git a/website/client/src/components/avatarModal/hair-settings.vue b/website/client/src/components/avatarModal/hair-settings.vue index d2c7e723d8..d04b33cce6 100644 --- a/website/client/src/components/avatarModal/hair-settings.vue +++ b/website/client/src/components/avatarModal/hair-settings.vue @@ -27,7 +27,7 @@ diff --git a/website/client/src/components/avatarModal/skin-settings.vue b/website/client/src/components/avatarModal/skin-settings.vue index d62a863d92..270c3a298b 100644 --- a/website/client/src/components/avatarModal/skin-settings.vue +++ b/website/client/src/components/avatarModal/skin-settings.vue @@ -23,7 +23,7 @@ diff --git a/website/client/src/mixins/avatarEditUtilities.js b/website/client/src/mixins/avatarEditUtilities.js index 46c8e81e9e..207defffd6 100644 --- a/website/client/src/mixins/avatarEditUtilities.js +++ b/website/client/src/mixins/avatarEditUtilities.js @@ -17,8 +17,14 @@ export const avatarEditorUtilies = { // eslint-disable-line import/prefer-defaul }; }, methods: { - hideSet (set) { - return moment(appearanceSets[set.key].availableUntil).isBefore(moment()); + hideSet (setKey) { + if (appearanceSets[setKey].availableFrom) { + return !moment().isBetween( + appearanceSets[setKey].availableFrom, + appearanceSets[setKey].availableUntil, + ); + } + return moment(appearanceSets[setKey].availableUntil).isBefore(moment()); }, mapKeysToFreeOption (key, type, subType) { const userPreference = subType @@ -43,8 +49,8 @@ export const avatarEditorUtilies = { // eslint-disable-line import/prefer-defaul const locked = !userPurchased || !userPurchased[key]; let hide = false; - if (set && appearanceSets[set]) { - if (locked) hide = moment(appearanceSets[set].availableUntil).isBefore(moment()); + if (set && appearanceSets[set] && locked) { + hide = this.hideSet(set); } option.gemLocked = locked; diff --git a/website/client/src/store/getters/tasks.js b/website/client/src/store/getters/tasks.js index 859201de84..d7d8adb4bf 100644 --- a/website/client/src/store/getters/tasks.js +++ b/website/client/src/store/getters/tasks.js @@ -102,7 +102,7 @@ export function canEdit (store) { } break; case 'group': - isUserCanEditTask = isUserGroupLeader || isUserGroupManager || isUserAdmin; + isUserCanEditTask = isUserGroupLeader || isUserGroupManager; break; default: break; diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index 106f1caf69..5d16659a7f 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -190,7 +190,7 @@ "fall2022KappaRogueSet": "Kappa (Rogue)", "fall2022OrcWarriorSet": "Orc (Warrior)", "fall2022HarpyMageSet": "Harpy (Mage)", - "fall2022WatcherHealerSet": "Watcher (Healer)", + "fall2022WatcherHealerSet": "Peeker (Healer)", "eventAvailability": "Available for purchase until <%= date(locale) %>.", "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.", "dateEndJanuary": "January 31",