Skip to content

Fix pubkeys in delete dialog #437

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

Open
mateumiralles wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix pubkeys in delete dialog #437

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
39 changes: 24 additions & 15 deletions packages/ui/src/components/Dialogs/KeystoresDeleteDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@ export default function KeystoresDeleteDialog({
const [keystoresDelete, setKeystoresDelete] = useState<Web3signerDeleteResponse>();
const [keystoresDeleteError, setKeystoresDeleteError] = useState<string>();
const [loading, setLoading] = useState(false);
const [deletedPubkeys, setDeletedPubkeys] = useState<string[]>([]);
const theme = useTheme();
const isMobile = useMediaQuery(theme.breakpoints.down("sm"));

async function deleteSelectedKeystores() {
try {
setKeystoresDelete(undefined);
setLoading(true);
const pubkeysToDelete = selectedRows.map((row) => rows[parseInt(row.toString())]?.pubkey);
setDeletedPubkeys(pubkeysToDelete);
setKeystoresDelete(
await rpcClient.call("deleteValidators", {
pubkeys: selectedRows.map((row) => rows[parseInt(row.toString())].pubkey)
pubkeys: pubkeysToDelete
})
);
setLoading(false);
Expand All @@ -61,6 +64,7 @@ export default function KeystoresDeleteDialog({
const handleClose = () => {
setOpen(false);
};

return (
<Dialog
disableEscapeKeyDown={true}
Expand All @@ -76,28 +80,33 @@ export default function KeystoresDeleteDialog({
aria-describedby="alert-dialog-description"
TransitionComponent={SlideTransition}
>
<DialogTitle id="alert-dialog-title">{keystoresDelete ? "Done" : "Delete Keystores?"}</DialogTitle>
<DialogTitle id="alert-dialog-title">
{keystoresDelete ? "Keys deleted successfully" : "Delete Keystores?"}
</DialogTitle>
<DialogContent>
<Box sx={importDialogBoxStyle}>
{keystoresDeleteError ? (
`Error: ${keystoresDeleteError}`
) : keystoresDelete?.data ? (
<div>
{keystoresDelete.data.map((result, index) => (
<div style={{ marginBottom: "20px" }}>
<Typography variant="h5" color="GrayText">
{shortenPubkey(rows[index]?.pubkey)}
</Typography>
<Typography variant="h6">
<b>Status:</b> {result.status} {getEmoji(result.status)}
</Typography>
{result.message ? (
{keystoresDelete.data.map((result, index) => {
const pubkey = deletedPubkeys[index];
return (
<div style={{ marginBottom: "20px" }} key={pubkey || index}>
<Typography variant="h5" color="GrayText">
{shortenPubkey(pubkey)}
</Typography>
<Typography variant="h6">
<b>Message:</b> {result.message}
<b>Status:</b> {result.status} {getEmoji(result.status)}
</Typography>
) : null}
</div>
))}
{result.message ? (
<Typography variant="h6">
<b>Message:</b> {result.message}
</Typography>
) : null}
</div>
);
})}
{keystoresDelete.slashing_protection ? (
<div>
<Alert severity="warning" sx={{ marginTop: 2, marginBottom: 2 }} variant="filled">
Expand Down