fix: mf-6482 merge all lens and fids (#11912)

* fix: mf-6481 some feeds might render empty * fix: mf-6482 merge all lens and fids
DimensionDev · Nov 7, 2024 · 5050950 · 5050950
1 parent a2bb7a2
commit 5050950
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx b/packages/plugins/RSS3/src/SiteAdaptor/FinanceFeeds/FeedSummary.tsx
@@ -72,26 +72,28 @@ export const FeedSummary = memo<Props>(function FeedSummary({ transaction, ...re
     if (['trade', 'mint'].includes(txType) && transaction.assets.length === 2) {
         const inAsset = transaction.assets.find((x) => x.direction === 'receive')
         const outAsset = transaction.assets.find((x) => x.direction === 'send')
-        return (
-            <>
-                {inAsset && outAsset ?
-                    <SummaryTypography {...rest}>
-                        <Trans>
-                            <AccountLabel address={owner.address} />{' '}
-                            <Select value={txType} _trade="traded" _mint="minted" other="traded" />{' '}
-                            <Label>
-                                {formatAmount(inAsset.amount)} {inAsset.symbol || inAsset.name}
-                            </Label>{' '}
-                            for{' '}
-                            <Label>
-                                {formatAmount(outAsset.amount)} {outAsset.symbol || outAsset.name}
-                            </Label>
-                        </Trans>
-                    </SummaryTypography>
-                :   null}
-                {approvalSummaries}
-            </>
-        )
+        if ((inAsset && outAsset) || approvalSummaries?.length) {
+            return (
+                <>
+                    {inAsset && outAsset ?
+                        <SummaryTypography {...rest}>
+                            <Trans>
+                                <AccountLabel address={owner.address} />{' '}
+                                <Select value={txType} _trade="traded" _mint="minted" other="traded" />{' '}
+                                <Label>
+                                    {formatAmount(inAsset.amount)} {inAsset.symbol || inAsset.name}
+                                </Label>{' '}
+                                for{' '}
+                                <Label>
+                                    {formatAmount(outAsset.amount)} {outAsset.symbol || outAsset.name}
+                                </Label>
+                            </Trans>
+                        </SummaryTypography>
+                    :   null}
+                    {approvalSummaries}
+                </>
+            )
+        }
     }
     if (['burn', 'deposit', 'mint', 'receive', 'send', 'withdraw'].includes(txType)) {
         return (

diff --git a/packages/plugins/RSS3/src/SiteAdaptor/SocialFeeds/useSocialFeeds.ts b/packages/plugins/RSS3/src/SiteAdaptor/SocialFeeds/useSocialFeeds.ts
@@ -2,7 +2,7 @@ import { EMPTY_LIST } from '@masknet/shared-base'
 import { useFireflyFarcasterAccounts, useFireflyLensAccounts } from '@masknet/web3-hooks-base'
 import { FireflyConfig, FireflyFarcaster, Lens } from '@masknet/web3-providers'
 import { useQuery, useInfiniteQuery, skipToken } from '@tanstack/react-query'
-import { sortBy } from 'lodash-es'
+import { sortBy, uniq } from 'lodash-es'
 import { useCallback } from 'react'
 
 interface Options {
@@ -17,10 +17,15 @@ export function useSocialFeeds({ userId, address }: Options) {
     const { data: profiles } = useQuery({
         queryKey: ['firefly', 'profiles-by-address', address],
         queryFn: address ? () => FireflyConfig.getUnionProfile({ walletAddress: address }) : skipToken,
+        select(data) {
+            return {
+                fids: data.farcasterProfiles.map((x) => x.fid),
+                lensHandles: data.lensProfiles.map((x) => x.handle).concat(data.lensProfilesV3.map((x) => x.localName)),
+            }
+        },
     })
-    const { farcasterProfiles = [], lensProfiles = [], lensProfilesV3 = [] } = profiles || {}
 
-    const fids = userId ? farAccounts.map((x) => x.id) : farcasterProfiles.map((x) => x.fid) || []
+    const fids = uniq(farAccounts.map((x) => x.id.toString()).concat(profiles?.fids || []))
     const {
         data: farcasterPosts = EMPTY_LIST,
         error: farcasterError,
@@ -41,10 +46,7 @@ export function useSocialFeeds({ userId, address }: Options) {
         },
     })
 
-    const lensHandles =
-        userId ?
-            lensAccounts.map((x) => x.handle)
-        :   [...lensProfiles.map((x) => x.handle), ...lensProfilesV3.map((x) => x.localName)]
+    const lensHandles = uniq(lensAccounts.map((x) => x.handle).concat(profiles?.lensHandles || []))
     const { data: lensIds = EMPTY_LIST } = useQuery({
         queryKey: ['lens', 'popup-list', lensHandles],
         queryFn: async () => {