From ade80463062e5b0d3a8200c76cd46407db31838d Mon Sep 17 00:00:00 2001 From: lelenei <72531217+lelenei@users.noreply.github.com> Date: Fri, 8 Oct 2021 21:25:55 +0800 Subject: [PATCH] fix: opensea plugin didn't show sale end time if the end time is today or tomorrow(within 24 hrs) --- .../src/plugins/Collectible/SNSAdaptor/Collectible.tsx | 1 - packages/maskbook/src/plugins/Collectible/apis/opensea.ts | 4 +--- packages/maskbook/src/plugins/Collectible/hooks/useAsset.ts | 5 ++++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/maskbook/src/plugins/Collectible/SNSAdaptor/Collectible.tsx b/packages/maskbook/src/plugins/Collectible/SNSAdaptor/Collectible.tsx index 28cb8d7f786a..456732b6883f 100644 --- a/packages/maskbook/src/plugins/Collectible/SNSAdaptor/Collectible.tsx +++ b/packages/maskbook/src/plugins/Collectible/SNSAdaptor/Collectible.tsx @@ -185,7 +185,6 @@ export function Collectible(props: CollectibleProps) { ] const endDate = asset.value?.end_time - return ( <> diff --git a/packages/maskbook/src/plugins/Collectible/apis/opensea.ts b/packages/maskbook/src/plugins/Collectible/apis/opensea.ts index 0bf95ee0a94c..80a58148be00 100644 --- a/packages/maskbook/src/plugins/Collectible/apis/opensea.ts +++ b/packages/maskbook/src/plugins/Collectible/apis/opensea.ts @@ -60,9 +60,7 @@ export async function getAsset(tokenAddress: string, tokenId: string, chainId?: ).json() const endTime = head<{ closing_date: Date }>( - fetchResponse.orders.filter( - (item: { side: number; closing_extendable: boolean }) => item.side === 1 && item.closing_extendable, - ), + fetchResponse.orders.filter((item: { side: number; closing_extendable: boolean }) => item.side === 1), )?.closing_date return { diff --git a/packages/maskbook/src/plugins/Collectible/hooks/useAsset.ts b/packages/maskbook/src/plugins/Collectible/hooks/useAsset.ts index 351e210b0034..dbb29a7a550c 100644 --- a/packages/maskbook/src/plugins/Collectible/hooks/useAsset.ts +++ b/packages/maskbook/src/plugins/Collectible/hooks/useAsset.ts @@ -34,6 +34,7 @@ export function useAsset(provider: CollectibleProvider, token?: CollectibleToken new BigNumber(getOrderUnitPrice(b) ?? 0).toNumber(), ), ) + return { is_verified: ['approved', 'verified'].includes( openSeaResponse.collection?.safelist_request_status ?? '', @@ -69,7 +70,9 @@ export function useAsset(provider: CollectibleProvider, token?: CollectibleToken name: openSeaResponse.name ?? openSeaResponse.collection.name, collection_name: openSeaResponse.collection.name, animation_url: openSeaResponse.animation_url, - end_time: desktopOrder + end_time: openSeaResponse.endTime + ? new Date(openSeaResponse.endTime) + : desktopOrder ? toDate(Number.parseInt(desktopOrder.listingTime as unknown as string, 10)) : null, order_payment_tokens: desktopOrder?.paymentTokenContract