Skip to content

fix: ui issues of pending transactions #6162

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 1 commit into from
Apr 26, 2022
Merged

fix: ui issues of pending transactions #6162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions packages/mask/src/components/shared/WalletStatusBox/TransactionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ const useStyles = makeStyles()((theme) => ({
overflow: 'hidden',
whiteSpace: 'nowrap',
},
timestamp: {
fontSize: 12,
},
cell: {
fontSize: 14,
display: 'flex',
Expand All @@ -63,6 +66,9 @@ const useStyles = makeStyles()((theme) => ({
height: 12,
marginLeft: theme.spacing(0.5),
},
clear: {
fontSize: 14,
},
}))

const statusTextColorMap: Record<TransactionStatusType, string> = {
Expand Down Expand Up @@ -141,7 +147,7 @@ const Transaction: FC<TransactionProps> = ({ chainId, transaction: tx, onClear =
component="strong">
{functionName}
</Typography>
<Typography variant="body1" color={theme.palette.text.secondary}>
<Typography className={classes.timestamp} variant="body1" color={theme.palette.text.secondary}>
{format(tx.at, 'yyyy.MM.dd hh:mm')}
</Typography>
</Stack>
Expand All @@ -167,7 +173,7 @@ const Transaction: FC<TransactionProps> = ({ chainId, transaction: tx, onClear =
</Grid>
<Grid item className={classes.cell} md={2} justifyContent="center">
{txStatus === TransactionStatusType.NOT_DEPEND ? (
<Button variant="text" size="small" onClick={handleClear}>
<Button className={classes.clear} variant="text" size="small" onClick={handleClear}>
{t('wallet_status_pending_clear')}
</Button>
) : null}
Expand Down
2 changes: 1 addition & 1 deletion packages/mask/src/components/shared/WalletStatusBox/usePendingTransactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function usePendingTransactions() {
const frozenTxes = useRef<RecentTransaction[]>([])
const [meltedTxHashes, setMeltedTxHashes] = useState<string[]>([])
useEffect(() => {
frozenTxes.current = pendingTransactions.slice(0, 2)
frozenTxes.current = pendingTransactions.slice(0, 5)
setMeltedTxHashes([])
}, [showRecentTransactions])
const clearRecentTxes = useClearRecentTransactions()
Expand Down