diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
index c01ed1ba9..beaad3292 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
@@ -266,30 +266,37 @@ export const OrgMembersSection = () => {
The following members will be removed:
-
-
+
+
{(popUp.removeMembers.data?.selectedOrgMemberships as OrgUser[])?.map((member) => {
const email = member.user.email ?? member.user.username ?? member.inviteEmail;
return (
- -
-
- {member.user.firstName || member.user.lastName
- ? `${`${member.user.firstName} ${member.user.lastName}`.trim()} (${email})`
- : email}
-
- {userId === member.user.id && (
-
-
-
-
- Ignored
-
-
-
- )}
+ -
+
+
+ {member.user.firstName || member.user.lastName ? (
+ <>
+ {`${`${member.user.firstName} ${member.user.lastName}`.trim()} `}(
+ {email})
+ >
+ ) : (
+ {email}
+ )}{" "}
+
+ {userId === member.user.id && (
+
+
+
+
+ Ignored
+
+
+
+ )}
+
);
})}
diff --git a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index bbed63813..342b3ca62 100644
--- a/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -10,6 +10,7 @@ import {
faMagnifyingGlass,
faSearch,
faUsers,
+ faUserShield,
faUserSlash,
faUserXmark
} from "@fortawesome/free-solid-svg-icons";
@@ -44,6 +45,7 @@ import {
Td,
Th,
THead,
+ Tooltip,
Tr
} from "@app/components/v2";
import {
@@ -499,15 +501,24 @@ export const OrgMembersTable = ({
}}
/>
-
- {name ?? Not Set}
- {u.superAdmin && (
-
- Server Admin
-
- )}
+ |
+
+
+ {name ?? Not Set}
+
+ {u.superAdmin && (
+
+ Server Admin
+
+
+
+
+ )}
+
+ |
+
+ {username}
|
- {username} |
Username
- {membership.user.username}
+ {membership.user.username}
Email
- {membership.user.email ?? "-"}
-
-
-
+
+ {membership.user.email ?? "-"}{" "}
+
+
+
+
|