Skip to content

fix: add token type check for token list #6033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guanbinrui merged 3 commits into from
Apr 6, 2022
Merged

fix: add token type check for token list #6033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f7ed81
fix: add token type check for token list
yanzhihong23 Apr 6, 2022
7c30b3b
chore: reply review
yanzhihong23 Apr 6, 2022
9c921e8
chore: reply review
yanzhihong23 Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/web3-shared/evm/hooks/useERC20TokenDetailed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ import type { ERC20Bytes32 } from '@masknet/web3-contracts/types/ERC20Bytes32'
import { useERC20TokenContract, useERC20TokenContracts } from '../contracts/useERC20TokenContract'
import { useERC20TokenBytes32Contract, useERC20TokenBytes32Contracts } from '../contracts/useERC20TokenBytes32Contract'
import { parseStringOrBytes32, createERC20Token, createNativeToken } from '../utils'
import { useEthereumTokenType } from './useEthereumTokenType'

export function useERC20TokenDetailed(address?: string, token?: Partial<ERC20TokenDetailed>, targetChainId?: ChainId) {
const currentChainId = useChainId()
const chainId = targetChainId ?? currentChainId
const erc20TokenContract = useERC20TokenContract(address, chainId)
const erc20TokenBytes32Contract = useERC20TokenBytes32Contract(address, chainId)
const tokenType = useEthereumTokenType(address)

return useAsyncRetry(async () => {
if (!address) return
if (!EthereumAddress.isValid(address)) return
if (tokenType !== EthereumTokenType.ERC20) return
return getERC20TokenDetailed(address, chainId, erc20TokenContract, erc20TokenBytes32Contract, token)
}, [chainId, token, erc20TokenContract, erc20TokenBytes32Contract, address])
}, [chainId, token, erc20TokenContract, erc20TokenBytes32Contract, address, tokenType])
}

export function useFungibleTokensDetailed(listOfToken: Pick<FungibleToken, 'address' | 'type'>[], _chainId?: ChainId) {
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-shared/evm/hooks/useEthereumTokenType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function useCheckERC1155(address: string) {
return useERC165(erc1155Contract, address, ERC1155_ENUMERABLE_INTERFACE_ID)
}

export function useEthereumTokenType(address: string): EthereumTokenType | undefined {
export function useEthereumTokenType(address = ''): EthereumTokenType | undefined {
const { value: isContract, loading: loadingContract } = useCheckContract(address)
const { value: isERC721, loading: loadingERC721 } = useCheckERC721(address)
const { value: isERC1155, loading: loadingERC1155 } = useCheckERC1155(address)
Expand Down