Skip to content

Commit

Permalink
fix: adjust redpacket layout
Browse files Browse the repository at this point in the history
  • Loading branch information
swkatmask committed Jan 3, 2025
1 parent 1b4d9b6 commit 2f37c84
Show file tree
Hide file tree
Showing 26 changed files with 450 additions and 43 deletions.
5 changes: 4 additions & 1 deletion packages/plugins/Avatar/src/locale/en-US.json

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

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

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

5 changes: 4 additions & 1 deletion packages/plugins/Avatar/src/locale/ja-JP.json

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

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

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

5 changes: 4 additions & 1 deletion packages/plugins/Avatar/src/locale/ko-KR.json

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

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

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

5 changes: 4 additions & 1 deletion packages/plugins/Avatar/src/locale/zh-CN.json

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

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

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

5 changes: 4 additions & 1 deletion packages/plugins/Avatar/src/locale/zh-TW.json

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

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

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

58 changes: 30 additions & 28 deletions packages/plugins/RedPacket/src/SiteAdaptor/RedPacket/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -260,33 +260,35 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) {
const claimedOrEmpty = listOfStatus.includes(RedPacketStatus.claimed) || isEmpty

return (
<Card className={classes.root} component="article" elevation={0}>
<RedPacketEnvelope
className={classes.envelope}
cover={cover?.backgroundImageUrl || new URL('../assets/cover.png', import.meta.url).href}
message={payload.sender.message}
token={token}
shares={payload.shares}
isClaimed={isClaimed}
isEmpty={isEmpty}
isExpired={isExpired}
isRefunded={isRefunded}
claimedCount={+availability.claimed}
total={payload.total}
totalClaimed={minus(payload.total, payload.total_remaining || availability.balance).toFixed()}
claimedAmount={availability.claimed_amount}
creator={payload.sender.name}
/>
{cover ?
<Grow in={showRequirements ? !checkingClaimStatus : false} timeout={250}>
<Requirements
showResults={!claimedOrEmpty}
statusList={claimStrategyStatus?.claimStrategyStatus ?? EMPTY_LIST}
className={classes.requirements}
onClose={() => setShowRequirements(false)}
/>
</Grow>
: null}
<>
<Card className={classes.root} component="article" elevation={0}>
<RedPacketEnvelope
className={classes.envelope}
cover={cover?.backgroundImageUrl || new URL('../assets/cover.png', import.meta.url).href}
message={payload.sender.message}
token={token}
shares={payload.shares}
isClaimed={isClaimed}
isEmpty={isEmpty}
isExpired={isExpired}
isRefunded={isRefunded}
claimedCount={+availability.claimed}
total={payload.total}
totalClaimed={minus(payload.total, payload.total_remaining || availability.balance).toFixed()}
claimedAmount={availability.claimed_amount}
creator={payload.sender.name}
/>
{cover ?
<Grow in={showRequirements ? !checkingClaimStatus : false} timeout={250}>
<Requirements
showResults={!claimedOrEmpty}
statusList={claimStrategyStatus?.claimStrategyStatus ?? EMPTY_LIST}
className={classes.requirements}
onClose={() => setShowRequirements(false)}
/>
</Grow>
: null}
</Card>
{outdated ?
null
: myHandle ?
Expand All @@ -306,6 +308,6 @@ export const RedPacket = memo(function RedPacket({ payload }: RedPacketProps) {
}}
/>
}
</Card>
</>
)
})
Loading

0 comments on commit 2f37c84

Please sign in to comment.