From a0910bf9257347f409ca7830ba8a70c9b9b7bade Mon Sep 17 00:00:00 2001
From: Wukong Sun <swkatmask@gmail.com>
Date: Tue, 11 Mar 2025 17:06:22 +0800
Subject: [PATCH 1/4] fix: mf-6659 skip hidden content during extract post
 message

---
 .../site-adaptors/twitter.com/utils/fetch.ts  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/packages/mask/content-script/site-adaptors/twitter.com/utils/fetch.ts b/packages/mask/content-script/site-adaptors/twitter.com/utils/fetch.ts
index 84ff7653bedc..7a273cdb8443 100644
--- a/packages/mask/content-script/site-adaptors/twitter.com/utils/fetch.ts
+++ b/packages/mask/content-script/site-adaptors/twitter.com/utils/fetch.ts
@@ -97,12 +97,28 @@ function resolveType(content: string) {
     return 'normal'
 }
 
+function getVisibleText(node: Node) {
+    if (node.nodeType === Node.TEXT_NODE) return node.textContent
+    if (node.nodeType !== Node.ELEMENT_NODE) return ''
+    if (
+        (node as Element).getAttribute('aria-hidden') === 'true' && // getBoundingClientRect() causes layout, getAttribute() is cheaper
+        (node as Element).getBoundingClientRect().width === 0
+    )
+        return ''
+    let text = ''
+    for (const child of node.childNodes) {
+        text += getVisibleText(child)
+    }
+    return text
+}
+
 export function postContentMessageParser(node: HTMLElement): TypedMessage {
     function make(node: Node): TypedMessage {
         if (node.nodeType === Node.TEXT_NODE) {
             if (!node.nodeValue) return makeTypedMessageEmpty()
             return makeTypedMessageText(node.nodeValue, getElementStyle(node.parentElement))
-        } else if (node instanceof HTMLAnchorElement) {
+        }
+        if (node instanceof HTMLAnchorElement) {
             const anchor = node
             const href = anchor.getAttribute('title') ?? anchor.getAttribute('href')
             if (href?.includes('/photo/')) {
@@ -131,7 +147,7 @@ export function postContentMessageParser(node: HTMLElement): TypedMessage {
                     makeTypedMessageEmpty(),
                 )
             }
-            const content = anchor.textContent
+            const content = getVisibleText(anchor)
             if (!content) return makeTypedMessageEmpty()
             const altImage = node.querySelector('img')
             return makeTypedMessageAnchor(

From bac57e54df1e6ca3753aeb35bb6b098295460e92 Mon Sep 17 00:00:00 2001
From: Wukong Sun <swkatmask@gmail.com>
Date: Tue, 11 Mar 2025 17:53:29 +0800
Subject: [PATCH 2/4] fix: mf-6658 address in link

---
 .../SiteAdaptor/components/LinkModifier.tsx   | 33 +++++++++++--
 .../SiteAdaptor/components/TextModifier.tsx   | 49 +++++--------------
 .../SiteAdaptor/components/WarningCard.tsx    |  8 ++-
 .../src/SiteAdaptor/hooks/useCheckLink.ts     | 38 ++++++++++++++
 .../src/SiteAdaptor/hooks/useDetectAddress.ts | 31 ++++++++++++
 packages/plugins/ScamWarning/src/constants.ts |  4 ++
 packages/plugins/ScamWarning/src/utils.ts     | 10 ++++
 .../web3-constants/evm/nft-red-packet.json    |  6 +--
 8 files changed, 133 insertions(+), 46 deletions(-)
 create mode 100644 packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useCheckLink.ts
 create mode 100644 packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useDetectAddress.ts

diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
index 7d1ec568b929..216efe204bec 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
@@ -10,6 +10,9 @@ import { usePopoverControl } from './usePopoverControl.js'
 import { WarningCard } from './WarningCard.js'
 import { SecurityProvider } from '../../constants.js'
 import { GoPlusLabs } from '@masknet/web3-providers'
+import { extractAddresses } from '../../utils.js'
+import { useDetectAddress } from '../hooks/useDetectAddress.js'
+import { AddressTag } from './TextModifier.js'
 
 const useStyles = makeStyles()({
     link: {
@@ -19,6 +22,9 @@ const useStyles = makeStyles()({
         gap: 4,
         verticalAlign: 'bottom',
     },
+    address: {
+        display: 'contents',
+    },
     icon: {
         width: 18,
         height: 18,
@@ -26,20 +32,20 @@ const useStyles = makeStyles()({
         overflow: 'hidden',
         cursor: 'pointer',
     },
-})
+}))
 
 function isTCO(url: string | null) {
     if (!url) return false
     return url.startsWith('https://t.co/')
 }
 
-export const LinkModifier = memo<PropsOf<Plugin.SiteAdaptor.Definition['LinkModifier']>>(function ModifyLink({
+export const LinkModifier = memo<PropsOf<Plugin.SiteAdaptor.Definition['LinkModifier']>>(function LinkModifier({
     fallback,
     ...props
 }) {
     const { classes } = useStyles()
     const { data } = useQuery({
-        queryKey: ['scam-warning', 'check-link', props.href],
+        queryKey: ['scam-warning', 'check-link', props.href, props.children],
         queryFn: async () => {
             const resolvedLink = isTCO(props.href) ? await resolveTCOLink(props.href) : props.href
             if (!resolvedLink) return { isScam: false }
@@ -50,16 +56,35 @@ export const LinkModifier = memo<PropsOf<Plugin.SiteAdaptor.Definition['LinkModi
                     provider: SecurityProvider.GoPlus,
                     resolvedLink,
                 }
+            const isEllipsis = props.children.endsWith('…')
+            // We assume that the link contains only one address
+            const address = isEllipsis ? extractAddresses(resolvedLink, true)[0] : undefined
+
             return {
                 isScam: await PluginScamRPC.checkUrl(resolvedLink),
                 provider: SecurityProvider.ScamSniffer,
                 resolvedLink,
+                address,
             }
         },
     })
+    const { data: detected } = useDetectAddress(data?.address, data?.isScam === false)
     const { open, anchorEl, iconRef, onMouseEnter, onMouseLeave } = usePopoverControl()
 
-    if (!data?.isScam) return fallback
+    if (!data?.isScam) {
+        if (detected?.isScam) {
+            return (
+                <span className={classes.link}>
+                    <AddressTag className={classes.address} address={data!.address!} nested text="" />
+                    <Link href={props.href} target="_blank" rel="noopener noreferrer" fontSize="inherit">
+                        {props.children}
+                        {props.suggestedPostImage}
+                    </Link>
+                </span>
+            )
+        }
+        return fallback
+    }
 
     return (
         <span className={classes.link}>
diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
index 7bb29ef994ba..f56e168265c9 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
@@ -1,16 +1,11 @@
 import { Icons } from '@masknet/icons'
 import type { Plugin } from '@masknet/plugin-infra'
 import { makeStyles, ShadowRootPopper } from '@masknet/theme'
-import { GoPlusLabs } from '@masknet/web3-providers'
-import { isValidAddress } from '@masknet/web3-shared-evm'
-import { isValidAddress as isSolAddress } from '@masknet/web3-shared-solana'
-import { useQuery } from '@tanstack/react-query'
 import { Fragment, memo, useMemo } from 'react'
-import { EVM_ADDRESS, SecurityProvider, SOLANA_ADDRESS, TRON_ADDRESS } from '../../constants.js'
-import { PluginScamRPC } from '../../messages.js'
-import { isTronAddress } from '../../utils.js'
+import { extractAddresses } from '../../utils.js'
 import { usePopoverControl } from './usePopoverControl.js'
 import { WarningCard } from './WarningCard.js'
+import { useDetectAddress } from '../hooks/useDetectAddress.js'
 
 const useStyles = makeStyles()({
     text: {
@@ -27,40 +22,25 @@ const useStyles = makeStyles()({
         overflow: 'hidden',
         cursor: 'pointer',
     },
-})
+}))
 
 type TextModifierProps = PropsOf<Plugin.SiteAdaptor.Definition['TextModifier']>
 
 interface AddressTagProps {
     address: string
     text: string
+    nested?: boolean
+    className?: string
 }
 
-const AddressTag = memo<AddressTagProps>(function AddressTag({ address, text }) {
-    const { classes } = useStyles()
+export const AddressTag = memo<AddressTagProps>(function AddressTag({ address, text, className, nested }) {
+    const { classes, cx } = useStyles()
     const { open, anchorEl, iconRef, onMouseEnter, onMouseLeave } = usePopoverControl()
-    const { data } = useQuery({
-        queryKey: ['detect-address', address],
-        queryFn: async () => {
-            if (isValidAddress(address)) {
-                return { isScam: await PluginScamRPC.checkAddress(address), provider: SecurityProvider.ScamSniffer }
-            }
-            if (isSolAddress(address))
-                return {
-                    isScam: await GoPlusLabs.checkIfAddressIsScam('solana', address),
-                    provider: SecurityProvider.GoPlus,
-                }
-            if (isTronAddress(address))
-                return {
-                    isScam: GoPlusLabs.checkIfAddressIsScam('tron', address),
-                    provider: SecurityProvider.GoPlus,
-                }
-            return { isScam: false, provider: null }
-        },
-    })
+    const { data } = useDetectAddress(address)
+
     if (!data?.isScam) return text
     return (
-        <span className={classes.text}>
+        <span className={cx(classes.text, className)}>
             <Icons.Danger
                 size={18}
                 className={classes.icon}
@@ -68,7 +48,7 @@ const AddressTag = memo<AddressTagProps>(function AddressTag({ address, text })
                 onMouseEnter={onMouseEnter}
                 onMouseLeave={onMouseLeave}
             />
-            {address}
+            {nested ? null : address}
             <ShadowRootPopper open={open} anchorEl={anchorEl}>
                 <WarningCard
                     address={address}
@@ -88,12 +68,7 @@ interface Segment {
 }
 
 export const TextModifier = memo<TextModifierProps>(function TextModifier({ fallback, children: fullText }) {
-    const addresses = useMemo(() => {
-        const evmAddresses = fullText.match(EVM_ADDRESS) || []
-        const solAddresses = fullText.match(SOLANA_ADDRESS) || []
-        const tronAddresses = fullText.match(TRON_ADDRESS) || []
-        return [...evmAddresses, ...solAddresses, ...tronAddresses]
-    }, [fullText])
+    const addresses = useMemo(() => extractAddresses(fullText), [fullText])
 
     const segments = useMemo(() => {
         let leftOffset = 0
diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
index ee9cc29946f2..8fd3fd2e13db 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
@@ -65,6 +65,7 @@ const useStyles = makeStyles()((theme) => ({
         minWidth: 0,
         textOverflow: 'ellipsis',
         overflow: 'hidden',
+        whiteSpace: 'nowrap',
     },
     link: {
         textDecoration: 'underline',
@@ -130,10 +131,13 @@ export const WarningCard = memo(function WarningCard({ link, address, securityPr
             </div>
             <div className={classes.content}>
                 {link ?
-                    <a className={cx(classes.link, classes.target)} href={link}>
+                    <a className={cx(classes.link, classes.target)} href={link} title={link}>
                         {link}
                     </a>
-                :   <Typography className={classes.target}>{address}</Typography>}
+                :   <Typography className={classes.target} title={address}>
+                        {address}
+                    </Typography>
+                }
                 <Button variant="text" className={classes.reportButton}>
                     {isReporting ?
                         <LoadingBase size={16} />
diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useCheckLink.ts b/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useCheckLink.ts
new file mode 100644
index 000000000000..b26ce099eea0
--- /dev/null
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useCheckLink.ts
@@ -0,0 +1,38 @@
+import { resolveTCOLink } from '@masknet/plugin-infra/dom/context'
+import { GoPlusLabs } from '@masknet/web3-providers'
+import { useQuery } from '@tanstack/react-query'
+import { SecurityProvider } from '../../constants.js'
+import { PluginScamRPC } from '../../messages.js'
+import { extractAddresses } from '../../utils.js'
+
+function isTCO(url: string | null) {
+    if (!url) return false
+    return url.startsWith('https://t.co/')
+}
+
+export function useCheckLink(link: string, text: string) {
+    return useQuery({
+        queryKey: ['scam-warning', 'check-link', link, text],
+        queryFn: async () => {
+            const resolvedLink = isTCO(link) ? await resolveTCOLink(link) : link
+            if (!resolvedLink) return { isScam: false }
+            const result = await GoPlusLabs.checkIsPhishingSite(resolvedLink)
+            if (result)
+                return {
+                    isScam: result,
+                    provider: SecurityProvider.GoPlus,
+                    resolvedLink,
+                }
+            const isEllipsis = text.endsWith('…')
+            // We assume that the link contains only one address
+            const address = isEllipsis ? extractAddresses(resolvedLink)[0] : undefined
+
+            return {
+                isScam: await PluginScamRPC.checkUrl(resolvedLink),
+                provider: SecurityProvider.ScamSniffer,
+                resolvedLink,
+                address,
+            }
+        },
+    })
+}
diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useDetectAddress.ts b/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useDetectAddress.ts
new file mode 100644
index 000000000000..48cab02f0438
--- /dev/null
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/hooks/useDetectAddress.ts
@@ -0,0 +1,31 @@
+import { GoPlusLabs } from '@masknet/web3-providers'
+import { isValidAddress } from '@masknet/web3-shared-evm'
+import { isValidAddress as isSolAddress } from '@masknet/web3-shared-solana'
+import { useQuery } from '@tanstack/react-query'
+import { SecurityProvider } from '../../constants.js'
+import { PluginScamRPC } from '../../messages.js'
+import { isTronAddress } from '../../utils.js'
+
+export function useDetectAddress(address: string | null | undefined, enabled = true) {
+    return useQuery({
+        enabled: !!address && enabled,
+        queryKey: ['detect-address', address],
+        queryFn: async () => {
+            if (!address) return null
+            if (isValidAddress(address)) {
+                return { isScam: await PluginScamRPC.checkAddress(address), provider: SecurityProvider.ScamSniffer }
+            }
+            if (isSolAddress(address))
+                return {
+                    isScam: await GoPlusLabs.checkIfAddressIsScam('solana', address),
+                    provider: SecurityProvider.GoPlus,
+                }
+            if (isTronAddress(address))
+                return {
+                    isScam: GoPlusLabs.checkIfAddressIsScam('tron', address),
+                    provider: SecurityProvider.GoPlus,
+                }
+            return { isScam: false, provider: null }
+        },
+    })
+}
diff --git a/packages/plugins/ScamWarning/src/constants.ts b/packages/plugins/ScamWarning/src/constants.ts
index 2b9b92469814..18f94f0122e8 100644
--- a/packages/plugins/ScamWarning/src/constants.ts
+++ b/packages/plugins/ScamWarning/src/constants.ts
@@ -8,6 +8,10 @@ export const EVM_ADDRESS = /(^|\s)(0x[a-fA-F0-9]{40})/gu
 export const SOLANA_ADDRESS = /(^|\s)([1-9A-HJ-NP-Za-km-z]{32,44})/gu
 export const TRON_ADDRESS = /(^|\s)(T[A-Za-z1-9]{33})/gu
 
+export const EXIST_EVM_ADDRESS = /\b(0x[a-fA-F0-9]{40})/gu
+export const EXIST_SOLANA_ADDRESS = /\b([1-9A-HJ-NP-Za-km-z]{32,44})/gu
+export const EXIST_TRON_ADDRESS = /\b(T[A-Za-z1-9]{33})/gu
+
 export enum SecurityProvider {
     ScamSniffer = 'ScamSniffer',
     GoPlus = 'GoPlus',
diff --git a/packages/plugins/ScamWarning/src/utils.ts b/packages/plugins/ScamWarning/src/utils.ts
index edf05a7980d0..e2a769f33d12 100644
--- a/packages/plugins/ScamWarning/src/utils.ts
+++ b/packages/plugins/ScamWarning/src/utils.ts
@@ -1,3 +1,13 @@
+import { EVM_ADDRESS, SOLANA_ADDRESS } from '@masknet/plugin-scam-warning'
+import { EXIST_EVM_ADDRESS, EXIST_SOLANA_ADDRESS, EXIST_TRON_ADDRESS, TRON_ADDRESS } from './constants.js'
+
 export function isTronAddress(address: string) {
     return !!address.match(address)
 }
+
+export function extractAddresses(text: string, exist = false) {
+    const evmAddresses = text.match(exist ? EXIST_EVM_ADDRESS : EVM_ADDRESS) || []
+    const solAddresses = text.match(exist ? EXIST_SOLANA_ADDRESS : SOLANA_ADDRESS) || []
+    const tronAddresses = text.match(exist ? EXIST_TRON_ADDRESS : TRON_ADDRESS) || []
+    return [...evmAddresses, ...solAddresses, ...tronAddresses]
+}
diff --git a/packages/web3-constants/evm/nft-red-packet.json b/packages/web3-constants/evm/nft-red-packet.json
index 1294fd00f5c2..3b813e78db89 100644
--- a/packages/web3-constants/evm/nft-red-packet.json
+++ b/packages/web3-constants/evm/nft-red-packet.json
@@ -39,10 +39,10 @@
         "Base_Goerli": 0,
         "Polygon": 19131916,
         "Mumbai": 0,
-        "Arbitrum": 0,
+        "Arbitrum": 909051,
         "Arbitrum_Rinkeby": 0,
-        "xDai": 0,
-        "Optimism": 0,
+        "xDai": 18101937,
+        "Optimism": 2282849,
         "Optimism_Kovan": 0,
         "Optimism_Goerli": 0,
         "Avalanche": 0,

From 3327e6381ee6bd0df87052b1cccafbf7ffab7dbd Mon Sep 17 00:00:00 2001
From: Wukong Sun <swkatmask@gmail.com>
Date: Tue, 11 Mar 2025 17:53:52 +0800
Subject: [PATCH 3/4] fix: mf-6657 color scam address and link

---
 .../ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx  | 5 ++++-
 .../ScamWarning/src/SiteAdaptor/components/TextModifier.tsx  | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
index 216efe204bec..374c72771fe1 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/LinkModifier.tsx
@@ -14,13 +14,16 @@ import { extractAddresses } from '../../utils.js'
 import { useDetectAddress } from '../hooks/useDetectAddress.js'
 import { AddressTag } from './TextModifier.js'
 
-const useStyles = makeStyles()({
+const useStyles = makeStyles()((theme) => ({
     link: {
         whiteSpace: 'nowrap',
         display: 'inline-flex',
         alignItems: 'center',
         gap: 4,
         verticalAlign: 'bottom',
+        '& > a': {
+            color: theme.palette.maskColor.danger,
+        },
     },
     address: {
         display: 'contents',
diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
index f56e168265c9..1e2985ab8ede 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/TextModifier.tsx
@@ -7,13 +7,14 @@ import { usePopoverControl } from './usePopoverControl.js'
 import { WarningCard } from './WarningCard.js'
 import { useDetectAddress } from '../hooks/useDetectAddress.js'
 
-const useStyles = makeStyles()({
+const useStyles = makeStyles()((theme) => ({
     text: {
         whiteSpace: 'nowrap',
         display: 'inline-flex',
         alignItems: 'center',
         gap: 4,
         verticalAlign: 'bottom',
+        color: theme.palette.maskColor.danger,
     },
     icon: {
         width: 18,

From bd6be53c34ae224ffec25cd074d56d4908d2117c Mon Sep 17 00:00:00 2001
From: Wukong Sun <swkatmask@gmail.com>
Date: Tue, 11 Mar 2025 17:57:14 +0800
Subject: [PATCH 4/4] chore: remove report button

---
 .../SiteAdaptor/components/WarningCard.tsx    | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx b/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
index 8fd3fd2e13db..cc78123b851f 100644
--- a/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
+++ b/packages/plugins/ScamWarning/src/SiteAdaptor/components/WarningCard.tsx
@@ -1,9 +1,9 @@
 import { t } from '@lingui/core/macro'
 import { Trans } from '@lingui/react/macro'
 import { Icons } from '@masknet/icons'
-import { LoadingBase, makeStyles } from '@masknet/theme'
-import { Button, Typography } from '@mui/material'
-import { memo, useState, type HTMLProps } from 'react'
+import { makeStyles } from '@masknet/theme'
+import { Typography } from '@mui/material'
+import { memo, type HTMLProps } from 'react'
 import { SecurityProvider } from '../../constants.js'
 
 const useStyles = makeStyles()((theme) => ({
@@ -70,18 +70,6 @@ const useStyles = makeStyles()((theme) => ({
     link: {
         textDecoration: 'underline',
     },
-    reportButton: {
-        padding: theme.spacing(1, 0),
-        width: 60,
-        minWidth: 60,
-        textAlign: 'center',
-        alignItems: 'center',
-        justifyContent: 'center',
-        borderRadius: 32,
-        color: theme.palette.maskColor.main,
-        backgroundColor: theme.palette.maskColor.thirdMain,
-        marginLeft: 'auto',
-    },
     description: {
         fontFamily: 'Helvetica',
         borderRadius: 8,
@@ -102,7 +90,6 @@ interface Props extends HTMLProps<HTMLDivElement> {
 
 export const WarningCard = memo(function WarningCard({ link, address, securityProvider, ...rest }: Props) {
     const { classes, cx } = useStyles()
-    const [isReporting] = useState(false)
     return (
         <div {...rest} className={cx(classes.card, rest.className)}>
             <div className={classes.header}>
@@ -138,11 +125,6 @@ export const WarningCard = memo(function WarningCard({ link, address, securityPr
                         {address}
                     </Typography>
                 }
-                <Button variant="text" className={classes.reportButton}>
-                    {isReporting ?
-                        <LoadingBase size={16} />
-                    :   <Icons.Flag size={16} />}
-                </Button>
             </div>
             <Typography className={classes.description}>
                 <Trans>