fix: nft data and chain issues (#12215)

swkatmask · web-flow · commit 8482ad7cb6b1 · 2025-04-27T11:51:15.000+08:00
diff --git a/packages/mask/dashboard/components/SecondaryButton/index.tsx b/packages/mask/dashboard/components/SecondaryButton/index.tsx
@@ -13,6 +13,7 @@ const useStyles = makeStyles()((theme) => ({
         color: theme.palette.maskColor.main,
         border: 'none!important',
         fontWeight: 700,
+        borderRadius: 999,
         ['&:hover']: {
             background: theme.palette.maskColor.bottom,
             boxShadow: '0px 8px 25px rgba(0, 0, 0, 0.1)',
diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/AddDeriveWallet/index.tsx
@@ -236,6 +236,7 @@ export const Component = memo(function AddDeriveWallet() {
 
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     loading={confirmLoading}
                     disabled={disabled}
                     className={classes.bold}
diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/CreateMnemonic/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/CreateMnemonic/index.tsx
@@ -348,6 +348,7 @@ const VerifyMnemonicUI = memo<VerifyMnemonicUIProps>(function VerifyMnemonicUI({
                         <Trans>Back</Trans>
                     </SecondaryButton>
                     <PrimaryButton
+                        variant="roundedContained"
                         className={classes.bold}
                         width="125px"
                         disabled={loading || Object.entries(puzzleAnswer).length !== 3}
@@ -445,6 +446,7 @@ const CreateMnemonicUI = memo<CreateMnemonicUIProps>(function CreateMnemonicUI({
             </Alert>
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     className={cx(classes.bold, classes.button)}
                     width="125px"
                     size="large"
diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/CreateWalletForm/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/CreateWalletForm/index.tsx
@@ -164,6 +164,7 @@ export const Component = memo(function CreateWalletForm() {
             </form>
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     width="125px"
                     size="large"
                     color="primary"
diff --git a/packages/mask/dashboard/pages/CreateMaskWallet/Onboarding/index.tsx b/packages/mask/dashboard/pages/CreateMaskWallet/Onboarding/index.tsx
@@ -110,7 +110,7 @@ export const Component = memo(function Onboarding() {
                 <OnboardingWriter sentence={sentence} />
             </Box>
             <SetupFrameController>
-                <PrimaryButton onClick={onOpenPopupWallet} size="large" width={'228px'}>
+                <PrimaryButton variant="roundedContained" onClick={onOpenPopupWallet} size="large" width={'228px'}>
                     <Typography fontWeight={700}>
                         <Trans>Got it</Trans>
                     </Typography>
diff --git a/packages/mask/dashboard/pages/SetupPersona/Mnemonic/index.tsx b/packages/mask/dashboard/pages/SetupPersona/Mnemonic/index.tsx
@@ -203,6 +203,7 @@ export const Component = memo(function SignUpMnemonic() {
 
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     width="125px"
                     size="large"
                     color="primary"
diff --git a/packages/mask/dashboard/pages/SetupPersona/Onboarding/index.tsx b/packages/mask/dashboard/pages/SetupPersona/Onboarding/index.tsx
@@ -167,6 +167,7 @@ export const Component = memo(function Onboarding() {
             </Box>
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     onClick={onSetupTwitter}
                     size="large"
                     startIcon={
@@ -180,6 +181,7 @@ export const Component = memo(function Onboarding() {
                 </PrimaryButton>
                 {!isCreate && count && !isZero(count) ?
                     <PrimaryButton
+                        variant="roundedContained"
                         loading={loading}
                         disabled={loading}
                         onClick={onSetupPaymentPassword}
diff --git a/packages/mask/dashboard/pages/SetupPersona/PermissionOnboarding/index.tsx b/packages/mask/dashboard/pages/SetupPersona/PermissionOnboarding/index.tsx
@@ -137,6 +137,7 @@ export const Component = memo(function Onboarding() {
             </Box>
             <SetupFrameController>
                 <PrimaryButton
+                    variant="roundedContained"
                     onClick={onSetupTwitter}
                     size="large"
                     startIcon={
diff --git a/packages/mask/dashboard/pages/SetupPersona/Permissions/index.tsx b/packages/mask/dashboard/pages/SetupPersona/Permissions/index.tsx
@@ -128,7 +128,12 @@ export const Component = memo(function Permission() {
                     <SecondaryButton width="125px" size="large" onClick={() => window.close()}>
                         <Trans>Cancel</Trans>
                     </SecondaryButton>
-                    <PrimaryButton width="125px" size="large" color="primary" onClick={handleAgree}>
+                    <PrimaryButton
+                        variant="roundedContained"
+                        width="125px"
+                        size="large"
+                        color="primary"
+                        onClick={handleAgree}>
                         <Trans>Agree</Trans>
                     </PrimaryButton>
                 </div>
diff --git a/packages/mask/dashboard/pages/SetupPersona/SignUp/index.tsx b/packages/mask/dashboard/pages/SetupPersona/SignUp/index.tsx
@@ -120,6 +120,7 @@ export const Component = memo(function SignUp() {
                         <Trans>Skip</Trans>
                     </SecondaryButton>
                     <PrimaryButton
+                        variant="roundedContained"
                         width="125px"
                         size="large"
                         onClick={() => onNext()}
diff --git a/packages/mask/dashboard/pages/SetupPersona/Welcome/index.tsx b/packages/mask/dashboard/pages/SetupPersona/Welcome/index.tsx
@@ -99,10 +99,15 @@ export const Component = memo(function Welcome() {
             />
             <SetupFrameController>
                 <div className={classes.buttonGroup}>
-                    <SecondaryButton width="125px" size="large" onClick={() => window.close()}>
+                    <SecondaryButton variant="rounded" width="125px" size="large" onClick={() => window.close()}>
                         <Trans>Cancel</Trans>
                     </SecondaryButton>
-                    <PrimaryButton width="125px" size="large" color="primary" onClick={handleAgree}>
+                    <PrimaryButton
+                        variant="roundedContained"
+                        width="125px"
+                        size="large"
+                        color="primary"
+                        onClick={handleAgree}>
                         <Trans>Agree</Trans>
                     </PrimaryButton>
                 </div>
diff --git a/packages/mask/dashboard/pages/SignUp/steps/PersonaNameUI.tsx b/packages/mask/dashboard/pages/SignUp/steps/PersonaNameUI.tsx
@@ -66,6 +66,7 @@ export function PersonaNameUI({ onNext, error, loading }: PersonaNameUIProps) {
             <SetupFrameController>
                 <div className={classes.buttonGroup}>
                     <PrimaryButton
+                        variant="roundedContained"
                         loading={loading}
                         width="125px"
                         size="large"
diff --git a/packages/plugins/Collectible/src/SiteAdaptor/Shared/OffersList.tsx b/packages/plugins/Collectible/src/SiteAdaptor/Shared/OffersList.tsx
@@ -65,8 +65,8 @@ function OffersList(props: OffersListProps) {
 
     return (
         <div className={classes.wrapper} style={{ justifyContent: 'unset' }} data-hide-scrollbar>
-            {orderedOffers.map((x, idx) => (
-                <OfferCard key={idx} offer={x} className={classes.card} />
+            {orderedOffers.map((x) => (
+                <OfferCard key={x.id} offer={x} className={classes.card} />
             ))}
             <Stack pb="1px" width="100%" direction="row" justifyContent="center" data-hide-scrollbar>
                 {!finished && (
diff --git a/packages/plugins/Collectible/src/SiteAdaptor/Shared/PropertiesCard.tsx b/packages/plugins/Collectible/src/SiteAdaptor/Shared/PropertiesCard.tsx
@@ -25,7 +25,6 @@ const useStyles = makeStyles()((theme) => ({
         fontSize: 20,
         lineHeight: '24px',
         fontWeight: 700,
-        marginBottom: 12,
         color: theme.palette.maskColor.publicMain,
     },
     content: {
diff --git a/packages/plugins/Collectible/src/SiteAdaptor/index.tsx b/packages/plugins/Collectible/src/SiteAdaptor/index.tsx
@@ -94,7 +94,6 @@ const site: Plugin.SiteAdaptor.Definition = {
     PostInspector: function CollectiblePostInspector() {
         const links = usePostInfoDetails.mentionedLinks()
         const payload = getPayloadFromURLs(links)
-        console.log({ payload, links }, ...links)
         const isSupported =
             payload?.chainId ?
                 NFTSCAN_CHAIN_IDS.includes(payload.chainId as ChainId) ||
diff --git a/packages/plugins/Collectible/src/helpers/url.ts b/packages/plugins/Collectible/src/helpers/url.ts
@@ -128,7 +128,7 @@ const RULES: Rule[] = [
 
     // magic eden
     {
-        hosts: ['magiceden.io'],
+        hosts: ['magiceden.io', 'magiceden.us'],
         pathname: /^\/item-details\/(\w+)/,
         pluginID: NetworkPluginID.PLUGIN_SOLANA,
         chainId: ChainIdSolana.Mainnet,
diff --git a/packages/shared/src/UI/components/AssetsManagement/AssetsProvider.tsx b/packages/shared/src/UI/components/AssetsManagement/AssetsProvider.tsx
@@ -197,7 +197,7 @@ export const AssetsProvider = memo<AssetsProviderProps>(function AssetsProvider(
 
             // Fetch less in collection list, and more every time in expanded collection.
             // Also expand size if for id chunk, since there might be more assets than chunk size
-            const size = assetsState?.assets.length || collectionId ? 40 : 4
+            const size = assetsState?.assets.length || collectionId ? 20 : 4
             const indicator = (!collectionId && indicatorMapRef.current.get(storeId)) || createIndicator()
             dispatch({ type: 'SET_LOADING_STATUS', account, id: stateKey, loading: true })
             const pageable = await Hub.getNonFungibleAssetsByCollectionAndOwner(realId, account, {
diff --git a/packages/shared/src/UI/components/AssetsManagement/ChainRuntimeProvider.tsx b/packages/shared/src/UI/components/AssetsManagement/ChainRuntimeProvider.tsx
@@ -50,11 +50,14 @@ export const ChainRuntimeProvider = memo<PropsWithChildren<ChainRuntimeProviderP
     const assetsNetworks = useAssetsNetworks(pluginID)
 
     const networks = useMemo(() => {
-        const list = assetsNetworks.filter((x) => NFTSCAN_CHAIN_IDS.includes(x.chainId as ChainId))
+        const list =
+            pluginID === NetworkPluginID.PLUGIN_SOLANA ?
+                assetsNetworks
+            :   assetsNetworks.filter((x) => NFTSCAN_CHAIN_IDS.includes(x.chainId as ChainId))
         return chainWhiteList?.length ? list.filter((x) => chainWhiteList.includes(x.chainId as ChainId)) : list
     }, [chainWhiteList, assetsNetworks])
 
-    const currentChainId = chainId ?? defaultChainId ?? networks[0].chainId
+    const currentChainId = chainId ?? defaultChainId ?? networks?.[0]?.chainId
 
     const value = useMemo(
         () => ({ pluginID, account, defaultChainId, chainId: currentChainId, setChainId, networks, chainWhiteList }),
diff --git a/packages/shared/src/UI/components/AssetsManagement/CollectibleItem.tsx b/packages/shared/src/UI/components/AssetsManagement/CollectibleItem.tsx
@@ -152,7 +152,8 @@ export const CollectibleItem = memo((props: CollectibleItemProps) => {
     const assetName = useMemo(() => {
         if (!asset.collection) return
         if (isLensCollect(asset.collection.name)) return asset.metadata?.name
-        if (isLensFollower(asset.collection.name)) return asset.collection.name
+        if (isLensFollower(asset.collection.name || asset.metadata?.name))
+            return asset.collection.name || asset.metadata?.name
         if (isLens(asset.metadata?.name)) return asset.metadata?.name
         if (isXnsContractAddress(asset.address)) return asset.metadata?.name
         if (isENSContractAddress(asset.address) || isENSNameWrapperContractAddress(asset.address))
diff --git a/packages/shared/src/UI/components/AssetsManagement/useAssetsNetworks.ts b/packages/shared/src/UI/components/AssetsManagement/useAssetsNetworks.ts
@@ -1,6 +1,6 @@
-import { SimpleHashSupportedChains } from '@masknet/shared'
 import { NetworkPluginID } from '@masknet/shared-base'
 import { useNetworks } from '@masknet/web3-hooks-base'
+import { NFTScanSupportedChains } from '@masknet/web3-providers'
 import type { ReasonableNetwork } from '@masknet/web3-shared-base'
 import { CHAIN_DESCRIPTORS, ChainId, type SchemaType, type NetworkType } from '@masknet/web3-shared-evm'
 import { sortBy } from 'lodash-es'
@@ -9,9 +9,10 @@ import { useMemo } from 'react'
 export function useAssetsNetworks(pluginID: NetworkPluginID) {
     const allNetworks = useNetworks(pluginID, true)
     const networks = useMemo(() => {
-        const supported = SimpleHashSupportedChains[pluginID]
+        const supported = NFTScanSupportedChains[pluginID]
         const networks = allNetworks.filter(
-            (x) => (x.network === 'mainnet' || x.isCustomized) && supported.includes(x.chainId),
+            // network for Solana is mainnet-beta
+            (x) => (x.network.startsWith('mainnet') || x.isCustomized) && supported.includes(x.chainId),
         )
         // hard-coded for Zora
         if (pluginID === NetworkPluginID.PLUGIN_EVM) {
diff --git a/packages/shared/src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx b/packages/shared/src/UI/modals/SelectNonFungibleContractModal/SelectNonFungibleContractDialog.tsx
@@ -4,15 +4,16 @@ import { EMPTY_ENTRY, EMPTY_LIST, NetworkPluginID, Sniffings } from '@masknet/sh
 import { MaskTextField, makeStyles } from '@masknet/theme'
 import type { Web3Helper } from '@masknet/web3-helpers'
 import { useAccount, useNetworks, useNonFungibleCollections, useWeb3State } from '@masknet/web3-hooks-base'
+import { NFTScanSupportedChains } from '@masknet/web3-providers'
 import { isSameAddress, type NonFungibleCollection, type ReasonableNetwork } from '@masknet/web3-shared-base'
 import {
     CHAIN_DESCRIPTORS,
     ChainId,
-    type NetworkType,
     SchemaType,
     isLensCollect,
     isLensFollower,
     isLensProfileAddress,
+    type NetworkType,
 } from '@masknet/web3-shared-evm'
 import { Button, DialogActions, DialogContent, List, Stack, Typography } from '@mui/material'
 import { Box } from '@mui/system'
@@ -25,7 +26,6 @@ import { EmptyStatus, LoadingStatus, SelectNetworkSidebar } from '../../componen
 import { InjectedDialog } from '../../contexts/components/InjectedDialog.js'
 import { AddCollectiblesModal } from '../modals.js'
 import { ContractItem } from './ContractItem.js'
-import { SimpleHashSupportedChains } from '../../../constants.js'
 
 const useStyles = makeStyles()((theme) => ({
     content: {
@@ -245,7 +245,7 @@ export const SelectNonFungibleContractDialog = memo(
         const allNetworks = useNetworks(NetworkPluginID.PLUGIN_EVM, true)
 
         const networks = useMemo(() => {
-            const supported = SimpleHashSupportedChains[pluginID]
+            const supported = NFTScanSupportedChains[pluginID]
             const networks = allNetworks.filter(
                 (x) => (x.network === 'mainnet' || x.isCustomized) && supported.includes(x.chainId),
             )
diff --git a/packages/shared/src/constants.tsx b/packages/shared/src/constants.tsx
@@ -1,8 +1,5 @@
 import { Icons, type GeneratedIcon } from '@masknet/icons'
-import { EnhanceableSite, NetworkPluginID } from '@masknet/shared-base'
-import { ChainId } from '@masknet/web3-shared-evm'
-import { ChainId as SolanaChainId } from '@masknet/web3-shared-solana'
-import { ChainId as FlowChainId } from '@masknet/web3-shared-flow'
+import { EnhanceableSite } from '@masknet/shared-base'
 
 export const SOCIAL_MEDIA_ROUND_ICON_MAPPING: Record<EnhanceableSite | string, GeneratedIcon | null> = {
     [EnhanceableSite.Twitter]: Icons.TwitterXRound,
@@ -32,22 +29,3 @@ export enum PopupHomeTabType {
     SocialAccounts = 'Social Accounts',
     ConnectedWallets = 'Connected Wallets',
 }
-
-// https://docs.simplehash.com/reference/chains
-// sync `resolveChainId` and `ChainNameMap` in `web3-providers/src/SimpleHash/helpers.ts`
-export const SimpleHashSupportedChains: Record<NetworkPluginID, number[]> = {
-    [NetworkPluginID.PLUGIN_EVM]: [
-        ChainId.Mainnet,
-        ChainId.BSC,
-        ChainId.Base,
-        ChainId.Polygon,
-        ChainId.Arbitrum,
-        ChainId.Optimism,
-        ChainId.Avalanche,
-        ChainId.xDai,
-        ChainId.Scroll,
-        ChainId.Zora,
-    ],
-    [NetworkPluginID.PLUGIN_SOLANA]: [SolanaChainId.Mainnet],
-    [NetworkPluginID.PLUGIN_FLOW]: [FlowChainId.Mainnet],
-}
diff --git a/packages/web3-hooks/base/src/useNetworks.ts b/packages/web3-hooks/base/src/useNetworks.ts
@@ -12,7 +12,8 @@ export function useNetworks<T extends NetworkPluginID = NetworkPluginID>(pluginI
     const { Network } = useWeb3State(pluginID)
     const networks = useSubscription(Network?.networks ?? EMPTY_ARRAY)
     return useMemo(() => {
-        const list = networks.filter((x) => x.network === 'mainnet' || x.isCustomized)
+        // network for Solana is mainnet-beta
+        const list = networks.filter((x) => x.network.startsWith('mainnet') || x.isCustomized)
         return uniqChainId ? uniqBy(list, (x) => x.chainId) : list
-    }, [networks, uniqChainId])
+    }, [networks, uniqChainId, pluginID])
 }
diff --git a/packages/web3-providers/src/MagicEden/index.ts b/packages/web3-providers/src/MagicEden/index.ts
@@ -275,6 +275,12 @@ class MagicEdenAPI implements NonFungibleTokenAPI.Provider<ChainId, SchemaType>
                 // TODO's
                 assetPermalink: '',
                 source: SourceType.MagicEden,
+                maker: {
+                    address: offer.buyer,
+                },
+                price: {
+                    native: offer.price.toString(),
+                },
             }
         })
         return createPageable(
diff --git a/packages/web3-providers/src/NFTScan/constants.ts b/packages/web3-providers/src/NFTScan/constants.ts
@@ -1,15 +1,16 @@
+import { NetworkPluginID } from '@masknet/shared-base'
 import { ChainId } from '@masknet/web3-shared-evm'
+import { ChainId as SolanaChainId } from '@masknet/web3-shared-solana'
 
 export const NFTSCAN_URL = 'https://nftscan-proxy.r2d2.to'
 export const NFTSCAN_BASE = 'https://www.nftscan.com'
 export const NFTSCAN_BASE_SOLANA = 'https://solana.nftscan.com'
 export const NFTSCAN_LOGO_BASE = 'https://logo.nftscan.com/logo'
 
-export const NFTSCAN_CHAIN_IDS = [
-    ChainId.Mainnet,
-    ChainId.BSC,
-    ChainId.Polygon,
-    ChainId.Base,
-    ChainId.Optimism,
-    ChainId.Sei,
-]
+export const NFTSCAN_CHAIN_IDS = [ChainId.Mainnet, ChainId.BSC, ChainId.Polygon, ChainId.Base, ChainId.Optimism]
+
+export const NFTScanSupportedChains: Record<NetworkPluginID, number[]> = {
+    [NetworkPluginID.PLUGIN_EVM]: NFTSCAN_CHAIN_IDS,
+    [NetworkPluginID.PLUGIN_SOLANA]: [SolanaChainId.Mainnet],
+    [NetworkPluginID.PLUGIN_FLOW]: [],
+}
diff --git a/packages/web3-providers/src/NFTScan/index.ts b/packages/web3-providers/src/NFTScan/index.ts
@@ -3,4 +3,4 @@ export * from './apis/NonFungibleTokenAPI_Solana.js'
 export * from './apis/TrendingAPI_EVM.js'
 export * from './apis/TrendingAPI_Solana.js'
 export * from './apis/DSearchAPI.js'
-export { NFTSCAN_CHAIN_IDS } from './constants.js'
+export { NFTSCAN_CHAIN_IDS, NFTScanSupportedChains } from './constants.js'
diff --git a/packages/web3-providers/src/entry.ts b/packages/web3-providers/src/entry.ts
@@ -83,6 +83,7 @@ export {
     NFTScanNonFungibleTokenEVM,
     NFTScanNonFungibleTokenSolana,
     NFTSCAN_CHAIN_IDS,
+    NFTScanSupportedChains,
 } from './NFTScan/index.js'
 
 // Chainbase
diff --git a/packages/web3-shared/base/src/specs/index.ts b/packages/web3-shared/base/src/specs/index.ts
@@ -195,7 +195,7 @@ export interface ChainDescriptor<ChainId, SchemaType, NetworkType> {
     color?: string
     fullName?: string
     shortName?: string
-    /** For Solana, it's the cluster. */
+    /** For Solana, it's the cluster. The mainnet would be 'mainnet-beta' */
     network: LiteralUnion<'mainnet' | 'testnet'>
     nativeCurrency: FungibleToken<ChainId, SchemaType>
     minGasLimit?: string
diff --git a/packages/web3-shared/evm/src/helpers/isLensFollower.ts b/packages/web3-shared/evm/src/helpers/isLensFollower.ts
@@ -1,4 +1,5 @@
-export function isLensFollower(name: string) {
+export function isLensFollower(name: string | undefined) {
+    if (!name) return false
     // vitalik.lens-Follower, lensprotocol-Follower V2
     return name.includes('.lens-Follower') || name.includes('lensprotocol-Follower') || name.endsWith("'s follower NFT")
 }
