From 3ab25f5ff15338fe96a84dae7cc66722366364d0 Mon Sep 17 00:00:00 2001
From: Fred KISSIE <fredkiss3@gmail.com>
Date: Thu, 8 Jan 2026 03:38:55 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 messages/en-US.json           |  2 +-
 src/components/RolesTable.tsx | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/messages/en-US.json b/messages/en-US.json
index dbccd6d6..da47c240 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -743,7 +743,7 @@
     "accessRoleErrorRemove": "Failed to remove role",
     "accessRoleErrorRemoveDescription": "An error occurred while removing the role.",
     "accessRoleName": "Role Name",
-    "accessRoleQuestionRemove": "You're about to delete the {name} role. You cannot undo this action.",
+    "accessRoleQuestionRemove": "You're about to delete the `{name}` role. You cannot undo this action.",
     "accessRoleRemove": "Remove Role",
     "accessRoleRemoveDescription": "Remove a role from the organization",
     "accessRoleRemoveSubmit": "Remove Role",
diff --git a/src/components/RolesTable.tsx b/src/components/RolesTable.tsx
index 1ef103f3..210eee3c 100644
--- a/src/components/RolesTable.tsx
+++ b/src/components/RolesTable.tsx
@@ -36,7 +36,7 @@ export default function UsersTable({ roles }: RolesTableProps) {
     const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
     const router = useRouter();
 
-    const [roleToRemove, setUserToRemove] = useState<RoleRow | null>(null);
+    const [roleToRemove, setRoleToRemove] = useState<RoleRow | null>(null);
 
     const api = createApiClient(useEnvContext());
 
@@ -130,9 +130,7 @@ export default function UsersTable({ roles }: RolesTableProps) {
                                 <DropdownMenuContent align="end">
                                     <DropdownMenuItem
                                         onClick={() => {
-                                            // setSelectedInternalResource(
-                                            //     resourceRow
-                                            // );
+                                            setRoleToRemove(roleRow);
                                             setIsDeleteModalOpen(true);
                                         }}
                                     >
@@ -169,8 +167,11 @@ export default function UsersTable({ roles }: RolesTableProps) {
                     onSuccess={() => {
                         // Delay refresh to allow modal to close smoothly
                         setTimeout(() => {
-                            router.refresh();
-                            setEditingRole(null);
+                            startTransition(async () => {
+                                await refreshData().then(() =>
+                                    setEditingRole(null)
+                                );
+                            });
                         }, 150);
                     }}
                 />
@@ -189,8 +190,11 @@ export default function UsersTable({ roles }: RolesTableProps) {
                     setOpen={setIsDeleteModalOpen}
                     roleToDelete={roleToRemove}
                     afterDelete={() => {
-                        startTransition(refreshData);
-                        setUserToRemove(null);
+                        startTransition(async () => {
+                            await refreshData().then(() =>
+                                setRoleToRemove(null)
+                            );
+                        });
                     }}
                 />
             )}