Remove Farming toggle and add All tab

src/constants/index.ts

@@ -301,12 +301,13 @@ export const GlobalConst = {
       otherLP: '4',
     },
     poolsFilter: {
-      quickswap: '0',
-      unipilot: '1',
-      gamma: '2',
-      steer: '3',
-      defiedge: '4',
-      ichi: '5',
+      all: '0',
+      quickswap: '1',
+      unipilot: '2',
+      gamma: '3',
+      steer: '4',
+      defiedge: '5',
+      ichi: '6',
     },
   },
   analyticChart: {

src/hooks/v3/useV3Positions.ts

@@ -47,6 +47,7 @@ interface UseV3PositionsResults {
   loading: boolean;
   positions: PositionPool[] | undefined;
   count?: number;
+  includeCloseCount?: number;
 }
 
 export function useV3PositionsFromTokenIds(
@@ -253,6 +254,9 @@ export function useV3Positions(
     (hideFarmingPosition
       ? 0
       : transferredTokenIds.length + oldTransferredTokenIds.length);
+  const totalCount =
+    (algebraPositions ?? []).concat(isV4 ? [] : uniV3Positions ?? []).length +
+    (transferredTokenIds.length + oldTransferredTokenIds.length);
 
   return {
     loading:
@@ -263,6 +267,7 @@ export function useV3Positions(
       _positionsOnFarmerLoading,
     positions: combinedPositions,
     count,
+    includeCloseCount: totalCount,
   };
 }
 

src/pages/PoolsPage/v3/MyDefiedgePoolsV3/index.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Box, Button } from '@material-ui/core';
 import { useActiveWeb3React } from 'hooks';
 import Loader from 'components/Loader';
@@ -7,7 +7,13 @@ import DefiedgeLPList from './DefiedgeLPList';
 import { useDefiedgePositions } from 'hooks/v3/useV3Positions';
 import { useWeb3Modal } from '@web3modal/ethers5/react';
 
-export default function MyDefiedgePoolsV3() {
+export default function MyDefiedgePoolsV3({
+  isForAll,
+  setIsLoading,
+}: {
+  isForAll?: boolean;
+  setIsLoading?: (loading: boolean) => void;
+}) {
   const { t } = useTranslation();
   const { chainId, account } = useActiveWeb3React();
 
@@ -17,9 +23,13 @@ export default function MyDefiedgePoolsV3() {
 
   const { positions, loading } = useDefiedgePositions(account, chainId);
 
+  useEffect(() => {
+    !!setIsLoading && setIsLoading(loading);
+  }, [setIsLoading, loading]);
+
   return (
     <Box>
-      {loading ? (
+      {!!account && isForAll && loading ? (
         <Box mt={2} className='flex justify-center'>
           <Loader stroke='white' size={'2rem'} />
         </Box>

src/pages/PoolsPage/v3/MyGammaPoolsV3/index.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Box, Button } from '@material-ui/core';
 import { useActiveWeb3React } from 'hooks';
 import Loader from 'components/Loader';
@@ -15,7 +15,13 @@ import { formatUnits, Interface } from 'ethers/lib/utils';
 import { useGammaData } from 'hooks/v3/useGammaData';
 import { useWeb3Modal } from '@web3modal/ethers5/react';
 
-export default function MyGammaPoolsV3() {
+export default function MyGammaPoolsV3({
+  isForAll,
+  setIsLoading,
+}: {
+  isForAll?: boolean;
+  setIsLoading?: (loading: boolean) => void;
+}) {
   const { t } = useTranslation();
   const { chainId, account } = useActiveWeb3React();
 
@@ -109,6 +115,10 @@ export default function MyGammaPoolsV3() {
     lpTotalSupplyLoading ||
     dataLoading;
 
+  useEffect(() => {
+    !!setIsLoading && setIsLoading(loading);
+  }, [setIsLoading, loading]);
+
   const gammaPositions = lpsWithStakedAmount
     .map((lp, ind) => {
       const totalAmountsCalldata = lpTotalAmounts[ind];
@@ -165,25 +175,27 @@ export default function MyGammaPoolsV3() {
     .filter((item) => item.lpAmount > 0);
 
   return (
-    <Box>
-      {loading ? (
+    <>
+      {!!account && !isForAll && loading ? (
         <Box mt={2} className='flex justify-center'>
           <Loader stroke='white' size={'2rem'} />
         </Box>
       ) : gammaPositions.length > 0 ? (
         <GammaLPList gammaPositions={gammaPositions} />
       ) : (
-        <Box mt={2} textAlign='center'>
-          <p>{t('noLiquidityPositions')}.</p>
-          {showConnectAWallet && (
-            <Box maxWidth={250} margin='20px auto 0'>
-              <Button fullWidth onClick={() => open()}>
-                {t('connectWallet')}
-              </Button>
-            </Box>
-          )}
-        </Box>
+        !isForAll && (
+          <Box mt={2} textAlign='center'>
+            <p>{t('noLiquidityPositions')}.</p>
+            {showConnectAWallet && (
+              <Box maxWidth={250} margin='20px auto 0'>
+                <Button fullWidth onClick={() => open()}>
+                  {t('connectWallet')}
+                </Button>
+              </Box>
+            )}
+          </Box>
+        )
       )}
-    </Box>
+    </>
   );
 }

src/pages/PoolsPage/v3/MyICHIPools/index.tsx

@@ -6,7 +6,7 @@ import ICHILPItem from './ICHILPItem';
 import { useICHIPositions } from 'hooks/v3/useV3Positions';
 import { useWeb3Modal } from '@web3modal/ethers5/react';
 
-export default function MyICHIPools() {
+export default function MyICHIPools({ isForAll }: { isForAll?: boolean }) {
   const { t } = useTranslation();
   const { account } = useActiveWeb3React();
 
@@ -17,25 +17,27 @@ export default function MyICHIPools() {
   const { positions } = useICHIPositions();
 
   return (
-    <Box>
+    <>
       {positions && positions.length > 0 ? (
         <>
           {positions.map((position, index) => (
             <ICHILPItem key={index} position={position} />
           ))}
         </>
       ) : (
-        <Box mt={2} textAlign='center'>
-          <p>{t('noLiquidityPositions')}.</p>
-          {showConnectAWallet && (
-            <Box maxWidth={250} margin='20px auto 0'>
-              <Button fullWidth onClick={() => open()}>
-                {t('connectWallet')}
-              </Button>
-            </Box>
-          )}
-        </Box>
+        !isForAll && (
+          <Box mt={2} textAlign='center'>
+            <p>{t('noLiquidityPositions')}.</p>
+            {showConnectAWallet && (
+              <Box maxWidth={250} margin='20px auto 0'>
+                <Button fullWidth onClick={() => open()}>
+                  {t('connectWallet')}
+                </Button>
+              </Box>
+            )}
+          </Box>
+        )
       )}
-    </Box>
+    </>
   );
 }