From e8a05fb1d783ccf3fa7fa3887463dc7bc4875fff Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Thu, 16 Dec 2021 19:54:06 +0800 Subject: [PATCH] fix: the remaining/total numbers --- packages/mask/src/plugins/MaskBox/hooks/useContext.ts | 8 +++++--- packages/mask/src/plugins/MaskBox/type.ts | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/MaskBox/hooks/useContext.ts b/packages/mask/src/plugins/MaskBox/hooks/useContext.ts index 1ef558b50ea1..74584edbc49a 100644 --- a/packages/mask/src/plugins/MaskBox/hooks/useContext.ts +++ b/packages/mask/src/plugins/MaskBox/hooks/useContext.ts @@ -86,8 +86,10 @@ function useContext(initialState?: { boxId: string }) { if (!maskBoxInfo || !maskBoxStatus || isSameAddress(maskBoxInfo?.creator ?? ZERO_ADDRESS, ZERO_ADDRESS)) return null const personalLimit = Number.parseInt(maskBoxInfo.personal_limit, 10) - const remaining = Number.parseInt(maskBoxStatus.remaining, 10) - const sold = Number.parseInt(maskBoxStatus.total, 10) - remaining + const remaining = Number.parseInt(maskBoxStatus.remaining, 10) // the current balance of the creator's account + const total = Number.parseInt(maskBoxStatus.total, 10) // the total amount of tokens in the box + const totalComputed = total && remaining && remaining > total ? remaining : total + const sold = Math.max(0, totalComputed - remaining) const personalRemaining = Math.max(0, personalLimit - purchasedTokens.length) const startAt = Number.parseInt(maskBoxCreationSuccessEvent?.returnValues.start_time ?? '0', 10) const endAt = Number.parseInt(maskBoxCreationSuccessEvent?.returnValues.end_time ?? '0', 10) @@ -102,7 +104,7 @@ function useContext(initialState?: { boxId: string }) { availableAmount: Math.min(personalRemaining, remaining), startAt: startAt === 0 ? subDays(new Date(), 1) : fromUnixTime(startAt), endAt: endAt === 0 ? addDays(new Date(), 1) : fromUnixTime(endAt), - total: maskBoxStatus.total, + total: totalComputed, sold, canceled: maskBoxStatus.canceled, tokenIds: allTokens, diff --git a/packages/mask/src/plugins/MaskBox/type.ts b/packages/mask/src/plugins/MaskBox/type.ts index 692564eb90f0..7f9426a78aa3 100644 --- a/packages/mask/src/plugins/MaskBox/type.ts +++ b/packages/mask/src/plugins/MaskBox/type.ts @@ -43,7 +43,7 @@ export interface BoxInfo { payments: PaymentInfo[] remaining: number availableAmount: number - total: string + total: number sold: number startAt: Date endAt: Date