From e29405f3f12333d95e7829c9e3899f8d254f80fe Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Wed, 18 May 2022 09:53:12 -0300
Subject: [PATCH 1/7] Convert apps/meteor/client/components/RoomAutoComplete
 folder to ts

---
 .../components/RoomAutoComplete/Avatar.js     | 10 -------
 .../components/RoomAutoComplete/Avatar.tsx    | 16 ++++++++++++
 ...omAutoComplete.js => RoomAutoComplete.tsx} | 26 ++++++++++---------
 3 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 apps/meteor/client/components/RoomAutoComplete/Avatar.js
 create mode 100644 apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
 rename apps/meteor/client/components/RoomAutoComplete/{RoomAutoComplete.js => RoomAutoComplete.tsx} (58%)

diff --git a/apps/meteor/client/components/RoomAutoComplete/Avatar.js b/apps/meteor/client/components/RoomAutoComplete/Avatar.js
deleted file mode 100644
index 859cafdc8bd9..000000000000
--- a/apps/meteor/client/components/RoomAutoComplete/Avatar.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Options } from '@rocket.chat/fuselage';
-import React from 'react';
-
-import RoomAvatar from '../avatar/RoomAvatar';
-
-const Avatar = ({ value, type, avatarETag, ...props }) => (
-	<RoomAvatar size={Options.AvatarSize} room={{ type, _id: value, avatarETag }} {...props} />
-);
-
-export default Avatar;
diff --git a/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx b/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
new file mode 100644
index 000000000000..d90fa71772b4
--- /dev/null
+++ b/apps/meteor/client/components/RoomAutoComplete/Avatar.tsx
@@ -0,0 +1,16 @@
+import { Options } from '@rocket.chat/fuselage';
+import React, { ReactElement } from 'react';
+
+import RoomAvatar from '../avatar/RoomAvatar';
+
+type AvatarProps = {
+	value: string;
+	type: string;
+	avatarETag?: string | undefined;
+};
+
+const Avatar = ({ value, type, avatarETag, ...props }: AvatarProps): ReactElement => (
+	<RoomAvatar size={Options.AvatarSize} room={{ t: type, type, _id: value, avatarETag }} {...props} />
+);
+
+export default Avatar;
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.js b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
similarity index 58%
rename from apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.js
rename to apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 79c6ade0ff0a..edd07629fc23 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.js
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -1,13 +1,17 @@
 import { AutoComplete, Option, Box } from '@rocket.chat/fuselage';
