[FIX] User email showing [object Object] (#19870)

RocketChat · Dec 16, 2020 · 8a0258f · 8a0258f
1 parent 3b9f915
commit 8a0258f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/client/lib/getUserEmailAddress.ts b/client/lib/getUserEmailAddress.ts
@@ -1,4 +1,4 @@
-import type { IUser, IUserEmail } from '../../definition/IUser';
+import type { IUser } from '../../definition/IUser';
 
-export const getUserEmailAddress = (user: IUser): IUserEmail | undefined =>
-	(Array.isArray(user.emails) ? user.emails.find(({ address }) => !!address) : undefined);
+export const getUserEmailAddress = (user: IUser): string | undefined =>
+	(Array.isArray(user.emails) ? user.emails.find(({ address }) => !!address)?.address : undefined);
diff --git a/client/lib/getUserEmailVerified.ts b/client/lib/getUserEmailVerified.ts
@@ -0,0 +1,4 @@
+import type { IUser } from '../../definition/IUser';
+
+export const getUserEmailVerified = (user: IUser): boolean | undefined =>
+	(Array.isArray(user.emails) ? user.emails.find(({ verified }) => !!verified)?.verified : undefined);
diff --git a/client/views/room/contextualBar/UserInfo/index.js b/client/views/room/contextualBar/UserInfo/index.js
@@ -17,6 +17,7 @@ import UserActions from './actions/UserActions';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
+import { getUserEmailVerified } from '../../../../lib/getUserEmailVerified';
 
 const Label = (props) => <Box fontScale='p2' color='default' {...props} />;
 
@@ -32,6 +33,7 @@ export const UserInfo = React.memo(function UserInfo({
 	username,
 	bio,
 	email,
+	verified,
 	showRealNames,
 	status,
 	phone,
@@ -105,10 +107,10 @@ export const UserInfo = React.memo(function UserInfo({
 
 			{email && <> <Label>{t('Email')}</Label>
 				<Info display='flex' flexDirection='row' alignItems='center'>
-					<Box is='a' withTruncatedText href={`mailto:${ email.address }`}>{email.address}</Box>
+					<Box is='a' withTruncatedText href={`mailto:${ email }`}>{email}</Box>
 					<Margins inline='x4'>
-						{email.verified && <Tag variant='primary'>{t('Verified')}</Tag>}
-						{email.verified || <Tag disabled>{t('Not_verified')}</Tag>}
+						{verified && <Tag variant='primary'>{t('Verified')}</Tag>}
+						{verified || <Tag disabled>{t('Not_verified')}</Tag>}
 					</Margins>
 				</Info>
 			</>}
@@ -178,6 +180,7 @@ export const UserInfoWithData = React.memo(function UserInfoWithData({ uid, user
 			bio,
 			phone: user.phone,
 			customFields: user.customFields,
+			verified: getUserEmailVerified(user),
 			email: getUserEmailAddress(user),
 			utcOffset,
 			createdAt: user.createdAt,