[Issue-164] [Mythical telegram app] refactor code

Koniverse · Nov 18, 2024 · 576ba3c · 576ba3c
1 parent 98b39cf
commit 576ba3c
Showing 1 changed file with 20 additions and 46 deletions.
diff --git a/packages/extension-koni-ui/src/Popup/Home/MissionTemp/MissionSectionListContainer.tsx b/packages/extension-koni-ui/src/Popup/Home/MissionTemp/MissionSectionListContainer.tsx
@@ -55,59 +55,35 @@ function getMetricCounterpart (metricId: string, achievement: Achievement): stri
   return metric ? (metric.unit || '') : '';
 }
 
-function filterAchievements (achievements: Achievement[], taskSectionMap: Record<number, MissionSectionType>): Achievement[] {
+function filterAchievements (
+  achievements: Achievement[],
+  taskSectionMap: Record<number, MissionSectionType>
+): Achievement[] {
   const result: Record<string, Achievement> = {};
 
-  const groupedByDocumentId = achievements.reduce<Record<string, Achievement[]>>(
-    (groups, item) => {
-      if (!item.categoryId || !taskSectionMap[item.categoryId]) {
-        return groups;
-      }
-
-      if (!groups[item.documentId]) {
-        groups[item.documentId] = [];
-      }
-
-      groups[item.documentId].push(item);
-
-      return groups;
-    },
-    {}
-  );
-
-  Object.keys(groupedByDocumentId).forEach((documentId) => {
-    const items = groupedByDocumentId[documentId];
-
-    const allClaimed = items.every(
-      (item) => item.status === AchievementLogStatus.CLAIMED
-    );
+  achievements.forEach((item) => {
+    if (!item.categoryId || !taskSectionMap[item.categoryId]) {
+      return;
+    }
 
-    if (allClaimed) {
-      const claimedItem = items.reduce((maxItem, item) =>
-        !maxItem || item.milestoneOrdinal > maxItem.milestoneOrdinal
-          ? item
-          : maxItem,
-      null as Achievement | null
-      );
+    const current = result[item.documentId];
 
-      if (claimedItem) {
-        result[documentId] = claimedItem;
+    // If all items are CLAIMED, track the highest milestoneOrdinal
+    if (item.status === AchievementLogStatus.CLAIMED) {
+      if (!current || current.milestoneOrdinal < item.milestoneOrdinal) {
+        result[item.documentId] = item;
       }
 
       return;
     }
 
-    const activeItem = items
-      .filter((item) => item.status !== AchievementLogStatus.CLAIMED)
-      .reduce((minItem, item) =>
-        !minItem || item.milestoneOrdinal < minItem.milestoneOrdinal
-          ? item
-          : minItem,
-      null as Achievement | null
-      );
-
-    if (activeItem) {
-      result[documentId] = activeItem;
+    // For non-CLAIMED items, track the lowest milestoneOrdinal
+    if (
+      !current ||
+      current.status === AchievementLogStatus.CLAIMED ||
+      item.milestoneOrdinal < current.milestoneOrdinal
+    ) {
+      result[item.documentId] = item;
     }
   });
 
@@ -354,8 +330,6 @@ const Component = ({ accountInfo,
 
     const filteredAchievements = filterAchievements(achievements, taskSectionMap);
 
-    console.log('filteredAchievements', filteredAchievements);
-
     filteredAchievements.forEach((ach) => {
       taskSectionMap[ach.categoryId].items.push({
         id: `${ach.id}`,