From 507f4788540b4e0eaabcbb53e1ab0e7b22fe9a06 Mon Sep 17 00:00:00 2001 From: nuanyang233 Date: Sun, 24 Apr 2022 14:15:34 +0800 Subject: [PATCH] chore: replace network id to enhanceable site --- .../InjectedComponents/CommentBox.tsx | 4 +- .../pages/Personas/AccountDetail/index.tsx | 4 +- .../popups/pages/Personas/Accounts/index.tsx | 2 +- .../ITO/SNSAdaptor/CompositionDialog.tsx | 5 ++- .../SNSAdaptor/RedPacketCreateNew.tsx | 4 +- .../instagram.com/base.ts | 8 ++-- .../social-network-adaptor/minds.com/base.ts | 6 +-- .../social-network-adaptor/opensea.io/base.ts | 6 +-- .../twitter.com/base.ts | 6 +-- packages/shared/src/constants.tsx | 42 +++++++++---------- .../evm/TokenPicker/SelectTokenDialog.tsx | 5 +-- 11 files changed, 45 insertions(+), 47 deletions(-) diff --git a/packages/mask/src/components/InjectedComponents/CommentBox.tsx b/packages/mask/src/components/InjectedComponents/CommentBox.tsx index 9bb17fb6473b..7b2fc2082784 100644 --- a/packages/mask/src/components/InjectedComponents/CommentBox.tsx +++ b/packages/mask/src/components/InjectedComponents/CommentBox.tsx @@ -1,8 +1,8 @@ -import { MINDS_ID } from '@masknet/shared' import { makeStyles } from '@masknet/theme' import { Box, InputBase } from '@mui/material' import { activatedSocialNetworkUI } from '../../social-network' import { useI18N } from '../../utils' +import { EnhanceableSite } from '@masknet/shared-base' interface StyleProps { snsId: string @@ -13,7 +13,7 @@ const useStyles = makeStyles()((theme, { snsId }) => ({ flex: 1, fontSize: 13, background: '#3a3b3c', - width: snsId === MINDS_ID ? '96%' : '100%', + width: snsId === EnhanceableSite.Minds ? '96%' : '100%', height: 34, borderRadius: 20, padding: '2px 1em', diff --git a/packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx b/packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx index a9ed66c4de7f..a18fc155a70f 100644 --- a/packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx +++ b/packages/mask/src/extension/popups/pages/Personas/AccountDetail/index.tsx @@ -3,7 +3,7 @@ import { useTitle } from '../../../hook/useTitle' import { useI18N } from '../../../../../utils' import { PersonaContext } from '../hooks/usePersonaContext' import { useNavigate } from 'react-router-dom' -import { NextIDAction, PopupRoutes } from '@masknet/shared-base' +import { EnhanceableSite, NextIDAction, PopupRoutes } from '@masknet/shared-base' import { AccountDetailUI } from './UI' import { useAsyncFn } from 'react-use' import Service from '../../../../service' @@ -25,7 +25,7 @@ const AccountDetail = memo(() => { if (!selectedAccount?.identifier) return if ( - SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID.includes(selectedAccount.identifier.network) && + SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID.includes(selectedAccount.identifier.network as EnhanceableSite) && selectedAccount.is_valid ) { setOpen(true) diff --git a/packages/mask/src/extension/popups/pages/Personas/Accounts/index.tsx b/packages/mask/src/extension/popups/pages/Personas/Accounts/index.tsx index 35a18aaf4483..61647a9de17d 100644 --- a/packages/mask/src/extension/popups/pages/Personas/Accounts/index.tsx +++ b/packages/mask/src/extension/popups/pages/Personas/Accounts/index.tsx @@ -33,7 +33,7 @@ const Accounts = memo(() => { ...profile, platform: target?.platform, identity: target?.identity, - is_valid: SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID.includes(profile.identifier.network) + is_valid: SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID.includes(profile.identifier.network as EnhanceableSite) ? target?.is_valid : true, } diff --git a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx index e81ac152284e..828e95446a95 100644 --- a/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx +++ b/packages/mask/src/plugins/ITO/SNSAdaptor/CompositionDialog.tsx @@ -5,7 +5,7 @@ import { makeStyles } from '@masknet/theme' import { useI18N } from '../../../utils' import { useCurrentIdentity } from '../../../components/DataSource/useActivatedUI' import { useRemoteControlledDialog } from '@masknet/shared-base-ui' -import { InjectedDialog, InjectedDialogProps, MINDS_ID } from '@masknet/shared' +import { InjectedDialog, InjectedDialogProps } from '@masknet/shared' import { ITO_MetaKey_2, MSG_DELIMITER } from '../constants' import { DialogTabs, JSON_PayloadInMask } from '../types' import { CreateForm } from './CreateForm' @@ -21,6 +21,7 @@ import { WalletMessages } from '../../Wallet/messages' import { omit, set } from 'lodash-unified' import { useCompositionContext } from '@masknet/plugin-infra/content-script' import { activatedSocialNetworkUI } from '../../../social-network' +import { EnhanceableSite } from '@masknet/shared-base' interface StyleProps { snsId: string @@ -28,7 +29,7 @@ interface StyleProps { const useStyles = makeStyles()((theme, { snsId }) => ({ content: { - ...(snsId === MINDS_ID ? { minWidth: 600 } : {}), + ...(snsId === EnhanceableSite.Minds ? { minWidth: 600 } : {}), position: 'relative', paddingTop: 50, }, diff --git a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx index 60b0327f3878..cdc94626b9c1 100644 --- a/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx +++ b/packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketCreateNew.tsx @@ -1,5 +1,4 @@ import { makeStyles } from '@masknet/theme' -import { MINDS_ID } from '@masknet/shared' import { useChainId, ChainId } from '@masknet/web3-shared-evm' import { RedPacketFormProps, RedPacketERC20Form } from './RedPacketERC20Form' import { RedPacketERC721Form } from './RedPacketERC721Form' @@ -7,6 +6,7 @@ import AbstractTab, { AbstractTabProps } from '../../../components/shared/Abstra import { useI18N } from '../../../utils' import { activatedSocialNetworkUI } from '../../../social-network' import { IconURLs } from './IconURL' +import { EnhanceableSite } from '@masknet/shared-base' interface StyleProps { snsId: string @@ -21,7 +21,7 @@ const useStyles = makeStyles()((theme, { snsId }) => ({ tabs: { height: 36, minHeight: 36, - margin: `0 ${snsId === MINDS_ID ? '12px' : 'auto'}`, + margin: `0 ${snsId === EnhanceableSite.Minds ? '12px' : 'auto'}`, borderRadius: 4, backgroundColor: theme.palette.background.default, '& .Mui-selected': { diff --git a/packages/mask/src/social-network-adaptor/instagram.com/base.ts b/packages/mask/src/social-network-adaptor/instagram.com/base.ts index 3135f0cde0c2..1c9441b11e06 100644 --- a/packages/mask/src/social-network-adaptor/instagram.com/base.ts +++ b/packages/mask/src/social-network-adaptor/instagram.com/base.ts @@ -1,17 +1,17 @@ -import { INSTAGRAM_ID } from '@masknet/shared' import { SocialNetworkEnum } from '@masknet/encryption' import type { SocialNetwork, SocialNetworkWorker } from '../../social-network/types' +import { EnhanceableSite } from '@masknet/shared-base' const origins = ['https://www.instagram.com/*', 'https://m.instagram.com/*', 'https://instagram.com/*'] export const instagramBase: SocialNetwork.Base = { - networkIdentifier: INSTAGRAM_ID, + networkIdentifier: EnhanceableSite.Instagram, encryptionNetwork: SocialNetworkEnum.Instagram, declarativePermissions: { origins }, shouldActivate(location) { - return location.host.endsWith(INSTAGRAM_ID) + return location.host.endsWith(EnhanceableSite.Instagram) }, } export const instagramWorkerBase: SocialNetworkWorker.WorkerBase & SocialNetwork.Base = { ...instagramBase, - gunNetworkHint: INSTAGRAM_ID, + gunNetworkHint: EnhanceableSite.Instagram, } diff --git a/packages/mask/src/social-network-adaptor/minds.com/base.ts b/packages/mask/src/social-network-adaptor/minds.com/base.ts index 33027b5eb400..4d2175d8402c 100644 --- a/packages/mask/src/social-network-adaptor/minds.com/base.ts +++ b/packages/mask/src/social-network-adaptor/minds.com/base.ts @@ -1,10 +1,10 @@ -import { MINDS_ID } from '@masknet/shared' import { SocialNetworkEnum } from '@masknet/encryption' import type { SocialNetwork, SocialNetworkWorker } from '../../social-network/types' +import { EnhanceableSite } from '@masknet/shared-base' const origins = ['https://www.minds.com/*', 'https://minds.com/*', 'https://cdn.minds.com/*'] export const mindsBase: SocialNetwork.Base = { - networkIdentifier: MINDS_ID, + networkIdentifier: EnhanceableSite.Minds, encryptionNetwork: SocialNetworkEnum.Minds, declarativePermissions: { origins }, shouldActivate(location) { @@ -13,7 +13,7 @@ export const mindsBase: SocialNetwork.Base = { } export function isMinds(ui: SocialNetwork.Base) { - return ui.networkIdentifier === MINDS_ID + return ui.networkIdentifier === EnhanceableSite.Minds } export const mindsWorkerBase: SocialNetworkWorker.WorkerBase & SocialNetwork.Base = { diff --git a/packages/mask/src/social-network-adaptor/opensea.io/base.ts b/packages/mask/src/social-network-adaptor/opensea.io/base.ts index 4e32a6a4a87b..dd3c9cee793b 100644 --- a/packages/mask/src/social-network-adaptor/opensea.io/base.ts +++ b/packages/mask/src/social-network-adaptor/opensea.io/base.ts @@ -1,14 +1,14 @@ -import { OPENSEA_ID } from '@masknet/shared' import { SocialNetworkEnum } from '@masknet/encryption' import type { SocialNetwork, SocialNetworkWorker } from '../../social-network/types' +import { EnhanceableSite } from '@masknet/shared-base' const origins = ['https://opensea.io/*'] export const openseaBase: SocialNetwork.Base = { - networkIdentifier: OPENSEA_ID, + networkIdentifier: EnhanceableSite.OpenSea, encryptionNetwork: SocialNetworkEnum.Unknown, declarativePermissions: { origins }, shouldActivate(location) { - return location.host.endsWith(OPENSEA_ID) + return location.host.endsWith(EnhanceableSite.OpenSea) }, notReadyForProduction: true, } diff --git a/packages/mask/src/social-network-adaptor/twitter.com/base.ts b/packages/mask/src/social-network-adaptor/twitter.com/base.ts index a90412694e6f..961d7087a648 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/base.ts +++ b/packages/mask/src/social-network-adaptor/twitter.com/base.ts @@ -1,10 +1,10 @@ -import { TWITTER_ID } from '@masknet/shared' import { SocialNetworkEnum } from '@masknet/encryption' import type { SocialNetwork, SocialNetworkWorker } from '../../social-network/types' +import { EnhanceableSite } from '@masknet/shared-base' const origins = ['https://mobile.twitter.com/*', 'https://twitter.com/*'] export const twitterBase: SocialNetwork.Base = { - networkIdentifier: TWITTER_ID, + networkIdentifier: EnhanceableSite.Twitter, encryptionNetwork: SocialNetworkEnum.Twitter, declarativePermissions: { origins }, shouldActivate(location) { @@ -13,7 +13,7 @@ export const twitterBase: SocialNetwork.Base = { } export function isTwitter(ui: SocialNetwork.Base) { - return ui.networkIdentifier === TWITTER_ID + return ui.networkIdentifier === EnhanceableSite.Twitter } export const twitterWorkerBase: SocialNetworkWorker.WorkerBase & SocialNetwork.Base = { diff --git a/packages/shared/src/constants.tsx b/packages/shared/src/constants.tsx index af400c7a02c7..ff70cd04ccf4 100644 --- a/packages/shared/src/constants.tsx +++ b/packages/shared/src/constants.tsx @@ -10,38 +10,36 @@ import { InstagramRoundIcon, MindsRoundIcon, } from '@masknet/icons' - -export const MINDS_ID = 'minds.com' -export const FACEBOOK_ID = 'facebook.com' -export const TWITTER_ID = 'twitter.com' -export const INSTAGRAM_ID = 'instagram.com' -export const OPENSEA_ID = 'opensea.io' +import { EnhanceableSite } from '@masknet/shared-base' export const SOCIAL_MEDIA_ICON_MAPPING: Record = { - [TWITTER_ID]: , - [FACEBOOK_ID]: , - [MINDS_ID]: , - [INSTAGRAM_ID]: , - [OPENSEA_ID]: , + [EnhanceableSite.Twitter]: , + [EnhanceableSite.Facebook]: , + [EnhanceableSite.Minds]: , + [EnhanceableSite.Instagram]: , + [EnhanceableSite.OpenSea]: , + [EnhanceableSite.Localhost]: null, } export const SOCIAL_MEDIA_ROUND_ICON_MAPPING: Record = { - [TWITTER_ID]: , - [FACEBOOK_ID]: , - [MINDS_ID]: , - [INSTAGRAM_ID]: , - [OPENSEA_ID]: , + [EnhanceableSite.Twitter]: , + [EnhanceableSite.Facebook]: , + [EnhanceableSite.Minds]: , + [EnhanceableSite.Instagram]: , + [EnhanceableSite.OpenSea]: , + [EnhanceableSite.Localhost]: null, } export const SOCIAL_MEDIA_NAME: Record = { - [TWITTER_ID]: 'Twitter', - [FACEBOOK_ID]: 'Facebook', - [MINDS_ID]: 'Mind', - [INSTAGRAM_ID]: 'Instagram', - [OPENSEA_ID]: 'OpenSea', + [EnhanceableSite.Twitter]: 'Twitter', + [EnhanceableSite.Facebook]: 'Facebook', + [EnhanceableSite.Minds]: 'Mind', + [EnhanceableSite.Instagram]: 'Instagram', + [EnhanceableSite.OpenSea]: 'OpenSea', + [EnhanceableSite.Localhost]: 'Localhost', } -export const SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID = [TWITTER_ID] +export const SOCIAL_MEDIA_SUPPORTING_NEXT_DOT_ID = [EnhanceableSite.Twitter] export const mediaViewerUrl = 'https://media-viewer.r2d2.to/index.html' diff --git a/packages/shared/src/contexts/evm/TokenPicker/SelectTokenDialog.tsx b/packages/shared/src/contexts/evm/TokenPicker/SelectTokenDialog.tsx index 37c841bc85e3..f67432f8e304 100644 --- a/packages/shared/src/contexts/evm/TokenPicker/SelectTokenDialog.tsx +++ b/packages/shared/src/contexts/evm/TokenPicker/SelectTokenDialog.tsx @@ -1,4 +1,4 @@ -import { EMPTY_LIST } from '@masknet/shared-base' +import { EMPTY_LIST, EnhanceableSite } from '@masknet/shared-base' import { ERC20TokenList, useSharedI18N } from '@masknet/shared' import { makeStyles, MaskColorVar } from '@masknet/theme' import { ChainId, FungibleTokenDetailed, useTokenConstants } from '@masknet/web3-shared-evm' @@ -7,7 +7,6 @@ import { ChainId, FungibleTokenDetailed, useTokenConstants } from '@masknet/web3 import { DialogContent, Theme, useMediaQuery } from '@mui/material' import type { FC } from 'react' import { useBaseUIRuntime } from '../../base' -import { MINDS_ID } from '../../../constants' import { InjectedDialog } from '../../components' import { useRowSize } from './useRowSize' @@ -73,7 +72,7 @@ export const SelectTokenDialog: FC = ({ const t = useSharedI18N() const isDashboard = location.href.includes('dashboard.html') const { networkIdentifier } = useBaseUIRuntime() - const compact = networkIdentifier === MINDS_ID + const compact = networkIdentifier === EnhanceableSite.Minds const { classes } = useStyles({ compact, disablePaddingTop: isDashboard }) const { NATIVE_TOKEN_ADDRESS } = useTokenConstants(chainId) // eslint-disable-next-line import/no-deprecated