feat: refactor some hooks and show expired farms with pending rewards (…

…#476) * fix: typo in comment * feat: added usemultiplecontractmultipledata hook * fix: address is "false" in state * feat: added extrapendingpewards for super farms rewards * refactor: useextrapendingrewards hook * feat: show expired farms with pending rewards * fix: code smells * fix: tsc and lint * fix: sonarcloud bug * fix: stakingInfo is undefined * fix: approve not is enabled
pangolindex · Jul 22, 2023 · 3f94746 · 3f94746
1 parent 3757d93
commit 3f94746
Show file tree

Hide file tree

Showing 17 changed files with 365 additions and 216 deletions.
diff --git a/src/apollo/pangochef.ts b/src/apollo/pangochef.ts
@@ -133,7 +133,7 @@ export const GET_FARMS_STAKED = gql`
 `;
 
 /**
- * this hook is useful to get information for pangochef famrs  from subgraph
+ * this hook is useful to get information for pangochef farms  from subgraph
  * @param
  * @returns list farms
  */

diff --git a/src/components/Pools/DetailModal/Header/index.tsx b/src/components/Pools/DetailModal/Header/index.tsx
@@ -64,7 +64,7 @@ const Header: React.FC<Props> = ({ stakingInfo, onClose }) => {
     const swapFeeAPR = stakingInfo?.swapFeeApr || 0;
     // for rest we get the data from contract calls if exist, else put 0 for this data
     if (cheftType === ChefType.PANGO_CHEF) {
-      const userApr = (stakingInfo as PangoChefInfo).userApr;
+      const userApr = (stakingInfo as PangoChefInfo)?.userApr ?? 0;
 
       return {
         totalApr: stakingAPR + swapFeeAPR + extraFarmAPR,

diff --git a/src/components/Pools/PangoChef/ClaimReward/index.tsx b/src/components/Pools/PangoChef/ClaimReward/index.tsx
@@ -58,7 +58,7 @@ const ClaimRewardV3 = ({ stakingInfo, onClose, redirectToCompound }: ClaimProps)
     hederaAssociated: isHederaTokenAssociated,
   } = useHederaTokenAssociated(notAssociateTokens?.[0]?.address, notAssociateTokens?.[0]?.symbol);
 
-  const { callback: claimRewardCallback } = useClaimRewardCallback(stakingInfo.pid, stakingInfo.poolType);
+  const { callback: claimRewardCallback } = useClaimRewardCallback(stakingInfo.pid);
 
   function wrappedOnDismiss() {
     setHash(undefined);

diff --git a/src/components/Pools/PangoChef/Stake/index.tsx b/src/components/Pools/PangoChef/Stake/index.tsx
@@ -5,7 +5,7 @@ import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ThemeContext } from 'styled-components';
 import { Box, Button, DoubleCurrencyLogo, NumberOptions, Stat, Text, TextInput, Tooltip } from 'src/components';
-import { FARM_TYPE } from 'src/constants';
+import { BIG_INT_ZERO, FARM_TYPE } from 'src/constants';
 import { PNG } from 'src/constants/tokens';
 import { usePair } from 'src/data/Reserves';
 import { useChainId, usePangolinWeb3 } from 'src/hooks';
@@ -280,15 +280,19 @@ const Stake = ({ onComplete, type, stakingInfo, combinedApr }: StakeProps) => {
         </>
       );
     } else {
+      console.log({ approval });
       return (
         <Buttons>
           <Button
             variant={approval === ApprovalState.APPROVED ? 'confirm' : 'primary'}
             onClick={onAttemptToApprove}
             isDisabled={
-              approval !== ApprovalState.NOT_APPROVED || !JSBI.greaterThan(stakingInfo.multiplier, JSBI.BigInt(0))
+              approval !== ApprovalState.NOT_APPROVED ||
+              (JSBI.equal(stakingInfo.multiplier, BIG_INT_ZERO) &&
+                stakingInfo.extraPendingRewards.length > 0 &&
+                stakingInfo.extraPendingRewards.some((pendigRewards) => JSBI.equal(pendigRewards, BIG_INT_ZERO)))
             }
-            loading={attempting && !hash}
+            loading={approval === ApprovalState.PENDING}
             loadingText={t('migratePage.loading')}
           >
             {t('earn.approve')}
@@ -301,7 +305,9 @@ const Stake = ({ onComplete, type, stakingInfo, combinedApr }: StakeProps) => {
               approval !== ApprovalState.APPROVED ||
               !!stakeCallbackError ||
               shouldCreateStorage ||
-              !JSBI.greaterThan(stakingInfo.multiplier, JSBI.BigInt(0))
+              (JSBI.equal(stakingInfo.multiplier, BIG_INT_ZERO) &&
+                stakingInfo.extraPendingRewards.length > 0 &&
+                stakingInfo.extraPendingRewards.some((pendigRewards) => JSBI.equal(pendigRewards, BIG_INT_ZERO)))
             }
             onClick={onConfirm}
             loading={attempting && !hash}

diff --git a/src/components/Pools/Pool/PoolV2.tsx b/src/components/Pools/Pool/PoolV2.tsx
@@ -21,9 +21,13 @@ const PoolV2: React.FC<Props> = ({ type, setMenu, activeMenu, menuItems, miniChe
           JSBI.greaterThan(stakingInfo.multiplier, BIG_INT_ZERO),
         );
       case PoolType.own:
-        // return all farms with staked amount greater than 0
+        // return all farms with staked amount greater than 0 or user have pending rewards on farm
         return (miniChefStakingInfo || []).filter((stakingInfo) => {
-          return Boolean(stakingInfo.stakedAmount.greaterThan('0'));
+          return Boolean(
+            stakingInfo.stakedAmount.greaterThan('0') ||
+              stakingInfo.earnedAmount.greaterThan('0') ||
+              stakingInfo.extraPendingRewards.some((pendingRewards) => JSBI.greaterThan(pendingRewards, BIG_INT_ZERO)),
+          );
         });
       case PoolType.superFarms:
         // return all farms with reward tokens address greater than 1 and with weight (multipler) greater than 0

diff --git a/src/components/Pools/Pool/PoolV3.tsx b/src/components/Pools/Pool/PoolV3.tsx
@@ -22,9 +22,13 @@ const PoolV3: React.FC<Props> = ({ type, setMenu, activeMenu, menuItems, pangoCh
           JSBI.greaterThan(stakingInfo.multiplier, BIG_INT_ZERO),
         );
       case PoolType.own:
-        // return all farms with staked amount greater than 0
+        // return all farms with staked amount greater than 0 or user have pending rewards on farm
         return (pangoChefStakingInfos || []).filter((stakingInfo) => {
-          return Boolean(stakingInfo.stakedAmount.greaterThan('0'));
+          return Boolean(
+            stakingInfo.stakedAmount.greaterThan('0') ||
+              stakingInfo.earnedAmount.greaterThan('0') ||
+              stakingInfo.extraPendingRewards.some((pendingRewards) => JSBI.greaterThan(pendingRewards, BIG_INT_ZERO)),
+          );
         });
       case PoolType.superFarms:
         // return all farms with reward tokens address greater than 0 and with weight (multipler) greater than 0

diff --git a/src/components/Pools/Pool/mock.ts b/src/components/Pools/Pool/mock.ts
@@ -3,7 +3,7 @@ import { BigNumber } from 'ethers';
 import { BIG_INT_ZERO } from 'src/constants';
 import { PNG } from 'src/constants/tokens';
 import { useChainId } from 'src/hooks';
-import { PangoChefInfo, PoolType } from 'src/state/ppangoChef/types';
+import { PangoChefInfo } from 'src/state/ppangoChef/types';
 import { MinichefStakingInfo } from 'src/state/pstake/types';
 
 // get data for all farms
@@ -47,6 +47,7 @@ export const useGetMinichefStakingInfos = (): MinichefStakingInfo => {
     getHypotheticalWeeklyRewardRate: () => {
       return new TokenAmount(png, JSBI.BigInt(0));
     },
+    extraPendingRewards: [],
   } as MinichefStakingInfo;
 };
 
@@ -65,6 +66,8 @@ export const useGetPangoChefInfos = (): PangoChefInfo => {
     },
     userRewardRate: new Fraction('1000000000000000'),
     pairPrice: new Fraction('1', '20'),
-    poolType: PoolType.ERC20_POOL,
+    poolRewardRate: new Fraction('1000', '1'),
+    userApr: 0,
+    lockCount: undefined,
   } as PangoChefInfo;
 };
diff --git a/src/components/Pools/Stake/index.tsx b/src/components/Pools/Stake/index.tsx
@@ -15,7 +15,7 @@ import {
   TextInput,
   TransactionCompleted,
 } from 'src/components';
-import { FARM_TYPE } from 'src/constants';
+import { BIG_INT_ZERO, FARM_TYPE } from 'src/constants';
 import { PNG } from 'src/constants/tokens';
 import { usePair } from 'src/data/Reserves';
 import { useChainId, useLibrary, usePangolinWeb3, useRefetchMinichefSubgraph } from 'src/hooks';
@@ -31,7 +31,7 @@ import {
   useGetPoolDollerWorth,
   useMinichefPools,
 } from 'src/state/pstake/hooks/common';
-import { DoubleSideStakingInfo, SpaceType } from 'src/state/pstake/types';
+import { DoubleSideStakingInfo, MinichefStakingInfo, SpaceType } from 'src/state/pstake/types';
 import { useTransactionAdder } from 'src/state/ptransactions/hooks';
 import { useTokenBalance } from 'src/state/pwallet/hooks/evm';
 import { waitForTransaction } from 'src/utils';
@@ -514,7 +514,11 @@ const Stake = ({ version, onComplete, type, stakingInfo, combinedApr }: StakePro
               isDisabled={
                 approval !== ApprovalState.NOT_APPROVED ||
                 signatureData !== null ||
-                !JSBI.greaterThan(stakingInfo.multiplier, JSBI.BigInt(0))
+                (JSBI.equal(stakingInfo?.multiplier, BIG_INT_ZERO) &&
+                  (stakingInfo as MinichefStakingInfo)?.extraPendingRewards.length > 0 &&
+                  (stakingInfo as MinichefStakingInfo)?.extraPendingRewards.some((pendigRewards) =>
+                    JSBI.equal(pendigRewards, BIG_INT_ZERO),
+                  ))
               }
               loading={attempting && !hash}
               loadingText={t('migratePage.loading')}
@@ -527,7 +531,11 @@ const Stake = ({ version, onComplete, type, stakingInfo, combinedApr }: StakePro
               isDisabled={
                 !!error ||
                 (signatureData === null && approval !== ApprovalState.APPROVED) ||
-                !JSBI.greaterThan(stakingInfo.multiplier, JSBI.BigInt(0))
+                (JSBI.equal(stakingInfo?.multiplier, BIG_INT_ZERO) &&
+                  (stakingInfo as MinichefStakingInfo)?.extraPendingRewards.length > 0 &&
+                  (stakingInfo as MinichefStakingInfo)?.extraPendingRewards.some((pendigRewards) =>
+                    JSBI.equal(pendigRewards, BIG_INT_ZERO),
+                  ))
               }
               onClick={onStake}
               loading={attempting && !hash}

diff --git a/src/hooks/index.tsx b/src/hooks/index.tsx
@@ -1,3 +1,4 @@
+import { getAddress } from '@ethersproject/address';
 import { ExternalProvider, Web3Provider as Web3ProviderEthers } from '@ethersproject/providers';
 import { ALL_CHAINS, CHAINS, ChainId } from '@pangolindex/sdk';
 import { useWeb3React } from '@web3-react/core';
@@ -38,9 +39,13 @@ export const PangolinWeb3Provider: FC<Web3ProviderProps> = ({
   account,
 }: Web3ProviderProps) => {
   const state = useMemo(() => {
-    let normalizedAccount;
+    let normalizedAccount: typeof account;
     if (chainId) {
-      normalizedAccount = isEvmChain(chainId) ? isAddress(account) : account;
+      if (isEvmChain(chainId) && isAddress(account)) {
+        normalizedAccount = getAddress(account as string);
+      } else {
+        normalizedAccount = account;
+      }
     }
 
     return {

diff --git a/src/state/pmulticall/hooks.ts b/src/state/pmulticall/hooks.ts
@@ -216,6 +216,49 @@ export function useMultipleContractSingleData(
   }, [fragment, results, contractInterface, latestBlockNumber]);
 }
 
+/**
+ * This hook return the result of calls to multiple contracts with multiples inputs
+ * @param addresses Contracts Addresses
+ * @param contractInterface Contract interface from ethers
+ * @param methodName Contract method name to query
+ * @param callInputs Input of each call
+ * @param options Options, eg blocks per fetch
+ * @returns Array of callstate with result, isloading and error
+ */
+export function useMultipleContractMultipleData(
+  addresses: (string | undefined)[],
+  contractInterface: Interface,
+  methodName: string,
+  callInputs?: OptionalMethodInputs[],
+  options?: ListenerOptions,
+): CallState[] {
+  const fragment = useMemo(() => contractInterface.getFunction(methodName), [contractInterface, methodName]);
+
+  const calls = useMemo(
+    () =>
+      fragment && callInputs && callInputs.length > 0 && addresses && addresses.length > 0
+        ? callInputs.map<Call | undefined>((input, index) => {
+            const address = addresses[index];
+            return address && input
+              ? {
+                  address: address,
+                  callData: contractInterface.encodeFunctionData(fragment, input),
+                }
+              : undefined;
+          })
+        : [],
+    [callInputs, contractInterface, fragment],
+  );
+
+  const results = useCallsData(calls, options);
+
+  const latestBlockNumber = useBlockNumber();
+
+  return useMemo(() => {
+    return results.map((result) => toCallState(result, contractInterface, fragment, latestBlockNumber));
+  }, [fragment, results, contractInterface, latestBlockNumber]);
+}
+
 export function useSingleCallResult(
   contract: Contract | null | undefined,
   methodName: string,

diff --git a/src/state/ppangoChef/hooks/common.ts b/src/state/ppangoChef/hooks/common.ts
@@ -34,7 +34,7 @@ export function usePangoChefExtraFarmApr(
 
   const multipliers = stakingInfo?.rewardTokensMultiplier;
 
-  const pairPrice: Fraction | undefined = stakingInfo.pairPrice;
+  const pairPrice: Fraction | undefined = stakingInfo?.pairPrice;
 
   const png = PNG[chainId];
   const tokensPrices = useTokensCurrencyPrice(_rewardTokens);