From 6109ff35abdcecd081ed471c3a9f0af68ea0f53e Mon Sep 17 00:00:00 2001
From: corlard3y <corlardey@gmail.com>
Date: Fri, 13 Sep 2024 09:26:06 +0100
Subject: [PATCH] update hasEnded and has text

---
 .../components/StakePushActivitiesListItem.tsx   | 16 +++++++++++++++-
 .../rewards/components/StakePushSection.tsx      | 10 ++++++----
 .../rewards/hooks/useStakeRewardsResetTime.tsx   |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/modules/rewards/components/StakePushActivitiesListItem.tsx b/src/modules/rewards/components/StakePushActivitiesListItem.tsx
index c0c49f90a8..6c05fe14b7 100644
--- a/src/modules/rewards/components/StakePushActivitiesListItem.tsx
+++ b/src/modules/rewards/components/StakePushActivitiesListItem.tsx
@@ -16,6 +16,7 @@ export type StakeActivitiesItemProps = {
   isLoadingItem: boolean;
   setErrorMessage: (errorMessage: string) => void;
   isLocked: boolean;
+  hasEpochEnded?: boolean;
 };
 const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   userId,
@@ -23,6 +24,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   isLoadingItem,
   setErrorMessage,
   isLocked,
+  hasEpochEnded,
 }) => {
   const {
     data: usersSingleActivity,
@@ -32,6 +34,8 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
 
   const { isWalletConnected } = useAccount();
 
+  const hasActivityEndedUnclaimed = usersSingleActivity?.status !== 'COMPLETED' && hasEpochEnded;
+
   const isLockedOrNotConnected = isLocked || !isWalletConnected;
   return (
     <Skeleton
@@ -156,7 +160,17 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
             </Button>
           )}
 
-          {!isLocked && isWalletConnected && (
+          {hasActivityEndedUnclaimed && !isLocked && isWalletConnected && (
+            <Button
+              variant="tertiary"
+              size="small"
+              disabled
+            >
+              Ended
+            </Button>
+          )}
+
+          {!hasActivityEndedUnclaimed && !isLocked && isWalletConnected && (
             <ActivityButton
               userId={userId}
               activityTypeId={activity.id}
diff --git a/src/modules/rewards/components/StakePushSection.tsx b/src/modules/rewards/components/StakePushSection.tsx
index 0a6b304f67..f2a6a0e9ea 100644
--- a/src/modules/rewards/components/StakePushSection.tsx
+++ b/src/modules/rewards/components/StakePushSection.tsx
@@ -39,12 +39,12 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
   const activityResetDate = daysToReset + 7;
 
   const isEpochStatusActive = useMemo(() => {
-    return daysToReset != null && !multiplier && daysToReset >= 0 && activityResetDate > 7;
-  }, [daysToReset, multiplier, activityResetDate]);
+    return daysToReset != null && !multiplier && daysToReset >= 0 && activityResetDate > 7 && isWalletConnected;
+  }, [daysToReset, multiplier, activityResetDate, isWalletConnected]);
 
   const hasEpochEnded = useMemo(() => {
-    return daysToReset != null && activityResetDate >= 0 && activityResetDate <= 7 && !multiplier;
-  }, [daysToReset, activityResetDate, multiplier]);
+    return daysToReset != null && activityResetDate >= 0 && activityResetDate <= 7 && !multiplier && isWalletConnected;
+  }, [daysToReset, activityResetDate, multiplier, isWalletConnected]);
 
   return (
     <Box
@@ -164,6 +164,7 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
               isLoadingItem={isLoading}
               setErrorMessage={setErrorMessage}
               isLocked={isLocked}
+              hasEpochEnded={hasEpochEnded}
             />
           ))}
         </Box>
@@ -182,6 +183,7 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
               isLoadingItem={isLoading}
               setErrorMessage={setErrorMessage}
               isLocked={isLocked}
+              hasEpochEnded={hasEpochEnded}
             />
           ))}
         </Box>
diff --git a/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx b/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
index 489c41471c..bef46eda6c 100644
--- a/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
+++ b/src/modules/rewards/hooks/useStakeRewardsResetTime.tsx
@@ -76,7 +76,7 @@ const useStakeRewardsResetTime = ({ multiplier }: StakeRewardsResetTime) => {
   const daysToReset = useMemo(() => {
     const currentTime = Date.now() / 1000; // Current time in seconds
     const differenceInSeconds = (resetDate as number) - currentTime;
-    return Math.floor(differenceInSeconds / (60 * 60 * 24)); // Convert seconds to days and add the 7 days rest period
+    return Math.floor(differenceInSeconds / (60 * 60 * 24));
   }, [resetDate]);
 
   // Helper function to check if 7 days have passed since the stored epoch time (in seconds)