From 997ce512bb026656fc7faa2dabc7f32bd48af95b Mon Sep 17 00:00:00 2001
From: guanbinrui <52657989+guanbinrui@users.noreply.github.com>
Date: Mon, 20 Nov 2023 17:46:13 +0800
Subject: [PATCH] [Release] Hotfix 2.23.10 => 2.23.11 (patch) (#11146)

* chore: bump version to 2.23.11

* fix(RSS3): mf-5540 hide image for donation card (#11145)

since these images can be loaded anymore

* fix(NFTScan): mf-5609 data struct gets changed for solana nft (#11144)

---------

Co-authored-by: UncleBill <billbill290@gmail.com>
---
 package.json                                  |  2 +-
 .../components/FeedCard/DonationCard.tsx      | 33 +++----------------
 .../src/NFTScan/apis/TrendingAPI_Solana.ts    |  4 +--
 .../src/types/NonFungibleToken.ts             |  2 +-
 packages/web3-providers/src/types/Trending.ts |  2 +-
 5 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/package.json b/package.json
index 37c73d21283d..481994bfc000 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "yarn": ">=999.0.0",
     "npm": ">=999.0.0"
   },
-  "version": "2.23.10",
+  "version": "2.23.11",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
diff --git a/packages/plugins/RSS3/src/SiteAdaptor/components/FeedCard/DonationCard.tsx b/packages/plugins/RSS3/src/SiteAdaptor/components/FeedCard/DonationCard.tsx
index 7d0d09042679..b6263e9b6fea 100644
--- a/packages/plugins/RSS3/src/SiteAdaptor/components/FeedCard/DonationCard.tsx
+++ b/packages/plugins/RSS3/src/SiteAdaptor/components/FeedCard/DonationCard.tsx
@@ -1,4 +1,4 @@
-import { Image, Markdown } from '@masknet/shared'
+import { Markdown } from '@masknet/shared'
 import { makeStyles } from '@masknet/theme'
 import { RSS3BaseAPI } from '@masknet/web3-providers/types'
 import { Typography } from '@mui/material'
@@ -11,7 +11,7 @@ import { CardFrame, type FeedCardProps } from '../base.js'
 import { formatValue, Label } from './common.js'
 import { useMarkdownStyles } from './useMarkdownStyles.js'
 
-const useStyles = makeStyles<void, 'image'>()((theme, _, refs) => ({
+const useStyles = makeStyles()((theme) => ({
     badge: {
         display: 'inline-block',
         height: 18,
@@ -41,24 +41,6 @@ const useStyles = makeStyles<void, 'image'>()((theme, _, refs) => ({
         display: 'flex',
         flexDirection: 'row',
         alignItems: 'center',
-        [`.${refs.image}`]: {
-            width: 64,
-            height: 64,
-            borderRadius: 8,
-            overflow: 'hidden',
-            flexShrink: 0,
-        },
-    },
-    image: {
-        img: {
-            objectFit: 'cover',
-        },
-    },
-    verbose: {
-        [`.${refs.image}`]: {
-            marginTop: theme.spacing(1),
-            aspectRatio: 'auto',
-        },
     },
     info: {
         overflow: 'auto',
@@ -102,7 +84,6 @@ const CardBody = memo(({ metadata, className, ...rest }: CardBodyProps) => {
     const { classes, cx } = useStyles()
     return (
         <div className={cx(classes.body, className)} {...rest}>
-            <Image classes={{ container: classes.image }} src={metadata.logo} height={64} width={64} />
             <div className={classes.info}>
                 <Typography className={classes.title}>{metadata.title}</Typography>
                 <Typography className={classes.subtitle}>{metadata.description}</Typography>
@@ -119,7 +100,7 @@ const CardBody = memo(({ metadata, className, ...rest }: CardBodyProps) => {
  */
 export function DonationCard({ feed, actionIndex, className, ...rest }: DonationCardProps) {
     const { verbose } = rest
-    const { classes, cx } = useStyles()
+    const { classes } = useStyles()
     const { classes: mdClasses } = useMarkdownStyles()
 
     const [index, setIndex] = useState(0)
@@ -135,12 +116,7 @@ export function DonationCard({ feed, actionIndex, className, ...rest }: Donation
 
     if (verbose) {
         return (
-            <CardFrame
-                type={CardType.DonationDonate}
-                feed={feed}
-                className={cx(rest.verbose ? classes.verbose : null, className)}
-                badge={badge}
-                {...rest}>
+            <CardFrame type={CardType.DonationDonate} feed={feed} className={className} badge={badge} {...rest}>
                 <Typography className={classes.summary}>
                     <Translate.donation_donate_verbose
                         values={{
@@ -154,7 +130,6 @@ export function DonationCard({ feed, actionIndex, className, ...rest }: Donation
                         }}
                     />
                 </Typography>
-                <Image classes={{ container: classes.image }} src={metadata!.logo} width="100%" />
                 <Markdown className={mdClasses.markdown} defaultStyle={false}>
                     {metadata!.description}
                 </Markdown>
diff --git a/packages/web3-providers/src/NFTScan/apis/TrendingAPI_Solana.ts b/packages/web3-providers/src/NFTScan/apis/TrendingAPI_Solana.ts
index 48fce2cff0eb..f4feef8c115b 100644
--- a/packages/web3-providers/src/NFTScan/apis/TrendingAPI_Solana.ts
+++ b/packages/web3-providers/src/NFTScan/apis/TrendingAPI_Solana.ts
@@ -160,8 +160,8 @@ export class NFTScanTrendingAPI_Solana implements TrendingAPI.Provider<ChainId>
             },
             market: {
                 total_supply: collection.items_total,
-                current_price: collection.floor_price.toString(),
-                floor_price: collection.floor_price.toString(),
+                current_price: collection.floor_price?.toString(),
+                floor_price: collection.floor_price?.toString(),
                 highest_price: undefined,
                 owners_count: collection.owners_total,
                 price_symbol: collection.price_symbol || 'SOL',
diff --git a/packages/web3-providers/src/types/NonFungibleToken.ts b/packages/web3-providers/src/types/NonFungibleToken.ts
index 020520a5b4ab..a3904ce8ce01 100644
--- a/packages/web3-providers/src/types/NonFungibleToken.ts
+++ b/packages/web3-providers/src/types/NonFungibleToken.ts
@@ -56,7 +56,7 @@ export namespace NonFungibleTokenAPI {
         owners_total: number
         royalty: number
         opensea_floor_price: number
-        floor_price: number
+        floor_price: number | undefined
         price_symbol: string
         collections_with_same_name: []
     }
diff --git a/packages/web3-providers/src/types/Trending.ts b/packages/web3-providers/src/types/Trending.ts
index fceb1cf9ef1d..ed6936bf7dea 100644
--- a/packages/web3-providers/src/types/Trending.ts
+++ b/packages/web3-providers/src/types/Trending.ts
@@ -74,7 +74,7 @@ export namespace TrendingAPI {
     }
 
     export interface Market {
-        current_price: string
+        current_price: string | undefined
         circulating_supply?: number
         market_cap?: number
         max_supply?: number