Commit 21e2c004 authored by tom's avatar tom

empty expiry date in search results

parent eb3459d4
...@@ -25,7 +25,7 @@ export interface SearchResultAddressOrContract { ...@@ -25,7 +25,7 @@ export interface SearchResultAddressOrContract {
url?: string; // not used by the frontend, we build the url ourselves url?: string; // not used by the frontend, we build the url ourselves
ens_info?: { ens_info?: {
address_hash: string; address_hash: string;
expiry_date: string; expiry_date?: string;
name: string; name: string;
names_count: number; names_count: number;
}; };
......
...@@ -270,6 +270,8 @@ const SearchResultListItem = ({ data, searchTerm, isLoading }: Props) => { ...@@ -270,6 +270,8 @@ const SearchResultListItem = ({ data, searchTerm, isLoading }: Props) => {
case 'address': { case 'address': {
const shouldHighlightHash = ADDRESS_REGEXP.test(searchTerm); const shouldHighlightHash = ADDRESS_REGEXP.test(searchTerm);
const addressName = data.name || data.ens_info?.name; const addressName = data.name || data.ens_info?.name;
const expiresText = data.ens_info?.expiry_date ? ` (expires ${ dayjs(data.ens_info.expiry_date).fromNow() })` : '';
return addressName ? ( return addressName ? (
<> <>
<span dangerouslySetInnerHTML={{ __html: shouldHighlightHash ? xss(addressName) : highlightText(addressName, searchTerm) }}/> <span dangerouslySetInnerHTML={{ __html: shouldHighlightHash ? xss(addressName) : highlightText(addressName, searchTerm) }}/>
...@@ -277,7 +279,7 @@ const SearchResultListItem = ({ data, searchTerm, isLoading }: Props) => { ...@@ -277,7 +279,7 @@ const SearchResultListItem = ({ data, searchTerm, isLoading }: Props) => {
( (
data.ens_info.names_count > 1 ? data.ens_info.names_count > 1 ?
<chakra.span color="text_secondary"> (+{ data.ens_info.names_count - 1 })</chakra.span> : <chakra.span color="text_secondary"> (+{ data.ens_info.names_count - 1 })</chakra.span> :
<chakra.span color="text_secondary"> (expires { dayjs(data.ens_info.expiry_date).fromNow() })</chakra.span> <chakra.span color="text_secondary">{ expiresText }</chakra.span>
) )
} }
</> </>
......
...@@ -103,6 +103,7 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading }: Props) => { ...@@ -103,6 +103,7 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading }: Props) => {
implementation_name: null, implementation_name: null,
ens_domain_name: null, ens_domain_name: null,
}; };
const expiresText = data.ens_info?.expiry_date ? ` (expires ${ dayjs(data.ens_info.expiry_date).fromNow() })` : '';
return ( return (
<> <>
...@@ -131,7 +132,7 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading }: Props) => { ...@@ -131,7 +132,7 @@ const SearchResultTableItem = ({ data, searchTerm, isLoading }: Props) => {
( (
data.ens_info.names_count > 1 ? data.ens_info.names_count > 1 ?
<chakra.span color="text_secondary"> (+{ data.ens_info.names_count - 1 })</chakra.span> : <chakra.span color="text_secondary"> (+{ data.ens_info.names_count - 1 })</chakra.span> :
<chakra.span color="text_secondary"> (expires { dayjs(data.ens_info.expiry_date).fromNow() })</chakra.span> <chakra.span color="text_secondary">{ expiresText }</chakra.span>
) )
} }
</Td> </Td>
......
...@@ -31,6 +31,7 @@ const SearchBarSuggestAddress = ({ data, isMobile, searchTerm }: Props) => { ...@@ -31,6 +31,7 @@ const SearchBarSuggestAddress = ({ data, isMobile, searchTerm }: Props) => {
/> />
); );
const addressName = data.name || data.ens_info?.name; const addressName = data.name || data.ens_info?.name;
const expiresText = data.ens_info?.expiry_date ? ` (expires ${ dayjs(data.ens_info.expiry_date).fromNow() })` : '';
const nameEl = addressName && ( const nameEl = addressName && (
<Text <Text
...@@ -44,7 +45,7 @@ const SearchBarSuggestAddress = ({ data, isMobile, searchTerm }: Props) => { ...@@ -44,7 +45,7 @@ const SearchBarSuggestAddress = ({ data, isMobile, searchTerm }: Props) => {
( (
data.ens_info.names_count > 1 ? data.ens_info.names_count > 1 ?
<span> (+{ data.ens_info.names_count - 1 })</span> : <span> (+{ data.ens_info.names_count - 1 })</span> :
<span> (expires { dayjs(data.ens_info.expiry_date).fromNow() })</span> <span>{ expiresText }</span>
) )
} }
</Text> </Text>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment