fixup! feat: mf-6358 migrate finance feed source to debank

DimensionDev · Oct 25, 2024 · 26a24ce · 26a24ce
1 parent 52a5703
commit 26a24ce
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 32 deletions.
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx
@@ -1,14 +1,16 @@
 import { Select, Trans } from '@lingui/macro'
-import { type Transaction } from '@masknet/web3-shared-base'
+import { isSameAddress, type Transaction } from '@masknet/web3-shared-base'
 import { Typography, type TypographyProps } from '@mui/material'
 import { memo } from 'react'
 import { makeStyles } from '@masknet/theme'
-import type { ChainId, SchemaType } from '@masknet/web3-shared-evm'
-import { AccountLabel } from '../components/common.js'
+import { formatAmount, type ChainId, type SchemaType } from '@masknet/web3-shared-evm'
+import { AccountLabel, Label } from '../components/common.js'
+import { useFeedOwner } from '../contexts/FeedOwnerContext.js'
 
 const useStyles = makeStyles<{ size: number }>()((theme) => ({
     summary: {
         display: 'flex',
+        flexWrap: 'wrap',
         gap: theme.spacing(0.5),
         alignItems: 'center',
     },
@@ -19,19 +21,39 @@ interface Props extends TypographyProps {
 }
 export const FeedSummary = memo<Props>(function FeedSummary({ transaction, ...rest }) {
     const { classes, cx } = useStyles({ size: 20 })
+    const owner = useFeedOwner()
+
+    const otherAddress = isSameAddress(owner.address, transaction.from) ? transaction.to : transaction.from
 
     return (
-        <Typography {...rest} className={cx(classes.summary, rest.className)}>
-            <Select
-                value={transaction.type}
-                other={
-                    <Trans>
-                        <AccountLabel address={transaction.from} />
-                        transferred to
-                        <AccountLabel address={transaction.to} />
-                    </Trans>
-                }
-            />
-        </Typography>
+        <>
+            {transaction.assets.map((asset, index) => {
+                return (
+                    <Typography key={index} component="div" {...rest} className={cx(classes.summary, rest.className)}>
+                        <Select
+                            value={asset.direction}
+                            _send={
+                                <Trans>
+                                    <AccountLabel address={owner.address} />
+                                    {transaction.cateName}
+                                    <AccountLabel address={otherAddress} />
+                                </Trans>
+                            }
+                            other={
+                                <Trans>
+                                    <AccountLabel address={owner.address} />
+                                    {transaction.cateName}{' '}
+                                    <Label>
+                                        {formatAmount(asset.amount)} {asset.name}
+                                    </Label>{' '}
+                                    from
+                                    <AccountLabel address={otherAddress} />
+                                </Trans>
+                            }
+                        />
+                    </Typography>
+                )
+            })}
+        </>
     )
 })
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FinanceFeed.tsx b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FinanceFeed.tsx
@@ -28,7 +28,6 @@ const useStyles = makeStyles()((theme) => ({
         fontWeight: 400,
         color: theme.palette.maskColor.third,
     },
-    body: {},
 }))
 
 export interface FinanceFeedProps extends HTMLProps<HTMLDivElement> {
@@ -55,10 +54,6 @@ export const FinanceFeed = memo<FinanceFeedProps>(function FinanceFeed({ transac
                 :   null}
             </div>
             <FeedSummary transaction={transaction} mt={0.5} />
-            <div className={classes.body}>
-                {transaction.type}
-                {transaction.cateName}
-            </div>
         </article>
     )
 })
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/useFinanceFeeds.ts b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/useFinanceFeeds.ts
@@ -17,7 +17,7 @@ export function useFinanceFeeds({ address }: Options) {
             :   skipToken,
         getNextPageParam: (lp) => lp.nextIndicator,
         select(data) {
-            return data.pages.flatMap((page) => page.data)
+            return data.pages.flatMap((page) => page.data).filter((x) => !x.isScam)
         },
     })
 }
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/SocialFeeds/FeedSummary.tsx b/packages/plugins/RSS3/src/SiteAdaptor/SocialFeeds/FeedSummary.tsx
@@ -1,10 +1,10 @@
 import { Select, Trans } from '@lingui/macro'
+import { Image } from '@masknet/shared'
+import { makeStyles } from '@masknet/theme'
 import type { Social } from '@masknet/web3-providers/types'
 import { Typography, type TypographyProps } from '@mui/material'
 import { memo } from 'react'
 import { Label } from '../components/common.js'
-import { Image } from '@masknet/shared'
-import { makeStyles } from '@masknet/theme'
 
 const useStyles = makeStyles<{ size: number }>()((theme, { size }) => ({
     summary: {
@@ -52,7 +52,7 @@ export const FeedSummary = memo<Props>(function FeedSummary({ post, ...rest }) {
     const pfp = post.author.pfp
 
     return (
-        <Typography {...rest} className={cx(classes.summary, rest.className)}>
+        <Typography component="div" {...rest} className={cx(classes.summary, rest.className)}>
             <Select
                 value={post.type}
                 _Post={

diff --git a/packages/plugins/RSS3/src/SiteAdaptor/components/common.tsx b/packages/plugins/RSS3/src/SiteAdaptor/components/common.tsx
@@ -62,7 +62,7 @@ export function AccountLabel({
         :   <Label className={className} {...rest} />
     return (
         <>
-            <UserAvatar identity={reversed || address} style={{ marginRight: 6 }} />
+            <UserAvatar identity={reversed || address} />
             {label}
         </>
     )

diff --git a/packages/plugins/RSS3/src/SiteAdaptor/index.tsx b/packages/plugins/RSS3/src/SiteAdaptor/index.tsx
@@ -102,6 +102,9 @@ const FinanceTabConfig: Plugin.SiteAdaptor.ProfileTab = {
             return <FinanceFeeds address={socialAccount?.address} />
         },
     },
+    Utils: {
+        shouldDisplay,
+    },
 }
 
 const LegacyFinanceTabConfig = createProfileTabConfig({
@@ -197,6 +200,11 @@ const SocialTabConfigInSearchResult: Plugin.SiteAdaptor.SearchResultTab = {
             )
         },
     },
+    Utils: {
+        shouldDisplay(result) {
+            return [SearchResultType.Domain, SearchResultType.EOA].includes(result.type)
+        },
+    },
 }
 
 const site: Plugin.SiteAdaptor.Definition = {

diff --git a/packages/web3-providers/src/DeBank/helpers.ts b/packages/web3-providers/src/DeBank/helpers.ts
@@ -94,7 +94,7 @@ function toTxAsset(
         schema,
         name: token.name || token.collection?.name || fallbackName,
         symbol: token.optimized_symbol || token.collection?.name || fallbackName,
-        address: token.decimals ? token_id : token.contract_id,
+        address: token.decimals ? token.contract_id : ZERO_ADDRESS,
         decimals: token.decimals || 1,
         direction,
         amount: amount?.toString(),

diff --git a/packages/web3-providers/src/DeBank/types.ts b/packages/web3-providers/src/DeBank/types.ts
@@ -69,6 +69,7 @@ export interface ProjectItem {
 export interface TokenItem {
     decimals: number
     display_symbol?: string
+    /** could be native token id, for example arb */
     id: string
     is_core: boolean
     is_swap_common?: boolean

diff --git a/packages/web3-shared/base/src/specs/index.ts b/packages/web3-shared/base/src/specs/index.ts
@@ -807,7 +807,7 @@ type TransactionAsset<ChainId, SchemaType> = Token<ChainId, SchemaType> & {
     name: string
     symbol: string
     amount: string
-    direction: string
+    direction: LiteralUnion<'send' | 'receive'>
 }
 
 export interface Transaction<ChainId, SchemaType> {

diff --git a/packages/web3-shared/evm/src/helpers/isValidDomain.ts b/packages/web3-shared/evm/src/helpers/isValidDomain.ts
@@ -1,6 +1,6 @@
 import punycode from 'punycode'
 
-const NAME_SERVICE_RE = /\.(eth|bnb|arb|lens)$/
+const NAME_SERVICE_RE = /\.(eth|bnb|arb|lens|zeta|mode|taiko|mint)$/
 const DOMAIN_RE = /^(?:[a-z0-9](?:[-a-z0-9]*[a-z0-9])?\.)+[a-z0-9][-a-z0-9]*[a-z0-9]$/u
 const ENS_SUBDOMAIN_RE = /\[.{64}?\]\.(?:[a-z0-9](?:[-a-z0-9]*[a-z0-9])?\.)+[a-z0-9][-a-z0-9]*[a-z0-9]$/u
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml