[FIX] Unable to edit a user who does not have an email via the admin …

…or via the user's profile (#21626)
RocketChat · May 21, 2021 · 11a40e5 · 11a40e5
1 parent 7d7b681
commit 11a40e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/client/views/account/AccountProfileForm.js b/client/views/account/AccountProfileForm.js
@@ -151,7 +151,7 @@ function AccountProfileForm({ values, handlers, user, settings, onSaveStateChang
 		[statusText, t],
 	);
 	const {
-		emails: [{ verified = false }],
+		emails: [{ verified = false } = { verified: false }],
 	} = user;
 
 	const canSave = !![

diff --git a/client/views/admin/users/EditUser.js b/client/views/admin/users/EditUser.js
@@ -18,8 +18,8 @@ const getInitialValue = (data) => ({
 	status: data.status,
 	bio: data.bio ?? '',
 	nickname: data.nickname ?? '',
-	email: (data.emails && data.emails[0].address) || '',
-	verified: (data.emails && data.emails[0].verified) || false,
+	email: (data.emails && data.emails.length && data.emails[0].address) || '',
+	verified: (data.emails && data.emails.length && data.emails[0].verified) || false,
 	setRandomPassword: false,
 	requirePasswordChange: data.setRandomPassword || false,
 	customFields: data.customFields ?? {},

diff --git a/client/views/directory/UserTable.js b/client/views/directory/UserTable.js
@@ -138,7 +138,7 @@ function UserTable({ workspace = 'local' }) {
 					</Flex.Container>
 				</Table.Cell>
 				{mediaQuery && canViewFullOtherUserInfo && (
-					<Table.Cell withTruncatedText>{emails && emails[0].address}</Table.Cell>
+					<Table.Cell withTruncatedText>{emails && emails.length && emails[0].address}</Table.Cell>
 				)}
 				{federation && <Table.Cell withTruncatedText>{domain}</Table.Cell>}
 				{mediaQuery && (