diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx index 8a60f18ae390..78c601701874 100644 --- 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(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 ( - - + + {transaction.cateName} + + + } + other={ + + + {transaction.cateName}{' '} + {' '} + from + + + } + /> + + ) + })} + ) }) diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FinanceFeed.tsx b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FinanceFeed.tsx index 7962ebc4c708..a536ddd8d025 100644 --- 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 { @@ -55,10 +54,6 @@ export const FinanceFeed = memo(function FinanceFeed({ transac : null} -
- {transaction.type} - {transaction.cateName} -
) }) diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/useFinanceFeeds.ts b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/useFinanceFeeds.ts index 8bccfd4790b5..793ea9ff0824 100644 --- 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 index 2eec43b504b2..ae9aaf8afc7e 100644 --- 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(function FeedSummary({ post, ...rest }) { const pfp = post.author.pfp return ( - +