Merge branch 'develop' into sabrecat/teams-rebase

website/common/script/ops/buy/buyMarketGear.js

@@ -28,7 +28,7 @@ export class BuyMarketGearOperation extends AbstractGoldItemOperation { // eslin
     const checkSpecialClass = item.klass === 'special' && item.specialClass && item.specialClass !== user.stats.class;
 
     // check for different class gear
-    if (checkKlass || checkSpecialClass) {
+    if ((checkKlass || checkSpecialClass) && user.items.gear.owned[item.key] !== false) {
       throw new NotAuthorized(this.i18n('cannotBuyItem'));
     }
   }

website/common/script/ops/feed.js

@@ -130,6 +130,7 @@ export default function feed (user, req = {}, analytics) {
         if (user.addNotification) {
           const achievementString = `achievement${upperFirst(achievement.mountAchievement)}`;
           user.addNotification(achievement.mountNotificationType, {
+            label: `${'achievement'}: ${achievementString}`,
             achievement: achievement.mountAchievement,
             message: `${i18n.t('modalAchievement')} ${i18n.t(achievementString)}`,
             modalText: i18n.t(`${achievementString}ModalText`),

website/common/script/ops/hatch.js

@@ -72,6 +72,7 @@ export default function hatch (user, req = {}, analytics) {
           if (user.addNotification) {
             const achievementString = `achievement${upperFirst(achievement.petAchievement)}`;
             user.addNotification(achievement.petNotificationType, {
+              label: `${'achievement'}: ${achievementString}`,
               achievement: achievement.petAchievement,
               message: `${i18n.t('modalAchievement')} ${i18n.t(achievementString)}`,
               modalText: i18n.t(`${achievementString}ModalText`),
@@ -100,6 +101,7 @@ export default function hatch (user, req = {}, analytics) {
             if (user.addNotification) {
               const achievementString = `achievement${upperFirst(achievement.achievementKey)}`;
               user.addNotification(achievement.notificationType, {
+                label: `${'achievement'}: ${achievementString}`,
                 achievement: achievement.achievementKey,
                 message: `${i18n.t('modalAchievement')} ${i18n.t(achievementString)}`,
                 modalText: i18n.t(`${achievementString}ModalText`),

website/common/script/ops/scoreTask.js

@@ -420,5 +420,5 @@ export default function scoreTask (options = {}, req = {}, analytics) {
     checkOnboardingStatus(user, req, analytics);
   }
 
-  return [delta];
+  return delta;
 }