Skip to content

[Dashboard] Approve transaction does not transfer funds #3395

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
flopez7 merged 6 commits into from
Jun 18, 2025
Merged

[Dashboard] Approve transaction does not transfer funds #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3f2b838
feat: change tooltip in header, add tooltip to the value cell
KirillKirill Jun 16, 2025
c7a371b
fix: styles
KirillKirill Jun 16, 2025
1e12db5
fix: remove commented code
KirillKirill Jun 16, 2025
e2d777d
fix: add arrow to tooltip
KirillKirill Jun 16, 2025
41343fc
refactor: typography in table; using chip in the method cell
KirillKirill Jun 16, 2025
9bbde4f
fix: increase max width of tooltip
KirillKirill Jun 16, 2025
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
1 change: 1 addition & 0 deletions packages/apps/dashboard/client/src/components/SearchResults/AbbreviateClipboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const AbbreviateClipboard = ({ value, link }: AbbreviateClipboardProps) => {
return (
<Stack direction="row" gap={1}>
<Typography
variant="body2"
sx={{
whiteSpace: 'nowrap',
textDecoration: 'inherit',
Expand Down
26 changes: 10 additions & 16 deletions ...earchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellMethod.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Box from '@mui/material/Box/Box';
import Chip from '@mui/material/Chip';
import { useTheme } from '@mui/material/styles';
import Typography from '@mui/material/Typography';

type PaletteColorKey =
| 'primary'
Expand Down Expand Up @@ -87,19 +86,14 @@ export const TransactionTableCellMethod = ({ method }: { method: string }) => {
};

return (
<Box
display="inline-flex"
px={1.5}
py={1}
borderRadius={8}
border={`1px solid ${getColorFromTheme(currentStatusColors.border)}`}
>
<Typography
textTransform="capitalize"
color={getColorFromTheme(currentStatusColors.text)}
>
{method}
</Typography>
</Box>
<Chip
label={method}
variant="outlined"
sx={{
borderColor: getColorFromTheme(currentStatusColors.border),
color: getColorFromTheme(currentStatusColors.text),
textTransform: 'capitalize',
}}
/>
);
};
30 changes: 27 additions & 3 deletions ...SearchResults/WalletAddress/WalletAddressTransactions/cells/TransactionTableCellValue.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,28 @@
import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
import Typography from '@mui/material/Typography';

import CustomTooltip from '@/components/CustomTooltip';
import { formatHMTDecimals } from '@/helpers/formatHMTDecimals';
import { useHMTPrice } from '@/services/api/use-hmt-price';

export const TransactionTableCellValue = ({ value }: { value: string }) => {
const InfoTooltip = ({ title }: { title: string }) => (
<CustomTooltip title={title} arrow>
<HelpOutlineIcon
fontSize="small"
sx={{
color: 'text.secondary',
}}
/>
</CustomTooltip>
);

export const TransactionTableCellValue = ({
value,
method,
}: {
value: string;
method: string;
}) => {
const { isError, isPending } = useHMTPrice();

if (isError) {
Expand All @@ -15,9 +34,14 @@ export const TransactionTableCellValue = ({ value }: { value: string }) => {
}

return (
<Typography>
<Typography variant="body2" display="flex" alignItems="center" gap={0.5}>
{formatHMTDecimals(value)}
<Typography component="span"> HMT</Typography>
<Typography variant="body2" component="span">
HMT
</Typography>
{method === 'approve' && (
<InfoTooltip title="Approved amount (not a transfer)" />
)}
</Typography>
);
};
10 changes: 8 additions & 2 deletions ...Results/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ export const TransactionsTableBody: React.FC = () => {
</TableCell>
<TableCell>{elem.block}</TableCell>
<TableCell>
<TransactionTableCellValue value={elem.value} />
<TransactionTableCellValue
value={elem.value}
method={elem.method}
/>
</TableCell>
</TableRow>
{elem.internalTransactions?.map((internalTx, internalIdx) => (
Expand Down Expand Up @@ -153,7 +156,10 @@ export const TransactionsTableBody: React.FC = () => {
</TableCell>
<TableCell></TableCell>
<TableCell>
<TransactionTableCellValue value={internalTx.value} />
<TransactionTableCellValue
value={internalTx.value}
method={internalTx.method}
/>
</TableCell>
</TableRow>
))}
Expand Down
13 changes: 11 additions & 2 deletions ...Results/WalletAddress/WalletAddressTransactions/tableComponents/TransactionsTableHead.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@ import TableRow from '@mui/material/TableRow';
import CustomTooltip from '@/components/CustomTooltip';

const InfoTooltip = ({ title }: { title: string }) => (
<CustomTooltip title={title}>
<CustomTooltip
title={title}
slotProps={{
tooltip: {
sx: {
maxWidth: '320px',
},
},
}}
>
<HelpOutlineIcon
fontSize="small"
sx={{
Expand Down Expand Up @@ -50,7 +59,7 @@ export const TransactionsTableHead = () => {
<TableCell>
<Stack direction="row" alignItems="center">
Value
<InfoTooltip title="Amount of HMT transferred in the transaction" />
<InfoTooltip title="This column reflects transacted and approved amounts" />
</Stack>
</TableCell>
</TableRow>
Expand Down