Skip to content

Commit

Permalink
[Release] Hotfix 2.23.10 => 2.23.11 (patch) (#11146)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
guanbinrui and UncleBill committed Nov 20, 2023
1 parent 7c44e0d commit 997ce51
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 34 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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,
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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>
Expand All @@ -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)
Expand All @@ -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={{
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/types/NonFungibleToken.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
}
Expand Down
2 changes: 1 addition & 1 deletion packages/web3-providers/src/types/Trending.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 997ce51

Please sign in to comment.