From f7c610fbf3bedd53a2737372d34ebdcb1a5ab7c3 Mon Sep 17 00:00:00 2001
From: Anssi Juvonen <anssi.juvonen@gofore.com>
Date: Sat, 14 Dec 2024 07:46:04 +0200
Subject: [PATCH 1/2] Change favorites trophy calculation logic

---
 src/components/AchievementBadge.vue           |   6 +-
 .../AchievementList.spec.ts.snap              |  24 ++---
 src/components/__tests__/achievements.spec.ts | 101 ++++++++++--------
 .../__tests__/activityStore.spec.ts           |  24 -----
 src/hooks/achievements.ts                     |  22 ++--
 src/i18n/en.json                              |  10 +-
 src/i18n/fi.json                              |  12 +--
 src/stores/activityStore.ts                   |  27 +----
 src/stores/appStateStore.ts                   |   4 +-
 9 files changed, 95 insertions(+), 135 deletions(-)

diff --git a/src/components/AchievementBadge.vue b/src/components/AchievementBadge.vue
index 6c6762d..43fa509 100644
--- a/src/components/AchievementBadge.vue
+++ b/src/components/AchievementBadge.vue
@@ -102,15 +102,15 @@ const achievementProps: AchievementProps = {
   },
   favorite: {
     [AchievementLevel.Bronze]: {
-      textProps: [20],
+      textProps: [5],
       emoji: '😺',
     },
     [AchievementLevel.Silver]: {
-      textProps: [50],
+      textProps: [20],
       emoji: '😽',
     },
     [AchievementLevel.Gold]: {
-      textProps: [100],
+      textProps: [50],
       emoji: '😻',
     },
   },
diff --git a/src/components/__tests__/__snapshots__/AchievementList.spec.ts.snap b/src/components/__tests__/__snapshots__/AchievementList.spec.ts.snap
index c4d86ef..480d08a 100644
--- a/src/components/__tests__/__snapshots__/AchievementList.spec.ts.snap
+++ b/src/components/__tests__/__snapshots__/AchievementList.spec.ts.snap
@@ -109,23 +109,23 @@ exports[`AchievementList > renders 1`] = `
   <div data-v-1c120264="" class="flex-container flex-col">
     <h2 class="label-like">Playing Favorites</h2>
     <div data-v-1c120264="" class="achievement-list__badge-container">
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="20 repeat uses of same veggie" aria-label="20 repeat uses of same veggie" data-test-id="badge-favorite-1" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="5 uses of a veggie in all categories" aria-label="5 uses of a veggie in all categories" data-test-id="badge-favorite-1" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Bronze" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😺</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">20 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x5 samples</div>
       </div>
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="50 repeat uses of same veggie" aria-label="50 repeat uses of same veggie" data-test-id="badge-favorite-2" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="20 uses of a veggie in all categories" aria-label="20 uses of a veggie in all categories" data-test-id="badge-favorite-2" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Silver" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😽</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">50 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x20 samples</div>
       </div>
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="100 repeat uses of same veggie" aria-label="100 repeat uses of same veggie" data-test-id="badge-favorite-3" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="50 uses of a veggie in all categories" aria-label="50 uses of a veggie in all categories" data-test-id="badge-favorite-3" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Gold" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😻</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">100 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x50 samples</div>
       </div>
     </div>
   </div>
@@ -287,23 +287,23 @@ exports[`AchievementList > renders with badges enabled 1`] = `
   <div data-v-1c120264="" class="flex-container flex-col">
     <h2 class="label-like">Playing Favorites</h2>
     <div data-v-1c120264="" class="achievement-list__badge-container">
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="20 repeat uses of same veggie" aria-label="20 repeat uses of same veggie" data-test-id="badge-favorite-1" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="5 uses of a veggie in all categories" aria-label="5 uses of a veggie in all categories" data-test-id="badge-favorite-1" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Bronze" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😺</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">20 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x5 samples</div>
       </div>
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="50 repeat uses of same veggie" aria-label="50 repeat uses of same veggie" data-test-id="badge-favorite-2" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="20 uses of a veggie in all categories" aria-label="20 uses of a veggie in all categories" data-test-id="badge-favorite-2" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Silver" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😽</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">50 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x20 samples</div>
       </div>
