Fix Daily Rewards Section (#1970)

* update reset logic * update yarn.lock
push-protocol · Nov 14, 2024 · 8329a7d · 8329a7d
1 parent f769f86
commit 8329a7d
Show file tree

Hide file tree

Showing 2 changed files with 1,116 additions and 1,248 deletions.
diff --git a/src/modules/rewards/hooks/useDailyRewards.tsx b/src/modules/rewards/hooks/useDailyRewards.tsx
@@ -96,8 +96,20 @@ const useDailyRewards = () => {
       }
     }
 
-    setActiveDay(newDay);
-    setActiveItem(newDayData);
+    // first day data after completing all 7
+    const firstDayData = dailyRewardsActivities?.find(
+      (activity) => activity.activityType === `daily_check_in_7_days_day1`
+    );
+
+    // if active day is complete, reset to first day, if not use the next day
+    if (newDay <= 7) {
+      setActiveDay(newDay);
+      setActiveItem(newDayData);
+    } else {
+      setActiveDay(1);
+      setActiveItem(firstDayData);
+    }
+
     setIsLoadingRewards(false);
   }, [sendRecentActivities]);