D8067.1765197641.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D8067.1765197641.diff
View Options

	diff --git a/web/modals/threads/members/member.react.js b/web/modals/threads/members/member.react.js
	--- a/web/modals/threads/members/member.react.js
	+++ b/web/modals/threads/members/member.react.js
	@@ -42,6 +42,8 @@
	function ThreadMember(props: Props): React.Node {
	const { memberInfo, threadInfo, setOpenMenu, isMenuOpen } = props;
	const userName = stringForUser(memberInfo);
	+ const { roles } = threadInfo;
	+ const { role } = memberInfo;

	const onMenuChange = React.useCallback(
	menuOpen => {
	@@ -134,13 +136,18 @@
	);

	const label = React.useMemo(() => {
	- if (memberIsAdmin(memberInfo, threadInfo)) {
	- return <Label>Admin</Label>;
	- } else if (memberHasAdminPowers(memberInfo)) {
	- return <Label>Parent admin</Label>;
	+ // The parent admin is not associated to a role ID, so check for it first.
	+ if (memberHasAdminPowers(memberInfo)) {
	+ return <Label>Admins</Label>;
	}
	+
	+ const roleName = role && roles[role].name;
	+ if (roleName && roleName !== 'Members') {
	+ return <Label>{roleName}</Label>;
	+ }
	+
	return null;
	- }, [memberInfo, threadInfo]);
	+ }, [memberInfo, role, roles]);

	const memberContainerClasses = classNames(css.memberContainer, {
	[css.memberContainerWithMenuOpen]: isMenuOpen,