From e303967462b4ff83a14a5d43338c33afe6469bc6 Mon Sep 17 00:00:00 2001 From: Sharad Date: Fri, 10 Jun 2022 13:58:21 -0500 Subject: [PATCH] fix claim --- src/components/shared/Claim/ClaimRGTModal.tsx | 26 ++++++++----------- .../Fuse/contracts/compound-protocol.min.json | 2 +- src/esm/utils/networks.js | 18 ++++++------- src/utils/multicall.ts | 4 +-- src/utils/rewards.ts | 15 ++++++----- 5 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/components/shared/Claim/ClaimRGTModal.tsx b/src/components/shared/Claim/ClaimRGTModal.tsx index d01b749d..8d880f79 100644 --- a/src/components/shared/Claim/ClaimRGTModal.tsx +++ b/src/components/shared/Claim/ClaimRGTModal.tsx @@ -25,10 +25,7 @@ import { useUnclaimedFuseRewards, } from "hooks/rewards/useUnclaimedFuseRewards"; import DashboardBox from "../DashboardBox"; -import { - TokenData, - useTokensDataAsMap, -} from "hooks/useTokenData"; +import { TokenData, useTokensDataAsMap } from "hooks/useTokenData"; import { useClaimable } from "hooks/rewards/useClaimable"; import { claimRewardsFromRewardsDistributors } from "utils/rewards"; import { SimpleTooltip } from "../SimpleTooltip"; @@ -56,7 +53,6 @@ export const ClaimRGTModal = ({ const { fuse } = useRari(); - // pool2 // private // yieldagg @@ -120,13 +116,11 @@ const ClaimRewards = ({ showPrivate }: { showPrivate: boolean }) => { const { allClaimable, allRewardsTokens } = useClaimable(showPrivate); - const [claimingAll, setClaimingAll] = useState(false); const [claimingToken, setClaimingToken] = useState(); const rewardTokensData = useTokensDataAsMap(allRewardsTokens); - // Claims all Fuse LM rewards at once const handleClaimAll = useCallback(() => { setClaimingAll(true); @@ -168,6 +162,7 @@ const ClaimRewards = ({ showPrivate }: { showPrivate: boolean }) => { const rDs = rewardTokensMap[rewardToken]; const rDAddresses = rDs.map((rD) => rD.rewardsDistributorAddress); // all rewardsdistributors for this token + if (!!rDs.length) { setClaimingToken(rewardToken); claimRewardsFromRewardsDistributors(fuse, address, rDAddresses) @@ -248,8 +243,6 @@ const ClaimRewards = ({ showPrivate }: { showPrivate: boolean }) => { ); }; - - const ClaimableRow = ({ unclaimed, handleClaimFuseRewardsForToken, @@ -305,8 +298,10 @@ const ClaimableRow = ({ }; const unclaimedAmount = useMemo(() => { - return parseFloat(unclaimed.unclaimed.toString()) / - (1 * 10 ** (rewardTokenData?.decimals ?? 18)); + return ( + parseFloat(unclaimed.unclaimed.toString()) / + (1 * 10 ** (rewardTokenData?.decimals ?? 18)) + ); }, [unclaimed.unclaimed, rewardTokenData]); return ( @@ -343,7 +338,7 @@ const ClaimableRow = ({ crossAxisAlignment="center" px={6} py={4} - // bg="aqua" + // bg="aqua" >