From 5cd58d4119ff267b344f868fb99685730306889a Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabe@habitica.com>
Date: Mon, 22 Apr 2024 17:52:07 -0500
Subject: [PATCH] WIP(shops): dates and fixes

---
 website/client/src/components/header/userDropdown.vue | 6 +-----
 website/client/src/components/ui/selectList.vue       | 2 +-
 website/common/script/content/constants/schedule.js   | 7 ++++---
 website/common/script/libs/getItemInfo.js             | 2 +-
 website/common/script/libs/shops.js                   | 1 +
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/website/client/src/components/header/userDropdown.vue b/website/client/src/components/header/userDropdown.vue
index 46dba369d3..f149222731 100644
--- a/website/client/src/components/header/userDropdown.vue
+++ b/website/client/src/components/header/userDropdown.vue
@@ -35,13 +35,9 @@
         />
       </a>
       <a
-        class="topbar-dropdown-item dropdown-item"
+        class="topbar-dropdown-item dropdown-item dropdown-separated"
         @click="showAvatar('body', 'size')"
       >{{ $t('editAvatar') }}</a>
-      <a
-        class="topbar-dropdown-item dropdown-item dropdown-separated"
-        @click="showAvatar('backgrounds', '2024')"
-      >{{ $t('backgrounds') }}</a>
       <a
         class="topbar-dropdown-item dropdown-item"
         @click="showProfile('profile')"
diff --git a/website/client/src/components/ui/selectList.vue b/website/client/src/components/ui/selectList.vue
index c661f72a44..5e02c3c0a4 100644
--- a/website/client/src/components/ui/selectList.vue
+++ b/website/client/src/components/ui/selectList.vue
@@ -132,7 +132,7 @@ export default {
   },
   methods: {
     getKeyProp (item) {
-      return this.keyProp ? item[this.keyProp] : item;
+      return this.keyProp ? item[this.keyProp] : item.key;
     },
     isDisabled (item) {
       return typeof item[this.disabledProp] === 'undefined' ? false : item[this.disabledProp];
diff --git a/website/common/script/content/constants/schedule.js b/website/common/script/content/constants/schedule.js
index 193f2e3791..1c2fcdcb9d 100644
--- a/website/common/script/content/constants/schedule.js
+++ b/website/common/script/content/constants/schedule.js
@@ -857,9 +857,10 @@ export function getScheduleMatchingGroup (type, date) {
     });
   }
   if (!cachedScheduleMatchers[type]) {
-    let end = moment(checkedDate).date(TYPE_SCHEDULE[type]);
-    if (end.date() <= checkedDate.date()) {
-      end = moment(end).add(1, 'months');
+    let end = moment(checkedDate);
+    end.date(TYPE_SCHEDULE[type]);
+    if (end.date() <= moment(checkedDate).date()) {
+      moment(end).add(1, 'months');
     }
     return {
       end: end.toDate(),
diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
index c9074cd1a6..af72e71d01 100644
--- a/website/common/script/libs/getItemInfo.js
+++ b/website/common/script/libs/getItemInfo.js
@@ -491,7 +491,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
   }
 
   if (matcher) {
-    itemInfo.end = { matcher };
+    itemInfo.end = matcher.end;
   }
 
   return itemInfo;
diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
index d7d659c382..ab5ae85c20 100644
--- a/website/common/script/libs/shops.js
+++ b/website/common/script/libs/shops.js
@@ -582,6 +582,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
             bg,
             officialPinnedItems,
             language,
+            matchers,
           );
           backgroundCategory.items.push(item);
         }