diff --git a/cspell.json b/cspell.json index ba8f162b1d94..5fd132580974 100644 --- a/cspell.json +++ b/cspell.json @@ -107,7 +107,7 @@ "imtokenv2", "investables", "ipfs", - "IPFSHTTP", + "ipfshttp", "ipfsurl", "ittr", "jailbroken", diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTBadgeTimeline.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTBadgeTimeline.tsx index c0fc9965f087..76a453456ec8 100644 --- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTBadgeTimeline.tsx +++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTBadgeTimeline.tsx @@ -5,6 +5,7 @@ import { useNFTAvatar } from '../hooks' import type { AvatarMetaDB } from '../types' import { RainbowBox } from './RainbowBox' import type { RSS3_KEY_SNS } from '../constants' +import { makeStyles } from '@masknet/theme' interface NFTBadgeTimelineProps extends withClasses<'root'> { userId: string @@ -14,11 +15,18 @@ interface NFTBadgeTimelineProps extends withClasses<'root'> { snsKey: RSS3_KEY_SNS } +const useStyles = makeStyles()(() => ({ + root: { + transform: 'scale(0.97)', + }, +})) + export function NFTBadgeTimeline(props: NFTBadgeTimelineProps) { const { userId, avatarId, width, height, snsKey } = props const { loading, value: _avatar } = useNFTAvatar(userId, snsKey) const [avatar, setAvatar] = useState() const [avatarId_, setAvatarId_] = useState('') + const { classes } = useStyles() const onUpdate = (data: AvatarMetaDB) => { if (!data.address || !data.tokenId) { @@ -42,5 +50,9 @@ export function NFTBadgeTimeline(props: NFTBadgeTimelineProps) { if (!avatar) return null if (avatarId_ && avatar.avatarId !== avatarId_) return null - return loading ? : + return loading ? ( + + ) : ( + + ) } diff --git a/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/NFTAvatarInTwitter.tsx b/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/NFTAvatarInTwitter.tsx index 5042b59cd486..af8342f51652 100644 --- a/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/NFTAvatarInTwitter.tsx +++ b/packages/mask/src/social-network-adaptor/twitter.com/injection/NFT/NFTAvatarInTwitter.tsx @@ -24,7 +24,7 @@ export function injectNFTAvatarInTwitter(signal: AbortSignal) { const useStyles = makeStyles()(() => ({ root: { - transform: 'scale(1.025)', + transform: 'scale(1.022)', position: 'absolute', textAlign: 'center', color: 'white', @@ -160,8 +160,8 @@ function NFTAvatarInTwitter() { border: 2px solid #00f8ff; } ` - rainBowElement.current = linkDom.firstElementChild - if (showAvatar) linkDom.firstElementChild.classList.add('rainbowBorder') + rainBowElement.current = linkDom.firstElementChild.nextElementSibling + linkDom.firstElementChild.nextElementSibling?.classList.add('rainbowBorder') linkDom.appendChild(style) } } @@ -173,6 +173,8 @@ function NFTAvatarInTwitter() { if (borderElement.current && linkDom?.firstElementChild !== borderElement.current) { linkDom?.insertBefore(borderElement.current, linkDom.firstChild) + } + if (rainBowElement.current) { rainBowElement.current?.classList.remove('rainbowBorder') } } diff --git a/packages/web3-constants/evm/artblocks.json b/packages/web3-constants/evm/artblocks.json index ea5318c39057..b626e1dae9f6 100644 --- a/packages/web3-constants/evm/artblocks.json +++ b/packages/web3-constants/evm/artblocks.json @@ -12,6 +12,8 @@ "Arbitrum": "", "Arbitrum_Rinkeby": "", "xDai": "", + "Avalanche": "", + "Avalanche_Fuji": "", "Celo": "", "Fantom": "", "Aurora": "",