From 21ffb8b5b508c60121554dc7327de4c40c27d646 Mon Sep 17 00:00:00 2001
From: sharad-s <sharadshekar@gmail.com>
Date: Tue, 15 Mar 2022 22:00:48 -0500
Subject: [PATCH] Convex Pool shows up in rewarded pools

---
 src/components/pages/Fuse/FuseTabBar.tsx      |  7 --
 .../pages/Fuse/Modals/PluginModal/index.ts    |  2 +-
 src/constants/convex.ts                       |  4 +-
 src/hooks/convex/useConvexRewards.ts          | 21 +-----
 src/hooks/fuse/useFusePools.ts                | 66 ++++++++++---------
 5 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/src/components/pages/Fuse/FuseTabBar.tsx b/src/components/pages/Fuse/FuseTabBar.tsx
index 2c1c11ac..2195b760 100644
--- a/src/components/pages/Fuse/FuseTabBar.tsx
+++ b/src/components/pages/Fuse/FuseTabBar.tsx
@@ -30,13 +30,6 @@ const FuseTabBar = () => {
   const [val, setVal] = useState("");
   const { isAuthed, chainId } = useRari();
 
-  useEffect(() => {
-    if (router.pathname === "/fuse") {
-      const route = val ? `/fuse?filter=${val}` : "/fuse";
-      router.push(route, undefined, { shallow: true });
-    }
-  }, [val]);
-
   return (
     <DashboardBox width="100%" mt={4} height={isMobile ? "auto" : "65px"}>
       <RowOrColumn
diff --git a/src/components/pages/Fuse/Modals/PluginModal/index.ts b/src/components/pages/Fuse/Modals/PluginModal/index.ts
index 3f2a0d28..51d7c1c6 100644
--- a/src/components/pages/Fuse/Modals/PluginModal/index.ts
+++ b/src/components/pages/Fuse/Modals/PluginModal/index.ts
@@ -1,2 +1,2 @@
-import PluginModal from './PluginModal'
+import PluginModal from './PluginRewardsModal'
 export default PluginModal
\ No newline at end of file
diff --git a/src/constants/convex.ts b/src/constants/convex.ts
index ad4248f3..ce99792c 100644
--- a/src/constants/convex.ts
+++ b/src/constants/convex.ts
@@ -86,4 +86,6 @@ type PluginCTokenInfoType = {
         convexPoolName: string,
         curvePoolLink: string,
     }
-}
\ No newline at end of file
+}
+
+export const POOL_156_COMPTROLLER = "0x07cd53380FE9B2a5E64099591b498c73F0EfaA66"
diff --git a/src/hooks/convex/useConvexRewards.ts b/src/hooks/convex/useConvexRewards.ts
index 629dbf51..8521bc7c 100644
--- a/src/hooks/convex/useConvexRewards.ts
+++ b/src/hooks/convex/useConvexRewards.ts
@@ -1,19 +1,13 @@
 import { useRari } from "context/RariContext";
-import { BigNumber, constants, Contract } from "ethers";
+import { BigNumber, Contract } from "ethers";
 
 import FlywheelLensABI from "contracts/abi/FlywheelRouter.json";
 import { useQuery } from "react-query";
-// import { formatEther } from "ethers/lib/utils";
 import { useCallback } from "react";
 import { Web3Provider } from "@ethersproject/providers";
 import { filterOnlyObjectProperties } from "utils/fetchFusePoolData";
-// import { getEthUsdPriceBN } from "esm/utils/getUSDPriceBN";
-// import { FusePoolData } from "utils/fetchFusePoolData";
-// import { getPriceFromOracles } from "hooks/rewards/useRewardAPY";
 import { useConvexPoolSuppliedCTokens } from "hooks/convex/useConvexPoolSuppliedCTokens";
-// import { pools } from "constants/pools";
-// import useCTokensWithRewardsPlugin from "./useMarketsWithPlugins";
-
+import { POOL_156_COMPTROLLER } from "constants/convex";
 
 const FLYWHEEL_LENS_ROUTER = "0xe7813367804d5a8bc19c27a143c8b837d373e3b7";
 