-      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="100 repeat uses of same veggie" aria-label="100 repeat uses of same veggie" data-test-id="badge-favorite-3" class="badge" role="img">
+      <div data-v-06381b3c="" data-v-1c120264="" aria-disabled="true" title="50 uses of a veggie in all categories" aria-label="50 uses of a veggie in all categories" data-test-id="badge-favorite-3" class="badge" role="img">
         <div data-v-06381b3c="" class="badge__background badge__background--Gold" aria-hidden="true">
           <div data-v-06381b3c="" class="badge__emoji">😻</div>
         </div>
-        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">100 samples</div>
+        <div data-v-06381b3c="" aria-hidden="true" class="badge__text">6x50 samples</div>
       </div>
     </div>
   </div>
diff --git a/src/components/__tests__/achievements.spec.ts b/src/components/__tests__/achievements.spec.ts
index d047fd0..e6af386 100644
--- a/src/components/__tests__/achievements.spec.ts
+++ b/src/components/__tests__/achievements.spec.ts
@@ -1,7 +1,7 @@
 import {describe, it, expect} from 'vitest';
 import {mount} from '@vue/test-utils';
 import {useAchievements} from '@/hooks/achievements';
-import {AchievementLevel, type Achievements} from '@/utils/types';
+import {AchievementLevel, Category, type Achievements, type Favorites} from '@/utils/types';
 import {take} from 'remeda';
 import {ALL_VEGGIES, BEANS, FRUITS, GRAINS, LEAFIES, ROOTS, VEGETABLES} from '@/utils/constants';
 
@@ -31,6 +31,15 @@ const defaultAchievements: Achievements = {
   thirtyVeggies: AchievementLevel.NoAchievement,
 };
 
