From 7a8350b0fa815aa3a1cb8656ccb50cbcaeeb805b Mon Sep 17 00:00:00 2001 From: viet-nv Date: Mon, 19 Feb 2024 14:55:11 +0700 Subject: [PATCH] fix: correct phase 1 data --- .../components/SelectTreasuryGrant.tsx | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/pages/ElasticSnapshot/components/SelectTreasuryGrant.tsx b/src/pages/ElasticSnapshot/components/SelectTreasuryGrant.tsx index 1d80c8743f..d54a8f27e0 100644 --- a/src/pages/ElasticSnapshot/components/SelectTreasuryGrant.tsx +++ b/src/pages/ElasticSnapshot/components/SelectTreasuryGrant.tsx @@ -27,6 +27,8 @@ import { formatDisplayNumber } from 'utils/numbers' import vesting3rdData from '../data/pendle_dappos_vesting.json' import vestingData from '../data/vesting.json' +import vestingOptionA from '../data/vesting/optionA.json' +import vestingOptionB from '../data/vesting/optionB.json' import ChooseGrantModal from './ChooseGrantModal' import TermAndPolicyModal from './TermAndPolicyModal' @@ -54,11 +56,24 @@ export default function SelectTreasuryGrant() { const theme = useTheme() const { account, chainId } = useActiveWeb3React() const [showOptionModal, setShowOptionsModal] = useState(false) - const userData = vestingData.find(item => item.receiver.toLowerCase() === account?.toLowerCase()) - const user3rdData = vesting3rdData.find(item => item.receiver.toLowerCase() === account?.toLowerCase()) - const totalValue = (userData?.value || 0) + (user3rdData?.value || 0) - console.log(userData, user3rdData) + const addressesOptionA = vestingOptionA.map(item => item.claimData.receiver.toLowerCase()) + const addressesOptionB = vestingOptionB.map(item => item.claimData.receiver.toLowerCase()) + const userData = vestingData.find( + item => + item.receiver.toLowerCase() === account?.toLowerCase() && + (addressesOptionA.includes(item.receiver.toLowerCase()) || addressesOptionB.includes(item.receiver.toLowerCase)), + ) + + const userPhase2 = vestingData.find( + item => + item.receiver.toLowerCase() === account?.toLowerCase() && + !addressesOptionA.includes(item.receiver.toLowerCase()) && + !addressesOptionB.includes(item.receiver.toLowerCase), + ) + const user3rdData = vesting3rdData.find(item => item.receiver.toLowerCase() === account?.toLowerCase()) + const totalPhase2Value = (user3rdData?.value || 0) + (userPhase2?.value || 0) + const totalValue = (userData?.value || 0) + totalPhase2Value const [createOption] = useCreateOptionMutation() const notify = useNotify() @@ -240,7 +255,7 @@ export default function SelectTreasuryGrant() { Phase 2 - {format(user3rdData?.value || 0)} + {format(totalPhase2Value || 0)}