clean up success callbacks

TreasureProject · Jan 2, 2025 · 24ebd12 · 24ebd12
1 parent 82f0c82
commit 24ebd12
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 60 deletions.
diff --git a/app/api/user.server.ts b/app/api/user.server.ts
@@ -185,6 +185,9 @@ export const fetchUserIncentives = async (
       const reward = (rewardPerLiquidityDelta * usersLiquidity) / UINT112_MAX;
       return {
         ...userIncentive,
+        isActive:
+          Number(userIncentive.incentive.endTime) >
+          Math.floor(Date.now() / 1000),
         incentive: {
           ...userIncentive.incentive,
           rewardToken: rewardToken,

diff --git a/app/hooks/useClaimRewards.ts b/app/hooks/useClaimRewards.ts
@@ -11,15 +11,15 @@ type Props = {
   onSuccess?: () => void;
 };
 
-export const useClaimRewards = ({ enabled = true, onSuccess }: Props) => {
+export const useClaimRewards = (props?: Props) => {
   const { isConnected } = useAccount();
   const stakingContractAddress = useContractAddress("stakingContract");
   const claimAllRewards = useWriteStakingContractClaimAllRewards();
   const claimAllRewardsReceipt = useWaitForTransactionReceipt({
     hash: claimAllRewards.data,
   });
 
-  const isEnabled = enabled && isConnected;
+  const isEnabled = isConnected && props?.enabled !== false;
   const isSuccess = claimAllRewardsReceipt.isSuccess;
 
   useToast({
@@ -33,9 +33,9 @@ export const useClaimRewards = ({ enabled = true, onSuccess }: Props) => {
 
   useEffect(() => {
     if (isSuccess) {
-      onSuccess?.();
+      props?.onSuccess?.();
     }
-  }, [isSuccess, onSuccess]);
+  }, [isSuccess, props?.onSuccess]);
 
   return {
     claimRewards: (incentiveIds: bigint[]) => {

diff --git a/app/hooks/useSubscribeToIncentives.ts b/app/hooks/useSubscribeToIncentives.ts
@@ -1,34 +1,29 @@
-import { useEffect, useState } from "react";
 import { useWaitForTransactionReceipt } from "wagmi";
 
-import type { UserIncentive } from "~/api/user.server";
+import { useEffect } from "react";
 import { useAccount } from "~/contexts/account";
 import { useWriteStakingContractSubscribeToIncentives } from "~/generated";
 import { useContractAddress } from "./useContractAddress";
 import { useToast } from "./useToast";
 
 type Props = {
   enabled?: boolean;
-  onSuccess?: (incentiveIds: bigint[]) => void;
+  onSuccess?: () => void;
 };
 
-export const useSubscribeToIncentives = ({
-  enabled = true,
-  onSuccess,
-}: Props) => {
-  const [lastIncentiveIds, setLastIncentiveIds] = useState<bigint[]>([]);
+export const useSubscribeToIncentives = (props?: Props) => {
   const { isConnected } = useAccount();
   const stakingContractAddress = useContractAddress("stakingContract");
   const subscribeToIncentives = useWriteStakingContractSubscribeToIncentives();
   const subscribeToIncentivesReceipt = useWaitForTransactionReceipt({
     hash: subscribeToIncentives.data,
   });
 
-  const isEnabled = enabled && isConnected;
+  const isEnabled = isConnected && props?.enabled !== false;
   const isSuccess = subscribeToIncentivesReceipt.isSuccess;
 
   useToast({
-    title: "Subscribing to rewards",
+    title: "Subscribe to rewards",
     isLoading:
       subscribeToIncentives.isPending || subscribeToIncentivesReceipt.isLoading,
     isSuccess,
@@ -41,18 +36,16 @@ export const useSubscribeToIncentives = ({
 
   useEffect(() => {
     if (isSuccess) {
-      onSuccess?.(lastIncentiveIds);
+      props?.onSuccess?.();
     }
-  }, [isSuccess, onSuccess, lastIncentiveIds]);
+  }, [isSuccess, props?.onSuccess]);
 
   return {
     subscribeToIncentives: (incentiveIds: bigint[]) => {
       if (!isEnabled) {
         return;
       }
 
-      setLastIncentiveIds(incentiveIds);
-
       return subscribeToIncentives.writeContractAsync({
         address: stakingContractAddress,
         args: [incentiveIds],

diff --git a/app/hooks/useWithdrawBatch.ts b/app/hooks/useWithdrawBatch.ts
@@ -52,7 +52,7 @@ export const useWithdrawBatch = ({
     nftVaultApproveReceipt.isLoading;
 
   useToast({
-    title: "Withdrawing Rewards",
+    title: "Withdraw rewards",
     isLoading,
     isSuccess,
     isError:

diff --git a/app/routes/pools_.$id.tsx b/app/routes/pools_.$id.tsx
@@ -85,7 +85,7 @@ import { formatTokenReserve } from "~/lib/tokens";
 import { cn } from "~/lib/utils";
 import type { RootLoader } from "~/root";
 import { getSession } from "~/sessions";
-import type { Optional, PoolToken } from "~/types";
+import type { Optional, PoolToken, TroveTokenWithQuantity } from "~/types";
 import type { TransactionType } from ".graphclient";
 
 type PoolManagementTab = "deposit" | "withdraw" | "stake" | "unstake";
@@ -197,8 +197,7 @@ export default function PoolDetailsPage() {
 
   const nftIncentive = userIncentives.find(
     (userIncentive) =>
-      userIncentive.incentive.rewardToken?.isNFT &&
-      BigInt(userIncentive.reward) > 0,
+      userIncentive.isActive && userIncentive.incentive.rewardToken?.isNFT,
   );
 
   const nftIncentiveDecimals =
@@ -226,24 +225,8 @@ export default function PoolDetailsPage() {
     refetchNftIncentiveTokenBalance();
   }, [revalidator, refetchNftIncentiveTokenBalance]);
 
-  const { subscribeToIncentives } = useSubscribeToIncentives({
-    onSuccess: useCallback(
-      (incentiveIds: bigint[]) => {
-        // API can be slow to update, so optimistically update the subscribed list
-        setOptimisticSubscribedIncentiveIds((curr) =>
-          curr.concat(incentiveIds),
-        );
-        refetch();
-      },
-      [refetch],
-    ),
-  });
-
-  const { claimRewards } = useClaimRewards({
-    // Doesn't need optimistic update because data is pulled directly from contract
-    onSuccess: refetch,
-  });
-
+  const { subscribeToIncentives } = useSubscribeToIncentives();
+  const { claimRewards } = useClaimRewards();
   const { withdrawBatch, isLoading: isLoadingWithdrawBatch } = useWithdrawBatch(
     {
       vaultAddress: nftIncentive?.incentive.rewardTokenAddress as
@@ -286,6 +269,32 @@ export default function PoolDetailsPage() {
   const quoteToken =
     baseToken.id === pool.token1.id ? pool.token0 : pool.token1;
 
+  const handleSubscribeToAll = async () => {
+    const incentiveIds = [...unsubscribedIncentiveIds];
+    await subscribeToIncentives(incentiveIds);
+    // API can be slow to update, so optimistically update the subscribed list
+    setOptimisticSubscribedIncentiveIds((curr) => curr.concat(incentiveIds));
+    refetch();
+  };
+
+  const handleClaimRewards = async () => {
+    await claimRewards(subscribedIncentiveIds);
+    // Doesn't need optimistic update because data is pulled directly from contract
+    refetch();
+  };
+
+  const handleWithdrawRewards = async (tokens: TroveTokenWithQuantity[]) => {
+    await withdrawBatch(
+      tokens.map((token) => ({
+        id: BigInt(token.tokenId),
+        amount: BigInt(token.quantity),
+        collectionId: token.collectionAddr as Address,
+      })),
+    );
+    setIsWithdrawingFromVault(false);
+    refetch();
+  };
+
   return (
     <main className="container py-5 md:py-7">
       <Link
@@ -502,12 +511,7 @@ export default function PoolDetailsPage() {
                     )}
                   </div>
                   {lpStaked > 0 && unsubscribedIncentiveIds.length > 0 ? (
-                    <Button
-                      className="w-full"
-                      onClick={() =>
-                        subscribeToIncentives(unsubscribedIncentiveIds)
-                      }
-                    >
+                    <Button className="w-full" onClick={handleSubscribeToAll}>
                       Start earning all rewards
                     </Button>
                   ) : null}
@@ -544,10 +548,7 @@ export default function PoolDetailsPage() {
                       </ul>
                     </div>
                     {hasStakingRewards ? (
-                      <Button
-                        className="w-full"
-                        onClick={() => claimRewards(subscribedIncentiveIds)}
-                      >
+                      <Button className="w-full" onClick={handleClaimRewards}>
                         Claim all rewards
                       </Button>
                     ) : null}
@@ -771,16 +772,7 @@ export default function PoolDetailsPage() {
                 floorBigInt(nftIncentiveTokenBalance, nftIncentiveDecimals),
                 nftIncentiveDecimals,
               )}
-              onSubmit={async (tokens) => {
-                await withdrawBatch(
-                  tokens.map((token) => ({
-                    id: BigInt(token.tokenId),
-                    amount: BigInt(token.quantity),
-                    collectionId: token.collectionAddr as Address,
-                  })),
-                );
-                setIsWithdrawingFromVault(false);
-              }}
+              onSubmit={handleWithdrawRewards}
               isSubmitDisabled={isLoadingWithdrawBatch}
               keepOpenOnSubmit
             />