Merge pull request QuickSwap#1706 from 0xoscario/remove/defiedge

sameepsi · web-flow · commit 43576212ccdb · 2025-02-28T23:12:06.000+05:30
Remove all defiedge mentions
diff --git a/src/hooks/v3/useV3Farms.ts b/src/hooks/v3/useV3Farms.ts
@@ -20,7 +20,6 @@ import { useEffect, useMemo } from 'react';
 import { useSelectedTokenList } from 'state/lists/hooks';
 import {
   calculatePositionWidth,
-  getAllDefiedgeStrategies,
   getAllGammaPairs,
   getTokenFromAddress,
   percentageToMultiplier,
@@ -37,7 +36,7 @@ import { useGammaData, useGammaRewards } from './useGammaData';
 import { useActiveWeb3React } from 'hooks';
 import { useSteerVaults } from './useSteerData';
 import { useICHIVaultAPRs, useICHIVaults } from 'hooks/useICHIData';
-// import { useDefiEdgeStrategiesAPR } from 'state/mint/v3/hooks';
+
 import {
   useEternalFarmAprs,
   useEternalFarmPoolAPRs,
@@ -455,27 +454,6 @@ export const useMerklFarms = () => {
     usdPrices,
   );
 
-  const defiEdgeIdsFiltered = useMemo(() => {
-    if (!merklFarms) return [];
-
-    return getAllDefiedgeStrategies(chainId)
-      .filter(
-        (vault) =>
-          !!merklFarms.find(
-            (item) =>
-              !!item.forwarders.find(
-                (alm: any) =>
-                  alm.label.includes('DefiEdge') &&
-                  vault.id.toLowerCase() === alm.almAddress.toLowerCase(),
-              ),
-          ),
-      )
-      .map((e) => e.id);
-  }, [chainId, merklFarms]);
-  // const {
-  //   isLoading: loadingDefiEdgeAPRs,
-  //   data: defiedgeAprs,
-  // } = useDefiEdgeStrategiesAPR(defiEdgeIdsFiltered);
   const {
     data: eternalFarmPoolAprs,
     isLoading: eternalFarmPoolAprsLoading,
@@ -499,10 +477,6 @@ export const useMerklFarms = () => {
           return IchiVaults[chainId]?.find(
             (address) => address.toLowerCase() === alm.almAddress.toLowerCase(),
           );
-        } else if (alm.label.includes('DefiEdge')) {
-          return getAllDefiedgeStrategies(chainId).find(
-            (item) => item.id.toLowerCase() === alm.almAddress.toLowerCase(),
-          );
         }
         return false;
       });
@@ -562,13 +536,6 @@ export const useMerklFarms = () => {
                 item.address.toLowerCase() === alm.almAddress.toLowerCase(),
             );
             allowToken0 = ichiVault?.allowToken0;
-          } else if (alm.label.includes('DefiEdge')) {
-            poolAPR = 0;
-            // defiedgeAprs?.find(
-            //   (e: any) =>
-            //     e.strategy.address.toLowerCase() ===
-            //     alm.almAddress.toLowerCase(),
-            // )?.strategy?.fees_apr ?? 0;
           } else if (
             alm.label.toLowerCase().includes('quickswap') &&
             eternalFarmPoolAprs
@@ -588,7 +555,6 @@ export const useMerklFarms = () => {
     });
   }, [
     chainId,
-    // defiedgeAprs,
     eternalFarmPoolAprs,
     gammaData,
     ichiAPRs,
@@ -599,7 +565,6 @@ export const useMerklFarms = () => {
   return {
     loading: loadingMerkl,
     loadingPoolAPRs:
-      // loadingDefiEdgeAPRs ||
       loadingICHIAPRs ||
       loadingUSDPrices ||
       eternalFarmPoolAprsLoading ||
diff --git a/src/pages/FarmPage/V3/AllMerklFarms.tsx b/src/pages/FarmPage/V3/AllMerklFarms.tsx
@@ -16,12 +16,11 @@ import MerklFarmCard from './MerklFarmCard';
 import useParsedQueryString from 'hooks/useParsedQueryString';
 import CustomSelector from 'components/v3/CustomSelector';
 import MerklPairFarmCard from './MerklPairFarmCard';
-import { getAllDefiedgeStrategies, getAllGammaPairs } from 'utils';
+import { getAllGammaPairs } from 'utils';
 import { useActiveWeb3React } from 'hooks';
 import { useHistory } from 'react-router-dom';
 import { useCurrency } from 'hooks/v3/Tokens';
 import { KeyboardArrowLeft } from '@material-ui/icons';
-import { useDefiEdgeRangeTitles } from 'hooks/v3/useDefiedgeStrategyData';
 import { useUSDCPricesFromAddresses } from 'utils/useUSDCPrice';
 
 interface Props {
@@ -274,15 +273,6 @@ const AllMerklFarms: React.FC<Props> = ({
   const currency0 = useCurrency(selectedPool?.token0);
   const currency1 = useCurrency(selectedPool?.token1);
 
-  const selectedDefiEdgeIds = getAllDefiedgeStrategies(chainId)
-    .filter(
-      (item) =>
-        !!(selectedPool?.alm ?? []).find(
-          (alm: any) => alm.almAddress.toLowerCase() === item.id.toLowerCase(),
-        ),
-    )
-    .map((item) => item.id);
-  const defiEdgeTitles = useDefiEdgeRangeTitles(selectedDefiEdgeIds);
   const selectedFarms: any[] = useMemo(() => {
     const almFarms: any[] = selectedPool?.alm ?? [];
     return almFarms.map((alm) => {
@@ -293,12 +283,6 @@ const AllMerklFarms: React.FC<Props> = ({
             (item) =>
               item.address.toLowerCase() === alm.almAddress.toLowerCase(),
           )?.title ?? '';
-      } else if (alm.label.includes('DefiEdge')) {
-        title =
-          defiEdgeTitles.find(
-            (item) =>
-              item.address.toLowerCase() === alm.almAddress.toLowerCase(),
-          )?.title ?? '';
       }
       return {
         ...alm,
@@ -311,7 +295,7 @@ const AllMerklFarms: React.FC<Props> = ({
             : undefined,
       };
     });
-  }, [chainId, defiEdgeTitles, selectedPool]);
+  }, [chainId, selectedPool]);
 
   const farmTypes = useMemo(() => {
     const mTypes = selectedFarms.reduce((memo: string[], item) => {
diff --git a/src/pages/FarmPage/V3/MerklFarmAPRTooltipItem.tsx b/src/pages/FarmPage/V3/MerklFarmAPRTooltipItem.tsx
@@ -1,6 +1,5 @@
 import { Box, Button } from '@material-ui/core';
 import { useActiveWeb3React } from 'hooks';
-import { useDefiEdgeRangeTitles } from 'hooks/v3/useDefiedgeStrategyData';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { formatNumber, getAllGammaPairs } from 'utils';
@@ -13,12 +12,6 @@ export const MerklFarmAPRTooltipItem: React.FC<{
   const { t } = useTranslation();
   const { chainId } = useActiveWeb3React();
   const farmType = farm.label ? farm.label.split(' ')[0] : '';
-  const defiEdgeFarmTitleData = useDefiEdgeRangeTitles(
-    farmType === 'DefiEdge' ? [farm.almAddress] : [],
-  );
-  const defiEdgeFarmTitle = defiEdgeFarmTitleData[0]
-    ? defiEdgeFarmTitleData[0].title
-    : undefined;
 
   const farmTitle = useMemo(() => {
     if (farm.label) {
@@ -29,15 +22,13 @@ export const MerklFarmAPRTooltipItem: React.FC<{
               item.address.toLowerCase() === farm.almAddress.toLowerCase(),
           )?.title ?? ''
         );
-      } else if (farm.label.includes('DefiEdge')) {
-        return defiEdgeFarmTitle ?? '';
       } else if (farm.label.includes('Steer')) {
         return farm.title;
       }
       return '';
     }
     return '';
-  }, [chainId, defiEdgeFarmTitle, farm]);
+  }, [chainId, farm]);
 
   return (
     <Box>
diff --git a/src/pages/FarmPage/V3/MerklPairFarmCard.tsx b/src/pages/FarmPage/V3/MerklPairFarmCard.tsx
@@ -4,7 +4,6 @@ import { DoubleCurrencyLogo } from 'components';
 import { formatNumber, getTokenFromAddress } from 'utils';
 import APRHover from 'assets/images/aprHover.png';
 import QuickSwapLogo from 'assets/images/quickLogo.png';
-import DefiedgeLogo from 'assets/images/defiedge.png';
 import GammaLogo from 'assets/images/gammaLogo.png';
 import IchiLogo from 'assets/images/ichi_logo.png';
 import SteerLogo from 'assets/images/SteerLogo.png';
@@ -30,15 +29,6 @@ export const MerklPairFarmCard: React.FC<Props> = ({ farm }) => {
         <img src={GammaLogo} alt='Gamma Logo' style={{ height: 10 }} />
       );
       break;
-    case 'DefiEdge':
-      poolIcon = (
-        <img
-          src={DefiedgeLogo}
-          alt='Defiedge Logo'
-          style={{ height: 36, marginLeft: '-10px' }}
-        />
-      );
-      break;
     case 'Ichi':
       poolIcon = <img src={IchiLogo} alt='ICHI Logo' style={{ height: 18 }} />;
       break;
diff --git a/src/pages/FarmPage/V3/MerklPairFarmCardDetails.tsx b/src/pages/FarmPage/V3/MerklPairFarmCardDetails.tsx
@@ -4,16 +4,13 @@ import { CurrencyLogo, CustomMenu } from 'components';
 import RangeBadge from 'components/v3/Badge/RangeBadge';
 import { useActiveWeb3React } from 'hooks';
 import { useICHIPosition } from 'hooks/useICHIData';
-import { useDefiEdgePosition } from 'hooks/v3/useDefiedgeStrategyData';
 import { useGammaPosition } from 'hooks/v3/useGammaData';
 import { usePool } from 'hooks/v3/usePools';
 import { useSteerPosition } from 'hooks/v3/useSteerData';
 import {
   useGetMerklRewards,
   useV3PositionsFromPool,
 } from 'hooks/v3/useV3Farms';
-import IncreaseDefiedgeLiquidityModal from 'pages/PoolsPage/v3/MyDefiedgePoolsV3/IncreaseDefiedgeLiquidityModal';
-import WithdrawDefiedgeLiquidityModal from 'pages/PoolsPage/v3/MyDefiedgePoolsV3/WithdrawDefiedgeLiquidityModal';
 import IncreaseGammaLiquidityModal from 'pages/PoolsPage/v3/MyGammaPoolsV3/IncreaseGammaLiquidityModal';
 import WithdrawGammaLiquidityModal from 'pages/PoolsPage/v3/MyGammaPoolsV3/WithdrawGammaLiquidityModal';
 import IncreaseICHILiquidityModal from 'pages/PoolsPage/v3/MyICHIPools/IncreaseICHILiquidityModal';
@@ -50,7 +47,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
   const farmType = farm.label.split(' ')[0];
   const isICHI = !!farm.label.includes('Ichi');
   const isGamma = !!farm.label.includes('Gamma');
-  const isDefiEdge = !!farm.label.includes('DefiEdge');
   const isQuickswap = farm.label.toLowerCase().includes('quickswap');
   const isSteer = !!farm.label.includes('Steer');
 
@@ -64,14 +60,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
     farm?.token0,
     farm?.token1,
   );
-  const {
-    loading: loadingDefiEdge,
-    data: defiEdgePosition,
-  } = useDefiEdgePosition(
-    isDefiEdge ? farm.almAddress : undefined,
-    farm?.token0,
-    farm?.token1,
-  );
   const { loading: loadingSteer, data: steerPosition } = useSteerPosition(
     isSteer ? farm.almAddress : undefined,
   );
@@ -136,8 +124,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
     ? loadingICHI
     : isGamma
     ? loadingGamma
-    : isDefiEdge
-    ? loadingDefiEdge
     : isQuickswap
     ? loadingQS
     : isSteer
@@ -150,9 +136,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
     if (isGamma) {
       return gammaPosition?.balance0 ?? 0;
     }
-    if (isDefiEdge) {
-      return defiEdgePosition?.balance0 ?? 0;
-    }
     if (isQuickswap) {
       return Number(qsPosition?.amount0.toExact() ?? 0);
     }
@@ -163,12 +146,10 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
   }, [
     isICHI,
     isGamma,
-    isDefiEdge,
     isQuickswap,
     isSteer,
     ichiPosition?.token0Balance,
     gammaPosition?.balance0,
-    defiEdgePosition?.balance0,
     qsPosition?.amount0,
     steerPosition?.token0BalanceWallet,
   ]);
@@ -180,9 +161,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
     if (isGamma) {
       return gammaPosition?.balance1 ?? 0;
     }
-    if (isDefiEdge) {
-      return defiEdgePosition?.balance1 ?? 0;
-    }
     if (isQuickswap) {
       return Number(qsPosition?.amount1.toExact() ?? 0);
     }
@@ -193,12 +171,10 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
   }, [
     isICHI,
     isGamma,
-    isDefiEdge,
     isQuickswap,
     isSteer,
     ichiPosition?.token1Balance,
     gammaPosition?.balance1,
-    defiEdgePosition?.balance1,
     qsPosition?.amount1,
     steerPosition?.token1BalanceWallet,
   ]);
@@ -303,20 +279,6 @@ export const MerklPairFarmCardDetails: React.FC<Props> = ({ farm }) => {
           position={gammaPosition}
         />
       )}
-      {defiEdgePosition && openAdd && (
-        <IncreaseDefiedgeLiquidityModal
-          open={openAdd}
-          onClose={() => setOpenAdd(false)}
-          position={defiEdgePosition}
-        />
-      )}
-      {defiEdgePosition && openWithdraw && (
-        <WithdrawDefiedgeLiquidityModal
-          open={openWithdraw}
-          onClose={() => setOpenWithdraw(false)}
-          position={defiEdgePosition}
-        />
-      )}
       {steerPosition && openAdd && (
         <IncreaseSteerLiquidityModal
           open={openAdd}
diff --git a/src/pages/FarmPage/V3/MyRewardFarms.tsx b/src/pages/FarmPage/V3/MyRewardFarms.tsx
@@ -6,12 +6,10 @@ import { useMerklFarms } from 'hooks/v3/useV3Farms';
 import Loader from 'components/Loader';
 import CustomSelector from 'components/v3/CustomSelector';
 import MerklPairFarmCard from './MerklPairFarmCard';
-import { getAllDefiedgeStrategies, getAllGammaPairs } from 'utils';
+import { getAllGammaPairs } from 'utils';
 import { useActiveWeb3React } from 'hooks';
-import { useDefiEdgeRangeTitles } from 'hooks/v3/useDefiedgeStrategyData';
-import { useUSDCPricesFromAddresses } from 'utils/useUSDCPrice';
+
 import {
-  useDefiedgePositions,
   useICHIPositions,
   useUnipilotPositions,
   useV3Positions,
@@ -36,15 +34,10 @@ const MyRewardFarms: React.FC<Props> = ({
 
   const myPositionIds: any = [];
   const { positions } = useV3Positions(account, true);
-  const { positions: defiedgePositions } = useDefiedgePositions(
-    account,
-    chainId,
-  );
   const { unipilotPositions } = useUnipilotPositions(account, chainId);
   const { positions: ichiPositions } = useICHIPositions();
   const steerPositions = useV3SteerPositions();
   const gammaPositions = useGammaPositions();
-  defiedgePositions.map((item) => myPositionIds.push(item?.id));
   unipilotPositions.map((item) => myPositionIds.push(item?.id));
   ichiPositions.map((item) => myPositionIds.push(item?.address));
   steerPositions.map((item) => myPositionIds.push(item?.address));
@@ -264,17 +257,6 @@ const MyRewardFarms: React.FC<Props> = ({
     }
   });
 
-  const selectedDefiEdgeIds = getAllDefiedgeStrategies(chainId)
-    .filter((item) => {
-      // Check if any pool in selectedPool contains the almAddress
-      return (selectedPool ?? []).some((pool: any) =>
-        (pool.alm ?? []).some(
-          (alm: any) => alm.almAddress.toLowerCase() === item.id.toLowerCase(),
-        ),
-      );
-    })
-    .map((item) => item.id);
-  const defiEdgeTitles = useDefiEdgeRangeTitles(selectedDefiEdgeIds);
   const selectedFarmsPre: any[] = useMemo(() => {
     return selectedPool.map((pool: any) => {
       const almFarms: any[] = pool?.alm ?? [];
@@ -286,12 +268,6 @@ const MyRewardFarms: React.FC<Props> = ({
               (item) =>
                 item.address.toLowerCase() === alm.almAddress.toLowerCase(),
             )?.title ?? '';
-        } else if (alm.label.includes('DefiEdge')) {
-          title =
-            defiEdgeTitles.find(
-              (item) =>
-                item.address.toLowerCase() === alm.almAddress.toLowerCase(),
-            )?.title ?? '';
         }
 
         return {
@@ -306,7 +282,7 @@ const MyRewardFarms: React.FC<Props> = ({
         };
       });
     });
-  }, [chainId, defiEdgeTitles, selectedPool]);
+  }, [chainId, selectedPool]);
   const combinedArray = [].concat(...selectedFarmsPre);
 
   const selectedFarms = combinedArray.filter((item: any) => {
diff --git a/src/pages/PoolsPage/v3/SupplyLiquidityV3/components/PresetRanges/index.tsx b/src/pages/PoolsPage/v3/SupplyLiquidityV3/components/PresetRanges/index.tsx
diff --git a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/AddLiquidityButton/index.tsx b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/AddLiquidityButton/index.tsx
diff --git a/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx b/src/pages/PoolsPage/v3/SupplyLiquidityV3/containers/SelectRange/index.tsx
