From bd228d5d69a1a0cba5b2e983cd4342d173c02934 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 17 Dec 2020 08:25:04 -0600 Subject: [PATCH 1/2] fix(event): correct return value for find --- website/common/script/libs/shops-seasonal.config.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index b5ec753a67..3e1d54aa95 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -6,9 +6,8 @@ import { SEASONAL_SETS, } from '../content/constants'; -const CURRENT_EVENT = find(EVENTS, event => { - moment().isBetween(event.start, event.end); -}); +const CURRENT_EVENT = find(EVENTS, event => moment().isBetween(event.start, event.end)); + const SHOP_OPEN = CURRENT_EVENT && ['winter', 'spring', 'summer', 'fall'].includes(CURRENT_EVENT.season); export default { From dc34db98b4c4b9bebb5f2f51acf22d197d58e4d2 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Thu, 17 Dec 2020 08:25:09 -0600 Subject: [PATCH 2/2] 4.175.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 153a2d5e23..f224ea632a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.175.1", + "version": "4.175.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1cc61e2b5f..c485ac8331 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.175.1", + "version": "4.175.2", "main": "./website/server/index.js", "dependencies": { "@babel/core": "^7.12.10",