Merge pull request #325 from AElfProject/feature/refactor-2.0.0-Block…

…chain feat: type error
AElfProject · Apr 29, 2024 · d1c322e · d1c322e
2 parents 5c23f6c + c8765d9
commit d1c322e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/_types/common.ts b/src/_types/common.ts
@@ -12,6 +12,7 @@ export interface IToken {
   name: string;
   symbol: string;
   imageUrl: string;
+  decimals: number;
 }
 
 export interface IAddress {

diff --git a/src/app/[chain]/nft/[collectionSymbol]/_Detail/_inventory/CardList.tsx b/src/app/[chain]/nft/[collectionSymbol]/_Detail/_inventory/CardList.tsx
@@ -39,7 +39,7 @@ export interface Props {
   emptyType?: 'nodata' | 'search' | 'internet' | ReactNode | (() => ReactNode) | null;
   emptyText?: string;
   pageChange?: (page: number, pageSize?: number) => void;
-  pageSizeChange?: (value: number) => void;
+  pageSizeChange?: (value: number, size: number) => void;
   headerLeftNode?: ReactNode;
   options?: any;
 }

diff --git a/src/app/[chain]/nfts/mock.ts b/src/app/[chain]/nfts/mock.ts
@@ -4,6 +4,7 @@ const nftsList: INFTsTableItem[] = Array.from(new Array(100).keys()).map((key) =
   rank: key,
   nftCollection: {
     name: 'ELF',
+    decimals: 8,
     symbol: 'ELF',
     imageUrl:
       'https://ewell-testnet.s3.ap-northeast-1.amazonaws.com/1707185337825-9ccfd284d9a0301a256ce6ed13e56329.jpeg',

diff --git a/src/app/[chain]/token/[tokenSymbol]/_components/Overview/index.tsx b/src/app/[chain]/token/[tokenSymbol]/_components/Overview/index.tsx
@@ -31,26 +31,23 @@ const TokenDetailItems: IOverviewItem[] = [
     format: thousandsNumber,
   },
   {
-    key: 'priceInUsd',
+    key: 'price',
     label: 'PRICE',
-    render: (text, record) =>
-      record['pricePercentChange24h'] && record['pricePercentChange24h'] !== 0 ? (
-        <NumberPercentGroup decorator="$" number={text} percent={record['pricePercentChange24h']} />
-      ) : (
-        '--'
-      ),
+    render: (text, record) => (
+      <NumberPercentGroup decorator="$" number={text} percent={record['pricePercentChange24h']} />
+    ),
   },
   {
-    key: 'contractAddress',
+    key: 'tokenContractAddress',
     label: 'CONTRACT',
     tooltip:
       'This is the MultiToken contract that defines a common implementation for fungible and non-fungible tokens.',
     render: (text) => (text ? <ContractToken address={text} type={AddressType.address} chainId="AELf" /> : '--'),
   },
   {
-    key: 'decimals',
+    key: 'token',
     label: 'DECIMAL',
-    render: (text) => (text && text !== 0 ? text : '--'),
+    render: (token) => (token.decimals && token.decimals !== 0 ? token.decimals : '--'),
   },
 ];
 

diff --git a/src/app/[chain]/token/[tokenSymbol]/type.ts b/src/app/[chain]/token/[tokenSymbol]/type.ts
@@ -45,11 +45,11 @@ export interface ITokenDetail {
   totalSupply: string;
   circulatingSupply: string;
   holders: number;
+  price: number;
   holderPercentChange24h: number;
   transferCount: number;
-  priceInUsd: number;
   pricePercentChange24h: number;
-  contractAddress: string;
+  tokenContractAddress: string;
   decimals: number;
 }