merge fix

mocks/address/tokens.ts

@@ -122,11 +122,13 @@ export const nfts: AddressNFTsResponse = {
   items: [
     {
       ...tokenInstance.base,
+      token: tokens.tokenInfoERC1155a,
       token_type: 'ERC-1155',
       value: '11',
     },
     {
       ...tokenInstance.unique,
+      token: tokens.tokenInfoERC721a,
       token_type: 'ERC-721',
       value: '1',
     },

stubs/address.ts

@@ -10,7 +10,7 @@ import type {
 import type { AddressesItem } from 'types/api/addresses';
 
 import { ADDRESS_HASH } from './addressParams';
-import { TOKEN_INFO_ERC_1155, TOKEN_INFO_ERC_20, TOKEN_INSTANCE } from './token';
+import { TOKEN_INFO_ERC_1155, TOKEN_INFO_ERC_20, TOKEN_INFO_ERC_721, TOKEN_INSTANCE } from './token';
 import { TX_HASH } from './tx';
 
 export const ADDRESS_INFO: Address = {
@@ -90,12 +90,14 @@ export const ADDRESS_TOKEN_BALANCE_ERC_20: AddressTokenBalance = {
 
 export const ADDRESS_NFT_721: AddressNFT = {
   token_type: 'ERC-721',
+  token: TOKEN_INFO_ERC_721,
   value: '1',
   ...TOKEN_INSTANCE,
 };
 
 export const ADDRESS_NFT_1155: AddressNFT = {
   token_type: 'ERC-1155',
+  token: TOKEN_INFO_ERC_1155,
   value: '10',
   ...TOKEN_INSTANCE,
 };

types/api/address.ts

@@ -50,6 +50,7 @@ export interface AddressTokenBalance {
 }
 
 export type AddressNFT = TokenInstance & {
+  token: TokenInfo;
   token_type: Omit<TokenType, 'ERC-20'>;
   value: string;
 }

ui/pages/Token.tsx

@@ -178,7 +178,7 @@ const TokenPageContent = () => {
     (tokenQuery.data?.type === 'ERC-1155' || tokenQuery.data?.type === 'ERC-721') ? {
       id: 'inventory',
       title: 'Inventory',
-      component: <TokenInventory inventoryQuery={ inventoryQuery } tokenQuery={ tokenQuery } ownerFilter={ ownerFilter }/>
+      component: <TokenInventory inventoryQuery={ inventoryQuery } tokenQuery={ tokenQuery } ownerFilter={ ownerFilter }/>,
     } : undefined,
     { id: 'token_transfers', title: 'Token transfers', component: <TokenTransfer transfersQuery={ transfersQuery } token={ tokenQuery.data }/> },
     { id: 'holders', title: 'Holders', component: <TokenHolders token={ tokenQuery.data } holdersQuery={ holdersQuery }/> },