feat: 🎸 refactor

pancakeswap · Jan 14, 2025 · d7d0f0b · d7d0f0b
1 parent 489304d
commit d7d0f0b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 12 deletions.
diff --git a/apps/web/src/views/Ifos/components/IfoVesting/VestingPeriod/Claim.tsx b/apps/web/src/views/Ifos/components/IfoVesting/VestingPeriod/Claim.tsx
@@ -9,7 +9,6 @@ import { useCallback, useMemo } from 'react'
 import { Address } from 'viem'
 import { VestingData } from 'views/Ifos/hooks/vesting/fetchUserWalletIfoData'
 
-import { isVestingEnd } from 'views/Ifos/hooks/vesting/useFetchVestingData'
 import { SwitchNetworkTips } from '../../IfoFoldableCard/IfoPoolCard/SwitchNetworkTips'
 
 interface Props {
@@ -35,7 +34,6 @@ const ClaimButton: React.FC<React.PropsWithChildren<Props>> = ({
   const { address, token, chainId } = data.ifo
   const contract = useIfoV3Contract(address)
   const { fetchWithCatchTxError, loading: isPending } = useCatchTxError()
-  const isEnd = isVestingEnd(data)
 
   const isReady = useMemo(() => {
     const checkClaimableAmount = isVestingInitialized ? claimableAmount === '0' : false
@@ -89,7 +87,7 @@ const ClaimButton: React.FC<React.PropsWithChildren<Props>> = ({
       width="100%"
       onClick={handleClaim}
       isLoading={isPending}
-      disabled={isReady && !enabled && !isEnd}
+      disabled={isReady && !enabled}
       endIcon={isPending ? <AutoRenewIcon spin color="currentColor" /> : null}
     >
       {t('Claim', { symbol: token.symbol })}

diff --git a/apps/web/src/views/Ifos/components/IfoVesting/VestingPeriod/Info.tsx b/apps/web/src/views/Ifos/components/IfoVesting/VestingPeriod/Info.tsx
@@ -8,7 +8,7 @@ import useGetPublicIfoV3Data from 'views/Ifos/hooks/v3/useGetPublicIfoData'
 import { VestingData } from 'views/Ifos/hooks/vesting/fetchUserWalletIfoData'
 
 import { useQuery } from '@tanstack/react-query'
-import { getVestingInfo } from 'views/Ifos/hooks/usePoolVestingData'
+import { getVestingInfo } from 'views/Ifos/hooks/getVestingInfo'
 import { isBasicSale } from '../../../hooks/v7/helpers'
 import Claim from './Claim'
 

diff --git a/apps/web/src/views/Ifos/components/IfoVesting/index.tsx b/apps/web/src/views/Ifos/components/IfoVesting/index.tsx
@@ -7,7 +7,7 @@ import { useAccount } from 'wagmi'
 import Trans from 'components/Trans'
 
 import { PoolIds } from '@pancakeswap/ifos'
-import { getHasClaimable } from 'views/Ifos/hooks/usePoolVestingData'
+import { getHasClaimable } from 'views/Ifos/hooks/getVestingInfo'
 import useFetchVestingData from '../../hooks/vesting/useFetchVestingData'
 import { VestingStatus } from './types'
 import VestingEnded from './VestingEnded'

diff --git a/...rc/views/Ifos/hooks/usePoolVestingData.ts → ...eb/src/views/Ifos/hooks/getVestingInfo.ts b/...rc/views/Ifos/hooks/usePoolVestingData.ts → ...eb/src/views/Ifos/hooks/getVestingInfo.ts
diff --git a/apps/web/src/views/Ifos/hooks/vesting/useFetchVestingData.ts b/apps/web/src/views/Ifos/hooks/vesting/useFetchVestingData.ts
@@ -26,13 +26,6 @@ const isPoolEligible = (poolId: PoolIds, userVestingData: UserVestingData) => {
   return vestingEndTime.gte(currentTimeStamp)
 }
 
-export const isVestingEnd = (vestingData: VestingData) => {
-  const pool = vestingData.userVestingData[PoolIds.poolBasic] || vestingData.userVestingData[PoolIds.poolUnlimited]
-  const currentTimeStamp = Date.now()
-  const vestingEndTime = (vestingData.userVestingData.vestingStartTime + pool.vestingInformationDuration) * 1000
-  return vestingEndTime < currentTimeStamp
-}
-
 const isEligibleVestingData = (ifo: VestingData) => {
   const { userVestingData } = ifo
   return POOLS.some((poolId) => isPoolEligible(poolId, userVestingData))