From 0527589fcf94b540f88dfb3a9984500f6fe671b0 Mon Sep 17 00:00:00 2001
From: dougfabris <deefabris@gmail.com>
Date: Wed, 12 May 2021 16:09:46 -0300
Subject: [PATCH] fix UserInfo

---
 .../room/contextualBar/UserInfo/UserInfo.js    | 16 +++++++++++++++-
 .../contextualBar/UserInfo/UserInfoWithData.js | 18 ++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/views/room/contextualBar/UserInfo/UserInfo.js b/client/views/room/contextualBar/UserInfo/UserInfo.js
index 1ce43e11aeebe..a28516342d770 100644
--- a/client/views/room/contextualBar/UserInfo/UserInfo.js
+++ b/client/views/room/contextualBar/UserInfo/UserInfo.js
@@ -5,6 +5,7 @@ import MarkdownText from '../../../../components/MarkdownText';
 import UTCClock from '../../../../components/UTCClock';
 import UserCard from '../../../../components/UserCard';
 import VerticalBar from '../../../../components/VerticalBar';
+import { useSetting } from '../../../../contexts/SettingsContext';
 import { useTranslation } from '../../../../contexts/TranslationContext';
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import InfoPanel from '../../../InfoPanel';
@@ -34,6 +35,19 @@ function UserInfo({
 
 	const timeAgo = useTimeAgo();
 
+	const customFieldsToShowSetting = useSetting('Accounts_CustomFieldsToShowInUserInfo');
+	const customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);
+
+	const customFieldsToShow = customFieldsToShowObj
+		? Object.values(customFieldsToShowObj).map((value) => {
+				const role = Object.values(value);
+				const roleNameToShow = Object.keys(value);
+				const customField = {};
+				customField[roleNameToShow] = customFields[role];
+				return customField;
+		  })
+		: [];
+
 	return (
 		<VerticalBar.ScrollableContent p='x24' {...props}>
 			<InfoPanel>
@@ -129,7 +143,7 @@ function UserInfo({
 						</InfoPanel.Field>
 					)}
 
-					{customFields.map((customField) =>
+					{customFieldsToShow.map((customField) =>
 						Object.values(customField)[0] ? (
 							<InfoPanel.Field key={Object.keys(customField)[0]}>
 								<InfoPanel.Label>{t(Object.keys(customField)[0])}</InfoPanel.Label>
diff --git a/client/views/room/contextualBar/UserInfo/UserInfoWithData.js b/client/views/room/contextualBar/UserInfo/UserInfoWithData.js
index 8ba29be438593..b723f6b5fad78 100644
--- a/client/views/room/contextualBar/UserInfo/UserInfoWithData.js
+++ b/client/views/room/contextualBar/UserInfo/UserInfoWithData.js
@@ -40,23 +40,9 @@ function UserInfoWithData({
 		]),
 	);
 
-	const customFieldsToShowSetting = useSetting('Accounts_CustomFieldsToShowInUserInfo');
-
 	const user = useMemo(() => {
 		const { user } = value || { user: {} };
 
-		const customFieldsToShowObj = JSON.parse(customFieldsToShowSetting);
-
-		const customFieldsToShow = customFieldsToShowObj
-			? Object.values(customFieldsToShowObj).map((value) => {
-					const role = Object.values(value);
-					const roleNameToShow = Object.keys(value);
-					const customField = {};
-					customField[roleNameToShow] = user?.customFields[role];
-					return customField;
-			  })
-			: [];
-
 		const {
 			_id,
 			name,
@@ -78,7 +64,7 @@ function UserInfoWithData({
 				getRoles(roles).map((role, index) => <UserCard.Role key={index}>{role}</UserCard.Role>),
 			bio,
 			phone: user.phone,
-			customFields: customFieldsToShow,
+			customFields: user.customFields,
 			verified: getUserEmailVerified(user),
 			email: getUserEmailAddress(user),
 			utcOffset,
@@ -87,7 +73,7 @@ function UserInfoWithData({
 			customStatus: statusText,
 			nickname,
 		};
-	}, [value, customFieldsToShowSetting, showRealNames, getRoles]);
+	}, [value, showRealNames, getRoles]);
 
 	return (
 		<>