From c30b478226216fc9dae1d67bc06a6530339b34bc Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Wed, 30 Aug 2023 13:57:38 -0300
Subject: [PATCH 01/61] feat: User Panel > Tab ALL (#29622)

* all tab initial

* remove "-" fallback

* change 'status' to 'registration status'

---------

Co-authored-by: dougfabris <devfabris@gmail.com>
Co-authored-by: Felipe <84182706+felipe-rod123@users.noreply.github.com>
---
 .../views/admin/users/AdminUsersPage.tsx      | 27 ++++++++++++++++---
 .../admin/users/UsersTable/UsersTable.tsx     |  2 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  | 21 ++++++++-------
 .../rocketchat-i18n/i18n/en.i18n.json         |  3 +++
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 24622a44bcc6..838a383d4fc9 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -1,7 +1,7 @@
-import { Button, ButtonGroup } from '@rocket.chat/fuselage';
+import { Button, ButtonGroup, Tabs } from '@rocket.chat/fuselage';
 import { usePermission, useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 
 import UserPageHeaderContentWithSeatsCap from '../../../../ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap';
 import { useSeatsCap } from '../../../../ee/client/views/admin/users/useSeatsCap';
@@ -25,15 +25,17 @@ const UsersPage = (): ReactElement => {
 	const canCreateUser = usePermission('create-user');
 	const canBulkCreateUser = usePermission('bulk-register-user');
 
+	const [tab, setTab] = useState<string>('all');
+
 	useEffect(() => {
 		if (!context || !seatsCap) {
 			return;
 		}
 
-		if (seatsCap.activeUsers >= seatsCap.maxActiveUsers && !['edit', 'info'].includes(context)) {
+		if (seatsCap.activeUsers >= seatsCap.maxActiveUsers && context && !['edit', 'info'].includes(context)) {
 			router.navigate('/admin/users');
 		}
-	}, [router, context, seatsCap]);
+	}, [context, seatsCap, tab, router]);
 
 	const handleReload = (): void => {
 		seatsCap?.reload();
@@ -62,6 +64,23 @@ const UsersPage = (): ReactElement => {
 					)}
 				</Page.Header>
 				<Page.Content>
+					<Tabs>
+						<Tabs.Item selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
+							{t('All')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'tab-invited'} onClick={() => setTab('tab-invited')}>
+							{t('Invited')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'tab-new'} onClick={() => setTab('tab-new')}>
+							{t('New_users')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'tab-active'} onClick={() => setTab('tab-active')}>
+							{t('Active')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'tab-deactivated'} onClick={() => setTab('tab-deactivated')}>
+							{t('Deactivated')}
+						</Tabs.Item>
+					</Tabs>
 					<UsersTable reload={reload} />
 				</Page.Content>
 			</Page>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 981e75483d03..44175ec47de7 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -132,7 +132,7 @@ const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
 				</GenericTableHeaderCell>
 			),
 			<GenericTableHeaderCell w='x100' key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
-				{t('Status')}
+				{t('Registration_status')}
 			</GenericTableHeaderCell>,
 		],
 		[mediaQuery, setSort, sortBy, sortDirection, t],
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 2572b7446c42..64e3f4858ffa 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,25 +1,25 @@
+import { UserStatus as Status } from '@rocket.chat/core-typings';
 import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { capitalize } from '@rocket.chat/string-helpers';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
 import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
+import { UserStatus } from '../../../../components/UserStatus';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 
 type UsersTableRowProps = {
-	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>;
+	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'emails' | 'active' | 'avatarETag' | 'roles'>;
 	onClick: (id: IUser['_id']) => void;
 	mediaQuery: boolean;
 };
 
 const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): ReactElement => {
 	const t = useTranslation();
-	const { _id, emails, username, name, roles, status, active, avatarETag } = user;
-	const statusText = active ? t(capitalize(status as string) as TranslationKey) : t('Disabled');
+	const { _id, emails, username, name, status, roles, active, avatarETag } = user;
+	const registrationStatusText = active ? t('Active') : t('Deactivated');
 
 	const roleNames = (roles || [])
 		.map((roleId) => (Roles.findOne(roleId, { fields: { name: 1 } }) as IRole | undefined)?.name)
@@ -41,12 +41,14 @@ const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): React
 					<Box display='flex' mi={8} withTruncatedText>
 						<Box display='flex' flexDirection='column' alignSelf='center' withTruncatedText>
 							<Box fontScale='p2m' color='default' withTruncatedText>
+								<Box display='inline' mie='x8'>
+									<UserStatus status={status || Status.OFFLINE} />
+								</Box>
 								{name || username}
 							</Box>
 							{!mediaQuery && name && (
 								<Box fontScale='p2' color='hint' withTruncatedText>
-									{' '}
-									{`@${username}`}{' '}
+									{`@${username}`}
 								</Box>
 							)}
 						</Box>
@@ -57,14 +59,15 @@ const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): React
 				<GenericTableCell>
 					<Box fontScale='p2m' color='hint' withTruncatedText>
 						{username}
-					</Box>{' '}
+					</Box>
 					<Box mi={4} />
 				</GenericTableCell>
 			)}
+
 			<GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>
 			{mediaQuery && <GenericTableCell withTruncatedText>{roleNames}</GenericTableCell>}
 			<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
-				{statusText}
+				{registrationStatusText}
 			</GenericTableCell>
 		</GenericTableRow>
 	);
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index d1e0248fba48..93aac3827b2c 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1521,6 +1521,7 @@
   "DDP_Rate_Limit_User_Interval_Time": "Limit by User: interval time",
   "DDP_Rate_Limit_User_Requests_Allowed": "Limit by User: requests allowed",
   "Deactivate": "Deactivate",
+  "Deactivated": "Deactivated",
   "Decline": "Decline",
   "Decode_Key": "Decode Key",
   "default": "default",
@@ -2669,6 +2670,7 @@
   "Invitation_Subject": "Invitation Subject",
   "Invitation_Subject_Default": "You have been invited to [Site_Name]",
   "Invite": "Invite",
+  "Invited": "Invited",
   "Invites": "Invites",
   "Invite_and_add_members_to_this_workspace_to_start_communicating": "Invite and add members to this workspace to start communicating.",
   "Invite_Link": "Invite Link",
@@ -5999,5 +6001,6 @@
   "All_visible": "All visible",
   "Filter_by_room": "Filter by room type",
   "Filter_by_visibility": "Filter by visibility",
+  "Registration_status": "Registration status",
   "Theme_Appearence": "Theme Appearence"
 }

From 90da483aa7094fa9893a25cab15a7d09726aebaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Wed, 4 Oct 2023 16:32:28 -0300
Subject: [PATCH 02/61] feat: Implement users page active tab (#30242)

* feat: :sparkles: Filter users list by active users

Implemented the necessary resources to filter the list of users and to return only those who are active, when the active tab is enabled.

* feat: :sparkles: Implement new roles filter in the admin users page

Implemented a new filter on the users' page that retrieves the roles list and creates a dropdown menu. When any of its options is selected, it will filter the users' list to display only those with the selected roles. Additionally, I made some minor adjustments to the MultiSelectCustom component and introduced some new hooks.

* WIP: Remove filters

* feat: :sparkles: WIP: Implement new actions menu for users page table

* feat: :sparkles: Finish users table menu

Completed the implementation of the users table actions menu by preventing the propagation of the click event that triggered the opening of the contextual bar when the menu was clicked. Also, ensured that the contextual bar only opens when the "Enter" or "Space" keys are used for keyboard navigation and enhanced the options menu in the contextual bar as specified in Figma.

* refactor: :recycle: Remove status badge from contextual bar and reorg

Removed the status from the users page contextual bar (the need to remove this may not be concrete, for now it will be only commented until the final decision is made). Also changed the order of the contextual bar info and changed some minor styles to follow figma specs.

* Typecheck

* Re-add icon back to InfoPanelTitle

* Hide registration status and justify actions menu

* Review, reintroduce contextual bar full name and status
---
 .../components/InfoPanel/InfoPanelTitle.tsx   |   6 +-
 .../components/UserCard/UserCardRoles.tsx     |   2 +-
 .../client/components/UserInfo/UserInfo.tsx   |  40 ++---
 .../admin/users/AdminUserInfoActions.tsx      |  10 +-
 .../views/admin/users/AdminUsersPage.tsx      |  12 +-
 .../admin/users/UsersTable/UsersTable.tsx     | 152 +++++++++---------
 .../admin/users/UsersTable/UsersTableRow.tsx  |  94 ++++++++++-
 .../admin/users/hooks/useFilterActiveUsers.ts |  10 ++
 .../admin/users/hooks/useFilterUsersByrole.ts |  12 ++
 .../views/admin/users/hooks/useListUsers.ts   |  69 ++++++++
 .../rocketchat-i18n/i18n/en.i18n.json         |   6 +-
 .../MultiSelectCustom/MultiSelectCustom.tsx   |   4 +-
 .../MultiSelectCustomAnchor.tsx               |   9 +-
 .../MultiSelectCustomList.tsx                 |   4 +-
 14 files changed, 307 insertions(+), 123 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useListUsers.ts

diff --git a/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx b/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
index 7ea4de6d9867..615f6762efd1 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanelTitle.tsx
@@ -5,15 +5,15 @@ import React from 'react';
 
 type InfoPanelTitleProps = {
 	title: string;
-	icon: ReactNode;
+	icon?: ReactNode;
 };
 
 const isValidIcon = (icon: ReactNode): icon is IconName => typeof icon === 'string';
 
 const InfoPanelTitle: FC<InfoPanelTitleProps> = ({ title, icon }) => (
-	<Box display='flex' flexShrink={0} alignItems='center' fontScale='h4' color='default' withTruncatedText>
+	<Box display='flex' flexShrink={0} alignItems='center' fontScale='p1m' color='default' withTruncatedText>
 		{isValidIcon(icon) ? <Icon name={icon} size='x22' /> : icon}
-		<Box mis={8} withTruncatedText title={title}>
+		<Box withTruncatedText title={title} mis={8}>
 			{title}
 		</Box>
 	</Box>
diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index 9cd22ebdff35..f7a977d4a4dc 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -6,7 +6,7 @@ import UserCardInfo from './UserCardInfo';
 
 const UserCardRoles = ({ children }: { children: ReactNode }): ReactElement => (
 	<Box m='neg-x2'>
-		<UserCardInfo flexWrap='wrap' display='flex' flexShrink={0}>
+		<UserCardInfo mb={8} flexWrap='wrap' display='flex' flexShrink={0}>
 			{children}
 		</UserCardInfo>
 	</Box>
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index bdce27d028ad..8a42f1b87026 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -81,12 +81,19 @@ const UserInfo = ({
 					{userDisplayName && <InfoPanel.Title icon={status} title={userDisplayName} />}
 					{statusText && (
 						<InfoPanel.Text>
-							<MarkdownText content={statusText} parseEmoji={true} />
+							<MarkdownText content={statusText} parseEmoji={true} variant='inline' />
 						</InfoPanel.Text>
 					)}
 				</InfoPanel.Section>
 
 				<InfoPanel.Section>
+					{nickname && (
+						<InfoPanel.Field>
+							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
+							<InfoPanel.Text>{nickname}</InfoPanel.Text>
+						</InfoPanel.Field>
+					)}
+
 					{roles.length !== 0 && (
 						<InfoPanel.Field>
 							<InfoPanel.Label>{t('Roles')}</InfoPanel.Label>
@@ -94,6 +101,13 @@ const UserInfo = ({
 						</InfoPanel.Field>
 					)}
 
+					{username && username !== name && (
+						<InfoPanel.Field>
+							<InfoPanel.Label>{t('Username')}</InfoPanel.Label>
+							<InfoPanel.Text data-qa='UserInfoUserName'>{username}</InfoPanel.Text>
+						</InfoPanel.Field>
+					)}
+
 					{Number.isInteger(utcOffset) && (
 						<InfoPanel.Field>
 							<InfoPanel.Label>{t('Local_Time')}</InfoPanel.Label>
@@ -101,10 +115,12 @@ const UserInfo = ({
 						</InfoPanel.Field>
 					)}
 
-					{username && username !== name && (
+					{bio && (
 						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Username')}</InfoPanel.Label>
-							<InfoPanel.Text data-qa='UserInfoUserName'>{username}</InfoPanel.Text>
+							<InfoPanel.Label>{t('Bio')}</InfoPanel.Label>
+							<InfoPanel.Text withTruncatedText={false}>
+								<MarkdownText variant='inline' content={bio} />
+							</InfoPanel.Text>
 						</InfoPanel.Field>
 					)}
 
@@ -122,22 +138,6 @@ const UserInfo = ({
 						</InfoPanel.Field>
 					)}
 
-					{nickname && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
-							<InfoPanel.Text>{nickname}</InfoPanel.Text>
-						</InfoPanel.Field>
-					)}
-
-					{bio && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Bio')}</InfoPanel.Label>
-							<InfoPanel.Text withTruncatedText={false}>
-								<MarkdownText variant='inline' content={bio} />
-							</InfoPanel.Text>
-						</InfoPanel.Field>
-					)}
-
 					{phone && (
 						<InfoPanel.Field>
 							<InfoPanel.Label>{t('Phone')}</InfoPanel.Label>
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index d003b47ba2af..dd0bf833f72b 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -83,8 +83,8 @@ const AdminUserInfoActions = ({
 			...(changeAdminStatusAction && !isFederatedUser && { makeAdmin: changeAdminStatusAction }),
 			...(resetE2EKeyAction && !isFederatedUser && { resetE2EKey: resetE2EKeyAction }),
 			...(resetTOTPAction && !isFederatedUser && { resetTOTP: resetTOTPAction }),
-			...(deleteUserAction && { delete: deleteUserAction }),
 			...(changeUserStatusAction && !isFederatedUser && { changeActiveStatus: changeUserStatusAction }),
+			...(deleteUserAction && { delete: deleteUserAction }),
 		}),
 		[
 			t,
@@ -116,7 +116,13 @@ const AdminUserInfoActions = ({
 				secondary
 				flexShrink={0}
 				key='menu'
-				renderItem={({ label: { label, icon }, ...props }): ReactElement => <Option label={label} title={label} icon={icon} {...props} />}
+				renderItem={({ label: { label, icon }, ...props }): ReactElement =>
+					label === 'Delete' ? (
+						<Option label={label} title={label} icon={icon} variant='danger' {...props} />
+					) : (
+						<Option label={label} title={label} icon={icon} {...props} />
+					)
+				}
 				options={menuOptions}
 			/>
 		);
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index e4f1f25b2c7b..e0e88bedcd90 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -25,7 +25,7 @@ const UsersPage = (): ReactElement => {
 	const canCreateUser = usePermission('create-user');
 	const canBulkCreateUser = usePermission('bulk-register-user');
 
-	const [tab, setTab] = useState<string>('all');
+	const [tab, setTab] = useState<'all' | 'invited' | 'new' | 'active' | 'deactivated'>('all');
 
 	useEffect(() => {
 		if (!context || !seatsCap) {
@@ -68,20 +68,20 @@ const UsersPage = (): ReactElement => {
 						<Tabs.Item selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
 							{t('All')}
 						</Tabs.Item>
-						<Tabs.Item selected={tab === 'tab-invited'} onClick={() => setTab('tab-invited')}>
+						<Tabs.Item selected={tab === 'invited'} onClick={() => setTab('invited')}>
 							{t('Invited')}
 						</Tabs.Item>
-						<Tabs.Item selected={tab === 'tab-new'} onClick={() => setTab('tab-new')}>
+						<Tabs.Item selected={tab === 'new'} onClick={() => setTab('new')}>
 							{t('New_users')}
 						</Tabs.Item>
-						<Tabs.Item selected={tab === 'tab-active'} onClick={() => setTab('tab-active')}>
+						<Tabs.Item selected={tab === 'active'} onClick={() => setTab('active')}>
 							{t('Active')}
 						</Tabs.Item>
-						<Tabs.Item selected={tab === 'tab-deactivated'} onClick={() => setTab('tab-deactivated')}>
+						<Tabs.Item selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
 							{t('Deactivated')}
 						</Tabs.Item>
 					</Tabs>
-					<UsersTable reload={reload} />
+					<UsersTable reload={reload} tab={tab} onReload={handleReload} />
 				</Page.Content>
 			</Page>
 			{context && (
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 44175ec47de7..7f2dd575e66e 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,8 +1,6 @@
-import { Pagination } from '@rocket.chat/fuselage';
+import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useEndpoint, useRoute, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
+import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useRef, useMemo, useState, useEffect } from 'react';
 
@@ -17,86 +15,73 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import { useFilterActiveUsers } from '../hooks/useFilterActiveUsers';
+import { useListUsers } from '../hooks/useListUsers';
 import UsersTableRow from './UsersTableRow';
 
 type UsersTableProps = {
 	reload: MutableRefObject<() => void>;
+	tab: string;
+	onReload: () => void;
 };
 
 // TODO: Missing error state
-const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
-	const usersRoute = useRoute('admin-users');
+	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
+
 	const [text, setText] = useState('');
 
 	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'status'>('name');
 
 	const searchTerm = useDebouncedValue(text, 500);
-	const prevSearchTerm = useRef<string>('');
-
-	const query = useDebouncedValue(
-		useMemo(() => {
-			if (searchTerm !== prevSearchTerm.current) {
-				setCurrent(0);
-			}
-
-			return {
-				fields: JSON.stringify({
-					name: 1,
-					username: 1,
-					emails: 1,
-					roles: 1,
-					status: 1,
-					avatarETag: 1,
-					active: 1,
-				}),
-				query: JSON.stringify({
-					$or: [
-						{ 'emails.address': { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-						{ username: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-						{ name: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-					],
-				}),
-				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-				count: itemsPerPage,
-				offset: searchTerm === prevSearchTerm.current ? current : 0,
-			};
-		}, [searchTerm, sortBy, sortDirection, itemsPerPage, current, setCurrent]),
-		500,
+	const prevSearchTerm = useRef('');
+
+	const { data, isLoading, isSuccess, isError, refetch } = useListUsers(
+		searchTerm,
+		prevSearchTerm,
+		setCurrent,
+		sortBy,
+		sortDirection,
+		itemsPerPage,
+		current,
 	);
 
-	const getUsers = useEndpoint('GET', '/v1/users.list');
+	const useAllUsers = () => (tab === 'all' && isSuccess ? data?.users : []);
 
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const { data, isLoading, error, isSuccess, refetch } = useQuery(
-		['users', query],
-		async () => {
-			const users = await getUsers(query);
-			return users;
-		},
-		{
-			onError: (error) => {
-				dispatchToastMessage({ type: 'error', message: error });
-			},
-		},
-	);
+	const filteredUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab)];
 
 	useEffect(() => {
 		reload.current = refetch;
-	}, [reload, refetch]);
-
-	useEffect(() => {
 		prevSearchTerm.current = searchTerm;
-	}, [searchTerm]);
+	}, [reload, refetch, searchTerm]);
+
+	const isKeyboardEvent = (
+		event: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>,
+	): event is React.KeyboardEvent<HTMLElement> => {
+		return (event as React.KeyboardEvent<HTMLElement>).key !== undefined;
+	};
+
+	const handleClickOrKeyDown = useMutableCallback(
+		(id, e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>): void => {
+			e.stopPropagation();
+
+			const keyboardSubmitKeys = ['Enter', ' '];
 
-	const handleClick = useMutableCallback((id): void =>
-		usersRoute.push({
-			context: 'info',
-			id,
-		}),
+			if (isKeyboardEvent(e) && !keyboardSubmitKeys.includes(e.key)) {
+				return;
+			}
+
+			router.navigate({
+				name: 'admin-users',
+				params: {
+					context: 'info',
+					id,
+				},
+			});
+		},
 	);
 
 	const headers = useMemo(
@@ -131,17 +116,23 @@ const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
 					{t('Roles')}
 				</GenericTableHeaderCell>
 			),
-			<GenericTableHeaderCell w='x100' key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
-				{t('Registration_status')}
-			</GenericTableHeaderCell>,
+			tab === 'all' && (
+				<GenericTableHeaderCell
+					w='x100'
+					key='status'
+					direction={sortDirection}
+					active={sortBy === 'status'}
+					onClick={setSort}
+					sort='status'
+				>
+					{t('Registration_status')}
+				</GenericTableHeaderCell>
+			),
+			<GenericTableHeaderCell key='actions' w='x44' />,
 		],
-		[mediaQuery, setSort, sortBy, sortDirection, t],
+		[mediaQuery, setSort, sortBy, sortDirection, t, tab],
 	);
 
-	if (error) {
-		return null;
-	}
-
 	return (
 		<>
 			<FilterByText autoFocus placeholder={t('Search_Users')} onChange={({ text }): void => setText(text)} />
@@ -151,13 +142,21 @@ const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
 					<GenericTableBody>{isLoading && <GenericTableLoadingTable headerCells={5} />}</GenericTableBody>
 				</GenericTable>
 			)}
-			{data?.users && data.count > 0 && isSuccess && (
+			{isSuccess && !!data && !!filteredUsers && data.count > 0 && (
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{data?.users.map((user) => (
-								<UsersTableRow key={user._id} onClick={handleClick} mediaQuery={mediaQuery} user={user} />
+							{filteredUsers.map((user) => (
+								<UsersTableRow
+									key={user._id}
+									onClick={handleClickOrKeyDown}
+									mediaQuery={mediaQuery}
+									user={user}
+									refetchUsers={refetch}
+									onReload={onReload}
+									tab={tab}
+								/>
 							))}
 						</GenericTableBody>
 					</GenericTable>
@@ -173,6 +172,15 @@ const UsersTable = ({ reload }: UsersTableProps): ReactElement | null => {
 				</>
 			)}
 			{isSuccess && data?.count === 0 && <GenericNoResults />}
+			{isError && (
+				<States>
+					<StatesIcon name='warning' variation='danger' />
+					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+					<StatesActions>
+						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
+					</StatesActions>
+				</States>
+			)}
 		</>
 	);
 };
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 64e3f4858ffa..637ad5018615 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,7 +1,9 @@
-import { UserStatus as Status } from '@rocket.chat/core-typings';
+import { UserStatus as Status, isUserFederated } from '@rocket.chat/core-typings';
 import type { IRole, IUser } from '@rocket.chat/core-typings';
-import { Box } from '@rocket.chat/fuselage';
+import { Box, Menu, Option } from '@rocket.chat/fuselage';
+import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
@@ -9,14 +11,22 @@ import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { UserStatus } from '../../../../components/UserStatus';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
+import { useChangeAdminStatusAction } from '../hooks/useChangeAdminStatusAction';
+import { useChangeUserStatusAction } from '../hooks/useChangeUserStatusAction';
+import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
+import { useResetE2EEKeyAction } from '../hooks/useResetE2EEKeyAction';
+import { useResetTOTPAction } from '../hooks/useResetTOTPAction';
 
 type UsersTableRowProps = {
 	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'emails' | 'active' | 'avatarETag' | 'roles'>;
-	onClick: (id: IUser['_id']) => void;
+	onClick: (id: IUser['_id'], e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => void;
 	mediaQuery: boolean;
+	refetchUsers: ReturnType<typeof useQuery>['refetch'];
+	onReload: () => void;
+	tab: string;
 };
 
-const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): ReactElement => {
+const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab }: UsersTableRowProps): ReactElement => {
 	const t = useTranslation();
 	const { _id, emails, username, name, status, roles, active, avatarETag } = user;
 	const registrationStatusText = active ? t('Active') : t('Deactivated');
@@ -26,10 +36,54 @@ const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): React
 		.filter((roleName): roleName is string => !!roleName)
 		.join(', ');
 
+	const userId = user._id;
+	const isAdmin = user.roles?.includes('admin');
+	const isActive = user.active;
+	const isFederatedUser = isUserFederated(user);
+
+	const onChange = useMutableCallback(() => {
+		onReload();
+		refetchUsers();
+	});
+
+	const changeAdminStatusAction = useChangeAdminStatusAction(userId, isAdmin, onChange);
+	const changeUserStatusAction = useChangeUserStatusAction(userId, isActive, onChange);
+	const deleteUserAction = useDeleteUserAction(userId, onChange, onReload);
+	const resetTOTPAction = useResetTOTPAction(userId);
+	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
+
+	const menuOptions = {
+		...(changeAdminStatusAction &&
+			!isFederatedUser && {
+				makeAdmin: {
+					label: { label: changeAdminStatusAction.label, icon: changeAdminStatusAction.icon },
+					action: changeAdminStatusAction.action,
+				},
+			}),
+		...(resetE2EKeyAction &&
+			!isFederatedUser && {
+				resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
+			}),
+		...(resetTOTPAction &&
+			!isFederatedUser && {
+				resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
+			}),
+		...(changeUserStatusAction &&
+			!isFederatedUser && {
+				changeActiveStatus: {
+					label: { label: changeUserStatusAction.label, icon: changeUserStatusAction.icon },
+					action: changeUserStatusAction.action,
+				},
+			}),
+		...(deleteUserAction && {
+			delete: { label: { label: deleteUserAction.label, icon: deleteUserAction.icon }, action: deleteUserAction.action },
+		}),
+	};
+
 	return (
 		<GenericTableRow
-			onKeyDown={(): void => onClick(_id)}
-			onClick={(): void => onClick(_id)}
+			onKeyDown={(e): void => onClick(_id, e)}
+			onClick={(e): void => onClick(_id, e)}
 			tabIndex={0}
 			role='link'
 			action
@@ -66,8 +120,32 @@ const UsersTableRow = ({ user, onClick, mediaQuery }: UsersTableRowProps): React
 
 			<GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>
 			{mediaQuery && <GenericTableCell withTruncatedText>{roleNames}</GenericTableCell>}
-			<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
-				{registrationStatusText}
+			{tab === 'all' && (
+				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
+					{registrationStatusText}
+				</GenericTableCell>
+			)}
+			<GenericTableCell
+				display='flex'
+				justifyContent='flex-end'
+				onClick={(e): void => {
+					e.stopPropagation();
+				}}
+			>
+				<Menu
+					mi={4}
+					placement='bottom-start'
+					flexShrink={0}
+					key='menu'
+					renderItem={({ label: { label, icon }, ...props }): ReactElement =>
+						label === 'Delete' ? (
+							<Option label={label} title={label} icon={icon} variant='danger' {...props} />
+						) : (
+							<Option label={label} title={label} icon={icon} {...props} />
+						)
+					}
+					options={menuOptions}
+				/>
 			</GenericTableCell>
 		</GenericTableRow>
 	);
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
new file mode 100644
index 000000000000..a8dd6acfa3b7
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
@@ -0,0 +1,10 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+export const useFilterActiveUsers = (
+	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[] | undefined,
+	tab: string,
+) => {
+	if (!users || tab !== 'active') return [];
+
+	return users.filter((currentUser) => currentUser.active);
+};
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts b/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
new file mode 100644
index 000000000000..44b6c6ae1217
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
@@ -0,0 +1,12 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+export const useFilterUsersByRole = (
+	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[],
+	selectedRoles: string[],
+) => {
+	if (!users.length || !selectedRoles.length || selectedRoles.includes('all')) return users;
+
+	return users.filter((currentUser) => {
+		return currentUser.roles.some((currentRole) => selectedRoles.includes(currentRole));
+	});
+};
diff --git a/apps/meteor/client/views/admin/users/hooks/useListUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
new file mode 100644
index 000000000000..57b263f2f360
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
@@ -0,0 +1,69 @@
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { escapeRegExp } from '@rocket.chat/string-helpers';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import type { MutableRefObject } from 'react';
+import { useMemo } from 'react';
+
+import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+
+export const useListUsers = (
+	searchTerm: string,
+	prevSearchTerm: MutableRefObject<string>,
+	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
+	sortBy: ReturnType<typeof useSort>['sortBy'],
+	sortDirection: ReturnType<typeof useSort>['sortDirection'],
+	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
+	current: ReturnType<typeof usePagination>['current'],
+) => {
+	const query = useDebouncedValue(
+		useMemo(() => {
+			if (searchTerm !== prevSearchTerm.current) {
+				setCurrent(0);
+			}
+
+			return {
+				fields: JSON.stringify({
+					name: 1,
+					username: 1,
+					emails: 1,
+					roles: 1,
+					status: 1,
+					avatarETag: 1,
+					active: 1,
+				}),
+				query: JSON.stringify({
+					$or: [
+						{ 'emails.address': { $regex: escapeRegExp(searchTerm), $options: 'i' } },
+						{ username: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
+						{ name: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
+					],
+				}),
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				count: itemsPerPage,
+				offset: searchTerm === prevSearchTerm.current ? current : 0,
+			};
+		}, [searchTerm, prevSearchTerm, sortBy, sortDirection, itemsPerPage, current, setCurrent]),
+		500,
+	);
+
+	const getUsers = useEndpoint('GET', '/v1/users.list');
+
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const usersListQueryResult = useQuery(
+		['users', query],
+		async () => {
+			const users = await getUsers(query);
+			return users;
+		},
+		{
+			onError: (error) => {
+				dispatchToastMessage({ type: 'error', message: error });
+			},
+		},
+	);
+
+	return usersListQueryResult;
+};
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 72aef9af6407..cd8b88fe4058 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -396,6 +396,8 @@
   "AutoLinker_UrlsRegExp": "AutoLinker URL Regular Expression",
   "All_messages": "All messages",
   "All_Prices": "All prices",
+  "All_roles": "All roles",
+  "All_rooms": "All rooms",
   "All_status": "All status",
   "All_users": "All users",
   "All_users_in_the_channel_can_write_new_messages": "All users in the channel can write new messages",
@@ -2317,6 +2319,8 @@
   "Filter_by_category": "Filter by Category",
   "Filter_by_Custom_Fields": "Filter by Custom Fields",
   "Filter_By_Price": "Filter by price",
+  "Filter_by_role": "Filter by role",
+  "Filter_by_room": "Filter by room type",
   "Filter_By_Status": "Filter by status",
   "Filters": "Filters",
   "Filters_applied": "Filters applied",
@@ -6055,9 +6059,7 @@
   "multiple_instance_solutions": "multiple instance solutions",
   "Uninstall_grandfathered_app": "Uninstall {{appName}}?",
   "App_will_lose_grandfathered_status": "**This {{context}} app will lose its grandfathered status.**  \n  \nWorkspaces on Community Edition can have up to {{limit}} {{context}} apps enabled. Grandfathered apps count towards the limit but the limit is not applied to them.",
-  "All_rooms": "All rooms",
   "All_visible": "All visible",
-  "Filter_by_room": "Filter by room type",
   "Filter_by_visibility": "Filter by visibility",
   "Registration_status": "Registration status",
   "Theme_Appearence": "Theme Appearence"
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 1420a62346d6..a81d93f8c2f5 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -53,12 +53,12 @@ export type OptionProp = TitleOptionProp | CheckboxOptionProp;
  */
 type DropDownProps = {
 	dropdownOptions: OptionProp[];
-	defaultTitle: TranslationKey;
+	defaultTitle: string;
 	selectedOptionsTitle: TranslationKey;
 	selectedOptions: OptionProp[];
 	setSelectedOptions: Dispatch<SetStateAction<OptionProp[]>>;
 	customSetSelected: Dispatch<SetStateAction<OptionProp[]>>;
-	searchBarText?: TranslationKey;
+	searchBarText?: string;
 };
 
 export const MultiSelectCustom = ({
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
index 9f6a15d38ba1..d06e6d881f92 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomAnchor.tsx
@@ -1,15 +1,14 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Icon, Palette } from '@rocket.chat/fuselage';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useTranslation } from '@rocket.chat/ui-contexts';
+import { TranslationKey, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { forwardRef } from 'react';
 
 type MultiSelectCustomAnchorProps = {
 	onClick?: (value: boolean) => void;
 	collapsed: boolean;
-	defaultTitle: TranslationKey;
-	selectedOptionsTitle: TranslationKey;
+	defaultTitle: string;
+	selectedOptionsTitle: string;
 	selectedOptionsCount: number;
 	maxCount: number;
 } & ComponentProps<typeof Button>;
@@ -59,7 +58,7 @@ const MultiSelectCustomAnchor = forwardRef<HTMLElement, MultiSelectCustomAnchorP
 			className={inputStyle}
 			{...props}
 		>
-			{isDirty ? `${t(selectedOptionsTitle)} (${selectedOptionsCount})` : t(defaultTitle)}
+			{isDirty ? `${t(selectedOptionsTitle as TranslationKey)} (${selectedOptionsCount})` : t(defaultTitle as TranslationKey)}
 			<Icon name='chevron-down' fontSize='x20' color='hint' />
 		</Box>
 	);
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index 7e6bfdb9fee1..85ee17f1751d 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -14,7 +14,7 @@ const MultiSelectCustomList = ({
 }: {
 	options: OptionProp[];
 	onSelected: (item: OptionProp, e?: FormEvent<HTMLElement>) => void;
-	searchBarText?: TranslationKey;
+	searchBarText?: string;
 }) => {
 	const t = useTranslation();
 
@@ -33,7 +33,7 @@ const MultiSelectCustomList = ({
 				<Option>
 					<SearchInput
 						name='select-search'
-						placeholder={t(searchBarText)}
+						placeholder={t(searchBarText as TranslationKey)}
 						autoComplete='off'
 						addon={<Icon name='magnifier' size='x20' />}
 						onChange={handleChange}

From 964e9e4118590847687a2bd6bbc08619bf5e8d52 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 5 Oct 2023 11:01:25 -0300
Subject: [PATCH 03/61] style: :lipstick: Review

---
 apps/meteor/client/components/UserCard/UserCardInfo.tsx  | 2 +-
 apps/meteor/client/components/UserCard/UserCardRoles.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/components/UserCard/UserCardInfo.tsx b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
index 8e235670a3dc..2afcf6a37f2c 100644
--- a/apps/meteor/client/components/UserCard/UserCardInfo.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardInfo.tsx
@@ -3,7 +3,7 @@ import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
 
 const UserCardInfo = (props: ComponentProps<typeof Box>): ReactElement => (
-	<Box mbe={8} is='span' fontScale='p2' color='hint' withTruncatedText {...props} />
+	<Box mb={8} is='span' fontScale='p2' color='hint' withTruncatedText {...props} />
 );
 
 export default UserCardInfo;
diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index f7a977d4a4dc..9cd22ebdff35 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -6,7 +6,7 @@ import UserCardInfo from './UserCardInfo';
 
 const UserCardRoles = ({ children }: { children: ReactNode }): ReactElement => (
 	<Box m='neg-x2'>
-		<UserCardInfo mb={8} flexWrap='wrap' display='flex' flexShrink={0}>
+		<UserCardInfo flexWrap='wrap' display='flex' flexShrink={0}>
 			{children}
 		</UserCardInfo>
 	</Box>

From 809ca6c265b53d76baae34d41f1e00525c1627bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Mon, 23 Oct 2023 14:00:48 -0300
Subject: [PATCH 04/61] feat: New create user contextual bar (#30582)

* feat: :sparkles: New SetRandomPassword UI/ux

Created a new ui logic for the SetRandomPassword form with 2 radio buttons instead of a toggle and changed the email field to be the first one in the create user contextual bar.

* feat: :sparkles: Implement password confirmation and password verification

Implemented the password verification and confirmation flows in the users page contextual bar, changed some types to follow the changes, removed the old Verified toggle and componentized the setRandomPassword radios.

* feat: :sparkles: Create briefing field in new users contextual bar

Created a briefing text warning users of the new tab layout functionality in the new user contextual bar of the admin users page.

* feat: :sparkles: Create visual part of hide custom fields button

Created a button that will hide or show the custom fields of the new users form on click. Also added an icon to the user form title, changed the password field position in the form, removed the addon icons from some fields and created a new briefing message in the top of the form.

* feat: :sparkles: Create logic for 'hide additional fields' button

Created the logic that hides the custom fields of the new user form when the 'hide additional fields' button is clicked

* feat: :sparkles: Implement multiple user creation flow

Added a new screen to enhance the user creation experience. This screen appears immediately after you create a new user. On this page, you have two options: you can either complete the process and view the user you just created, or you can return to the form to create another user without exiting the contextual bar. Additionally, I've made some minor logic improvements and removed commented-out code.

* feat: :sparkles: Make user created contextual bar page count dynamic

Implemented logic to the user created contextual bar, now for each user created without exiting or refreshing the page the number of the message will be incremented by 1. Also stopped using the old Field.Component components in favor of their standalone versions and made the message of the Hide Additional Fields button change to Show additional fields when the fields are hidden.

* feat: :sparkles: Implement label tooltip in the user creation page email field

Implemented a tooltip in the email verification field of the user creation contextual bar that explains what toggling on this field will do. Also implemented a way to use a single value in order to controll the setRandomPassword radios instead of two and added the necessary entries in the i18n to follow the aforementioned changes.

* refactor: :recycle: Change "Only allow verified users to login" setting copy

Changed the title of the "Only allow verified users to login" setting to "Require email verification to login" and its description from "Make sure you have correct SMTP settings to use this feature" to "Ensure SMTP is configured to enable this feature"

* refactor: :recycle: Ensure requirePasswordChange is true when setRandomPassword is true

Created some logic to make sure the requirePasswordChange field will be true even if the user changed it to false and then changed setRandomPassword to true. Also changed some strings and sizes to follow figma specs.

* refactor: :recycle: Remove useEffect + reset usage of new user creation form

Removed un-optimal usage of the useEffect hook together with RHF's reset function, implemented a function that changes the requirePasswordChange value based on which setRandomPassword radio is checked, switched resetField for setValue to make sure the value is always correct, changed some rendering logic to make sure the first state of some fields is correct and optimized some parts of the getInitialValues function return.

* refactor: :recycle: Componentize setRandomPassword field content

Changed the name of the AdminUserSetRandomPassword component to AdminUserSetRandomPasswordRadios and created a new component called AdminUserSetRandomPasswordContent to organize and clean the AdminUserForm component.

* fix: :bug: Refetch user form data after editing user

Implemented a refecthUserData function for the AdminuserInfoWithData component that will run when the handleUpdateUser mutation is succesful to refetch the user data of the edited user. This fixes a bug in which the user form would show the old data instead of the updated one.

* Move tabs component to Page instead of Page content

* Fix imports

* First test fix

* Fix create user test

* Fix tests

* Fix test typo

* Test fix
---
 .../views/admin/users/AdminUserCreated.tsx    |  32 ++
 .../views/admin/users/AdminUserForm.tsx       | 437 +++++++++---------
 .../admin/users/AdminUserFormWithData.tsx     |  16 +-
 .../AdminUserSetRandomPasswordContent.tsx     | 109 +++++
 .../AdminUserSetRandomPasswordRadios.tsx      |  98 ++++
 .../views/admin/users/AdminUsersPage.tsx      |  59 ++-
 .../rocketchat-i18n/i18n/en.i18n.json         |  23 +-
 apps/meteor/tests/e2e/administration.spec.ts  |   5 +-
 .../fragments/admin-flextab-users.ts          |  14 +-
 packages/core-typings/src/IUser.ts            |   4 +-
 .../src/v1/users/UserCreateParamsPOST.ts      |   2 +-
 .../PasswordVerifier/PasswordVerifier.tsx     |  11 +-
 .../PasswordVerifier/PasswordVerifierItem.tsx |   5 +-
 13 files changed, 537 insertions(+), 278 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/AdminUserCreated.tsx
 create mode 100644 apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
 create mode 100644 apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx

diff --git a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
new file mode 100644
index 000000000000..ac793c1ac756
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
@@ -0,0 +1,32 @@
+import { Button, ButtonGroup, ContextualbarFooter } from '@rocket.chat/fuselage';
+import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import React, { useCallback } from 'react';
+
+import { ContextualbarScrollableContent } from '../../../components/Contextualbar';
+
+const AdminUserCreated = ({ uid, createdUsersCount }: { uid: string; createdUsersCount: number }) => {
+	const t = useTranslation();
+	const router = useRouter();
+
+	const goToUser = useCallback((id) => router.navigate(`/admin/users/info/${id}`), [router]);
+
+	return (
+		<>
+			<ContextualbarScrollableContent h='100%' fontScale='p1m'>
+				{createdUsersCount === 1 ? t('You_have_created_one_user') : t('You_have_created_users', { count: createdUsersCount })}
+			</ContextualbarScrollableContent>
+			<ContextualbarFooter>
+				<ButtonGroup stretch>
+					<Button type='reset' w='50%' onClick={() => router.navigate(`/admin/users/new`)}>
+						{t('Add_more_users')}
+					</Button>
+					<Button primary w='50%' onClick={() => goToUser(uid)}>
+						{t('Done')}
+					</Button>
+				</ButtonGroup>
+			</ContextualbarFooter>
+		</>
+	);
+};
+
+export default AdminUserCreated;
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 1912150b4a48..3071ccb8c63a 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -1,26 +1,24 @@
 import type { AvatarObject, IUser, Serialized } from '@rocket.chat/core-typings';
 import {
 	Field,
-	FieldLabel,
-	FieldRow,
-	FieldError,
-	FieldHint,
 	TextInput,
 	TextAreaInput,
-	PasswordInput,
 	MultiSelectFiltered,
 	Box,
 	ToggleSwitch,
-	Icon,
-	Divider,
 	FieldGroup,
 	ContextualbarFooter,
-	ButtonGroup,
 	Button,
 	Callout,
+	FieldLabel,
+	FieldRow,
+	FieldError,
+	FieldHint,
+	Icon,
 } from '@rocket.chat/fuselage';
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { useUniqueId, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { UserCreateParamsPOST } from '@rocket.chat/rest-typings';
 import { CustomFieldsForm } from '@rocket.chat/ui-client';
 import {
 	useAccountsCustomFields,
@@ -31,7 +29,7 @@ import {
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
 import { useQuery, useMutation } from '@tanstack/react-query';
-import React, { useCallback } from 'react';
+import React, { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
 import { validateEmail } from '../../../../lib/emailValidator';
@@ -41,22 +39,31 @@ import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar';
 import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants';
+import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordContent';
+import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios';
 import { useSmtpQuery } from './hooks/useSmtpQuery';
 
 type AdminUserFormProps = {
 	userData?: Serialized<IUser>;
 	onReload: () => void;
+	setCreatedUsersCount?: React.Dispatch<React.SetStateAction<number>>;
+	context: string;
+	refetchUserFormData?: () => void;
 };
 
+export type userFormProps = Omit<UserCreateParamsPOST & { avatar: AvatarObject; passwordConfirmation: string }, 'fields'>;
+
 const getInitialValue = ({
 	data,
 	defaultUserRoles,
 	isSmtpEnabled,
+	isNewUserPage,
 }: {
 	data?: Serialized<IUser>;
 	defaultUserRoles?: IUser['roles'];
 	isSmtpEnabled?: boolean;
-}) => ({
+	isNewUserPage?: boolean;
+}): userFormProps => ({
 	roles: data?.roles ?? defaultUserRoles,
 	name: data?.name ?? '',
 	password: '',
@@ -65,50 +72,51 @@ const getInitialValue = ({
 	nickname: data?.nickname ?? '',
 	email: (data?.emails?.length && data.emails[0].address) || '',
 	verified: (data?.emails?.length && data.emails[0].verified) || false,
-	setRandomPassword: false,
-	requirePasswordChange: data?.requirePasswordChange || false,
+	setRandomPassword: (isNewUserPage && isSmtpEnabled) ?? true,
+	requirePasswordChange: isNewUserPage && (data?.requirePasswordChange ?? true),
 	customFields: data?.customFields ?? {},
 	statusText: data?.statusText ?? '',
 	joinDefaultChannels: true,
 	sendWelcomeEmail: isSmtpEnabled,
 	avatar: '' as AvatarObject,
+	passwordConfirmation: '',
 });
 
-const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
+const AdminUserForm = ({ userData, onReload, setCreatedUsersCount, context, refetchUserFormData, ...props }: AdminUserFormProps) => {
 	const t = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const customFieldsMetadata = useAccountsCustomFields();
 	const defaultRoles = useSetting<string>('Accounts_Registration_Users_Default_Roles') || '';
+	const isVerificationNeeded = useSetting('Accounts_EmailVerification');
 
 	const defaultUserRoles = parseCSV(defaultRoles);
-	const { data } = useSmtpQuery();
+	const { data, isSuccess: isSmtpStatusAvailable } = useSmtpQuery();
 	const isSmtpEnabled = data?.isSMTPConfigured;
-
-	const eventStats = useEndpointAction('POST', '/v1/statistics.telemetry');
-	const updateUserAction = useEndpoint('POST', '/v1/users.update');
-	const createUserAction = useEndpoint('POST', '/v1/users.create');
-
-	const getRoles = useEndpoint('GET', '/v1/roles.list');
-	const { data: roleData, error: roleError } = useQuery(['roles'], async () => getRoles());
-
-	const availableRoles: SelectOption[] = roleData?.roles.map(({ _id, name, description }) => [_id, description || name]) || [];
-
-	const goToUser = useCallback((id) => router.navigate(`/admin/users/info/${id}`), [router]);
+	const isNewUserPage = context === 'new';
 
 	const {
 		control,
 		watch,
 		handleSubmit,
-		reset,
 		formState: { errors, isDirty },
+		setValue,
 	} = useForm({
-		defaultValues: getInitialValue({ data: userData, defaultUserRoles, isSmtpEnabled }),
+		defaultValues: getInitialValue({ data: userData, defaultUserRoles, isSmtpEnabled, isNewUserPage }),
 		mode: 'onBlur',
 	});
 
-	const { avatar, username, setRandomPassword } = watch();
+	const { avatar, username, setRandomPassword, password } = watch();
+
+	const eventStats = useEndpointAction('POST', '/v1/statistics.telemetry');
+	const updateUserAction = useEndpoint('POST', '/v1/users.update');
+	const createUserAction = useEndpoint('POST', '/v1/users.create');
+
+	const getRoles = useEndpoint('GET', '/v1/roles.list');
+	const { data: roleData, error: roleError } = useQuery(['roles'], async () => getRoles());
+
+	const availableRoles: SelectOption[] = roleData?.roles.map(({ _id, name, description }) => [_id, description || name]) || [];
 
 	const updateAvatar = useUpdateAvatar(avatar, userData?._id || '');
 
@@ -119,6 +127,7 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 			await updateAvatar();
 			router.navigate(`/admin/users/info/${_id}`);
 			onReload();
+			refetchUserFormData?.();
 		},
 		onError: (error) => {
 			dispatchToastMessage({ type: 'error', message: error });
@@ -127,12 +136,13 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 
 	const handleCreateUser = useMutation({
 		mutationFn: createUserAction,
-		onSuccess: async (data) => {
+		onSuccess: async ({ user: { _id } }) => {
 			dispatchToastMessage({ type: 'success', message: t('User_created_successfully!') });
 			await eventStats({
 				params: [{ eventName: 'updateCounter', settingsId: 'Manual_Entry_User_Count' }],
 			});
-			goToUser(data.user._id);
+			setCreatedUsersCount?.((prevUsersCount) => prevUsersCount + 1);
+			router.navigate(`/admin/users/created/${_id}`);
 			onReload();
 		},
 		onError: (error) => {
@@ -140,12 +150,14 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 		},
 	});
 
-	const handleSaveUser = useMutableCallback(async (userFormPayload) => {
-		const { avatar, ...userFormData } = userFormPayload;
-		if (userData?._id) {
+	const handleSaveUser = useMutableCallback(async (userFormPayload: userFormProps) => {
+		const { avatar, passwordConfirmation, ...userFormData } = userFormPayload;
+
+		if (!isNewUserPage && userData?._id) {
 			return handleUpdateUser.mutateAsync({ userId: userData?._id, data: userFormData });
 		}
-		return handleCreateUser.mutateAsync(userFormData);
+
+		return handleCreateUser.mutateAsync({ ...userFormData, fields: '' });
 	});
 
 	const nameId = useUniqueId();
@@ -156,17 +168,22 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 	const bioId = useUniqueId();
 	const nicknameId = useUniqueId();
 	const passwordId = useUniqueId();
-	const requirePasswordChangeId = useUniqueId();
-	const setRandomPasswordId = useUniqueId();
 	const rolesId = useUniqueId();
 	const joinDefaultChannelsId = useUniqueId();
 	const sendWelcomeEmailId = useUniqueId();
+	const setRandomPasswordId = useUniqueId();
+
+	const [showCustomFields, setShowCustomFields] = useState(true);
+
+	if (!context) {
+		return null;
+	}
 
 	return (
 		<>
 			<ContextualbarScrollableContent {...props}>
 				<FieldGroup>
-					{userData?._id && (
+					{!isNewUserPage && (
 						<Field>
 							<Controller
 								name='avatar'
@@ -182,6 +199,62 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 							/>
 						</Field>
 					)}
+					{isNewUserPage && <Box color='hint'>{t('Manually_created_users_briefing')}</Box>}
+					<Field>
+						<FieldLabel htmlFor={emailId}>{t('Email')}</FieldLabel>
+						<FieldRow>
+							<Controller
+								control={control}
+								name='email'
+								rules={{
+									required: t('The_field_is_required', t('Email')),
+									validate: (email) => (validateEmail(email) ? undefined : t('ensure_email_address_valid')),
+								}}
+								render={({ field }) => (
+									<TextInput
+										{...field}
+										id={emailId}
+										aria-invalid={errors.email ? 'true' : 'false'}
+										aria-describedby={`${emailId}-error`}
+										error={errors.email?.message}
+										flexGrow={1}
+									/>
+								)}
+							/>
+						</FieldRow>
+						{errors?.email && (
+							<FieldError aria-live='assertive' id={`${emailId}-error`} fontScale='c1' mbs={12}>
+								{errors.email.message}
+							</FieldError>
+						)}
+						<FieldRow mbs={12}>
+							<Box display='flex' alignItems='center'>
+								<FieldLabel htmlFor={verifiedId} p={0} disabled={!isSmtpEnabled || !isVerificationNeeded}>
+									{t('Mark_email_as_verified')}
+								</FieldLabel>
+								<Icon name='info-circled' size='x20' mis={8} title={t('Enable_to_bypass_email_verification')} color='default' />
+							</Box>
+							<Controller
+								control={control}
+								name='verified'
+								render={({ field: { onChange, value } }) => (
+									<ToggleSwitch id={verifiedId} checked={value} onChange={onChange} disabled={!isSmtpEnabled || !isVerificationNeeded} />
+								)}
+							/>
+						</FieldRow>
+						{isVerificationNeeded && !isSmtpEnabled && (
+							<FieldHint
+								id={`${verifiedId}-hint`}
+								dangerouslySetInnerHTML={{ __html: t('Send_Email_SMTP_Warning', { url: 'admin/settings/Email' }) }}
+							/>
+						)}
+						{!isVerificationNeeded && (
+							<FieldHint
+								id={`${verifiedId}-hint`}
+								dangerouslySetInnerHTML={{ __html: t('Email_verification_isnt_required', { url: 'admin/settings/Accounts' }) }}
+							/>
+						)}
+					</Field>
 					<Field>
 						<FieldLabel htmlFor={nameId}>{t('Name')}</FieldLabel>
 						<FieldRow>
@@ -222,7 +295,6 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 										aria-describedby={`${usernameId}-error`}
 										error={errors.username?.message}
 										flexGrow={1}
-										addon={<Icon name='at' size='x20' />}
 									/>
 								)}
 							/>
@@ -234,46 +306,98 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 						)}
 					</Field>
 					<Field>
-						<FieldLabel htmlFor={emailId}>{t('Email')}</FieldLabel>
-						<FieldRow>
-							<Controller
+						<FieldLabel htmlFor={passwordId} mbe={8}>
+							{t('Password')}
+						</FieldLabel>
+						<AdminUserSetRandomPasswordRadios
+							isNewUserPage={isNewUserPage}
+							setRandomPasswordId={setRandomPasswordId}
+							control={control}
+							isSmtpStatusAvailable={isSmtpStatusAvailable}
+							isSmtpEnabled={isSmtpEnabled}
+							setValue={setValue}
+						/>
+						{!setRandomPassword && (
+							<AdminUserSetRandomPasswordContent
 								control={control}
-								name='email'
-								rules={{
-									required: t('The_field_is_required', t('Email')),
-									validate: (email) => (validateEmail(email) ? undefined : t('error-invalid-email-address')),
-								}}
-								render={({ field }) => (
-									<TextInput
-										{...field}
-										id={emailId}
-										aria-invalid={errors.email ? 'true' : 'false'}
-										aria-describedby={`${emailId}-error`}
-										error={errors.email?.message}
-										flexGrow={1}
-										addon={<Icon name='mail' size='x20' />}
-									/>
-								)}
+								setRandomPassword={setRandomPassword}
+								isNewUserPage={isNewUserPage}
+								passwordId={passwordId}
+								errors={errors}
+								password={password}
 							/>
-						</FieldRow>
-						{errors?.email && (
-							<FieldError aria-live='assertive' id={`${emailId}-error`}>
-								{errors.email.message}
-							</FieldError>
 						)}
 					</Field>
+					<Field>
+						<FieldLabel htmlFor={rolesId}>{t('Roles')}</FieldLabel>
+						<FieldRow>
+							{roleError && <Callout>{roleError}</Callout>}
+							{!roleError && (
+								<Controller
+									control={control}
+									name='roles'
+									rules={{ required: t('The_field_is_required', t('Roles')) }}
+									render={({ field: { onChange, value } }) => (
+										<MultiSelectFiltered
+											id={rolesId}
+											value={value}
+											onChange={onChange}
+											flexGrow={1}
+											placeholder={t('Select_role')}
+											options={availableRoles}
+										/>
+									)}
+								/>
+							)}
+						</FieldRow>
+						{errors?.roles && <FieldError>{errors.roles.message}</FieldError>}
+					</Field>
 					<Field>
 						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={verifiedId}>{t('Verified')}</FieldLabel>
+							<FieldLabel htmlFor={joinDefaultChannelsId}>{t('Join_default_channels')}</FieldLabel>
 							<FieldRow>
 								<Controller
 									control={control}
-									name='verified'
-									render={({ field: { onChange, value } }) => <ToggleSwitch id={verifiedId} checked={value} onChange={onChange} />}
+									name='joinDefaultChannels'
+									render={({ field: { ref, onChange, value } }) => (
+										<ToggleSwitch id={joinDefaultChannelsId} ref={ref} onChange={onChange} checked={value} />
+									)}
 								/>
 							</FieldRow>
 						</Box>
 					</Field>
+					<Field>
+						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1} mbe={8}>
+							<FieldLabel htmlFor={sendWelcomeEmailId} disabled={!isSmtpEnabled}>
+								{t('Send_welcome_email')}
+							</FieldLabel>
+							<FieldRow>
+								{isSmtpStatusAvailable && (
+									<Controller
+										control={control}
+										name='sendWelcomeEmail'
+										defaultValue={isSmtpEnabled}
+										render={({ field: { onChange, value } }) => (
+											<ToggleSwitch
+												id={sendWelcomeEmailId}
+												aria-describedby={`${sendWelcomeEmailId}-hint`}
+												onChange={onChange}
+												checked={value}
+												disabled={!isSmtpEnabled}
+											/>
+										)}
+									/>
+								)}
+							</FieldRow>
+						</Box>
+						{!isSmtpEnabled && (
+							<FieldHint
+								id={`${sendWelcomeEmailId}-hint`}
+								dangerouslySetInnerHTML={{ __html: t('Send_Email_SMTP_Warning', { url: 'admin/settings/Email' }) }}
+								mbs={0}
+							/>
+						)}
+					</Field>
 					<Field>
 						<FieldLabel htmlFor={statusTextId}>{t('StatusMessage')}</FieldLabel>
 						<FieldRow>
@@ -289,7 +413,6 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 										aria-invalid={errors.statusText ? 'true' : 'false'}
 										aria-describedby={`${statusTextId}-error`}
 										flexGrow={1}
-										addon={<Icon name='edit' size='x20' />}
 									/>
 								)}
 							/>
@@ -316,7 +439,6 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 										aria-invalid={errors.bio ? 'true' : 'false'}
 										aria-describedby={`${bioId}-error`}
 										flexGrow={1}
-										addon={<Icon name='edit' size='x20' alignSelf='center' />}
 									/>
 								)}
 							/>
@@ -330,181 +452,34 @@ const UserForm = ({ userData, onReload, ...props }: AdminUserFormProps) => {
 					<Field>
 						<FieldLabel htmlFor={nicknameId}>{t('Nickname')}</FieldLabel>
 						<FieldRow>
-							<Controller
-								control={control}
-								name='nickname'
-								render={({ field }) => (
-									<TextInput {...field} id={nicknameId} flexGrow={1} addon={<Icon name='edit' size='x20' alignSelf='center' />} />
-								)}
-							/>
+							<Controller control={control} name='nickname' render={({ field }) => <TextInput {...field} id={nicknameId} flexGrow={1} />} />
 						</FieldRow>
 					</Field>
-				</FieldGroup>
-				<FieldGroup>
-					{!setRandomPassword && (
-						<Field>
-							<FieldLabel htmlFor={passwordId}>{t('Password')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='password'
-									rules={{ required: !userData?._id && t('The_field_is_required', t('Password')) }}
-									render={({ field }) => (
-										<PasswordInput
-											{...field}
-											id={passwordId}
-											aria-invalid={errors.password ? 'true' : 'false'}
-											aria-describedby={`${passwordId}-error`}
-											error={errors.password?.message}
-											flexGrow={1}
-											addon={<Icon name='key' size='x20' />}
-										/>
-									)}
-								/>
-							</FieldRow>
-							{errors?.password && (
-								<FieldError aria-live='assertive' id={`${passwordId}-error`}>
-									{errors.password.message}
-								</FieldError>
-							)}
-						</Field>
-					)}
-					<Field>
-						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={requirePasswordChangeId}>{t('Require_password_change')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='requirePasswordChange'
-									render={({ field: { ref, onChange, value } }) => (
-										<ToggleSwitch
-											ref={ref}
-											id={requirePasswordChangeId}
-											disabled={setRandomPassword}
-											checked={setRandomPassword || value}
-											onChange={onChange}
-										/>
-									)}
-								/>
-							</FieldRow>
-						</Box>
-					</Field>
-					<Field>
-						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={setRandomPasswordId}>{t('Set_random_password_and_send_by_email')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='setRandomPassword'
-									render={({ field: { ref, onChange, value } }) => (
-										<ToggleSwitch
-											ref={ref}
-											id={setRandomPasswordId}
-											aria-describedby={`${setRandomPasswordId}-hint`}
-											checked={value}
-											onChange={onChange}
-											disabled={!isSmtpEnabled}
-										/>
-									)}
-								/>
-							</FieldRow>
-						</Box>
-						{!isSmtpEnabled && (
-							<FieldHint
-								id={`${setRandomPasswordId}-hint`}
-								dangerouslySetInnerHTML={{ __html: t('Send_Email_SMTP_Warning', { url: 'admin/settings/Email' }) }}
-							/>
-						)}
-					</Field>
-					<Field>
-						<FieldLabel htmlFor={rolesId}>{t('Roles')}</FieldLabel>
-						<FieldRow>
-							{roleError && <Callout>{roleError}</Callout>}
-							{!roleError && (
-								<Controller
-									control={control}
-									name='roles'
-									rules={{ required: t('The_field_is_required', t('Roles')) }}
-									render={({ field: { onChange, value } }) => (
-										<MultiSelectFiltered
-											id={rolesId}
-											value={value}
-											onChange={onChange}
-											flexGrow={1}
-											placeholder={t('Select_an_option')}
-											options={availableRoles}
-										/>
-									)}
-								/>
-							)}
-						</FieldRow>
-						{errors?.roles && <FieldError>{errors.roles.message}</FieldError>}
-					</Field>
-					<Field>
-						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={joinDefaultChannelsId}>{t('Join_default_channels')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='joinDefaultChannels'
-									render={({ field: { ref, onChange, value } }) => (
-										<ToggleSwitch id={joinDefaultChannelsId} ref={ref} onChange={onChange} checked={value} />
-									)}
-								/>
-							</FieldRow>
-						</Box>
-					</Field>
-					<Field>
-						<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1}>
-							<FieldLabel htmlFor={sendWelcomeEmailId}>{t('Send_welcome_email')}</FieldLabel>
-							<FieldRow>
-								<Controller
-									control={control}
-									name='sendWelcomeEmail'
-									render={({ field: { onChange, value } }) => (
-										<ToggleSwitch
-											id={sendWelcomeEmailId}
-											aria-describedby={`${sendWelcomeEmailId}-hint`}
-											onChange={onChange}
-											checked={value}
-											disabled={!isSmtpEnabled}
-										/>
-									)}
-								/>
-							</FieldRow>
-						</Box>
-						{!isSmtpEnabled && (
-							<FieldHint
-								id={`${sendWelcomeEmailId}-hint`}
-								dangerouslySetInnerHTML={{ __html: t('Send_Email_SMTP_Warning', { url: 'admin/settings/Email' }) }}
-							/>
-						)}
-					</Field>
 					{Boolean(customFieldsMetadata.length) && (
 						<>
-							<Divider />
-							<Box fontScale='h4'>{t('Custom_Fields')}</Box>
-							<CustomFieldsForm formName='customFields' formControl={control} metadata={customFieldsMetadata} />
+							<Button
+								fontScale='c2'
+								w='x140'
+								h='x28'
+								display='flex'
+								alignItems='center'
+								justifyContent='center'
+								onClick={() => setShowCustomFields((prevState) => !prevState)}
+							>
+								{showCustomFields ? t('Hide_additional_fields') : t('Show_additional_fields')}
+							</Button>
+							{showCustomFields && <CustomFieldsForm formName='customFields' formControl={control} metadata={customFieldsMetadata} />}
 						</>
 					)}
 				</FieldGroup>
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
-				<ButtonGroup stretch>
-					<Button
-						type='reset'
-						disabled={!isDirty}
-						onClick={() => reset(getInitialValue({ data: userData, defaultUserRoles, isSmtpEnabled }))}
-					>
-						{t('Reset')}
-					</Button>
-					<Button primary disabled={!isDirty} onClick={handleSubmit(handleSaveUser)}>
-						{t('Save')}
-					</Button>
-				</ButtonGroup>
+				<Button primary disabled={!isDirty} onClick={handleSubmit(handleSaveUser)} w='100%'>
+					{t('Add_user')}
+				</Button>
 			</ContextualbarFooter>
 		</>
 	);
 };
 
-export default UserForm;
+export default AdminUserForm;
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index 63fe2691d972..a584cf284c0f 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -12,11 +12,12 @@ import AdminUserForm from './AdminUserForm';
 type AdminUserFormWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
+	context: string;
 };
 
-const AdminUserFormWithData = ({ uid, onReload }: AdminUserFormWithDataProps): ReactElement => {
+const AdminUserFormWithData = ({ uid, onReload, context }: AdminUserFormWithDataProps): ReactElement => {
 	const t = useTranslation();
-	const { data, isLoading, isError } = useUserInfoQuery({ userId: uid });
+	const { data, isLoading, isError, refetch } = useUserInfoQuery({ userId: uid });
 
 	if (isLoading) {
 		return (
@@ -42,7 +43,16 @@ const AdminUserFormWithData = ({ uid, onReload }: AdminUserFormWithDataProps): R
 		);
 	}
 
-	return <AdminUserForm userData={data?.user} onReload={onReload} />;
+	return (
+		<AdminUserForm
+			userData={data?.user}
+			onReload={onReload}
+			context={context}
+			refetchUserFormData={() => {
+				refetch();
+			}}
+		/>
+	);
 };
 
 export default AdminUserFormWithData;
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
new file mode 100644
index 000000000000..282515b71068
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -0,0 +1,109 @@
+import { Box, FieldError, FieldLabel, FieldRow, PasswordInput, ToggleSwitch } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { PasswordVerifier } from '@rocket.chat/ui-client';
+import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import type { Control, FieldErrors } from 'react-hook-form';
+import { Controller } from 'react-hook-form';
+
+import type { userFormProps } from './AdminUserForm';
+
+type AdminUserSetRandomPasswordContentProps = {
+	control: Control<userFormProps, any>;
+	setRandomPassword: boolean | undefined;
+	isNewUserPage: boolean;
+	passwordId: string;
+	errors: FieldErrors<userFormProps>;
+	password: string;
+};
+
+const AdminUserSetRandomPasswordContent = ({
+	control,
+	setRandomPassword,
+	isNewUserPage,
+	passwordId,
+	errors,
+	password,
+}: AdminUserSetRandomPasswordContentProps) => {
+	const t = useTranslation();
+
+	const passwordConfirmationId = useUniqueId();
+	const requirePasswordChangeId = useUniqueId();
+	const passwordVerifierId = useUniqueId();
+
+	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation');
+	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
+	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
+
+	return (
+		<>
+			<Box display='flex' flexDirection='row' alignItems='center' justifyContent='space-between' flexGrow={1} mbe={8} mbs={12}>
+				<FieldLabel htmlFor={requirePasswordChangeId}>{t('Require_password_change')}</FieldLabel>
+				<FieldRow>
+					<Controller
+						control={control}
+						name='requirePasswordChange'
+						render={({ field: { ref, onChange, value } }) => (
+							<ToggleSwitch ref={ref} id={requirePasswordChangeId} disabled={setRandomPassword} checked={value} onChange={onChange} />
+						)}
+					/>
+				</FieldRow>
+			</Box>
+			<FieldRow>
+				<Controller
+					control={control}
+					name='password'
+					rules={{ required: isNewUserPage && t('The_field_is_required', t('Password')) }}
+					render={({ field }) => (
+						<PasswordInput
+							{...field}
+							id={passwordId}
+							aria-invalid={errors.password ? 'true' : 'false'}
+							aria-describedby={`${passwordId}-error`}
+							error={errors.password?.message}
+							flexGrow={1}
+							placeholder={passwordPlaceholder || t('Password')}
+						/>
+					)}
+				/>
+			</FieldRow>
+			{errors?.password && (
+				<FieldError aria-live='assertive' id={`${passwordId}-error`}>
+					{errors.password.message}
+				</FieldError>
+			)}
+			{requiresPasswordConfirmation && (
+				<FieldRow>
+					<Controller
+						control={control}
+						name='passwordConfirmation'
+						rules={{
+							required: isNewUserPage && t('The_field_is_required', t('Confirm_password')),
+							deps: ['password'],
+							validate: (val: string) => (password === val ? true : t('Invalid_confirm_pass')),
+						}}
+						render={({ field }) => (
+							<PasswordInput
+								{...field}
+								id={passwordConfirmationId}
+								aria-invalid={errors.passwordConfirmation ? 'true' : 'false'}
+								aria-describedby={`${passwordConfirmationId}-error`}
+								error={errors.passwordConfirmation?.message}
+								flexGrow={1}
+								placeholder={passwordConfirmationPlaceholder || t('Confirm_password')}
+							/>
+						)}
+					/>
+				</FieldRow>
+			)}
+			{errors?.passwordConfirmation && (
+				<FieldError aria-live='assertive' id={`${passwordConfirmationId}-error`}>
+					{errors.passwordConfirmation.message}
+				</FieldError>
+			)}
+			<PasswordVerifier password={password} id={passwordVerifierId} vertical />
+		</>
+	);
+};
+
+export default AdminUserSetRandomPasswordContent;
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
new file mode 100644
index 000000000000..1eea93639edb
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
@@ -0,0 +1,98 @@
+import { Box, FieldHint, FieldLabel, FieldRow, RadioButton } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import type { Control, UseFormSetValue } from 'react-hook-form';
+import { Controller } from 'react-hook-form';
+
+import type { userFormProps } from './AdminUserForm';
+
+type AdminUserSetRandomPasswordProps = {
+	isNewUserPage: boolean | undefined;
+	control: Control<userFormProps, any>;
+	isSmtpStatusAvailable: boolean;
+	isSmtpEnabled: boolean | undefined;
+	setRandomPasswordId: string;
+	setValue: UseFormSetValue<userFormProps>;
+};
+
+const AdminUserSetRandomPasswordRadios = ({
+	isNewUserPage,
+	control,
+	isSmtpStatusAvailable,
+	isSmtpEnabled,
+	setRandomPasswordId,
+	setValue,
+}: AdminUserSetRandomPasswordProps) => {
+	const t = useTranslation();
+
+	const setPasswordManuallyId = useUniqueId();
+
+	const handleSetRandomPasswordChange = (onChange: (...event: any[]) => void, value: boolean) => {
+		setValue('requirePasswordChange', value);
+
+		onChange(value);
+	};
+
+	if (!isSmtpStatusAvailable || isNewUserPage === undefined) {
+		return null;
+	}
+
+	return (
+		<>
+			<Box display='flex' flexDirection='row' alignItems='center' flexGrow={1} mbe={8}>
+				<FieldRow mie={8}>
+					<Controller
+						control={control}
+						name='setRandomPassword'
+						defaultValue={isNewUserPage}
+						render={({ field: { ref, onChange, value } }) => (
+							<RadioButton
+								ref={ref}
+								id={setRandomPasswordId}
+								aria-describedby={`${setRandomPasswordId}-hint`}
+								checked={value}
+								onChange={() => handleSetRandomPasswordChange(onChange, true)}
+								disabled={!isSmtpEnabled}
+							/>
+						)}
+					/>
+				</FieldRow>
+				<FieldLabel htmlFor={setRandomPasswordId} alignSelf='center' fontScale='p2' disabled={!isSmtpEnabled}>
+					{t('Set_randomly_and_send_by_email')}
+				</FieldLabel>
+			</Box>
+			{!isSmtpEnabled && (
+				<FieldHint
+					id={`${setRandomPasswordId}-hint`}
+					dangerouslySetInnerHTML={{ __html: t('Send_Email_SMTP_Warning', { url: 'admin/settings/Email' }) }}
+					mbe={16}
+					mbs={0}
+				/>
+			)}
+			<Box display='flex' flexDirection='row' alignItems='center' flexGrow={1}>
+				<FieldRow mie={8}>
+					<Controller
+						control={control}
+						name='setRandomPassword'
+						defaultValue={!isNewUserPage}
+						render={({ field: { ref, onChange, value } }) => (
+							<RadioButton
+								ref={ref}
+								id={setPasswordManuallyId}
+								aria-describedby={`${setPasswordManuallyId}-hint`}
+								checked={!value}
+								onChange={() => handleSetRandomPasswordChange(onChange, false)}
+							/>
+						)}
+					/>
+				</FieldRow>
+				<FieldLabel htmlFor={setPasswordManuallyId} alignSelf='center' fontScale='p2'>
+					{t('Set_manually')}
+				</FieldLabel>
+			</Box>
+		</>
+	);
+};
+
+export default AdminUserSetRandomPasswordRadios;
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index e0e88bedcd90..ab07134e0794 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -1,4 +1,4 @@
-import { Button, ButtonGroup, Tabs } from '@rocket.chat/fuselage';
+import { Button, ButtonGroup, Icon, Tabs, TabsItem } from '@rocket.chat/fuselage';
 import { usePermission, useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useRef, useState } from 'react';
@@ -7,7 +7,10 @@ import UserPageHeaderContentWithSeatsCap from '../../../../ee/client/views/admin
 import { useSeatsCap } from '../../../../ee/client/views/admin/users/useSeatsCap';
 import { Contextualbar, ContextualbarHeader, ContextualbarTitle, ContextualbarClose } from '../../../components/Contextualbar';
 import Page from '../../../components/Page';
+import PageContent from '../../../components/Page/PageContent';
+import PageHeader from '../../../components/Page/PageHeader';
 import AdminInviteUsers from './AdminInviteUsers';
+import AdminUserCreated from './AdminUserCreated';
 import AdminUserForm from './AdminUserForm';
 import AdminUserFormWithData from './AdminUserFormWithData';
 import AdminUserInfoWithData from './AdminUserInfoWithData';
@@ -26,6 +29,7 @@ const UsersPage = (): ReactElement => {
 	const canBulkCreateUser = usePermission('bulk-register-user');
 
 	const [tab, setTab] = useState<'all' | 'invited' | 'new' | 'active' | 'deactivated'>('all');
+	const [createdUsersCount, setCreatedUsersCount] = useState(0);
 
 	useEffect(() => {
 		if (!context || !seatsCap) {
@@ -45,7 +49,7 @@ const UsersPage = (): ReactElement => {
 	return (
 		<Page flexDirection='row'>
 			<Page>
-				<Page.Header title={t('Users')}>
+				<PageHeader title={t('Users')}>
 					{seatsCap && seatsCap.maxActiveUsers < Number.POSITIVE_INFINITY ? (
 						<UserPageHeaderContentWithSeatsCap {...seatsCap} />
 					) : (
@@ -62,27 +66,27 @@ const UsersPage = (): ReactElement => {
 							)}
 						</ButtonGroup>
 					)}
-				</Page.Header>
-				<Page.Content>
-					<Tabs>
-						<Tabs.Item selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
-							{t('All')}
-						</Tabs.Item>
-						<Tabs.Item selected={tab === 'invited'} onClick={() => setTab('invited')}>
-							{t('Invited')}
-						</Tabs.Item>
-						<Tabs.Item selected={tab === 'new'} onClick={() => setTab('new')}>
-							{t('New_users')}
-						</Tabs.Item>
-						<Tabs.Item selected={tab === 'active'} onClick={() => setTab('active')}>
-							{t('Active')}
-						</Tabs.Item>
-						<Tabs.Item selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
-							{t('Deactivated')}
-						</Tabs.Item>
-					</Tabs>
+				</PageHeader>
+				<Tabs>
+					<TabsItem selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
+						{t('All')}
+					</TabsItem>
+					<TabsItem selected={tab === 'invited'} onClick={() => setTab('invited')}>
+						{t('Invited')}
+					</TabsItem>
+					<TabsItem selected={tab === 'new'} onClick={() => setTab('new')}>
+						{t('New_users')}
+					</TabsItem>
+					<TabsItem selected={tab === 'active'} onClick={() => setTab('active')}>
+						{t('Active')}
+					</TabsItem>
+					<TabsItem selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
+						{t('Deactivated')}
+					</TabsItem>
+				</Tabs>
+				<PageContent>
 					<UsersTable reload={reload} tab={tab} onReload={handleReload} />
-				</Page.Content>
+				</PageContent>
 			</Page>
 			{context && (
 				<Contextualbar is='aside' aria-labelledby=''>
@@ -90,14 +94,19 @@ const UsersPage = (): ReactElement => {
 						<ContextualbarTitle>
 							{context === 'info' && t('User_Info')}
 							{context === 'edit' && t('Edit_User')}
-							{context === 'new' && t('Add_User')}
+							{(context === 'new' || context === 'created') && (
+								<>
+									<Icon name='user-plus' size={20} /> {t('New_user')}
+								</>
+							)}
 							{context === 'invite' && t('Invite_Users')}
 						</ContextualbarTitle>
 						<ContextualbarClose onClick={() => router.navigate('/admin/users')} />
 					</ContextualbarHeader>
 					{context === 'info' && id && <AdminUserInfoWithData uid={id} onReload={handleReload} />}
-					{context === 'edit' && id && <AdminUserFormWithData uid={id} onReload={handleReload} />}
-					{context === 'new' && <AdminUserForm onReload={handleReload} />}
+					{context === 'edit' && id && <AdminUserFormWithData uid={id} onReload={handleReload} context={context} />}
+					{context === 'new' && <AdminUserForm onReload={handleReload} setCreatedUsersCount={setCreatedUsersCount} context={context} />}
+					{context === 'created' && id && <AdminUserCreated uid={id} createdUsersCount={createdUsersCount} />}
 					{context === 'invite' && <AdminInviteUsers />}
 				</Contextualbar>
 			)}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 056f7f003727..5da4b1da20f1 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -113,8 +113,8 @@
   "Accounts_Email_Approved_Subject": "Account approved",
   "Accounts_Email_Deactivated": "[name]<br/><br/><p>Your account was deactivated.</p>",
   "Accounts_Email_Deactivated_Subject": "Account deactivated",
-  "Accounts_EmailVerification": "Only allow verified users to login",
-  "Accounts_EmailVerification_Description": "Make sure you have correct SMTP settings to use this feature",
+  "Accounts_EmailVerification": "Require email verification to login",
+  "Accounts_EmailVerification_Description": "Ensure SMTP is configured to enable this feature",
   "Accounts_Enrollment_Email": "Enrollment Email",
   "Accounts_Enrollment_Email_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p>",
   "Accounts_Enrollment_Email_Description": "You may use the following placeholders:  \n - `[name]`, `[fname]`, `[lname]` for the user's full name, first name or last name, respectively.  \n - `[email]` for the user's email.  \n - `[Site_Name]` and `[Site_URL]` for the Application Name and URL respectively. ",
@@ -295,6 +295,7 @@
   "Action_Available_After_Custom_Content_Added": "This action will become available after the custom content has been added",
   "Action_Available_After_Custom_Content_Added_And_Visible": "This action will become available after the custom content has been added and made visible to everyone",
   "Activate": "Activate",
+  "Enable_to_bypass_email_verification": "Enable to bypass email verification",
   "Active": "Active",
   "Active_users": "Active users",
   "Activity": "Activity",
@@ -307,13 +308,13 @@
   "Add_files_from": "Add files from",
   "Add_manager": "Add manager",
   "Add_monitor": "Add monitor",
+  "Add_more_users": "Add more users",
   "Add_Reaction": "Add reaction",
   "Add_Role": "Add Role",
   "Add_Sender_To_ReplyTo": "Add Sender to Reply-To",
   "Add_Server": "Add Server",
   "Add_URL": "Add URL",
   "Add_user": "Add user",
-  "Add_User": "Add User",
   "Add_users": "Add users",
   "Add_members": "Add Members",
   "add-all-to-room": "Add all users to a room",
@@ -1862,6 +1863,7 @@
   "Email_subject": "Email Subject",
   "Email_verified": "Email verified",
   "Email_sent": "Email sent",
+  "Email_verification_isnt_required": "Email verification to login is not required. To require, enable setting in <a href=\"{{url}}\">Accounts</a> > Registration",
   "Emoji": "Emoji",
   "Emoji_picker": "Emoji picker",
   "EmojiCustomFilesystem": "Custom Emoji Filesystem",
@@ -1908,6 +1910,7 @@
   "Engagement_Dashboard": "Engagement dashboard",
   "Enrich_your_workspace": "Enrich your workspace perspective with the engagement dashboard. Analyze practical usage statistics about your users, messages and channels. Included with Rocket.Chat Enterprise.",
   "Ensure_secure_workspace_access": "Ensure secure workspace access",
+  "ensure_email_address_valid": "Please ensure the email address is valid",
   "Enter": "Enter",
   "Enter_a_custom_message": "Enter a custom message",
   "Enter_a_department_name": "Enter a department name",
@@ -2469,6 +2472,7 @@
   "Hi_username": "Hi [name]",
   "Hidden": "Hidden",
   "Hide": "Hide",
+  "Hide_additional_fields": "Hide additional fields",
   "Hide_counter": "Hide counter",
   "Hide_flextab": "Hide Contextual Bar by clicking outside of it",
   "Hide_Group_Warning": "Are you sure you want to hide the group \"%s\"?",
@@ -3315,6 +3319,7 @@
   "Managing_assets": "Managing assets",
   "Managing_integrations": "Managing integrations",
   "Manual_Selection": "Manual Selection",
+  "Manually_created_users_briefing": "Manually created users will initially be shown as pending. Once they log in for the first time, they will be shown as active.",
   "Manufacturing": "Manufacturing",
   "MapView_Enabled": "Enable Mapview",
   "MapView_Enabled_Description": "Enabling mapview will display a location share button on the right of the chat input field.",
@@ -3323,6 +3328,7 @@
   "Mark_all_as_read": "`%s` - Mark all messages (in all channels) as read",
   "Mark_as_read": "Mark As Read",
   "Mark_as_unread": "Mark As Unread",
+  "Mark_email_as_verified": "Mark email as verified",
   "Mark_read": "Mark Read",
   "Mark_unread": "Mark Unread",
   "Marketplace": "Marketplace",
@@ -3677,6 +3683,7 @@
   "New_Tag": "New Tag",
   "New_Trigger": "New Trigger",
   "New_Unit": "New Unit",
+  "New_user": "New user",
   "New_users": "New users",
   "New_version_available_(s)": "New version available (%s)",
   "New_videocall_request": "New Video Call Request",
@@ -4613,7 +4620,7 @@
   "Select_at_least_two_users": "Select at least two users",
   "Select_department": "Select a department",
   "Select_file": "Select file",
-  "Select_role": "Select a Role",
+  "Select_role": "Select a role",
   "Select_service_to_login": "Select a service to login to load your picture or upload one directly from your computer",
   "Select_tag": "Select a tag",
   "Select_the_channels_you_want_the_user_to_be_removed_from": "Select the channels you want the user to be removed from",
@@ -4634,7 +4641,7 @@
   "Send_confirmation_email": "Send confirmation email",
   "Send_data_into_RocketChat_in_realtime": "Send data into Rocket.Chat in real-time.",
   "Send_email": "Send Email",
-  "Send_Email_SMTP_Warning": "To send this email you need to <a href=\"{{url}}\">setup SMTP emailing server</a>",
+  "Send_Email_SMTP_Warning": "Set up the SMTP server in <a href=\"{{url}}\">email settings</a> to enable",
   "Send_invitation_email": "Send invitation email",
   "Send_invitation_email_error": "You haven't provided any valid email address.",
   "Send_invitation_email_info": "You can send multiple email invitations at once.",
@@ -4692,9 +4699,10 @@
   "Set_as_moderator": "Set as moderator",
   "Set_as_owner": "Set as owner",
   "Upload_app": "Upload App",
-  "Set_random_password_and_send_by_email": "Set random password and send by email",
+  "Set_randomly_and_send_by_email": "Set randomly and send by email",
   "set-leader": "Set Leader",
   "set-leader_description": "Permission to set other users as leader of a channel",
+  "Set_manually": "Set manually",
   "set-moderator": "Set Moderator",
   "set-moderator_description": "Permission to set other users as moderator of a channel",
   "set-owner": "Set Owner",
@@ -4721,6 +4729,7 @@
   "shortcut_name": "shortcut name",
   "Should_be_a_URL_of_an_image": "Should be a URL of an image.",
   "Should_exists_a_user_with_this_username": "The user must already exist.",
+  "Show_additional_fields": "Show additional fields",
   "Show_agent_email": "Show agent email",
   "Show_agent_info": "Show agent information",
   "Show_all": "Show All",
@@ -5794,6 +5803,8 @@
   "You_have_a_new_message": "You have a new message",
   "You_have_been_muted": "You have been muted and cannot speak in this room",
   "You_have_been_removed_from__roomName_": "You've been removed from the room {{roomName}}",
+  "You_have_created_one_user": "You’ve created 1 user",
+  "You_have_created_users": "You’ve created {{count}} users",
   "You_have_joined_a_new_call_with": "You have joined a new call with",
   "You_have_n_codes_remaining": "You have {{number}} codes remaining.",
   "You_have_not_verified_your_email": "You have not verified your email.",
diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
index b439258429f8..85a016daaf6c 100644
--- a/apps/meteor/tests/e2e/administration.spec.ts
+++ b/apps/meteor/tests/e2e/administration.spec.ts
@@ -39,11 +39,12 @@ test.describe.parallel('administration', () => {
 
 		test('expect create a user', async () => {
 			await poAdmin.tabs.users.btnNew.click();
+			await poAdmin.tabs.users.inputEmail.type(faker.internet.email());
 			await poAdmin.tabs.users.inputName.type(faker.person.firstName());
 			await poAdmin.tabs.users.inputUserName.type(faker.internet.userName());
-			await poAdmin.tabs.users.inputEmail.type(faker.internet.email());
-			await poAdmin.tabs.users.checkboxVerified.click();
+			await poAdmin.tabs.users.inputSetManually.click();
 			await poAdmin.tabs.users.inputPassword.type('any_password');
+			await poAdmin.tabs.users.inputConfirmPassword.type('any_password');
 			await expect(poAdmin.tabs.users.userRole).toBeVisible();
 			await poAdmin.tabs.users.btnSave.click();
 		});
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts b/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts
index bd46de6ea00f..2e9c73b9e37d 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/admin-flextab-users.ts
@@ -12,7 +12,7 @@ export class AdminFlextabUsers {
 	}
 
 	get btnSave(): Locator {
-		return this.page.locator('role=button[name="Save"]');
+		return this.page.locator('role=button[name="Add user"]');
 	}
 
 	get btnInvite(): Locator {
@@ -31,12 +31,20 @@ export class AdminFlextabUsers {
 		return this.page.locator('//label[text()="Email"]/following-sibling::span//input').first();
 	}
 
+	get inputSetManually(): Locator {
+		return this.page.locator('//label[text()="Set manually"]');
+	}
+
 	get inputPassword(): Locator {
-		return this.page.locator('//label[text()="Password"]/following-sibling::span//input');
+		return this.page.locator('input[placeholder="Password"]');
+	}
+
+	get inputConfirmPassword(): Locator {
+		return this.page.locator('input[placeholder="Confirm password"]');
 	}
 
 	get checkboxVerified(): Locator {
-		return this.page.locator('//label[text()="Verified"]');
+		return this.page.locator('//label[text()="Mark email as verified"]');
 	}
 
 	get userRole(): Locator {
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index ce14c4020d6f..7e5a08899f57 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -150,9 +150,7 @@ export interface IUser extends IRocketChatRecord {
 		public_key: string;
 	};
 	requirePasswordChange?: boolean;
-	customFields?: {
-		[key: string]: any;
-	};
+	customFields?: Record<string, any>;
 	settings?: IUserSettings;
 	defaultRoom?: string;
 	ldap?: boolean;
diff --git a/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts b/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
index 347498999011..49fb8b2f6912 100644
--- a/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UserCreateParamsPOST.ts
@@ -19,7 +19,7 @@ export type UserCreateParamsPOST = {
 	setRandomPassword?: boolean;
 	sendWelcomeEmail?: boolean;
 	verified?: boolean;
-	customFields?: object;
+	customFields?: Record<string, any>;
 	/* @deprecated */
 	fields: string;
 };
diff --git a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifier.tsx b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifier.tsx
index bf53360a2351..c2ed984512fa 100644
--- a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifier.tsx
+++ b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifier.tsx
@@ -8,6 +8,7 @@ import { PasswordVerifierItem } from './PasswordVerifierItem';
 type PasswordVerifierProps = {
 	password: string | undefined;
 	id?: string;
+	vertical?: boolean;
 };
 
 type PasswordVerificationProps = {
@@ -16,7 +17,7 @@ type PasswordVerificationProps = {
 	limit?: number;
 }[];
 
-export const PasswordVerifier = ({ password, id }: PasswordVerifierProps) => {
+export const PasswordVerifier = ({ password, id, vertical }: PasswordVerifierProps) => {
 	const { t } = useTranslation();
 	const uniqueId = useUniqueId();
 
@@ -37,7 +38,13 @@ export const PasswordVerifier = ({ password, id }: PasswordVerifierProps) => {
 				</Box>
 				<Box display='flex' flexWrap='wrap' role='list' aria-labelledby={uniqueId}>
 					{passwordVerifications.map(({ isValid, limit, name }) => (
-						<PasswordVerifierItem key={name} text={t(`${name}-label`, { limit })} isValid={isValid} aria-invalid={!isValid} />
+						<PasswordVerifierItem
+							key={name}
+							text={t(`${name}-label`, { limit })}
+							isValid={isValid}
+							aria-invalid={!isValid}
+							vertical={!!vertical}
+						/>
 					))}
 				</Box>
 			</Box>
diff --git a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifierItem.tsx b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifierItem.tsx
index 97499c0eaf73..c622fc74e6c8 100644
--- a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifierItem.tsx
+++ b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifierItem.tsx
@@ -20,13 +20,14 @@ const variants: {
 export const PasswordVerifierItem = ({
 	text,
 	isValid,
+	vertical,
 	...props
-}: { text: string; isValid: boolean } & Omit<AllHTMLAttributes<HTMLElement>, 'is'>) => {
+}: { text: string; isValid: boolean; vertical: boolean } & Omit<AllHTMLAttributes<HTMLElement>, 'is'>) => {
 	const { icon, color } = variants[isValid ? 'success' : 'error'];
 	return (
 		<Box
 			display='flex'
-			flexBasis='50%'
+			flexBasis={vertical ? '100%' : '50%'}
 			alignItems='center'
 			mbe={8}
 			fontScale='c1'

From 3c793c85bb41eeacd9188f7b45f93a5b6172f11b Mon Sep 17 00:00:00 2001
From: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Mon, 30 Oct 2023 13:55:06 -0300
Subject: [PATCH 05/61] feat: pending tab new (#30666)

* create pending tab

* remove button on 'all' tab

* fix

* remove extra tab

* Standardize empty state

* fix

* fix merge

---------

Co-authored-by: rique223 <henrique.jobs1@gmail.com>
---
 .../client/components/UserInfo/UserInfo.tsx   |  8 ++++
 .../admin/users/AdminUserInfoWithData.tsx     |  2 +
 .../views/admin/users/AdminUsersPage.tsx      | 39 ++++++++--------
 .../admin/users/UsersTable/UsersTable.tsx     | 43 +++++++++++-------
 .../admin/users/UsersTable/UsersTableRow.tsx  | 44 +++++++++++++++++--
 .../users/hooks/useFilterPendingUsers.ts      | 10 +++++
 .../views/admin/users/hooks/useListUsers.ts   |  5 +++
 .../rocketchat-i18n/i18n/en.i18n.json         | 11 +++++
 8 files changed, 124 insertions(+), 38 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts

diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 8a42f1b87026..01edbe9503ce 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -39,6 +39,7 @@ type UserInfoProps = UserInfoDataProps & {
 	verified?: boolean;
 	actions: ReactElement;
 	roles: ReactElement[];
+	reason?: string;
 };
 
 const UserInfo = ({
@@ -59,6 +60,7 @@ const UserInfo = ({
 	customFields,
 	canViewAllInfo,
 	actions,
+	reason,
 	...props
 }: UserInfoProps): ReactElement => {
 	const t = useTranslation();
@@ -87,6 +89,12 @@ const UserInfo = ({
 				</InfoPanel.Section>
 
 				<InfoPanel.Section>
+					{reason && (
+						<InfoPanel.Field>
+							<InfoPanel.Label>{t('Reason_for_joining')}</InfoPanel.Label>
+							<InfoPanel.Text>{reason}</InfoPanel.Text>
+						</InfoPanel.Field>
+					)}
 					{nickname && (
 						<InfoPanel.Field>
 							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index d0580b90c642..693cccf0df05 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -69,6 +69,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 			lastLogin,
 			nickname,
 			canViewAllInfo,
+			reason,
 		} = data.user;
 
 		return {
@@ -91,6 +92,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 			status: <UserStatus status={status} />,
 			statusText,
 			nickname,
+			reason,
 		};
 	}, [approveManuallyUsers, data, getRoles]);
 
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index ab07134e0794..fbc35ab74de8 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -28,7 +28,8 @@ const UsersPage = (): ReactElement => {
 	const canCreateUser = usePermission('create-user');
 	const canBulkCreateUser = usePermission('bulk-register-user');
 
-	const [tab, setTab] = useState<'all' | 'invited' | 'new' | 'active' | 'deactivated'>('all');
+	const [tab, setTab] = useState<'all' | 'invited' | 'active' | 'deactivated' | 'pending'>('all');
+	const [pendingActionsCount, setPendingActionsCount] = useState<number>(0);
 	const [createdUsersCount, setCreatedUsersCount] = useState(0);
 
 	useEffect(() => {
@@ -67,25 +68,25 @@ const UsersPage = (): ReactElement => {
 						</ButtonGroup>
 					)}
 				</PageHeader>
-				<Tabs>
-					<TabsItem selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
-						{t('All')}
-					</TabsItem>
-					<TabsItem selected={tab === 'invited'} onClick={() => setTab('invited')}>
-						{t('Invited')}
-					</TabsItem>
-					<TabsItem selected={tab === 'new'} onClick={() => setTab('new')}>
-						{t('New_users')}
-					</TabsItem>
-					<TabsItem selected={tab === 'active'} onClick={() => setTab('active')}>
-						{t('Active')}
-					</TabsItem>
-					<TabsItem selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
-						{t('Deactivated')}
-					</TabsItem>
-				</Tabs>
 				<PageContent>
-					<UsersTable reload={reload} tab={tab} onReload={handleReload} />
+					<Tabs>
+						<TabsItem selected={!tab || tab === 'all'} onClick={() => setTab('all')}>
+							{t('All')}
+						</TabsItem>
+						<TabsItem selected={tab === 'pending'} onClick={() => setTab('pending')}>
+							{pendingActionsCount === 0 ? t('Pending') : `${t('Pending')} (${pendingActionsCount})`}
+						</TabsItem>
+						<TabsItem selected={tab === 'active'} onClick={() => setTab('active')}>
+							{t('Active')}
+						</TabsItem>
+						<TabsItem selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
+							{t('Deactivated')}
+						</TabsItem>
+						<TabsItem selected={tab === 'invited'} onClick={() => setTab('invited')}>
+							{t('Invited')}
+						</TabsItem>
+					</Tabs>
+					<UsersTable reload={reload} tab={tab} onReload={handleReload} setPendingActionsCount={setPendingActionsCount} />
 				</PageContent>
 			</Page>
 			{context && (
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 7f2dd575e66e..09da2271ec10 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -16,17 +16,20 @@ import {
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import { useFilterActiveUsers } from '../hooks/useFilterActiveUsers';
+import { useFilterPendingUsers } from '../hooks/useFilterPendingUsers';
 import { useListUsers } from '../hooks/useListUsers';
 import UsersTableRow from './UsersTableRow';
 
+// TODO: remove bots from pending users + add "resend email" function
+
 type UsersTableProps = {
 	reload: MutableRefObject<() => void>;
 	tab: string;
 	onReload: () => void;
+	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>;
 };
 
-// TODO: Missing error state
-const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
@@ -47,11 +50,12 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 		sortDirection,
 		itemsPerPage,
 		current,
+		setPendingActionsCount,
 	);
 
 	const useAllUsers = () => (tab === 'all' && isSuccess ? data?.users : []);
 
-	const filteredUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab)];
+	const filteredUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab), ...useFilterPendingUsers(data?.users, tab)];
 
 	useEffect(() => {
 		reload.current = refetch;
@@ -128,7 +132,12 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 					{t('Registration_status')}
 				</GenericTableHeaderCell>
 			),
-			<GenericTableHeaderCell key='actions' w='x44' />,
+			tab === 'pending' && (
+				<GenericTableHeaderCell w='x88' key='action' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
+					{t('Pending_action')}
+				</GenericTableHeaderCell>
+			),
+			<GenericTableHeaderCell key='actions' w='x176' />,
 		],
 		[mediaQuery, setSort, sortBy, sortDirection, t, tab],
 	);
@@ -136,13 +145,27 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 	return (
 		<>
 			<FilterByText autoFocus placeholder={t('Search_Users')} onChange={({ text }): void => setText(text)} />
+
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
 					<GenericTableBody>{isLoading && <GenericTableLoadingTable headerCells={5} />}</GenericTableBody>
 				</GenericTable>
 			)}
-			{isSuccess && !!data && !!filteredUsers && data.count > 0 && (
+
+			{isError && (
+				<States>
+					<StatesIcon name='warning' variation='danger' />
+					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+					<StatesActions>
+						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
+					</StatesActions>
+				</States>
+			)}
+
+			{isSuccess && filteredUsers.length === 0 && <GenericNoResults />}
+
+			{isSuccess && !!data && !!filteredUsers && (
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
@@ -171,16 +194,6 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 					/>
 				</>
 			)}
-			{isSuccess && data?.count === 0 && <GenericNoResults />}
-			{isError && (
-				<States>
-					<StatesIcon name='warning' variation='danger' />
-					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
-					<StatesActions>
-						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
-					</StatesActions>
-				</States>
-			)}
 		</>
 	);
 };
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 637ad5018615..c9df04e3bad2 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,6 +1,6 @@
 import { UserStatus as Status, isUserFederated } from '@rocket.chat/core-typings';
 import type { IRole, IUser } from '@rocket.chat/core-typings';
-import { Box, Menu, Option } from '@rocket.chat/fuselage';
+import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { useQuery } from '@tanstack/react-query';
@@ -11,6 +11,7 @@ import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { UserStatus } from '../../../../components/UserStatus';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
+import { dispatchToastMessage } from '../../../../lib/toast';
 import { useChangeAdminStatusAction } from '../hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from '../hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
@@ -53,18 +54,21 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
 
 	const menuOptions = {
-		...(changeAdminStatusAction &&
+		...(tab !== 'pending' &&
+			changeAdminStatusAction &&
 			!isFederatedUser && {
 				makeAdmin: {
 					label: { label: changeAdminStatusAction.label, icon: changeAdminStatusAction.icon },
 					action: changeAdminStatusAction.action,
 				},
 			}),
-		...(resetE2EKeyAction &&
+		...(tab !== 'pending' &&
+			resetE2EKeyAction &&
 			!isFederatedUser && {
 				resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
 			}),
-		...(resetTOTPAction &&
+		...(tab !== 'pending' &&
+			resetTOTPAction &&
 			!isFederatedUser && {
 				resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
 			}),
@@ -80,6 +84,28 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 		}),
 	};
 
+	// TODO: create action for this?
+	// TODO: implement logic
+	const handleResendWelcomeEmail = () => {
+		console.log('Welcome email resent');
+		dispatchToastMessage({ type: 'success', message: t('Welcome_email_resent') });
+	};
+
+	const checkPendingButton = (): ReactElement => {
+		if (active) {
+			return (
+				<Button small secondary mie={8} onClick={handleResendWelcomeEmail}>
+					{t('Resend_welcome_email')}
+				</Button>
+			);
+		}
+		return (
+			<Button small primary mie={8} onClick={changeUserStatusAction?.action}>
+				{t('Activate')}
+			</Button>
+		);
+	};
+
 	return (
 		<GenericTableRow
 			onKeyDown={(e): void => onClick(_id, e)}
@@ -125,6 +151,14 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 					{registrationStatusText}
 				</GenericTableCell>
 			)}
+			{tab === 'pending' && (
+				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
+					<Box display='flex' flexDirection='row' alignContent='flex-end'>
+						{active ? t('User_first_log_in') : t('Activation')}
+					</Box>
+				</GenericTableCell>
+			)}
+
 			<GenericTableCell
 				display='flex'
 				justifyContent='flex-end'
@@ -132,6 +166,8 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 					e.stopPropagation();
 				}}
 			>
+				{tab === 'pending' && checkPendingButton()}
+
 				<Menu
 					mi={4}
 					placement='bottom-start'
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
new file mode 100644
index 000000000000..4cab19242463
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
@@ -0,0 +1,10 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+export const useFilterPendingUsers = (
+	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin'>[] | undefined,
+	tab: string,
+) => {
+	if (!users || tab !== 'pending') return [];
+
+	return users.filter((currentUser) => currentUser.active === false || !currentUser.lastLogin);
+};
diff --git a/apps/meteor/client/views/admin/users/hooks/useListUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
index 57b263f2f360..4be9009f2adf 100644
--- a/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
@@ -16,6 +16,7 @@ export const useListUsers = (
 	sortDirection: ReturnType<typeof useSort>['sortDirection'],
 	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
 	current: ReturnType<typeof usePagination>['current'],
+	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>,
 ) => {
 	const query = useDebouncedValue(
 		useMemo(() => {
@@ -65,5 +66,9 @@ export const useListUsers = (
 		},
 	);
 
+	if (usersListQueryResult.isSuccess) {
+		setPendingActionsCount(usersListQueryResult.data.users.filter((user) => !user.active).length);
+	}
+
 	return usersListQueryResult;
 };
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 5da4b1da20f1..75b022196bf3 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -6103,6 +6103,17 @@
   "All_visible": "All visible",
   "Filter_by_visibility": "Filter by visibility",
   "Registration_status": "Registration status",
+  "Pending": "Pending",
+  "Pending_action": "Pending action",
+  "User_first_log_in": "User first log in",
+  "Activation": "Activation",
+  "Resend_welcome_email": "Resend welcome email",
+  "No_pending_users": "No pending users",
+  "No_deactivated_users": "No deactivated users",
+  "Users_who_are_pending": "Users who are pending activation or have been manually created but haven't logged in yet appear here.",
+  "Deactivated_users_appear_here": "Deactivated users appear here.",
+  "Welcome_email_resent": "Welcome email resent",
+  "Reason_for_joining": "Reason for joining",
   "Theme_Appearence": "Theme Appearence",
   "mentions_counter": "{{count}} mention",
   "mentions_counter_plural": "{{count}} mentions",

From 86c64691b9a81d4cea9325930170037be519b31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Fri, 3 Nov 2023 10:11:13 -0300
Subject: [PATCH 06/61] chore: Change user created page message from string to
 states (#30806)

* refactor: :recycle: Change string to states in user created contextual bar

Changed the simple string that was shown in the user created page to the states component and updated the toast message to follow figma specs.

* Revert some changes

* Remove unnecessary checks and props

* refactor: :recycle: Implement i18n plurals in user created page

Implemented the plurals functionality in the user created page instead of manually verifying the number of created users.
---
 .../client/views/admin/users/AdminUserCreated.tsx     | 11 +++++------
 .../meteor/client/views/admin/users/AdminUserForm.tsx |  2 +-
 .../admin/users/AdminUserSetRandomPasswordRadios.tsx  |  2 +-
 .../meteor/packages/rocketchat-i18n/i18n/en.i18n.json |  6 +++---
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
index ac793c1ac756..d6601fce8517 100644
--- a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
@@ -1,20 +1,19 @@
 import { Button, ButtonGroup, ContextualbarFooter } from '@rocket.chat/fuselage';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarScrollableContent } from '../../../components/Contextualbar';
+import { ContextualbarEmptyContent } from '../../../components/Contextualbar';
 
 const AdminUserCreated = ({ uid, createdUsersCount }: { uid: string; createdUsersCount: number }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const goToUser = useCallback((id) => router.navigate(`/admin/users/info/${id}`), [router]);
 
 	return (
 		<>
-			<ContextualbarScrollableContent h='100%' fontScale='p1m'>
-				{createdUsersCount === 1 ? t('You_have_created_one_user') : t('You_have_created_users', { count: createdUsersCount })}
-			</ContextualbarScrollableContent>
+			<ContextualbarEmptyContent icon='user' title={t('You_have_created_user', { count: createdUsersCount })} />
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button type='reset' w='50%' onClick={() => router.navigate(`/admin/users/new`)}>
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 3071ccb8c63a..35991573886c 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -72,7 +72,7 @@ const getInitialValue = ({
 	nickname: data?.nickname ?? '',
 	email: (data?.emails?.length && data.emails[0].address) || '',
 	verified: (data?.emails?.length && data.emails[0].verified) || false,
-	setRandomPassword: (isNewUserPage && isSmtpEnabled) ?? true,
+	setRandomPassword: isNewUserPage && isSmtpEnabled,
 	requirePasswordChange: isNewUserPage && (data?.requirePasswordChange ?? true),
 	customFields: data?.customFields ?? {},
 	statusText: data?.statusText ?? '',
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
index 1eea93639edb..cd09fc38d7c0 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordRadios.tsx
@@ -45,7 +45,7 @@ const AdminUserSetRandomPasswordRadios = ({
 					<Controller
 						control={control}
 						name='setRandomPassword'
-						defaultValue={isNewUserPage}
+						defaultValue={isSmtpEnabled && isNewUserPage}
 						render={({ field: { ref, onChange, value } }) => (
 							<RadioButton
 								ref={ref}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 798d006b68e2..b8ad62365ac1 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -5392,7 +5392,7 @@
   "User_added_successfully": "User added successfully",
   "User_and_group_mentions_only": "User and group mentions only",
   "User_cant_be_empty": "User cannot be empty",
-  "User_created_successfully!": "User create successfully!",
+  "User_created_successfully!": "User created successfully!",
   "User_default": "User default",
   "User_doesnt_exist": "No user exists by the name of `@%s`.",
   "User_e2e_key_was_reset": "User E2E key was reset successfully.",
@@ -5815,8 +5815,8 @@
   "You_have_a_new_message": "You have a new message",
   "You_have_been_muted": "You have been muted and cannot speak in this room",
   "You_have_been_removed_from__roomName_": "You've been removed from the room {{roomName}}",
-  "You_have_created_one_user": "You’ve created 1 user",
-  "You_have_created_users": "You’ve created {{count}} users",
+  "You_have_created_user_one": "You’ve created {{count}} user",
+  "You_have_created_user_other": "You’ve created {{count}} users",
   "You_have_joined_a_new_call_with": "You have joined a new call with",
   "You_have_n_codes_remaining": "You have {{number}} codes remaining.",
   "You_have_not_verified_your_email": "You have not verified your email.",

From c6b4b54e8ff99afba4731155fc9835eb2b4eee17 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Fri, 3 Nov 2023 15:50:45 -0300
Subject: [PATCH 07/61] feat: add endpoint to get active/inactive users and
 filter by role

---
 apps/meteor/app/api/server/v1/users.ts | 89 ++++++++++++++++++++++++++
 packages/rest-typings/src/v1/users.ts  |  6 ++
 2 files changed, 95 insertions(+)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index b23d41255c3b..0fc509b9215a 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -555,6 +555,95 @@ API.v1.addRoute(
 	},
 );
 
+API.v1.addRoute(
+	'users.list/:status',
+	{
+		authRequired: true,
+	},
+	{
+		async get() {
+			if (!(await hasPermissionAsync(this.userId, 'view-d-room'))) {
+				return API.v1.unauthorized();
+			}
+
+			if (
+				settings.get('API_Apply_permission_view-outside-room_on_users-list') &&
+				!(await hasPermissionAsync(this.userId, 'view-outside-room'))
+			) {
+				return API.v1.unauthorized();
+			}
+
+			const { offset, count } = await getPaginationItems(this.queryParams);
+			const { status } = this.urlParams;
+			const { sort, fields } = await this.parseJsonQuery();
+			const { role } = this.queryParams;
+
+			const nonEmptyFields = getNonEmptyFields(fields);
+
+			const inclusiveFields = getInclusiveFields(nonEmptyFields);
+
+			const actualSort = sort || { username: 1 };
+
+			if (sort?.status) {
+				actualSort.active = sort.status;
+			}
+
+			if (sort?.name) {
+				actualSort.nameInsensitive = sort.name;
+			}
+
+			const limit =
+				count !== 0
+					? [
+							{
+								$limit: count,
+							},
+					  ]
+					: [];
+
+			const result = await Users.col
+				.aggregate<{ sortedResults: IUser[]; totalCount: { total: number }[] }>([
+					{
+						$match: {
+							active: status === 'active',
+							roles: role,
+						},
+					},
+					{
+						$project: inclusiveFields,
+					},
+					{
+						$facet: {
+							sortedResults: [
+								{
+									$sort: actualSort,
+								},
+								{
+									$skip: offset,
+								},
+								...limit,
+							],
+							totalCount: [{ $group: { _id: null, total: { $sum: 1 } } }],
+						},
+					},
+				])
+				.toArray();
+
+			const {
+				sortedResults: users,
+				totalCount: [{ total } = { total: 0 }],
+			} = result[0];
+
+			return API.v1.success({
+				users,
+				count: users.length,
+				offset,
+				total,
+			});
+		},
+	},
+);
+
 API.v1.addRoute(
 	'users.register',
 	{
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index c47f4be6404d..8e08b3a4ba27 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -151,6 +151,12 @@ export type UsersEndpoints = {
 		}>;
 	};
 
+	'/v1/users.list/:status': {
+		GET: (params: PaginatedRequest<{ fields: string }>) => PaginatedResult<{
+			users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[];
+		}>;
+	};
+
 	'/v1/users.setAvatar': {
 		POST: (params: UsersSetAvatar) => void;
 	};

From 2cb1c1da82e6d55b1a68cd385631dbc1e091b63a Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Fri, 3 Nov 2023 17:48:29 -0300
Subject: [PATCH 08/61] feat: add endpoint to send welcome email

---
 apps/meteor/app/api/server/v1/users.ts        | 20 ++++++++
 apps/meteor/server/main.ts                    |  1 +
 .../meteor/server/methods/sendWelcomeEmail.ts | 49 +++++++++++++++++++
 packages/rest-typings/src/v1/users.ts         |  4 ++
 4 files changed, 74 insertions(+)
 create mode 100644 apps/meteor/server/methods/sendWelcomeEmail.ts

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 0fc509b9215a..256ced775bc3 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -644,6 +644,26 @@ API.v1.addRoute(
 	},
 );
 
+API.v1.addRoute(
+	'users.sendWelcomeEmail',
+	{
+		authRequired: true,
+	},
+	{
+		async post() {
+			const { email } = this.bodyParams;
+			if (!email) {
+				return API.v1.failure("The 'email' param is required");
+			}
+
+			if (await Meteor.callAsync('sendWelcomeEmail', email)) {
+				return API.v1.success();
+			}
+			return API.v1.failure();
+		},
+	},
+);
+
 API.v1.addRoute(
 	'users.register',
 	{
diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts
index b9418fe43830..f8d716d114f1 100644
--- a/apps/meteor/server/main.ts
+++ b/apps/meteor/server/main.ts
@@ -63,6 +63,7 @@ import './methods/saveUserPreferences';
 import './methods/saveUserProfile';
 import './methods/sendConfirmationEmail';
 import './methods/sendForgotPasswordEmail';
+import './methods/sendWelcomeEmail';
 import './methods/setAvatarFromService';
 import './methods/setUserActiveStatus';
 import './methods/setUserPassword';
diff --git a/apps/meteor/server/methods/sendWelcomeEmail.ts b/apps/meteor/server/methods/sendWelcomeEmail.ts
new file mode 100644
index 000000000000..098bf58984da
--- /dev/null
+++ b/apps/meteor/server/methods/sendWelcomeEmail.ts
@@ -0,0 +1,49 @@
+import { Users } from '@rocket.chat/models';
+import type { ServerMethods } from '@rocket.chat/ui-contexts';
+import { check } from 'meteor/check';
+import { Meteor } from 'meteor/meteor';
+
+import * as Mailer from '../../app/mailer/server/api';
+import { settings } from '../../app/settings/server';
+
+declare module '@rocket.chat/ui-contexts' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface ServerMethods {
+		sendWelcomeEmail(to: string): boolean | undefined;
+	}
+}
+
+Meteor.methods<ServerMethods>({
+	async sendWelcomeEmail(to) {
+		check(to, String);
+
+		const email = to.trim();
+
+		const user = await Users.findOneByEmailAddress(email, { projection: { _id: 1 } });
+
+		if (!user) {
+			return false;
+		}
+
+		try {
+			let html = '';
+			Mailer.getTemplate('Accounts_UserAddedEmail_Email', (template) => {
+				html = template;
+			});
+
+			await Mailer.send({
+				to: email,
+				from: settings.get('From_Email'),
+				subject: settings.get('Accounts_UserAddedEmail_Subject'),
+				html,
+			});
+
+			return true;
+		} catch (error: any) {
+			throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${error.message}`, {
+				method: 'sendWelcomeEmail',
+				message: error.message,
+			});
+		}
+	},
+});
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 8e08b3a4ba27..a58720f04db8 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -157,6 +157,10 @@ export type UsersEndpoints = {
 		}>;
 	};
 
+	'/v1/users.sendWelcomeEmail': {
+		POST: (params: { email: string }) => void;
+	};
+
 	'/v1/users.setAvatar': {
 		POST: (params: UsersSetAvatar) => void;
 	};

From 9f14c8f74f8adad4ac7c8b0c0c33a027422d6707 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Mon, 6 Nov 2023 17:46:28 -0300
Subject: [PATCH 09/61] feat: add pending status to the endpoint

---
 apps/meteor/app/api/server/v1/users.ts        | 27 ++++++++++++++++++-
 packages/rest-typings/src/v1/users.ts         |  3 ++-
 .../src/v1/users/UsersListStatusParamsGET.ts  | 22 +++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 256ced775bc3..1d581528f790 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -592,6 +592,31 @@ API.v1.addRoute(
 				actualSort.nameInsensitive = sort.name;
 			}
 
+			let match;
+
+			switch (status) {
+				case 'active':
+					match = {
+						active: true,
+						lastLogin: { $exists: true },
+					};
+					break;
+				case 'inactive':
+					match = {
+						active: false,
+						lastLogin: { $exists: true },
+					};
+					break;
+				case 'pending':
+					match = {
+						lastLogin: { $exists: false },
+						type: { $ne: 'bot' },
+					};
+					break;
+				default:
+					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
+			}
+
 			const limit =
 				count !== 0
 					? [
@@ -605,8 +630,8 @@ API.v1.addRoute(
 				.aggregate<{ sortedResults: IUser[]; totalCount: { total: number }[] }>([
 					{
 						$match: {
-							active: status === 'active',
 							roles: role,
+							...match,
 						},
 					},
 					{
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index a58720f04db8..6b2affd10d72 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -18,6 +18,7 @@ import type { UserRegisterParamsPOST } from './users/UserRegisterParamsPOST';
 import type { UserSetActiveStatusParamsPOST } from './users/UserSetActiveStatusParamsPOST';
 import type { UsersAutocompleteParamsGET } from './users/UsersAutocompleteParamsGET';
 import type { UsersInfoParamsGet } from './users/UsersInfoParamsGet';
+import type { UsersListStatusParamsGET } from './users/UsersListStatusParamsGET';
 import type { UsersListTeamsParamsGET } from './users/UsersListTeamsParamsGET';
 import type { UsersSendConfirmationEmailParamsPOST } from './users/UsersSendConfirmationEmailParamsPOST';
 import type { UsersSetPreferencesParamsPOST } from './users/UsersSetPreferenceParamsPOST';
@@ -152,7 +153,7 @@ export type UsersEndpoints = {
 	};
 
 	'/v1/users.list/:status': {
-		GET: (params: PaginatedRequest<{ fields: string }>) => PaginatedResult<{
+		GET: (params: UsersListStatusParamsGET) => PaginatedResult<{
 			users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[];
 		}>;
 	};
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
new file mode 100644
index 000000000000..e4226afbf377
--- /dev/null
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -0,0 +1,22 @@
+import Ajv from 'ajv';
+
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type UsersListStatusParamsGET = { role: string } & PaginatedRequest<{ fields: string }>;
+
+const UsersListStatusParamsGetSchema = {
+	type: 'object',
+	properties: {
+		role: {
+			type: 'string',
+		},
+	},
+	required: ['role'],
+	additionalProperties: false,
+};
+
+export const isUsersListStatusProps = ajv.compile<UsersListStatusParamsGET>(UsersListStatusParamsGetSchema);

From 2bff799ce9c3aba21dcf0038570c40a3edef29a4 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 10:23:54 -0300
Subject: [PATCH 10/61] fix: change param name to match frontend tabs

---
 apps/meteor/app/api/server/v1/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 1d581528f790..7128f2c8c96d 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -601,7 +601,7 @@ API.v1.addRoute(
 						lastLogin: { $exists: true },
 					};
 					break;
-				case 'inactive':
+				case 'deactivated':
 					match = {
 						active: false,
 						lastLogin: { $exists: true },

From 42470e9bc1dda36650656261597251ad197909bb Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 10:48:26 -0300
Subject: [PATCH 11/61] refactor: remove meteor dependency

---
 apps/meteor/app/api/server/v1/users.ts        |  3 +-
 apps/meteor/server/main.ts                    |  1 -
 .../meteor/server/methods/sendWelcomeEmail.ts | 70 ++++++++-----------
 3 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 7128f2c8c96d..9c9242f098b4 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -25,6 +25,7 @@ import type { Filter } from 'mongodb';
 import { i18n } from '../../../../server/lib/i18n';
 import { resetUserE2EEncriptionKey } from '../../../../server/lib/resetUserE2EKey';
 import { saveUserPreferences } from '../../../../server/methods/saveUserPreferences';
+import { sendWelcomeEmail } from '../../../../server/methods/sendWelcomeEmail';
 import { getUserForCheck, emailCheck } from '../../../2fa/server/code';
 import { resetTOTP } from '../../../2fa/server/functions/resetTOTP';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -681,7 +682,7 @@ API.v1.addRoute(
 				return API.v1.failure("The 'email' param is required");
 			}
 
-			if (await Meteor.callAsync('sendWelcomeEmail', email)) {
+			if (await sendWelcomeEmail(email)) {
 				return API.v1.success();
 			}
 			return API.v1.failure();
diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts
index f8d716d114f1..b9418fe43830 100644
--- a/apps/meteor/server/main.ts
+++ b/apps/meteor/server/main.ts
@@ -63,7 +63,6 @@ import './methods/saveUserPreferences';
 import './methods/saveUserProfile';
 import './methods/sendConfirmationEmail';
 import './methods/sendForgotPasswordEmail';
-import './methods/sendWelcomeEmail';
 import './methods/setAvatarFromService';
 import './methods/setUserActiveStatus';
 import './methods/setUserPassword';
diff --git a/apps/meteor/server/methods/sendWelcomeEmail.ts b/apps/meteor/server/methods/sendWelcomeEmail.ts
index 098bf58984da..4e7828789cfe 100644
--- a/apps/meteor/server/methods/sendWelcomeEmail.ts
+++ b/apps/meteor/server/methods/sendWelcomeEmail.ts
@@ -1,49 +1,39 @@
 import { Users } from '@rocket.chat/models';
-import type { ServerMethods } from '@rocket.chat/ui-contexts';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import * as Mailer from '../../app/mailer/server/api';
 import { settings } from '../../app/settings/server';
 
-declare module '@rocket.chat/ui-contexts' {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface ServerMethods {
-		sendWelcomeEmail(to: string): boolean | undefined;
+export async function sendWelcomeEmail(to: string) {
+	check(to, String);
+
+	const email = to.trim();
+
+	const user = await Users.findOneByEmailAddress(email, { projection: { _id: 1 } });
+
+	if (!user) {
+		return false;
 	}
-}
 
-Meteor.methods<ServerMethods>({
-	async sendWelcomeEmail(to) {
-		check(to, String);
-
-		const email = to.trim();
-
-		const user = await Users.findOneByEmailAddress(email, { projection: { _id: 1 } });
-
-		if (!user) {
-			return false;
-		}
-
-		try {
-			let html = '';
-			Mailer.getTemplate('Accounts_UserAddedEmail_Email', (template) => {
-				html = template;
-			});
-
-			await Mailer.send({
-				to: email,
-				from: settings.get('From_Email'),
-				subject: settings.get('Accounts_UserAddedEmail_Subject'),
-				html,
-			});
-
-			return true;
-		} catch (error: any) {
-			throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${error.message}`, {
-				method: 'sendWelcomeEmail',
-				message: error.message,
-			});
-		}
-	},
-});
+	try {
+		let html = '';
+		Mailer.getTemplate('Accounts_UserAddedEmail_Email', (template) => {
+			html = template;
+		});
+
+		await Mailer.send({
+			to: email,
+			from: settings.get('From_Email'),
+			subject: settings.get('Accounts_UserAddedEmail_Subject'),
+			html,
+		});
+
+		return true;
+	} catch (error: any) {
+		throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${error.message}`, {
+			method: 'sendWelcomeEmail',
+			message: error.message,
+		});
+	}
+}

From b0f15feb2ee5c9230e6c426bd5e1752585ce7541 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 11:49:43 -0300
Subject: [PATCH 12/61] refactor: move query to model

---
 apps/meteor/app/api/server/v1/users.ts | 51 ++++++--------------------
 1 file changed, 11 insertions(+), 40 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 9c9242f098b4..0b4c93b66bcd 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -618,47 +618,18 @@ API.v1.addRoute(
 					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
 			}
 
-			const limit =
-				count !== 0
-					? [
-							{
-								$limit: count,
-							},
-					  ]
-					: [];
-
-			const result = await Users.col
-				.aggregate<{ sortedResults: IUser[]; totalCount: { total: number }[] }>([
-					{
-						$match: {
-							roles: role,
-							...match,
-						},
-					},
-					{
-						$project: inclusiveFields,
-					},
-					{
-						$facet: {
-							sortedResults: [
-								{
-									$sort: actualSort,
-								},
-								{
-									$skip: offset,
-								},
-								...limit,
-							],
-							totalCount: [{ $group: { _id: null, total: { $sum: 1 } } }],
-						},
-					},
-				])
-				.toArray();
+			const result = await Users.findPaginated(
+				{ ...match, roles: role },
+				{
+					projection: inclusiveFields,
+					sort: actualSort,
+					skip: offset,
+					limit: count,
+				},
+			);
 
-			const {
-				sortedResults: users,
-				totalCount: [{ total } = { total: 0 }],
-			} = result[0];
+			const users = await result.cursor.toArray();
+			const total = await result.totalCount;
 
 			return API.v1.success({
 				users,

From efa2f23259ddda7dca8682d969284937d8957c6e Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 11:52:51 -0300
Subject: [PATCH 13/61] refactor: remove deprecated `field` query param

---
 apps/meteor/app/api/server/v1/users.ts        | 20 ++++++++++++++-----
 .../src/v1/users/UsersListStatusParamsGET.ts  |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 0b4c93b66bcd..c791d653ed30 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -576,12 +576,21 @@ API.v1.addRoute(
 
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { status } = this.urlParams;
-			const { sort, fields } = await this.parseJsonQuery();
+			const { sort } = await this.parseJsonQuery();
 			const { role } = this.queryParams;
 
-			const nonEmptyFields = getNonEmptyFields(fields);
-
-			const inclusiveFields = getInclusiveFields(nonEmptyFields);
+			const projection = {
+				name: 1,
+				username: 1,
+				emails: 1,
+				roles: 1,
+				status: 1,
+				active: 1,
+				avatarETag: 1,
+				lastLogin: 1,
+				type: 1,
+				reason: 0,
+			};
 
 			const actualSort = sort || { username: 1 };
 
@@ -613,6 +622,7 @@ API.v1.addRoute(
 						lastLogin: { $exists: false },
 						type: { $ne: 'bot' },
 					};
+					projection.reason = 1;
 					break;
 				default:
 					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
@@ -621,10 +631,10 @@ API.v1.addRoute(
 			const result = await Users.findPaginated(
 				{ ...match, roles: role },
 				{
-					projection: inclusiveFields,
 					sort: actualSort,
 					skip: offset,
 					limit: count,
+					projection,
 				},
 			);
 
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index e4226afbf377..dcaa09e2a459 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,7 +6,7 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { role: string } & PaginatedRequest<{ fields: string }>;
+export type UsersListStatusParamsGET = { role: string } & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',

From ade3c32550cf85b556eb976d6087422beac6158f Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 11:59:53 -0300
Subject: [PATCH 14/61] Create serious-poets-smash.md

---
 .changeset/serious-poets-smash.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changeset/serious-poets-smash.md

diff --git a/.changeset/serious-poets-smash.md b/.changeset/serious-poets-smash.md
new file mode 100644
index 000000000000..bacf314515a3
--- /dev/null
+++ b/.changeset/serious-poets-smash.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/rest-typings": minor
+---
+
+Add a new endpoint to list users and resend the welcome message

From 95ffefc708045f1dad7751eb7ffd5029f113e91e Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 14:57:49 -0300
Subject: [PATCH 15/61] test: list users tab

---
 apps/meteor/tests/end-to-end/api/01-users.js | 100 +++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index eaafc97527a3..7e5af0a20f99 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4229,4 +4229,104 @@ describe('[Users]', function () {
 			});
 		});
 	});
+
+	describe('[/users.list/:status]', () => {
+		let user;
+
+		before(async () => {
+			user = await createUser();
+		});
+
+		after(async () => {
+			await deleteUser(user);
+		});
+
+		it('should list pending users', async () => {
+			await request
+				.get(api('users.list/pending'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+
+					expect(users).to.have.length(2);
+				});
+		});
+
+		it('should list active users', async () => {
+			await login(user.username, password);
+
+			await request
+				.get(api('users.list/active'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+
+					expect(users).to.have.length(2);
+				});
+		});
+
+		it('should filter users by role', async () => {
+			await login(user.username, password);
+
+			await request
+				.get(api('users.list/active'))
+				.set(credentials)
+				.query({ role: 'admin' })
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+
+					expect(users).to.have.length(1);
+				});
+		});
+
+		it('should list deactivated users', async () => {
+			await request.post(api('users.setActiveStatus')).set(credentials).send({
+				userId: user._id,
+				activeStatus: false,
+				confirmRelinquish: false,
+			});
+
+			await request
+				.get(api('users.list/deactivated'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+
+					expect(users).to.have.length(1);
+				});
+		});
+
+		it('should return error for invalid status params', async () => {
+			await request
+				.get(api('users.list/abcd'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-invalid-status');
+					expect(res.body.error).to.be.equal('Invalid status parameter [error-invalid-status]');
+				});
+		});
+	});
 });

From 626ed7c00600223d18ee02f283de9a84a69658f7 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Tue, 7 Nov 2023 17:46:00 -0300
Subject: [PATCH 16/61] test: fix expect to avoid being affect by other tests

---
 apps/meteor/tests/end-to-end/api/01-users.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 7e5af0a20f99..21d0fd10435e 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4252,8 +4252,9 @@ describe('[Users]', function () {
 					expect(res.body).to.have.property('users');
 
 					const { users } = res.body;
+					const ids = users.map((user) => user._id);
 
-					expect(users).to.have.length(2);
+					expect(ids).to.include(user._id);
 				});
 		});
 
@@ -4270,8 +4271,9 @@ describe('[Users]', function () {
 					expect(res.body).to.have.property('users');
 
 					const { users } = res.body;
+					const ids = users.map((user) => user._id);
 
-					expect(users).to.have.length(2);
+					expect(ids).to.include(user._id);
 				});
 		});
 
@@ -4289,8 +4291,9 @@ describe('[Users]', function () {
 					expect(res.body).to.have.property('users');
 
 					const { users } = res.body;
+					const ids = users.map((user) => user._id);
 
-					expect(users).to.have.length(1);
+					expect(ids).to.not.include(user._id);
 				});
 		});
 
@@ -4311,8 +4314,9 @@ describe('[Users]', function () {
 					expect(res.body).to.have.property('users');
 
 					const { users } = res.body;
+					const ids = users.map((user) => user._id);
 
-					expect(users).to.have.length(1);
+					expect(ids).to.include(user._id);
 				});
 		});
 

From 32199ce901392df803b1dcb3868bd4765cfad58b Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Mon, 13 Nov 2023 12:18:13 -0300
Subject: [PATCH 17/61] fix: changes requested

---
 apps/meteor/app/api/server/v1/users.ts        | 21 ++++++-------------
 .../meteor/server/methods/sendWelcomeEmail.ts | 15 +++++++------
 packages/rest-typings/src/v1/users.ts         |  1 +
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index c791d653ed30..c16bdb71fd7c 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -6,6 +6,7 @@ import {
 	isUserSetActiveStatusParamsPOST,
 	isUserDeactivateIdleParamsPOST,
 	isUsersInfoParamsGetProps,
+	isUsersListStatusProps,
 	isUserRegisterParamsPOST,
 	isUserLogoutParamsPOST,
 	isUsersListTeamsProps,
@@ -560,20 +561,11 @@ API.v1.addRoute(
 	'users.list/:status',
 	{
 		authRequired: true,
+		validateParams: isUsersListStatusProps,
+		permissionsRequired: ['view-d-room', 'view-outside-room'],
 	},
 	{
 		async get() {
-			if (!(await hasPermissionAsync(this.userId, 'view-d-room'))) {
-				return API.v1.unauthorized();
-			}
-
-			if (
-				settings.get('API_Apply_permission_view-outside-room_on_users-list') &&
-				!(await hasPermissionAsync(this.userId, 'view-outside-room'))
-			) {
-				return API.v1.unauthorized();
-			}
-
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { status } = this.urlParams;
 			const { sort } = await this.parseJsonQuery();
@@ -663,10 +655,9 @@ API.v1.addRoute(
 				return API.v1.failure("The 'email' param is required");
 			}
 
-			if (await sendWelcomeEmail(email)) {
-				return API.v1.success();
-			}
-			return API.v1.failure();
+			await sendWelcomeEmail(email);
+
+			return API.v1.success();
 		},
 	},
 );
diff --git a/apps/meteor/server/methods/sendWelcomeEmail.ts b/apps/meteor/server/methods/sendWelcomeEmail.ts
index 4e7828789cfe..3a8cf1b19787 100644
--- a/apps/meteor/server/methods/sendWelcomeEmail.ts
+++ b/apps/meteor/server/methods/sendWelcomeEmail.ts
@@ -1,19 +1,24 @@
 import { Users } from '@rocket.chat/models';
-import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import * as Mailer from '../../app/mailer/server/api';
 import { settings } from '../../app/settings/server';
 
-export async function sendWelcomeEmail(to: string) {
-	check(to, String);
+export async function sendWelcomeEmail(to: string): Promise<void> {
+	if (typeof to !== 'string') {
+		throw new Meteor.Error('error-invalid-arguments', 'Invalid arguments', {
+			method: 'sendWelcomeEmail',
+		});
+	}
 
 	const email = to.trim();
 
 	const user = await Users.findOneByEmailAddress(email, { projection: { _id: 1 } });
 
 	if (!user) {
-		return false;
+		throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+			method: 'sendWelcomeEmail',
+		});
 	}
 
 	try {
@@ -28,8 +33,6 @@ export async function sendWelcomeEmail(to: string) {
 			subject: settings.get('Accounts_UserAddedEmail_Subject'),
 			html,
 		});
-
-		return true;
 	} catch (error: any) {
 		throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${error.message}`, {
 			method: 'sendWelcomeEmail',
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 6b2affd10d72..dfc07b217346 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -384,6 +384,7 @@ export * from './users/UserCreateParamsPOST';
 export * from './users/UserSetActiveStatusParamsPOST';
 export * from './users/UserDeactivateIdleParamsPOST';
 export * from './users/UsersInfoParamsGet';
+export * from './users/UsersListStatusParamsGET';
 export * from './users/UserRegisterParamsPOST';
 export * from './users/UserLogoutParamsPOST';
 export * from './users/UsersListTeamsParamsGET';

From 66a327f2655f68b276b1d0e32f40081fda52a3b3 Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Thu, 16 Nov 2023 17:04:57 -0300
Subject: [PATCH 18/61] fix: use ajv to validate request params

---
 apps/meteor/app/api/server/v1/users.ts        |  5 ++---
 packages/rest-typings/src/v1/users.ts         |  4 +++-
 .../users/UsersSendWelcomeEmailParamsPOST.ts  | 20 +++++++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index c16bdb71fd7c..18552a3101d3 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -7,6 +7,7 @@ import {
 	isUserDeactivateIdleParamsPOST,
 	isUsersInfoParamsGetProps,
 	isUsersListStatusProps,
+	isUsersSendWelcomeEmailProps,
 	isUserRegisterParamsPOST,
 	isUserLogoutParamsPOST,
 	isUsersListTeamsProps,
@@ -647,13 +648,11 @@ API.v1.addRoute(
 	'users.sendWelcomeEmail',
 	{
 		authRequired: true,
+		validateParams: isUsersSendWelcomeEmailProps,
 	},
 	{
 		async post() {
 			const { email } = this.bodyParams;
-			if (!email) {
-				return API.v1.failure("The 'email' param is required");
-			}
 
 			await sendWelcomeEmail(email);
 
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index dfc07b217346..0917346ca967 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -21,6 +21,7 @@ import type { UsersInfoParamsGet } from './users/UsersInfoParamsGet';
 import type { UsersListStatusParamsGET } from './users/UsersListStatusParamsGET';
 import type { UsersListTeamsParamsGET } from './users/UsersListTeamsParamsGET';
 import type { UsersSendConfirmationEmailParamsPOST } from './users/UsersSendConfirmationEmailParamsPOST';
+import type { UsersSendWelcomeEmailParamsPOST } from './users/UsersSendWelcomeEmailParamsPOST';
 import type { UsersSetPreferencesParamsPOST } from './users/UsersSetPreferenceParamsPOST';
 import type { UsersUpdateOwnBasicInfoParamsPOST } from './users/UsersUpdateOwnBasicInfoParamsPOST';
 import type { UsersUpdateParamsPOST } from './users/UsersUpdateParamsPOST';
@@ -159,7 +160,7 @@ export type UsersEndpoints = {
 	};
 
 	'/v1/users.sendWelcomeEmail': {
-		POST: (params: { email: string }) => void;
+		POST: (params: UsersSendWelcomeEmailParamsPOST) => void;
 	};
 
 	'/v1/users.setAvatar': {
@@ -385,6 +386,7 @@ export * from './users/UserSetActiveStatusParamsPOST';
 export * from './users/UserDeactivateIdleParamsPOST';
 export * from './users/UsersInfoParamsGet';
 export * from './users/UsersListStatusParamsGET';
+export * from './users/UsersSendWelcomeEmailParamsPOST';
 export * from './users/UserRegisterParamsPOST';
 export * from './users/UserLogoutParamsPOST';
 export * from './users/UsersListTeamsParamsGET';
diff --git a/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts
new file mode 100644
index 000000000000..7bfd6f04c021
--- /dev/null
+++ b/packages/rest-typings/src/v1/users/UsersSendWelcomeEmailParamsPOST.ts
@@ -0,0 +1,20 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type UsersSendWelcomeEmailParamsPOST = { email: string };
+
+const UsersSendWelcomeEmailParamsPostSchema = {
+	type: 'object',
+	properties: {
+		email: {
+			type: 'string',
+		},
+	},
+	required: ['email'],
+	additionalProperties: false,
+};
+
+export const isUsersSendWelcomeEmailProps = ajv.compile<UsersSendWelcomeEmailParamsPOST>(UsersSendWelcomeEmailParamsPostSchema);

From 70bbfc51b4acbafe6fd7c98a7f0de462627e2b9f Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Thu, 16 Nov 2023 17:14:23 -0300
Subject: [PATCH 19/61] fix: set role as optional param

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

diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index dcaa09e2a459..94cf33f9ca9c 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -15,7 +15,6 @@ const UsersListStatusParamsGetSchema = {
 			type: 'string',
 		},
 	},
-	required: ['role'],
 	additionalProperties: false,
 };
 

From 9a3e60bceafe93f68f9206629e8fd0f9b9c9bcab Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Thu, 16 Nov 2023 18:05:57 -0300
Subject: [PATCH 20/61] test: check if user has permission

---
 apps/meteor/tests/end-to-end/api/01-users.js | 35 +++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 21d0fd10435e..1fcd1b15c84c 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4230,15 +4230,22 @@ describe('[Users]', function () {
 		});
 	});
 
-	describe('[/users.list/:status]', () => {
+	describe.only('[/users.list/:status]', () => {
 		let user;
+		let otherUser;
+		let otherUserCredentials;
 
 		before(async () => {
 			user = await createUser();
+			otherUser = await createUser();
+			otherUserCredentials = await login(otherUser.username, password);
 		});
 
 		after(async () => {
 			await deleteUser(user);
+			await deleteUser(otherUser);
+			await updatePermission('view-outside-room', ['admin', 'owner', 'moderator', 'user']);
+			await updatePermission('view-d-room', ['admin', 'owner', 'moderator', 'user']);
 		});
 
 		it('should list pending users', async () => {
@@ -4332,5 +4339,31 @@ describe('[Users]', function () {
 					expect(res.body.error).to.be.equal('Invalid status parameter [error-invalid-status]');
 				});
 		});
+
+		it('should throw unauthorized error to user without "view-d-room" permission', async () => {
+			await updatePermission('view-d-room', ['admin']);
+			await request
+				.get(api('users.list/active'))
+				.set(otherUserCredentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+
+		it('should throw unauthorized error to user without "view-outside-room" permission', async () => {
+			await updatePermission('view-outside-room', ['admin']);
+			await request
+				.get(api('users.list/active'))
+				.set(otherUserCredentials)
+				.expect('Content-Type', 'application/json')
+				.expect(403)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
 	});
 });

From 63329c60e7ca3456210f77cf9e96b1e8305e20ed Mon Sep 17 00:00:00 2001
From: Rafael Tapia <rafael.tapia@rocket.chat>
Date: Thu, 16 Nov 2023 18:32:39 -0300
Subject: [PATCH 21/61] test: remove only

---
 apps/meteor/tests/end-to-end/api/01-users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 1fcd1b15c84c..579dafa99e49 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4230,7 +4230,7 @@ describe('[Users]', function () {
 		});
 	});
 
-	describe.only('[/users.list/:status]', () => {
+	describe('[/users.list/:status]', () => {
 		let user;
 		let otherUser;
 		let otherUserCredentials;

From 29a50b751eb3b82f09f67bf7fc72f3768e9f8970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Wed, 29 Nov 2023 10:22:00 -0300
Subject: [PATCH 22/61] feat: Implement users page deactivated tab (#30532)

* feat: :sparkles: Filter users list by active users

Implemented the necessary resources to filter the list of users and to return only those who are active, when the active tab is enabled.

* feat: :sparkles: Implement new roles filter in the admin users page

Implemented a new filter on the users' page that retrieves the roles list and creates a dropdown menu. When any of its options is selected, it will filter the users' list to display only those with the selected roles. Additionally, I made some minor adjustments to the MultiSelectCustom component and introduced some new hooks.

* WIP: Remove filters

* feat: :sparkles: WIP: Implement new actions menu for users page table

* feat: :sparkles: Finish users table menu

Completed the implementation of the users table actions menu by preventing the propagation of the click event that triggered the opening of the contextual bar when the menu was clicked. Also, ensured that the contextual bar only opens when the "Enter" or "Space" keys are used for keyboard navigation and enhanced the options menu in the contextual bar as specified in Figma.

* refactor: :recycle: Remove status badge from contextual bar and reorg

Removed the status from the users page contextual bar (the need to remove this may not be concrete, for now it will be only commented until the final decision is made). Also changed the order of the contextual bar info and changed some minor styles to follow figma specs.

* Typecheck

* Re-add icon back to InfoPanelTitle

* Hide registration status and justify actions menu

* feat: :sparkles: Implement deactivated tab logic and specifications

Implemented the filtering function that will show deactivated users when the deactivated tab has been selected and hid the actions menu options that are unnecessary for deactivated users. Didn't implement the empty state because it has been implemented in the pending tab PR.

* Fix tab types

* Re-add spacing, change components and add save user
---
 .../components/UserCard/UserCardRoles.tsx     |   2 +-
 .../client/components/UserInfo/UserInfo.tsx   | 130 +++++++++---------
 .../views/admin/users/AdminUserForm.tsx       |   2 +-
 .../admin/users/AdminUserInfoActions.tsx      |  17 ++-
 .../admin/users/AdminUserInfoWithData.tsx     |   4 +-
 .../views/admin/users/AdminUsersPage.tsx      |   2 +-
 .../admin/users/UsersTable/UsersTableRow.tsx  |   7 +-
 .../useFilterActiveOrDeactivatedUsers.ts      |  10 ++
 .../rocketchat-i18n/i18n/en.i18n.json         |   1 +
 .../MultiSelectCustom/MultiSelectCustom.tsx   |   1 -
 10 files changed, 96 insertions(+), 80 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts

diff --git a/apps/meteor/client/components/UserCard/UserCardRoles.tsx b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
index 9cd22ebdff35..f7a977d4a4dc 100644
--- a/apps/meteor/client/components/UserCard/UserCardRoles.tsx
+++ b/apps/meteor/client/components/UserCard/UserCardRoles.tsx
@@ -6,7 +6,7 @@ import UserCardInfo from './UserCardInfo';
 
 const UserCardRoles = ({ children }: { children: ReactNode }): ReactElement => (
 	<Box m='neg-x2'>
-		<UserCardInfo flexWrap='wrap' display='flex' flexShrink={0}>
+		<UserCardInfo mb={8} flexWrap='wrap' display='flex' flexShrink={0}>
 			{children}
 		</UserCardInfo>
 	</Box>
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 01edbe9503ce..4ff97f3c826f 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -10,6 +10,12 @@ import { useUserCustomFields } from '../../hooks/useUserCustomFields';
 import { useUserDisplayName } from '../../hooks/useUserDisplayName';
 import { ContextualbarScrollableContent } from '../Contextualbar';
 import InfoPanel from '../InfoPanel';
+import InfoPanelAvatar from '../InfoPanel/InfoPanelAvatar';
+import InfoPanelField from '../InfoPanel/InfoPanelField';
+import InfoPanelLabel from '../InfoPanel/InfoPanelLabel';
+import InfoPanelSection from '../InfoPanel/InfoPanelSection';
+import InfoPanelText from '../InfoPanel/InfoPanelText';
+import InfoPanelTitle from '../InfoPanel/InfoPanelTitle';
 import MarkdownText from '../MarkdownText';
 import UTCClock from '../UTCClock';
 import UserCard from '../UserCard';
@@ -58,7 +64,6 @@ const UserInfo = ({
 	status,
 	statusText,
 	customFields,
-	canViewAllInfo,
 	actions,
 	reason,
 	...props
@@ -72,124 +77,117 @@ const UserInfo = ({
 		<ContextualbarScrollableContent p={24} {...props}>
 			<InfoPanel>
 				{username && (
-					<InfoPanel.Avatar>
+					<InfoPanelAvatar>
 						<UserInfoAvatar username={username} etag={avatarETag} />
-					</InfoPanel.Avatar>
+					</InfoPanelAvatar>
 				)}
 
-				{actions && <InfoPanel.Section>{actions}</InfoPanel.Section>}
+				{actions && <InfoPanelSection>{actions}</InfoPanelSection>}
 
-				<InfoPanel.Section>
-					{userDisplayName && <InfoPanel.Title icon={status} title={userDisplayName} />}
+				<InfoPanelSection>
+					{userDisplayName && <InfoPanelTitle icon={status} title={userDisplayName} />}
 					{statusText && (
-						<InfoPanel.Text>
+						<InfoPanelText>
 							<MarkdownText content={statusText} parseEmoji={true} variant='inline' />
-						</InfoPanel.Text>
+						</InfoPanelText>
 					)}
-				</InfoPanel.Section>
+				</InfoPanelSection>
 
-				<InfoPanel.Section>
+				<InfoPanelSection>
 					{reason && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Reason_for_joining')}</InfoPanel.Label>
-							<InfoPanel.Text>{reason}</InfoPanel.Text>
-						</InfoPanel.Field>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Reason_for_joining')}</InfoPanelLabel>
+							<InfoPanelText>{reason}</InfoPanelText>
+						</InfoPanelField>
 					)}
 					{nickname && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Nickname')}</InfoPanel.Label>
-							<InfoPanel.Text>{nickname}</InfoPanel.Text>
-						</InfoPanel.Field>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Nickname')}</InfoPanelLabel>
+							<InfoPanelText>{nickname}</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{roles.length !== 0 && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Roles')}</InfoPanel.Label>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Roles')}</InfoPanelLabel>
 							<UserCard.Roles>{roles}</UserCard.Roles>
-						</InfoPanel.Field>
+						</InfoPanelField>
 					)}
 
 					{username && username !== name && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Username')}</InfoPanel.Label>
-							<InfoPanel.Text data-qa='UserInfoUserName'>{username}</InfoPanel.Text>
-						</InfoPanel.Field>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Username')}</InfoPanelLabel>
+							<InfoPanelText data-qa='UserInfoUserName'>{username}</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{Number.isInteger(utcOffset) && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Local_Time')}</InfoPanel.Label>
-							<InfoPanel.Text>{utcOffset && <UTCClock utcOffset={utcOffset} />}</InfoPanel.Text>
-						</InfoPanel.Field>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Local_Time')}</InfoPanelLabel>
+							<InfoPanelText>{utcOffset && <UTCClock utcOffset={utcOffset} />}</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{bio && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Bio')}</InfoPanel.Label>
-							<InfoPanel.Text withTruncatedText={false}>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Bio')}</InfoPanelLabel>
+							<InfoPanelText withTruncatedText={false}>
 								<MarkdownText variant='inline' content={bio} />
-							</InfoPanel.Text>
-						</InfoPanel.Field>
+							</InfoPanelText>
+						</InfoPanelField>
 					)}
 
-					{canViewAllInfo && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Last_login')}</InfoPanel.Label>
-							<InfoPanel.Text>{lastLogin ? timeAgo(lastLogin) : t('Never')}</InfoPanel.Text>
-						</InfoPanel.Field>
-					)}
-
-					{name && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Full_Name')}</InfoPanel.Label>
-							<InfoPanel.Text>{name}</InfoPanel.Text>
-						</InfoPanel.Field>
+					{Number.isInteger(utcOffset) && (
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Last_login')}</InfoPanelLabel>
+							<InfoPanelText>{lastLogin ? timeAgo(lastLogin) : t('Never')}</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{phone && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Phone')}</InfoPanel.Label>
-							<InfoPanel.Text display='flex' flexDirection='row' alignItems='center'>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Phone')}</InfoPanelLabel>
+							<InfoPanelText display='flex' flexDirection='row' alignItems='center'>
 								<Box is='a' withTruncatedText href={`tel:${phone}`}>
 									{phone}
 								</Box>
-							</InfoPanel.Text>
-						</InfoPanel.Field>
+							</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{email && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Email')}</InfoPanel.Label>
-							<InfoPanel.Text display='flex' flexDirection='row' alignItems='center'>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Email')}</InfoPanelLabel>
+							<InfoPanelText display='flex' flexDirection='row' alignItems='center'>
 								<Box is='a' withTruncatedText href={`mailto:${email}`}>
 									{email}
 								</Box>
 								<Margins inline={4}>
 									<Tag>{verified ? t('Verified') : t('Not_verified')}</Tag>
 								</Margins>
-							</InfoPanel.Text>
-						</InfoPanel.Field>
+							</InfoPanelText>
+						</InfoPanelField>
 					)}
 
 					{userCustomFields?.map(
 						(customField) =>
 							customField?.value && (
-								<InfoPanel.Field key={customField.value}>
-									<InfoPanel.Label>{t(customField.label as TranslationKey)}</InfoPanel.Label>
-									<InfoPanel.Text>
+								<InfoPanelField key={customField.value}>
+									<InfoPanelLabel>{t(customField.label as TranslationKey)}</InfoPanelLabel>
+									<InfoPanelText>
 										<MarkdownText content={customField.value} variant='inline' />
-									</InfoPanel.Text>
-								</InfoPanel.Field>
+									</InfoPanelText>
+								</InfoPanelField>
 							),
 					)}
 
 					{createdAt && (
-						<InfoPanel.Field>
-							<InfoPanel.Label>{t('Created_at')}</InfoPanel.Label>
-							<InfoPanel.Text>{timeAgo(createdAt)}</InfoPanel.Text>
-						</InfoPanel.Field>
+						<InfoPanelField>
+							<InfoPanelLabel>{t('Created_at')}</InfoPanelLabel>
+							<InfoPanelText>{timeAgo(createdAt)}</InfoPanelText>
+						</InfoPanelField>
 					)}
-				</InfoPanel.Section>
+				</InfoPanelSection>
 			</InfoPanel>
 		</ContextualbarScrollableContent>
 	);
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 35991573886c..023aaed21e85 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -475,7 +475,7 @@ const AdminUserForm = ({ userData, onReload, setCreatedUsersCount, context, refe
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
 				<Button primary disabled={!isDirty} onClick={handleSubmit(handleSaveUser)} w='100%'>
-					{t('Add_user')}
+					{isNewUserPage ? t('Add_user') : t('Save_user')}
 				</Button>
 			</ContextualbarFooter>
 		</>
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index dd0bf833f72b..505a9814cc3b 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -20,6 +20,7 @@ type AdminUserInfoActionsProps = {
 	isAdmin: boolean;
 	onChange: () => void;
 	onReload: () => void;
+	tab: 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
 };
 
 const AdminUserInfoActions = ({
@@ -30,6 +31,7 @@ const AdminUserInfoActions = ({
 	isAdmin,
 	onChange,
 	onReload,
+	tab,
 }: AdminUserInfoActionsProps): ReactElement => {
 	const t = useTranslation();
 	const directRoute = useRoute('direct');
@@ -80,24 +82,25 @@ const AdminUserInfoActions = ({
 					disabled: isFederatedUser,
 				},
 			}),
-			...(changeAdminStatusAction && !isFederatedUser && { makeAdmin: changeAdminStatusAction }),
-			...(resetE2EKeyAction && !isFederatedUser && { resetE2EKey: resetE2EKeyAction }),
-			...(resetTOTPAction && !isFederatedUser && { resetTOTP: resetTOTPAction }),
+			...(changeAdminStatusAction && !isFederatedUser && tab !== 'deactivated' && { makeAdmin: changeAdminStatusAction }),
+			...(resetE2EKeyAction && !isFederatedUser && tab !== 'deactivated' && { resetE2EKey: resetE2EKeyAction }),
+			...(resetTOTPAction && !isFederatedUser && tab !== 'deactivated' && { resetTOTP: resetTOTPAction }),
 			...(changeUserStatusAction && !isFederatedUser && { changeActiveStatus: changeUserStatusAction }),
 			...(deleteUserAction && { delete: deleteUserAction }),
 		}),
 		[
-			t,
 			canDirectMessage,
+			t,
 			directMessageClick,
 			canEditOtherUserInfo,
+			isFederatedUser,
 			editUserClick,
 			changeAdminStatusAction,
-			changeUserStatusAction,
-			deleteUserAction,
+			tab,
 			resetE2EKeyAction,
 			resetTOTPAction,
-			isFederatedUser,
+			changeUserStatusAction,
+			deleteUserAction,
 		],
 	);
 
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 693cccf0df05..0eb252f9f0f1 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -19,9 +19,10 @@ import AdminUserInfoActions from './AdminUserInfoActions';
 type AdminUserInfoWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
+	tab: 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
 };
 
-const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): ReactElement => {
+const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProps): ReactElement => {
 	const t = useTranslation();
 	const getRoles = useRolesDescription();
 	const approveManuallyUsers = useSetting('Accounts_ManuallyApproveNewUsers');
@@ -124,6 +125,7 @@ const AdminUserInfoWithData = ({ uid, onReload }: AdminUserInfoWithDataProps): R
 					isFederatedUser={isUserFederated(data?.user as unknown as IUser)}
 					onChange={onChange}
 					onReload={onReload}
+					tab={tab}
 				/>
 			}
 		/>
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 7f48d00d6d1e..c93861911e9a 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -106,7 +106,7 @@ const UsersPage = (): ReactElement => {
 						</ContextualbarTitle>
 						<ContextualbarClose onClick={() => router.navigate('/admin/users')} />
 					</ContextualbarHeader>
-					{context === 'info' && id && <AdminUserInfoWithData uid={id} onReload={handleReload} />}
+					{context === 'info' && id && <AdminUserInfoWithData uid={id} onReload={handleReload} tab={tab} />}
 					{context === 'edit' && id && <AdminUserFormWithData uid={id} onReload={handleReload} context={context} />}
 					{context === 'new' && <AdminUserForm onReload={handleReload} setCreatedUsersCount={setCreatedUsersCount} context={context} />}
 					{context === 'created' && id && <AdminUserCreated uid={id} createdUsersCount={createdUsersCount} />}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index c9df04e3bad2..4b18c9289f77 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -55,6 +55,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 
 	const menuOptions = {
 		...(tab !== 'pending' &&
+			tab !== 'deactivated' &&
 			changeAdminStatusAction &&
 			!isFederatedUser && {
 				makeAdmin: {
@@ -63,11 +64,13 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 				},
 			}),
 		...(tab !== 'pending' &&
+			tab !== 'deactivated' &&
 			resetE2EKeyAction &&
 			!isFederatedUser && {
 				resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
 			}),
 		...(tab !== 'pending' &&
+			tab !== 'deactivated' &&
 			resetTOTPAction &&
 			!isFederatedUser && {
 				resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
@@ -91,7 +94,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 		dispatchToastMessage({ type: 'success', message: t('Welcome_email_resent') });
 	};
 
-	const checkPendingButton = (): ReactElement => {
+	const renderPendingButton = (): ReactElement => {
 		if (active) {
 			return (
 				<Button small secondary mie={8} onClick={handleResendWelcomeEmail}>
@@ -166,7 +169,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 					e.stopPropagation();
 				}}
 			>
-				{tab === 'pending' && checkPendingButton()}
+				{tab === 'pending' && renderPendingButton()}
 
 				<Menu
 					mi={4}
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts
new file mode 100644
index 000000000000..8af379662ac8
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts
@@ -0,0 +1,10 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+export const useFilterActiveOrDeactivatedUsers = (
+	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[] | undefined,
+	tab: string,
+) => {
+	if (!users || (tab !== 'active' && tab !== 'deactivated')) return [];
+
+	return tab === 'active' ? users.filter((currentUser) => currentUser.active) : users.filter((currentUser) => !currentUser.active);
+};
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index db370ff54070..67cd827793d5 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -4564,6 +4564,7 @@
   "Save_Mobile_Bandwidth": "Save Mobile Bandwidth",
   "Save_to_enable_this_action": "Save to enable this action",
   "Save_To_Webdav": "Save to WebDAV",
+  "Save_user": "Save user",
   "Save_your_encryption_password": "Save your encryption password",
   "save-all-canned-responses": "Save All Canned Responses",
   "save-all-canned-responses_description": "Permission to save all canned responses",
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 09e97b422dc0..290bb616cec4 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -43,7 +43,6 @@ export type OptionProp = TitleOptionProp | CheckboxOptionProp;
 	@param selectedOptionsTitle dropdown text after clicking one or more options. For example: 'Rooms (3)'
  * @param selectedOptions array with clicked options. This is used in the useFilteredTypeRooms hook, to filter the Rooms' table, for example. This array joins all of the individual clicked options from all available MultiSelectCustom components in the page. It helps to create a union filter for all the selections.
  * @param setSelectedOptions part of an useState hook to set the previous selectedOptions
- * @param customSetSelected part of an useState hook to set the individual selected checkboxes from this instance.
  * @param searchBarText optional text prop that creates a search bar inside the dropdown, when added.
  * @returns a React Component that should be used with a custom hook for filters, such as useFilteredTypeRooms.tsx.
  * Check out the following files, for examples:

From fdd77a89358c4339324054f8983b84b6117a8126 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Fri, 12 Jan 2024 17:42:03 -0300
Subject: [PATCH 23/61] feat: :sparkles: Introduce new user.list endpoint to
 UsersTable

Implemented the new user.list endpoint in the UsersTable.tsx component, now its possible to send a user status to the endpoint and it will return only users with that status. Besides that refactored some hooks and components to better accomodate the new changes. Next will be implementing text search in the new endpoint and if possible the filters.
---
 apps/meteor/app/api/server/v1/users.ts        |  3 +
 .../admin/users/UsersTable/UsersTable.tsx     | 21 +++----
 .../admin/users/UsersTable/UsersTableRow.tsx  |  3 +-
 .../useFilterActiveOrDeactivatedUsers.ts      | 10 ---
 .../admin/users/hooks/useFilterActiveUsers.ts | 10 ---
 .../users/hooks/useFilterPendingUsers.ts      | 10 ---
 .../admin/users/hooks/useFilterUsersByrole.ts | 12 ----
 .../admin/users/hooks/useFilteredUsers.ts     | 61 +++++++++++++++++++
 .../{useListUsers.ts => useListAllUsers.ts}   | 17 ++----
 .../admin/users/hooks/useListTabUsers.ts      | 48 +++++++++++++++
 .../src/v1/users/UsersListStatusParamsGET.ts  | 11 +++-
 11 files changed, 137 insertions(+), 69 deletions(-)
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
 rename apps/meteor/client/views/admin/users/hooks/{useListUsers.ts => useListAllUsers.ts} (88%)
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 89997ce0d039..58cde0bd1d55 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -617,6 +617,9 @@ API.v1.addRoute(
 					};
 					projection.reason = 1;
 					break;
+				case 'all':
+					match = {};
+					break;
 				default:
 					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
 			}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 09da2271ec10..978299e2d9b6 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -15,9 +15,7 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import { useFilterActiveUsers } from '../hooks/useFilterActiveUsers';
-import { useFilterPendingUsers } from '../hooks/useFilterPendingUsers';
-import { useListUsers } from '../hooks/useListUsers';
+import useFilteredUsers from '../hooks/useFilteredUsers';
 import UsersTableRow from './UsersTableRow';
 
 // TODO: remove bots from pending users + add "resend email" function
@@ -42,7 +40,7 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 	const searchTerm = useDebouncedValue(text, 500);
 	const prevSearchTerm = useRef('');
 
-	const { data, isLoading, isSuccess, isError, refetch } = useListUsers(
+	const { filteredUsers, isSuccess, refetch, isLoading, isError, paginationMetadata } = useFilteredUsers(
 		searchTerm,
 		prevSearchTerm,
 		setCurrent,
@@ -51,16 +49,13 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 		itemsPerPage,
 		current,
 		setPendingActionsCount,
+		tab,
 	);
 
-	const useAllUsers = () => (tab === 'all' && isSuccess ? data?.users : []);
-
-	const filteredUsers = [...useAllUsers(), ...useFilterActiveUsers(data?.users, tab), ...useFilterPendingUsers(data?.users, tab)];
-
 	useEffect(() => {
 		reload.current = refetch;
 		prevSearchTerm.current = searchTerm;
-	}, [reload, refetch, searchTerm]);
+	}, [reload, searchTerm, refetch]);
 
 	const isKeyboardEvent = (
 		event: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>,
@@ -149,7 +144,9 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
-					<GenericTableBody>{isLoading && <GenericTableLoadingTable headerCells={5} />}</GenericTableBody>
+					<GenericTableBody>
+						<GenericTableLoadingTable headerCells={5} />
+					</GenericTableBody>
 				</GenericTable>
 			)}
 
@@ -165,7 +162,7 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 
 			{isSuccess && filteredUsers.length === 0 && <GenericNoResults />}
 
-			{isSuccess && !!data && !!filteredUsers && (
+			{isSuccess && !!filteredUsers && (
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
@@ -187,7 +184,7 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 						divider
 						current={current}
 						itemsPerPage={itemsPerPage}
-						count={data?.total || 0}
+						count={paginationMetadata.total || 0}
 						onSetItemsPerPage={setItemsPerPage}
 						onSetCurrent={setCurrent}
 						{...paginationProps}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 4b18c9289f77..250583e7f8eb 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -3,7 +3,6 @@ import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useTranslation } from '@rocket.chat/ui-contexts';
-import type { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
@@ -22,7 +21,7 @@ type UsersTableRowProps = {
 	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'emails' | 'active' | 'avatarETag' | 'roles'>;
 	onClick: (id: IUser['_id'], e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => void;
 	mediaQuery: boolean;
-	refetchUsers: ReturnType<typeof useQuery>['refetch'];
+	refetchUsers: () => void;
 	onReload: () => void;
 	tab: string;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts
deleted file mode 100644
index 8af379662ac8..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useFilterActiveOrDeactivatedUsers.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-
-export const useFilterActiveOrDeactivatedUsers = (
-	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[] | undefined,
-	tab: string,
-) => {
-	if (!users || (tab !== 'active' && tab !== 'deactivated')) return [];
-
-	return tab === 'active' ? users.filter((currentUser) => currentUser.active) : users.filter((currentUser) => !currentUser.active);
-};
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
deleted file mode 100644
index a8dd6acfa3b7..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useFilterActiveUsers.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-
-export const useFilterActiveUsers = (
-	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[] | undefined,
-	tab: string,
-) => {
-	if (!users || tab !== 'active') return [];
-
-	return users.filter((currentUser) => currentUser.active);
-};
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
deleted file mode 100644
index 4cab19242463..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useFilterPendingUsers.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-
-export const useFilterPendingUsers = (
-	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin'>[] | undefined,
-	tab: string,
-) => {
-	if (!users || tab !== 'pending') return [];
-
-	return users.filter((currentUser) => currentUser.active === false || !currentUser.lastLogin);
-};
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts b/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
deleted file mode 100644
index 44b6c6ae1217..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useFilterUsersByrole.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-
-export const useFilterUsersByRole = (
-	users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[],
-	selectedRoles: string[],
-) => {
-	if (!users.length || !selectedRoles.length || selectedRoles.includes('all')) return users;
-
-	return users.filter((currentUser) => {
-		return currentUser.roles.some((currentRole) => selectedRoles.includes(currentRole));
-	});
-};
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
new file mode 100644
index 000000000000..5469d1814874
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -0,0 +1,61 @@
+import { useCallback, type MutableRefObject } from 'react';
+
+import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import { useListAllUsers } from './useListAllUsers';
+import useListTabUsers from './useListTabUsers';
+
+const useFilteredUsers = (
+	searchTerm: string,
+	prevSearchTerm: MutableRefObject<string>,
+	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
+	sortBy: ReturnType<typeof useSort>['sortBy'],
+	sortDirection: ReturnType<typeof useSort>['sortDirection'],
+	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
+	current: ReturnType<typeof usePagination>['current'],
+	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>,
+	tab: string,
+) => {
+	const {
+		data: allUsersListData,
+		isLoading: isAllUsersLoading,
+		isSuccess: isAllusersSuccess,
+		isError: isAllUsersError,
+		refetch: refetchAllusers,
+	} = useListAllUsers(searchTerm, prevSearchTerm, setCurrent, sortBy, sortDirection, itemsPerPage, current, setPendingActionsCount);
+
+	const {
+		data: tabUsersListData,
+		isLoading: isTabUsersLoading,
+		isSuccess: isTabUsersSuccess,
+		isError: isTabUsersError,
+		refetch: refetchTabUsers,
+	} = useListTabUsers(searchTerm, prevSearchTerm, setCurrent, sortBy, sortDirection, itemsPerPage, current, tab);
+
+	const useAllUsers = () => (tab === 'all' && isAllusersSuccess ? allUsersListData?.users : []);
+	const useTabUsers = () => (tab !== 'all' && isTabUsersSuccess ? tabUsersListData?.users : []);
+
+	const filteredUsers = [...useAllUsers(), ...useTabUsers()];
+	const isSuccess = isAllusersSuccess && isTabUsersSuccess;
+	const refetch = useCallback(() => {
+		refetchAllusers();
+		refetchTabUsers();
+	}, [refetchAllusers, refetchTabUsers]);
+	const isLoading = isAllUsersLoading && isTabUsersLoading;
+	const isError = isAllUsersError && isTabUsersError;
+	const paginationMetadata =
+		tab === 'all'
+			? { count: allUsersListData?.count, offset: allUsersListData?.offset, total: allUsersListData?.total }
+			: { count: tabUsersListData?.count, offset: tabUsersListData?.offset, total: tabUsersListData?.total };
+
+	return {
+		filteredUsers,
+		isSuccess,
+		refetch,
+		isLoading,
+		isError,
+		paginationMetadata,
+	};
+};
+
+export default useFilteredUsers;
diff --git a/apps/meteor/client/views/admin/users/hooks/useListUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
similarity index 88%
rename from apps/meteor/client/views/admin/users/hooks/useListUsers.ts
rename to apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
index 4be9009f2adf..1af19e5466c6 100644
--- a/apps/meteor/client/views/admin/users/hooks/useListUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
@@ -8,7 +8,7 @@ import { useMemo } from 'react';
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
 
-export const useListUsers = (
+export const useListAllUsers = (
 	searchTerm: string,
 	prevSearchTerm: MutableRefObject<string>,
 	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
@@ -53,18 +53,11 @@ export const useListUsers = (
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
-	const usersListQueryResult = useQuery(
-		['users', query],
-		async () => {
-			const users = await getUsers(query);
-			return users;
+	const usersListQueryResult = useQuery(['allUsers', query], async () => getUsers(query), {
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
 		},
-		{
-			onError: (error) => {
-				dispatchToastMessage({ type: 'error', message: error });
-			},
-		},
-	);
+	});
 
 	if (usersListQueryResult.isSuccess) {
 		setPendingActionsCount(usersListQueryResult.data.users.filter((user) => !user.active).length);
diff --git a/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts
new file mode 100644
index 000000000000..33d7b3e7d629
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts
@@ -0,0 +1,48 @@
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import type { MutableRefObject } from 'react';
+import { useMemo } from 'react';
+
+import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+
+const useListTabUsers = (
+	searchTerm: string,
+	prevSearchTerm: MutableRefObject<string>,
+	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
+	sortBy: ReturnType<typeof useSort>['sortBy'],
+	sortDirection: ReturnType<typeof useSort>['sortDirection'],
+	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
+	current: ReturnType<typeof usePagination>['current'],
+	tab: string,
+) => {
+	const payload = useDebouncedValue(
+		useMemo(() => {
+			if (searchTerm !== prevSearchTerm.current) {
+				setCurrent(0);
+			}
+
+			return {
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				count: itemsPerPage,
+				offset: searchTerm === prevSearchTerm.current ? current : 0,
+			};
+		}, [current, itemsPerPage, prevSearchTerm, searchTerm, setCurrent, sortBy, sortDirection]),
+		500,
+	);
+
+	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: tab });
+
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const usersListQueryResult = useQuery(['tabUsers', payload, tab], async () => getUsers(payload), {
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+
+	return usersListQueryResult;
+};
+
+export default useListTabUsers;
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index 94cf33f9ca9c..05dc96fec28c 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,7 +6,7 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { role: string } & PaginatedRequest;
+export type UsersListStatusParamsGET = { role?: string } & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',
@@ -14,6 +14,15 @@ const UsersListStatusParamsGetSchema = {
 		role: {
 			type: 'string',
 		},
+		sort: {
+			type: 'string',
+		},
+		count: {
+			type: 'number',
+		},
+		offset: {
+			type: 'number',
+		},
 	},
 	additionalProperties: false,
 };

From 0f1204f6d93e8ce05e1a2e9aeedfc0a62c47377d Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Fri, 12 Jan 2024 19:35:23 -0300
Subject: [PATCH 24/61] feat: :sparkles: Implement search by text in new
 users.list endpoint

Implemented the capability of searching by text in the new users.list endpoint, removed the invited tab from the front-end, refactored the new users.list to also return all users when prompted to and refactored the front end to only use the new endpoint instead of both. Next will solve some smaller issues and implement the filtering if possible.
---
 apps/meteor/app/api/server/v1/users.ts        | 24 ++++--
 .../views/admin/users/AdminUsersPage.tsx      |  3 -
 .../admin/users/UsersTable/UsersTable.tsx     | 13 ++--
 .../admin/users/hooks/useFilteredUsers.ts     | 76 ++++++++-----------
 .../admin/users/hooks/useListAllUsers.ts      | 67 ----------------
 .../admin/users/hooks/useListTabUsers.ts      | 48 ------------
 .../src/v1/users/UsersListStatusParamsGET.ts  |  5 +-
 7 files changed, 61 insertions(+), 175 deletions(-)
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
 delete mode 100644 apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 58cde0bd1d55..da7b221c4f3d 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -19,6 +19,7 @@ import {
 	isUsersCheckUsernameAvailabilityParamsGET,
 	isUsersSendConfirmationEmailParamsPOST,
 } from '@rocket.chat/rest-typings';
+import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Accounts } from 'meteor/accounts-base';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -570,7 +571,7 @@ API.v1.addRoute(
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { status } = this.urlParams;
 			const { sort } = await this.parseJsonQuery();
-			const { role } = this.queryParams;
+			const { role, searchTerm } = this.queryParams;
 
 			const projection = {
 				name: 1,
@@ -604,6 +605,9 @@ API.v1.addRoute(
 						lastLogin: { $exists: true },
 					};
 					break;
+				case 'all':
+					match = {};
+					break;
 				case 'deactivated':
 					match = {
 						active: false,
@@ -617,15 +621,25 @@ API.v1.addRoute(
 					};
 					projection.reason = 1;
 					break;
-				case 'all':
-					match = {};
-					break;
 				default:
 					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
 			}
 
+			const canSeeAllUserInfo = await hasPermissionAsync(this.userId, 'view-full-other-user-info');
+			match = {
+				...match,
+				$or: [
+					...(canSeeAllUserInfo ? [{ 'emails.address': { $regex: escapeRegExp(searchTerm), $options: 'i' } }] : []),
+					{ username: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
+					{ name: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
+				],
+			};
+
 			const result = await Users.findPaginated(
-				{ ...match, roles: role },
+				{
+					...match,
+					roles: role,
+				},
 				{
 					sort: actualSort,
 					skip: offset,
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 65c7624f9ce9..da164966ca3b 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -76,9 +76,6 @@ const UsersPage = (): ReactElement => {
 						<TabsItem selected={tab === 'deactivated'} onClick={() => setTab('deactivated')}>
 							{t('Deactivated')}
 						</TabsItem>
-						<TabsItem selected={tab === 'invited'} onClick={() => setTab('invited')}>
-							{t('Invited')}
-						</TabsItem>
 					</Tabs>
 					<UsersTable reload={reload} tab={tab} onReload={handleReload} setPendingActionsCount={setPendingActionsCount} />
 				</PageContent>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 978299e2d9b6..b4b39c034e09 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -27,7 +27,7 @@ type UsersTableProps = {
 	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>;
 };
 
-const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
@@ -40,7 +40,7 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 	const searchTerm = useDebouncedValue(text, 500);
 	const prevSearchTerm = useRef('');
 
-	const { filteredUsers, isSuccess, refetch, isLoading, isError, paginationMetadata } = useFilteredUsers(
+	const { data, isSuccess, refetch, isLoading, isError } = useFilteredUsers(
 		searchTerm,
 		prevSearchTerm,
 		setCurrent,
@@ -48,7 +48,6 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 		sortDirection,
 		itemsPerPage,
 		current,
-		setPendingActionsCount,
 		tab,
 	);
 
@@ -160,14 +159,14 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 				</States>
 			)}
 
-			{isSuccess && filteredUsers.length === 0 && <GenericNoResults />}
+			{isSuccess && data.users?.length === 0 && <GenericNoResults />}
 
-			{isSuccess && !!filteredUsers && (
+			{isSuccess && !!data.users && (
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{filteredUsers.map((user) => (
+							{data.users.map((user) => (
 								<UsersTableRow
 									key={user._id}
 									onClick={handleClickOrKeyDown}
@@ -184,7 +183,7 @@ const UsersTable = ({ reload, tab, onReload, setPendingActionsCount }: UsersTabl
 						divider
 						current={current}
 						itemsPerPage={itemsPerPage}
-						count={paginationMetadata.total || 0}
+						count={data.total || 0}
 						onSetItemsPerPage={setItemsPerPage}
 						onSetCurrent={setCurrent}
 						{...paginationProps}
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index 5469d1814874..c567825c9145 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -1,9 +1,11 @@
-import { useCallback, type MutableRefObject } from 'react';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import type { MutableRefObject } from 'react';
+import { useMemo } from 'react';
 
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import { useListAllUsers } from './useListAllUsers';
-import useListTabUsers from './useListTabUsers';
 
 const useFilteredUsers = (
 	searchTerm: string,
@@ -13,49 +15,35 @@ const useFilteredUsers = (
 	sortDirection: ReturnType<typeof useSort>['sortDirection'],
 	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
 	current: ReturnType<typeof usePagination>['current'],
-	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>,
 	tab: string,
 ) => {
-	const {
-		data: allUsersListData,
-		isLoading: isAllUsersLoading,
-		isSuccess: isAllusersSuccess,
-		isError: isAllUsersError,
-		refetch: refetchAllusers,
-	} = useListAllUsers(searchTerm, prevSearchTerm, setCurrent, sortBy, sortDirection, itemsPerPage, current, setPendingActionsCount);
-
-	const {
-		data: tabUsersListData,
-		isLoading: isTabUsersLoading,
-		isSuccess: isTabUsersSuccess,
-		isError: isTabUsersError,
-		refetch: refetchTabUsers,
-	} = useListTabUsers(searchTerm, prevSearchTerm, setCurrent, sortBy, sortDirection, itemsPerPage, current, tab);
-
-	const useAllUsers = () => (tab === 'all' && isAllusersSuccess ? allUsersListData?.users : []);
-	const useTabUsers = () => (tab !== 'all' && isTabUsersSuccess ? tabUsersListData?.users : []);
-
-	const filteredUsers = [...useAllUsers(), ...useTabUsers()];
-	const isSuccess = isAllusersSuccess && isTabUsersSuccess;
-	const refetch = useCallback(() => {
-		refetchAllusers();
-		refetchTabUsers();
-	}, [refetchAllusers, refetchTabUsers]);
-	const isLoading = isAllUsersLoading && isTabUsersLoading;
-	const isError = isAllUsersError && isTabUsersError;
-	const paginationMetadata =
-		tab === 'all'
-			? { count: allUsersListData?.count, offset: allUsersListData?.offset, total: allUsersListData?.total }
-			: { count: tabUsersListData?.count, offset: tabUsersListData?.offset, total: tabUsersListData?.total };
-
-	return {
-		filteredUsers,
-		isSuccess,
-		refetch,
-		isLoading,
-		isError,
-		paginationMetadata,
-	};
+	const payload = useDebouncedValue(
+		useMemo(() => {
+			if (searchTerm !== prevSearchTerm.current) {
+				setCurrent(0);
+			}
+
+			return {
+				searchTerm,
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				count: itemsPerPage,
+				offset: searchTerm === prevSearchTerm.current ? current : 0,
+			};
+		}, [current, itemsPerPage, prevSearchTerm, searchTerm, setCurrent, sortBy, sortDirection]),
+		500,
+	);
+
+	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: tab });
+
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const usersListQueryResult = useQuery(['tabUsers', payload, tab], async () => getUsers(payload), {
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+
+	return usersListQueryResult;
 };
 
 export default useFilteredUsers;
diff --git a/apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
deleted file mode 100644
index 1af19e5466c6..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useListAllUsers.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
-import type { MutableRefObject } from 'react';
-import { useMemo } from 'react';
-
-import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
-import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
-
-export const useListAllUsers = (
-	searchTerm: string,
-	prevSearchTerm: MutableRefObject<string>,
-	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
-	sortBy: ReturnType<typeof useSort>['sortBy'],
-	sortDirection: ReturnType<typeof useSort>['sortDirection'],
-	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
-	current: ReturnType<typeof usePagination>['current'],
-	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>,
-) => {
-	const query = useDebouncedValue(
-		useMemo(() => {
-			if (searchTerm !== prevSearchTerm.current) {
-				setCurrent(0);
-			}
-
-			return {
-				fields: JSON.stringify({
-					name: 1,
-					username: 1,
-					emails: 1,
-					roles: 1,
-					status: 1,
-					avatarETag: 1,
-					active: 1,
-				}),
-				query: JSON.stringify({
-					$or: [
-						{ 'emails.address': { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-						{ username: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-						{ name: { $regex: escapeRegExp(searchTerm), $options: 'i' } },
-					],
-				}),
-				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-				count: itemsPerPage,
-				offset: searchTerm === prevSearchTerm.current ? current : 0,
-			};
-		}, [searchTerm, prevSearchTerm, sortBy, sortDirection, itemsPerPage, current, setCurrent]),
-		500,
-	);
-
-	const getUsers = useEndpoint('GET', '/v1/users.list');
-
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const usersListQueryResult = useQuery(['allUsers', query], async () => getUsers(query), {
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
-		},
-	});
-
-	if (usersListQueryResult.isSuccess) {
-		setPendingActionsCount(usersListQueryResult.data.users.filter((user) => !user.active).length);
-	}
-
-	return usersListQueryResult;
-};
diff --git a/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts b/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts
deleted file mode 100644
index 33d7b3e7d629..000000000000
--- a/apps/meteor/client/views/admin/users/hooks/useListTabUsers.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
-import type { MutableRefObject } from 'react';
-import { useMemo } from 'react';
-
-import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
-import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
-
-const useListTabUsers = (
-	searchTerm: string,
-	prevSearchTerm: MutableRefObject<string>,
-	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
-	sortBy: ReturnType<typeof useSort>['sortBy'],
-	sortDirection: ReturnType<typeof useSort>['sortDirection'],
-	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
-	current: ReturnType<typeof usePagination>['current'],
-	tab: string,
-) => {
-	const payload = useDebouncedValue(
-		useMemo(() => {
-			if (searchTerm !== prevSearchTerm.current) {
-				setCurrent(0);
-			}
-
-			return {
-				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-				count: itemsPerPage,
-				offset: searchTerm === prevSearchTerm.current ? current : 0,
-			};
-		}, [current, itemsPerPage, prevSearchTerm, searchTerm, setCurrent, sortBy, sortDirection]),
-		500,
-	);
-
-	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: tab });
-
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const usersListQueryResult = useQuery(['tabUsers', payload, tab], async () => getUsers(payload), {
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
-		},
-	});
-
-	return usersListQueryResult;
-};
-
-export default useListTabUsers;
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index 05dc96fec28c..a10c21208f8d 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,11 +6,14 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { role?: string } & PaginatedRequest;
+export type UsersListStatusParamsGET = { role?: string; searchTerm: string } & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',
 	properties: {
+		searchTerm: {
+			type: 'string',
+		},
 		role: {
 			type: 'string',
 		},

From 480b3927ca50aed92392664dae8da421b6d4d2a8 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 15 Jan 2024 16:35:22 -0300
Subject: [PATCH 25/61] fix: removing fields protected by permissions from API
 and UI

---
 apps/meteor/app/api/server/v1/users.ts              | 3 ++-
 apps/meteor/client/components/UserInfo/UserInfo.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index da7b221c4f3d..a4d8febf91a6 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -570,7 +570,7 @@ API.v1.addRoute(
 		async get() {
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { status } = this.urlParams;
-			const { sort } = await this.parseJsonQuery();
+			const { sort, fields } = await this.parseJsonQuery();
 			const { role, searchTerm } = this.queryParams;
 
 			const projection = {
@@ -584,6 +584,7 @@ API.v1.addRoute(
 				lastLogin: 1,
 				type: 1,
 				reason: 0,
+				...fields,
 			};
 
 			const actualSort = sort || { username: 1 };
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 4ff97f3c826f..6f4ec647ba23 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -66,6 +66,7 @@ const UserInfo = ({
 	customFields,
 	actions,
 	reason,
+	canViewAllInfo,
 	...props
 }: UserInfoProps): ReactElement => {
 	const t = useTranslation();
@@ -137,7 +138,7 @@ const UserInfo = ({
 						</InfoPanelField>
 					)}
 
-					{Number.isInteger(utcOffset) && (
+					{Number.isInteger(utcOffset) && canViewAllInfo && (
 						<InfoPanelField>
 							<InfoPanelLabel>{t('Last_login')}</InfoPanelLabel>
 							<InfoPanelText>{lastLogin ? timeAgo(lastLogin) : t('Never')}</InfoPanelText>

From 00a68da5e33cec067e36ca8af8a4fd48fafda316 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 15 Jan 2024 16:39:35 -0300
Subject: [PATCH 26/61] fix: removing app user type from pending users list

---
 apps/meteor/app/api/server/v1/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index a4d8febf91a6..3158dbbfd2d4 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -618,7 +618,7 @@ API.v1.addRoute(
 				case 'pending':
 					match = {
 						lastLogin: { $exists: false },
-						type: { $ne: 'bot' },
+						type: { $nin: ['bot', 'app'] },
 					};
 					projection.reason = 1;
 					break;

From 7e11253818d718aded01ac9afa007f742a91441e Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Tue, 16 Jan 2024 13:59:51 -0300
Subject: [PATCH 27/61] fix: IAdminUserTabs type

---
 apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx  | 3 ++-
 apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx | 3 ++-
 apps/meteor/client/views/admin/users/IAdminUserTabs.tsx        | 1 +
 apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx | 3 ++-
 .../client/views/admin/users/UsersTable/UsersTableRow.tsx      | 3 ++-
 apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts | 3 ++-
 6 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/IAdminUserTabs.tsx

diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index 505a9814cc3b..5fd1b1eafca7 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -6,6 +6,7 @@ import React, { useCallback, useMemo } from 'react';
 
 import UserInfo from '../../../components/UserInfo';
 import { useActionSpread } from '../../hooks/useActionSpread';
+import type { IAdminUserTabs } from './IAdminUserTabs';
 import { useChangeAdminStatusAction } from './hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from './hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from './hooks/useDeleteUserAction';
@@ -20,7 +21,7 @@ type AdminUserInfoActionsProps = {
 	isAdmin: boolean;
 	onChange: () => void;
 	onReload: () => void;
-	tab: 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
+	tab: IAdminUserTabs;
 };
 
 const AdminUserInfoActions = ({
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 0eb252f9f0f1..679413ce7638 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -15,11 +15,12 @@ import UserInfo from '../../../components/UserInfo';
 import { UserStatus } from '../../../components/UserStatus';
 import { getUserEmailVerified } from '../../../lib/utils/getUserEmailVerified';
 import AdminUserInfoActions from './AdminUserInfoActions';
+import type { IAdminUserTabs } from './IAdminUserTabs';
 
 type AdminUserInfoWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
-	tab: 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
+	tab: IAdminUserTabs;
 };
 
 const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProps): ReactElement => {
diff --git a/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx b/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx
new file mode 100644
index 000000000000..e8d4a6ebe57b
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx
@@ -0,0 +1 @@
+export type IAdminUserTabs = 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index b4b39c034e09..821ed32f6796 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -15,6 +15,7 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import type { IAdminUserTabs } from '../IAdminUserTabs';
 import useFilteredUsers from '../hooks/useFilteredUsers';
 import UsersTableRow from './UsersTableRow';
 
@@ -22,7 +23,7 @@ import UsersTableRow from './UsersTableRow';
 
 type UsersTableProps = {
 	reload: MutableRefObject<() => void>;
-	tab: string;
+	tab: IAdminUserTabs;
 	onReload: () => void;
 	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>;
 };
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 250583e7f8eb..94334803cd87 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -11,6 +11,7 @@ import { GenericTableRow, GenericTableCell } from '../../../../components/Generi
 import { UserStatus } from '../../../../components/UserStatus';
 import UserAvatar from '../../../../components/avatar/UserAvatar';
 import { dispatchToastMessage } from '../../../../lib/toast';
+import type { IAdminUserTabs } from '../IAdminUserTabs';
 import { useChangeAdminStatusAction } from '../hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from '../hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
@@ -23,7 +24,7 @@ type UsersTableRowProps = {
 	mediaQuery: boolean;
 	refetchUsers: () => void;
 	onReload: () => void;
-	tab: string;
+	tab: IAdminUserTabs;
 };
 
 const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab }: UsersTableRowProps): ReactElement => {
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index c567825c9145..5577074ffd7b 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -6,6 +6,7 @@ import { useMemo } from 'react';
 
 import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import type { IAdminUserTabs } from '../IAdminUserTabs';
 
 const useFilteredUsers = (
 	searchTerm: string,
@@ -15,7 +16,7 @@ const useFilteredUsers = (
 	sortDirection: ReturnType<typeof useSort>['sortDirection'],
 	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
 	current: ReturnType<typeof usePagination>['current'],
-	tab: string,
+	tab: IAdminUserTabs,
 ) => {
 	const payload = useDebouncedValue(
 		useMemo(() => {

From c1c9ed852f884a480169b08c87823e9c1ea253e3 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Tue, 16 Jan 2024 16:35:05 -0300
Subject: [PATCH 28/61] feat: implement resend email for pending users

---
 apps/meteor/app/api/server/v1/misc.ts         |  6 ++---
 apps/meteor/app/api/server/v1/users.ts        |  9 ++++---
 .../server/functions/isSMTPConfigured.ts      |  6 +++++
 .../admin/users/UsersTable/UsersTableRow.tsx  | 12 ++++++---
 .../hooks/useSendWelcomeEmailMutation.ts      | 25 +++++++++++++++++++
 .../rocketchat-i18n/i18n/en.i18n.json         |  1 +
 .../meteor/server/methods/sendWelcomeEmail.ts |  7 ++++++
 packages/rest-typings/src/v1/users.ts         |  2 +-
 8 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 apps/meteor/app/utils/server/functions/isSMTPConfigured.ts
 create mode 100644 apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index 7b6c964a50bb..c402d7dd6566 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -27,6 +27,7 @@ import { passwordPolicy } from '../../../lib/server';
 import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { settings } from '../../../settings/server';
 import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
+import { isSMTPConfigured } from '../../../utils/server/functions/isSMTPConfigured';
 import { getURL } from '../../../utils/server/getURL';
 import { API } from '../api';
 import { getLoggedInUser } from '../helpers/getLoggedInUser';
@@ -634,9 +635,8 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
-			const isMailURLSet = !(process.env.MAIL_URL === 'undefined' || process.env.MAIL_URL === undefined);
-			const isSMTPConfigured = Boolean(settings.get('SMTP_Host')) || isMailURLSet;
-			return API.v1.success({ isSMTPConfigured });
+			const smtpConfigured = isSMTPConfigured();
+			return API.v1.success({ smtpConfigured });
 		},
 	},
 );
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 3158dbbfd2d4..fd47974b8224 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -672,9 +672,12 @@ API.v1.addRoute(
 		async post() {
 			const { email } = this.bodyParams;
 
-			await sendWelcomeEmail(email);
-
-			return API.v1.success();
+			try {
+				await sendWelcomeEmail(email);
+				return API.v1.success({ success: true });
+			} catch (e: any) {
+				return API.v1.failure({ error: e.message });
+			}
 		},
 	},
 );
diff --git a/apps/meteor/app/utils/server/functions/isSMTPConfigured.ts b/apps/meteor/app/utils/server/functions/isSMTPConfigured.ts
new file mode 100644
index 000000000000..fa300cb37ee2
--- /dev/null
+++ b/apps/meteor/app/utils/server/functions/isSMTPConfigured.ts
@@ -0,0 +1,6 @@
+import { settings } from '../../../settings/server';
+
+export const isSMTPConfigured = (): boolean => {
+	const isMailURLSet = !(process.env.MAIL_URL === 'undefined' || process.env.MAIL_URL === undefined);
+	return Boolean(settings.get('SMTP_Host')) || isMailURLSet;
+};
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 94334803cd87..1fca88676381 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -17,6 +17,7 @@ import { useChangeUserStatusAction } from '../hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from '../hooks/useDeleteUserAction';
 import { useResetE2EEKeyAction } from '../hooks/useResetE2EEKeyAction';
 import { useResetTOTPAction } from '../hooks/useResetTOTPAction';
+import { useSendWelcomeEmailMutation } from '../hooks/useSendWelcomeEmailMutation';
 
 type UsersTableRowProps = {
 	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'emails' | 'active' | 'avatarETag' | 'roles'>;
@@ -52,6 +53,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 	const deleteUserAction = useDeleteUserAction(userId, onChange, onReload);
 	const resetTOTPAction = useResetTOTPAction(userId);
 	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
+	const resendWelcomeEmail = useSendWelcomeEmailMutation();
 
 	const menuOptions = {
 		...(tab !== 'pending' &&
@@ -87,11 +89,13 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 		}),
 	};
 
-	// TODO: create action for this?
-	// TODO: implement logic
 	const handleResendWelcomeEmail = () => {
-		console.log('Welcome email resent');
-		dispatchToastMessage({ type: 'success', message: t('Welcome_email_resent') });
+		if (!emails?.length) {
+			dispatchToastMessage({ type: 'error', message: t('Welcome_email_failed') });
+			return;
+		}
+
+		resendWelcomeEmail.mutateAsync({ email: emails[0].address });
 	};
 
 	const renderPendingButton = (): ReactElement => {
diff --git a/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
new file mode 100644
index 000000000000..82a9b57e46dd
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
@@ -0,0 +1,25 @@
+import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { UseMutationResult } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
+
+type useSendWelcomeEmailMutationProps = {
+	email: string;
+};
+
+export const useSendWelcomeEmailMutation = (): UseMutationResult<{ success: boolean }, Error, useSendWelcomeEmailMutationProps> => {
+	const t = useTranslation();
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const sendWelcomeEmail = useEndpoint('POST', '/v1/users.sendWelcomeEmail');
+
+	return useMutation(
+		async ({ email }) => {
+			const result = await sendWelcomeEmail({ email });
+			return result;
+		},
+		{
+			onSuccess: () => dispatchToastMessage({ type: 'success', message: t('Welcome_email_resent') }),
+			onError: (error) => dispatchToastMessage({ type: 'error', message: error }),
+		},
+	);
+};
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index a013f5bd74c5..3421505b71ca 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -6203,6 +6203,7 @@
   "Users_who_are_pending": "Users who are pending activation or have been manually created but haven't logged in yet appear here.",
   "Deactivated_users_appear_here": "Deactivated users appear here.",
   "Welcome_email_resent": "Welcome email resent",
+  "Welcome_email_failed": "Failed to resend welcome email",
   "Reason_for_joining": "Reason for joining",
   "Theme_Appearence": "Theme Appearence",
   "mentions_counter": "{{count}} mention",
diff --git a/apps/meteor/server/methods/sendWelcomeEmail.ts b/apps/meteor/server/methods/sendWelcomeEmail.ts
index 3a8cf1b19787..a31d642ff73a 100644
--- a/apps/meteor/server/methods/sendWelcomeEmail.ts
+++ b/apps/meteor/server/methods/sendWelcomeEmail.ts
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 
 import * as Mailer from '../../app/mailer/server/api';
 import { settings } from '../../app/settings/server';
+import { isSMTPConfigured } from '../../app/utils/server/functions/isSMTPConfigured';
 
 export async function sendWelcomeEmail(to: string): Promise<void> {
 	if (typeof to !== 'string') {
@@ -11,6 +12,12 @@ export async function sendWelcomeEmail(to: string): Promise<void> {
 		});
 	}
 
+	if (!isSMTPConfigured()) {
+		throw new Meteor.Error('error-email-send-failed', 'SMTP is not configured', {
+			method: 'sendWelcomeEmail',
+		});
+	}
+
 	const email = to.trim();
 
 	const user = await Users.findOneByEmailAddress(email, { projection: { _id: 1 } });
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 3bf4d7c347cc..5179ca6b4774 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -152,7 +152,7 @@ export type UsersEndpoints = {
 	};
 
 	'/v1/users.sendWelcomeEmail': {
-		POST: (params: UsersSendWelcomeEmailParamsPOST) => void;
+		POST: (params: UsersSendWelcomeEmailParamsPOST) => { success: boolean };
 	};
 
 	'/v1/users.setAvatar': {

From 50c853c9a3e310cce83000ba48a8014ea1419a46 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Tue, 16 Jan 2024 16:37:12 -0300
Subject: [PATCH 29/61] fix: remove TODO

---
 apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 821ed32f6796..82b9a9ab8931 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -19,8 +19,6 @@ import type { IAdminUserTabs } from '../IAdminUserTabs';
 import useFilteredUsers from '../hooks/useFilteredUsers';
 import UsersTableRow from './UsersTableRow';
 
-// TODO: remove bots from pending users + add "resend email" function
-
 type UsersTableProps = {
 	reload: MutableRefObject<() => void>;
 	tab: IAdminUserTabs;

From 26d65453f56ae9356d4f2adf3a19e304e23c5fb6 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Wed, 17 Jan 2024 10:04:58 -0300
Subject: [PATCH 30/61] fix: remove duplicated key

---
 apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 3421505b71ca..39c9d6d320b5 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3713,7 +3713,6 @@
   "New_Tag": "New Tag",
   "New_Trigger": "New Trigger",
   "New_Unit": "New Unit",
-  "New_user": "New user",
   "New_users": "New users",
   "New_user": "New user",
   "New_version_available_(s)": "New version available (%s)",

From c3884ea9e5cccfefc3fdce62e660add04980b8b5 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Wed, 17 Jan 2024 10:17:47 -0300
Subject: [PATCH 31/61] adding more tests cases for users api

---
 apps/meteor/tests/end-to-end/api/01-users.js | 39 ++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 579dafa99e49..bbdb675fb16d 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4248,6 +4248,25 @@ describe('[Users]', function () {
 			await updatePermission('view-d-room', ['admin', 'owner', 'moderator', 'user']);
 		});
 
+		it('should list all users', async () => {
+			await login(user.username, password);
+
+			await request
+				.get(api('users.list/all'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+					const ids = users.map((user) => user._id);
+
+					expect(ids).to.include(user._id);
+				});
+		});
+
 		it('should list pending users', async () => {
 			await request
 				.get(api('users.list/pending'))
@@ -4327,6 +4346,26 @@ describe('[Users]', function () {
 				});
 		});
 
+		it('should filter users by username', async () => {
+			await login(user.username, password);
+
+			await request
+				.get(api('users.list/all'))
+				.set(credentials)
+				.query({ searchTerm: user.username })
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('users');
+
+					const { users } = res.body;
+					const ids = users.map((user) => user._id);
+
+					expect(ids).to.include(user._id);
+				});
+		});
+
 		it('should return error for invalid status params', async () => {
 			await request
 				.get(api('users.list/abcd'))

From 6a9bc569ec0cf1313f788e50fcc351460fcdde4c Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Wed, 17 Jan 2024 17:26:16 -0300
Subject: [PATCH 32/61] feat: :sparkles: Implement role filter in new users
 page

Implemented a filter that fetches all the roles for the current workspace, lists them and allows user to filter the users list by which roles they want to see. Next will be implementing loading logic for the MultiSelectCustom component, the search functionality of the roles filter and checking all options when the all roles option is checked.
---
 apps/meteor/app/api/server/v1/users.ts        | 11 ++-
 .../views/admin/rooms/RoomsTableFilters.tsx   |  3 +-
 .../views/admin/users/AdminUserForm.tsx       | 22 ++++--
 .../admin/users/AdminUserFormWithData.tsx     |  8 ++-
 .../views/admin/users/AdminUsersPage.tsx      | 26 +++++--
 .../views/admin/users/IAdminUserTabs.tsx      |  2 +-
 .../admin/users/UsersTable/UsersTable.tsx     | 32 ++++++---
 .../users/UsersTable/UsersTableFilters.tsx    | 72 +++++++++++++++++++
 .../admin/users/hooks/useFilteredUsers.ts     | 38 ++++++----
 .../src/v1/users/UsersListStatusParamsGET.ts  | 11 +--
 .../MultiSelectCustom/MultiSelectCustom.tsx   | 42 ++++++-----
 .../MultiSelectCustomList.tsx                 |  4 +-
 12 files changed, 203 insertions(+), 68 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 3158dbbfd2d4..cb57c1fe2b61 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -571,7 +571,7 @@ API.v1.addRoute(
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { status } = this.urlParams;
 			const { sort, fields } = await this.parseJsonQuery();
-			const { role, searchTerm } = this.queryParams;
+			const { roles, searchTerm } = this.queryParams;
 
 			const projection = {
 				name: 1,
@@ -627,6 +627,7 @@ API.v1.addRoute(
 			}
 
 			const canSeeAllUserInfo = await hasPermissionAsync(this.userId, 'view-full-other-user-info');
+
 			match = {
 				...match,
 				$or: [
@@ -636,10 +637,16 @@ API.v1.addRoute(
 				],
 			};
 
+			if (roles?.length && !roles.includes('all')) {
+				match = {
+					...match,
+					roles: { $in: roles },
+				};
+			}
+
 			const result = await Users.findPaginated(
 				{
 					...match,
-					roles: role,
 				},
 				{
 					sort: actualSort,
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
index fcdaa29c9dff..456e66c3abf4 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTableFilters.tsx
@@ -9,7 +9,6 @@ const roomTypeFilterStructure = [
 	{
 		id: 'filter_by_room',
 		text: 'Filter_by_room',
-		isGroupTitle: true,
 	},
 	{
 		id: 'd',
@@ -89,7 +88,7 @@ const RoomsTableFilters = ({ setFilters }: { setFilters: Dispatch<SetStateAction
 			<Box minWidth='x224' m='x4'>
 				<MultiSelectCustom
 					dropdownOptions={roomTypeFilterStructure}
-					defaultTitle={'All_rooms' as any}
+					defaultTitle='All_rooms'
 					selectedOptionsTitle='Rooms'
 					setSelectedOptions={handleRoomTypeChange}
 					selectedOptions={roomTypeSelectedOptions}
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 023aaed21e85..3c83a9df650f 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -1,4 +1,5 @@
-import type { AvatarObject, IUser, Serialized } from '@rocket.chat/core-typings';
+import type { AvatarObject, IRole, IUser, Serialized } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
 import {
 	Field,
 	TextInput,
@@ -16,7 +17,6 @@ import {
 	FieldHint,
 	Icon,
 } from '@rocket.chat/fuselage';
-import type { SelectOption } from '@rocket.chat/fuselage';
 import { useUniqueId, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { UserCreateParamsPOST } from '@rocket.chat/rest-typings';
 import { CustomFieldsForm } from '@rocket.chat/ui-client';
@@ -28,7 +28,7 @@ import {
 	useToastMessageDispatch,
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
-import { useQuery, useMutation } from '@tanstack/react-query';
+import { useMutation } from '@tanstack/react-query';
 import React, { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
@@ -49,6 +49,8 @@ type AdminUserFormProps = {
 	setCreatedUsersCount?: React.Dispatch<React.SetStateAction<number>>;
 	context: string;
 	refetchUserFormData?: () => void;
+	roleData: { roles: IRole[] } | undefined;
+	roleError: unknown;
 };
 
 export type userFormProps = Omit<UserCreateParamsPOST & { avatar: AvatarObject; passwordConfirmation: string }, 'fields'>;
@@ -82,7 +84,16 @@ const getInitialValue = ({
 	passwordConfirmation: '',
 });
 
-const AdminUserForm = ({ userData, onReload, setCreatedUsersCount, context, refetchUserFormData, ...props }: AdminUserFormProps) => {
+const AdminUserForm = ({
+	userData,
+	onReload,
+	setCreatedUsersCount,
+	context,
+	refetchUserFormData,
+	roleData,
+	roleError,
+	...props
+}: AdminUserFormProps) => {
 	const t = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -113,9 +124,6 @@ const AdminUserForm = ({ userData, onReload, setCreatedUsersCount, context, refe
 	const updateUserAction = useEndpoint('POST', '/v1/users.update');
 	const createUserAction = useEndpoint('POST', '/v1/users.create');
 
-	const getRoles = useEndpoint('GET', '/v1/roles.list');
-	const { data: roleData, error: roleError } = useQuery(['roles'], async () => getRoles());
-
 	const availableRoles: SelectOption[] = roleData?.roles.map(({ _id, name, description }) => [_id, description || name]) || [];
 
 	const updateAvatar = useUpdateAvatar(avatar, userData?._id || '');
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index a584cf284c0f..0e9c149314ba 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -1,4 +1,4 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { isUserFederated } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
 import { useTranslation } from '@rocket.chat/ui-contexts';
@@ -13,9 +13,11 @@ type AdminUserFormWithDataProps = {
 	uid: IUser['_id'];
 	onReload: () => void;
 	context: string;
+	roleData: { roles: IRole[] } | undefined;
+	roleError: unknown;
 };
 
-const AdminUserFormWithData = ({ uid, onReload, context }: AdminUserFormWithDataProps): ReactElement => {
+const AdminUserFormWithData = ({ uid, onReload, context, roleData, roleError }: AdminUserFormWithDataProps): ReactElement => {
 	const t = useTranslation();
 	const { data, isLoading, isError, refetch } = useUserInfoQuery({ userId: uid });
 
@@ -51,6 +53,8 @@ const AdminUserFormWithData = ({ uid, onReload, context }: AdminUserFormWithData
 			refetchUserFormData={() => {
 				refetch();
 			}}
+			roleData={roleData}
+			roleError={roleError}
 		/>
 	);
 };
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index da164966ca3b..152798dcd1b2 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -1,5 +1,6 @@
 import { Button, ButtonGroup, ContextualbarIcon, Icon, Tabs, TabsItem } from '@rocket.chat/fuselage';
-import { usePermission, useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouteParameter, useTranslation, useRouter, useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useRef, useState } from 'react';
 
@@ -14,6 +15,7 @@ import AdminUserForm from './AdminUserForm';
 import AdminUserFormWithData from './AdminUserFormWithData';
 import AdminUserInfoWithData from './AdminUserInfoWithData';
 import AdminUserUpgrade from './AdminUserUpgrade';
+import type { IAdminUserTabs } from './IAdminUserTabs';
 import UsersTable from './UsersTable';
 
 const UsersPage = (): ReactElement => {
@@ -30,8 +32,7 @@ const UsersPage = (): ReactElement => {
 	const canBulkCreateUser = usePermission('bulk-register-user');
 	const isCreateUserDisabled = useShouldPreventAction('activeUsers');
 
-	const [tab, setTab] = useState<'all' | 'invited' | 'active' | 'deactivated' | 'pending'>('all');
-	const [pendingActionsCount, setPendingActionsCount] = useState<number>(0);
+	const [tab, setTab] = useState<IAdminUserTabs>('all');
 	const [createdUsersCount, setCreatedUsersCount] = useState(0);
 
 	const handleReload = (): void => {
@@ -41,6 +42,9 @@ const UsersPage = (): ReactElement => {
 
 	const isRoutePrevented = context && ['new', 'invite'].includes(context) && isCreateUserDisabled;
 
+	const getRoles = useEndpoint('GET', '/v1/roles.list');
+	const { data, error } = useQuery(['roles'], async () => getRoles());
+
 	return (
 		<Page flexDirection='row'>
 			<Page>
@@ -68,7 +72,7 @@ const UsersPage = (): ReactElement => {
 							{t('All')}
 						</TabsItem>
 						<TabsItem selected={tab === 'pending'} onClick={() => setTab('pending')}>
-							{pendingActionsCount === 0 ? t('Pending') : `${t('Pending')} (${pendingActionsCount})`}
+							{t('Pending')}
 						</TabsItem>
 						<TabsItem selected={tab === 'active'} onClick={() => setTab('active')}>
 							{t('Active')}
@@ -77,7 +81,7 @@ const UsersPage = (): ReactElement => {
 							{t('Deactivated')}
 						</TabsItem>
 					</Tabs>
-					<UsersTable reload={reload} tab={tab} onReload={handleReload} setPendingActionsCount={setPendingActionsCount} />
+					<UsersTable reload={reload} tab={tab} roleData={data} onReload={handleReload} />
 				</PageContent>
 			</Page>
 			{context && (
@@ -97,9 +101,17 @@ const UsersPage = (): ReactElement => {
 						<ContextualbarClose onClick={() => router.navigate('/admin/users')} />
 					</ContextualbarHeader>
 					{context === 'info' && id && <AdminUserInfoWithData uid={id} onReload={handleReload} tab={tab} />}
-					{context === 'edit' && id && <AdminUserFormWithData uid={id} onReload={handleReload} context={context} />}
+					{context === 'edit' && id && (
+						<AdminUserFormWithData uid={id} onReload={handleReload} context={context} roleData={data} roleError={error} />
+					)}
 					{!isRoutePrevented && context === 'new' && (
-						<AdminUserForm onReload={handleReload} setCreatedUsersCount={setCreatedUsersCount} context={context} />
+						<AdminUserForm
+							onReload={handleReload}
+							setCreatedUsersCount={setCreatedUsersCount}
+							context={context}
+							roleData={data}
+							roleError={error}
+						/>
 					)}
 					{!isRoutePrevented && context === 'created' && id && <AdminUserCreated uid={id} createdUsersCount={createdUsersCount} />}
 					{!isRoutePrevented && context === 'invite' && <AdminInviteUsers />}
diff --git a/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx b/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx
index e8d4a6ebe57b..82cf0a686610 100644
--- a/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx
+++ b/apps/meteor/client/views/admin/users/IAdminUserTabs.tsx
@@ -1 +1 @@
-export type IAdminUserTabs = 'all' | 'invited' | 'active' | 'deactivated' | 'pending';
+export type IAdminUserTabs = 'all' | 'active' | 'deactivated' | 'pending';
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 821ed32f6796..585abe2b49a9 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,10 +1,12 @@
+import type { IRole } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+// import { MultiSelectCustom } from '@rocket.chat/ui-client';
+import type { OptionProp } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useRef, useMemo, useState, useEffect } from 'react';
 
-import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -17,31 +19,35 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import type { IAdminUserTabs } from '../IAdminUserTabs';
 import useFilteredUsers from '../hooks/useFilteredUsers';
+import UsersTableFilters from './UsersTableFilters';
 import UsersTableRow from './UsersTableRow';
 
-// TODO: remove bots from pending users + add "resend email" function
-
 type UsersTableProps = {
 	reload: MutableRefObject<() => void>;
 	tab: IAdminUserTabs;
 	onReload: () => void;
-	setPendingActionsCount: React.Dispatch<React.SetStateAction<number>>;
+	roleData: { roles: IRole[] } | undefined;
+};
+
+export type UsersFilters = {
+	text: string;
+	roles: OptionProp[];
 };
 
-const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({ reload, tab, roleData, onReload }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
-	const [text, setText] = useState('');
+	const [userFilters, setUserFilters] = useState<UsersFilters>({ text: '', roles: [] });
 
 	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'status'>('name');
 
-	const searchTerm = useDebouncedValue(text, 500);
+	const searchTerm = useDebouncedValue(userFilters.text, 500);
 	const prevSearchTerm = useRef('');
 
-	const { data, isSuccess, refetch, isLoading, isError } = useFilteredUsers(
+	const { data, isSuccess, refetch, isLoading, isError } = useFilteredUsers({
 		searchTerm,
 		prevSearchTerm,
 		setCurrent,
@@ -50,12 +56,16 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 		itemsPerPage,
 		current,
 		tab,
-	);
+		selectedRoles: useMemo(() => userFilters.roles.map((role) => role.id), [userFilters.roles]),
+	});
 
 	useEffect(() => {
 		reload.current = refetch;
+	}, [refetch, reload]);
+
+	useEffect(() => {
 		prevSearchTerm.current = searchTerm;
-	}, [reload, searchTerm, refetch]);
+	}, [searchTerm]);
 
 	const isKeyboardEvent = (
 		event: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>,
@@ -139,7 +149,7 @@ const UsersTable = ({ reload, tab, onReload }: UsersTableProps): ReactElement |
 
 	return (
 		<>
-			<FilterByText autoFocus placeholder={t('Search_Users')} onChange={({ text }): void => setText(text)} />
+			<UsersTableFilters roleData={roleData} setUsersFilters={setUserFilters} />
 
 			{isLoading && (
 				<GenericTable>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
new file mode 100644
index 000000000000..2efc32d4e85a
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -0,0 +1,72 @@
+import type { IRole } from '@rocket.chat/core-typings';
+import type { OptionProp } from '@rocket.chat/ui-client';
+import { MultiSelectCustom } from '@rocket.chat/ui-client';
+import React, { useCallback, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import FilterByText from '../../../../components/FilterByText';
+import type { UsersFilters } from './UsersTable';
+
+type UsersTableFiltersProps = {
+	setUsersFilters: React.Dispatch<React.SetStateAction<UsersFilters>>;
+	roleData: { roles: IRole[] } | undefined;
+};
+
+const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps) => {
+	const { t } = useTranslation();
+
+	const [selectedRoles, setSelectedRoles] = useState<OptionProp[]>([]);
+	const [text, setText] = useState('');
+
+	const handleSearchTextChange = useCallback(
+		({ text }) => {
+			setUsersFilters({ text, roles: selectedRoles });
+			setText(text);
+		},
+		[selectedRoles, setUsersFilters],
+	);
+
+	const handleRolesChange = useCallback(
+		(roles: OptionProp[]) => {
+			setUsersFilters({ text, roles });
+			setSelectedRoles(roles);
+		},
+		[setUsersFilters, text],
+	);
+
+	const userRolesFilterStructure = useMemo(
+		() => [
+			{
+				id: 'filter_by_role',
+				text: 'Filter_by_role',
+			},
+			{
+				id: 'all',
+				text: 'All_roles',
+				checked: false,
+			},
+			...(roleData
+				? roleData.roles.map((role) => ({
+						id: role._id,
+						text: role.description || role.name || role._id,
+						checked: false,
+				  }))
+				: []),
+		],
+		[roleData],
+	);
+
+	return (
+		<FilterByText autoFocus placeholder={t('Search_Users')} onChange={handleSearchTextChange}>
+			<MultiSelectCustom
+				dropdownOptions={userRolesFilterStructure}
+				defaultTitle='All_rooms'
+				selectedOptionsTitle='Roles'
+				setSelectedOptions={handleRolesChange}
+				selectedOptions={selectedRoles}
+			/>
+		</FilterByText>
+	);
+};
+
+export default UsersTableFilters;
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index 5577074ffd7b..7f21d0293769 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -8,16 +8,29 @@ import type { usePagination } from '../../../../components/GenericTable/hooks/us
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import type { IAdminUserTabs } from '../IAdminUserTabs';
 
-const useFilteredUsers = (
-	searchTerm: string,
-	prevSearchTerm: MutableRefObject<string>,
-	setCurrent: ReturnType<typeof usePagination>['setCurrent'],
-	sortBy: ReturnType<typeof useSort>['sortBy'],
-	sortDirection: ReturnType<typeof useSort>['sortDirection'],
-	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'],
-	current: ReturnType<typeof usePagination>['current'],
-	tab: IAdminUserTabs,
-) => {
+type useFilteredUsersOptions = {
+	searchTerm: string;
+	prevSearchTerm: MutableRefObject<string>;
+	setCurrent: ReturnType<typeof usePagination>['setCurrent'];
+	sortBy: ReturnType<typeof useSort>['sortBy'];
+	sortDirection: ReturnType<typeof useSort>['sortDirection'];
+	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'];
+	current: ReturnType<typeof usePagination>['current'];
+	tab: IAdminUserTabs;
+	selectedRoles: string[];
+};
+
+const useFilteredUsers = ({
+	searchTerm,
+	prevSearchTerm,
+	setCurrent,
+	sortBy,
+	sortDirection,
+	itemsPerPage,
+	current,
+	tab,
+	selectedRoles,
+}: useFilteredUsersOptions) => {
 	const payload = useDebouncedValue(
 		useMemo(() => {
 			if (searchTerm !== prevSearchTerm.current) {
@@ -26,11 +39,12 @@ const useFilteredUsers = (
 
 			return {
 				searchTerm,
+				roles: selectedRoles,
 				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
 				count: itemsPerPage,
 				offset: searchTerm === prevSearchTerm.current ? current : 0,
 			};
-		}, [current, itemsPerPage, prevSearchTerm, searchTerm, setCurrent, sortBy, sortDirection]),
+		}, [current, itemsPerPage, prevSearchTerm, searchTerm, selectedRoles, setCurrent, sortBy, sortDirection]),
 		500,
 	);
 
@@ -38,7 +52,7 @@ const useFilteredUsers = (
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
-	const usersListQueryResult = useQuery(['tabUsers', payload, tab], async () => getUsers(payload), {
+	const usersListQueryResult = useQuery(['users.list', payload, tab], async () => getUsers(payload), {
 		onError: (error) => {
 			dispatchToastMessage({ type: 'error', message: error });
 		},
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index a10c21208f8d..721f02570728 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,15 +6,18 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { role?: string; searchTerm: string } & PaginatedRequest;
+export type UsersListStatusParamsGET = { roles: string[]; searchTerm: string } & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',
 	properties: {
-		searchTerm: {
-			type: 'string',
+		roles: {
+			type: 'array',
+			items: {
+				type: 'string',
+			},
 		},
-		role: {
+		searchTerm: {
 			type: 'string',
 		},
 		sort: {
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
index 290bb616cec4..e199204c4444 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustom.tsx
@@ -1,7 +1,7 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useOutsideClick, useToggle } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import type { Dispatch, FormEvent, ReactElement, RefObject, SetStateAction } from 'react';
+import type { FormEvent, ReactElement, RefObject } from 'react';
 import { useCallback, useRef } from 'react';
 
 import MultiSelectCustomAnchor from './MultiSelectCustomAnchor';
@@ -21,22 +21,22 @@ const onMouseEventPreventSideEffects = (e: MouseEvent): void => {
 	e.stopImmediatePropagation();
 };
 
-type TitleOptionProp = {
+export type TitleOptionProp = {
 	id: string;
 	text: string;
-	isGroupTitle: boolean;
-	checked: never;
 };
 
 type CheckboxOptionProp = {
 	id: string;
 	text: string;
-	isGroupTitle: never;
 	checked: boolean;
 };
 
 export type OptionProp = TitleOptionProp | CheckboxOptionProp;
 
+export const isCheckboxOptionProp = (option: OptionProp): option is CheckboxOptionProp =>
+	(option as CheckboxOptionProp).checked !== undefined;
+
 /**
  * @param dropdownOptions options available for the multiselect dropdown list
  * @param defaultTitle dropdown text before selecting any options (or all of them). For example: 'All rooms'
@@ -55,7 +55,7 @@ type DropDownProps = {
 	defaultTitle: string;
 	selectedOptionsTitle: TranslationKey;
 	selectedOptions: OptionProp[];
-	setSelectedOptions: Dispatch<SetStateAction<OptionProp[]>>;
+	setSelectedOptions: (options: OptionProp[]) => void;
 	searchBarText?: TranslationKey;
 };
 
@@ -85,20 +85,26 @@ export const MultiSelectCustom = ({
 
 	useOutsideClick([target], onClose);
 
-	const onSelect = (item: OptionProp, e?: FormEvent<HTMLElement>): void => {
-		e?.stopPropagation();
-		item.checked = !item.checked;
+	const onSelect = useCallback(
+		(selectedOption: OptionProp, e?: FormEvent<HTMLElement>): void => {
+			e?.stopPropagation();
+
+			if (isCheckboxOptionProp(selectedOption)) {
+				selectedOption.checked = !selectedOption.checked;
 
-		if (item.checked === true) {
-			setSelectedOptions([...new Set([...selectedOptions, item])]);
-			return;
-		}
+				if (selectedOption.checked) {
+					setSelectedOptions([...new Set([...selectedOptions, selectedOption])]);
+					return;
+				}
 
-		// the user has disabled this option -> remove this from the selected options list
-		setSelectedOptions(selectedOptions.filter((option: OptionProp) => option.id !== item.id));
-	};
+				// the user has disabled this option -> remove this from the selected options list
+				setSelectedOptions(selectedOptions.filter((option: OptionProp) => option.id !== selectedOption.id));
+			}
+		},
+		[selectedOptions, setSelectedOptions],
+	);
 
-	const count = dropdownOptions.filter((option) => option.checked).length;
+	const selectedOptionsCount = dropdownOptions.filter((option) => isCheckboxOptionProp(option) && option.checked).length;
 
 	return (
 		<Box display='flex' flexGrow={1} position='relative'>
@@ -108,7 +114,7 @@ export const MultiSelectCustom = ({
 				collapsed={collapsed}
 				defaultTitle={defaultTitle}
 				selectedOptionsTitle={selectedOptionsTitle}
-				selectedOptionsCount={count}
+				selectedOptionsCount={selectedOptionsCount}
 				maxCount={dropdownOptions.length}
 			/>
 			{collapsed && (
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index bbf43e1513a4..b4c6db252cc6 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import { Fragment, useCallback, useState } from 'react';
 
-import type { OptionProp } from './MultiSelectCustom';
+import { isCheckboxOptionProp, type OptionProp } from './MultiSelectCustom';
 import { useFilteredOptions } from './useFilteredOptions';
 
 const MultiSelectCustomList = ({
@@ -40,7 +40,7 @@ const MultiSelectCustomList = ({
 			)}
 			{filteredOptions.map((option) => (
 				<Fragment key={option.id}>
-					{option.isGroupTitle ? (
+					{!isCheckboxOptionProp(option) ? (
 						<Box mi='x12' mb='x4' fontScale='p2b' color='default'>
 							{t(option.text as TranslationKey)}
 						</Box>

From 019321e66417a334595ae64a25cc1f2903827b61 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 18 Jan 2024 12:48:00 -0300
Subject: [PATCH 33/61] feat: :sparkles: Implement roles filter search bar and
 pending users count

Implemented the searchbar in the users page roles filter and implemented a secondary custom hook to get the pending users count.
---
 .../views/admin/users/AdminUsersPage.tsx      |  9 +++---
 .../admin/users/UsersTable/UsersTable.tsx     |  6 +++-
 .../users/UsersTable/UsersTableFilters.tsx    |  1 +
 .../admin/users/hooks/usePendingUsersCount.ts | 31 +++++++++++++++++++
 .../rocketchat-i18n/i18n/en.i18n.json         |  1 +
 5 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts

diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index 152798dcd1b2..df8a91bcf9cc 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -18,7 +18,7 @@ import AdminUserUpgrade from './AdminUserUpgrade';
 import type { IAdminUserTabs } from './IAdminUserTabs';
 import UsersTable from './UsersTable';
 
-const UsersPage = (): ReactElement => {
+const AdminUsersPage = (): ReactElement => {
 	const t = useTranslation();
 
 	const seatsCap = useSeatsCap();
@@ -34,6 +34,7 @@ const UsersPage = (): ReactElement => {
 
 	const [tab, setTab] = useState<IAdminUserTabs>('all');
 	const [createdUsersCount, setCreatedUsersCount] = useState(0);
+	const [pendingUsersCount, setPendingUsersCount] = useState(0);
 
 	const handleReload = (): void => {
 		seatsCap?.reload();
@@ -72,7 +73,7 @@ const UsersPage = (): ReactElement => {
 							{t('All')}
 						</TabsItem>
 						<TabsItem selected={tab === 'pending'} onClick={() => setTab('pending')}>
-							{t('Pending')}
+							{pendingUsersCount ? `${t('Pending')} (${pendingUsersCount})` : t('Pending')}
 						</TabsItem>
 						<TabsItem selected={tab === 'active'} onClick={() => setTab('active')}>
 							{t('Active')}
@@ -81,7 +82,7 @@ const UsersPage = (): ReactElement => {
 							{t('Deactivated')}
 						</TabsItem>
 					</Tabs>
-					<UsersTable reload={reload} tab={tab} roleData={data} onReload={handleReload} />
+					<UsersTable reload={reload} tab={tab} roleData={data} onReload={handleReload} setPendingUsersCount={setPendingUsersCount} />
 				</PageContent>
 			</Page>
 			{context && (
@@ -122,4 +123,4 @@ const UsersPage = (): ReactElement => {
 	);
 };
 
-export default UsersPage;
+export default AdminUsersPage;
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 585abe2b49a9..09a0e42ea6b0 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -19,6 +19,7 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import type { IAdminUserTabs } from '../IAdminUserTabs';
 import useFilteredUsers from '../hooks/useFilteredUsers';
+import usePendingUsersCount from '../hooks/usePendingUsersCount';
 import UsersTableFilters from './UsersTableFilters';
 import UsersTableRow from './UsersTableRow';
 
@@ -27,6 +28,7 @@ type UsersTableProps = {
 	tab: IAdminUserTabs;
 	onReload: () => void;
 	roleData: { roles: IRole[] } | undefined;
+	setPendingUsersCount: React.Dispatch<React.SetStateAction<number>>;
 };
 
 export type UsersFilters = {
@@ -34,7 +36,7 @@ export type UsersFilters = {
 	roles: OptionProp[];
 };
 
-const UsersTable = ({ reload, tab, roleData, onReload }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
@@ -59,6 +61,8 @@ const UsersTable = ({ reload, tab, roleData, onReload }: UsersTableProps): React
 		selectedRoles: useMemo(() => userFilters.roles.map((role) => role.id), [userFilters.roles]),
 	});
 
+	usePendingUsersCount({ tab, setPendingUsersCount, currentUsersTotal: data?.total });
+
 	useEffect(() => {
 		reload.current = refetch;
 	}, [refetch, reload]);
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
index 2efc32d4e85a..cfb6b487ac4d 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -64,6 +64,7 @@ const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps
 				selectedOptionsTitle='Roles'
 				setSelectedOptions={handleRolesChange}
 				selectedOptions={selectedRoles}
+				searchBarText='Search_roles'
 			/>
 		</FilterByText>
 	);
diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
new file mode 100644
index 000000000000..aadc1301a85e
--- /dev/null
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -0,0 +1,31 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+
+type usePendingUsersCountProps = {
+	tab: string;
+	setPendingUsersCount: React.Dispatch<React.SetStateAction<number>>;
+	currentUsersTotal: number | undefined;
+};
+
+const usePendingUsersCount = ({ tab, setPendingUsersCount, currentUsersTotal }: usePendingUsersCountProps) => {
+	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: 'pending' });
+
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	const payload = { count: 1, roles: [], searchTerm: '' };
+
+	const pendingUsersListQueryResult = useQuery(['pendingUsersCount', tab, currentUsersTotal], async () => getUsers(payload), {
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+
+	if (pendingUsersListQueryResult.isSuccess && pendingUsersListQueryResult.data) {
+		setPendingUsersCount(pendingUsersListQueryResult.data.total);
+		return;
+	}
+
+	setPendingUsersCount(0);
+};
+
+export default usePendingUsersCount;
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 39c9d6d320b5..5afc4481ffd5 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -4629,6 +4629,7 @@
   "Search_Page_Size": "Page Size",
   "Search_Private_Groups": "Search Private Groups",
   "Search_Provider": "Search Provider",
+  "Search_roles": "Search roles",
   "Search_rooms": "Search rooms",
   "Search_Rooms": "Search Rooms",
   "Search_Users": "Search Users",

From f4019ec15bd721c134d70c26f16f6b89899051b1 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 18 Jan 2024 19:53:43 -0300
Subject: [PATCH 34/61] refactor: :recycle: Refactor usePendingUsersCount and
 refactor UsersTableFilters

Refactored the usePendingUserCount hook to have better reactivity and stability. Also refactored the UsersTableFilters to better follow figma specs.
---
 .../views/admin/users/AdminUserForm.tsx       | 13 +++++-
 .../admin/users/UsersTable/UsersTable.tsx     |  2 +-
 .../users/UsersTable/UsersTableFilters.tsx    | 45 ++++++++++++++-----
 .../admin/users/hooks/usePendingUsersCount.ts | 31 ++++++-------
 .../MultiSelectCustomList.tsx                 | 12 ++---
 5 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index 3c83a9df650f..a9598234a6f1 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -28,7 +28,7 @@ import {
 	useToastMessageDispatch,
 	useTranslation,
 } from '@rocket.chat/ui-contexts';
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React, { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
@@ -97,6 +97,7 @@ const AdminUserForm = ({
 	const t = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
 
 	const customFieldsMetadata = useAccountsCustomFields();
 	const defaultRoles = useSetting<string>('Accounts_Registration_Users_Default_Roles') || '';
@@ -165,7 +166,15 @@ const AdminUserForm = ({
 			return handleUpdateUser.mutateAsync({ userId: userData?._id, data: userFormData });
 		}
 
-		return handleCreateUser.mutateAsync({ ...userFormData, fields: '' });
+		return handleCreateUser.mutateAsync(
+			{ ...userFormData, fields: '' },
+			{
+				onSuccess: () =>
+					queryClient.invalidateQueries(['pendingUsersCount'], {
+						refetchType: 'all',
+					}),
+			},
+		);
 	});
 
 	const nameId = useUniqueId();
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 09a0e42ea6b0..bf426aede962 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -61,7 +61,7 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 		selectedRoles: useMemo(() => userFilters.roles.map((role) => role.id), [userFilters.roles]),
 	});
 
-	usePendingUsersCount({ tab, setPendingUsersCount, currentUsersTotal: data?.total });
+	usePendingUsersCount({ setPendingUsersCount, currentUsersTotal: data?.total });
 
 	useEffect(() => {
 		reload.current = refetch;
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
index cfb6b487ac4d..b7f9785d3c6e 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -1,10 +1,10 @@
 import type { IRole } from '@rocket.chat/core-typings';
+import { Box, Icon, TextInput } from '@rocket.chat/fuselage';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { MultiSelectCustom } from '@rocket.chat/ui-client';
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import FilterByText from '../../../../components/FilterByText';
 import type { UsersFilters } from './UsersTable';
 
 type UsersTableFiltersProps = {
@@ -19,7 +19,8 @@ const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps
 	const [text, setText] = useState('');
 
 	const handleSearchTextChange = useCallback(
-		({ text }) => {
+		(event) => {
+			const text = event.currentTarget.value;
 			setUsersFilters({ text, roles: selectedRoles });
 			setText(text);
 		},
@@ -57,16 +58,36 @@ const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps
 	);
 
 	return (
-		<FilterByText autoFocus placeholder={t('Search_Users')} onChange={handleSearchTextChange}>
-			<MultiSelectCustom
-				dropdownOptions={userRolesFilterStructure}
-				defaultTitle='All_rooms'
-				selectedOptionsTitle='Roles'
-				setSelectedOptions={handleRolesChange}
-				selectedOptions={selectedRoles}
-				searchBarText='Search_roles'
-			/>
-		</FilterByText>
+		<Box
+			is='form'
+			onSubmit={useCallback((e) => e.preventDefault(), [])}
+			mb='x8'
+			display='flex'
+			flexWrap='wrap'
+			alignItems='center'
+			justifyContent='center'
+		>
+			<Box minWidth='x224' display='flex' m='x4' flexGrow={2}>
+				<TextInput
+					name='Search_Users'
+					alignItems='center'
+					placeholder={t('Search_Users')}
+					addon={<Icon name='magnifier' size='x20' />}
+					onChange={handleSearchTextChange}
+					value={text}
+				/>
+			</Box>
+			<Box minWidth='x224' m='x4'>
+				<MultiSelectCustom
+					dropdownOptions={userRolesFilterStructure}
+					defaultTitle='All_rooms'
+					selectedOptionsTitle='Roles'
+					setSelectedOptions={handleRolesChange}
+					selectedOptions={selectedRoles}
+					searchBarText='Search_roles'
+				/>
+			</Box>
+		</Box>
 	);
 };
 
diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
index aadc1301a85e..35788e927d88 100644
--- a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -1,31 +1,26 @@
-import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
 type usePendingUsersCountProps = {
-	tab: string;
 	setPendingUsersCount: React.Dispatch<React.SetStateAction<number>>;
 	currentUsersTotal: number | undefined;
 };
 
-const usePendingUsersCount = ({ tab, setPendingUsersCount, currentUsersTotal }: usePendingUsersCountProps) => {
+const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePendingUsersCountProps) => {
 	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: 'pending' });
 
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const payload = { count: 1, roles: [], searchTerm: '' };
-
-	const pendingUsersListQueryResult = useQuery(['pendingUsersCount', tab, currentUsersTotal], async () => getUsers(payload), {
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
+	useQuery(
+		['pendingUsersCount', currentUsersTotal],
+		async () => {
+			const payload = { count: 1, roles: [], searchTerm: '' };
+			return getUsers(payload);
 		},
-	});
-
-	if (pendingUsersListQueryResult.isSuccess && pendingUsersListQueryResult.data) {
-		setPendingUsersCount(pendingUsersListQueryResult.data.total);
-		return;
-	}
-
-	setPendingUsersCount(0);
+		{
+			onSuccess: (data) => {
+				setPendingUsersCount(data ? data.total : 0);
+			},
+		},
+	);
 };
 
 export default usePendingUsersCount;
diff --git a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
index b4c6db252cc6..0da163fb1d06 100644
--- a/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
+++ b/packages/ui-client/src/components/MultiSelectCustom/MultiSelectCustomList.tsx
@@ -1,4 +1,4 @@
-import { Box, CheckBox, Icon, Option, SearchInput, Tile } from '@rocket.chat/fuselage';
+import { Box, CheckBox, Icon, Margins, Option, SearchInput, Tile } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
@@ -25,9 +25,9 @@ const MultiSelectCustomList = ({
 	const filteredOptions = useFilteredOptions(text, options);
 
 	return (
-		<Tile overflow='auto' pb='x12' pi={0} elevation='2' w='full' bg='light' borderRadius='x2'>
+		<Tile overflow='auto' pb={12} pi={0} elevation='2' w='full' bg='light' borderRadius={2}>
 			{searchBarText && (
-				<Option>
+				<Margins blockEnd={12} inline={12}>
 					<SearchInput
 						name='select-search'
 						placeholder={t(searchBarText as TranslationKey)}
@@ -36,17 +36,17 @@ const MultiSelectCustomList = ({
 						onChange={handleChange}
 						value={text}
 					/>
-				</Option>
+				</Margins>
 			)}
 			{filteredOptions.map((option) => (
 				<Fragment key={option.id}>
 					{!isCheckboxOptionProp(option) ? (
-						<Box mi='x12' mb='x4' fontScale='p2b' color='default'>
+						<Box mi={12} mb={4} fontScale='p2b' color='default'>
 							{t(option.text as TranslationKey)}
 						</Box>
 					) : (
 						<Option key={option.id}>
-							<Box pis='x4' pb='x4' w='full' display='flex' justifyContent='space-between' is='label'>
+							<Box w='full' display='flex' justifyContent='space-between' is='label'>
 								{t(option.text as TranslationKey)}
 
 								<CheckBox checked={option.checked} pi={0} name={option.text} id={option.id} onChange={() => onSelected(option)} />

From b6da74c09a52e96277638976ee5bb0c5f8ad9510 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 11:17:27 -0300
Subject: [PATCH 35/61] fix: remove unused translations

---
 apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json    | 3 +--
 56 files changed, 56 insertions(+), 112 deletions(-)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
index 90db76e13637..8f7ed56210f3 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Voeg bestuurder by",
   "Add_Role": "Voeg rol by",
   "Add_user": "Voeg gebruiker by",
-  "Add_User": "Voeg gebruiker by",
   "Add_users": "Voeg gebruikers by",
   "add-oauth-service": "Voeg Oauth Service by",
   "add-oauth-service_description": "Toestemming om 'n nuwe Oauth-diens by te voeg",
@@ -2759,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Stuur bevestiging e-pos",
   "Enterprise": "onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
index b841354a8b0f..6ea4bdb87092 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "إضافة دور",
   "Add_Sender_To_ReplyTo": "إضافة مرسل للرد عليه",
   "Add_user": "إضافة مستخدم",
-  "Add_User": "إضافة مستخدم",
   "Add_users": "إضافة مستخدمين",
   "Add_members": "إضافة أعضاء",
   "add-all-to-room": "أضف كل المستخدمين إلى غرفة",
@@ -4886,4 +4885,4 @@
   "Enterprise": "مؤسسة",
   "UpgradeToGetMore_engagement-dashboard_Title": "التحليلات",
   "UpgradeToGetMore_auditing_Title": "تدقيق الرسائل"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
index d3c9146f868f..b698c0591b49 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Meneceri əlavə edin",
   "Add_Role": "Rolu əlavə edin",
   "Add_user": "İstifadəçi əlavə edin",
-  "Add_User": "İstifadəçi əlavə edin",
   "Add_users": "İstifadəçilər əlavə edin",
   "add-oauth-service": "Oauth Xidməti əlavə edin",
   "add-oauth-service_description": "Yeni bir Oauth xidməti əlavə etmək üçün icazə",
@@ -2759,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Təsdiq e-poçt göndər",
   "Enterprise": "Müəssisə",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
index 84af45c446ff..24163b1275db 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
@@ -205,7 +205,6 @@
   "Add_manager": "дадаць менеджэр",
   "Add_Role": "дадаць ролю",
   "Add_user": "дадаць карыстальніка",
-  "Add_User": "Дадаць карыстальніка",
   "Add_users": "даданне карыстальнікаў",
   "add-oauth-service": "Дадаць службу OAuth",
   "add-oauth-service_description": "Дазвол на даданне новага OAuth службы",
@@ -2777,4 +2776,4 @@
   "registration.component.form.sendConfirmationEmail": "Адправіць па электроннай пошце пацвярджэнне",
   "Enterprise": "прадпрыемства",
   "UpgradeToGetMore_engagement-dashboard_Title": "аналітыка"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
index a4bdc836a471..8aeaeaf21c9d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Добавете мениджър",
   "Add_Role": "Добавяне на роля",
   "Add_user": "Добавяне на потребител",
-  "Add_User": "Добавяне на потребител",
   "Add_users": "Добавяне на потребители",
   "add-oauth-service": "Добавете услуга Oauth",
   "add-oauth-service_description": "Разрешение за добавяне на нова услуга на Oauth",
@@ -2751,4 +2750,4 @@
   "registration.component.form.sendConfirmationEmail": "Изпратете имейл за потвърждение",
   "Enterprise": "начинание",
   "UpgradeToGetMore_engagement-dashboard_Title": "анализ"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
index 0f7b90aa2efe..047ae1087117 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
@@ -38,8 +38,7 @@
   "Accounts_OAuth_Custom_Secret": "গোপন",
   "Accounts_OAuth_Google_secret": "গুগল সিক্রেট",
   "Accounts_OAuth_Tokenpass_callback_url": "Tokenpass কলব্যাক ইউআরএল",
-  "Add_User": "ব্যবহারকারী যুক্ত করুন",
   "add-user": "ব্যবহারকারী যুক্ত করুন",
   "Closed_automatically": "সিস্টেম দ্বারা স্বয়ংক্রিয়ভাবে বন্ধ",
   "Customize": "কাস্টমাইজ করুন"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
index ff757e76e6ca..de63876236fe 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Dodaj upravitelja",
   "Add_Role": "Dodajte ulogu",
   "Add_user": "Dodaj korisnika",
-  "Add_User": "Dodaj korisnika",
   "Add_users": "Dodaj korisnike",
   "add-oauth-service": "Dodaj Oauth uslugu",
   "add-oauth-service_description": "Dozvolu za dodavanje nove Oauth usluge",
@@ -2747,4 +2746,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
index f960770eb116..a616e29ec243 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "Afegeix rol",
   "Add_Sender_To_ReplyTo": "Afegir remitent per respondre",
   "Add_user": "Afegir usuari",
-  "Add_User": "Afegeix usuari",
   "Add_users": "Afegeix usuaris",
   "Add_members": "Afegir membres",
   "add-all-to-room": "Afegir tots els usuaris a una sala",
@@ -4690,4 +4689,4 @@
   "Enterprise": "Empresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analítiques",
   "UpgradeToGetMore_auditing_Title": "Auditoria de missatges"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
index ec0faf0829aa..549ba83d112e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -249,7 +249,6 @@
   "Add_Reaction": "Přidat reakci",
   "Add_Role": "Přidat roli",
   "Add_user": "Přidat uživatele",
-  "Add_User": "Přidat uživatele",
   "Add_users": "Přidat uživatele",
   "add-livechat-department-agents": "Přidat Omnichannel operátory do oddělení",
   "add-oauth-service": "Přidat Oauth službu",
@@ -3965,4 +3964,4 @@
   "Enterprise": "Korporace",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika",
   "UpgradeToGetMore_auditing_Title": "Audit zpráv"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
index c3b473dab7ce..c8bf1d9c81e1 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Ychwanegu rheolwr",
   "Add_Role": "Ychwanegu Rôl",
   "Add_user": "Ychwanegu defnyddiwr",
-  "Add_User": "Ychwanegu Defnyddiwr",
   "Add_users": "Ychwanegwch ddefnyddwyr",
   "add-oauth-service": "Ychwanegu Gwasanaeth Oauth",
   "add-oauth-service_description": "Caniatâd i ychwanegu gwasanaeth Oauth newydd",
@@ -2750,4 +2749,4 @@
   "registration.component.form.sendConfirmationEmail": "Anfon ebost cadarnhad",
   "Enterprise": "Menter",
   "UpgradeToGetMore_engagement-dashboard_Title": "Dadansoddiadau"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
index 522a3776dcc9..225754859130 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
@@ -248,7 +248,6 @@
   "Add_Reaction": "Tilføj reaktion",
   "Add_Role": "Tilføj rolle",
   "Add_user": "Tilføj bruger",
-  "Add_User": "Tilføj bruger",
   "Add_users": "Tilføj brugere",
   "add-livechat-department-agents": "Tilføj omni-kanal-agenter til afdelinger",
   "add-oauth-service": "Tilføj OAuth-tjeneste",
@@ -3987,4 +3986,4 @@
   "Enterprise": "Firma",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyse",
   "UpgradeToGetMore_auditing_Title": "Meddelelsesovervågning"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index 18325e65a0f9..e6a38d8392c7 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Manager hinzufügen",
   "Add_Role": "Rolle hinzufügen",
   "Add_user": "BenutzerIn hinzufügen",
-  "Add_User": "BenutzerIn hinzufügen",
   "Add_users": "BenutzerInnen hinzufügen",
   "add-oauth-service": "OAuth-Dienst hinzufügen",
   "add-oauth-service_description": "Berechtigung zum Hinzufügen eines neuen Oauth-Service",
@@ -2759,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Bestätigungsmail versenden",
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
index 2248f5ef3022..fa372d08c6ff 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
@@ -207,7 +207,6 @@
   "Add_manager": "Manager hinzufügen",
   "Add_Role": "Rolle hinzufügen",
   "Add_user": "BenutzerIn hinzufügen",
-  "Add_User": "BenutzerIn hinzufügen",
   "Add_users": "BenutzerInnen hinzufügen",
   "add-oauth-service": "OAuth-Dienst hinzufügen",
   "add-oauth-service_description": "Berechtigung, einen neuen OAuth-Dienst hinzuzufügen",
@@ -3103,4 +3102,4 @@
   "Your_question": "Deine Frage",
   "Your_server_link": "Dein Server-Link",
   "Your_workspace_is_ready": "Dein Arbeitsbereich ist einsatzbereit 🎉"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
index e5241fe68e1b..105212ee228d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -292,7 +292,6 @@
   "Add_Server": "Server hinzufügen",
   "Add_URL": "URL hinzufügen",
   "Add_user": "Benutzer hinzufügen",
-  "Add_User": "Benutzer hinzufügen",
   "Add_users": "Benutzer hinzufügen",
   "Add_members": "Mitglieder hinzufügen",
   "add-all-to-room": "Alle Benutzer zu einem Kanal hinzufügen ",
@@ -5516,4 +5515,4 @@
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Nachrichtenüberprüfung"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
index 57c07c0b8129..07ae9948fd98 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -205,7 +205,6 @@
   "Add_manager": "Προσθήκη διαχειριστή",
   "Add_Role": "Προσθήκη Ρόλου",
   "Add_user": "Προσθήκη χρήστη",
-  "Add_User": "Προσθήκη Χρήστη",
   "Add_users": "Προσθήκη χρηστών",
   "add-oauth-service": "Προσθήκη Υπηρεσίας OAuth",
   "add-oauth-service_description": "Άδεια για προσθήκη νέας υπηρεσίας OAuth",
@@ -2768,4 +2767,4 @@
   "registration.component.form.sendConfirmationEmail": "Αποστολή email επιβεβαίωσης",
   "Enterprise": "Επιχείρηση",
   "UpgradeToGetMore_engagement-dashboard_Title": "Αναλυτικά στοιχεία"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
index 68ec0dbe60f3..f95780bfb15d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Aldonu administranton",
   "Add_Role": "Aldoni rolon",
   "Add_user": "Aldoni uzanton",
-  "Add_User": "Aldoni Uzanton",
   "Add_users": "Aldoni uzantojn",
   "add-oauth-service": "Aldoni Oauth-Servon",
   "add-oauth-service_description": "Permeso aldoni novan Oauth-servon",
@@ -2760,4 +2759,4 @@
   "registration.component.form.sendConfirmationEmail": "Sendu konfirman retpoŝton",
   "Enterprise": "Entrepreno",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitiko"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
index 861ea5723b4a..2e6d369e6fab 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -286,7 +286,6 @@
   "Add_Role": "Añadir rol",
   "Add_Sender_To_ReplyTo": "Añadir remitente para responder",
   "Add_user": "Añadir usuario",
-  "Add_User": "Añadir usuario",
   "Add_users": "Añadir usuarios",
   "Add_members": "Añadir miembros",
   "add-livechat-department-agents": "Añadir agentes de Omnichannel a departamentos",
@@ -5084,4 +5083,4 @@
   "Unlimited_seats": "Puestos ilimitados",
   "Unlimited_MACs": "Contactos Activos por Mes (MAC) ilimitados",
   "Unlimited_seats_MACs": "Puestos y Contactos Activos por Mes (MAC) ilimitados"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
index a4a6d7e4e879..eb81e9f7cd14 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -226,7 +226,6 @@
   "Add_monitor": "اضافه کردن مانیتور",
   "Add_Role": "اضافه کردن نقش",
   "Add_user": "اضافه کردن کاربر",
-  "Add_User": "اضافه کردن کاربر",
   "Add_users": "اضافه کردن کاربران",
   "add-livechat-department-agents": "اضافه کردن پشتیبان‌های کانال همه‌کاره به بخش‌ها",
   "add-livechat-department-agents_description": "مجوز اضافه کردن پشتیبان‌های کانال همه‌کاره به بخش‌ها",
@@ -3107,4 +3106,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "کانال همه‌کاره",
   "Enterprise": "شرکت، پروژه",
   "UpgradeToGetMore_engagement-dashboard_Title": "تجزیه و تحلیل ترافیک"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
index 629665260a4d..1b25ece07e96 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -294,7 +294,6 @@
   "Add_Server": "Lisää palvelin",
   "Add_URL": "Lisää URL-osoite",
   "Add_user": "Lisää käyttäjä",
-  "Add_User": "Lisää käyttäjä",
   "Add_users": "Lisää käyttäjiä",
   "Add_members": "Lisää jäseniä",
   "add-all-to-room": "Lisää kaikki käyttäjät huoneeseen",
@@ -5754,4 +5753,4 @@
   "Theme_Appearence": "Teeman ulkoasu",
   "Enterprise": "Yritys",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
index c0c866af1b0a..27adcf8a29a0 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "Ajouter un rôle",
   "Add_Sender_To_ReplyTo": "Ajouter l'expéditeur à Répondre à",
   "Add_user": "Ajouter un utilisateur",
-  "Add_User": "Ajouter un utilisateur",
   "Add_users": "Ajouter des utilisateurs",
   "Add_members": "Ajouter des membres",
   "add-all-to-room": "Ajouter tout les utilisateurs à un salon",
@@ -4886,4 +4885,4 @@
   "Enterprise": "Entreprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyses",
   "UpgradeToGetMore_auditing_Title": "Audit des messages"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
index 0f17d3f548c2..e6066c1dbf6a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -133,7 +133,6 @@
   "Add_manager": "הוספת מנהל",
   "Add_Role": "הוספת תפקיד",
   "Add_user": "הוספת משתמש",
-  "Add_User": "הוספת משתמש",
   "Add_users": "הוספת משתמשים",
   "add-user": "הוספת משתמש",
   "Adding_OAuth_Services": "הוספת שירותי OAuth",
@@ -1536,4 +1535,4 @@
   "registration.component.form.confirmPassword": "אמת את הסיסמה שלך",
   "registration.component.form.sendConfirmationEmail": "שליחת דוא״ל אימות",
   "UpgradeToGetMore_engagement-dashboard_Title": "סטטיסטיקה"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
index e33f8dd815da..1cb035d8252e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -208,7 +208,6 @@
   "Add_manager": "Dodaj upravitelja",
   "Add_Role": "Dodajte ulogu",
   "Add_user": "Dodaj korisnika",
-  "Add_User": "Dodaj korisnika",
   "Add_users": "Dodaj korisnike",
   "add-oauth-service": "Dodaj Oauth uslugu",
   "add-oauth-service_description": "Dozvolu za dodavanje nove Oauth usluge",
@@ -2896,4 +2895,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
index 9149c72fdeec..3ee3c0dd7402 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -289,7 +289,6 @@
   "Add_Sender_To_ReplyTo": "Küldő hozzáadása a válaszcímhez",
   "Add_URL": "URL hozzáadása",
   "Add_user": "Felhasználó hozzáadása",
-  "Add_User": "Felhasználó hozzáadása",
   "Add_users": "Felhasználók hozzáadása",
   "Add_members": "Tagok hozzáadása",
   "add-all-to-room": "Összes felhasználó hozzáadása egy szobához",
@@ -5425,4 +5424,4 @@
   "Enterprise": "Vállalati",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika",
   "UpgradeToGetMore_auditing_Title": "Üzenet ellenőrzés"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
index 563d67a3fb7f..5570fe19d328 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Tambahkan manager",
   "Add_Role": "Tambahkan Peran",
   "Add_user": "Tambahkan pengguna",
-  "Add_User": "Tambahkan pengguna",
   "Add_users": "Tambahkan pengguna",
   "add-oauth-service": "Tambahkan Layanan Oauth",
   "add-oauth-service_description": "Izin untuk menambahkan layanan Oauth baru",
@@ -2769,4 +2768,4 @@
   "registration.component.form.sendConfirmationEmail": "Kirim email konfirmasi",
   "Enterprise": "Perusahaan",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
index 4a656c8b3337..cef2358652bc 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -223,7 +223,6 @@
   "Add_Reaction": "Aggiungi reazione",
   "Add_Role": "Aggiungi ruolo",
   "Add_user": "Aggiungi utente",
-  "Add_User": "Aggiungi utente",
   "Add_users": "Aggiungi utenti",
   "add-oauth-service": "Aggiungi servizio Oauth",
   "add-oauth-service_description": "Autorizzazione ad aggiungere un nuovo servizio Oauth",
@@ -2862,4 +2861,4 @@
   "registration.component.form.sendConfirmationEmail": "Invia email di conferma",
   "Enterprise": "impresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
index 81f51b667cd9..829552cf80ce 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "ロールの追加",
   "Add_Sender_To_ReplyTo": "返信先に送信者を追加",
   "Add_user": "ユーザーを追加",
-  "Add_User": "ユーザーの追加",
   "Add_users": "ユーザーを追加",
   "Add_members": "メンバーの追加",
   "add-livechat-department-agents": "部署にオムニチャネルエージェントを追加",
@@ -4836,4 +4835,4 @@
   "Enterprise": "エンタープライズ",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "メッセージ監査"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
index 8e673e5346cc..17fc12f2ba08 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
@@ -244,7 +244,6 @@
   "Add_Reaction": "რეაქციის დამატება",
   "Add_Role": "როლის დამატება",
   "Add_user": "მომხმარებლის დამატება",
-  "Add_User": "მომხმარებლის დამატება",
   "Add_users": "მომხმარებლების დამატება",
   "add-livechat-department-agents": "დაამატეთ მრავალარხიანი აგენტები დეპარტამენტებში",
   "add-oauth-service": "Oauth სერვისის დამატება",
@@ -3671,4 +3670,4 @@
   "onboarding.form.registerOfflineForm.title": "ხელით დარეგისტრირება",
   "UpgradeToGetMore_engagement-dashboard_Title": "ანალიტიკა",
   "UpgradeToGetMore_auditing_Title": "შეტყობინებების შემოწმება"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
index b58c8c5c5dc1..be322ff0d131 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -229,7 +229,6 @@
   "Add_monitor": "បន្ថែមម៉ូនីទ័រ",
   "Add_Role": "បន្ថែមតួនាទី",
   "Add_user": "បន្ថែមអ្នកប្រើ",
-  "Add_User": "បន្ថែមអ្នកប្រើ",
   "Add_users": "ថែម​អ្នក​ប្រើប្រាស់",
   "add-livechat-department-agents": "បន្ថែមភ្នាក់ងារបន្តផ្ទាល់ទៅមន្ទីរ។",
   "add-oauth-service": "បន្ថែមសេវាកម្ម Oauth",
@@ -3116,4 +3115,4 @@
   "Enterprise": "សហគ្រាស",
   "UpgradeToGetMore_engagement-dashboard_Title": "វិភាគ",
   "UpgradeToGetMore_auditing_Title": "សវនកម្មសារ"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
index 6cd9d58a8692..b768bd9c565f 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -260,7 +260,6 @@
   "Add_Role": "역할 추가",
   "Add_Sender_To_ReplyTo": "회신자에 발신자 추가",
   "Add_user": "사용자 추가",
-  "Add_User": "사용자 추가",
   "Add_users": "사용자 추가",
   "Add_members": "멤버 추가",
   "add-livechat-department-agents": "부서에 실시간상담 상담사 추가",
@@ -4029,4 +4028,4 @@
   "Enterprise": "기업",
   "UpgradeToGetMore_engagement-dashboard_Title": "분석(에널리틱스)",
   "UpgradeToGetMore_auditing_Title": "메시지 감사"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
index 856732eca0be..29b9b8b4ec31 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "lê zêde bike manager",
   "Add_Role": "Role",
   "Add_user": "lê zêde bike user",
-  "Add_User": "lê zêde bike Bikarhêner",
   "Add_users": "بەکارهێنەر زیادبکە",
   "add-oauth-service": "Xizmetkirina Oauth",
   "add-oauth-service_description": "Destûra karûbarên nû ya Oauth zêde bike",
@@ -2749,4 +2748,4 @@
   "registration.component.form.sendConfirmationEmail": "ئیمەیڵی پشتڕاستکردنەوە بنێرە",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
index 34f308d2ab50..85e2ec916227 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -210,7 +210,6 @@
   "Add_monitor": "ເພີ່ມຈໍພາບ",
   "Add_Role": "ເພີ່ມພາລະບົດບາດ",
   "Add_user": "ເພີ່ມສະມາຊິກ",
-  "Add_User": "ເພີ່ມຜູ້ໃຊ້",
   "Add_users": "ເພີ່ມຜູ້ຊົມໃຊ້",
   "add-oauth-service": "ເພີ່ມ Oauth ບໍລິການ",
   "add-oauth-service_description": "ການອະນຸຍາດທີ່ຈະເພີ່ມການບໍລິການ Oauth ໃຫມ່",
@@ -2797,4 +2796,4 @@
   "registration.component.form.sendConfirmationEmail": "ສົ່ງອີເມວການຢືນຢັນ",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "ການວິເຄາະ"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
index 89226d5019d8..f8f48297e0f9 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
@@ -230,7 +230,6 @@
   "Add_manager": "Pridėti tvarkyklę",
   "Add_Role": "Pridėti vaidmenį",
   "Add_user": "Pridėti naudotoją",
-  "Add_User": "Pridėti naudotoją",
   "Add_users": "Pridėti vartotojus",
   "Add_members": "Pridėti narius",
   "add-oauth-service": "Pridėti \"Oauth\" paslaugą",
@@ -2814,4 +2813,4 @@
   "registration.component.form.sendConfirmationEmail": "Siųsti patvirtinimo el. Laišką",
   "Enterprise": "Įmonė",
   "UpgradeToGetMore_engagement-dashboard_Title": "\"Analytics\""
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
index ab594b7d2f69..cc841d39cff9 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
@@ -204,7 +204,6 @@
   "Add_monitor": "Pievienot monitoru/pieskatītāju",
   "Add_Role": "Pievienot lomu",
   "Add_user": "Pievienot lietotāju",
-  "Add_User": "Pievienot lietotāju",
   "Add_users": "Pievienot lietotājus",
   "add-oauth-service": "Pievienot Oauth pakalpojumu",
   "add-oauth-service_description": "Atļauja pievienot jaunu Oauth pakalpojumu",
@@ -2755,4 +2754,4 @@
   "registration.component.form.sendConfirmationEmail": "Nosūtīt apstiprinājuma e-pastu",
   "Enterprise": "Uzņēmums",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analītika"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
index 19da31a1b2e5..d9d5c4f138d2 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Менежер нэмэх",
   "Add_Role": "Дэмжлэг нэмэх",
   "Add_user": "Хэрэглэгч нэмэх",
-  "Add_User": "Хэрэглэгч нэмэх",
   "Add_users": "Хэрэглэгч нэмэх",
   "add-oauth-service": "Ойт алба нэмнэ үү",
   "add-oauth-service_description": "Шинэ Окафын үйлчилгээг нэмэх зөвшөөрөл",
@@ -2748,4 +2747,4 @@
   "registration.component.form.sendConfirmationEmail": "Баталгаажуулах имэйл илгээх",
   "Enterprise": "Аж ахуйн нэгж",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитик"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index 8d2cb17ea0d2..fb355d358ccc 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -198,7 +198,6 @@
   "Add_manager": "Tambah pengurus",
   "Add_Role": "Tambah Peranan",
   "Add_user": "Tambah pengguna",
-  "Add_User": "Tambah Pengguna",
   "Add_users": "Tambah pengguna",
   "add-oauth-service": "Tambah Perkhidmatan Oauth",
   "add-oauth-service_description": "Kebenaran untuk menambah perkhidmatan Oauth baru",
@@ -2765,4 +2764,4 @@
   "registration.component.form.sendConfirmationEmail": "Hantar e-mel pengesahan",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analisis"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
index fd9833d15769..7e8cb8095257 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "Rol toevoegen",
   "Add_Sender_To_ReplyTo": "Voeg afzender toe aan antwoord aan",
   "Add_user": "Voeg gebruiker toe",
-  "Add_User": "Voeg gebruiker toe",
   "Add_users": "Gebruikers toevoegen",
   "Add_members": "Leden toevoegen",
   "add-all-to-room": "Alle gebruikers aan een kamer toevoegen",
@@ -4874,4 +4873,4 @@
   "Enterprise": "Onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Bericht auditing"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
index f1d3862c76d6..1be32f0d4ef8 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -306,7 +306,6 @@
   "Add_Server": "Legg til server",
   "Add_URL": "Legg til URL",
   "Add_user": "Legg til bruker",
-  "Add_User": "Legg til bruker",
   "Add_users": "Legg til brukere",
   "Add_members": "Legg til medlemmer",
   "add-all-to-room": "Legg til alle brukere i et rom",
@@ -2977,4 +2976,4 @@
   "registration.component.form.sendConfirmationEmail": "Send bekreftelses-e-post",
   "Enterprise": "Bedriften",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
index 2ff9ceb1ab86..4d60c8b61320 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -283,7 +283,6 @@
   "Add_Server": "Dodaj serwer",
   "Add_URL": "Dodaj URL",
   "Add_user": "Dodaj użytkownika",
-  "Add_User": "Dodaj użytkownika",
   "Add_users": "Dodaj użytkowników",
   "Add_members": "Dodaj członków",
   "add-all-to-room": "Dodaj wszystkich użytkowników do pokoju.",
@@ -5345,4 +5344,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analityka",
   "UpgradeToGetMore_auditing_Title": "Audyt wiadomości"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 260d3828c796..b3946e03c603 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -288,7 +288,6 @@
   "Add_Sender_To_ReplyTo": "Adicionar remetente ao campo \"Responder para\"",
   "Add_URL": "Adicionar URL",
   "Add_user": "Adicionar usuário",
-  "Add_User": "Adicionar usuário",
   "Add_users": "Adicionar usuários",
   "Add_members": "Adicionar membros",
   "add-all-to-room": "Adicionar todos os usuários a uma sala",
@@ -4980,4 +4979,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
index 9bc920849c8c..ba7177c7159a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -232,7 +232,6 @@
   "Add_Role": "Adicionar função",
   "Add_Sender_To_ReplyTo": "Adicionar Remetente ao campo \"Responder a\"",
   "Add_user": "Adicionar utilizador",
-  "Add_User": "Adicionar Utilizador",
   "Add_users": "Adicionar utilizadores",
   "add-livechat-department-agents": "Adicionar Agentes Livechat aos Departamentos",
   "add-oauth-service": "Adicionar Oauth Service",
@@ -3176,4 +3175,4 @@
   "registration.component.form.sendConfirmationEmail": "Enviar email de confirmação",
   "Enterprise": "Empreendimento",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
index 8a966903515c..947c1fa7a977 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Adauga manager",
   "Add_Role": "Adăugați rol",
   "Add_user": "Adaugă utilizator",
-  "Add_User": "Adaugă utilizator",
   "Add_users": "Adaugă utilizatori",
   "add-oauth-service": "Adăugați serviciul Oauth",
   "add-oauth-service_description": "Permisiunea de a adăuga un nou serviciu Oauth",
@@ -2754,4 +2753,4 @@
   "registration.component.form.sendConfirmationEmail": "Trimite email de confirmare",
   "Enterprise": "Afacere",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
index c73e1fa58d20..af6815d14193 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -293,7 +293,6 @@
   "Add_Server": "Добавить Сервер",
   "Add_URL": "Добавить URL",
   "Add_user": "Добавить пользователя",
-  "Add_User": "Добавить Пользователя",
   "Add_users": "Добавить пользователей",
   "Add_members": "Добавить участников",
   "add-all-to-room": "Добавить всех пользователей в чат",
@@ -5088,4 +5087,4 @@
   "Enterprise": "Корпорация",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика",
   "UpgradeToGetMore_auditing_Title": "Аудит сообщений"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
index b3062bd2787a..e7944bf98810 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
@@ -202,7 +202,6 @@
   "Add_monitor": "Pridať vedúceho",
   "Add_Role": "Pridať funkciu",
   "Add_user": "Pridať používateľa",
-  "Add_User": "Pridať používateľa",
   "Add_users": "Pridať používateľov",
   "add-oauth-service": "Pridať službu Oauth",
   "add-oauth-service_description": "Povolenie na pridanie novej služby Oauth",
@@ -2764,4 +2763,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlite potvrdzovací e-mail",
   "Enterprise": "podnik",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
index d36f64dee4a8..cf0332fa5594 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Dodaj upravitelja",
   "Add_Role": "Dodaj vlogo",
   "Add_user": "Dodaj uporabnika",
-  "Add_User": "Dodaj uporabnika",
   "Add_users": "Dodaj uporabnike",
   "add-oauth-service": "Dodaj storitev Oauth",
   "add-oauth-service_description": "Dovoljenje za dodajanje nove storitve Oauth",
@@ -2744,4 +2743,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlji potrditveno e-poštno sporočilo",
   "Enterprise": "Podjetje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analiza"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
index 8754bcdf3ea4..ae7bdcc30433 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "Shto menaxher",
   "Add_Role": "Shto rol",
   "Add_user": "Shto përdorues",
-  "Add_User": "Shto përdoruesin",
   "Add_users": "Shtoni përdorues",
   "add-oauth-service": "Shtoni shërbimin Oauth",
   "add-oauth-service_description": "Leja për të shtuar një shërbim të ri Oauth",
@@ -2755,4 +2754,4 @@
   "registration.component.form.sendConfirmationEmail": "Dërgo email konfirmimi",
   "Enterprise": "Ndërmarrje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitikë"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
index 629b20286646..2d82f87503df 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -164,7 +164,6 @@
   "Add_manager": "Додај менаџера",
   "Add_Role": "Додај улогу",
   "Add_user": "Додај корисника",
-  "Add_User": "Додај корисника",
   "Add_users": "Додај кориснике",
   "add-user": "Додај корисника",
   "add-user_description": "Дозвола за додавање нових корисника на сервер преко екрана корисника",
@@ -2565,4 +2564,4 @@
   "registration.component.form.sendConfirmationEmail": "Пошаљи потврдну поруку",
   "Enterprise": "Предузеће",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
index 03d733f7eaea..193ede15f0a8 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -294,7 +294,6 @@
   "Add_Server": "Lägg till server",
   "Add_URL": "Lägg till URL",
   "Add_user": "Skapa användare",
-  "Add_User": "Skapa Användare",
   "Add_users": "Skapa användare",
   "Add_members": "Lägg till medlemmar",
   "add-all-to-room": "Lägg till alla användare i ett rum",
@@ -5751,4 +5750,4 @@
   "Theme_Appearence": "Utseende för tema",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index 89366d9df2a0..0ecfdc92aa45 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -199,7 +199,6 @@
   "Add_manager": "மேலாளர் சேர்",
   "Add_Role": "பங்கு சேர்",
   "Add_user": "பயனர் சேர்",
-  "Add_User": "பயனர் சேர்க்க",
   "Add_users": "பயனர் சேர்க்க",
   "add-oauth-service": "Oauth சேவை சேர்க்கவும்",
   "add-oauth-service_description": "புதிய Oauth சேவையைச் சேர்க்க அனுமதி",
@@ -2759,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "உறுதிப்படுத்தும் மின்னஞ்சல் அனுப்பவும்",
   "Enterprise": "நிறுவன",
   "UpgradeToGetMore_engagement-dashboard_Title": "அனலிட்டிக்ஸ்"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
index e97d28e2c30b..83a37a1cc346 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
@@ -198,7 +198,6 @@
   "Add_manager": "เพิ่มผู้จัดการ",
   "Add_Role": "เพิ่มบทบาท",
   "Add_user": "เพิ่มผู้ใช้",
-  "Add_User": "เพิ่มผู้ใช้",
   "Add_users": "เพิ่มผู้ใช้",
   "add-oauth-service": "เพิ่มบริการ Oauth",
   "add-oauth-service_description": "อนุญาตให้เพิ่มบริการ Oauth ใหม่",
@@ -2742,4 +2741,4 @@
   "registration.component.form.sendConfirmationEmail": "ส่งอีเมลยืนยัน",
   "Enterprise": "องค์กร",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
index 9f969914d5d0..9a0a5219547e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -222,7 +222,6 @@
   "Add_Reaction": "Tepki ekle",
   "Add_Role": "Rol Ekle",
   "Add_user": "Kullanıcı ekle",
-  "Add_User": "Kullanıcı Ekle",
   "Add_users": "Kullanıcı ekle",
   "add-livechat-department-agents": "Departmanlara canlı destek operatörleri ekle",
   "add-oauth-service": "Oauth Hizmeti Ekle",
@@ -3266,4 +3265,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "Çoklu Kanal",
   "Enterprise": "Kuruluş",
   "UpgradeToGetMore_engagement-dashboard_Title": "Mantıksal Analiz"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
index 57a828f92ffb..6dcfeb1d7a94 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -118,7 +118,6 @@
   "Add_custom_oauth": "نى قوشۇش OAuth ئۆزى بەلگىلىنىدىغان",
   "Add_manager": "باشقۇرغۇچى قوشۇش",
   "Add_user": "يېڭى كۆپەيگەن ئابۇنت",
-  "Add_User": "ئابۇنت قوشۇش",
   "Add_users": "ئابۇنت قوشۇش",
   "add-user": "ئابۇنت قوشۇش",
   "Adding_OAuth_Services": "مۇلازىمىتى قوشۇش OAuth",
@@ -1244,4 +1243,4 @@
   "registration.component.form.confirmPassword": "مەخپىي نومۇرنى جەزملەشتۈرۈش",
   "registration.component.form.sendConfirmationEmail": "جەزملەشتۈرگەن ئىلخەت يوللاندى",
   "UpgradeToGetMore_engagement-dashboard_Title": "ئانالىز قىلىش"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
index bc31ae328e6a..1a3d42e871b0 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -253,7 +253,6 @@
   "Add_monitor": "Додати монітор",
   "Add_Role": "Додати роль",
   "Add_user": "Додати користувача",
-  "Add_User": "Додати Користувача",
   "Add_users": "Додати користувачів",
   "add-livechat-department-agents": "Додайте Omnichannel представників до відділів",
   "add-oauth-service": "Додати сервіс Oauth",
@@ -3352,4 +3351,4 @@
   "Enterprise": "Підприємство",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналітика",
   "UpgradeToGetMore_auditing_Title": "Аудит повідомлень"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
index 88bcf754c10d..999ad8bf1f90 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
@@ -249,7 +249,6 @@
   "Add_Role": "Thêm vai trò",
   "Add_Sender_To_ReplyTo": "Thêm người gửi vào Phải phản hồi",
   "Add_user": "Thêm thành viên",
-  "Add_User": "Thêm Thành viên",
   "Add_users": "Thêm nhiều thành viên",
   "Add_members": "Thêm thành viên",
   "add-oauth-service": "Thêm Oauth Service",
@@ -2853,4 +2852,4 @@
   "registration.component.form.sendConfirmationEmail": "Gửi email xác nhận",
   "Enterprise": "Doanh nghiệp",
   "UpgradeToGetMore_engagement-dashboard_Title": "phân tích"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
index afeecab7fb7c..8725bfdaf76e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
@@ -212,7 +212,6 @@
   "Add_manager": "添加管理员",
   "Add_Role": "添加角色",
   "Add_user": "添加用户",
-  "Add_User": "添加用户",
   "Add_users": "添加用户",
   "add-oauth-service": "添加Oauth服务",
   "add-oauth-service_description": "允许添加新的Oauth服务",
@@ -2774,4 +2773,4 @@
   "registration.component.form.sendConfirmationEmail": "已发送确认电子邮件",
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index d5e8e05f71fb..a584f7bf2c61 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -269,7 +269,6 @@
   "Add_Role": "新增角色",
   "Add_Sender_To_ReplyTo": "新增寄件者到回覆對象",
   "Add_user": "新增使用者",
-  "Add_User": "新增使用者",
   "Add_users": "新增使用者",
   "Add_members": "新增成員",
   "add-livechat-department-agents": "新增即時聊天代理到部門",
@@ -4590,4 +4589,4 @@
   "Enterprise": "企業",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "訊息稽核"
-}
\ No newline at end of file
+}
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
index 314fc013cb68..77c7482fde16 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -256,7 +256,6 @@
   "Add_Reaction": "添加回应",
   "Add_Role": "添加角色",
   "Add_user": "添加用户",
-  "Add_User": "添加用户",
   "Add_users": "添加用户",
   "add-livechat-department-agents": "将 omnichannel 客服添加到部门",
   "add-oauth-service": "添加 Oauth 服务",
@@ -4137,4 +4136,4 @@
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "消息审计"
-}
\ No newline at end of file
+}

From a30caaaddf659ff876f0ef5c5fc51e6081802216 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 11:17:43 -0300
Subject: [PATCH 36/61] fix: role filter name

---
 .../client/views/admin/users/UsersTable/UsersTableFilters.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
index b7f9785d3c6e..c9a8b8b17b11 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -80,7 +80,7 @@ const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps
 			<Box minWidth='x224' m='x4'>
 				<MultiSelectCustom
 					dropdownOptions={userRolesFilterStructure}
-					defaultTitle='All_rooms'
+					defaultTitle='All_roles'
 					selectedOptionsTitle='Roles'
 					setSelectedOptions={handleRolesChange}
 					selectedOptions={selectedRoles}

From ddf3be0e1d72c444d92c32ab09583dbe0ed05471 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 11:17:53 -0300
Subject: [PATCH 37/61] fix: updating changeset message

---
 .changeset/serious-poets-smash.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/serious-poets-smash.md b/.changeset/serious-poets-smash.md
index bacf314515a3..ac6726fa8db9 100644
--- a/.changeset/serious-poets-smash.md
+++ b/.changeset/serious-poets-smash.md
@@ -3,4 +3,4 @@
 "@rocket.chat/rest-typings": minor
 ---
 
-Add a new endpoint to list users and resend the welcome message
+New admin user panel to manage users in different status, such as: All, Pending, Active, Deactivated

From 43b694ad1656b553302517bef1b622438b500903 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Fri, 19 Jan 2024 12:19:24 -0300
Subject: [PATCH 38/61] refactor: :recycle: Add 'pending' to users table
 registration status column

Implemented the 'pending' registration status in the 'users' table column with the same name. Modified the 'users.list' rest-typing to accurately represent the returned users list. Adjusted the 'isUserFederated' typing to enable compatibility with serialized user objects. Streamlined some boolean verifications for increased conciseness and eliminated an unnecessary comment.
---
 .../admin/users/AdminUserFormWithData.tsx     |  2 +-
 .../admin/users/AdminUserInfoWithData.tsx     |  2 +-
 .../admin/users/UsersTable/UsersTable.tsx     |  1 -
 .../admin/users/UsersTable/UsersTableRow.tsx  | 44 ++++++++++++-------
 packages/core-typings/src/IUser.ts            |  3 +-
 packages/rest-typings/src/v1/users.ts         |  9 +++-
 6 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index 0e9c149314ba..83cf07347789 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -37,7 +37,7 @@ const AdminUserFormWithData = ({ uid, onReload, context, roleData, roleError }:
 		);
 	}
 
-	if (data?.user && isUserFederated(data?.user as unknown as IUser)) {
+	if (data?.user && isUserFederated(data?.user)) {
 		return (
 			<Callout m={16} type='danger'>
 				{t('Edit_Federated_User_Not_Allowed')}
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 679413ce7638..74561819f2da 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -123,7 +123,7 @@ const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProp
 					isAdmin={data?.user.roles?.includes('admin')}
 					userId={data?.user._id}
 					username={user.username}
-					isFederatedUser={isUserFederated(data?.user as unknown as IUser)}
+					isFederatedUser={isUserFederated(data?.user)}
 					onChange={onChange}
 					onReload={onReload}
 					tab={tab}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index bf426aede962..241837efa32a 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,7 +1,6 @@
 import type { IRole } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-// import { MultiSelectCustom } from '@rocket.chat/ui-client';
 import type { OptionProp } from '@rocket.chat/ui-client';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MutableRefObject } from 'react';
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 1fca88676381..fe7df8092cc5 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -1,10 +1,11 @@
 import { UserStatus as Status, isUserFederated } from '@rocket.chat/core-typings';
-import type { IRole, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IUser, Serialized } from '@rocket.chat/core-typings';
 import { Box, Button, Menu, Option } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { PickedUser } from '@rocket.chat/rest-typings';
 import { useTranslation } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { Roles } from '../../../../../app/models/client';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
@@ -20,7 +21,7 @@ import { useResetTOTPAction } from '../hooks/useResetTOTPAction';
 import { useSendWelcomeEmailMutation } from '../hooks/useSendWelcomeEmailMutation';
 
 type UsersTableRowProps = {
-	user: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'emails' | 'active' | 'avatarETag' | 'roles'>;
+	user: Serialized<PickedUser>;
 	onClick: (id: IUser['_id'], e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => void;
 	mediaQuery: boolean;
 	refetchUsers: () => void;
@@ -30,8 +31,22 @@ type UsersTableRowProps = {
 
 const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab }: UsersTableRowProps): ReactElement => {
 	const t = useTranslation();
-	const { _id, emails, username, name, status, roles, active, avatarETag } = user;
-	const registrationStatusText = active ? t('Active') : t('Deactivated');
+	const { _id, emails, username, name, status, roles, active, avatarETag, lastLogin, type } = user;
+	const registrationStatusText = useMemo(() => {
+		const usersExcludedFromPending = ['bot', 'app'];
+
+		if (!lastLogin && !usersExcludedFromPending.includes(type)) {
+			return t('Pending');
+		}
+
+		if (active && lastLogin) {
+			return t('Active');
+		}
+
+		if (!active && lastLogin) {
+			return t('Deactivated');
+		}
+	}, [active, lastLogin, t, type]);
 
 	const roleNames = (roles || [])
 		.map((roleId) => (Roles.findOne(roleId, { fields: { name: 1 } }) as IRole | undefined)?.name)
@@ -55,26 +70,21 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 	const resetE2EKeyAction = useResetE2EEKeyAction(userId);
 	const resendWelcomeEmail = useSendWelcomeEmailMutation();
 
+	const isNotPendingDeactivatedNorFederated = tab !== 'pending' && tab !== 'deactivated' && !isFederatedUser;
 	const menuOptions = {
-		...(tab !== 'pending' &&
-			tab !== 'deactivated' &&
-			changeAdminStatusAction &&
-			!isFederatedUser && {
+		...(isNotPendingDeactivatedNorFederated &&
+			changeAdminStatusAction && {
 				makeAdmin: {
 					label: { label: changeAdminStatusAction.label, icon: changeAdminStatusAction.icon },
 					action: changeAdminStatusAction.action,
 				},
 			}),
-		...(tab !== 'pending' &&
-			tab !== 'deactivated' &&
-			resetE2EKeyAction &&
-			!isFederatedUser && {
+		...(isNotPendingDeactivatedNorFederated &&
+			resetE2EKeyAction && {
 				resetE2EKey: { label: { label: resetE2EKeyAction.label, icon: resetE2EKeyAction.icon }, action: resetE2EKeyAction.action },
 			}),
-		...(tab !== 'pending' &&
-			tab !== 'deactivated' &&
-			resetTOTPAction &&
-			!isFederatedUser && {
+		...(isNotPendingDeactivatedNorFederated &&
+			resetTOTPAction && {
 				resetTOTP: { label: { label: resetTOTPAction.label, icon: resetTOTPAction.icon }, action: resetTOTPAction.action },
 			}),
 		...(changeUserStatusAction &&
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index 9ae696f44889..31654a40e64e 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -1,5 +1,6 @@
 import type { IRocketChatRecord } from './IRocketChatRecord';
 import type { IRole } from './IRole';
+import type { Serialized } from './Serialized';
 import type { UserStatus } from './UserStatus';
 
 export interface ILoginToken {
@@ -188,7 +189,7 @@ export interface IRegisterUser extends IUser {
 }
 
 export const isRegisterUser = (user: IUser): user is IRegisterUser => user.username !== undefined && user.name !== undefined;
-export const isUserFederated = (user: Partial<IUser>) => 'federated' in user && user.federated === true;
+export const isUserFederated = (user: Partial<IUser> | Partial<Serialized<IUser>>) => 'federated' in user && user.federated === true;
 
 export type IUserDataEvent = {
 	id: unknown;
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 5179ca6b4774..6b135c278645 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -112,6 +112,11 @@ export type UserPresence = Readonly<
 
 export type UserPersonalTokens = Pick<IPersonalAccessToken, 'name' | 'lastTokenPart' | 'bypassTwoFactor'> & { createdAt: string };
 
+export type PickedUser = Pick<
+	IUser,
+	'_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag' | 'lastLogin' | 'type'
+>;
+
 export type UsersEndpoints = {
 	'/v1/users.2fa.enableEmail': {
 		POST: () => void;
@@ -141,13 +146,13 @@ export type UsersEndpoints = {
 
 	'/v1/users.list': {
 		GET: (params: PaginatedRequest<{ fields: string }>) => PaginatedResult<{
-			users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[];
+			users: PickedUser[];
 		}>;
 	};
 
 	'/v1/users.list/:status': {
 		GET: (params: UsersListStatusParamsGET) => PaginatedResult<{
-			users: Pick<IUser, '_id' | 'username' | 'name' | 'status' | 'roles' | 'emails' | 'active' | 'avatarETag'>[];
+			users: PickedUser[];
 		}>;
 	};
 

From 83138d670cd519c8dce842bd64f0f2c20d91bd17 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 14:07:41 -0300
Subject: [PATCH 39/61] fix: removing exceeding keys

---
 apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json    | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json | 3 +--
 apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json    | 3 +--
 19 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
index 6ea4bdb87092..fb84d9f5aa2d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -3833,7 +3833,6 @@
   "Set_as_moderator": "تعيين كمشرف",
   "Set_as_owner": "تعيين كمالك",
   "Upload_app": "تحميل التطبيق",
-  "Set_random_password_and_send_by_email": "تعيين كلمة مرور عشوائية وإرسالها عبر البريد الإلكتروني",
   "set-leader": "تعيين القائد",
   "set-leader_description": "إذن لتعيين مستخدمين آخرين كقائد لإحدى القنوات",
   "set-moderator": "تعيين المشرف",
@@ -4885,4 +4884,4 @@
   "Enterprise": "مؤسسة",
   "UpgradeToGetMore_engagement-dashboard_Title": "التحليلات",
   "UpgradeToGetMore_auditing_Title": "تدقيق الرسائل"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
index a616e29ec243..80f59ccdf33b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -3767,7 +3767,6 @@
   "Set_as_moderator": "Fes-lo moderador",
   "Set_as_owner": "Establir com a propietari",
   "Upload_app": "Pujar l'Aplicació",
-  "Set_random_password_and_send_by_email": "Establir una contrasenya aleatòria i envieu-la per correu electrònic",
   "set-leader": "Establir com a líder",
   "set-leader_description": "Permís per establir a altres usuaris com a líders d'un canal",
   "set-moderator": "Assignar moderador",
@@ -4689,4 +4688,4 @@
   "Enterprise": "Empresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analítiques",
   "UpgradeToGetMore_auditing_Title": "Auditoria de missatges"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
index 549ba83d112e..c7fe0866dcc4 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -3198,7 +3198,6 @@
   "Set_as_moderator": "Nastavit jako moderátora",
   "Set_as_owner": "Nastavit jako vlastníka",
   "Upload_app": "Nahrát aplikaci",
-  "Set_random_password_and_send_by_email": "Nastavit náhodné heslo a odeslat emailem",
   "set-leader": "Nastavit vedoucího",
   "set-moderator": "Nastavit moderátora",
   "set-moderator_description": "Právo nastavit uživatele jako moderátora místnosti",
@@ -3964,4 +3963,4 @@
   "Enterprise": "Korporace",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika",
   "UpgradeToGetMore_auditing_Title": "Audit zpráv"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
index 225754859130..6776a4bec427 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
@@ -3217,7 +3217,6 @@
   "Set_as_moderator": "Indstil som moderator",
   "Set_as_owner": "Sæt som ejer",
   "Upload_app": "Upload-app",
-  "Set_random_password_and_send_by_email": "Vælg tilfældig adgangskode og send via e-mail",
   "set-leader": "Vælg som leder",
   "set-moderator": "Indstil Moderator",
   "set-moderator_description": "Tilladelse til at indstille andre brugere som moderator for en kanal",
@@ -3986,4 +3985,4 @@
   "Enterprise": "Firma",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyse",
   "UpgradeToGetMore_auditing_Title": "Meddelelsesovervågning"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
index 105212ee228d..5a7c3e38cf06 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -4315,7 +4315,6 @@
   "Set_as_moderator": "Zum Moderator ernennen",
   "Set_as_owner": "Zum Besitzer machen",
   "Upload_app": "App hochladen",
-  "Set_random_password_and_send_by_email": "Zufallspasswort festlegen und per E-Mail versenden",
   "set-leader": "Diskussionsleiter ernennen",
   "set-leader_description": "Erlaubnis, andere Benutzer als Leiter eines Kanals festzulegen",
   "set-moderator": "Moderator ernennen",
@@ -5515,4 +5514,4 @@
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Nachrichtenüberprüfung"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
index 2e6d369e6fab..56eae13d9a6c 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -3820,7 +3820,6 @@
   "Set_as_moderator": "Establecer como moderador",
   "Set_as_owner": "Establecer como propietario",
   "Upload_app": "Subir aplicación",
-  "Set_random_password_and_send_by_email": "Establecer contraseña aleatoria y enviar por correo electrónico",
   "set-leader": "Establecer líder",
   "set-leader_description": "Permiso para establecer a otros usuarios como líderes de un canal",
   "set-moderator": "Establecer moderador",
@@ -5083,4 +5082,4 @@
   "Unlimited_seats": "Puestos ilimitados",
   "Unlimited_MACs": "Contactos Activos por Mes (MAC) ilimitados",
   "Unlimited_seats_MACs": "Puestos y Contactos Activos por Mes (MAC) ilimitados"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
index 1b25ece07e96..6b9add9bbabb 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -4399,7 +4399,6 @@
   "Set_as_moderator": "Aseta valvojaksi",
   "Set_as_owner": "Aseta omistajaksi",
   "Upload_app": "Lataa sovellus",
-  "Set_random_password_and_send_by_email": "Aseta satunnainen salasana ja lähetä se sähköpostitse",
   "set-leader": "Setin johtaja",
   "set-leader_description": "Lupa asettaa muita käyttäjiä kanavan johtajiksi",
   "set-moderator": "Aseta moderaattori",
@@ -5753,4 +5752,4 @@
   "Theme_Appearence": "Teeman ulkoasu",
   "Enterprise": "Yritys",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
index 27adcf8a29a0..d705a5e0217b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -3829,7 +3829,6 @@
   "Set_as_moderator": "Définir comme modérateur",
   "Set_as_owner": "Définir comme propriétaire",
   "Upload_app": "Charger l'application",
-  "Set_random_password_and_send_by_email": "Définir un mot de passe aléatoire et l'envoyer par e-mail",
   "set-leader": "Définir le leader",
   "set-leader_description": "Autorisation de définir d'autres utilisateurs comme leader d'un canal",
   "set-moderator": "Définir le modérateur",
@@ -4885,4 +4884,4 @@
   "Enterprise": "Entreprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analyses",
   "UpgradeToGetMore_auditing_Title": "Audit des messages"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
index 3ee3c0dd7402..68e964c7e78d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -4232,7 +4232,6 @@
   "Set_as_moderator": "Beállítás moderátorként",
   "Set_as_owner": "Beállítás tulajdonosként",
   "Upload_app": "Alkalmazás feltöltése",
-  "Set_random_password_and_send_by_email": "Véletlen jelszó beállítása és küldés e-mailben",
   "set-leader": "Vezető beállítása",
   "set-leader_description": "Jogosultság más felhasználóknak egy csatorna vezetőjeként való beállításához",
   "set-moderator": "Moderátor beállítása",
@@ -5424,4 +5423,4 @@
   "Enterprise": "Vállalati",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika",
   "UpgradeToGetMore_auditing_Title": "Üzenet ellenőrzés"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
index 829552cf80ce..7128ad9b992a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -3795,7 +3795,6 @@
   "Set_as_moderator": "モデレーターとして設定",
   "Set_as_owner": "所有者に設定",
   "Upload_app": "アプリのアップロード",
-  "Set_random_password_and_send_by_email": "ランダムなパスワードを設定してメールで送信",
   "set-leader": "リーダーの設定",
   "set-leader_description": "他のユーザーをチャネルのリーダーとして設定する権限",
   "set-moderator": "モデレーターの設定",
@@ -4835,4 +4834,4 @@
   "Enterprise": "エンタープライズ",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "メッセージ監査"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
index 17fc12f2ba08..42e6719ad045 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ka-GE.i18n.json
@@ -2962,7 +2962,6 @@
   "Set_as_moderator": "მოდერატორად დაყენება",
   "Set_as_owner": "მფლობელად დაყენება",
   "Upload_app": "აპლიკაციის ატვირთვა",
-  "Set_random_password_and_send_by_email": "დააყენეთ შემთხვევითი პაროლი და გაგზავნეთ ელ.ფოსტით",
   "set-leader": "ლიდერის დაყენება",
   "set-moderator": "მოდერატორის დაყენება",
   "set-moderator_description": "სხვა მომხმარებლების არხის მოდერატორად დაყენების უფლება",
@@ -3670,4 +3669,4 @@
   "onboarding.form.registerOfflineForm.title": "ხელით დარეგისტრირება",
   "UpgradeToGetMore_engagement-dashboard_Title": "ანალიტიკა",
   "UpgradeToGetMore_auditing_Title": "შეტყობინებების შემოწმება"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
index b768bd9c565f..b9263a3feed4 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -3257,7 +3257,6 @@
   "Set_as_moderator": "운영자로 설정",
   "Set_as_owner": "소유자로 설정",
   "Upload_app": "앱 업로드",
-  "Set_random_password_and_send_by_email": "임의의 비밀번호를 설정하고 이메일로 전송",
   "set-leader": "주운영자로 설정",
   "set-moderator": "운영자 설정",
   "set-moderator_description": "채널에서 다른 사용자를 운영자로 설정할 권한",
@@ -4028,4 +4027,4 @@
   "Enterprise": "기업",
   "UpgradeToGetMore_engagement-dashboard_Title": "분석(에널리틱스)",
   "UpgradeToGetMore_auditing_Title": "메시지 감사"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
index 7e8cb8095257..0c0400b4b7b1 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -3822,7 +3822,6 @@
   "Set_as_moderator": "Stel in als moderator",
   "Set_as_owner": "Stel in als eigenaar",
   "Upload_app": "App uploaden",
-  "Set_random_password_and_send_by_email": "Stel een willekeurig wachtwoord in en stuur het per e-mail",
   "set-leader": "Leider instellen",
   "set-leader_description": "Toestemming om andere gebruikers in te stellen als leider van een kanaal",
   "set-moderator": "Stel moderator in",
@@ -4873,4 +4872,4 @@
   "Enterprise": "Onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Bericht auditing"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
index 4d60c8b61320..210be9fd0338 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -4164,7 +4164,6 @@
   "Set_as_moderator": "Ustaw jako moderatora",
   "Set_as_owner": "Ustaw jako właściciela",
   "Upload_app": "Prześlij aplikację",
-  "Set_random_password_and_send_by_email": "Ustaw losowe hasło i wyślij je poprzez email",
   "set-leader": "Ustaw lidera",
   "set-leader_description": "Uprawnienie do ustawiania innych użytkowników jako liderów kanału",
   "set-moderator": "Ustaw moderatora",
@@ -5344,4 +5343,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analityka",
   "UpgradeToGetMore_auditing_Title": "Audyt wiadomości"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index b3946e03c603..254d03123008 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -3901,7 +3901,6 @@
   "Set_as_moderator": "Definir como moderador",
   "Set_as_owner": "Definir como proprietário",
   "Upload_app": "Upload de aplicativo",
-  "Set_random_password_and_send_by_email": "Definir senha aleatória e enviar por e-mail",
   "set-leader": "Definir como líder",
   "set-leader_description": "Permissão para definir outros usuários como líder de um canal",
   "set-moderator": "Definir como moderador",
@@ -4979,4 +4978,4 @@
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
   "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
index af6815d14193..1225dcfb5b5a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -3986,7 +3986,6 @@
   "Set_as_moderator": "Назначить модератором",
   "Set_as_owner": "Назначить владельцем",
   "Upload_app": "Загрузить приложение",
-  "Set_random_password_and_send_by_email": "Установить случайный пароль и отправьте его по электронной почте",
   "set-leader": "Назначить лидера",
   "set-leader_description": "Разрешение назначать других пользователей лидерами чата",
   "set-moderator": "Назначить модератора",
@@ -5087,4 +5086,4 @@
   "Enterprise": "Корпорация",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика",
   "UpgradeToGetMore_auditing_Title": "Аудит сообщений"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
index 193ede15f0a8..2b1c24019d8b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -4404,7 +4404,6 @@
   "Set_as_moderator": "Ange som moderator",
   "Set_as_owner": "Ange som ägare",
   "Upload_app": "Ladda upp app",
-  "Set_random_password_and_send_by_email": "Ange slumpmässigt lösenord och skicka via e-post",
   "set-leader": "Ange ledare",
   "set-leader_description": "Behörighet att ange andra användare som ledare för en kanal",
   "set-moderator": "Välj moderator",
@@ -5750,4 +5749,4 @@
   "Theme_Appearence": "Utseende för tema",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index a584f7bf2c61..68edd837db7f 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -3676,7 +3676,6 @@
   "Set_as_moderator": "設置為主持人",
   "Set_as_owner": "設置為擁有者",
   "Upload_app": "上傳應用程式",
-  "Set_random_password_and_send_by_email": "設定隨機密碼然後用電子郵件寄出",
   "set-leader": "指定領導者",
   "set-moderator": "設置主持人",
   "set-moderator_description": "允許將其他使用者設定為頻道主持人",
@@ -4589,4 +4588,4 @@
   "Enterprise": "企業",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "訊息稽核"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
index 77c7482fde16..fb9e64db0596 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -3345,7 +3345,6 @@
   "Set_as_moderator": "设为主持",
   "Set_as_owner": "设为所有者",
   "Upload_app": "上传应用",
-  "Set_random_password_and_send_by_email": "设置随机密码并用邮件发送",
   "set-leader": "设置领导",
   "set-moderator": "设置主持",
   "set-moderator_description": "将其他用户设置为频道主持的权限",
@@ -4136,4 +4135,4 @@
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析",
   "UpgradeToGetMore_auditing_Title": "消息审计"
-}
+}
\ No newline at end of file

From f997dfdcea2c2429e85610ce910dc8429838dbac Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 14:44:42 -0300
Subject: [PATCH 40/61] fix: fixing translation order

---
 apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json    | 4 +---
 apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json    | 6 +++---
 apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json    | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json | 2 +-
 apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json    | 2 +-
 56 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
index 8f7ed56210f3..8aa111f1b3d1 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/af.i18n.json
@@ -2758,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Stuur bevestiging e-pos",
   "Enterprise": "onderneming",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
index fb84d9f5aa2d..437cd5eb6ec8 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ar.i18n.json
@@ -924,7 +924,6 @@
   "Connection_Closed": "تم إغلاق الاتصال",
   "Connection_Reset": "إعادة تعيين الاتصال",
   "Connection_error": "خطأ في الاتصال",
-  "LDAP_Connection_successful": "اتصال LDAP ناجح",
   "Connection_failed": "فشل اتصال LDAP",
   "Connectivity_Services": "خدمات الاتصال",
   "Consulting": "الاستشارات",
@@ -2417,6 +2416,7 @@
   "LDAP_Connection": "الاتصال",
   "LDAP_Connection_Authentication": "المصادقة",
   "LDAP_Connection_Encryption": "التشفير",
+  "LDAP_Connection_successful": "اتصال LDAP ناجح",
   "LDAP_Connection_Timeouts": "المهلات",
   "LDAP_UserSearch": "بحث المستخدم",
   "LDAP_UserSearch_Filter": "عامل تصفية البحث",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
index b698c0591b49..cf56ccaa6d73 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/az.i18n.json
@@ -2758,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Təsdiq e-poçt göndər",
   "Enterprise": "Müəssisə",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
index 24163b1275db..abf8eb32b32b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/be-BY.i18n.json
@@ -2776,4 +2776,4 @@
   "registration.component.form.sendConfirmationEmail": "Адправіць па электроннай пошце пацвярджэнне",
   "Enterprise": "прадпрыемства",
   "UpgradeToGetMore_engagement-dashboard_Title": "аналітыка"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
index 8aeaeaf21c9d..c3546c14d2ad 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bg.i18n.json
@@ -2750,4 +2750,4 @@
   "registration.component.form.sendConfirmationEmail": "Изпратете имейл за потвърждение",
   "Enterprise": "начинание",
   "UpgradeToGetMore_engagement-dashboard_Title": "анализ"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
index 047ae1087117..2154774df837 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bn-IN.i18n.json
@@ -41,4 +41,4 @@
   "add-user": "ব্যবহারকারী যুক্ত করুন",
   "Closed_automatically": "সিস্টেম দ্বারা স্বয়ংক্রিয়ভাবে বন্ধ",
   "Customize": "কাস্টমাইজ করুন"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
index de63876236fe..28e9204051ae 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/bs.i18n.json
@@ -2746,4 +2746,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
index 80f59ccdf33b..c5e245d99983 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ca.i18n.json
@@ -919,7 +919,6 @@
   "Connection_Closed": "Connexió tancada",
   "Connection_Reset": "Connexió restablerta",
   "Connection_error": "Error de connexió",
-  "LDAP_Connection_successful": "Connexió LDAP correcta",
   "Connection_failed": "Error de connexió LDAP",
   "Connectivity_Services": "Serveis de connectivitat",
   "Consulting": "Consultant",
@@ -2391,6 +2390,7 @@
   "LDAP_Connection": "Connexió",
   "LDAP_Connection_Authentication": "Autenticació",
   "LDAP_Connection_Encryption": "Xifrat",
+  "LDAP_Connection_successful": "Connexió LDAP correcta",
   "LDAP_Connection_Timeouts": "Temps d'espera",
   "LDAP_UserSearch": "Cerca d'usuari",
   "LDAP_UserSearch_Filter": "Filtre de cerca",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
index c7fe0866dcc4..4fd8113bd1e8 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/cs.i18n.json
@@ -752,7 +752,6 @@
   "Connect": "Připojit",
   "Connection_Closed": "Připojení bylo uzavřeno",
   "Connection_Reset": "Obnovit připojení",
-  "LDAP_Connection_successful": "LDAP připojení úspěšné",
   "Connectivity_Services": "Služby připojení",
   "Consulting": "Konzultace",
   "Contact": "Kontakt",
@@ -2055,6 +2054,7 @@
   "Layout_Sidenav_Footer_Dark_description": "Velikost zápatí je 260 x 70 pixelů",
   "Layout_Terms_of_Service": "Podmínky služby",
   "LDAP": "LDAP",
+  "LDAP_Connection_successful": "LDAP připojení úspěšné",
   "LDAP_Advanced_Sync": "Pokročilá synchronizace",
   "LDAP_Authentication": "Povolit",
   "LDAP_Authentication_Password": "Heslo",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
index c8bf1d9c81e1..9f6ad98cbfe9 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/cy.i18n.json
@@ -2749,4 +2749,4 @@
   "registration.component.form.sendConfirmationEmail": "Anfon ebost cadarnhad",
   "Enterprise": "Menter",
   "UpgradeToGetMore_engagement-dashboard_Title": "Dadansoddiadau"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
index 6776a4bec427..deed12a0300f 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/da.i18n.json
@@ -756,7 +756,6 @@
   "Connect": "Forbind",
   "Connection_Closed": "Forbindelse lukket",
   "Connection_Reset": "Nulstilning af forbindelse",
-  "LDAP_Connection_successful": "LDAP-forbindelse lykkedes",
   "Connectivity_Services": "Connectivity Services",
   "Consulting": "Rådgivning",
   "Contact": "Kontakt",
@@ -2065,6 +2064,7 @@
   "Layout_Sidenav_Footer_Dark_description": "Footer-størrelse er 260 x 70px",
   "Layout_Terms_of_Service": "Servicevilkår",
   "LDAP": "LDAP",
+  "LDAP_Connection_successful": "LDAP-forbindelse lykkedes",
   "LDAP_Advanced_Sync": "Avanceret synkronisering",
   "LDAP_Authentication": "Aktivér",
   "LDAP_Authentication_Password": "Adgangskode",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
index e6a38d8392c7..f8bef9d0dafc 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de-AT.i18n.json
@@ -2758,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "Bestätigungsmail versenden",
   "Enterprise": "Unternehmen",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
index fa372d08c6ff..fa5e7c722f5e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de-IN.i18n.json
@@ -3102,4 +3102,4 @@
   "Your_question": "Deine Frage",
   "Your_server_link": "Dein Server-Link",
   "Your_workspace_is_ready": "Dein Arbeitsbereich ist einsatzbereit 🎉"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
index 5a7c3e38cf06..ce40337ed88c 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -1045,7 +1045,6 @@
   "Connection_Closed": "Verbindung geschlossen",
   "Connection_Reset": "Verbindung zurücksetzen",
   "Connection_error": "Verbindungsfehler",
-  "LDAP_Connection_successful": "LDAP-Verbindung erfolgreich",
   "Connection_failed": "LDAP-Verbindung fehlgeschlagen",
   "Connectivity_Services": "Verbindungsdienste",
   "Consulting": "Beratung",
@@ -2703,6 +2702,7 @@
   "LDAP_Connection": "Verbindung",
   "LDAP_Connection_Authentication": "Authentifizierung",
   "LDAP_Connection_Encryption": "Verschlüsselung",
+  "LDAP_Connection_successful": "LDAP-Verbindung erfolgreich",
   "LDAP_Connection_Timeouts": "Zeitüberschreitungen",
   "LDAP_UserSearch": "Benutzersuche",
   "LDAP_UserSearch_Filter": "Suchfilter",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
index 07ae9948fd98..3f329c5e973b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/el.i18n.json
@@ -2767,4 +2767,4 @@
   "registration.component.form.sendConfirmationEmail": "Αποστολή email επιβεβαίωσης",
   "Enterprise": "Επιχείρηση",
   "UpgradeToGetMore_engagement-dashboard_Title": "Αναλυτικά στοιχεία"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 4f776f695b3e..c2bc7bf62f5d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -6299,4 +6299,4 @@
   "Seat_limit_reached": "Seat limit reached",
   "Seat_limit_reached_Description": "Your workspace reached its contractual seat limit. Buy more seats to add more users.",
   "Buy_more_seats": "Buy more seats"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
index f95780bfb15d..0e9ba2ee03f3 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/eo.i18n.json
@@ -2759,4 +2759,4 @@
   "registration.component.form.sendConfirmationEmail": "Sendu konfirman retpoŝton",
   "Enterprise": "Entrepreno",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitiko"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
index 56eae13d9a6c..322e5c0b5098 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -930,7 +930,6 @@
   "Connection_Closed": "Conexión cerrada",
   "Connection_Reset": "Conexión restablecida",
   "Connection_error": "Error de conexión",
-  "LDAP_Connection_successful": "Conexión LDAP correcta",
   "Connection_failed": "Error de conexión LDAP",
   "Connectivity_Services": "Servicios de conectividad",
   "Consulting": "Consultoría",
@@ -2411,6 +2410,7 @@
   "LDAP_Connection": "Conexión",
   "LDAP_Connection_Authentication": "Autenticación",
   "LDAP_Connection_Encryption": "Cifrado",
+  "LDAP_Connection_successful": "Conexión LDAP correcta",
   "LDAP_Connection_Timeouts": "Tiempos de espera",
   "LDAP_UserSearch": "Búsqueda de usuarios",
   "LDAP_UserSearch_Filter": "Filtro de búsqueda",
@@ -4903,10 +4903,8 @@
   "subscription.callout.capabilitiesDisabled": "Características desactivadas",
   "subscription.callout.description.limitsExceeded_one": "Su espacio de trabajo ha superado el límite de <1> {{val}} </1>. <3> Administre su suscripción</3> para incrementar los límites.",
   "subscription.callout.description.limitsExceeded_other": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
-  "subscription.callout.description.limitsExceeded_many": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.description.limitsReached_one": "Su espacio de trabajo ha alcanzado el límite <1> {{val}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.description.limitsReached_other": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
-  "subscription.callout.description.limitsReached_many": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.allPremiumCapabilitiesDisabled": "Todas las funciones premium desactivadas",
   "subscription.callout.activeUsers": "puestos",
   "subscription.callout.guestUsers": "invitados",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
index eb81e9f7cd14..8bca5ea0d9f0 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fa.i18n.json
@@ -1666,7 +1666,7 @@
   "Job_Title": "عنوان شغلی",
   "Join": "پیوستن",
   "Join_audio_call": "پیوستن به تماس صوتی",
-  "Join_call":"پیوستن به تماس.",
+  "Join_call": "پیوستن به تماس.",
   "Join_Chat": "عضویت در چت",
   "Join_default_channels": "پیوستن به کانال های پیشفرض",
   "Join_the_Community": "پیوستن به جامعه",
@@ -2949,7 +2949,7 @@
   "Video_Conference": "ویدیو کنفرانس",
   "Video_message": "پیام ویدویی",
   "Videocall_declined": "تماس ویدیویی  رد شد",
-  "video_livechat_started": "شروع یک تماس ویدیویی." ,
+  "video_livechat_started": "شروع یک تماس ویدیویی.",
   "View_mode": "شیوه نمایش",
   "View_All": "مشاهده همه",
   "View_Logs": "نمایش سیاهههای مربوط",
@@ -3106,4 +3106,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "کانال همه‌کاره",
   "Enterprise": "شرکت، پروژه",
   "UpgradeToGetMore_engagement-dashboard_Title": "تجزیه و تحلیل ترافیک"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
index 6b9add9bbabb..1874f64be9b3 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fi.i18n.json
@@ -1066,7 +1066,6 @@
   "Connection_Closed": "Yhteys katkaistu",
   "Connection_Reset": "Yhteyden nollaus",
   "Connection_error": "Yhteysvirhe",
-  "LDAP_Connection_successful": "LDAP-yhteys onnistui",
   "Connection_failed": "LDAP-yhteys epäonnistui",
   "Connectivity_Services": "Yhteyspalvelut",
   "Consulting": "Konsultointi",
@@ -2748,6 +2747,7 @@
   "LDAP_Connection": "Yhteys",
   "LDAP_Connection_Authentication": "Todennus",
   "LDAP_Connection_Encryption": "Salaus",
+  "LDAP_Connection_successful": "LDAP-yhteys onnistui",
   "LDAP_Connection_Timeouts": "Aikakatkaisut",
   "LDAP_UserSearch": "Käyttäjähaku",
   "LDAP_UserSearch_Filter": "Hakusuodatin",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
index d705a5e0217b..4f9baa0645f8 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/fr.i18n.json
@@ -927,7 +927,6 @@
   "Connection_Closed": "Connexion fermée",
   "Connection_Reset": "Connexion réinitialisée",
   "Connection_error": "Erreur de connexion",
-  "LDAP_Connection_successful": "Connexion LDAP réussie",
   "Connection_failed": "Échec de la connexion LDAP",
   "Connectivity_Services": "Services de connectivité",
   "Consulting": "Conseil",
@@ -2411,6 +2410,7 @@
   "LDAP_Connection": "Connexion",
   "LDAP_Connection_Authentication": "Authentification",
   "LDAP_Connection_Encryption": "Chiffrement",
+  "LDAP_Connection_successful": "Connexion LDAP réussie",
   "LDAP_Connection_Timeouts": "Dépassements de délai",
   "LDAP_UserSearch": "Recherche utilisateur",
   "LDAP_UserSearch_Filter": "Filtre de recherche",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
index e6066c1dbf6a..6ce3bb4cfee0 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/he.i18n.json
@@ -1535,4 +1535,4 @@
   "registration.component.form.confirmPassword": "אמת את הסיסמה שלך",
   "registration.component.form.sendConfirmationEmail": "שליחת דוא״ל אימות",
   "UpgradeToGetMore_engagement-dashboard_Title": "סטטיסטיקה"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
index 1cb035d8252e..e61c837482ce 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/hr.i18n.json
@@ -2895,4 +2895,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošalji potvrdni email",
   "Enterprise": "Poduzeće",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitika"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
index 68e964c7e78d..b6fda6374583 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/hu.i18n.json
@@ -1027,7 +1027,6 @@
   "Connection_Closed": "Kapcsolat lezárva",
   "Connection_Reset": "Kapcsolat visszaállítva",
   "Connection_error": "Kapcsolódási hiba",
-  "LDAP_Connection_successful": "Az LDAP-kapcsolat sikeres",
   "Connection_failed": "Az LDAP-kapcsolat sikertelen",
   "Connectivity_Services": "Kapcsolódási szolgáltatások",
   "Consulting": "Tanácsadás",
@@ -2641,6 +2640,7 @@
   "LDAP_Connection": "Kapcsolat",
   "LDAP_Connection_Authentication": "Hitelesítés",
   "LDAP_Connection_Encryption": "Titkosítás",
+  "LDAP_Connection_successful": "Az LDAP-kapcsolat sikeres",
   "LDAP_Connection_Timeouts": "Időkorlátok",
   "LDAP_UserSearch": "Felhasználó keresése",
   "LDAP_UserSearch_Filter": "Keresési szűrő",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
index 5570fe19d328..a31c2d029df3 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/id.i18n.json
@@ -2768,4 +2768,4 @@
   "registration.component.form.sendConfirmationEmail": "Kirim email konfirmasi",
   "Enterprise": "Perusahaan",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
index cef2358652bc..26ba6bcf0d86 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/it.i18n.json
@@ -2861,4 +2861,4 @@
   "registration.component.form.sendConfirmationEmail": "Invia email di conferma",
   "Enterprise": "impresa",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
index 7128ad9b992a..f6554229e352 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ja.i18n.json
@@ -914,7 +914,6 @@
   "Connection_Closed": "接続が閉じられました",
   "Connection_Reset": "接続のリセット",
   "Connection_error": "接続エラー",
-  "LDAP_Connection_successful": "LDAP接続に成功しました",
   "Connection_failed": "LDAP接続が失敗しました",
   "Connectivity_Services": "接続サービス",
   "Consulting": "コンサルティング",
@@ -2388,6 +2387,7 @@
   "LDAP_Connection": "接続",
   "LDAP_Connection_Authentication": "認証",
   "LDAP_Connection_Encryption": "暗号化",
+  "LDAP_Connection_successful": "LDAP接続に成功しました",
   "LDAP_Connection_Timeouts": "タイムアウト",
   "LDAP_UserSearch": "ユーザー検索",
   "LDAP_UserSearch_Filter": "検索フィルター",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
index be322ff0d131..517a76b78b05 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/km.i18n.json
@@ -3115,4 +3115,4 @@
   "Enterprise": "សហគ្រាស",
   "UpgradeToGetMore_engagement-dashboard_Title": "វិភាគ",
   "UpgradeToGetMore_auditing_Title": "សវនកម្មសារ"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
index b9263a3feed4..a95281f1b69e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ko.i18n.json
@@ -794,7 +794,6 @@
   "Connect": "연결",
   "Connection_Closed": "연결이 닫혔습니다.",
   "Connection_Reset": "연결 재설정",
-  "LDAP_Connection_successful": "LDAP 연결 성공",
   "Connectivity_Services": "연결 서비스",
   "Consulting": "컨설팅",
   "Contact": "연락처",
@@ -2112,6 +2111,7 @@
   "Layout_Sidenav_Footer_Dark_description": "바닥글 크기는 260x70 입니다.",
   "Layout_Terms_of_Service": "이용약관",
   "LDAP": "LDAP",
+  "LDAP_Connection_successful": "LDAP 연결 성공",
   "LDAP_Advanced_Sync": "고급 동기화",
   "LDAP_Authentication": "사용",
   "LDAP_Authentication_Password": "비밀번호",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
index 29b9b8b4ec31..3c7f26f87905 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ku.i18n.json
@@ -2748,4 +2748,4 @@
   "registration.component.form.sendConfirmationEmail": "ئیمەیڵی پشتڕاستکردنەوە بنێرە",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
index 85e2ec916227..4411b591ec3d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lo.i18n.json
@@ -2796,4 +2796,4 @@
   "registration.component.form.sendConfirmationEmail": "ສົ່ງອີເມວການຢືນຢັນ",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "ການວິເຄາະ"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
index f8f48297e0f9..4e6ec775dd1f 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lt.i18n.json
@@ -2813,4 +2813,4 @@
   "registration.component.form.sendConfirmationEmail": "Siųsti patvirtinimo el. Laišką",
   "Enterprise": "Įmonė",
   "UpgradeToGetMore_engagement-dashboard_Title": "\"Analytics\""
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
index cc841d39cff9..046b8edeec5a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/lv.i18n.json
@@ -2754,4 +2754,4 @@
   "registration.component.form.sendConfirmationEmail": "Nosūtīt apstiprinājuma e-pastu",
   "Enterprise": "Uzņēmums",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analītika"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
index d9d5c4f138d2..63b32a48298f 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/mn.i18n.json
@@ -2747,4 +2747,4 @@
   "registration.component.form.sendConfirmationEmail": "Баталгаажуулах имэйл илгээх",
   "Enterprise": "Аж ахуйн нэгж",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитик"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
index fb355d358ccc..f4ea7a771aca 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ms-MY.i18n.json
@@ -2764,4 +2764,4 @@
   "registration.component.form.sendConfirmationEmail": "Hantar e-mel pengesahan",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analisis"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
index 0c0400b4b7b1..abf4c97047b6 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/nl.i18n.json
@@ -922,7 +922,6 @@
   "Connection_Closed": "Verbinding gesloten",
   "Connection_Reset": "Verbinding gereset",
   "Connection_error": "Verbindingsfout",
-  "LDAP_Connection_successful": "LDAP-verbinding geslaagd",
   "Connection_failed": "LDAP-verbinding mislukt",
   "Connectivity_Services": "Connectiviteitsdiensten",
   "Consulting": "Consultant",
@@ -2405,6 +2404,7 @@
   "LDAP_Connection": "Verbinding",
   "LDAP_Connection_Authentication": "Authenticatie",
   "LDAP_Connection_Encryption": "Encryptie",
+  "LDAP_Connection_successful": "LDAP-verbinding geslaagd",
   "LDAP_Connection_Timeouts": "Time-outs",
   "LDAP_UserSearch": "Gebruikers zoeken",
   "LDAP_UserSearch_Filter": "Zoekfilter",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
index 1be32f0d4ef8..85f4b1991958 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -2976,4 +2976,4 @@
   "registration.component.form.sendConfirmationEmail": "Send bekreftelses-e-post",
   "Enterprise": "Bedriften",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
index 210be9fd0338..15afcbd28f0a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pl.i18n.json
@@ -1006,7 +1006,6 @@
   "Connection_Closed": "Połączenie zamknięte",
   "Connection_Reset": "Reset połączenia",
   "Connection_error": "Błąd połączenia",
-  "LDAP_Connection_successful": "Nawiązano połączenie z LDAP",
   "Connection_failed": "Nie można nawiązać połączenia z LDAP",
   "Connectivity_Services": "Usługi łączności",
   "Consulting": "Doradztwo",
@@ -2601,6 +2600,7 @@
   "LDAP_Connection": "Połączenie",
   "LDAP_Connection_Authentication": "Autentykacja",
   "LDAP_Connection_Encryption": "Szyforwanie",
+  "LDAP_Connection_successful": "Nawiązano połączenie z LDAP",
   "LDAP_Connection_Timeouts": "Timeout'y",
   "LDAP_UserSearch": "Wyszukiwanie użytkowników",
   "LDAP_UserSearch_Filter": "Filtr wyszukiwania",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 254d03123008..4bd534edb27b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -964,7 +964,6 @@
   "Connection_Closed": "Conexão fechada",
   "Connection_Reset": "Redefinição de conexão",
   "Connection_error": "Erro de conexão",
-  "LDAP_Connection_successful": "Conexão com LDAP bem-sucedida",
   "Connection_failed": "Falha na conexão com o LDAP",
   "Connectivity_Services": "Serviços de conectividade",
   "Consulting": "Consultoria",
@@ -2460,6 +2459,7 @@
   "LDAP_Connection": "Conexão",
   "LDAP_Connection_Authentication": "Autenticação",
   "LDAP_Connection_Encryption": "Criptografia",
+  "LDAP_Connection_successful": "Conexão com LDAP bem-sucedida",
   "LDAP_Connection_Timeouts": "Tempos limite",
   "LDAP_UserSearch": "Pesquisa de usuários",
   "LDAP_UserSearch_Filter": "Filtro de pesquisa",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
index ba7177c7159a..bf910a4daa25 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -3175,4 +3175,4 @@
   "registration.component.form.sendConfirmationEmail": "Enviar email de confirmação",
   "Enterprise": "Empreendimento",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
index 947c1fa7a977..d509b69b4130 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ro.i18n.json
@@ -2753,4 +2753,4 @@
   "registration.component.form.sendConfirmationEmail": "Trimite email de confirmare",
   "Enterprise": "Afacere",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
index 1225dcfb5b5a..f7679f13bc41 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ru.i18n.json
@@ -1027,7 +1027,6 @@
   "Connection_Closed": "Соединение закрыто",
   "Connection_Reset": "Сброс соединения",
   "Connection_error": "Ошибка подключения",
-  "LDAP_Connection_successful": "Подключение к LDAP успешное",
   "Connection_failed": "Сбой подключения LDAP",
   "Connectivity_Services": "Connectivity Services",
   "Consulting": "Консалтинг",
@@ -2551,6 +2550,7 @@
   "LDAP_Connection": "Подключение",
   "LDAP_Connection_Authentication": "Аутентификация",
   "LDAP_Connection_Encryption": "Шифрование",
+  "LDAP_Connection_successful": "Подключение к LDAP успешное",
   "LDAP_Connection_Timeouts": "Время ожидания",
   "LDAP_UserSearch": "Поиск пользователя",
   "LDAP_UserSearch_Filter": "Фильтр поиска",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
index e7944bf98810..b7d05585489b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sk-SK.i18n.json
@@ -2763,4 +2763,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlite potvrdzovací e-mail",
   "Enterprise": "podnik",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytika"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
index cf0332fa5594..eccb9f24a9e5 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sl-SI.i18n.json
@@ -2743,4 +2743,4 @@
   "registration.component.form.sendConfirmationEmail": "Pošlji potrditveno e-poštno sporočilo",
   "Enterprise": "Podjetje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analiza"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
index ae7bdcc30433..00734cbd908a 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sq.i18n.json
@@ -2754,4 +2754,4 @@
   "registration.component.form.sendConfirmationEmail": "Dërgo email konfirmimi",
   "Enterprise": "Ndërmarrje",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analitikë"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
index 2d82f87503df..2dd6d5f4e396 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sr.i18n.json
@@ -2564,4 +2564,4 @@
   "registration.component.form.sendConfirmationEmail": "Пошаљи потврдну поруку",
   "Enterprise": "Предузеће",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналитика"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
index 2b1c24019d8b..6766abba58cb 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/sv.i18n.json
@@ -1063,7 +1063,6 @@
   "Connection_Closed": "Anslutningen är stängd",
   "Connection_Reset": "Anslutning återställd",
   "Connection_error": "Anslutningsfel",
-  "LDAP_Connection_successful": "LDAP-anslutningen har upprättats",
   "Connection_failed": "LDAP-anslutningen kunde inte upprättas",
   "Connectivity_Services": "Anslutningstjänster",
   "Consulting": "Consulting",
@@ -2747,6 +2746,7 @@
   "LDAP_Connection": "Anslutning",
   "LDAP_Connection_Authentication": "Autentisering",
   "LDAP_Connection_Encryption": "Kryptering",
+  "LDAP_Connection_successful": "LDAP-anslutningen har upprättats",
   "LDAP_Connection_Timeouts": "Tidsgränser",
   "LDAP_UserSearch": "Användarsökning",
   "LDAP_UserSearch_Filter": "Sökfilter",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
index 0ecfdc92aa45..8cd5d8a840b4 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ta-IN.i18n.json
@@ -2758,4 +2758,4 @@
   "registration.component.form.sendConfirmationEmail": "உறுதிப்படுத்தும் மின்னஞ்சல் அனுப்பவும்",
   "Enterprise": "நிறுவன",
   "UpgradeToGetMore_engagement-dashboard_Title": "அனலிட்டிக்ஸ்"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
index 83a37a1cc346..c966c182f7e0 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/th-TH.i18n.json
@@ -2741,4 +2741,4 @@
   "registration.component.form.sendConfirmationEmail": "ส่งอีเมลยืนยัน",
   "Enterprise": "องค์กร",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
index 9a0a5219547e..154d30a9e2a2 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/tr.i18n.json
@@ -3265,4 +3265,4 @@
   "RegisterWorkspace_Features_Omnichannel_Title": "Çoklu Kanal",
   "Enterprise": "Kuruluş",
   "UpgradeToGetMore_engagement-dashboard_Title": "Mantıksal Analiz"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
index 6dcfeb1d7a94..203715c9df31 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/ug.i18n.json
@@ -1243,4 +1243,4 @@
   "registration.component.form.confirmPassword": "مەخپىي نومۇرنى جەزملەشتۈرۈش",
   "registration.component.form.sendConfirmationEmail": "جەزملەشتۈرگەن ئىلخەت يوللاندى",
   "UpgradeToGetMore_engagement-dashboard_Title": "ئانالىز قىلىش"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
index 1a3d42e871b0..6383943f157e 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/uk.i18n.json
@@ -3351,4 +3351,4 @@
   "Enterprise": "Підприємство",
   "UpgradeToGetMore_engagement-dashboard_Title": "Аналітика",
   "UpgradeToGetMore_auditing_Title": "Аудит повідомлень"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
index 999ad8bf1f90..c864bb7d0f48 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/vi-VN.i18n.json
@@ -2852,4 +2852,4 @@
   "registration.component.form.sendConfirmationEmail": "Gửi email xác nhận",
   "Enterprise": "Doanh nghiệp",
   "UpgradeToGetMore_engagement-dashboard_Title": "phân tích"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
index 8725bfdaf76e..b898f1ef9b71 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-HK.i18n.json
@@ -2773,4 +2773,4 @@
   "registration.component.form.sendConfirmationEmail": "已发送确认电子邮件",
   "Enterprise": "企业",
   "UpgradeToGetMore_engagement-dashboard_Title": "分析"
-}
+}
\ No newline at end of file
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
index 68edd837db7f..4b5ef1fa810d 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh-TW.i18n.json
@@ -913,7 +913,6 @@
   "Connection_Closed": "連接關閉",
   "Connection_Reset": "連線重置",
   "Connection_error": "連線錯誤",
-  "LDAP_Connection_successful": "LDAP 連接成功",
   "Connection_failed": "LDAP 連線失敗",
   "Connectivity_Services": "連線的服務",
   "Consulting": "諮詢",
@@ -2361,6 +2360,7 @@
   "LDAP_Connection": "連線",
   "LDAP_Connection_Authentication": "驗證",
   "LDAP_Connection_Encryption": "加密",
+  "LDAP_Connection_successful": "LDAP 連接成功",
   "LDAP_Connection_Timeouts": "逾時",
   "LDAP_UserSearch": "使用者搜尋",
   "LDAP_UserSearch_Filter": "搜尋過濾",
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
index fb9e64db0596..2c35341c6ec4 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -808,7 +808,6 @@
   "Connect_SSL_TLS": "使用 SSL/TLS 连接",
   "Connection_Closed": "连接关闭",
   "Connection_Reset": "连接重置",
-  "LDAP_Connection_successful": "LDAP 连接成功",
   "Connectivity_Services": "连接性服务",
   "Consulting": "咨询",
   "Contact": "联系人",
@@ -2150,6 +2149,7 @@
   "Layout_Terms_of_Service": "服务条款",
   "LDAP": "LDAP",
   "LDAP_Description": "LDAP(轻量目录访问协议)是一种层次数据库，常被企业用于提供单点登录机制——该机制允许用户使用同一套帐号密码登录多个网站或服务。想要了解LDAP认证的设置及示例，可参考我们的wiki页： https://rocket.chat/docs/administrator-guides/authentication/ldap/",
+  "LDAP_Connection_successful": "LDAP 连接成功",
   "LDAP_Advanced_Sync": "高级同步",
   "LDAP_Authentication": "启用",
   "LDAP_Authentication_Password": "密码",

From 538ec120911ae6738e82b6e40dc1801374f3a68d Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 15:48:04 -0300
Subject: [PATCH 41/61] fix: users api tests

---
 apps/meteor/tests/end-to-end/api/01-users.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index bbdb675fb16d..bca80a3ee474 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4230,7 +4230,7 @@ describe('[Users]', function () {
 		});
 	});
 
-	describe('[/users.list/:status]', () => {
+	describe.only('[/users.list/:status]', () => {
 		let user;
 		let otherUser;
 		let otherUserCredentials;
@@ -4248,12 +4248,11 @@ describe('[Users]', function () {
 			await updatePermission('view-d-room', ['admin', 'owner', 'moderator', 'user']);
 		});
 
-		it('should list all users', async () => {
-			await login(user.username, password);
-
+		it('should list pending users', async () => {
 			await request
-				.get(api('users.list/all'))
+				.get(api('users.list/pending'))
 				.set(credentials)
+				.query({ count: 50 })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4267,9 +4266,11 @@ describe('[Users]', function () {
 				});
 		});
 
-		it('should list pending users', async () => {
+		it('should list all users', async () => {
+			await login(user.username, password);
+
 			await request
-				.get(api('users.list/pending'))
+				.get(api('users.list/all'))
 				.set(credentials)
 				.expect('Content-Type', 'application/json')
 				.expect(200)
@@ -4309,7 +4310,7 @@ describe('[Users]', function () {
 			await request
 				.get(api('users.list/active'))
 				.set(credentials)
-				.query({ role: 'admin' })
+				.query({ 'roles[]': 'admin' })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4347,8 +4348,6 @@ describe('[Users]', function () {
 		});
 
 		it('should filter users by username', async () => {
-			await login(user.username, password);
-
 			await request
 				.get(api('users.list/all'))
 				.set(credentials)

From b3bf96bde1091b44ed5f2574e2d557793f01c524 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 15:56:44 -0300
Subject: [PATCH 42/61] fix: users api .only()

---
 apps/meteor/tests/end-to-end/api/01-users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index bca80a3ee474..afe61e2a1ddc 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4230,7 +4230,7 @@ describe('[Users]', function () {
 		});
 	});
 
-	describe.only('[/users.list/:status]', () => {
+	describe('[/users.list/:status]', () => {
 		let user;
 		let otherUser;
 		let otherUserCredentials;

From 8b1bce6d448272362d2435e09b73f0ab106b5dc0 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Fri, 19 Jan 2024 16:05:57 -0300
Subject: [PATCH 43/61] fix: remove created user counter

---
 .../client/views/admin/users/AdminUserCreated.tsx   |  4 ++--
 .../client/views/admin/users/AdminUserForm.tsx      | 13 +------------
 .../client/views/admin/users/AdminUsersPage.tsx     | 11 ++---------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
index d6601fce8517..fa48ed187585 100644
--- a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 
 import { ContextualbarEmptyContent } from '../../../components/Contextualbar';
 
-const AdminUserCreated = ({ uid, createdUsersCount }: { uid: string; createdUsersCount: number }) => {
+const AdminUserCreated = ({ uid }: { uid: string }) => {
 	const { t } = useTranslation();
 	const router = useRouter();
 
@@ -13,7 +13,7 @@ const AdminUserCreated = ({ uid, createdUsersCount }: { uid: string; createdUser
 
 	return (
 		<>
-			<ContextualbarEmptyContent icon='user' title={t('You_have_created_user', { count: createdUsersCount })} />
+			<ContextualbarEmptyContent icon='user' title={t('You_have_created_user', { count: 1 })} />
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
 					<Button type='reset' w='50%' onClick={() => router.navigate(`/admin/users/new`)}>
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index a9598234a6f1..ef51f50cfb1e 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -46,7 +46,6 @@ import { useSmtpQuery } from './hooks/useSmtpQuery';
 type AdminUserFormProps = {
 	userData?: Serialized<IUser>;
 	onReload: () => void;
-	setCreatedUsersCount?: React.Dispatch<React.SetStateAction<number>>;
 	context: string;
 	refetchUserFormData?: () => void;
 	roleData: { roles: IRole[] } | undefined;
@@ -84,16 +83,7 @@ const getInitialValue = ({
 	passwordConfirmation: '',
 });
 
-const AdminUserForm = ({
-	userData,
-	onReload,
-	setCreatedUsersCount,
-	context,
-	refetchUserFormData,
-	roleData,
-	roleError,
-	...props
-}: AdminUserFormProps) => {
+const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleData, roleError, ...props }: AdminUserFormProps) => {
 	const t = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
@@ -150,7 +140,6 @@ const AdminUserForm = ({
 			await eventStats({
 				params: [{ eventName: 'updateCounter', settingsId: 'Manual_Entry_User_Count' }],
 			});
-			setCreatedUsersCount?.((prevUsersCount) => prevUsersCount + 1);
 			router.navigate(`/admin/users/created/${_id}`);
 			onReload();
 		},
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index df8a91bcf9cc..e3ed6a16b3bd 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -33,7 +33,6 @@ const AdminUsersPage = (): ReactElement => {
 	const isCreateUserDisabled = useShouldPreventAction('activeUsers');
 
 	const [tab, setTab] = useState<IAdminUserTabs>('all');
-	const [createdUsersCount, setCreatedUsersCount] = useState(0);
 	const [pendingUsersCount, setPendingUsersCount] = useState(0);
 
 	const handleReload = (): void => {
@@ -106,15 +105,9 @@ const AdminUsersPage = (): ReactElement => {
 						<AdminUserFormWithData uid={id} onReload={handleReload} context={context} roleData={data} roleError={error} />
 					)}
 					{!isRoutePrevented && context === 'new' && (
-						<AdminUserForm
-							onReload={handleReload}
-							setCreatedUsersCount={setCreatedUsersCount}
-							context={context}
-							roleData={data}
-							roleError={error}
-						/>
+						<AdminUserForm onReload={handleReload} context={context} roleData={data} roleError={error} />
 					)}
-					{!isRoutePrevented && context === 'created' && id && <AdminUserCreated uid={id} createdUsersCount={createdUsersCount} />}
+					{!isRoutePrevented && context === 'created' && id && <AdminUserCreated uid={id} />}
 					{!isRoutePrevented && context === 'invite' && <AdminInviteUsers />}
 					{isRoutePrevented && <AdminUserUpgrade />}
 				</Contextualbar>

From 407e68d016caee451a4184c9af65fd44eb830f5f Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Fri, 19 Jan 2024 16:35:44 -0300
Subject: [PATCH 44/61] fix: :bug: Uneven users table avatars

Fixed a visual bug in which the avatars of the users table would be uneven due to having too much columns in small screens.
---
 .../admin/users/UsersTable/UsersTable.tsx     | 26 ++++++++++---------
 .../admin/users/UsersTable/UsersTableRow.tsx  |  2 +-
 yarn.lock                                     | 12 ---------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 241837efa32a..6b8c5e6eab8b 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -98,7 +98,7 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 
 	const headers = useMemo(
 		() => [
-			<GenericTableHeaderCell w='x200' key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
+			<GenericTableHeaderCell w='x240' key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
 				{t('Name')}
 			</GenericTableHeaderCell>,
 			mediaQuery && (
@@ -113,16 +113,18 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 					{t('Username')}
 				</GenericTableHeaderCell>
 			),
-			<GenericTableHeaderCell
-				w='x120'
-				key='email'
-				direction={sortDirection}
-				active={sortBy === 'emails.address'}
-				onClick={setSort}
-				sort='emails.address'
-			>
-				{t('Email')}
-			</GenericTableHeaderCell>,
+			mediaQuery && (
+				<GenericTableHeaderCell
+					w='x120'
+					key='email'
+					direction={sortDirection}
+					active={sortBy === 'emails.address'}
+					onClick={setSort}
+					sort='emails.address'
+				>
+					{t('Email')}
+				</GenericTableHeaderCell>
+			),
 			mediaQuery && (
 				<GenericTableHeaderCell w='x120' key='roles' onClick={setSort}>
 					{t('Roles')}
@@ -145,7 +147,7 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 					{t('Pending_action')}
 				</GenericTableHeaderCell>
 			),
-			<GenericTableHeaderCell key='actions' w='x176' />,
+			<GenericTableHeaderCell key='actions' w='x170' />,
 		],
 		[mediaQuery, setSort, sortBy, sortDirection, t, tab],
 	);
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index fe7df8092cc5..837ea084c5da 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -161,7 +161,7 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 				</GenericTableCell>
 			)}
 
-			<GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>
+			{mediaQuery && <GenericTableCell withTruncatedText>{emails?.length && emails[0].address}</GenericTableCell>}
 			{mediaQuery && <GenericTableCell withTruncatedText>{roleNames}</GenericTableCell>}
 			{tab === 'all' && (
 				<GenericTableCell fontScale='p2' color='hint' withTruncatedText>
diff --git a/yarn.lock b/yarn.lock
index 5953649266f6..93ace4f75e01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9147,18 +9147,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-hooks@npm:^0.33.0":
-  version: 0.33.0
-  resolution: "@rocket.chat/fuselage-hooks@npm:0.33.0"
-  dependencies:
-    use-sync-external-store: ~1.2.0
-  peerDependencies:
-    "@rocket.chat/fuselage-tokens": "*"
-    react: ^17.0.2
-  checksum: addf78db893c3185d4d5fc347e1aa81710e0939505a08db77e524740d05555c5e8556d2b6f0e6425270621bdd7230d13278add77ce38197c048af30207cce853
-  languageName: node
-  linkType: hard
-
 "@rocket.chat/fuselage-polyfills@npm:~0.31.25":
   version: 0.31.25
   resolution: "@rocket.chat/fuselage-polyfills@npm:0.31.25"

From 8cfbcd31870fa17a1f651d1fb411916325a29ca4 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Fri, 19 Jan 2024 17:39:10 -0300
Subject: [PATCH 45/61] Fix ci

---
 apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
index 322e5c0b5098..74f76342068b 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -4902,8 +4902,10 @@
   "subscription.callout.servicesDisruptionsOccurring": "Se están produciendo interrupciones en los servicios.",
   "subscription.callout.capabilitiesDisabled": "Características desactivadas",
   "subscription.callout.description.limitsExceeded_one": "Su espacio de trabajo ha superado el límite de <1> {{val}} </1>. <3> Administre su suscripción</3> para incrementar los límites.",
+  "subscription.callout.description.limitsExceeded_many": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.description.limitsExceeded_other": "Su espacio de trabajo ha superado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.description.limitsReached_one": "Su espacio de trabajo ha alcanzado el límite <1> {{val}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
+  "subscription.callout.description.limitsReached_many": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.description.limitsReached_other": "Su espacio de trabajo ha alcanzado los límites <1> {{val, list}} </1>. <3> Administre su suscripción </3> para incrementar los límites.",
   "subscription.callout.allPremiumCapabilitiesDisabled": "Todas las funciones premium desactivadas",
   "subscription.callout.activeUsers": "puestos",

From 492084c8c669596b33108733a3dd4fa472edde1a Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 22 Jan 2024 08:50:53 -0300
Subject: [PATCH 46/61] fix: misc return value

---
 apps/meteor/app/api/server/v1/misc.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index c402d7dd6566..a567045c6b71 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -636,7 +636,7 @@ API.v1.addRoute(
 	{
 		async get() {
 			const smtpConfigured = isSMTPConfigured();
-			return API.v1.success({ smtpConfigured });
+			return API.v1.success({ isSMTPConfigured: smtpConfigured });
 		},
 	},
 );

From 3bac561ba6ec68bf98314027595edf825be26e77 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 22 Jan 2024 09:11:09 -0300
Subject: [PATCH 47/61] fix: change requests

---
 apps/meteor/app/api/server/v1/users.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 437c30105d14..554797eb752a 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -656,8 +656,7 @@ API.v1.addRoute(
 				},
 			);
 
-			const users = await result.cursor.toArray();
-			const total = await result.totalCount;
+			const [users, total] = await Promise.all([result.cursor.toArray(), result.totalCount]);
 
 			return API.v1.success({
 				users,
@@ -678,13 +677,9 @@ API.v1.addRoute(
 	{
 		async post() {
 			const { email } = this.bodyParams;
+			await sendWelcomeEmail(email);
 
-			try {
-				await sendWelcomeEmail(email);
-				return API.v1.success({ success: true });
-			} catch (e: any) {
-				return API.v1.failure({ error: e.message });
-			}
+			return API.v1.success({ success: true });
 		},
 	},
 );

From 03726f8117d1a4ceca1c575de7b122caf3d85f57 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 22 Jan 2024 15:54:25 -0300
Subject: [PATCH 48/61] Update apps/meteor/app/api/server/v1/misc.ts

Co-authored-by: Kevin Aleman <kaleman960@gmail.com>
---
 apps/meteor/app/api/server/v1/misc.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index a567045c6b71..b8c5c06b2eba 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -635,8 +635,7 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
-			const smtpConfigured = isSMTPConfigured();
-			return API.v1.success({ isSMTPConfigured: smtpConfigured });
+			return API.v1.success({ isSMTPConfigured: isSMTPConfigured() });
 		},
 	},
 );

From e4d2e81965c88d74845dd892dc61e453ace89ee8 Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 22 Jan 2024 16:58:31 -0300
Subject: [PATCH 49/61] fix: [/users.sendWelcomeEmail] api tests

---
 apps/meteor/tests/end-to-end/api/01-users.js | 76 ++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index afe61e2a1ddc..02d7b132d873 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4404,4 +4404,80 @@ describe('[Users]', function () {
 				});
 		});
 	});
+
+	describe('[/users.sendWelcomeEmail]', async () => {
+		let user;
+		let otherUser;
+
+		before(async () => {
+			user = await createUser();
+			otherUser = await createUser();
+		});
+
+		after(async () => {
+			await deleteUser(user);
+			await deleteUser(otherUser);
+		});
+
+		it('should send Welcome Email to user', async () => {
+			await updateSetting('SMTP_Host', 'localhost');
+
+			await request
+				.post(api('users.sendWelcomeEmail'))
+				.set(credentials)
+				.send({ email: user.emails[0].address })
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				});
+		});
+
+		it('should fail to send Welcome Email due to SMTP settings missing', async () => {
+			await updateSetting('SMTP_Host', '');
+
+			await request
+				.post(api('users.sendWelcomeEmail'))
+				.set(credentials)
+				.send({ email: user.emails[0].address })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.error).to.be.equal('SMTP is not configured [error-email-send-failed]');
+				});
+		});
+
+		it('should fail to send Welcome Email due to missing param', async () => {
+			await updateSetting('SMTP_Host', '');
+
+			await request
+				.post(api('users.sendWelcomeEmail'))
+				.set(credentials)
+				.send({})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'invalid-params');
+					expect(res.body).to.have.property('error', "must have required property 'email' [invalid-params]");
+				});
+		});
+
+		it('should fail to send Welcome Email due missing user', async () => {
+			await updateSetting('SMTP_Host', 'localhost');
+
+			await request
+				.post(api('users.sendWelcomeEmail'))
+				.set(credentials)
+				.send({ email: 'fake_user32132131231@rocket.chat' })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('errorType', 'error-invalid-user');
+					expect(res.body).to.have.property('error', 'Invalid user [error-invalid-user]');
+				});
+		});
+	});
 });

From 609b53dd11988ddb733fceb8e3800df12866241d Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Mon, 22 Jan 2024 16:58:55 -0300
Subject: [PATCH 50/61] fix: pr change requests

---
 apps/meteor/app/api/server/v1/users.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 554797eb752a..0a2d7ff3b79d 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -644,7 +644,7 @@ API.v1.addRoute(
 				};
 			}
 
-			const result = await Users.findPaginated(
+			const { cursor, totalCount } = await Users.findPaginated(
 				{
 					...match,
 				},
@@ -656,7 +656,7 @@ API.v1.addRoute(
 				},
 			);
 
-			const [users, total] = await Promise.all([result.cursor.toArray(), result.totalCount]);
+			const [users, total] = await Promise.all([cursor.toArray(), totalCount]);
 
 			return API.v1.success({
 				users,
@@ -679,7 +679,7 @@ API.v1.addRoute(
 			const { email } = this.bodyParams;
 			await sendWelcomeEmail(email);
 
-			return API.v1.success({ success: true });
+			return API.v1.success();
 		},
 	},
 );

From 3ad03d43eebfca45890448f7ff31883890ac1be1 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Tue, 23 Jan 2024 18:19:04 -0300
Subject: [PATCH 51/61] refactor: :recycle: Change user.list/:status to
 users.listByStatus

---
 apps/meteor/app/api/server/v1/users.ts        |  5 ++-
 .../admin/users/hooks/useFilteredUsers.ts     |  5 +--
 .../admin/users/hooks/usePendingUsersCount.ts |  4 +--
 apps/meteor/tests/end-to-end/api/01-users.js  | 31 +++++++++++--------
 packages/rest-typings/src/v1/users.ts         |  2 +-
 .../src/v1/users/UsersListStatusParamsGET.ts  |  5 ++-
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 0a2d7ff3b79d..26198390d044 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -560,7 +560,7 @@ API.v1.addRoute(
 );
 
 API.v1.addRoute(
-	'users.list/:status',
+	'users.listByStatus',
 	{
 		authRequired: true,
 		validateParams: isUsersListStatusProps,
@@ -569,9 +569,8 @@ API.v1.addRoute(
 	{
 		async get() {
 			const { offset, count } = await getPaginationItems(this.queryParams);
-			const { status } = this.urlParams;
 			const { sort, fields } = await this.parseJsonQuery();
-			const { roles, searchTerm } = this.queryParams;
+			const { status, roles, searchTerm } = this.queryParams;
 
 			const projection = {
 				name: 1,
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index 7f21d0293769..a01fc9e2d023 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -38,17 +38,18 @@ const useFilteredUsers = ({
 			}
 
 			return {
+				status: tab,
 				searchTerm,
 				roles: selectedRoles,
 				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
 				count: itemsPerPage,
 				offset: searchTerm === prevSearchTerm.current ? current : 0,
 			};
-		}, [current, itemsPerPage, prevSearchTerm, searchTerm, selectedRoles, setCurrent, sortBy, sortDirection]),
+		}, [current, itemsPerPage, prevSearchTerm, searchTerm, selectedRoles, setCurrent, sortBy, sortDirection, tab]),
 		500,
 	);
 
-	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: tab });
+	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
index 35788e927d88..7ec5642b4f03 100644
--- a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -7,12 +7,12 @@ type usePendingUsersCountProps = {
 };
 
 const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePendingUsersCountProps) => {
-	const getUsers = useEndpoint('GET', '/v1/users.list/:status', { status: 'pending' });
+	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
 
 	useQuery(
 		['pendingUsersCount', currentUsersTotal],
 		async () => {
-			const payload = { count: 1, roles: [], searchTerm: '' };
+			const payload = { status: 'pending', count: 1, roles: [], searchTerm: '' };
 			return getUsers(payload);
 		},
 		{
diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 02d7b132d873..cdb7760c0310 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4230,7 +4230,7 @@ describe('[Users]', function () {
 		});
 	});
 
-	describe('[/users.list/:status]', () => {
+	describe('[/users.listByStatus]', () => {
 		let user;
 		let otherUser;
 		let otherUserCredentials;
@@ -4250,9 +4250,9 @@ describe('[Users]', function () {
 
 		it('should list pending users', async () => {
 			await request
-				.get(api('users.list/pending'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
-				.query({ count: 50 })
+				.query({ status: 'pending', count: 50 })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4270,7 +4270,7 @@ describe('[Users]', function () {
 			await login(user.username, password);
 
 			await request
-				.get(api('users.list/all'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
 				.expect('Content-Type', 'application/json')
 				.expect(200)
@@ -4289,8 +4289,9 @@ describe('[Users]', function () {
 			await login(user.username, password);
 
 			await request
-				.get(api('users.list/active'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
+				.query({ status: 'active' })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4308,9 +4309,9 @@ describe('[Users]', function () {
 			await login(user.username, password);
 
 			await request
-				.get(api('users.list/active'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
-				.query({ 'roles[]': 'admin' })
+				.query({ 'status': 'active', 'roles[]': 'admin' })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4332,8 +4333,9 @@ describe('[Users]', function () {
 			});
 
 			await request
-				.get(api('users.list/deactivated'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
+				.query({ status: 'deactivated' })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4349,9 +4351,9 @@ describe('[Users]', function () {
 
 		it('should filter users by username', async () => {
 			await request
-				.get(api('users.list/all'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
-				.query({ searchTerm: user.username })
+				.query({ status: 'all', searchTerm: user.username })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
@@ -4367,8 +4369,9 @@ describe('[Users]', function () {
 
 		it('should return error for invalid status params', async () => {
 			await request
-				.get(api('users.list/abcd'))
+				.get(api('users.listByStatus'))
 				.set(credentials)
+				.query({ status: 'abcd' })
 				.expect('Content-Type', 'application/json')
 				.expect(400)
 				.expect((res) => {
@@ -4381,8 +4384,9 @@ describe('[Users]', function () {
 		it('should throw unauthorized error to user without "view-d-room" permission', async () => {
 			await updatePermission('view-d-room', ['admin']);
 			await request
-				.get(api('users.list/active'))
+				.get(api('users.listByStatus'))
 				.set(otherUserCredentials)
+				.query({ status: 'active' })
 				.expect('Content-Type', 'application/json')
 				.expect(403)
 				.expect((res) => {
@@ -4394,8 +4398,9 @@ describe('[Users]', function () {
 		it('should throw unauthorized error to user without "view-outside-room" permission', async () => {
 			await updatePermission('view-outside-room', ['admin']);
 			await request
-				.get(api('users.list/active'))
+				.get(api('users.listByStatus'))
 				.set(otherUserCredentials)
+				.query({ status: 'active' })
 				.expect('Content-Type', 'application/json')
 				.expect(403)
 				.expect((res) => {
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 6b135c278645..eab2b421a14f 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -150,7 +150,7 @@ export type UsersEndpoints = {
 		}>;
 	};
 
-	'/v1/users.list/:status': {
+	'/v1/users.listByStatus': {
 		GET: (params: UsersListStatusParamsGET) => PaginatedResult<{
 			users: PickedUser[];
 		}>;
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index 721f02570728..b2ebbf717b9d 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,11 +6,14 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { roles: string[]; searchTerm: string } & PaginatedRequest;
+export type UsersListStatusParamsGET = { status: string; roles: string[]; searchTerm: string } & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',
 	properties: {
+		status: {
+			type: 'string',
+		},
 		roles: {
 			type: 'array',
 			items: {

From 50499cdbd17aafcda7f69b141521e66f0fda243e Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Tue, 23 Jan 2024 19:14:10 -0300
Subject: [PATCH 52/61] test: :white_check_mark: Add query param to wrong test

---
 apps/meteor/tests/end-to-end/api/01-users.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index cdb7760c0310..832dfecb0480 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4272,6 +4272,7 @@ describe('[Users]', function () {
 			await request
 				.get(api('users.listByStatus'))
 				.set(credentials)
+				.query({ status: 'all' })
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {

From 784e128ceb8f07bc2b1a0961836eafc67d4953df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrique=20Guimar=C3=A3es=20Ribeiro?=
 <henrique.jobs1@gmail.com>
Date: Thu, 25 Jan 2024 13:38:04 -0300
Subject: [PATCH 53/61] Update .changeset/serious-poets-smash.md

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
---
 .changeset/serious-poets-smash.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.changeset/serious-poets-smash.md b/.changeset/serious-poets-smash.md
index ac6726fa8db9..0bbc770cc7ce 100644
--- a/.changeset/serious-poets-smash.md
+++ b/.changeset/serious-poets-smash.md
@@ -1,6 +1,8 @@
 ---
 "@rocket.chat/meteor": minor
 "@rocket.chat/rest-typings": minor
+"@rocket.chat/core-typings": patch
+"@rocket.chat/ui-client": patch
 ---
 
 New admin user panel to manage users in different status, such as: All, Pending, Active, Deactivated

From 3f459cfcdaef015d1318734ecd4c68c14b36197a Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 25 Jan 2024 15:10:46 -0300
Subject: [PATCH 54/61] fix: adding ajv status validation, types and adapting
 tests cases

---
 apps/meteor/app/api/server/v1/users.ts                     | 6 +++---
 apps/meteor/tests/end-to-end/api/01-users.js               | 4 ++--
 .../rest-typings/src/v1/users/UsersListStatusParamsGET.ts  | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index 26198390d044..8ae9501bbe41 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -586,7 +586,7 @@ API.v1.addRoute(
 				...fields,
 			};
 
-			const actualSort = sort || { username: 1 };
+			const actualSort: Record<string, 1 | -1> = sort || { username: 1 };
 
 			if (sort?.status) {
 				actualSort.active = sort.status;
@@ -596,7 +596,7 @@ API.v1.addRoute(
 				actualSort.nameInsensitive = sort.name;
 			}
 
-			let match;
+			let match: Filter<IUser>;
 
 			switch (status) {
 				case 'active':
@@ -622,7 +622,7 @@ API.v1.addRoute(
 					projection.reason = 1;
 					break;
 				default:
-					throw new Meteor.Error('error-invalid-status', 'Invalid status parameter');
+					throw new Meteor.Error('invalid-params', 'Invalid status parameter');
 			}
 
 			const canSeeAllUserInfo = await hasPermissionAsync(this.userId, 'view-full-other-user-info');
diff --git a/apps/meteor/tests/end-to-end/api/01-users.js b/apps/meteor/tests/end-to-end/api/01-users.js
index 832dfecb0480..70f95b700062 100644
--- a/apps/meteor/tests/end-to-end/api/01-users.js
+++ b/apps/meteor/tests/end-to-end/api/01-users.js
@@ -4377,8 +4377,8 @@ describe('[Users]', function () {
 				.expect(400)
 				.expect((res) => {
 					expect(res.body).to.have.property('success', false);
-					expect(res.body.errorType).to.be.equal('error-invalid-status');
-					expect(res.body.error).to.be.equal('Invalid status parameter [error-invalid-status]');
+					expect(res.body.errorType).to.be.equal('invalid-params');
+					expect(res.body.error).to.be.equal('must be equal to one of the allowed values [invalid-params]');
 				});
 		});
 
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index b2ebbf717b9d..82795fa88e52 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,13 +6,18 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = { status: string; roles: string[]; searchTerm: string } & PaginatedRequest;
+export type UsersListStatusParamsGET = {
+	status: 'active' | 'all' | 'deactivated' | 'pending';
+	roles: string[];
+	searchTerm: string;
+} & PaginatedRequest;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',
 	properties: {
 		status: {
 			type: 'string',
+			enum: ['active', 'all', 'deactivated', 'pending'],
 		},
 		roles: {
 			type: 'array',

From 2d0c3c4245e1601c10442194e6322468766c9c8d Mon Sep 17 00:00:00 2001
From: Hugo Costa <hugocarreiracosta@gmail.com>
Date: Thu, 25 Jan 2024 16:07:55 -0300
Subject: [PATCH 55/61] fix: fix typing

---
 .../views/admin/users/hooks/usePendingUsersCount.ts      | 9 ++++++++-
 .../src/v1/users/UsersListStatusParamsGET.ts             | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
index 7ec5642b4f03..512d353d0949 100644
--- a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -1,3 +1,4 @@
+import type { UsersListStatusParamsGET } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
@@ -12,7 +13,13 @@ const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePe
 	useQuery(
 		['pendingUsersCount', currentUsersTotal],
 		async () => {
-			const payload = { status: 'pending', count: 1, roles: [], searchTerm: '' };
+			const payload: UsersListStatusParamsGET = {
+				status: 'pending',
+				count: 1,
+				roles: [],
+				searchTerm: '',
+			};
+
 			return getUsers(payload);
 		},
 		{
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index 82795fa88e52..5185b96e4d51 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -24,18 +24,23 @@ const UsersListStatusParamsGetSchema = {
 			items: {
 				type: 'string',
 			},
+			nullable: true,
 		},
 		searchTerm: {
 			type: 'string',
+			nullable: true,
 		},
 		sort: {
 			type: 'string',
+			nullable: true,
 		},
 		count: {
 			type: 'number',
+			nullable: true,
 		},
 		offset: {
 			type: 'number',
+			nullable: true,
 		},
 	},
 	additionalProperties: false,

From 7996be04f479be17d6ba2e5eca2fae25471f6615 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 25 Jan 2024 16:33:02 -0300
Subject: [PATCH 56/61] Reviews

---
 apps/meteor/client/views/admin/users/AdminUserCreated.tsx   | 6 ++----
 .../rest-typings/src/v1/users/UsersListStatusParamsGET.ts   | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
index fa48ed187585..8c6c66d404c0 100644
--- a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx
@@ -1,6 +1,6 @@
 import { Button, ButtonGroup, ContextualbarFooter } from '@rocket.chat/fuselage';
 import { useRouter } from '@rocket.chat/ui-contexts';
-import React, { useCallback } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { ContextualbarEmptyContent } from '../../../components/Contextualbar';
@@ -9,8 +9,6 @@ const AdminUserCreated = ({ uid }: { uid: string }) => {
 	const { t } = useTranslation();
 	const router = useRouter();
 
-	const goToUser = useCallback((id) => router.navigate(`/admin/users/info/${id}`), [router]);
-
 	return (
 		<>
 			<ContextualbarEmptyContent icon='user' title={t('You_have_created_user', { count: 1 })} />
@@ -19,7 +17,7 @@ const AdminUserCreated = ({ uid }: { uid: string }) => {
 					<Button type='reset' w='50%' onClick={() => router.navigate(`/admin/users/new`)}>
 						{t('Add_more_users')}
 					</Button>
-					<Button primary w='50%' onClick={() => goToUser(uid)}>
+					<Button primary w='50%' onClick={() => router.navigate(`/admin/users/info/${uid}`)}>
 						{t('Done')}
 					</Button>
 				</ButtonGroup>
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index 82795fa88e52..2f96631edd18 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -6,11 +6,11 @@ const ajv = new Ajv({
 	coerceTypes: true,
 });
 
-export type UsersListStatusParamsGET = {
+export type UsersListStatusParamsGET = PaginatedRequest<{
 	status: 'active' | 'all' | 'deactivated' | 'pending';
 	roles: string[];
 	searchTerm: string;
-} & PaginatedRequest;
+}>;
 
 const UsersListStatusParamsGetSchema = {
 	type: 'object',

From 9d8800a2ba38efcf81d3469e85d576b42ce57dc4 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 25 Jan 2024 16:44:02 -0300
Subject: [PATCH 57/61] refactor: :recycle: Remove unnecessary params from
 query and improve typing

\
---
 .../client/views/admin/users/hooks/usePendingUsersCount.ts   | 2 --
 .../rest-typings/src/v1/users/UsersListStatusParamsGET.ts    | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
index 512d353d0949..4f24e4cd8720 100644
--- a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -16,8 +16,6 @@ const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePe
 			const payload: UsersListStatusParamsGET = {
 				status: 'pending',
 				count: 1,
-				roles: [],
-				searchTerm: '',
 			};
 
 			return getUsers(payload);
diff --git a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
index a63588a156f2..a991790911be 100644
--- a/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
+++ b/packages/rest-typings/src/v1/users/UsersListStatusParamsGET.ts
@@ -8,8 +8,8 @@ const ajv = new Ajv({
 
 export type UsersListStatusParamsGET = PaginatedRequest<{
 	status: 'active' | 'all' | 'deactivated' | 'pending';
-	roles: string[];
-	searchTerm: string;
+	roles?: string[];
+	searchTerm?: string;
 }>;
 
 const UsersListStatusParamsGetSchema = {
@@ -43,6 +43,7 @@ const UsersListStatusParamsGetSchema = {
 			nullable: true,
 		},
 	},
+	required: ['status'],
 	additionalProperties: false,
 };
 

From 2c64eed4cad70693fc8468f2667472c7d49061f9 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Thu, 25 Jan 2024 17:19:13 -0300
Subject: [PATCH 58/61] refactor: :recycle: Invalidate usersPendingCount query
 inside of useMutation

Changed the invalidation call of the pendingUsersCount query from the mutateAsync onSuccess to the useMutation onSuccess.
---
 .../client/views/admin/users/AdminUserForm.tsx      | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index ef51f50cfb1e..12167729830e 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -140,6 +140,9 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 			await eventStats({
 				params: [{ eventName: 'updateCounter', settingsId: 'Manual_Entry_User_Count' }],
 			});
+			queryClient.invalidateQueries(['pendingUsersCount'], {
+				refetchType: 'all',
+			});
 			router.navigate(`/admin/users/created/${_id}`);
 			onReload();
 		},
@@ -155,15 +158,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 			return handleUpdateUser.mutateAsync({ userId: userData?._id, data: userFormData });
 		}
 
-		return handleCreateUser.mutateAsync(
-			{ ...userFormData, fields: '' },
-			{
-				onSuccess: () =>
-					queryClient.invalidateQueries(['pendingUsersCount'], {
-						refetchType: 'all',
-					}),
-			},
-		);
+		return handleCreateUser.mutateAsync({ ...userFormData, fields: '' });
 	});
 
 	const nameId = useUniqueId();

From b80fdd920c7beaf0c3d27aa86c1c5cfdf81b8c3b Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Tue, 30 Jan 2024 17:45:17 -0300
Subject: [PATCH 59/61] Remove setState from inside of useQuery onSuccess

---
 .../views/admin/users/AdminUsersPage.tsx      | 57 +++++++++++---
 .../admin/users/UsersTable/UsersTable.tsx     | 78 +++++++------------
 .../admin/users/UsersTable/UsersTableRow.tsx  |  4 +-
 .../admin/users/hooks/useFilteredUsers.ts     | 54 +++++--------
 .../admin/users/hooks/usePendingUsersCount.ts | 17 +---
 5 files changed, 101 insertions(+), 109 deletions(-)

diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index e3ed6a16b3bd..6e08305cf33d 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -1,12 +1,16 @@
 import { Button, ButtonGroup, ContextualbarIcon, Icon, Tabs, TabsItem } from '@rocket.chat/fuselage';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import type { OptionProp } from '@rocket.chat/ui-client';
 import { usePermission, useRouteParameter, useTranslation, useRouter, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import UserPageHeaderContentWithSeatsCap from '../../../../ee/client/views/admin/users/UserPageHeaderContentWithSeatsCap';
 import { useSeatsCap } from '../../../../ee/client/views/admin/users/useSeatsCap';
 import { Contextualbar, ContextualbarHeader, ContextualbarTitle, ContextualbarClose } from '../../../components/Contextualbar';
+import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import { useShouldPreventAction } from '../../../hooks/useShouldPreventAction';
 import AdminInviteUsers from './AdminInviteUsers';
@@ -17,12 +21,18 @@ import AdminUserInfoWithData from './AdminUserInfoWithData';
 import AdminUserUpgrade from './AdminUserUpgrade';
 import type { IAdminUserTabs } from './IAdminUserTabs';
 import UsersTable from './UsersTable';
+import useFilteredUsers from './hooks/useFilteredUsers';
+import usePendingUsersCount from './hooks/usePendingUsersCount';
+
+export type UsersFilters = {
+	text: string;
+	roles: OptionProp[];
+};
 
 const AdminUsersPage = (): ReactElement => {
 	const t = useTranslation();
 
 	const seatsCap = useSeatsCap();
-	const reload = useRef(() => null);
 
 	const router = useRouter();
 	const context = useRouteParameter('context');
@@ -33,18 +43,39 @@ const AdminUsersPage = (): ReactElement => {
 	const isCreateUserDisabled = useShouldPreventAction('activeUsers');
 
 	const [tab, setTab] = useState<IAdminUserTabs>('all');
-	const [pendingUsersCount, setPendingUsersCount] = useState(0);
-
-	const handleReload = (): void => {
-		seatsCap?.reload();
-		reload.current();
-	};
+	const [userFilters, setUserFilters] = useState<UsersFilters>({ text: '', roles: [] });
 
 	const isRoutePrevented = context && ['new', 'invite'].includes(context) && isCreateUserDisabled;
 
 	const getRoles = useEndpoint('GET', '/v1/roles.list');
 	const { data, error } = useQuery(['roles'], async () => getRoles());
 
+	const paginationData = usePagination();
+	const sortData = useSort<'name' | 'username' | 'emails.address' | 'status'>('name');
+
+	const searchTerm = useDebouncedValue(userFilters.text, 500);
+	const prevSearchTerm = useRef('');
+
+	const filteredUsersQueryResult = useFilteredUsers({
+		searchTerm,
+		prevSearchTerm,
+		sortData,
+		tab,
+		paginationData,
+		selectedRoles: useMemo(() => userFilters.roles.map((role) => role.id), [userFilters.roles]),
+	});
+
+	const pendingUsersCount = usePendingUsersCount(filteredUsersQueryResult.data?.total);
+
+	const handleReload = (): void => {
+		seatsCap?.reload();
+		filteredUsersQueryResult?.refetch();
+	};
+
+	useEffect(() => {
+		prevSearchTerm.current = searchTerm;
+	}, [searchTerm]);
+
 	return (
 		<Page flexDirection='row'>
 			<Page>
@@ -81,7 +112,15 @@ const AdminUsersPage = (): ReactElement => {
 							{t('Deactivated')}
 						</TabsItem>
 					</Tabs>
-					<UsersTable reload={reload} tab={tab} roleData={data} onReload={handleReload} setPendingUsersCount={setPendingUsersCount} />
+					<UsersTable
+						filteredUsersQueryResult={filteredUsersQueryResult}
+						setUserFilters={setUserFilters}
+						roleData={data}
+						tab={tab}
+						onReload={handleReload}
+						paginationData={paginationData}
+						sortData={sortData}
+					/>
 				</PageContent>
 			</Page>
 			{context && (
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 6b8c5e6eab8b..caa7d5638de6 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -1,10 +1,11 @@
-import type { IRole } from '@rocket.chat/core-typings';
+import type { IRole, Serialized } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
-import { useMediaQuery, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import type { OptionProp } from '@rocket.chat/ui-client';
+import { useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import type { PaginatedResult, PickedUser } from '@rocket.chat/rest-typings';
 import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
-import type { ReactElement, MutableRefObject } from 'react';
-import React, { useRef, useMemo, useState, useEffect } from 'react';
+import type { UseQueryResult } from '@tanstack/react-query';
+import type { ReactElement } from 'react';
+import React, { useMemo } from 'react';
 
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -14,61 +15,39 @@ import {
 	GenericTableBody,
 	GenericTableLoadingTable,
 } from '../../../../components/GenericTable';
-import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import type { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
+import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import type { UsersFilters } from '../AdminUsersPage';
 import type { IAdminUserTabs } from '../IAdminUserTabs';
-import useFilteredUsers from '../hooks/useFilteredUsers';
-import usePendingUsersCount from '../hooks/usePendingUsersCount';
 import UsersTableFilters from './UsersTableFilters';
 import UsersTableRow from './UsersTableRow';
 
 type UsersTableProps = {
-	reload: MutableRefObject<() => void>;
 	tab: IAdminUserTabs;
-	onReload: () => void;
 	roleData: { roles: IRole[] } | undefined;
-	setPendingUsersCount: React.Dispatch<React.SetStateAction<number>>;
-};
-
-export type UsersFilters = {
-	text: string;
-	roles: OptionProp[];
+	onReload: () => void;
+	setUserFilters: React.Dispatch<React.SetStateAction<UsersFilters>>;
+	filteredUsersQueryResult: UseQueryResult<PaginatedResult<{ users: Serialized<PickedUser>[] }>>;
+	paginationData: ReturnType<typeof usePagination>;
+	sortData: ReturnType<typeof useSort<'name' | 'username' | 'emails.address' | 'status'>>;
 };
 
-const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: UsersTableProps): ReactElement | null => {
+const UsersTable = ({
+	filteredUsersQueryResult,
+	setUserFilters,
+	roleData,
+	tab,
+	onReload,
+	paginationData,
+	sortData,
+}: UsersTableProps): ReactElement | null => {
 	const t = useTranslation();
 	const router = useRouter();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
-	const [userFilters, setUserFilters] = useState<UsersFilters>({ text: '', roles: [] });
-
-	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
-	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'status'>('name');
-
-	const searchTerm = useDebouncedValue(userFilters.text, 500);
-	const prevSearchTerm = useRef('');
-
-	const { data, isSuccess, refetch, isLoading, isError } = useFilteredUsers({
-		searchTerm,
-		prevSearchTerm,
-		setCurrent,
-		sortBy,
-		sortDirection,
-		itemsPerPage,
-		current,
-		tab,
-		selectedRoles: useMemo(() => userFilters.roles.map((role) => role.id), [userFilters.roles]),
-	});
-
-	usePendingUsersCount({ setPendingUsersCount, currentUsersTotal: data?.total });
-
-	useEffect(() => {
-		reload.current = refetch;
-	}, [refetch, reload]);
-
-	useEffect(() => {
-		prevSearchTerm.current = searchTerm;
-	}, [searchTerm]);
+	const { data, isLoading, isError, isSuccess } = filteredUsersQueryResult;
+	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = paginationData;
+	const { sortBy, sortDirection, setSort } = sortData;
 
 	const isKeyboardEvent = (
 		event: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>,
@@ -170,12 +149,12 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 					<StatesIcon name='warning' variation='danger' />
 					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
 					<StatesActions>
-						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
+						<StatesAction onClick={onReload}>{t('Reload_page')}</StatesAction>
 					</StatesActions>
 				</States>
 			)}
 
-			{isSuccess && data.users?.length === 0 && <GenericNoResults />}
+			{isSuccess && data.users.length === 0 && <GenericNoResults />}
 
 			{isSuccess && !!data.users && (
 				<>
@@ -188,7 +167,6 @@ const UsersTable = ({ reload, tab, roleData, onReload, setPendingUsersCount }: U
 									onClick={handleClickOrKeyDown}
 									mediaQuery={mediaQuery}
 									user={user}
-									refetchUsers={refetch}
 									onReload={onReload}
 									tab={tab}
 								/>
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
index 837ea084c5da..cecdd536c5fc 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableRow.tsx
@@ -24,12 +24,11 @@ type UsersTableRowProps = {
 	user: Serialized<PickedUser>;
 	onClick: (id: IUser['_id'], e: React.MouseEvent<HTMLElement, MouseEvent> | React.KeyboardEvent<HTMLElement>) => void;
 	mediaQuery: boolean;
-	refetchUsers: () => void;
 	onReload: () => void;
 	tab: IAdminUserTabs;
 };
 
-const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab }: UsersTableRowProps): ReactElement => {
+const UsersTableRow = ({ user, onClick, mediaQuery, onReload, tab }: UsersTableRowProps): ReactElement => {
 	const t = useTranslation();
 	const { _id, emails, username, name, status, roles, active, avatarETag, lastLogin, type } = user;
 	const registrationStatusText = useMemo(() => {
@@ -60,7 +59,6 @@ const UsersTableRow = ({ user, onClick, mediaQuery, refetchUsers, onReload, tab
 
 	const onChange = useMutableCallback(() => {
 		onReload();
-		refetchUsers();
 	});
 
 	const changeAdminStatusAction = useChangeAdminStatusAction(userId, isAdmin, onChange);
diff --git a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
index a01fc9e2d023..9b6a145a1d9f 100644
--- a/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useFilteredUsers.ts
@@ -1,4 +1,3 @@
-import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { MutableRefObject } from 'react';
@@ -11,43 +10,30 @@ import type { IAdminUserTabs } from '../IAdminUserTabs';
 type useFilteredUsersOptions = {
 	searchTerm: string;
 	prevSearchTerm: MutableRefObject<string>;
-	setCurrent: ReturnType<typeof usePagination>['setCurrent'];
-	sortBy: ReturnType<typeof useSort>['sortBy'];
-	sortDirection: ReturnType<typeof useSort>['sortDirection'];
-	itemsPerPage: ReturnType<typeof usePagination>['itemsPerPage'];
-	current: ReturnType<typeof usePagination>['current'];
 	tab: IAdminUserTabs;
 	selectedRoles: string[];
+	paginationData: ReturnType<typeof usePagination>;
+	sortData: ReturnType<typeof useSort<'name' | 'username' | 'emails.address' | 'status'>>;
 };
 
-const useFilteredUsers = ({
-	searchTerm,
-	prevSearchTerm,
-	setCurrent,
-	sortBy,
-	sortDirection,
-	itemsPerPage,
-	current,
-	tab,
-	selectedRoles,
-}: useFilteredUsersOptions) => {
-	const payload = useDebouncedValue(
-		useMemo(() => {
-			if (searchTerm !== prevSearchTerm.current) {
-				setCurrent(0);
-			}
-
-			return {
-				status: tab,
-				searchTerm,
-				roles: selectedRoles,
-				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-				count: itemsPerPage,
-				offset: searchTerm === prevSearchTerm.current ? current : 0,
-			};
-		}, [current, itemsPerPage, prevSearchTerm, searchTerm, selectedRoles, setCurrent, sortBy, sortDirection, tab]),
-		500,
-	);
+const useFilteredUsers = ({ searchTerm, prevSearchTerm, sortData, tab, selectedRoles, paginationData }: useFilteredUsersOptions) => {
+	const { setCurrent, itemsPerPage, current } = paginationData;
+	const { sortBy, sortDirection } = sortData;
+
+	const payload = useMemo(() => {
+		if (searchTerm !== prevSearchTerm.current) {
+			setCurrent(0);
+		}
+
+		return {
+			status: tab,
+			searchTerm,
+			roles: selectedRoles,
+			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+			count: itemsPerPage,
+			offset: searchTerm === prevSearchTerm.current ? current : 0,
+		};
+	}, [current, itemsPerPage, prevSearchTerm, searchTerm, selectedRoles, setCurrent, sortBy, sortDirection, tab]);
 
 	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
 
diff --git a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
index 4f24e4cd8720..fe3bf8be124a 100644
--- a/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
+++ b/apps/meteor/client/views/admin/users/hooks/usePendingUsersCount.ts
@@ -2,15 +2,10 @@ import type { UsersListStatusParamsGET } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 
-type usePendingUsersCountProps = {
-	setPendingUsersCount: React.Dispatch<React.SetStateAction<number>>;
-	currentUsersTotal: number | undefined;
-};
-
-const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePendingUsersCountProps) => {
+const usePendingUsersCount = (currentUsersTotal: number | undefined) => {
 	const getUsers = useEndpoint('GET', '/v1/users.listByStatus');
 
-	useQuery(
+	return useQuery(
 		['pendingUsersCount', currentUsersTotal],
 		async () => {
 			const payload: UsersListStatusParamsGET = {
@@ -20,12 +15,8 @@ const usePendingUsersCount = ({ setPendingUsersCount, currentUsersTotal }: usePe
 
 			return getUsers(payload);
 		},
-		{
-			onSuccess: (data) => {
-				setPendingUsersCount(data ? data.total : 0);
-			},
-		},
-	);
+		{ select: (data) => data?.total },
+	).data;
 };
 
 export default usePendingUsersCount;

From 6a9d687a85f7dc39e5a0cb595efb92a8b8330cc6 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Wed, 31 Jan 2024 16:37:11 -0300
Subject: [PATCH 60/61] Typecheck

---
 .../client/views/admin/users/UsersTable/UsersTableFilters.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
index c9a8b8b17b11..9e2b7412ad7e 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -5,7 +5,7 @@ import { MultiSelectCustom } from '@rocket.chat/ui-client';
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { UsersFilters } from './UsersTable';
+import type { UsersFilters } from '../AdminUsersPage';
 
 type UsersTableFiltersProps = {
 	setUsersFilters: React.Dispatch<React.SetStateAction<UsersFilters>>;

From 0b47cdaad610db78fe87fb006a0d6a4f63752ee2 Mon Sep 17 00:00:00 2001
From: rique223 <henrique.jobs1@gmail.com>
Date: Tue, 20 Feb 2024 16:05:08 -0300
Subject: [PATCH 61/61] translation-check

---
 apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
index f6f9e7198eb1..a5dbe2b76acb 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/no.i18n.json
@@ -3680,7 +3680,6 @@
   "Set_as_moderator": "Sett som moderator",
   "Set_as_owner": "Sett som eier",
   "Upload_app": "Last opp app",
-  "Set_random_password_and_send_by_email": "Angi tilfeldig passord og send via e-post",
   "set-moderator": "Sett moderator",
   "set-moderator_description": "Tillatelse til å sette andre brukere som moderator på en kanal",
   "set-owner": "Sett eier",