token in token transfer is possibly null (#2396)

* token in token transfer is possibly null * show transfer type if no token
blockscout · Nov 14, 2024 · 21e1fde · 21e1fde
1 parent db405c1
commit 21e1fde
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 59 deletions.
diff --git a/mocks/tokens/tokenTransfer.ts b/mocks/tokens/tokenTransfer.ts
@@ -1,3 +1,4 @@
+import type { TokenInfo } from 'types/api/token';
 import type { TokenTransfer, TokenTransferResponse } from 'types/api/tokenTransfer';
 
 export const erc20: TokenTransfer = {
@@ -146,7 +147,7 @@ export const erc1155A: TokenTransfer = {
 export const erc1155B: TokenTransfer = {
   ...erc1155A,
   token: {
-    ...erc1155A.token,
+    ...(erc1155A.token as TokenInfo<'ERC-1155'>),
     name: 'SastanaNFT',
     symbol: 'ipfs://QmUpFUfVKDCWeZQk5pvDFUxnpQP9N6eLSHhNUy49T1JVtY',
   },
@@ -156,7 +157,7 @@ export const erc1155B: TokenTransfer = {
 export const erc1155C: TokenTransfer = {
   ...erc1155A,
   token: {
-    ...erc1155A.token,
+    ...(erc1155A.token as TokenInfo<'ERC-1155'>),
     name: 'SastanaNFT',
     symbol: 'ipfs://QmUpFUfVKDCWeZQk5pvDFUxnpQP9N6eLSHhNUy49T1JVtY',
   },
@@ -166,7 +167,7 @@ export const erc1155C: TokenTransfer = {
 export const erc1155D: TokenTransfer = {
   ...erc1155A,
   token: {
-    ...erc1155A.token,
+    ...(erc1155A.token as TokenInfo<'ERC-1155'>),
     name: 'SastanaNFT',
     symbol: 'ipfs://QmUpFUfVKDCWeZQk5pvDFUxnpQP9N6eLSHhNUy49T1JVtY',
   },
@@ -225,7 +226,7 @@ export const erc404A: TokenTransfer = {
 export const erc404B: TokenTransfer = {
   ...erc404A,
   token: {
-    ...erc404A.token,
+    ...(erc404A.token as TokenInfo<'ERC-404'>),
     name: 'SastanaNFT',
     symbol: 'ipfs://QmUpFUfVKDCWeZQk5pvDFUxnpQP9N6eLSHhNUy49T1JVtY',
   },

diff --git a/types/api/tokenTransfer.ts b/types/api/tokenTransfer.ts
@@ -26,19 +26,19 @@ export type Erc404TotalPayload = {
 
 export type TokenTransfer = (
   {
-    token: TokenInfo<'ERC-20'>;
+    token: TokenInfo<'ERC-20'> | null;
     total: Erc20TotalPayload | null;
   } |
   {
-    token: TokenInfo<'ERC-721'>;
+    token: TokenInfo<'ERC-721'> | null;
     total: Erc721TotalPayload | null;
   } |
   {
-    token: TokenInfo<'ERC-1155'>;
+    token: TokenInfo<'ERC-1155'> | null;
     total: Erc1155TotalPayload | null;
   } |
   {
-    token: TokenInfo<'ERC-404'>;
+    token: TokenInfo<'ERC-404'> | null;
     total: Erc404TotalPayload | null;
   }
 ) & TokenTransferBase;

diff --git a/ui/address/AddressTokenTransfers.tsx b/ui/address/AddressTokenTransfers.tsx
@@ -54,7 +54,7 @@ const matchFilters = (filters: Filters, tokenTransfer: TokenTransfer, address?:
     }
   }
   if (filters.type && filters.type.length) {
-    if (!filters.type.includes(tokenTransfer.token.type)) {
+    if (!tokenTransfer.token || !filters.type.includes(tokenTransfer.token.type)) {
       return false;
     }
   }

diff --git a/ui/pages/Token.tsx b/ui/pages/Token.tsx
@@ -170,7 +170,7 @@ const TokenPageContent = () => {
     {
       id: 'token_transfers',
       title: 'Token transfers',
-      component: <TokenTransfer transfersQuery={ transfersQuery } token={ tokenQuery.data } shouldRender={ !isLoading }/>,
+      component: <TokenTransfer transfersQuery={ transfersQuery } tokenQuery={ tokenQuery } shouldRender={ !isLoading }/>,
     },
     {
       id: 'holders',

diff --git a/ui/pages/TokenInstance.tsx b/ui/pages/TokenInstance.tsx
@@ -97,7 +97,7 @@ const TokenInstanceContent = () => {
     {
       id: 'token_transfers',
       title: 'Token transfers',
-      component: <TokenTransfer transfersQuery={ transfersQuery } tokenId={ id } token={ tokenQuery.data } shouldRender={ !isLoading }/>,
+      component: <TokenTransfer transfersQuery={ transfersQuery } tokenId={ id } tokenQuery={ tokenQuery } shouldRender={ !isLoading }/>,
     },
     shouldFetchHolders ?
       { id: 'holders', title: 'Holders', component: <TokenHolders holdersQuery={ holdersQuery } token={ tokenQuery.data } shouldRender={ !isLoading }/> } :

diff --git a/ui/shared/TokenTransfer/TokenTransferListItem.tsx b/ui/shared/TokenTransfer/TokenTransferListItem.tsx
@@ -38,7 +38,7 @@ const TokenTransferListItem = ({
 }: Props) => {
   const { usd, valueStr } = total && 'value' in total && total.value !== null ? getCurrencyValue({
     value: total.value,
-    exchangeRate: token.exchange_rate,
+    exchangeRate: token?.exchange_rate,
     accuracy: 8,
     accuracyUsd: 2,
     decimals: total.decimals || '0',
@@ -48,21 +48,27 @@ const TokenTransferListItem = ({
     <ListItemMobile rowGap={ 3 } isAnimated>
       <Flex w="100%" justifyContent="space-between">
         <Flex flexWrap="wrap" rowGap={ 1 } mr={ showTxInfo && txHash ? 2 : 0 } columnGap={ 2 } overflow="hidden">
-          <TokenEntity
-            token={ token }
-            isLoading={ isLoading }
-            noSymbol
-            noCopy
-            w="auto"
-          />
-          <Tag flexShrink={ 0 } isLoading={ isLoading }>{ getTokenTypeName(token.type) }</Tag>
+          { token && (
+            <>
+              <TokenEntity
+                token={ token }
+                isLoading={ isLoading }
+                noSymbol
+                noCopy
+                w="auto"
+              />
+              <Tag flexShrink={ 0 } isLoading={ isLoading }>{ getTokenTypeName(token.type) }</Tag>
+            </>
+          ) }
           <Tag colorScheme="orange" isLoading={ isLoading }>{ getTokenTransferTypeText(type) }</Tag>
         </Flex>
         { showTxInfo && txHash && (
           <TxAdditionalInfo hash={ txHash } isMobile isLoading={ isLoading }/>
         ) }
       </Flex>
-      { total && 'token_id' in total && total.token_id !== null && <NftEntity hash={ token.address } id={ total.token_id } isLoading={ isLoading }/> }
+      { total && 'token_id' in total && total.token_id !== null && token && (
+        <NftEntity hash={ token.address } id={ total.token_id } isLoading={ isLoading }/>
+      ) }
       { showTxInfo && txHash && (
         <Flex justifyContent="space-between" alignItems="center" lineHeight="24px" width="100%">
           <TxEntity

diff --git a/ui/shared/TokenTransfer/TokenTransferTableItem.tsx b/ui/shared/TokenTransfer/TokenTransferTableItem.tsx
@@ -37,7 +37,7 @@ const TokenTransferTableItem = ({
 }: Props) => {
   const { usd, valueStr } = total && 'value' in total && total.value !== null ? getCurrencyValue({
     value: total.value,
-    exchangeRate: token.exchange_rate,
+    exchangeRate: token?.exchange_rate,
     accuracy: 8,
     accuracyUsd: 2,
     decimals: total.decimals || '0',
@@ -53,20 +53,30 @@ const TokenTransferTableItem = ({
         </Td>
       ) }
       <Td>
-        <TokenEntity
-          token={ token }
-          isLoading={ isLoading }
-          noSymbol
-          noCopy
-          mt={ 1 }
-        />
-        <Flex columnGap={ 2 } rowGap={ 2 } mt={ 2 } flexWrap="wrap">
-          <Tag isLoading={ isLoading }>{ getTokenTypeName(token.type) }</Tag>
-          <Tag colorScheme="orange" isLoading={ isLoading }>{ getTokenTransferTypeText(type) }</Tag>
-        </Flex>
+        { token ? (
+          <>
+            <TokenEntity
+              token={ token }
+              isLoading={ isLoading }
+              noSymbol
+              noCopy
+              mt={ 1 }
+            />
+            <Flex columnGap={ 2 } rowGap={ 2 } mt={ 2 } flexWrap="wrap">
+              <Tag isLoading={ isLoading }>{ getTokenTypeName(token.type) }</Tag>
+              <Tag colorScheme="orange" isLoading={ isLoading }>{ getTokenTransferTypeText(type) }</Tag>
+            </Flex>
+          </>
+        ) : 'N/A' }
       </Td>
       <Td>
-        { total && 'token_id' in total && total.token_id !== null && <NftEntity hash={ token.address } id={ total.token_id } isLoading={ isLoading }/> }
+        { total && 'token_id' in total && total.token_id !== null && token && (
+          <NftEntity
+            hash={ token.address }
+            id={ total.token_id }
+            isLoading={ isLoading }
+          />
+        ) }
       </Td>
       { showTxInfo && txHash && (
         <Td>

diff --git a/ui/shared/TokenTransferSnippet/TokenTransferSnippet.tsx b/ui/shared/TokenTransferSnippet/TokenTransferSnippet.tsx
@@ -28,7 +28,7 @@ const TokenTransferSnippet = ({ data, isLoading, noAddressIcons = true }: Props)
       return <Skeleton w="250px" h={ 6 }/>;
     }
 
-    switch (data.token.type) {
+    switch (data.token?.type) {
       case 'ERC-20': {
         const total = data.total as Erc20TotalPayload | null;
         if (total === null || total.value === null) {
@@ -82,6 +82,9 @@ const TokenTransferSnippet = ({ data, isLoading, noAddressIcons = true }: Props)
           return <TokenTransferSnippetFiat token={ data.token } value={ total.value } decimals={ total.decimals }/>;
         }
       }
+      default: {
+        return null;
+      }
     }
   })();
 

diff --git a/ui/token/TokenTransfer/TokenTransfer.pw.tsx b/ui/token/TokenTransfer/TokenTransfer.pw.tsx
@@ -1,6 +1,7 @@
 import { Box } from '@chakra-ui/react';
 import React from 'react';
 
+import { tokenInfoERC20a, tokenInfoERC721a, tokenInfoERC1155a } from 'mocks/tokens/tokenInfo';
 import * as tokenTransferMock from 'mocks/tokens/tokenTransfer';
 import { test, expect } from 'playwright/lib';
 
@@ -21,6 +22,10 @@ test('erc20 +@mobile', async({ render }) => {
           // @ts-ignore:
           pagination: { page: 1, isVisible: true },
         }}
+        // @ts-ignore:
+        tokenQuery={{
+          data: tokenInfoERC20a,
+        }}
       />
     </Box>,
   );
@@ -43,6 +48,10 @@ test('erc721 +@mobile', async({ render }) => {
           // @ts-ignore:
           pagination: { page: 1, isVisible: true },
         }}
+        // @ts-ignore:
+        tokenQuery={{
+          data: tokenInfoERC721a,
+        }}
       />
     </Box>,
   );
@@ -70,6 +79,10 @@ test('erc1155 +@mobile', async({ render }) => {
           // @ts-ignore:
           pagination: { page: 1, isVisible: true },
         }}
+        // @ts-ignore:
+        tokenQuery={{
+          data: tokenInfoERC1155a,
+        }}
       />
     </Box>,
   );

diff --git a/ui/token/TokenTransfer/TokenTransfer.tsx b/ui/token/TokenTransfer/TokenTransfer.tsx
@@ -1,10 +1,12 @@
 import { Box } from '@chakra-ui/react';
+import type { UseQueryResult } from '@tanstack/react-query';
 import { useRouter } from 'next/router';
 import React from 'react';
 
 import type { SocketMessage } from 'lib/socket/types';
 import type { TokenInfo } from 'types/api/token';
 
+import type { ResourceError } from 'lib/api/resources';
 import useGradualIncrement from 'lib/hooks/useGradualIncrement';
 import useIsMobile from 'lib/hooks/useIsMobile';
 import useIsMounted from 'lib/hooks/useIsMounted';
@@ -23,15 +25,16 @@ const TABS_HEIGHT = 88;
 type Props = {
   transfersQuery: QueryWithPagesResult<'token_transfers'> | QueryWithPagesResult<'token_instance_transfers'>;
   tokenId?: string;
-  token?: TokenInfo;
+  tokenQuery: UseQueryResult<TokenInfo, ResourceError<unknown>>;
   shouldRender?: boolean;
 };
 
-const TokenTransfer = ({ transfersQuery, tokenId, token, shouldRender = true }: Props) => {
+const TokenTransfer = ({ transfersQuery, tokenId, tokenQuery, shouldRender = true }: Props) => {
   const isMobile = useIsMobile();
   const isMounted = useIsMounted();
   const router = useRouter();
   const { isError, isPlaceholderData, data, pagination } = transfersQuery;
+  const { data: token, isPlaceholderData: isTokenPlaceholderData, isError: isTokenError } = tokenQuery;
 
   const [ newItemsCount, setNewItemsCount ] = useGradualIncrement(0);
   const [ socketAlert, setSocketAlert ] = React.useState('');
@@ -64,7 +67,9 @@ const TokenTransfer = ({ transfersQuery, tokenId, token, shouldRender = true }:
     return null;
   }
 
-  const content = data?.items ? (
+  const isLoading = isPlaceholderData || isTokenPlaceholderData;
+
+  const content = data?.items && token ? (
     <>
       <Box display={{ base: 'none', lg: 'block' }}>
         <TokenTransferTable
@@ -75,7 +80,7 @@ const TokenTransfer = ({ transfersQuery, tokenId, token, shouldRender = true }:
           socketInfoNum={ newItemsCount }
           tokenId={ tokenId }
           token={ token }
-          isLoading={ isPlaceholderData }
+          isLoading={ isLoading }
         />
       </Box>
       <Box display={{ base: 'block', lg: 'none' }}>
@@ -85,10 +90,10 @@ const TokenTransfer = ({ transfersQuery, tokenId, token, shouldRender = true }:
             num={ newItemsCount }
             alert={ socketAlert }
             type="token_transfer"
-            isLoading={ isPlaceholderData }
+            isLoading={ isLoading }
           />
         ) }
-        <TokenTransferList data={ data?.items } tokenId={ tokenId } isLoading={ isPlaceholderData }/>
+        <TokenTransferList data={ data?.items } tokenId={ tokenId } isLoading={ isLoading }/>
       </Box>
     </>
   ) : null;
@@ -101,7 +106,7 @@ const TokenTransfer = ({ transfersQuery, tokenId, token, shouldRender = true }:
 
   return (
     <DataListDisplay
-      isError={ isError }
+      isError={ isError || isTokenError }
       items={ data?.items }
       emptyText="There are no token transfers."
       content={ content }

diff --git a/ui/token/TokenTransfer/TokenTransferListItem.tsx b/ui/token/TokenTransfer/TokenTransferListItem.tsx
@@ -28,7 +28,7 @@ const TokenTransferListItem = ({
 }: Props) => {
   const { usd, valueStr } = total && 'value' in total && total.value !== null ? getCurrencyValue({
     value: total.value,
-    exchangeRate: token.exchange_rate,
+    exchangeRate: token?.exchange_rate,
     accuracy: 8,
     accuracyUsd: 2,
     decimals: total.decimals || '0',
@@ -58,11 +58,11 @@ const TokenTransferListItem = ({
         from={ from }
         to={ to }
         isLoading={ isLoading }
-        tokenHash={ token.address }
+        tokenHash={ token?.address }
         w="100%"
         fontWeight="500"
       />
-      { valueStr && (token.type === 'ERC-20' || token.type === 'ERC-1155') && (
+      { valueStr && token && (token.type === 'ERC-20' || token.type === 'ERC-1155') && (
         <Grid gap={ 2 } templateColumns={ `1fr auto auto${ usd ? ' auto' : '' }` }>
           <Skeleton isLoaded={ !isLoading } flexShrink={ 0 } fontWeight={ 500 }>
             Value
@@ -89,7 +89,7 @@ const TokenTransferListItem = ({
           ) }
         </Grid>
       ) }
-      { total && 'token_id' in total && (NFT_TOKEN_TYPE_IDS.includes(token.type)) && total.token_id !== null && (
+      { total && 'token_id' in total && token && (NFT_TOKEN_TYPE_IDS.includes(token.type)) && total.token_id !== null && (
         <NftEntity
           hash={ token.address }
           id={ total.token_id }

diff --git a/ui/token/TokenTransfer/TokenTransferTable.tsx b/ui/token/TokenTransfer/TokenTransferTable.tsx
@@ -19,11 +19,12 @@ interface Props {
   socketInfoNum?: number;
   tokenId?: string;
   isLoading?: boolean;
-  token?: TokenInfo;
+  token: TokenInfo;
 }
 
 const TokenTransferTable = ({ data, top, showSocketInfo, socketInfoAlert, socketInfoNum, tokenId, isLoading, token }: Props) => {
-  const tokenType = data[0].token.type;
+
+  const tokenType = token.type;
 
   return (
     <AddressHighlightProvider>