fix null balance and result num

blockscout · Sep 10, 2024 · 30e2b1c · 30e2b1c
1 parent b60bf30
commit 30e2b1c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/types/api/addresses.ts b/types/api/addresses.ts
@@ -1,6 +1,6 @@
 import type { AddressParam } from './addressParams';
 
-export type AddressesItem = AddressParam &{ tx_count: string; coin_balance: string }
+export type AddressesItem = AddressParam & { tx_count: string; coin_balance: string | null }
 
 export type AddressesResponse = {
   items: Array<AddressesItem>;

diff --git a/ui/addresses/AddressesListItem.tsx b/ui/addresses/AddressesListItem.tsx
@@ -25,7 +25,7 @@ const AddressesListItem = ({
   isLoading,
 }: Props) => {
 
-  const addressBalance = BigNumber(item.coin_balance).div(BigNumber(10 ** config.chain.currency.decimals));
+  const addressBalance = BigNumber(item.coin_balance || 0).div(BigNumber(10 ** config.chain.currency.decimals));
 
   return (
     <ListItemMobile rowGap={ 3 }>

diff --git a/ui/addresses/AddressesTableItem.tsx b/ui/addresses/AddressesTableItem.tsx
@@ -24,7 +24,7 @@ const AddressesTableItem = ({
   isLoading,
 }: Props) => {
 
-  const addressBalance = BigNumber(item.coin_balance).div(BigNumber(10 ** config.chain.currency.decimals));
+  const addressBalance = BigNumber(item.coin_balance || 0).div(BigNumber(10 ** config.chain.currency.decimals));
   const addressBalanceChunks = addressBalance.dp(8).toFormat().split('.');
 
   return (

diff --git a/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx b/ui/addressesLabelSearch/AddressesLabelSearchListItem.tsx
@@ -19,7 +19,7 @@ const AddressesLabelSearchListItem = ({
   isLoading,
 }: Props) => {
 
-  const addressBalance = BigNumber(item.coin_balance).div(BigNumber(10 ** config.chain.currency.decimals));
+  const addressBalance = BigNumber(item.coin_balance || 0).div(BigNumber(10 ** config.chain.currency.decimals));
 
   return (
     <ListItemMobile rowGap={ 3 }>

diff --git a/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx b/ui/addressesLabelSearch/AddressesLabelSearchTableItem.tsx
@@ -17,7 +17,7 @@ const AddressesLabelSearchTableItem = ({
   isLoading,
 }: Props) => {
 
-  const addressBalance = BigNumber(item.coin_balance).div(BigNumber(10 ** config.chain.currency.decimals));
+  const addressBalance = BigNumber(item.coin_balance || 0).div(BigNumber(10 ** config.chain.currency.decimals));
   const addressBalanceChunks = addressBalance.dp(8).toFormat().split('.');
 
   return (

diff --git a/ui/pages/AccountsLabelSearch.pw.tsx b/ui/pages/AccountsLabelSearch.pw.tsx
@@ -28,7 +28,7 @@ const addresses: AddressesMetadataSearchResult = {
     {
       ...addressMocks.eoa,
       tx_count: '420',
-      coin_balance: '123456',
+      coin_balance: null,
     },
   ],
   next_page_params: null,

diff --git a/ui/pages/AccountsLabelSearch.tsx b/ui/pages/AccountsLabelSearch.tsx
@@ -32,7 +32,7 @@ const AccountsLabelSearch = () => {
     options: {
       placeholderData: generateListStub<'addresses_metadata_search'>(
         TOP_ADDRESS,
-        5,
+        50,
         {
           next_page_params: null,
         },
@@ -83,7 +83,11 @@ const AccountsLabelSearch = () => {
           isLoaded={ !isPlaceholderData }
           display="inline-block"
         >
-          Found <chakra.span fontWeight={ 700 }>{ num }</chakra.span> matching result{ num > 1 ? 's' : '' } for
+          Found{ ' ' }
+          <chakra.span fontWeight={ 700 }>
+            { num }{ data?.next_page_params || pagination.page > 1 ? '+' : '' }
+          </chakra.span>{ ' ' }
+          matching result{ num > 1 ? 's' : '' } for
         </Skeleton>
         <EntityTag data={ tagData } isLoading={ isPlaceholderData } noLink/>
       </Flex>