From 2e515791b3a334aa7ff4c2050b2b9e45b4d4083c Mon Sep 17 00:00:00 2001 From: lelenei Date: Tue, 14 Jun 2022 22:41:04 +0800 Subject: [PATCH 01/14] fix: css style --- .../mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx | 1 + .../mask/src/plugins/Avatar/Application/NFTListDialog.tsx | 4 ++-- .../src/social-network-adaptor/twitter.com/ui-provider.ts | 1 + packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx index 16f7941a6fbe..49b24cad0ed1 100644 --- a/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx +++ b/packages/mask/src/plugins/Avatar/Application/NFTAvatarsDialog.tsx @@ -25,6 +25,7 @@ const useStyles = makeStyles()((theme) => ({ backgroundColor: theme.palette.mode === 'dark' ? 'rgba(250, 250, 250, 0.2)' : 'rgba(0, 0, 0, 0.2)', backgroundClip: 'padding-box', }, + overflow: 'hidden', }, })) enum CreateNFTAvatarStep { diff --git a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx index 86428ec9f627..3f11710580bb 100644 --- a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx +++ b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx @@ -104,10 +104,10 @@ export function NFTListDialog(props: NFTListDialogProps) { const currentPluginId = useCurrentWeb3NetworkPluginID() const account = useAccount(currentPluginId) const currentChainId = useChainId<'all'>(currentPluginId) - const [chainId, setChainId] = useState(currentChainId as ChainId) + const [chainId, setChainId] = useState((currentChainId ?? ChainId.Mainnet) as ChainId) const [open_, setOpen_] = useState(false) const [selectedAccount, setSelectedAccount] = useState(account ?? wallets?.[0]?.identity ?? '') - const [selectedPluginId, setSelectedPluginId] = useState(currentPluginId) + const [selectedPluginId, setSelectedPluginId] = useState(currentPluginId ?? NetworkPluginID.PLUGIN_EVM) const [selectedToken, setSelectedToken] = useState(tokenInfo) const [disabled, setDisabled] = useState(false) const t = useI18N() diff --git a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts index bc9174c4d2b4..20028753193f 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts @@ -57,6 +57,7 @@ const useInjectedDialogClassesOverwriteTwitter = makeStyles()((theme) => { display: 'block !important', margin: 12, }, + overflow: 'hidden', }, dialogTitle: { display: 'grid', diff --git a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx index c4b692644112..ae63334f6b46 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx @@ -38,6 +38,7 @@ const useStyles = makeStyles()((theme) => ({ display: 'block !important', margin: 12, }, + overflow: 'hidden', }, })) From f738cba9b564911cdc475e0d4dc580fe63316a22 Mon Sep 17 00:00:00 2001 From: lelenei Date: Tue, 14 Jun 2022 23:24:22 +0800 Subject: [PATCH 02/14] fix: filter nft by chain id --- .../mask/src/plugins/Avatar/Application/NFTListDialog.tsx | 4 ++-- .../src/social-network-adaptor/twitter.com/ui-provider.ts | 4 +++- packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx index 3f11710580bb..0886e9f120ad 100644 --- a/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx +++ b/packages/mask/src/plugins/Avatar/Application/NFTListDialog.tsx @@ -103,7 +103,7 @@ export function NFTListDialog(props: NFTListDialogProps) { const { classes } = useStyles() const currentPluginId = useCurrentWeb3NetworkPluginID() const account = useAccount(currentPluginId) - const currentChainId = useChainId<'all'>(currentPluginId) + const currentChainId = useChainId(currentPluginId) const [chainId, setChainId] = useState((currentChainId ?? ChainId.Mainnet) as ChainId) const [open_, setOpen_] = useState(false) const [selectedAccount, setSelectedAccount] = useState(account ?? wallets?.[0]?.identity ?? '') @@ -237,7 +237,7 @@ export function NFTListDialog(props: NFTListDialogProps) { selectedPluginId === NetworkPluginID.PLUGIN_SOLANA ? (x) => x.tokenId : (x) => x.contract?.address.toLowerCase() + x.tokenId, - ) + ).filter((x) => x.chainId === chainId) const NoNFTList = () => { if (!collectibles.length && !loadFinish && !loadError) { diff --git a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts index 20028753193f..8db5eb98b6c2 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/ui-provider.ts @@ -57,7 +57,9 @@ const useInjectedDialogClassesOverwriteTwitter = makeStyles()((theme) => { display: 'block !important', margin: 12, }, - overflow: 'hidden', + '&::-webkit-scrollbar': { + display: 'none', + }, }, dialogTitle: { display: 'grid', diff --git a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx index ae63334f6b46..c4b692644112 100644 --- a/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx +++ b/packages/plugins/FileService/src/SNSAdaptor/MainDialog.tsx @@ -38,7 +38,6 @@ const useStyles = makeStyles()((theme) => ({ display: 'block !important', margin: 12, }, - overflow: 'hidden', }, })) From b191c1486b225ce2a4ab83a5595e0fc674957ddf Mon Sep 17 00:00:00 2001 From: lelenei Date: Tue, 14 Jun 2022 23:37:53 +0800 Subject: [PATCH 03/14] fix: get nft from opensea --- packages/mask/src/plugins/Avatar/hooks/useNFT.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index 2b24a3d80fd7..f36dbe9d8d10 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -1,7 +1,7 @@ import { ChainId } from '@masknet/web3-shared-evm' import { useAsyncRetry } from 'react-use' import { useWeb3Hub, useWeb3State } from '@masknet/plugin-infra/web3' -import { CurrencyType, NetworkPluginID } from '@masknet/web3-shared-base' +import { CurrencyType, NetworkPluginID, SourceType } from '@masknet/web3-shared-base' import type { NFTInfo } from '../types' export function useNFT( @@ -20,6 +20,7 @@ export function useNFT( return useAsyncRetry(async () => { const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { chainId, + sourceType: SourceType.OpenSea, }) return { amount: asset?.price?.[CurrencyType.NATIVE] ?? '0', From 82750bfedb7199242877a1972fd9b598a8ea992c Mon Sep 17 00:00:00 2001 From: guanbinrui Date: Wed, 15 Jun 2022 00:02:50 +0800 Subject: [PATCH 04/14] fix: type error --- packages/plugin-infra/src/web3-helpers/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/plugin-infra/src/web3-helpers/index.ts b/packages/plugin-infra/src/web3-helpers/index.ts index b0eb1e1cd1f9..e6139a76b455 100644 --- a/packages/plugin-infra/src/web3-helpers/index.ts +++ b/packages/plugin-infra/src/web3-helpers/index.ts @@ -206,8 +206,7 @@ export declare namespace Web3Helper { export type Web3HubAll = Hub< Definition[NetworkPluginID]['ChainId'], Definition[NetworkPluginID]['SchemaType'], - Definition[NetworkPluginID]['GasOption'], - Definition[NetworkPluginID]['Transaction'] + Definition[NetworkPluginID]['GasOption'] > export type Web3StateAll = Web3Plugin.ObjectCapabilities.Capabilities< From c771f3c2d4cf6f9f7f897f78a0c84332984f68e2 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 00:03:23 +0800 Subject: [PATCH 05/14] fix: get price --- .../mask/src/plugins/Avatar/hooks/useNFT.ts | 3 +-- .../mask/src/plugins/Avatar/hooks/usePrice.ts | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 packages/mask/src/plugins/Avatar/hooks/usePrice.ts diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index f36dbe9d8d10..2b24a3d80fd7 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -1,7 +1,7 @@ import { ChainId } from '@masknet/web3-shared-evm' import { useAsyncRetry } from 'react-use' import { useWeb3Hub, useWeb3State } from '@masknet/plugin-infra/web3' -import { CurrencyType, NetworkPluginID, SourceType } from '@masknet/web3-shared-base' +import { CurrencyType, NetworkPluginID } from '@masknet/web3-shared-base' import type { NFTInfo } from '../types' export function useNFT( @@ -20,7 +20,6 @@ export function useNFT( return useAsyncRetry(async () => { const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { chainId, - sourceType: SourceType.OpenSea, }) return { amount: asset?.price?.[CurrencyType.NATIVE] ?? '0', diff --git a/packages/mask/src/plugins/Avatar/hooks/usePrice.ts b/packages/mask/src/plugins/Avatar/hooks/usePrice.ts new file mode 100644 index 000000000000..5c790276e6e9 --- /dev/null +++ b/packages/mask/src/plugins/Avatar/hooks/usePrice.ts @@ -0,0 +1,26 @@ +import { ChainId } from '@masknet/web3-shared-evm' +import { useAsyncRetry } from 'react-use' +import { useWeb3Hub } from '@masknet/plugin-infra/web3' +import { CurrencyType, NetworkPluginID, SourceType } from '@masknet/web3-shared-base' + +export function usePrice( + account: string, + address: string, + tokenId: string, + pluginId: NetworkPluginID, + chainId?: ChainId, +) { + const hub = useWeb3Hub<'all'>(pluginId, { + chainId, + account, + }) + + return useAsyncRetry(async () => { + if (pluginId !== NetworkPluginID.PLUGIN_EVM || chainId !== ChainId.Mainnet) return '0' + const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { + chainId, + sourceType: SourceType.OpenSea, + }) + return asset?.price?.[CurrencyType.BTC] ?? '0' + }, [hub?.getNonFungibleAsset, address, tokenId, chainId]) +} From 01e8e8cfc07f879a179e67efe8cfdcd034a7309d Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 00:42:20 +0800 Subject: [PATCH 06/14] fix: opensea provider --- .../mask/src/plugins/Avatar/hooks/useNFT.ts | 2 +- .../mask/src/plugins/Avatar/hooks/usePrice.ts | 26 ------------------- packages/web3-providers/src/opensea/index.ts | 11 ++++++-- packages/web3-providers/src/opensea/types.ts | 2 ++ 4 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 packages/mask/src/plugins/Avatar/hooks/usePrice.ts diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index 2b24a3d80fd7..efcef6f084f6 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -22,7 +22,7 @@ export function useNFT( chainId, }) return { - amount: asset?.price?.[CurrencyType.NATIVE] ?? '0', + amount: asset?.price?.[CurrencyType.BTC] ?? '0', name: asset?.contract?.name ?? '', symbol: asset?.contract?.symbol ?? 'ETH', image: asset?.metadata?.imageURL ?? '', diff --git a/packages/mask/src/plugins/Avatar/hooks/usePrice.ts b/packages/mask/src/plugins/Avatar/hooks/usePrice.ts deleted file mode 100644 index 5c790276e6e9..000000000000 --- a/packages/mask/src/plugins/Avatar/hooks/usePrice.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { ChainId } from '@masknet/web3-shared-evm' -import { useAsyncRetry } from 'react-use' -import { useWeb3Hub } from '@masknet/plugin-infra/web3' -import { CurrencyType, NetworkPluginID, SourceType } from '@masknet/web3-shared-base' - -export function usePrice( - account: string, - address: string, - tokenId: string, - pluginId: NetworkPluginID, - chainId?: ChainId, -) { - const hub = useWeb3Hub<'all'>(pluginId, { - chainId, - account, - }) - - return useAsyncRetry(async () => { - if (pluginId !== NetworkPluginID.PLUGIN_EVM || chainId !== ChainId.Mainnet) return '0' - const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { - chainId, - sourceType: SourceType.OpenSea, - }) - return asset?.price?.[CurrencyType.BTC] ?? '0' - }, [hub?.getNonFungibleAsset, address, tokenId, chainId]) -} diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts index b59961621531..3ef084e5b863 100644 --- a/packages/web3-providers/src/opensea/index.ts +++ b/packages/web3-providers/src/opensea/index.ts @@ -29,7 +29,7 @@ import type { OpenSeaCustomAccount, OpenSeaResponse, } from './types' -import { getOrderUSDPrice, toImage } from './utils' +import { getOrderUnitPrice, getOrderUSDPrice, toImage } from './utils' import { OPENSEA_ACCOUNT_URL, OPENSEA_API_URL } from './constants' async function fetchFromOpenSea(url: string, chainId: ChainId, apiKey?: string) { @@ -123,7 +123,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs ) return { ...createNFTToken(chainId, asset), - link: asset.opensea_link, + link: asset.opensea_link ?? asset.permalink, payment_tokens: orderTokens.concat(offerTokens), auction: isAfter(Date.parse(`${asset.endTime ?? ''}Z`), Date.now()) ? { @@ -148,6 +148,13 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs type: x.trait_type, value: x.value, })), + price: { + btc: getOrderUnitPrice( + asset.last_sale?.total_price, + asset.last_sale?.payment_token.decimals, + asset.last_sale?.quantity ?? '1', + )?.toString(), + }, orders: asset.orders ?.sort((a, z) => new BigNumber(getOrderUSDPrice(z.current_price, z.payment_token_contract?.usd_price) ?? 0) diff --git a/packages/web3-providers/src/opensea/types.ts b/packages/web3-providers/src/opensea/types.ts index 809d645187e2..3fb28974f5c4 100644 --- a/packages/web3-providers/src/opensea/types.ts +++ b/packages/web3-providers/src/opensea/types.ts @@ -60,6 +60,7 @@ export interface AssetEvent { payment_token: { decimals: number } + quantity: string } export interface OpenSeaAssetContract extends OpenSeaFees { @@ -166,6 +167,7 @@ export interface OpenSeaResponse extends Asset { }> creator: OpenSeaCustomAccount endTime: string + permalink: string } interface Transaction { From d3cdf355a6156ee0b03d3da53219420191519a22 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 00:48:54 +0800 Subject: [PATCH 07/14] fix: slice name --- packages/mask/src/plugins/Avatar/utils/index.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/mask/src/plugins/Avatar/utils/index.ts b/packages/mask/src/plugins/Avatar/utils/index.ts index 8766c899284a..00d4f5c18f2f 100644 --- a/packages/mask/src/plugins/Avatar/utils/index.ts +++ b/packages/mask/src/plugins/Avatar/utils/index.ts @@ -59,11 +59,9 @@ export function formatPrice(amount: string, symbol: string) { export function formatText(name: string, tokenId: string) { const _name = name.replace(/#\d*/, '').trim() - let token = tokenId - if (tokenId.length > 10) { - token = tokenId.slice(0, 6) + '...' + tokenId.slice(-4) - } - return `${_name} #${token}` + const __name = `${_name} #${tokenId}` + if (__name.length > 35) return `${__name.slice(0, 35)}...` + return __name } export function formatTokenId(symbol: string, tokenId: string) { From d036e3e7114d59cdded18f6b26c25d9e7a38a9c0 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 00:59:52 +0800 Subject: [PATCH 08/14] fix: reply review --- packages/mask/src/plugins/Avatar/hooks/useNFT.ts | 2 +- packages/web3-providers/src/opensea/index.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index efcef6f084f6..484fafd35ba9 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -22,7 +22,7 @@ export function useNFT( chainId, }) return { - amount: asset?.price?.[CurrencyType.BTC] ?? '0', + amount: asset?.price?.[CurrencyType.USD] ?? '0', name: asset?.contract?.name ?? '', symbol: asset?.contract?.symbol ?? 'ETH', image: asset?.metadata?.imageURL ?? '', diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts index 3ef084e5b863..cd057b47db57 100644 --- a/packages/web3-providers/src/opensea/index.ts +++ b/packages/web3-providers/src/opensea/index.ts @@ -149,7 +149,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs value: x.value, })), price: { - btc: getOrderUnitPrice( + usd: getOrderUnitPrice( asset.last_sale?.total_price, asset.last_sale?.payment_token.decimals, asset.last_sale?.quantity ?? '1', From 51ac3b159ee10d7bea035c590be02b7994d03135 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 01:15:07 +0800 Subject: [PATCH 09/14] fix: reply reivew --- packages/web3-providers/src/opensea/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-providers/src/opensea/index.ts b/packages/web3-providers/src/opensea/index.ts index cd057b47db57..d7d980903e41 100644 --- a/packages/web3-providers/src/opensea/index.ts +++ b/packages/web3-providers/src/opensea/index.ts @@ -149,7 +149,7 @@ function createNFTAsset(chainId: ChainId, asset: OpenSeaResponse): NonFungibleAs value: x.value, })), price: { - usd: getOrderUnitPrice( + [CurrencyType.USD]: getOrderUnitPrice( asset.last_sale?.total_price, asset.last_sale?.payment_token.decimals, asset.last_sale?.quantity ?? '1', From 6b7ffb6be2ab82226814edb213ff8d1e31ee930e Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 01:23:50 +0800 Subject: [PATCH 10/14] fix: reply review --- packages/plugins/EVM/src/state/Hub/hub.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/plugins/EVM/src/state/Hub/hub.ts b/packages/plugins/EVM/src/state/Hub/hub.ts index 9fd4a6219b44..5a95c60fafc9 100644 --- a/packages/plugins/EVM/src/state/Hub/hub.ts +++ b/packages/plugins/EVM/src/state/Hub/hub.ts @@ -117,7 +117,9 @@ class Hub implements EVM_Hub { [SourceType.Alchemy_EVM]: Alchemy_EVM, } const predicate = createPredicate(Object.keys(providers) as Array) - const filteredProviders = predicate(sourceType) ? [providers[sourceType]] : [Alchemy_EVM, OpenSea, Rarible] + const defaultProviders = + options?.chainId === ChainId.Mainnet ? [OpenSea, Alchemy_EVM, Rarible] : [Alchemy_EVM, OpenSea, Rarible] + const filteredProviders = predicate(sourceType) ? [providers[sourceType]] : defaultProviders return attemptUntil( filteredProviders.map((x) => () => x.getAsset(address, tokenId, options)), undefined, From 1e39b9ca517d8810765978c959be0892aff8a529 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 01:34:23 +0800 Subject: [PATCH 11/14] fix: symbol error --- packages/mask/src/plugins/Avatar/hooks/useNFT.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index 484fafd35ba9..a72bfafe5b48 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -21,10 +21,11 @@ export function useNFT( const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { chainId, }) + console.log(asset) return { amount: asset?.price?.[CurrencyType.USD] ?? '0', name: asset?.contract?.name ?? '', - symbol: asset?.contract?.symbol ?? 'ETH', + symbol: asset?.payment_tokens?.[0].symbol ?? 'ETH', image: asset?.metadata?.imageURL ?? '', owner: asset?.owner?.address ?? asset?.ownerId ?? '', slug: asset?.collection?.slug ?? '', From e28ac622f2f91a58e59098428cdecc32f008674f Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 01:36:03 +0800 Subject: [PATCH 12/14] fix: remove console.log --- packages/mask/src/plugins/Avatar/hooks/useNFT.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts index a72bfafe5b48..d5c5c3c9b604 100644 --- a/packages/mask/src/plugins/Avatar/hooks/useNFT.ts +++ b/packages/mask/src/plugins/Avatar/hooks/useNFT.ts @@ -21,7 +21,6 @@ export function useNFT( const asset = await hub?.getNonFungibleAsset?.(address, tokenId, { chainId, }) - console.log(asset) return { amount: asset?.price?.[CurrencyType.USD] ?? '0', name: asset?.contract?.name ?? '', From 9f779fa8f38a15183e995eaf24fbcc344bad0406 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 03:16:26 +0800 Subject: [PATCH 13/14] fix: remove check solana --- packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx | 6 +++--- packages/mask/src/plugins/Avatar/Services/storage.ts | 1 - packages/mask/src/plugins/Avatar/hooks/save/useSave.ts | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx index b786a878fb94..f5fbb2c7762f 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTImage.tsx @@ -7,7 +7,7 @@ import type { AllChainsNonFungibleToken } from '../types' const useStyles = makeStyles()((theme) => ({ imgBackground: { position: 'relative', - padding: 4, + padding: 6, borderRadius: '100%', display: 'flex', alignItems: 'center', @@ -15,8 +15,8 @@ const useStyles = makeStyles()((theme) => ({ }, icon: { position: 'absolute', - top: 2, - right: 2, + top: 8, + right: 13, width: 20, height: 20, color: theme.palette.primary.main, diff --git a/packages/mask/src/plugins/Avatar/Services/storage.ts b/packages/mask/src/plugins/Avatar/Services/storage.ts index 21c02284070d..fa0421514975 100644 --- a/packages/mask/src/plugins/Avatar/Services/storage.ts +++ b/packages/mask/src/plugins/Avatar/Services/storage.ts @@ -22,7 +22,6 @@ export async function saveAvatar(account: string, network: EnhanceableSite, avat await setAddress(network, avatar.userId, avatar.pluginId ?? NetworkPluginID.PLUGIN_EVM, account) await NFTAvatarStorage(network).set(avatar.userId, { ...avatar, - address: avatar.pluginId === NetworkPluginID.PLUGIN_SOLANA ? avatar.tokenId : avatar.address, sign, }) diff --git a/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts b/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts index f380a2624c8a..45ccdef3da8d 100644 --- a/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts +++ b/packages/mask/src/plugins/Avatar/hooks/save/useSave.ts @@ -24,8 +24,7 @@ export function useSave(pluginId: NetworkPluginID, chainId: ChainId) { persona: ECKeyIdentifier, proof: BindingProof, ) => { - if (pluginId === NetworkPluginID.PLUGIN_SOLANA && !token.tokenId) return - if (pluginId !== NetworkPluginID.PLUGIN_SOLANA && (!token.contract?.address || !token.tokenId)) return + if (!token.contract?.address || !token.tokenId) return const info: NextIDAvatarMeta = { pluginId, nickname: data.nickname, From 8bc7c8f20a8074faed1f36a766a87ba1d7dc3490 Mon Sep 17 00:00:00 2001 From: lelenei Date: Wed, 15 Jun 2022 03:38:30 +0800 Subject: [PATCH 14/14] fix: reply review --- packages/web3-providers/src/alchemy/index.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/web3-providers/src/alchemy/index.ts b/packages/web3-providers/src/alchemy/index.ts index 602abd2d4dfa..d62d6b98908b 100644 --- a/packages/web3-providers/src/alchemy/index.ts +++ b/packages/web3-providers/src/alchemy/index.ts @@ -237,11 +237,7 @@ function createNFTAsset_EVM( slug: '', description: metaDataResponse.description, }, - link: resolveOpenSeaLink( - metaDataResponse?.contract?.address, - Number.parseInt(metaDataResponse.id?.tokenId, 16).toString(), - chainId, - ), + link: resolveOpenSeaLink(metaDataResponse?.contract?.address, metaDataResponse.id?.tokenId, chainId), owner: { address: first(ownersResponse?.owners), },