Fix Rewards Point - LifeTime Issue

src/modules/rewards/components/ActivityButton.tsx

@@ -18,6 +18,7 @@ type ActivityButtonProps = {
   isLoadingActivity: boolean;
   label?: string;
   isStakeSection?: boolean;
+  lifeTime?: boolean;
 };
 
 const ActivityButton: FC<ActivityButtonProps> = ({
@@ -31,10 +32,11 @@ const ActivityButton: FC<ActivityButtonProps> = ({
   isLoadingActivity,
   label,
   isStakeSection,
+  lifeTime,
 }) => {
   const { resetEpoch } = useRewardsContext();
 
-  if (usersSingleActivity?.status === 'COMPLETED' && isStakeSection && resetEpoch) {
+  if (usersSingleActivity?.status === 'COMPLETED' && isStakeSection && resetEpoch && !lifeTime) {
     return (
       // default verify button
       <ActivityVerificationButton

src/modules/rewards/components/RewardsActivitiesBottomSection.tsx

@@ -39,7 +39,7 @@ const RewardsActivitiesBottomSection: FC<RewardsActivitiesBottomSectionProps> =
       >
         <StakePushSection
           title="Stake Push to Earn Points"
-          subtitle="Visit [app.push.org/yieldv2](https://app.push.org/yieldv2) and stake tokens in the Fee Pool or LP Pool to redeem points."
+          subtitle="Visit [app.push.org/yield](https://app.push.org/yield) and stake tokens in the Fee Pool or LP Pool to redeem points."
           timeline={true}
         />
       </Box>
@@ -53,9 +53,9 @@ const RewardsActivitiesBottomSection: FC<RewardsActivitiesBottomSectionProps> =
         margin="spacing-none spacing-none spacing-md spacing-none"
       >
         <StakePushSection
-          multiplier={true}
+          lifeTime={true}
           title="Stake Push to Earn Multipliers"
-          subtitle="Visit [app.push.org/yieldv2](https://app.push.org/yieldv2) and stake tokens in the Fee Pool or LP Pool to activate multipliers."
+          subtitle="Visit [app.push.org/yield](https://app.push.org/yield) and stake tokens in the Fee Pool or LP Pool to activate multipliers."
         />
       </Box>
     </Box>

src/modules/rewards/components/StakePushActivitiesListItem.tsx

@@ -20,6 +20,7 @@ export type StakeActivitiesItemProps = {
   allUsersActivity: StakeActivityResponse;
   isAllActivitiesLoading: boolean;
   refetchActivity: () => void;
+  lifeTime?: boolean;
 };
 const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   userId,
@@ -31,6 +32,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   allUsersActivity,
   isAllActivitiesLoading,
   refetchActivity,
+  lifeTime,
 }) => {
   const { isWalletConnected } = useAccount();
 
@@ -40,6 +42,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
   const hasActivityEndedUnclaimed = usersSingleActivity?.status !== 'COMPLETED' && hasEpochEnded;
 
   const isLockedOrNotConnected = isLocked || !isWalletConnected;
+
   return (
     <Skeleton
       isLoading={isLoadingItem}
@@ -163,7 +166,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
             </Button>
           )}
 
-          {hasActivityEndedUnclaimed && !isLocked && isWalletConnected && (
+          {hasActivityEndedUnclaimed && !isLocked && isWalletConnected && !lifeTime && (
             <Button
               variant="tertiary"
               size="small"
@@ -173,7 +176,25 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
             </Button>
           )}
 
-          {!hasActivityEndedUnclaimed && !isLocked && isWalletConnected && (
+          {/* stake reset/one-time button */}
+          {!hasActivityEndedUnclaimed && !isLocked && isWalletConnected && !lifeTime && (
+            <ActivityButton
+              userId={userId}
+              activityTypeId={activity.id}
+              activityTypeIndex={activity.index}
+              activityType={activity.activityType}
+              refetchActivity={refetchActivity}
+              setErrorMessage={setErrorMessage}
+              usersSingleActivity={usersSingleActivity}
+              isLoadingActivity={isLoading}
+              label="Claim"
+              isStakeSection
+              lifeTime={lifeTime}
+            />
+          )}
+
+          {/* stake lifetime button */}
+          {lifeTime && !isLocked && isWalletConnected && (
             <ActivityButton
               userId={userId}
               activityTypeId={activity.id}
@@ -185,6 +206,7 @@ const StakePushActivitiesListItem: FC<StakeActivitiesItemProps> = ({
               isLoadingActivity={isLoading}
               label="Claim"
               isStakeSection
+              lifeTime={lifeTime}
             />
           )}
         </Box>

src/modules/rewards/components/StakePushSection.tsx

@@ -19,14 +19,14 @@ export type StakePushPoints = {
   title: string;
   subtitle: string;
   timeline?: boolean;
-  multiplier?: boolean;
+  lifeTime?: boolean;
 };
 
-const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, multiplier }) => {
+const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, lifeTime }) => {
   const { account, isWalletConnected } = useAccount();
   const { isLocked } = useRewardsContext();
   const { stakePushArray, uniV2PushArray, isLoading, daysToReset } = useStakeRewardsResetTime({
-    multiplier,
+    lifeTime,
   });
   const [errorMessage, setErrorMessage] = useState<string>('');
 
@@ -39,12 +39,12 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
   const activityResetDate = (daysToReset as number) + 7;
 
   const isEpochStatusActive = useMemo(() => {
-    return daysToReset != null && !multiplier && daysToReset >= 0 && activityResetDate > 7 && isWalletConnected;
-  }, [daysToReset, multiplier, activityResetDate, isWalletConnected]);
+    return daysToReset != null && !lifeTime && daysToReset >= 0 && activityResetDate > 7 && isWalletConnected;
+  }, [daysToReset, lifeTime, activityResetDate, isWalletConnected]);
 
   const hasEpochEnded = useMemo(() => {
-    return daysToReset != null && activityResetDate >= 0 && activityResetDate <= 7 && !multiplier && isWalletConnected;
-  }, [daysToReset, activityResetDate, multiplier, isWalletConnected]);
+    return daysToReset != null && activityResetDate >= 0 && activityResetDate <= 7 && !lifeTime && isWalletConnected;
+  }, [daysToReset, activityResetDate, lifeTime, isWalletConnected]);
 
   // Combine all activities into a single array
   const allActivities = [...uniV2PushArray, ...stakePushArray];
@@ -185,6 +185,7 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
               allUsersActivity={allUsersActivity as StakeActivityResponse}
               isAllActivitiesLoading={isAllActivitiesLoading}
               refetchActivity={refetchActivity}
+              lifeTime={lifeTime}
             />
           ))}
         </Box>
@@ -207,12 +208,13 @@ const StakePushSection: FC<StakePushPoints> = ({ title, subtitle, timeline, mult
               allUsersActivity={allUsersActivity as StakeActivityResponse}
               isAllActivitiesLoading={isAllActivitiesLoading}
               refetchActivity={refetchActivity}
+              lifeTime={lifeTime}
             />
           ))}
         </Box>
       </Box>
 