-import React, { memo, useMemo, useState } from 'react';
+import React, { ComponentPropsWithRef, memo, ReactElement, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import RoomAvatar from '../avatar/RoomAvatar';
 import Avatar from './Avatar';
 
-const query = (term = '') => ({ selector: JSON.stringify({ name: term }) });
+const query = (
+	term = '',
+): {
+	selector: string;
+} => ({ selector: JSON.stringify({ name: term }) });
 
-const RoomAutoComplete = (props) => {
+const RoomAutoComplete = (props: ComponentPropsWithRef<typeof AutoComplete>): ReactElement => {
 	const [filter, setFilter] = useState('');
 	const { value: data } = useEndpointData(
 		'rooms.autocomplete.channelAndPrivate',
@@ -15,12 +19,10 @@ const RoomAutoComplete = (props) => {
 	);
 	const options = useMemo(
 		() =>
-			(data &&
-				data.items.map(({ name, _id, avatarETag, t }) => ({
-					value: _id,
-					label: { name, avatarETag, type: t },
-				}))) ||
-			[],
+			data?.items.map(({ name, _id, avatarETag, t }) => ({
+				value: _id,
+				label: { name, avatarETag, type: t },
+			})) || [],
 		[data],
 	);
 
@@ -29,7 +31,7 @@ const RoomAutoComplete = (props) => {
 			{...props}
 			filter={filter}
 			setFilter={setFilter}
-			renderSelected={({ value, label }) => (
+			renderSelected={({ value, label }): ReactElement => (
 				<>
 					<Box margin='none' mi='x2'>
 						<RoomAvatar size='x20' room={{ type: label?.type || 'c', _id: value, ...label }} />{' '}
@@ -39,10 +41,10 @@ const RoomAutoComplete = (props) => {
 					</Box>
 				</>
 			)}
-			renderItem={({ value, label, ...props }) => (
+			renderItem={({ value, label, ...props }): ReactElement => (
 				<Option key={value} {...props} label={label.name} avatar={<Avatar value={value} {...label} />} />
 			)}
-			options={options}
+			options={options.map((option) => ({ value: option.value, label: option.label.name || '' }))}
 		/>
 	);
 };

From bc59ab59294da597a87560eabc5a4aa8b3068094 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Wed, 18 May 2022 10:51:40 -0300
Subject: [PATCH 2/7] Convert
 apps/meteor/client/components/UserAutoComplete/UserAutoComplete to tsx

---
 ...erAutoComplete.js => UserAutoComplete.tsx} | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)
 rename apps/meteor/client/components/UserAutoComplete/{UserAutoComplete.js => UserAutoComplete.tsx} (56%)

diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.js b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
similarity index 56%
rename from apps/meteor/client/components/UserAutoComplete/UserAutoComplete.js
rename to apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index dc134617260f..e55b029269fb 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.js
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -1,13 +1,24 @@
 import { AutoComplete, Option, Box, Chip, Options } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import React, { memo, useMemo, useState } from 'react';
+import React, { ComponentProps, memo, MouseEventHandler, ReactElement, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import UserAvatar from '../avatar/UserAvatar';
 
-const query = (term = '', conditions = {}) => ({ selector: JSON.stringify({ term, conditions }) });
+const query = (
+	term = '',
+	conditions = {},
+): {
+	selector: string;
+} => ({ selector: JSON.stringify({ term, conditions }) });
 
-const UserAutoComplete = (props) => {
+type UserAutoCompleteProps = ComponentProps<typeof AutoComplete> &
+	ComponentProps<typeof Option> & {
+		conditions?: { [key: string]: string };
+		onChange?: MouseEventHandler<HTMLButtonElement>;
+	};
+
+const UserAutoComplete = (props: UserAutoCompleteProps): ReactElement => {
 	const { conditions = {} } = props;
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 1000);
@@ -17,20 +28,20 @@ const UserAutoComplete = (props) => {
 		useMemo(() => query(debouncedFilter, conditions), [filter]),
 	);
 
-	const options = useMemo(() => (data && data.items.map((user) => ({ value: user.username, label: user.name }))) || [], [data]);
+	const options = useMemo(() => data?.items.map((user) => ({ value: user.username, label: user.name || '' })) || [], [data]);
 
 	return (
 		<AutoComplete
 			{...props}
 			filter={filter}
 			setFilter={setFilter}
-			renderSelected={({ value, label }) => {
+			renderSelected={({ value, label }): ReactElement => {
 				if (!value) {
-					return '';
+					undefined;
 				}
 
 				return (
-					<Chip height='x20' value={value} onClick={() => props.onChange()} mie='x4'>
+					<Chip height='x20' value={value} onClick={props.onChange} mie='x4'>
 						<UserAvatar size='x20' username={value} />
 						<Box verticalAlign='middle' is='span' margin='none' mi='x4'>
 							{label}
@@ -38,7 +49,7 @@ const UserAutoComplete = (props) => {
 					</Chip>
 				);
 			}}
-			renderItem={({ value, ...props }) => (
+			renderItem={({ value, ...props }): ReactElement => (
 				<Option key={value} avatar={<UserAvatar size={Options.AvatarSize} username={value} />} {...props} />
 			)}
 			options={options}

From 5ebc6bf2b3fdc984b797ce846903ecba828a7eaa Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Wed, 18 May 2022 16:46:20 -0300
Subject: [PATCH 3/7] fixes

---
 .../components/UserAutoComplete/UserAutoComplete.tsx     | 9 ++++++---
 .../client/views/omnichannel/managers/AddManager.tsx     | 5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index e55b029269fb..3d6d8e8ea724 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -12,13 +12,15 @@ const query = (
 	selector: string;
 } => ({ selector: JSON.stringify({ term, conditions }) });
 
-type UserAutoCompleteProps = ComponentProps<typeof AutoComplete> &
-	ComponentProps<typeof Option> & {
+type UserAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'value' | 'filter'> &
+	Omit<ComponentProps<typeof Option>, 'value'> & {
 		conditions?: { [key: string]: string };
 		onChange?: MouseEventHandler<HTMLButtonElement>;
+		value: any;
+		filter?: string;
 	};
 
-const UserAutoComplete = (props: UserAutoCompleteProps): ReactElement => {
+const UserAutoComplete = ({ value, ...props }: UserAutoCompleteProps): ReactElement => {
 	const { conditions = {} } = props;
 	const [filter, setFilter] = useState('');
 	const debouncedFilter = useDebouncedValue(filter, 1000);
@@ -33,6 +35,7 @@ const UserAutoComplete = (props: UserAutoCompleteProps): ReactElement => {
 	return (
 		<AutoComplete
 			{...props}
+			value={value}
 			filter={filter}
 			setFilter={setFilter}
 			renderSelected={({ value, label }): ReactElement => {
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index 6a4f167c96bc..cbc84379503e 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -23,12 +23,15 @@ const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
 		reload();
 		setUsername('');
 	});
+
+	const handleChange = (value: any): void => setUsername(value);
+
 	return (
 		<Box display='flex' alignItems='center' pi='x24'>
 			<Field>
 				<Field.Label>{t('Username')}</Field.Label>
 				<Field.Row>
-					<UserAutoComplete value={username} onChange={setUsername} />
+					<UserAutoComplete value={username} onChange={handleChange} />
 					<Button disabled={!username} onClick={handleSave} mis='x8' primary>
 						{t('Add')}
 					</Button>

From ba46da80abdeb9d18506b0f90c5d398804096752 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Wed, 18 May 2022 17:45:50 -0300
Subject: [PATCH 4/7] fix

---
 .../components/CreateDiscussion/CreateDiscussion.tsx      | 2 +-
 .../components/Omnichannel/modals/ForwardChatModal.tsx    | 3 +--
 .../components/RoomAutoComplete/RoomAutoComplete.tsx      | 8 ++++++--
 .../components/UserAutoComplete/UserAutoComplete.tsx      | 2 +-
 .../admin/permissions/UsersInRole/UsersInRolePage.tsx     | 6 ++++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index 0b684b4d1488..685b9f29fbf4 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -94,7 +94,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 									value={parentRoom}
 									onChange={handleParentRoom}
 									placeholder={t('Discussion_target_channel_description')}
-									disabled={defaultParentRoom}
+									disabled={Boolean(defaultParentRoom)}
 								/>
 							)}
 						</Field.Row>
diff --git a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
index 616895ddc771..853dd7c7d293 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
@@ -109,9 +109,8 @@ const ForwardChatModal = ({
 					<Field.Row>
 						<UserAutoComplete
 							conditions={conditions}
-							flexGrow={1}
 							placeholder={t('Username')}
-							onChange={(value: string): void => {
+							onChange={(value: any): void => {
 								setValue('username', value);
 							}}
 							value={getValues().username}
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index edd07629fc23..023d9288eaff 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -1,5 +1,5 @@
 import { AutoComplete, Option, Box } from '@rocket.chat/fuselage';
-import React, { ComponentPropsWithRef, memo, ReactElement, useMemo, useState } from 'react';
+import React, { ComponentProps, memo, ReactElement, useMemo, useState } from 'react';
 
 import { useEndpointData } from '../../hooks/useEndpointData';
 import RoomAvatar from '../avatar/RoomAvatar';
@@ -11,7 +11,11 @@ const query = (
 	selector: string;
 } => ({ selector: JSON.stringify({ name: term }) });
 
-const RoomAutoComplete = (props: ComponentPropsWithRef<typeof AutoComplete>): ReactElement => {
+type RoomAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'value' | 'filter'> & {
+	value: any;
+};
+
+const RoomAutoComplete = (props: RoomAutoCompleteProps): ReactElement => {
 	const [filter, setFilter] = useState('');
 	const { value: data } = useEndpointData(
 		'rooms.autocomplete.channelAndPrivate',
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index 3d6d8e8ea724..428927e1ce67 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -14,7 +14,7 @@ const query = (
 
 type UserAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'value' | 'filter'> &
 	Omit<ComponentProps<typeof Option>, 'value'> & {
-		conditions?: { [key: string]: string };
+		conditions?: { [key: string]: unknown };
 		onChange?: MouseEventHandler<HTMLButtonElement>;
 		value: any;
 		filter?: string;
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 19bea11d2547..984ae06d299f 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -39,7 +39,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 			setUser(undefined);
 			reload.current?.();
 		} catch (error) {
-			dispatchToastMessage({ type: 'error', message: error });
+			dispatchToastMessage({ type: 'error', message: String(error) });
 		}
 	});
 
@@ -51,6 +51,8 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 		return setUser(user);
 	});
 
+	const handleChange = (value: any): void => setRid(value);
+
 	return (
 		<Page>
 			<Page.Header title={`${t('Users_in_role')} "${description || name}"`}>
@@ -65,7 +67,7 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 							<Field mbe='x4'>
 								<Field.Label>{t('Choose_a_room')}</Field.Label>
 								<Field.Row>
-									<RoomAutoComplete value={rid} onChange={setRid} placeholder={t('User')} />
+									<RoomAutoComplete value={rid} onChange={handleChange} placeholder={t('User')} />
 								</Field.Row>
 							</Field>
 						)}

From ce78eb3fe5973f626e2f1cc3bd49b8df772f2cac Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 19 May 2022 19:10:25 -0300
Subject: [PATCH 5/7] fix review

---
 .../client/components/RoomAutoComplete/RoomAutoComplete.tsx | 5 +++--
 .../client/components/UserAutoComplete/UserAutoComplete.tsx | 2 +-
 .../views/admin/permissions/UsersInRole/UsersInRolePage.tsx | 6 +++++-
 .../meteor/client/views/omnichannel/managers/AddManager.tsx | 6 +++++-
 packages/rest-typings/src/v1/users.ts                       | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 023d9288eaff..762bd2cc7ed1 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -15,6 +15,7 @@ type RoomAutoCompleteProps = Omit<ComponentProps<typeof AutoComplete>, 'value' |
 	value: any;
 };
 
+/* @deprecated */
 const RoomAutoComplete = (props: RoomAutoCompleteProps): ReactElement => {
 	const [filter, setFilter] = useState('');
 	const { value: data } = useEndpointData(
@@ -28,7 +29,7 @@ const RoomAutoComplete = (props: RoomAutoCompleteProps): ReactElement => {
 				label: { name, avatarETag, type: t },
 			})) || [],
 		[data],
-	);
+	) as unknown as { value: string; label: string }[];
 
 	return (
 		<AutoComplete
@@ -48,7 +49,7 @@ const RoomAutoComplete = (props: RoomAutoCompleteProps): ReactElement => {
 			renderItem={({ value, label, ...props }): ReactElement => (
 				<Option key={value} {...props} label={label.name} avatar={<Avatar value={value} {...label} />} />
 			)}
-			options={options.map((option) => ({ value: option.value, label: option.label.name || '' }))}
+			options={options}
 		/>
 	);
 };
diff --git a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
index 428927e1ce67..f24bbb096be3 100644
--- a/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
+++ b/apps/meteor/client/components/UserAutoComplete/UserAutoComplete.tsx
@@ -30,7 +30,7 @@ const UserAutoComplete = ({ value, ...props }: UserAutoCompleteProps): ReactElem
 		useMemo(() => query(debouncedFilter, conditions), [filter]),
 	);
 
-	const options = useMemo(() => data?.items.map((user) => ({ value: user.username, label: user.name || '' })) || [], [data]);
+	const options = useMemo(() => data?.items.map((user) => ({ value: user.username, label: user.name || user.username })) || [], [data]);
 
 	return (
 		<AutoComplete
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 984ae06d299f..018abbcb33c5 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -51,7 +51,11 @@ const UsersInRolePage = ({ role }: { role: IRole }): ReactElement => {
 		return setUser(user);
 	});
 
-	const handleChange = (value: any): void => setRid(value);
+	const handleChange = (value: unknown): void => {
+		if (typeof value === 'string') {
+			setRid(value);
+		}
+	};
 
 	return (
 		<Page>
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index cbc84379503e..58e6d956afce 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -24,7 +24,11 @@ const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
 		setUsername('');
 	});
 
-	const handleChange = (value: any): void => setUsername(value);
+	const handleChange = (value: unknown): void => {
+		if (typeof value === 'string') {
+			setUsername(value);
+		}
+	};
 
 	return (
 		<Box display='flex' alignItems='center' pi='x24'>
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 1dedd4791400..9f0dfffa96ab 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -10,7 +10,7 @@ export type UsersEndpoints = {
 		POST: (params: { emailOrUsername: string }) => void;
 	};
 	'users.autocomplete': {
-		GET: (params: { selector: string }) => { items: IUser[] };
+		GET: (params: { selector: string }) => { items: Omit<IUser, 'username'> & Required<Pick<IUser, 'username'>>[] };
 	};
 	'users.listTeams': {
 		GET: (params: { userId: IUser['_id'] }) => { teams: Array<ITeam> };

From f1f7c4a066f6e2fdba6603fd92f40417c869b1c1 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 May 2022 09:40:22 -0300
Subject: [PATCH 6/7] fix fix review

---
 packages/core-typings/src/IUser.ts    | 1 +
 packages/rest-typings/src/v1/users.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index c7d00ad750f6..9d0b4547d639 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -109,6 +109,7 @@ export interface IUser extends IRocketChatRecord {
 	type: string;
 	active: boolean;
 	username?: string;
+	nickname?: string;
 	name?: string;
 	services?: IUserServices;
 	emails?: IUserEmail[];
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 9f0dfffa96ab..392b089e043d 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -10,7 +10,9 @@ export type UsersEndpoints = {
 		POST: (params: { emailOrUsername: string }) => void;
 	};
 	'users.autocomplete': {
-		GET: (params: { selector: string }) => { items: Omit<IUser, 'username'> & Required<Pick<IUser, 'username'>>[] };
+		GET: (params: { selector: string }) => {
+			items: Required<Pick<IUser, 'name' | 'username' | 'nickname' | 'status' | 'avatarETag'>>[];
+		};
 	};
 	'users.listTeams': {
 		GET: (params: { userId: IUser['_id'] }) => { teams: Array<ITeam> };

From 870c3805fde2ada49ed7e9318360033b22d11731 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 20 May 2022 12:10:37 -0300
Subject: [PATCH 7/7] fix fix

---
 packages/rest-typings/src/v1/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 392b089e043d..0f9951f4dfec 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -11,7 +11,7 @@ export type UsersEndpoints = {
 	};
 	'users.autocomplete': {
 		GET: (params: { selector: string }) => {
-			items: Required<Pick<IUser, 'name' | 'username' | 'nickname' | 'status' | 'avatarETag'>>[];
+			items: Required<Pick<IUser, '_id' | 'name' | 'username' | 'nickname' | 'status' | 'avatarETag'>>[];
 		};
 	};
 	'users.listTeams': {