feat: handle claim reward

KyberNetwork · Nov 22, 2023 · 8be97fa · 8be97fa
1 parent 84e58f8
commit 8be97fa
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 20 deletions.
diff --git a/src/pages/OmniFarms/components/FarmList.tsx b/src/pages/OmniFarms/components/FarmList.tsx
@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'
 import { useMemo } from 'react'
 import Skeleton from 'react-loading-skeleton'
 import { Text } from 'rebass'
-import { useGetFarmsQuery } from 'services/knprotocol'
+import { NormalizedFarm, useGetFarmsQuery } from 'services/knprotocol'
 import styled from 'styled-components'
 
 import Pagination from 'components/Pagination'
@@ -29,14 +29,14 @@ const Row = styled(HeaderWrapper)(({ theme }) => ({
   height: '70px',
 }))
 
-export default function FarmList() {
+export default function FarmList({ onHarvest }: { onHarvest: (farm: NormalizedFarm) => void }) {
   const theme = useTheme()
   const { account } = useActiveWeb3React()
   const [{ chainIds, ...filters }, setFarmFilters] = useFarmFilters()
 
   const params = useMemo(() => ({ ...filters, account }), [filters, account])
 
-  const { data, isLoading, isFetching } = useGetFarmsQuery(params, {
+  const { data, isLoading } = useGetFarmsQuery(params, {
     pollingInterval: 10_000,
   })
 
@@ -58,7 +58,7 @@ export default function FarmList() {
     <FarmTable>
       <FarmTableHeader />
 
-      {isLoading || isFetching ? (
+      {isLoading ? (
         [...Array(10).keys()].map(i => (
           <Row key={i}>
             {skeleton('80%', 'left')}
@@ -72,7 +72,13 @@ export default function FarmList() {
         ))
       ) : data?.farmPools.length ? (
         data?.farmPools.map(farm => {
-          return <FarmTableRow farm={farm} key={`${farm.chain.name}_${farm.protocol}_${farm.id}`} />
+          return (
+            <FarmTableRow
+              farm={farm}
+              key={`${farm.chain.name}_${farm.protocol}_${farm.id}`}
+              onHarvest={() => onHarvest(farm)}
+            />
+          )
         })
       ) : (
         <Text padding="3rem" display="flex" alignItems="center" justifyContent="center" color={theme.subText}>

diff --git a/src/pages/OmniFarms/components/FarmTableRow.tsx b/src/pages/OmniFarms/components/FarmTableRow.tsx
@@ -36,7 +36,7 @@ const Row = styled(HeaderWrapper)(({ theme }) => ({
   borderBottom: `1px solid ${theme.border}`,
 }))
 
-const getFeeOrAMPTag = (pool: NormalizedFarm) => {
+export const getFeeOrAMPTag = (pool: NormalizedFarm) => {
   if (pool.protocol === ProtocolType.Classic && 'amp' in pool.pool) {
     return `AMP ${pool.pool.amp}`
   }
@@ -45,7 +45,7 @@ const getFeeOrAMPTag = (pool: NormalizedFarm) => {
   return ''
 }
 
-export default function FarmTableRow({ farm }: { farm: NormalizedFarm }) {
+export default function FarmTableRow({ farm, onHarvest }: { farm: NormalizedFarm; onHarvest: () => void }) {
   const { account } = useActiveWeb3React()
   const [showStake, setShowStake] = useState(false)
   const [showUnStake, setShowUnStake] = useState(false)
@@ -80,7 +80,7 @@ export default function FarmTableRow({ farm }: { farm: NormalizedFarm }) {
     item =>
       item.joinedPositions?.length ||
       !!item.depositedPosition ||
-      !!item.farmV2DepositedPositions?.some(dp => dp.pendingRewards.some(rw => rw !== '0')),
+      !!item.farmV2DepositedPositions?.some(dp => dp.pendingRewards?.some(rw => rw !== '0')),
   )
 
   const hasRewards = farm.rewardAmounts.some(rw => rw.toExact() !== '0')
@@ -212,7 +212,7 @@ export default function FarmTableRow({ farm }: { farm: NormalizedFarm }) {
               colorScheme={ButtonColorScheme.APR}
               disabled={!hasRewards}
               onClick={() => {
-                // handleHarvest()
+                onHarvest()
                 mixpanel.track('ElasticFarmV2 - Harvest Clicked', mixpanelPayload)
               }}
             >