Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const NFTCard = memo(function NFTCard({ token, onRemove, className, ...re
{formatTokenId(token.tokenId, 2)}
</Typography>
{onRemove ?
<Icons.Clear size={20} className={classes.removeButton} />
<Icons.Clear size={20} className={classes.removeButton} onClick={() => onRemove(token)} />
: null}
</div>
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,12 @@ const useStyles = makeStyles()((theme) => ({
alignItems: 'center',
gap: theme.spacing(1),
},
name: {
maxWidth: 300,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
},
status: {
display: 'flex',
alignItems: 'center',
Expand Down Expand Up @@ -272,7 +278,10 @@ export function NftRedPacketEnvelope({
<Typography className={classes.amount}>{claimedZero ? null : `1 ${metadata?.name}`}</Typography>
: <Typography className={classes.amount}>
{`${claimedCount} / ${total} `}
{metadata?.name}

<TextOverflowTooltip key={metadata?.name} title={metadata?.name} as={ShadowRootTooltip}>
<span className={classes.name}>{metadata?.name}</span>
</TextOverflowTooltip>
{showConditionButton ?
<Icons.Questions size={24} onClick={onClickCondition} />
: null}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { NetworkPluginID, RedPacketNftMetaKey } from '@masknet/shared-base'
import { ActionButton, makeStyles } from '@masknet/theme'
import { useChainContext, useNativeTokenPrice, useSmartPayChainId, useWallet } from '@masknet/web3-hooks-base'
import { EVMChainResolver, EVMExplorerResolver, EVMWeb3 } from '@masknet/web3-providers'
import { Box, Link, Typography } from '@mui/material'
import { alpha, Box, Link, Paper, Typography } from '@mui/material'
import { useCallback, useContext, useMemo, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { RoutePaths } from '../../constants.js'
Expand All @@ -32,7 +32,7 @@ const useStyles = makeStyles()((theme) => ({
settings: {
display: 'flex',
flexDirection: 'column',
gap: theme.spacing(2),
gap: theme.spacing(1.5),
padding: theme.spacing(2),
flexGrow: 1,
},
Expand Down Expand Up @@ -85,6 +85,20 @@ const useStyles = makeStyles()((theme) => ({
overflow: 'hidden',
backgroundColor: theme.palette.maskColor.input,
},
hit: {
display: 'flex',
alignItems: 'center',
maxWidth: 568,
fontWeight: 300,
borderRadius: 8,
backgroundColor: theme.palette.maskColor.bg,
color: theme.palette.text.primary,
padding: 12,
},
warningHit: {
color: theme.palette.maskColor.danger,
backgroundColor: alpha(theme.palette.maskColor.danger, 0.1),
},
}))

export function NftRedPacketConfirm() {
Expand Down Expand Up @@ -248,6 +262,36 @@ export function NftRedPacketConfirm() {
/>
</div>
</div>
<Paper className={cx(classes.hit, classes.warningHit)}>
<Icons.Warning size={20} />
<Typography
variant="body1"
align="left"
marginTop="1px"
marginLeft="8.5px"
style={{ lineHeight: '18px' }}
fontSize="14px">
<Trans>
Note: When selecting approve all, all NFTs in the contract will be authorized for sale by
default, including the NFTs transferred later.
</Trans>
</Typography>
</Paper>
<Paper className={classes.hit}>
<Icons.SettingInfo size={20} />
<Typography
variant="body1"
align="left"
marginTop="1px"
marginLeft="8.5px"
style={{ lineHeight: '18px' }}
fontSize="14px">
<Trans>
Lucky Drop is valid for 24 hours, within this period the Lucky Drop contract can send
approved NFTs to the participants of Lucky Drop.
</Trans>
</Typography>
</Paper>
</div>
<Box style={{ position: 'absolute', bottom: 0, left: 0, width: '100%' }}>
<PluginWalletStatusBar>
Expand Down
6 changes: 6 additions & 0 deletions packages/plugins/RedPacket/src/locale/en-US.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions packages/plugins/RedPacket/src/locale/en-US.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/plugins/RedPacket/src/locale/ja-JP.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions packages/plugins/RedPacket/src/locale/ja-JP.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/plugins/RedPacket/src/locale/ko-KR.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions packages/plugins/RedPacket/src/locale/ko-KR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/plugins/RedPacket/src/locale/zh-CN.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions packages/plugins/RedPacket/src/locale/zh-CN.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions packages/plugins/RedPacket/src/locale/zh-TW.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions packages/plugins/RedPacket/src/locale/zh-TW.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ const useStyles = makeStyles()((theme) => {
display: 'flex',
alignItems: 'center',
marginRight: 'auto',
minWidth: 0,
},
icon: {
width: 24,
Expand Down
Loading