Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: CR-487 wrong tvl due to linea testnet #2078

Merged
merged 2 commits into from
Jul 18, 2023
Merged

fix: CR-487 wrong tvl due to linea testnet #2078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a07d22
fix: CR-487 wrong tvl due to linea testnet
viet-nv Jul 18, 2023
186d8cd
fix: display vesting time issue
viet-nv Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/components/Vesting/RewardLockerSchedules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { BigNumber } from '@ethersproject/bignumber'
import { Token } from '@kyberswap/ks-sdk-core'

import { ZERO_ADDRESS } from 'constants/index'
import { EVMNetworkInfo } from 'constants/networks/type'
import { NativeCurrencies } from 'constants/tokens'
import { useActiveWeb3React } from 'hooks'
import useMixpanel, { MIXPANEL_TYPE } from 'hooks/useMixpanel'
Expand All @@ -28,7 +29,7 @@ const RewardLockerSchedules = ({
const dispatch = useAppDispatch()
const currentBlockNumber = useBlockNumber()
const currentTimestamp = Math.round(Date.now() / 1000)
const { account, chainId } = useActiveWeb3React()
const { account, chainId, networkInfo } = useActiveWeb3React()
const { vestMultipleTokensAtIndices } = useVesting(rewardLockerAddress)
const { mixpanelHandler } = useMixpanel()
if (!schedules) {
Expand Down Expand Up @@ -173,6 +174,8 @@ const RewardLockerSchedules = ({
return acc
}, currentBlockNumber)

const blockDiff = (maxEndBlock || 0) - (currentBlockNumber || 0)

const endTimestampFromBlock = useTimestampFromBlock(maxEndBlock)

const endTime = schedules.reduce((acc, cur) => {
Expand All @@ -183,7 +186,7 @@ const RewardLockerSchedules = ({
}

return acc
}, endTimestampFromBlock || 0)
}, endTimestampFromBlock || currentTimestamp + blockDiff * ((networkInfo as EVMNetworkInfo).averageBlockTimeInSeconds || 0))

return <VestingCard info={info} endTime={endTime} remainTime={endTime - currentTimestamp} onClaimAll={onClaimAll} />
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Vesting/VestingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { formatDollarAmount } from 'utils/numbers'
const formatRemainTime = (numberOfSeconds: number) => {
if (numberOfSeconds < 0) return t`Full unlocked`
const days = numberOfSeconds / 60 / 60 / 24
if (days > 1) return days + ' Days left'
if (days > 1) return days.toFixed(2) + ' Days left'

const hours = numberOfSeconds / 60 / 60
if (hours < 24 && hours > 1) return hours.toFixed(0) + ' Hours left'
Expand Down
18 changes: 11 additions & 7 deletions src/state/about/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ export function useGlobalData() {
}
const getResultByChainIds = async (chainIds: readonly ChainId[]) => {
// todo namgold: add aggregator API for solana
const elasticChains = chainIds.filter(isEVM).filter(id => !ELASTIC_NOT_SUPPORTED[id])
const elasticChains = chainIds
.filter(id => isEVM(id))
.filter(id => !ELASTIC_NOT_SUPPORTED[id] && id !== ChainId.LINEA_TESTNET)

const elasticPromises = elasticChains.map(chain =>
allKyberswapConfig[chain].elasticClient.query({
Expand All @@ -70,12 +72,14 @@ export function useGlobalData() {
return total + parseFloat(item?.data?.factories?.[0]?.totalValueLockedUSD || '0')
}, 0)

const allChainPromises = chainIds.filter(isEVM).map(chain =>
allKyberswapConfig[chain].classicClient.query({
query: GLOBAL_DATA(),
fetchPolicy: 'cache-first',
}),
)
const allChainPromises = chainIds
.filter(id => isEVM(id) && id !== ChainId.LINEA_TESTNET)
.map(chain =>
allKyberswapConfig[chain].classicClient.query({
query: GLOBAL_DATA(),
fetchPolicy: 'cache-first',
}),
)

const queryResult = (await Promise.all(allChainPromises.map(promises => promises.catch(e => e)))).filter(
res => !(res instanceof Error),
Expand Down
Loading