-      {!multiplier && (
+      {!lifeTime && (
         <Text
           textAlign="center"
           variant="bs-semibold"

src/modules/rewards/hooks/useStakeRewardsResetTime.tsx

@@ -19,10 +19,10 @@ import { filterAndSortActivities, filterAndSortAllActivities } from '../utils/st
 import { CommonLocalStorageKeys } from 'common';
 
 export type StakeRewardsResetTime = {
-  multiplier?: boolean;
+  lifeTime?: boolean;
 };
 
-const useStakeRewardsResetTime = ({ multiplier }: StakeRewardsResetTime) => {
+const useStakeRewardsResetTime = ({ lifeTime }: StakeRewardsResetTime) => {
   const [resetDate, setResetDate] = useState<number | null>(null); // Local state for latest timestamp
   const { account, isWalletConnected } = useAccount();
   const { setResetEpoch } = useRewardsContext();
@@ -42,17 +42,17 @@ const useStakeRewardsResetTime = ({ multiplier }: StakeRewardsResetTime) => {
     return filterAndSortActivities(
       'push',
       rewardActivitiesResponse?.activities.flatMap((page) => page) || [],
-      multiplier
+      lifeTime
     );
-  }, [rewardActivitiesResponse, multiplier, isLoadingActivities]);
+  }, [rewardActivitiesResponse, lifeTime, isLoadingActivities]);
 
   const uniV2PushArray = useMemo(() => {
     return filterAndSortActivities(
       'uni-v2',
       rewardActivitiesResponse?.activities.flatMap((page) => page) || [],
-      multiplier
+      lifeTime
     );
-  }, [rewardActivitiesResponse, multiplier, isLoadingActivities]);
+  }, [rewardActivitiesResponse, lifeTime, isLoadingActivities]);
 
   // Combined array for both multiplier and point activities for push and uniV2
   const allPushArray = useMemo(() => {