From 593511f02d3b96ef119097222fd1ebb6d90dcecd Mon Sep 17 00:00:00 2001
From: lelenei <zwpsky@gmail.com>
Date: Tue, 8 Feb 2022 09:53:23 +0800
Subject: [PATCH 1/3] fix: improve nft avatar

---
 .../src/plugins/Avatar/SNSAdaptor/NFTAvatarRing.tsx   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatarRing.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatarRing.tsx
index e54532753bbf..bcdd0bc65bad 100644
--- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatarRing.tsx
+++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatarRing.tsx
@@ -20,7 +20,7 @@ export function NFTAvatarRing(props: NFTAvatarRingProps) {
     const { classes } = useStyles()
     const { stroke, strokeWidth, fontSize, text, width, id, price } = props
 
-    const avatarSize = width + 3
+    const avatarSize = width + 1
     const R = avatarSize / 2
     const path_r = R - strokeWidth + fontSize / 2
     const x1 = R - path_r
@@ -59,7 +59,14 @@ export function NFTAvatarRing(props: NFTAvatarRingProps) {
                     </linearGradient>
                 </defs>
 
-                <circle cx={R} cy={R} r={R - strokeWidth / 2} fill="none" stroke={stroke} strokeWidth={strokeWidth} />
+                <circle
+                    cx={R}
+                    cy={R}
+                    r={R - strokeWidth / 2 + 1}
+                    fill="none"
+                    stroke={stroke}
+                    strokeWidth={strokeWidth}
+                />
                 <pattern id={`${id}-pattern`} x="0" y="0" width="300%" height="100%" patternUnits="userSpaceOnUse">
                     <circle cx={R} cy={R} r={R} fill={`url(#${id}-gradient)`}>
                         <animateTransform

From f1164bfc5ed7b810d8df44bf03b4adbb88646c05 Mon Sep 17 00:00:00 2001
From: lelenei <zwpsky@gmail.com>
Date: Tue, 8 Feb 2022 11:47:26 +0800
Subject: [PATCH 2/3] fix: show wallet address in nft avatar dialog

---
 packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx
index 9ce173214959..ddf4a032b2a5 100644
--- a/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx
+++ b/packages/mask/src/plugins/Avatar/SNSAdaptor/NFTAvatar.tsx
@@ -7,8 +7,6 @@ import {
     ChainId,
     SocketState,
     ERC721TokenDetailed,
-    formatEthereumAddress,
-    useAccount,
     useChainId,
     useCollectibles,
     useImageChecker,
@@ -18,6 +16,7 @@ import { useI18N } from '../../../utils'
 import { EthereumChainBoundary } from '../../../web3/UI/EthereumChainBoundary'
 import { AddNFT } from './AddNFT'
 import { NFTImage } from './NFTImage'
+import { useAccount, useWeb3State } from '@masknet/plugin-infra'
 
 const useStyles = makeStyles()((theme) => ({
     root: {},
@@ -99,6 +98,7 @@ export function NFTAvatar(props: NFTAvatarProps) {
     const [open_, setOpen_] = useState(false)
     const [collectibles_, setCollectibles_] = useState<ERC721TokenDetailed[]>([])
     const { t } = useI18N()
+    const { Utils } = useWeb3State()
     const { data: collectibles, error, retry, state } = useCollectibles(account, ChainId.Mainnet)
 
     const onClick = useCallback(async () => {
@@ -140,7 +140,7 @@ export function NFTAvatar(props: NFTAvatarProps) {
                     </Typography>
                     {account ? (
                         <Typography variant="body1" color="textPrimary" className={classes.account}>
-                            {t('nft_wallet_label')}: {formatEthereumAddress(account, 4)}
+                            {t('nft_wallet_label')}: {Utils?.formatAddress?.(account, 4) || account}
                             <Button
                                 variant="text"
                                 onClick={openSelectProviderDialog}

From d4706a9dcb93406b65990982081e764c49bf6f52 Mon Sep 17 00:00:00 2001
From: lelenei <zwpsky@gmail.com>
Date: Tue, 8 Feb 2022 12:06:42 +0800
Subject: [PATCH 3/3] fix: jump to opensea

---
 .../twitter.com/injection/NFT/NFTAvatarInTwitter.tsx           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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 2290df01fe10..c50ef6a2484a 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
@@ -189,8 +189,7 @@ function NFTAvatarInTwitter() {
 
     useUpdateEffect(() => {
         const linkParentDom = searchTwitterAvatarLinkSelector().evaluate()?.closest('div')
-
-        if (!avatar || !linkParentDom) return
+        if (!avatar || !linkParentDom || !showAvatar) return
 
         const handler = () => {
             window.open(resolveOpenSeaLink(avatar.address, avatar.tokenId), '_blank')