+const getFavorites = (amount: number = 0) =>
+  Object.values(Category).reduce(
+    (acc, category) => ({
+      ...acc,
+      [category]: amount ? [['veggie', amount]] : [],
+    }),
+    {} as Favorites,
+  );
+
 describe('achievements', () => {
   it('sets initial status', async () => {
     const {achievements} = await withSetup(useAchievements);
@@ -39,153 +48,153 @@ describe('achievements', () => {
 
   it('advances completionist', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [...Array(39)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(39)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, [...Array(40)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(40)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toBe(AchievementLevel.Bronze);
-    advanceAchievements(0, [...Array(80)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(80)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toBe(AchievementLevel.Silver);
-    advanceAchievements(0, [...Array(150)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(150)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toBe(AchievementLevel.Gold);
   });
 
   it('goes straight to silver', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [...Array(80)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(80)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toBe(AchievementLevel.Silver);
   });
 
   it('completionist goes straight to gold', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [...Array(150)], 0, 0, 0, 0);
+    advanceAchievements(0, [...Array(150)], 0, 0, 0, getFavorites());
     expect(achievements.value.completionist).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterFruit', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(FRUITS, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(FRUITS, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterFruit).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(FRUITS, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(FRUITS, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterFruit).toBe(AchievementLevel.Gold);
   });
 
   it('experimenter goes straight to gold', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(FRUITS, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(FRUITS, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterFruit).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterVegetable', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(VEGETABLES, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(VEGETABLES, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterVegetable).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(VEGETABLES, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(VEGETABLES, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterVegetable).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterLeafy', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(LEAFIES, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(LEAFIES, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterLeafy).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(LEAFIES, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(LEAFIES, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterLeafy).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterBean', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(BEANS, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(BEANS, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterBean).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(BEANS, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(BEANS, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterBean).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterRoot', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(ROOTS, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(ROOTS, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterRoot).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(ROOTS, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(ROOTS, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterRoot).toBe(AchievementLevel.Gold);
   });
 
   it('advances experimenterGrain', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, take(GRAINS, 14), 0, 0, 0, 0);
+    advanceAchievements(0, take(GRAINS, 14), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterGrain).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, take(GRAINS, 15), 0, 0, 0, 0);
+    advanceAchievements(0, take(GRAINS, 15), 0, 0, 0, getFavorites());
     expect(achievements.value.experimenterGrain).toBe(AchievementLevel.Gold);
   });
 
   it('advances hot streak', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [], 4, 0, 0, 0);
+    advanceAchievements(0, [], 4, 0, 0, getFavorites());
     expect(achievements.value.hotStreak).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, [], 5, 0, 0, 0);
+    advanceAchievements(0, [], 5, 0, 0, getFavorites());
     expect(achievements.value.hotStreak).toEqual(AchievementLevel.Bronze);
-    advanceAchievements(0, [], 10, 0, 0, 0);
+    advanceAchievements(0, [], 10, 0, 0, getFavorites());
     expect(achievements.value.hotStreak).toEqual(AchievementLevel.Silver);
-    advanceAchievements(0, [], 20, 0, 0, 0);
+    advanceAchievements(0, [], 20, 0, 0, getFavorites());
     expect(achievements.value.hotStreak).toEqual(AchievementLevel.Gold);
   });
 
   it('advances committed', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [], 0, 11, 0, 0);
+    advanceAchievements(0, [], 0, 11, 0, getFavorites());
     expect(achievements.value.committed).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, [], 0, 12, 0, 0);
+    advanceAchievements(0, [], 0, 12, 0, getFavorites());
     expect(achievements.value.committed).toEqual(AchievementLevel.Bronze);
-    advanceAchievements(0, [], 0, 26, 0, 0);
+    advanceAchievements(0, [], 0, 26, 0, getFavorites());
     expect(achievements.value.committed).toEqual(AchievementLevel.Silver);
-    advanceAchievements(0, [], 0, 52, 0, 0);
+    advanceAchievements(0, [], 0, 52, 0, getFavorites());
     expect(achievements.value.committed).toEqual(AchievementLevel.Gold);
   });
 
   it('advances challengeAccepted', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [], 0, 0, 4, 0);
+    advanceAchievements(0, [], 0, 0, 4, getFavorites());
     expect(achievements.value.challengeAccepted).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, [], 0, 0, 5, 0);
+    advanceAchievements(0, [], 0, 0, 5, getFavorites());
     expect(achievements.value.challengeAccepted).toEqual(AchievementLevel.Bronze);
-    advanceAchievements(0, [], 0, 0, 10, 0);
+    advanceAchievements(0, [], 0, 0, 10, getFavorites());
     expect(achievements.value.challengeAccepted).toEqual(AchievementLevel.Silver);
-    advanceAchievements(0, [], 0, 0, 20, 0);
+    advanceAchievements(0, [], 0, 0, 20, getFavorites());
     expect(achievements.value.challengeAccepted).toEqual(AchievementLevel.Gold);
   });
 
   it('advances thirtyVeggies', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(29, [], 0, 0, 0, 0);
+    advanceAchievements(29, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(30, [], 0, 0, 0, 0);
+    advanceAchievements(30, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toBe(AchievementLevel.Gold);
-    advanceAchievements(40, [], 0, 0, 0, 0);
+    advanceAchievements(40, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toBe(AchievementLevel.Platinum);
   });
 
   it('resets thirtyVeggies', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(30, [], 0, 0, 0, 0);
+    advanceAchievements(30, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toEqual(AchievementLevel.Gold);
-    advanceAchievements(0, [], 0, 0, 0, 0);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toBe(AchievementLevel.NoAchievement);
-    advanceAchievements(40, [], 0, 0, 0, 0);
+    advanceAchievements(40, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toEqual(AchievementLevel.Platinum);
-    advanceAchievements(0, [], 0, 0, 0, 0);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toBe(AchievementLevel.NoAchievement);
-    advanceAchievements(40, [], 0, 0, 0, 0);
+    advanceAchievements(40, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toEqual(AchievementLevel.Platinum);
-    advanceAchievements(39, [], 0, 0, 0, 0);
+    advanceAchievements(39, [], 0, 0, 0, getFavorites());
     expect(achievements.value.thirtyVeggies).toBe(AchievementLevel.Gold);
   });
 
   it('advances favorite', async () => {
     const {advanceAchievements, achievements} = await withSetup(useAchievements);
-    advanceAchievements(0, [], 0, 0, 0, 19);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites(4));
     expect(achievements.value.favorite).toEqual(AchievementLevel.NoAchievement);
-    advanceAchievements(0, [], 0, 0, 0, 20);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites(5));
     expect(achievements.value.favorite).toEqual(AchievementLevel.Bronze);
-    advanceAchievements(0, [], 0, 0, 0, 50);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites(20));
     expect(achievements.value.favorite).toEqual(AchievementLevel.Silver);
-    advanceAchievements(0, [], 0, 0, 0, 100);
+    advanceAchievements(0, [], 0, 0, 0, getFavorites(50));
     expect(achievements.value.favorite).toEqual(AchievementLevel.Gold);
   });
 
@@ -205,7 +214,7 @@ describe('achievements', () => {
       thirtyVeggies: AchievementLevel.Platinum,
     };
     const {advanceAchievements, achievements, resetAchievements} = await withSetup(useAchievements);
-    advanceAchievements(40, ALL_VEGGIES, 30, 52, 20, 100);
+    advanceAchievements(40, ALL_VEGGIES, 30, 52, 20, getFavorites(50));
     expect(achievements.value).toEqual(expectedAchievements);
     resetAchievements();
     expect(achievements.value).toEqual(defaultAchievements);
diff --git a/src/components/__tests__/activityStore.spec.ts b/src/components/__tests__/activityStore.spec.ts
index 3040390..ae39261 100644
--- a/src/components/__tests__/activityStore.spec.ts
+++ b/src/components/__tests__/activityStore.spec.ts
@@ -503,30 +503,6 @@ describe('activityStore', () => {
     });
   });
 
-  it('returns max amount of single veggie logged', () => {
-    activityStore.startDate = threeWeeksAgo;
-    activityStore.weeks.push(
-      {
-        startDate: threeWeeksAgo,
-        veggies: ['apple', 'edamame', 'portobello'],
-      },
-      {
-        startDate: twoWeeksAgo,
-        veggies: ['apple', 'edamame'],
-      },
-      {
-        startDate: lastWeek,
-        veggies: ['wheat'],
-      },
-      {
-        startDate: thisWeek,
-        veggies: ['apple', 'portobello', 'black trumpet mushroom'],
-      },
-    );
-
-    expect(activityStore.maxAmount).toBe(3);
-  });
-
   it('resets the store', () => {
     activityStore.startDate = thisWeek;
     activityStore.weeks.push({
diff --git a/src/hooks/achievements.ts b/src/hooks/achievements.ts
index be7cbc6..b301dd1 100644
--- a/src/hooks/achievements.ts
+++ b/src/hooks/achievements.ts
@@ -3,7 +3,7 @@ import {intersection, isDeepEqual, mapValues} from 'remeda';
 import {createActor, setup, type MachineContext} from 'xstate';
 import type {GuardArgs} from 'xstate/guards';
 import {BEANS, FRUITS, GRAINS, LEAFIES, ROOTS, VEGETABLES} from '@/utils/constants';
-import type {Achievements} from '@/utils/types';
+import type {Achievements, Favorites} from '@/utils/types';
 
 type AdvanceEvent = {
   type: 'ADVANCE';
@@ -12,7 +12,7 @@ type AdvanceEvent = {
   completedChallenges: number;
   hotStreakLength: number;
   totalWeeks: number;
-  maxAmount: number;
+  favorites: Favorites;
 };
 
 type ResetEvent = {
@@ -39,7 +39,7 @@ const guards = {
   favorite:
     (threshold: number) =>
     ({event}: GuardArgs<MachineContext, AdvanceEvent>) =>
-      event.maxAmount >= threshold,
+      Object.values(event.favorites).every((favorites) => favorites[0]?.[1] >= threshold),
   hotStreak:
     (threshold: number) =>
     ({event}: GuardArgs<MachineContext, AdvanceEvent>) =>
@@ -297,15 +297,15 @@ export function useAchievements() {
                 ADVANCE: [
                   {
                     target: '3',
-                    guard: guards.favorite(100),
+                    guard: guards.favorite(50),
                   },
                   {
                     target: '2',
-                    guard: guards.favorite(50),
+                    guard: guards.favorite(20),
                   },
                   {
                     target: '1',
-                    guard: guards.favorite(20),
+                    guard: guards.favorite(5),
                   },
                 ],
               },
@@ -315,11 +315,11 @@ export function useAchievements() {
                 ADVANCE: [
                   {
                     target: '3',
-                    guard: guards.favorite(100),
+                    guard: guards.favorite(50),
                   },
                   {
                     target: '2',
-                    guard: guards.favorite(50),
+                    guard: guards.favorite(20),
                   },
                 ],
               },
@@ -328,7 +328,7 @@ export function useAchievements() {
               on: {
                 ADVANCE: {
                   target: '3',
-                  guard: guards.favorite(100),
+                  guard: guards.favorite(50),
                 },
               },
             },
@@ -454,7 +454,7 @@ export function useAchievements() {
       hotStreakLength: number,
       totalWeeks: number,
       completedChallenges: number,
-      maxAmount: number,
+      favorites: Favorites,
     ) =>
       actor.send({
         type: 'ADVANCE',
@@ -463,7 +463,7 @@ export function useAchievements() {
         hotStreakLength,
         totalWeeks,
         completedChallenges,
-        maxAmount,
+        favorites,
       }),
     resetAchievements: () => actor.send({type: 'RESET'}),
   };
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6738a27..2ed3bdf 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -62,11 +62,11 @@
     },
     "favorite": {
       "title": "Playing Favorites",
-      "ariaLabel": "{0} repeat uses of same veggie",
-      "badgeText": "{0} samples",
-      "1": "You have sampled the same veggie 20 times, earning you the bronze achievement!",
-      "2": "You have sampled the same veggie 50 times, earning you the silver achievement!",
-      "3": "You have sampled the same veggie 100, earning you the gold achievement!"
+      "ariaLabel": "{0} uses of a veggie in all categories",
+      "badgeText": "6x{0} samples",
+      "1": "You have sampled your favorite veggies at least 5 times in each category, earning you the bronze achievement!",
+      "2": "You have sampled your favorite veggies at least 20 times in each category, earning you the silver achievement!",
+      "3": "You have sampled your favorite veggies at least 100 times in each category, earning you the gold achievement!"
     },
     "hotStreak": {
       "title": "Hot Streak",
diff --git a/src/i18n/fi.json b/src/i18n/fi.json
index 23ba31e..3a77114 100644
--- a/src/i18n/fi.json
+++ b/src/i18n/fi.json
@@ -61,12 +61,12 @@
       "3": "Olet kokeillut 15:tä erilaista kasvista ansaiten tämän palkinnon!"
     },
     "favorite": {
-      "title": "Oma suosikki",
-      "ariaLabel": "Sama kasvis {0} kertaa",
-      "badgeText": "{0} kokeilua",
-      "1": "Olet kokeillut samaa kasvista 20 kertaa ja ansainnut pronssisen palkinnon!",
-      "2": "Olet kokeillut samaa kasvista 50 kertaa ja ansainnut hopeisen palkinnon!",
-      "3": "Olet kokeillut samaa kasvista 100 kertaa ja ansainnut kultaisen palkinnon!"
+      "title": "Omat suosikit",
+      "ariaLabel": "Yksi kasvis {0} kertaa joka ryhmässä",
+      "badgeText": "6x{0} kokeilua",
+      "1": "Olet kokeillut suosikkikasviksiasi vähintään viisi kertaa joka ryhmässä, ansaiten pronssisen palkinnon!",
+      "2": "Olet kokeillut suosikkikasviksiasi vähintään 20 kertaa joka ryhmässä, ansaiten hopeisen palkinnon!",
+      "3": "Olet kokeillut suosikkikasviksiasi vähintään 50 kertaa joka ryhmässä, ansaiten kultaisen palkinnon!"
     },
     "hotStreak": {
       "title": "Putki päällä",
diff --git a/src/stores/activityStore.ts b/src/stores/activityStore.ts
index 7055ef4..b686cce 100644
--- a/src/stores/activityStore.ts
+++ b/src/stores/activityStore.ts
@@ -2,20 +2,7 @@ import {computed, ref, watchEffect} from 'vue';
 import {defineStore} from 'pinia';
 import {useNow, useStorage} from '@vueuse/core';
 import {DateTime} from 'luxon';
-import {
-  difference,
-  entries,
-  filter,
-  first,
-  groupBy,
-  map,
-  pipe,
-  prop,
-  sortBy,
-  take,
-  unique,
-  values,
-} from 'remeda';
+import {difference, entries, filter, groupBy, map, pipe, prop, sortBy, take, unique} from 'remeda';
 import {Category, type Favorites, type Challenge, type Week} from '@/utils/types';
 import {dateParser, getCategoryForVeggie, getRandomVeggie} from '@/utils/helpers';
 
@@ -155,17 +142,6 @@ export const useActivityStore = defineStore('activity', () => {
     ),
   );
 
-  const maxAmount = computed(
-    () =>
-      pipe(
-        allVeggies.value,
-        groupBy((veggie) => veggie),
-        values(),
-        sortBy([({length}) => length, 'desc']),
-        first,
-      )?.length ?? 0,
-  );
-
   // Actions
   const toggleVeggie = (targetVeggie: string) => {
     const weekStart = currentDate.value.startOf('week');
@@ -202,7 +178,6 @@ export const useActivityStore = defineStore('activity', () => {
     favorites,
     getWeekStarts,
     hotStreak,
-    maxAmount,
     over30Veggies,
     startDate,
     suggestions,
diff --git a/src/stores/appStateStore.ts b/src/stores/appStateStore.ts
index 46935ce..d2e40d3 100644
--- a/src/stores/appStateStore.ts
+++ b/src/stores/appStateStore.ts
@@ -12,7 +12,7 @@ type Message = {
 
 export const useAppStateStore = defineStore('appState', () => {
   const {advanceAchievements, achievements, resetAchievements} = useAchievements();
-  const {currentVeggies, uniqueVeggies, hotStreak, weeks, completedChallenges, maxAmount} =
+  const {currentVeggies, uniqueVeggies, hotStreak, weeks, completedChallenges, favorites} =
     storeToRefs(useActivityStore());
 
   watchEffect(() =>
@@ -22,7 +22,7 @@ export const useAppStateStore = defineStore('appState', () => {
       hotStreak.value,
       weeks.value.length,
       completedChallenges.value,
-      maxAmount.value,
+      favorites.value,
     ),
   );
 

From c3682516aa1ec0267b7f59cf78167e0922e6cae2 Mon Sep 17 00:00:00 2001
From: Anssi Juvonen <anssi.juvonen@gofore.com>
Date: Sat, 14 Dec 2024 07:51:49 +0200
Subject: [PATCH 2/2] Update dependencies

---
 package-lock.json | 24 ++++++++++++------------
 package.json      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0faaed..deb2f7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
         "@vue/test-utils": "^2.4.6",
         "@vue/tsconfig": "^0.7.0",
         "autoprefixer": "^10.4.20",
-        "eslint": "^9.16.0",
+        "eslint": "^9.17.0",
         "eslint-plugin-playwright": "^2.1.0",
         "eslint-plugin-vue": "^9.32.0",
         "eslint-plugin-vuejs-accessibility": "^2.4.1",
@@ -2241,9 +2241,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz",
-      "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
+      "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4456,9 +4456,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
-      "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4984,9 +4984,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz",
-      "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
+      "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4995,7 +4995,7 @@
         "@eslint/config-array": "^0.19.0",
         "@eslint/core": "^0.9.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.16.0",
+        "@eslint/js": "9.17.0",
         "@eslint/plugin-kit": "^0.2.3",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -5004,7 +5004,7 @@
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.5",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^8.2.0",
diff --git a/package.json b/package.json
index 0f5788c..e09e8a5 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "@vue/test-utils": "^2.4.6",
     "@vue/tsconfig": "^0.7.0",
     "autoprefixer": "^10.4.20",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "eslint-plugin-playwright": "^2.1.0",
     "eslint-plugin-vue": "^9.32.0",
     "eslint-plugin-vuejs-accessibility": "^2.4.1",