Skip to content

Commit ccde491

Browse files
authored
fix(RedPacket): mf-6649 notes in confirm page (#12153)
1 parent d5c5146 commit ccde491

File tree

15 files changed

+140
-16
lines changed

15 files changed

+140
-16
lines changed

packages/plugins/RedPacket/src/SiteAdaptor/components/NFTCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export const NFTCard = memo(function NFTCard({ token, onRemove, className, ...re
7272
{formatTokenId(token.tokenId, 2)}
7373
</Typography>
7474
{onRemove ?
75-
<Icons.Clear size={20} className={classes.removeButton} />
75+
<Icons.Clear size={20} className={classes.removeButton} onClick={() => onRemove(token)} />
7676
: null}
7777
</div>
7878
)

packages/plugins/RedPacket/src/SiteAdaptor/components/NftRedPacketEnvelope.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,12 @@ const useStyles = makeStyles()((theme) => ({
126126
alignItems: 'center',
127127
gap: theme.spacing(1),
128128
},
129+
name: {
130+
maxWidth: 300,
131+
whiteSpace: 'nowrap',
132+
overflow: 'hidden',
133+
textOverflow: 'ellipsis',
134+
},
129135
status: {
130136
display: 'flex',
131137
alignItems: 'center',
@@ -272,7 +278,10 @@ export function NftRedPacketEnvelope({
272278
<Typography className={classes.amount}>{claimedZero ? null : `1 ${metadata?.name}`}</Typography>
273279
: <Typography className={classes.amount}>
274280
{`${claimedCount} / ${total} `}
275-
{metadata?.name}
281+
282+
<TextOverflowTooltip key={metadata?.name} title={metadata?.name} as={ShadowRootTooltip}>
283+
<span className={classes.name}>{metadata?.name}</span>
284+
</TextOverflowTooltip>
276285
{showConditionButton ?
277286
<Icons.Questions size={24} onClick={onClickCondition} />
278287
: null}

packages/plugins/RedPacket/src/SiteAdaptor/views/NftRedPacketConfirm.tsx

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { NetworkPluginID, RedPacketNftMetaKey } from '@masknet/shared-base'
1212
import { ActionButton, makeStyles } from '@masknet/theme'
1313
import { useChainContext, useNativeTokenPrice, useSmartPayChainId, useWallet } from '@masknet/web3-hooks-base'
1414
import { EVMChainResolver, EVMExplorerResolver, EVMWeb3 } from '@masknet/web3-providers'
15-
import { Box, Link, Typography } from '@mui/material'
15+
import { alpha, Box, Link, Paper, Typography } from '@mui/material'
1616
import { useCallback, useContext, useMemo, useState } from 'react'
1717
import { useNavigate } from 'react-router-dom'
1818
import { RoutePaths } from '../../constants.js'
@@ -32,7 +32,7 @@ const useStyles = makeStyles()((theme) => ({
3232
settings: {
3333
display: 'flex',
3434
flexDirection: 'column',
35-
gap: theme.spacing(2),
35+
gap: theme.spacing(1.5),
3636
padding: theme.spacing(2),
3737
flexGrow: 1,
3838
},
@@ -85,6 +85,20 @@ const useStyles = makeStyles()((theme) => ({
8585
overflow: 'hidden',
8686
backgroundColor: theme.palette.maskColor.input,
8787
},
88+
hit: {
89+
display: 'flex',
90+
alignItems: 'center',
91+
maxWidth: 568,
92+
fontWeight: 300,
93+
borderRadius: 8,
94+
backgroundColor: theme.palette.maskColor.bg,
95+
color: theme.palette.text.primary,
96+
padding: 12,
97+
},
98+
warningHit: {
99+
color: theme.palette.maskColor.danger,
100+
backgroundColor: alpha(theme.palette.maskColor.danger, 0.1),
101+
},
88102
}))
89103

90104
export function NftRedPacketConfirm() {
@@ -248,6 +262,36 @@ export function NftRedPacketConfirm() {
248262
/>
249263
</div>
250264
</div>
265+
<Paper className={cx(classes.hit, classes.warningHit)}>
266+
<Icons.Warning size={20} />
267+
<Typography
268+
variant="body1"
269+
align="left"
270+
marginTop="1px"
271+
marginLeft="8.5px"
272+
style={{ lineHeight: '18px' }}
273+
fontSize="14px">
274+
<Trans>
275+
Note: When selecting approve all, all NFTs in the contract will be authorized for sale by
276+
default, including the NFTs transferred later.
277+
</Trans>
278+
</Typography>
279+
</Paper>
280+
<Paper className={classes.hit}>
281+
<Icons.SettingInfo size={20} />
282+
<Typography
283+
variant="body1"
284+
align="left"
285+
marginTop="1px"
286+
marginLeft="8.5px"
287+
style={{ lineHeight: '18px' }}
288+
fontSize="14px">
289+
<Trans>
290+
Lucky Drop is valid for 24 hours, within this period the Lucky Drop contract can send
291+
approved NFTs to the participants of Lucky Drop.
292+
</Trans>
293+
</Typography>
294+
</Paper>
251295
</div>
252296
<Box style={{ position: 'absolute', bottom: 0, left: 0, width: '100%' }}>
253297
<PluginWalletStatusBar>

packages/plugins/RedPacket/src/locale/en-US.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/en-US.po

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/ja-JP.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/ja-JP.po

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/ko-KR.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/ko-KR.po

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/plugins/RedPacket/src/locale/zh-CN.json

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)