Skip to content

fix: don't change props #6795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UncleBill merged 2 commits into from
Jul 18, 2022
Merged

fix: don't change props #6795

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c42fad
fix: don't change props
UncleBill Jul 13, 2022
5b4d4f3
fixup! fix: don't change props
UncleBill Jul 13, 2022
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
40 changes: 23 additions & 17 deletions packages/mask/src/plugins/RedPacket/SNSAdaptor/RedPacketInHistoryList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MouseEvent, useCallback, useState } from 'react'
import { MouseEvent, useCallback, useState, useMemo } from 'react'
import { useAsync } from 'react-use'
import { Interface } from '@ethersproject/abi'
import BigNumber from 'bignumber.js'
Expand Down Expand Up @@ -209,33 +209,37 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
rpid: eventParams.id,
creation_time: eventParams.creation_time.toNumber() * 1000,
}
}, [connection, history, HAPPY_RED_PACKET_ADDRESS_V4])
}, [connection, history.txid, HAPPY_RED_PACKET_ADDRESS_V4])

const rpid = receipt?.rpid ?? ''
const creation_time = receipt?.creation_time ?? 0

history.rpid = rpid
const patchedHistory: RedPacketJSONPayload | RedPacketJSONPayloadFromChain = useMemo(
() => ({ ...props.history, rpid }),
[props.history, rpid],
)
const {
value: availability,
computed: { canRefund, canSend, listOfStatus, isPasswordValid },
retry: revalidateAvailability,
} = useAvailabilityComputed(account, { ...history, creation_time })
} = useAvailabilityComputed(account, { ...patchedHistory, creation_time })

const claimerNumber = availability ? Number(availability.claimed) : 0
const total_remaining = availability?.balance

const [{ loading: isRefunding }, refunded, refundCallback] = useRefundCallback(
history.contract_version,
patchedHistory.contract_version,
account,
rpid,
)
const tokenAddress =
(history as RedPacketJSONPayload).token?.address ?? (history as RedPacketJSONPayloadFromChain).token_address
(patchedHistory as RedPacketJSONPayload).token?.address ??
(patchedHistory as RedPacketJSONPayloadFromChain).token_address

const { value: tokenDetailed } = useFungibleToken(NetworkPluginID.PLUGIN_EVM, tokenAddress ?? '')

const historyToken = {
...pick(tokenDetailed ?? (history as RedPacketJSONPayload).token, ['decimals', 'symbol']),
...pick(tokenDetailed ?? (patchedHistory as RedPacketJSONPayload).token, ['decimals', 'symbol']),
address: tokenAddress,
} as FungibleToken<ChainId, SchemaType.Native | SchemaType.ERC20>

Expand All @@ -244,8 +248,8 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
await refundCallback()
revalidateAvailability()
}
if (canSend) onSelect(removeUselessSendParams({ ...history, token: historyToken }))
}, [onSelect, refundCallback, canRefund, canSend, history, historyToken])
if (canSend) onSelect(removeUselessSendParams({ ...patchedHistory, token: historyToken }))
}, [onSelect, refundCallback, canRefund, canSend, patchedHistory, historyToken])

// #region password lost tips
const [anchorEl, setAnchorEl] = useState<(EventTarget & HTMLButtonElement) | null>(null)
Expand All @@ -272,24 +276,26 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
<div className={classes.div}>
<div className={classes.fullWidthBox}>
<Typography variant="body1" className={classNames(classes.title, classes.message)}>
{history.sender.message === '' ? t.best_wishes() : history.sender.message}
{patchedHistory.sender.message === ''
? t.best_wishes()
: patchedHistory.sender.message}
</Typography>
</div>
<Typography variant="body1" className={classNames(classes.info, classes.message)}>
{t.history_duration({
startTime: dateTimeFormat(new Date(creation_time)),
endTime: dateTimeFormat(new Date(creation_time + history.duration), false),
endTime: dateTimeFormat(new Date(creation_time + patchedHistory.duration), false),
})}
</Typography>
<Typography variant="body1" className={classNames(classes.info, classes.message)}>
{t.history_total_amount({
amount: formatBalance(history.total, historyToken?.decimals, 6),
amount: formatBalance(patchedHistory.total, historyToken?.decimals, 6),
symbol: historyToken?.symbol,
})}
</Typography>
<Typography variant="body1" className={classNames(classes.info, classes.message)}>
{t.history_split_mode({
mode: history.is_random ? t.random() : t.average(),
mode: patchedHistory.is_random ? t.random() : t.average(),
})}
</Typography>
</div>
Expand Down Expand Up @@ -336,7 +342,7 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
</section>
<StyledLinearProgress
variant="determinate"
value={100 * (1 - Number(total_remaining) / Number(history.total))}
value={100 * (1 - Number(total_remaining) / Number(patchedHistory.total))}
/>
<section className={classes.footer}>
<Typography variant="body1" className={classes.footerInfo}>
Expand All @@ -346,7 +352,7 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
}}
values={{
claimedShares: String(claimerNumber),
shares: String(history.shares),
shares: String(patchedHistory.shares),
}}
/>
</Typography>
Expand All @@ -357,9 +363,9 @@ export function RedPacketInHistoryList(props: RedPacketInHistoryListProps) {
span: <span className={classes.span} />,
}}
values={{
amount: formatBalance(history.total, historyToken?.decimals, 6),
amount: formatBalance(patchedHistory.total, historyToken?.decimals, 6),
claimedAmount: formatBalance(
new BigNumber(history.total).minus(total_remaining ?? 0),
new BigNumber(patchedHistory.total).minus(total_remaining ?? 0),
historyToken?.decimals,
6,
),
Expand Down