@@ -214,17 +208,6 @@ export const useFlywheelsTotalUSD = (
  */
 
 
-const POOL_156_MARKETS_WITH_PLUGINS = [
-  "0xEee0de9187B8B1Ba554E406d0b36a807A00B0ea5",
-  "0x03C2d837e625E0f5CC8f50084b7986863c82102C",
-  "0x5E479875Ed69d4F09f7bCAaF71E9879b12d9e326",
-  "0x3c37CdA5C30952E48aFcc40443A9296e59DAAcA9",
-  "0x97b8c935e130cBa777579Ea2460c4C3e78a48a61",
-  "0x2ec70d3Ff3FD7ac5c2a72AAA64A398b6CA7428A5",
-  "0xe71b4Cb8A99839042C45CC4cAca31C85C994E79f"
-]
-
-export const POOL_156_COMPTROLLER = "0x07cd53380fe9b2a5e64099591b498c73f0efaa66"
 
 export const useConvexMaxClaimable = () => {
   const cTokens: string[] | undefined = useConvexPoolSuppliedCTokens(POOL_156_COMPTROLLER)
diff --git a/src/hooks/fuse/useFusePools.ts b/src/hooks/fuse/useFusePools.ts
index a6da1b36..9b19c7e3 100644
--- a/src/hooks/fuse/useFusePools.ts
+++ b/src/hooks/fuse/useFusePools.ts
@@ -18,6 +18,8 @@ import { ChainID } from "esm/utils/networks";
 
 import { BigNumber } from "ethers";
 import { providers } from "@0xsequence/multicall";
+import { POOL_156_COMPTROLLER } from "constants/convex";
+import { flywheels } from "hooks/convex/useConvexRewards";
 
 // Ethers
 export interface FusePool {
@@ -121,7 +123,7 @@ export const fetchPoolsManual = async ({
 
   const multicallProvider = new providers.MulticallProvider(fuse.provider)
   const multicallFuse = new Fuse(multicallProvider, chainId)
-  const poolRewardTokens = await Promise.all(fusePools.map( (pool) => {
+  const poolRewardTokens = await Promise.all(fusePools.map((pool) => {
     return multicallFuse.contracts.FusePoolLensSecondary.callStatic.getRewardSpeedsByPool(
       pool.comptroller
     ).then((rewards) => {
@@ -174,30 +176,30 @@ export const fetchPools = async ({
   const req = isMyPools
     ? fuse.contracts.FusePoolLens.callStatic.getPoolsBySupplierWithData(address)
     : isCreatedPools
-    ? fuse.contracts.FusePoolLens.callStatic.getPoolsByAccountWithData(address)
-    : isNonWhitelistedPools
-    ? fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
-        false
-      )
-    : isRewardedPools
-    ? Promise.all([
-      fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
-        true
-      ),
-      fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
-        false
-      )]
-    ).then(([verifiedPools, unverifiedPools]) => {
-      return [
-        [...verifiedPools[0], ...unverifiedPools[0]],
-        [...verifiedPools[1], ...unverifiedPools[1]],
-        [...verifiedPools[2], ...unverifiedPools[2]],
-        [...verifiedPools[3], ...unverifiedPools[3]],
-      ]
-    })
-    : fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
-        true
-      );
+      ? fuse.contracts.FusePoolLens.callStatic.getPoolsByAccountWithData(address)
+      : isNonWhitelistedPools
+        ? fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
+          false
+        )
+        : isRewardedPools
+          ? Promise.all([
+            fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
+              true
+            ),
+            fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
+              false
+            )]
+          ).then(([verifiedPools, unverifiedPools]) => {
+            return [
+              [...verifiedPools[0], ...unverifiedPools[0]],
+              [...verifiedPools[1], ...unverifiedPools[1]],
+              [...verifiedPools[2], ...unverifiedPools[2]],
+              [...verifiedPools[3], ...unverifiedPools[3]],
+            ]
+          })
+          : fuse.contracts.FusePoolLens.callStatic.getPublicPoolsByVerificationWithData(
+            true
+          );
 
   const {
     0: ids,
@@ -206,8 +208,8 @@ export const fetchPools = async ({
     3: errors,
   }: LensPoolsWithData = await req;
 
-  
-  const poolRewardTokens = await Promise.all(fusePools.map( (pool, index) => {
+
+  const poolRewardTokens: string[][] = await Promise.all(fusePools.map((pool, index) => {
     return multicallFuse.contracts.FusePoolLensSecondary.callStatic.getRewardSpeedsByPool(
       pool.comptroller
     ).then((rewards) => {
@@ -233,7 +235,7 @@ const createMergedPools = async (
     const id = parseFloat(ids[i]);
     const fusePool = fusePools[i];
     const fusePoolData = fusePoolsData[i];
-    const poolTokenRewards = rewardTokens[i];
+    const poolTokenRewards = id === 156 ? Object.values(flywheels).map(f => f.rewardToken) : rewardTokens[i];
 
     const mergedPool = {
       id,
@@ -272,7 +274,7 @@ export const useFusePools = (filter: string | null): MergedPool[] | null => {
           chainId,
         });
       }
-      return await fetchPools({ fuse, address, filter, chainId});
+      return await fetchPools({ fuse, address, filter, chainId });
     }
   );
 
@@ -281,6 +283,8 @@ export const useFusePools = (filter: string | null): MergedPool[] | null => {
       return null;
     }
 
+    console.log({ pools })
+
     if (!pools.length) {
       return [];
     }
@@ -293,9 +297,9 @@ export const useFusePools = (filter: string | null): MergedPool[] | null => {
       return poolSort(pools);
     }
 
-    if(isRewardedPools){
+    if (isRewardedPools) {
       return poolSort(pools.filter((pool) => {
-        return pool.rewardTokens.length > 0
+        return (pool.rewardTokens.length > 0 || pool.comptroller == POOL_156_COMPTROLLER)
       }))
     }