From 71fce74ed824a0fbbd9303e1a7eb73cb4e5b2e52 Mon Sep 17 00:00:00 2001
From: mateumiralles <mateumiralles714@gmail.com>
Date: Mon, 12 Jan 2026 12:52:59 +0100
Subject: [PATCH] fix pubkeys in delete dialog

---
 .../Dialogs/KeystoresDeleteDialog.tsx         | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/packages/ui/src/components/Dialogs/KeystoresDeleteDialog.tsx b/packages/ui/src/components/Dialogs/KeystoresDeleteDialog.tsx
index 46d71fad..eb829d1e 100644
--- a/packages/ui/src/components/Dialogs/KeystoresDeleteDialog.tsx
+++ b/packages/ui/src/components/Dialogs/KeystoresDeleteDialog.tsx
@@ -37,6 +37,7 @@ 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"));
 
@@ -44,9 +45,11 @@ export default function KeystoresDeleteDialog({
     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);
@@ -61,6 +64,7 @@ export default function KeystoresDeleteDialog({
   const handleClose = () => {
     setOpen(false);
   };
+
   return (
     <Dialog
       disableEscapeKeyDown={true}
@@ -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">