From c0066962e2cd99494521c2f4cd6e1db94cbc55d1 Mon Sep 17 00:00:00 2001 From: tate Date: Thu, 16 Feb 2023 11:16:42 +1100 Subject: [PATCH] add date wrap for wrapperData expiryDate --- e2e/specs/stateless/12_updateResolver.spec.js | 2 +- src/hooks/fuses/useGetFusesSetDates.test.ts | 2 +- src/hooks/useBasicName.ts | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/e2e/specs/stateless/12_updateResolver.spec.js b/e2e/specs/stateless/12_updateResolver.spec.js index 65223c4c3..05d9c5fc8 100644 --- a/e2e/specs/stateless/12_updateResolver.spec.js +++ b/e2e/specs/stateless/12_updateResolver.spec.js @@ -1,6 +1,6 @@ import { acceptMetamaskAccess } from '../../setup' -const newResolver = '0x70e0bA845a1A0F2DA3359C97E0285013525FFC49' +const newResolver = '0x0E801D84Fa97b50751Dbf25036d067dCf18858bF' const oldResolver = '0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB' describe('Update Resolver', () => { diff --git a/src/hooks/fuses/useGetFusesSetDates.test.ts b/src/hooks/fuses/useGetFusesSetDates.test.ts index 3cd3bc4c6..137daf45f 100644 --- a/src/hooks/fuses/useGetFusesSetDates.test.ts +++ b/src/hooks/fuses/useGetFusesSetDates.test.ts @@ -51,7 +51,7 @@ const mockHistory: any = { transactionHash: '0x31ec20daa6b92e3aa0d2e4f86178b72240e0e42fe7a0ce7f8371818b71f807d1', id: '85-5', data: { - resolver: '0x70e0ba845a1a0f2da3359c97e0285013525ffc49', + resolver: '0x0E801D84Fa97b50751Dbf25036d067dCf18858bF', }, }, { diff --git a/src/hooks/useBasicName.ts b/src/hooks/useBasicName.ts index b14ec6f8f..90c0838aa 100644 --- a/src/hooks/useBasicName.ts +++ b/src/hooks/useBasicName.ts @@ -1,3 +1,4 @@ +import { useMemo } from 'react' import { useQuery } from 'wagmi' import { truncateFormat } from '@ensdomains/ensjs/utils/format' @@ -53,7 +54,16 @@ export const useBasicName = (name?: string | null, normalised?: boolean) => { }, ) - const [ownerData, wrapperData, expiryData, priceData] = batchData || [] + const [ownerData, _wrapperData, expiryData, priceData] = batchData || [] + + const wrapperData = useMemo(() => { + if (!_wrapperData) return undefined + const { expiryDate, ...rest } = _wrapperData + return { + ...rest, + expiryDate: expiryDate ? new Date(expiryDate) : undefined, + } + }, [_wrapperData]) const registrationStatus = batchData ? getRegistrationStatus({