-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Before opening a pull request, please read the [contributing guidelines](https://github.com/pancakeswap/pancake-frontend/blob/develop/CONTRIBUTING.md) first --> <!-- start pr-codex --> --- ## PR-Codex overview ### Detailed summary - Updated `LockCakeDataSet` component to display `veCakeAmount` with 2 decimal places. - Added `DebugTooltips` component to conditionally render tooltips based on environment variables. - Updated `getVeCakeAmount` function to use `MAX_VECAKE_LOCK_WEEKS` from config. - Updated `DataHeader` component to handle `BigNumber` values and display them with 2 decimal places. - Added `useVeCakeAmount` hook to calculate estimated `veCake` amount. - Added `useTargetUnlockTime` hook to calculate valid unlock time. - Updated `NotLockingCard` component to use `NewStakingDataSet` and removed `getVeCakeAmount` import. - Updated `TableRow` component to import `DebugTooltips` and use it instead of `Tooltips`. - Updated `LockedVeCakeStatus` component to use `getBalanceAmount` and display `balance` with 2 decimal places. - Updated `DualStakeTooltip` component to display `nativeBalance` and `proxyBalance` with 4 decimal places. - Added `useMaxUnlockTime` and `useMaxUnlockWeeks` hooks to calculate maximum unlock time and weeks. - Updated `LockWeeksForm` component to use `useMaxUnlockWeeks` hook and show maximum unlock weeks based on lock status. > The following files were skipped due to too many changes: `apps/web/src/views/CakeStaking/components/DataSet/NewStakingDataSet.tsx`, `apps/web/src/views/CakeStaking/components/DataSet/LockWeeksDataSet.tsx` > ✨ Ask PR-Codex anything about this PR by commenting with `/codex {your question}` <!-- end pr-codex -->
- Loading branch information
Showing
13 changed files
with
156 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
import { MAX_VECAKE_LOCK_WEEKS, WEEK } from 'config/constants/veCake' | ||
import BN from 'bignumber.js' | ||
import { MAX_VECAKE_LOCK_WEEKS, WEEK } from 'config/constants/veCake' | ||
|
||
export const getVeCakeAmount = (cakeToLocked: number | bigint | string, seconds: number | string): number => { | ||
return new BN(String(cakeToLocked || 0)) | ||
.times(seconds || 0) | ||
.div(MAX_VECAKE_LOCK_WEEKS * WEEK) | ||
.div((MAX_VECAKE_LOCK_WEEKS + 1) * WEEK - 1) | ||
.toNumber() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import { MAX_VECAKE_LOCK_WEEKS, WEEK } from 'config/constants/veCake' | ||
import dayjs from 'dayjs' | ||
import { useMemo } from 'react' | ||
import { useCurrentBlockTimestamp } from './useCurrentBlockTimestamp' | ||
|
||
export const useMaxUnlockTime = (durationSeconds: number, prevUnlockTimestamp: number = 0) => { | ||
const currentBlockTimestamp = useCurrentBlockTimestamp() | ||
const maxUnlockTimestamp = useMemo( | ||
() => dayjs.unix(prevUnlockTimestamp ?? currentBlockTimestamp).add(MAX_VECAKE_LOCK_WEEKS, 'weeks'), | ||
[currentBlockTimestamp, prevUnlockTimestamp], | ||
) | ||
|
||
return useMemo(() => { | ||
// if not staked before, max unlock time is max weeks | ||
if (prevUnlockTimestamp === 0) return maxUnlockTimestamp.unix() | ||
|
||
const currentWeeks = Math.floor(currentBlockTimestamp / WEEK) | ||
const target = dayjs.unix(prevUnlockTimestamp).add(durationSeconds, 'seconds').unix() | ||
|
||
const prevWeeks = Math.floor(prevUnlockTimestamp / WEEK) | ||
const leftWeeks = MAX_VECAKE_LOCK_WEEKS - (prevWeeks - currentWeeks) | ||
|
||
let targetWeeks = Math.floor(target / WEEK) | ||
|
||
if (targetWeeks - currentWeeks > leftWeeks) targetWeeks = currentWeeks + leftWeeks | ||
return targetWeeks * WEEK | ||
}, [currentBlockTimestamp, durationSeconds, maxUnlockTimestamp, prevUnlockTimestamp]) | ||
} | ||
|
||
export const useMaxUnlockWeeks = (weeksToLock: number, prevUnlockTimestamp: number = 0) => { | ||
const currentBlockTimestamp = useCurrentBlockTimestamp() | ||
const maxUnlockTime = useMaxUnlockTime(weeksToLock * WEEK, prevUnlockTimestamp) | ||
|
||
return useMemo(() => { | ||
if (!prevUnlockTimestamp) return MAX_VECAKE_LOCK_WEEKS | ||
if (maxUnlockTime > currentBlockTimestamp) | ||
return Math.floor(maxUnlockTime / WEEK) - Math.floor(currentBlockTimestamp / WEEK) | ||
return 0 | ||
}, [currentBlockTimestamp, maxUnlockTime, prevUnlockTimestamp]) | ||
} |
23 changes: 23 additions & 0 deletions
23
apps/web/src/views/CakeStaking/hooks/useTargetUnlockTime.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { MAX_VECAKE_LOCK_WEEKS, WEEK } from 'config/constants/veCake' | ||
import dayjs from 'dayjs' | ||
import { useMemo } from 'react' | ||
import { useCurrentBlockTimestamp } from './useCurrentBlockTimestamp' | ||
|
||
// return a valid unlock time(should be UTC Thursday 00:00 ), with given duration seconds | ||
export const useTargetUnlockTime = (duration: number, startFromTimestamp?: number) => { | ||
const currentBlockTimestamp = useCurrentBlockTimestamp() | ||
|
||
const maxUnlockTimestamp = useMemo( | ||
() => dayjs.unix(startFromTimestamp ?? currentBlockTimestamp).add(MAX_VECAKE_LOCK_WEEKS, 'weeks'), | ||
[currentBlockTimestamp, startFromTimestamp], | ||
) | ||
|
||
const target = useMemo(() => { | ||
const end = dayjs.unix(startFromTimestamp ?? currentBlockTimestamp).add(duration, 'seconds') | ||
return end.isBefore(maxUnlockTimestamp) ? end.unix() : maxUnlockTimestamp.unix() | ||
}, [currentBlockTimestamp, duration, maxUnlockTimestamp, startFromTimestamp]) | ||
|
||
return useMemo(() => { | ||
return Math.floor(target / WEEK) * WEEK | ||
}, [target]) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { useMemo } from 'react' | ||
import { getVeCakeAmount } from 'utils/getVeCakeAmount' | ||
import { useCurrentBlockTimestamp } from './useCurrentBlockTimestamp' | ||
|
||
// calculate estimated veCake amount with locked cake amount and duration | ||
export const useVeCakeAmount = (lockedAmount: string | number | bigint, unlockTimestamp: number) => { | ||
const currentBlockTimestamp = useCurrentBlockTimestamp() | ||
return useMemo(() => { | ||
if (currentBlockTimestamp > unlockTimestamp) return 0 | ||
return getVeCakeAmount(lockedAmount, unlockTimestamp - currentBlockTimestamp) | ||
}, [currentBlockTimestamp, lockedAmount, unlockTimestamp]) | ||
} |
Oops, something went wrong.
f96b1ed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
web – ./apps/web
pancake-prod.vercel.app
pancakeswap.finance
web.pancake.run
www.pancakeswap.finance
web2.pancake.run
web-git-develop.pancake.run