From 20e85cc7054052e8fe1b7dd6e81b41bd5b47e4bc Mon Sep 17 00:00:00 2001 From: lelenei Date: Fri, 7 Jan 2022 17:30:49 +0800 Subject: [PATCH 1/5] fix: nft contract default icon --- packages/icons/plugins/NFTContract.tsx | 179 ++++++++++++++++++ packages/icons/plugins/index.tsx | 1 + .../SNSAdaptor/SelectNftContractDialog.tsx | 12 +- packages/web3-providers/src/NFTScan/index.ts | 4 +- 4 files changed, 187 insertions(+), 9 deletions(-) create mode 100644 packages/icons/plugins/NFTContract.tsx diff --git a/packages/icons/plugins/NFTContract.tsx b/packages/icons/plugins/NFTContract.tsx new file mode 100644 index 000000000000..f9babbf04574 --- /dev/null +++ b/packages/icons/plugins/NFTContract.tsx @@ -0,0 +1,179 @@ +import { createIcon } from '../utils' + +export const NFTContractIcon = createIcon( + 'NFTContractIcon', + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + '0 0 36 36', +) diff --git a/packages/icons/plugins/index.tsx b/packages/icons/plugins/index.tsx index 1825d013e476..64bac8934383 100644 --- a/packages/icons/plugins/index.tsx +++ b/packages/icons/plugins/index.tsx @@ -12,3 +12,4 @@ export * from './PetIcon' export * from './LootMan' export * from './MaskBox' export * from './GoodGhosting' +export * from './NFTContract' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index f36a20a89dec..c188908bfd43 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -19,10 +19,10 @@ import { SearchInput } from '../../../extension/options-page/DashboardComponents import OpenInNewIcon from '@mui/icons-material/OpenInNew' import Fuse from 'fuse.js' import { useERC721ContractDetailed } from '@masknet/web3-shared-evm' -import classNames from 'classnames' import { unionBy } from 'lodash-unified' import { useNFTBalance } from '../../EVM/hooks' import type { NonFungibleTokenAPI } from '@masknet/web3-providers' +import { NFTContractIcon } from '@masknet/icons' const useStyles = makeStyles()((theme) => ({ search: { @@ -261,18 +261,16 @@ function ContractListItem(props: ContractListItemProps) { onSubmit(contract.contractDetailed)}> {contract.contractDetailed.iconURL ? ( - ) : null} + ) : ( + + )} {contract.contractDetailed.name}{' '} {contract.contractDetailed.symbol ? '(' + contract.contractDetailed.symbol + ')' : ''} {contract.balance ? {contract.balance} : null} -
+
onSubmit(contract.contractDetailed)}>{contract.contractDetailed.address} Date: Fri, 7 Jan 2022 17:48:49 +0800 Subject: [PATCH 2/5] fix: replace nft contract default icon --- packages/icons/plugins/NFTContract.tsx | 175 +------------------------ 1 file changed, 4 insertions(+), 171 deletions(-) diff --git a/packages/icons/plugins/NFTContract.tsx b/packages/icons/plugins/NFTContract.tsx index f9babbf04574..727e2d66a03a 100644 --- a/packages/icons/plugins/NFTContract.tsx +++ b/packages/icons/plugins/NFTContract.tsx @@ -3,177 +3,10 @@ import { createIcon } from '../utils' export const NFTContractIcon = createIcon( 'NFTContractIcon', - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + , '0 0 36 36', ) From 8dc72500f2029d721e72c2fcb0227f900919b7a7 Mon Sep 17 00:00:00 2001 From: lelenei Date: Fri, 7 Jan 2022 21:24:08 +0800 Subject: [PATCH 3/5] fix: use token default icon --- packages/icons/plugins/NFTContract.tsx | 12 ------------ packages/icons/plugins/index.tsx | 1 - .../Wallet/SNSAdaptor/SelectNftContractDialog.tsx | 10 ++++------ 3 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 packages/icons/plugins/NFTContract.tsx diff --git a/packages/icons/plugins/NFTContract.tsx b/packages/icons/plugins/NFTContract.tsx deleted file mode 100644 index 727e2d66a03a..000000000000 --- a/packages/icons/plugins/NFTContract.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import { createIcon } from '../utils' - -export const NFTContractIcon = createIcon( - 'NFTContractIcon', - - - , - '0 0 36 36', -) diff --git a/packages/icons/plugins/index.tsx b/packages/icons/plugins/index.tsx index 64bac8934383..1825d013e476 100644 --- a/packages/icons/plugins/index.tsx +++ b/packages/icons/plugins/index.tsx @@ -12,4 +12,3 @@ export * from './PetIcon' export * from './LootMan' export * from './MaskBox' export * from './GoodGhosting' -export * from './NFTContract' diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index c188908bfd43..daa09316c124 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -9,6 +9,7 @@ import { useAccount, useERC721Tokens, formatEthereumAddress, + useBlockie, } from '@masknet/web3-shared-evm' import { InjectedDialog } from '../../../components/shared/InjectedDialog' import { WalletMessages } from '../messages' @@ -22,7 +23,6 @@ import { useERC721ContractDetailed } from '@masknet/web3-shared-evm' import { unionBy } from 'lodash-unified' import { useNFTBalance } from '../../EVM/hooks' import type { NonFungibleTokenAPI } from '@masknet/web3-providers' -import { NFTContractIcon } from '@masknet/icons' const useStyles = makeStyles()((theme) => ({ search: { @@ -255,15 +255,13 @@ function ContractListItem(props: ContractListItemProps) { const { onSubmit, contract } = props const { classes } = useStyles() const chainId = useChainId() + const blockie = useBlockie(contract.contractDetailed.address) return (
onSubmit(contract.contractDetailed)}> - {contract.contractDetailed.iconURL ? ( - - ) : ( - - )} + + {contract.contractDetailed.name}{' '} {contract.contractDetailed.symbol ? '(' + contract.contractDetailed.symbol + ')' : ''} From cb587c58e1e256900a57937c87790273e45b1365 Mon Sep 17 00:00:00 2001 From: zhouhanseng Date: Thu, 20 Jan 2022 13:11:04 +0800 Subject: [PATCH 4/5] chore: little fix --- .../src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx | 2 +- packages/web3-providers/src/NFTScan/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index c38d04c7d976..c46b08b3dff8 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -260,7 +260,7 @@ function ContractListItem(props: ContractListItemProps) { return (
onSubmit(contract.contractDetailed)}> - + {contract.contractDetailed.name}{' '} diff --git a/packages/web3-providers/src/NFTScan/index.ts b/packages/web3-providers/src/NFTScan/index.ts index 56b31a76867f..3bfb6fe3faf1 100644 --- a/packages/web3-providers/src/NFTScan/index.ts +++ b/packages/web3-providers/src/NFTScan/index.ts @@ -72,8 +72,8 @@ export class NFTScanAPI implements NonFungibleTokenAPI.Provider { ChainId.Mainnet, x.nft_contract_address, x.nft_platform_name, - '', - '', + undefined, + undefined, x.nft_platform_image, ) const balance = x.nft_asset.length From 0f24cca89513995cf8c0f5aa7667f55873eb4d39 Mon Sep 17 00:00:00 2001 From: lelenei Date: Thu, 27 Jan 2022 19:28:38 +0800 Subject: [PATCH 5/5] fix: reply review --- .../plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx index c46b08b3dff8..5ee833da0145 100644 --- a/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx +++ b/packages/mask/src/plugins/Wallet/SNSAdaptor/SelectNftContractDialog.tsx @@ -1,6 +1,6 @@ import { useCallback, useState, useMemo } from 'react' import { makeStyles } from '@masknet/theme' -import { DialogContent, List, ListItem, Typography, Box, Link } from '@mui/material' +import { DialogContent, List, ListItem, Typography, Box, Link, Avatar } from '@mui/material' import { ChainId, ERC721ContractDetailed, @@ -9,7 +9,6 @@ import { useAccount, useERC721Tokens, formatEthereumAddress, - useBlockie, useERC721ContractDetailed, } from '@masknet/web3-shared-evm' import { InjectedDialog } from '../../../components/shared/InjectedDialog' @@ -255,13 +254,11 @@ function ContractListItem(props: ContractListItemProps) { const { onSubmit, contract } = props const { classes } = useStyles() const chainId = useChainId() - const blockie = useBlockie(contract.contractDetailed.address) return (
onSubmit(contract.contractDetailed)}> - - + {contract.contractDetailed.name}{' '} {contract.contractDetailed.symbol ? '(' + contract.contractDetailed.symbol + ')' : ''}