From c978ed6c6b934fc8ed3434e57e4487981e2990f5 Mon Sep 17 00:00:00 2001
From: sjaanus <sellinjaanus@gmail.com>
Date: Mon, 8 Aug 2022 09:08:21 +0300
Subject: [PATCH] Update messages in the dialogs for groups (#1208)

* Update messages

* Refinement
---
 .../Group/RemoveGroupUser/RemoveGroupUser.tsx       | 13 ++++++-------
 .../admin/groups/RemoveGroup/RemoveGroup.tsx        | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/src/component/admin/groups/Group/RemoveGroupUser/RemoveGroupUser.tsx b/frontend/src/component/admin/groups/Group/RemoveGroupUser/RemoveGroupUser.tsx
index 5e8faf6ac2..1a1159c9fb 100644
--- a/frontend/src/component/admin/groups/Group/RemoveGroupUser/RemoveGroupUser.tsx
+++ b/frontend/src/component/admin/groups/Group/RemoveGroupUser/RemoveGroupUser.tsx
@@ -47,23 +47,22 @@ export const RemoveGroupUser: FC<IRemoveGroupUserProps> = ({
         }
     };
 
+    const userName = user?.name || user?.username || user?.email;
     return (
         <Dialogue
             open={open && Boolean(user)}
-            primaryButtonText="Remove"
+            primaryButtonText="Remove user"
             secondaryButtonText="Cancel"
             onClick={onRemoveClick}
             onClose={() => {
                 setOpen(false);
             }}
-            title="Remove user from group"
+            title="Remove user from group?"
         >
             <Typography>
-                Are you sure you wish to remove{' '}
-                <strong>{user?.name || user?.username || user?.email}</strong>{' '}
-                from <strong>{group.name}</strong>? Removing the user from this
-                group may also remove their access from projects this group is
-                assigned to.
+                Do you really want to remove <strong>{userName}</strong> from{' '}
+                <strong>{group.name}</strong>? <strong>{userName}</strong> will
+                lose all access rights granted by this group.
             </Typography>
         </Dialogue>
     );
diff --git a/frontend/src/component/admin/groups/RemoveGroup/RemoveGroup.tsx b/frontend/src/component/admin/groups/RemoveGroup/RemoveGroup.tsx
index 3dfed93853..d6f1544697 100644
--- a/frontend/src/component/admin/groups/RemoveGroup/RemoveGroup.tsx
+++ b/frontend/src/component/admin/groups/RemoveGroup/RemoveGroup.tsx
@@ -42,18 +42,18 @@ export const RemoveGroup: FC<IRemoveGroupProps> = ({
     return (
         <Dialogue
             open={open}
-            primaryButtonText="Remove"
+            primaryButtonText="Delete group"
             secondaryButtonText="Cancel"
             onClick={onRemoveClick}
             onClose={() => {
                 setOpen(false);
             }}
-            title="Delete group"
+            title="Delete group?"
         >
             <Typography>
-                Are you sure you wish to delete <strong>{group.name}</strong>?
-                If this group is currently assigned to one or more projects then
-                users belonging to this group may lose access to those projects.
+                Do you really want to delete <strong>{group.name}</strong>?
+                Users who are granted access to projects only via this group
+                will lose access to those projects.
             </Typography>
         </Dialogue>
     );