From 3c9f741de7f13afde6fc2b432ca159e20a63b4bf Mon Sep 17 00:00:00 2001 From: Bartlomiej Tarczynski Date: Wed, 10 Jul 2024 08:42:45 +0200 Subject: [PATCH 1/5] Prioritize env variable in useVoucherRedeemDeadline --- .../src/blockchain/hooks/useVoucherRedeemDeadline.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/blockchain/hooks/useVoucherRedeemDeadline.ts b/packages/frontend/src/blockchain/hooks/useVoucherRedeemDeadline.ts index 74c01e9a5..a568b2f45 100644 --- a/packages/frontend/src/blockchain/hooks/useVoucherRedeemDeadline.ts +++ b/packages/frontend/src/blockchain/hooks/useVoucherRedeemDeadline.ts @@ -8,9 +8,9 @@ const REDEEM_PERIOD = BigInt(moment.unix(0).add(48, 'h').unix()) export function useVoucherRedeemDeadline() { const { biddingEndTime } = useReadAuctionParams() return useMemo(() => { - if (biddingEndTime) { - return biddingEndTime + REDEEM_PERIOD + if (environment.voucherRedeemDeadline) { + return BigInt(environment.voucherRedeemDeadline) } - return environment.voucherRedeemDeadline ? BigInt(environment.voucherRedeemDeadline) : undefined + return biddingEndTime ? biddingEndTime + REDEEM_PERIOD : undefined }, [biddingEndTime]) } From 76fec3f84ec0b5fee10561767099b8d6fb3b1e7a Mon Sep 17 00:00:00 2001 From: Bartlomiej Tarczynski Date: Wed, 10 Jul 2024 08:43:32 +0200 Subject: [PATCH 2/5] Return claimingEndTime in useReadAuctionParams --- packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts b/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts index 06c8d95c1..90ee6774c 100644 --- a/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts +++ b/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts @@ -28,6 +28,7 @@ export const useReadAuctionParams = () => { raffleWinnersCount: data ? Number(data[3]) : undefined, minimumBid: data?.[4], minimumBidIncrement: data?.[5], + claimingEndTime: data?.[6], isLoading, }), [data, isLoading], @@ -41,4 +42,5 @@ const params = [ 'raffleWinnersCount', 'reservePrice', 'minBidIncrement', + 'claimingEndTime' ] as const From c775728ca13ef0b38a7db3c5db5e39f0ad3f4da4 Mon Sep 17 00:00:00 2001 From: Bartlomiej Tarczynski Date: Wed, 10 Jul 2024 09:18:13 +0200 Subject: [PATCH 3/5] Use timestamp as date value in env --- packages/frontend/src/config/environment.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/frontend/src/config/environment.ts b/packages/frontend/src/config/environment.ts index 6f8a96ba4..b80016b9b 100644 --- a/packages/frontend/src/config/environment.ts +++ b/packages/frontend/src/config/environment.ts @@ -1,5 +1,5 @@ export const environment = { - voucherRedeemDeadline: getDateEnv(process.env.NEXT_PUBLIC_VOUCHER_REDEEM_DEADLINE), + voucherRedeemDeadline: process.env.NEXT_PUBLIC_VOUCHER_REDEEM_DEADLINE, walletConnectProjectId: process.env.NEXT_PUBLIC_WALLETCONNECT_PROJECT_ID ?? '', infuraKey: process.env.NEXT_PUBLIC_INFURA_KEY, gitcoinRequiredScore: Number(process.env.NEXT_PUBLIC_GITCOIN_REQUIRED_SCORE), @@ -18,7 +18,3 @@ export const environment = { }, nonceExpiry: Number(process.env.NONCE_EXPIRY), } - -function getDateEnv(envValue: string | undefined): number | undefined { - return envValue ? Math.floor(new Date(envValue).getTime() / 1000) : undefined -} From 5654bb6d0a9dacdc34dda23984c2acccab4cf804 Mon Sep 17 00:00:00 2001 From: Bartlomiej Tarczynski Date: Wed, 10 Jul 2024 09:19:13 +0200 Subject: [PATCH 4/5] Display refund and voucher redeeming times --- .../src/components/info/VoucherTimeLeft.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/frontend/src/components/info/VoucherTimeLeft.tsx b/packages/frontend/src/components/info/VoucherTimeLeft.tsx index 4e632031b..232ef86e5 100644 --- a/packages/frontend/src/components/info/VoucherTimeLeft.tsx +++ b/packages/frontend/src/components/info/VoucherTimeLeft.tsx @@ -8,15 +8,19 @@ import { useReadAuctionParams } from '@/blockchain/hooks/useReadAuctionParams' import { MediaQueries } from '@/styles/mediaQueries' export const VoucherTimeLeft = () => { - const { biddingEndTime } = useReadAuctionParams() + const { claimingEndTime } = useReadAuctionParams() const redeemTimestamp = useVoucherRedeemDeadline() - const isPeriodExpired = redeemTimestamp ? redeemTimestamp * BigInt(1000) < Date.now() : false + const isRedeemingExpired = redeemTimestamp ? redeemTimestamp * BigInt(1000) < Date.now() : false + const isClaimingExpired = claimingEndTime ? claimingEndTime * BigInt(1000) < Date.now() : false return ( - - - {isPeriodExpired ? 'Voucher redeem period expired on ' : 'Voucher redeem period: '} - {!isPeriodExpired && {formatDate(biddingEndTime)} - } + + + {isClaimingExpired ? 'Refund claiming expired on ': 'Refund claiming ends: '} + {formatDate(claimingEndTime)} + + + {isRedeemingExpired ? 'Voucher redemption expired on ' : 'Voucher redemption ends: '} {formatDate(redeemTimestamp)} From 3e5abc260a8d1a24920a5c359de5e750a4af9ae0 Mon Sep 17 00:00:00 2001 From: Bartlomiej Tarczynski Date: Wed, 10 Jul 2024 09:19:57 +0200 Subject: [PATCH 5/5] Lint --- packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts | 2 +- packages/frontend/src/components/info/VoucherTimeLeft.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts b/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts index 90ee6774c..a44a89198 100644 --- a/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts +++ b/packages/frontend/src/blockchain/hooks/useReadAuctionParams.ts @@ -42,5 +42,5 @@ const params = [ 'raffleWinnersCount', 'reservePrice', 'minBidIncrement', - 'claimingEndTime' + 'claimingEndTime', ] as const diff --git a/packages/frontend/src/components/info/VoucherTimeLeft.tsx b/packages/frontend/src/components/info/VoucherTimeLeft.tsx index 232ef86e5..353a6f3f1 100644 --- a/packages/frontend/src/components/info/VoucherTimeLeft.tsx +++ b/packages/frontend/src/components/info/VoucherTimeLeft.tsx @@ -16,7 +16,7 @@ export const VoucherTimeLeft = () => { return ( - {isClaimingExpired ? 'Refund claiming expired on ': 'Refund claiming ends: '} + {isClaimingExpired ? 'Refund claiming expired on ' : 'Refund claiming ends: '} {formatDate(claimingEndTime)}