From 5109cd3590804cd534c064ba632c2d05cb142636 Mon Sep 17 00:00:00 2001
From: Luciano Marcos Pierdona Junior
 <64279791+LucianoPierdona@users.noreply.github.com>
Date: Mon, 27 Jun 2022 08:41:52 -0300
Subject: [PATCH 1/5] Regression: Room Endpoint Call Issues (#25928)

---
 apps/meteor/app/api/server/v1/channels.ts                 | 8 ++++++--
 .../room/contextualBar/Info/RoomInfo/RoomInfoWithData.js  | 6 +++---
 .../views/teams/contextualBar/channels/RoomActions.js     | 6 +++---
 .../views/teams/contextualBar/info/TeamsInfoWithData.js   | 6 +++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/meteor/app/api/server/v1/channels.ts b/apps/meteor/app/api/server/v1/channels.ts
index 484c2a077081..e77826fd14fc 100644
--- a/apps/meteor/app/api/server/v1/channels.ts
+++ b/apps/meteor/app/api/server/v1/channels.ts
@@ -20,7 +20,7 @@ import {
 } from '@rocket.chat/rest-typings';
 
 import { Rooms, Subscriptions, Messages } from '../../../models/server';
-import { hasPermission, hasAllPermission } from '../../../authorization/server';
+import { hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
 import { Team } from '../../../../server/sdk';
@@ -454,7 +454,7 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			if (!hasAllPermission(this.userId, ['create-team', 'edit-room'])) {
+			if (!hasPermission(this.userId, 'create-team')) {
 				return API.v1.unauthorized();
 			}
 
@@ -464,6 +464,10 @@ API.v1.addRoute(
 				return API.v1.failure('The parameter "channelId" or "channelName" is required');
 			}
 
+			if (!hasPermission(this.userId, 'edit-room', channelId)) {
+				return API.v1.unauthorized();
+			}
+
 			const room = findChannelByIdOrName({
 				params: {
 					roomId: channelId,
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfoWithData.js b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfoWithData.js
index adf20054512c..55ba60e259cf 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfoWithData.js
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfoWithData.js
@@ -56,15 +56,15 @@ const RoomInfoWithData = ({ rid, openEditing, onClickBack, onEnterRoom, resetSta
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal());
-	const deleteRoom = useEndpoint('POST', room.t === 'c' ? 'channels.delete' : 'groups.delete');
+	const deleteRoom = useEndpoint('POST', room.t === 'c' ? '/v1/channels.delete' : '/v1/groups.delete');
 	const hideRoom = useMethod('hideRoom');
 	const leaveRoom = useMethod('leaveRoom');
 	const router = useRoute('home');
 
-	const moveChannelToTeam = useEndpointActionExperimental('POST', 'teams.addRooms', t('Rooms_added_successfully'));
+	const moveChannelToTeam = useEndpointActionExperimental('POST', '/v1/teams.addRooms', t('Rooms_added_successfully'));
 	const convertRoomToTeam = useEndpointActionExperimental(
 		'POST',
-		type === 'c' ? 'channels.convertToTeam' : 'groups.convertToTeam',
+		type === 'c' ? '/v1/channels.convertToTeam' : '/v1/groups.convertToTeam',
 		t('Success'),
 	);
 
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/RoomActions.js b/apps/meteor/client/views/teams/contextualBar/channels/RoomActions.js
index c47f2b9bab2f..4f332441ccad 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/RoomActions.js
+++ b/apps/meteor/client/views/teams/contextualBar/channels/RoomActions.js
@@ -30,11 +30,11 @@ const RoomActions = ({ room, reload }) => {
 	const canEditTeamChannel = usePermission('edit-team-channel', rid);
 	const canRemoveTeamChannel = usePermission('remove-team-channel', rid);
 
-	const updateRoomEndpoint = useEndpointActionExperimental('POST', 'teams.updateRoom');
-	const removeRoomEndpoint = useEndpointActionExperimental('POST', 'teams.removeRoom', t('Room_has_been_removed'));
+	const updateRoomEndpoint = useEndpointActionExperimental('POST', '/v1/teams.updateRoom');
+	const removeRoomEndpoint = useEndpointActionExperimental('POST', '/v1/teams.removeRoom', t('Room_has_been_removed'));
 	const deleteRoomEndpoint = useEndpointActionExperimental(
 		'POST',
-		room.t === 'c' ? 'channels.delete' : 'groups.delete',
+		room.t === 'c' ? '/v1/channels.delete' : '/v1/groups.delete',
 		t('Room_has_been_deleted'),
 	);
 
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js
index de4d72d14e0e..c49d310543e4 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.js
@@ -60,9 +60,9 @@ const TeamsInfoWithLogic = ({ room, openEditing }) => {
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal());
 
-	const deleteTeam = useEndpointActionExperimental('POST', 'teams.delete');
-	const leaveTeam = useEndpointActionExperimental('POST', 'teams.leave');
-	const convertTeamToChannel = useEndpointActionExperimental('POST', 'teams.convertToChannel');
+	const deleteTeam = useEndpointActionExperimental('POST', '/v1/teams.delete');
+	const leaveTeam = useEndpointActionExperimental('POST', '/V1/teams.leave');
+	const convertTeamToChannel = useEndpointActionExperimental('POST', '/v1/teams.convertToChannel');
 
 	const hideTeam = useMethod('hideRoom');
 

From cf921acc8a48b67f2ad7f1ee9344889a68b9530d Mon Sep 17 00:00:00 2001
From: Felipe <84182706+felipe-rod123@users.noreply.github.com>
Date: Mon, 27 Jun 2022 08:50:07 -0300
Subject: [PATCH 2/5] Chore: convert e2e to ts (#25958)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
---
 .../app/api/server/v1/{e2e.js => e2e.ts}      | 70 +++++++++++--------
 apps/meteor/client/sidebar/RoomMenu.tsx       |  2 +-
 .../client/sidebar/search/SearchList.tsx      |  1 +
 packages/rest-typings/src/index.ts            |  4 ++
 packages/rest-typings/src/v1/e2e.ts           |  4 +-
 .../e2eGetUsersOfRoomWithoutKeyParamsGET.ts   | 24 +++++++
 .../src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts   | 26 +++++++
 ...2eSetUserPublicAndPrivateKeysParamsPOST.ts | 29 ++++++++
 .../src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts | 30 ++++++++
 9 files changed, 159 insertions(+), 31 deletions(-)
 rename apps/meteor/app/api/server/v1/{e2e.js => e2e.ts} (75%)
 create mode 100644 packages/rest-typings/src/v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET.ts
 create mode 100644 packages/rest-typings/src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts
 create mode 100644 packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
 create mode 100644 packages/rest-typings/src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts

diff --git a/apps/meteor/app/api/server/v1/e2e.js b/apps/meteor/app/api/server/v1/e2e.ts
similarity index 75%
rename from apps/meteor/app/api/server/v1/e2e.js
rename to apps/meteor/app/api/server/v1/e2e.ts
index f079e75b8119..13939b1caf0d 100644
--- a/apps/meteor/app/api/server/v1/e2e.js
+++ b/apps/meteor/app/api/server/v1/e2e.ts
@@ -1,16 +1,26 @@
+/* eslint-disable @typescript-eslint/camelcase */
 import { Meteor } from 'meteor/meteor';
+import {
+	ise2eGetUsersOfRoomWithoutKeyParamsGET,
+	ise2eSetRoomKeyIDParamsPOST,
+	ise2eSetUserPublicAndPrivateKeysParamsPOST,
+	ise2eUpdateGroupKeyParamsPOST,
+} from '@rocket.chat/rest-typings';
+import { IUser } from '@rocket.chat/core-typings';
 
 import { API } from '../api';
 
 API.v1.addRoute(
 	'e2e.fetchMyKeys',
-	{ authRequired: true },
+	{
+		authRequired: true,
+	},
 	{
 		get() {
-			let result;
-			Meteor.runAsUser(this.userId, () => {
-				result = Meteor.call('e2e.fetchMyKeys');
-			});
+			const result: {
+				public_key: string;
+				private_key: string;
+			} = Meteor.call('e2e.fetchMyKeys');
 
 			return API.v1.success(result);
 		},
@@ -19,15 +29,17 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'e2e.getUsersOfRoomWithoutKey',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eGetUsersOfRoomWithoutKeyParamsGET,
+	},
 	{
 		get() {
 			const { rid } = this.queryParams;
 
-			let result;
-			Meteor.runAsUser(this.userId, () => {
-				result = Meteor.call('e2e.getUsersOfRoomWithoutKey', rid);
-			});
+			const result: {
+				users: IUser[];
+			} = Meteor.call('e2e.getUsersOfRoomWithoutKey', rid);
 
 			return API.v1.success(result);
 		},
@@ -65,16 +77,18 @@ API.v1.addRoute(
  *              schema:
  *                $ref: '#/components/schemas/ApiFailureV1'
  */
+
 API.v1.addRoute(
 	'e2e.setRoomKeyID',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eSetRoomKeyIDParamsPOST,
+	},
 	{
 		post() {
 			const { rid, keyID } = this.bodyParams;
 
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(Meteor.call('e2e.setRoomKeyID', rid, keyID));
-			});
+			Meteor.call('e2e.setRoomKeyID', rid, keyID);
 
 			return API.v1.success();
 		},
@@ -114,18 +128,17 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'e2e.setUserPublicAndPrivateKeys',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eSetUserPublicAndPrivateKeysParamsPOST,
+	},
 	{
 		post() {
-			const { public_key, private_key } = this.bodyParams;
-
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(
-					Meteor.call('e2e.setUserPublicAndPrivateKeys', {
-						public_key,
-						private_key,
-					}),
-				);
+			const { public_key, private_key } = Meteor.call('e2e.fetchMyKeys');
+
+			Meteor.call('e2e.setUserPublicAndPrivateKeys', {
+				public_key,
+				private_key,
 			});
 
 			return API.v1.success();
@@ -168,14 +181,15 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'e2e.updateGroupKey',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		validateParams: ise2eUpdateGroupKeyParamsPOST,
+	},
 	{
 		post() {
 			const { uid, rid, key } = this.bodyParams;
 
-			Meteor.runAsUser(this.userId, () => {
-				API.v1.success(Meteor.call('e2e.updateGroupKey', rid, uid, key));
-			});
+			Meteor.call('e2e.updateGroupKey', rid, uid, key);
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index 0457fb5096b7..b6f493a8dd05 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -202,7 +202,7 @@ const RoomMenu = ({ rid, unread, threadUnread, alert, roomOpen, type, cl, name =
 			aria-keyshortcuts='alt'
 			tabIndex={-1}
 			options={menuOptions}
-			renderItem={({ label: { label, icon }, ...props }) => <Option label={label} title={label} icon={icon} {...props} />}
+			renderItem={({ label: { label, icon }, ...props }): JSX.Element => <Option label={label} title={label} icon={icon} {...props} />}
 		/>
 	);
 };
diff --git a/apps/meteor/client/sidebar/search/SearchList.tsx b/apps/meteor/client/sidebar/search/SearchList.tsx
index 80be10d7ac62..d73620d8a5ef 100644
--- a/apps/meteor/client/sidebar/search/SearchList.tsx
+++ b/apps/meteor/client/sidebar/search/SearchList.tsx
@@ -45,6 +45,7 @@ const shortcut = ((): string => {
 	return '(\u2303+K)';
 })();
 
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 const useSpotlight = (filterText: string, usernames: string[]) => {
 	const expression = /(@|#)?(.*)/i;
 	const [, mention, name] = filterText.match(expression) || [];
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
index 6cf852d8f18b..eef47cbfca8d 100644
--- a/packages/rest-typings/src/index.ts
+++ b/packages/rest-typings/src/index.ts
@@ -185,6 +185,10 @@ export * from './v1/users/UsersSetAvatarParamsPOST';
 export * from './v1/users/UsersSetPreferenceParamsPOST';
 export * from './v1/users/UsersUpdateOwnBasicInfoParamsPOST';
 export * from './v1/users/UsersUpdateParamsPOST';
+export * from './v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET';
+export * from './v1/e2e/e2eSetRoomKeyIDParamsPOST';
+export * from './v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST';
+export * from './v1/e2e/e2eUpdateGroupKeyParamsPOST';
 export * from './v1/import/UploadImportFileParamsPOST';
 export * from './v1/import/DownloadPublicImportFileParamsPOST';
 export * from './v1/import/StartImportParamsPOST';
diff --git a/packages/rest-typings/src/v1/e2e.ts b/packages/rest-typings/src/v1/e2e.ts
index 10827062e8b9..40603d5bbbeb 100644
--- a/packages/rest-typings/src/v1/e2e.ts
+++ b/packages/rest-typings/src/v1/e2e.ts
@@ -98,10 +98,10 @@ export type E2eEndpoints = {
 		};
 	};
 	'/v1/e2e.updateGroupKey': {
-		POST: (params: E2eUpdateGroupKeyProps) => {};
+		POST: (params: E2eUpdateGroupKeyProps) => void;
 	};
 	'/v1/e2e.setRoomKeyID': {
-		POST: (params: E2eSetRoomKeyIdProps) => {};
+		POST: (params: E2eSetRoomKeyIdProps) => void;
 	};
 	'/v1/e2e.fetchMyKeys': {
 		GET: () => { public_key: string; private_key: string };
diff --git a/packages/rest-typings/src/v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET.ts b/packages/rest-typings/src/v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET.ts
new file mode 100644
index 000000000000..8be9abf23bec
--- /dev/null
+++ b/packages/rest-typings/src/v1/e2e/e2eGetUsersOfRoomWithoutKeyParamsGET.ts
@@ -0,0 +1,24 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eGetUsersOfRoomWithoutKeyParamsGET = {
+	rid: string;
+};
+
+const e2eGetUsersOfRoomWithoutKeyParamsGETSchema = {
+	type: 'object',
+	properties: {
+		rid: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['rid'],
+};
+
+export const ise2eGetUsersOfRoomWithoutKeyParamsGET = ajv.compile<e2eGetUsersOfRoomWithoutKeyParamsGET>(
+	e2eGetUsersOfRoomWithoutKeyParamsGETSchema,
+);
diff --git a/packages/rest-typings/src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts b/packages/rest-typings/src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts
new file mode 100644
index 000000000000..8977d8c96b6d
--- /dev/null
+++ b/packages/rest-typings/src/v1/e2e/e2eSetRoomKeyIDParamsPOST.ts
@@ -0,0 +1,26 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eSetRoomKeyIDParamsPOST = {
+	rid: string;
+	keyID: string;
+};
+
+const e2eSetRoomKeyIDParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		rid: {
+			type: 'string',
+		},
+		keyID: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['rid', 'keyID'],
+};
+
+export const ise2eSetRoomKeyIDParamsPOST = ajv.compile<e2eSetRoomKeyIDParamsPOST>(e2eSetRoomKeyIDParamsPOSTSchema);
diff --git a/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts b/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
new file mode 100644
index 000000000000..054093b9164c
--- /dev/null
+++ b/packages/rest-typings/src/v1/e2e/e2eSetUserPublicAndPrivateKeysParamsPOST.ts
@@ -0,0 +1,29 @@
+/* eslint-disable @typescript-eslint/camelcase */
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eSetUserPublicAndPrivateKeysParamsPOST = {
+	public_key: string;
+	private_key: string;
+};
+
+const e2eSetUserPublicAndPrivateKeysParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		public_key: {
+			type: 'string',
+		},
+		private_key: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['public_key', 'private_key'],
+};
+
+export const ise2eSetUserPublicAndPrivateKeysParamsPOST = ajv.compile<e2eSetUserPublicAndPrivateKeysParamsPOST>(
+	e2eSetUserPublicAndPrivateKeysParamsPOSTSchema,
+);
diff --git a/packages/rest-typings/src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts b/packages/rest-typings/src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts
new file mode 100644
index 000000000000..08bbf1d18aef
--- /dev/null
+++ b/packages/rest-typings/src/v1/e2e/e2eUpdateGroupKeyParamsPOST.ts
@@ -0,0 +1,30 @@
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+export type e2eUpdateGroupKeyParamsPOST = {
+	uid: string;
+	rid: string;
+	key: string;
+};
+
+const e2eUpdateGroupKeyParamsPOSTSchema = {
+	type: 'object',
+	properties: {
+		uid: {
+			type: 'string',
+		},
+		rid: {
+			type: 'string',
+		},
+		key: {
+			type: 'string',
+		},
+	},
+	additionalProperties: false,
+	required: ['uid', 'rid', 'key'],
+};
+
+export const ise2eUpdateGroupKeyParamsPOST = ajv.compile<e2eUpdateGroupKeyParamsPOST>(e2eUpdateGroupKeyParamsPOSTSchema);

From c8f93fabae920977f7b2b5cebb28ae0607b59cf0 Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Mon, 27 Jun 2022 09:23:19 -0300
Subject: [PATCH 3/5] Regression: Webhook Integration Creation + string error
 toast msg (#26008)

## Issue(s)
While creating an webhook integration, it was missing the **v1/**. Also, the toast was not properly displaying error messages

## Before:

![image](https://user-images.githubusercontent.com/1761174/175665990-c3e820c2-e9af-44ff-b0da-03b6a803f930.png)

![image](https://user-images.githubusercontent.com/1761174/175666183-d8d6999c-8ffd-43e9-835b-61ba76853d6b.png)


## After:

![image](https://user-images.githubusercontent.com/1761174/175665664-72b99178-e720-41a6-aec0-d0d06a25dfc2.png)


## Steps to test or reproduce
Try creating an Integration Webhook in Admin > Integrations.
The payload will be sent to: http://localhost:3000/api/integrations.create

Edit a user, and set it's email the same email as an existing user: the toast message will not display the correct message



Co-authored-by: Debdut Chakraborty <76006232+debdutdeb@users.noreply.github.com>
---
 apps/meteor/client/hooks/useEndpointAction.ts                 | 2 +-
 apps/meteor/client/views/account/security/TwoFactorEmail.js   | 4 ++--
 .../views/admin/integrations/edit/EditIncomingWebhook.js      | 2 +-
 .../views/admin/integrations/edit/EditOutgoingWebhook.js      | 2 +-
 .../client/views/admin/integrations/new/NewIncomingWebhook.js | 2 +-
 .../client/views/admin/integrations/new/NewOutgoingWebhook.js | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/meteor/client/hooks/useEndpointAction.ts b/apps/meteor/client/hooks/useEndpointAction.ts
index 76c86d648dfe..e58d925adebf 100644
--- a/apps/meteor/client/hooks/useEndpointAction.ts
+++ b/apps/meteor/client/hooks/useEndpointAction.ts
@@ -24,7 +24,7 @@ export const useEndpointAction = <TMethod extends Method, TPath extends PathFor<
 
 			return data;
 		} catch (error) {
-			dispatchToastMessage({ type: 'error', message: String(error) });
+			dispatchToastMessage({ type: 'error', message: error });
 			throw error;
 		}
 	}, [dispatchToastMessage, params, sendData, successMessage]);
diff --git a/apps/meteor/client/views/account/security/TwoFactorEmail.js b/apps/meteor/client/views/account/security/TwoFactorEmail.js
index e7c8a120cfdd..219c83e78a5f 100644
--- a/apps/meteor/client/views/account/security/TwoFactorEmail.js
+++ b/apps/meteor/client/views/account/security/TwoFactorEmail.js
@@ -10,8 +10,8 @@ const TwoFactorEmail = (props) => {
 
 	const isEnabled = user && user.services && user.services.email2fa && user.services.email2fa.enabled;
 
-	const enable2faAction = useEndpointAction('POST', 'users.2fa.enableEmail', undefined, t('Two-factor_authentication_enabled'));
-	const disable2faAction = useEndpointAction('POST', 'users.2fa.disableEmail', undefined, t('Two-factor_authentication_disabled'));
+	const enable2faAction = useEndpointAction('POST', '/v1/users.2fa.enableEmail', undefined, t('Two-factor_authentication_enabled'));
+	const disable2faAction = useEndpointAction('POST', '/v1/users.2fa.disableEmail', undefined, t('Two-factor_authentication_disabled'));
 
 	const handleEnable = useCallback(async () => {
 		await enable2faAction();
diff --git a/apps/meteor/client/views/admin/integrations/edit/EditIncomingWebhook.js b/apps/meteor/client/views/admin/integrations/edit/EditIncomingWebhook.js
index 8429696a404c..73f7dde4b123 100644
--- a/apps/meteor/client/views/admin/integrations/edit/EditIncomingWebhook.js
+++ b/apps/meteor/client/views/admin/integrations/edit/EditIncomingWebhook.js
@@ -30,7 +30,7 @@ function EditIncomingWebhook({ data, onChange, ...props }) {
 	const setModal = useSetModal();
 
 	const deleteQuery = useMemo(() => ({ type: 'webhook-incoming', integrationId: data._id }), [data._id]);
-	const deleteIntegration = useEndpointAction('POST', 'integrations.remove', deleteQuery);
+	const deleteIntegration = useEndpointAction('POST', '/v1/integrations.remove', deleteQuery);
 	const saveIntegration = useMethod('updateIncomingIntegration');
 
 	const router = useRoute('admin-integrations');
diff --git a/apps/meteor/client/views/admin/integrations/edit/EditOutgoingWebhook.js b/apps/meteor/client/views/admin/integrations/edit/EditOutgoingWebhook.js
index e0cb744e0648..61bdbcca4fe4 100644
--- a/apps/meteor/client/views/admin/integrations/edit/EditOutgoingWebhook.js
+++ b/apps/meteor/client/views/admin/integrations/edit/EditOutgoingWebhook.js
@@ -46,7 +46,7 @@ function EditOutgoingWebhook({ data, onChange, setSaveAction, ...props }) {
 	const router = useRoute('admin-integrations');
 
 	const deleteQuery = useMemo(() => ({ type: 'webhook-outgoing', integrationId: data._id }), [data._id]);
-	const deleteIntegration = useEndpointAction('POST', 'integrations.remove', deleteQuery);
+	const deleteIntegration = useEndpointAction('POST', '/v1/integrations.remove', deleteQuery);
 
 	const handleDeleteIntegration = useCallback(() => {
 		const closeModal = () => setModal();
diff --git a/apps/meteor/client/views/admin/integrations/new/NewIncomingWebhook.js b/apps/meteor/client/views/admin/integrations/new/NewIncomingWebhook.js
index 3d2d9c2606a7..958bce303162 100644
--- a/apps/meteor/client/views/admin/integrations/new/NewIncomingWebhook.js
+++ b/apps/meteor/client/views/admin/integrations/new/NewIncomingWebhook.js
@@ -26,7 +26,7 @@ export default function NewIncomingWebhook(props) {
 	const { values: formValues, handlers: formHandlers, reset } = useForm(initialState);
 
 	const params = useMemo(() => ({ ...formValues, type: 'webhook-incoming' }), [formValues]);
-	const saveAction = useEndpointAction('POST', 'integrations.create', params, t('Integration_added'));
+	const saveAction = useEndpointAction('POST', '/v1/integrations.create', params, t('Integration_added'));
 
 	const handleSave = useCallback(async () => {
 		const result = await saveAction();
diff --git a/apps/meteor/client/views/admin/integrations/new/NewOutgoingWebhook.js b/apps/meteor/client/views/admin/integrations/new/NewOutgoingWebhook.js
index 5769f1dc7101..b20b50b2b698 100644
--- a/apps/meteor/client/views/admin/integrations/new/NewOutgoingWebhook.js
+++ b/apps/meteor/client/views/admin/integrations/new/NewOutgoingWebhook.js
@@ -47,7 +47,7 @@ export default function NewOutgoingWebhook({ data = defaultData, onChange, setSa
 		}),
 		[formValues, triggerWords, urls],
 	);
-	const saveIntegration = useEndpointAction('POST', 'integrations.create', params, t('Integration_added'));
+	const saveIntegration = useEndpointAction('POST', '/v1/integrations.create', params, t('Integration_added'));
 
 	const handleSave = useCallback(async () => {
 		const result = await saveIntegration();

From e85a63bf17b583abd97a224cf885dbd6abf0fbd5 Mon Sep 17 00:00:00 2001
From: Douglas Fabris <devfabris@gmail.com>
Date: Mon, 27 Jun 2022 09:57:03 -0300
Subject: [PATCH 4/5] [BREAK] Remove show message in main thread preference
 (#26002)

<!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->

<!-- Your Pull Request name should start with one of the following tags
  [NEW] For new features
  [IMPROVE] For an improvement (performance or little improvements) in existing features
  [FIX] For bug fixes that affect the end-user
  [BREAK] For pull requests including breaking changes
  Chore: For small tasks
  Doc: For documentation
-->

<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.
  - I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
  - I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
  - Lint and unit tests pass locally with my changes
  - I have added tests that prove my fix is effective or that my feature works (if applicable)
  - I have added necessary documentation (if applicable)
  - Any dependent changes have been merged and published in downstream modules
-->

## Proposed changes (including videos or screenshots)
<!-- CHANGELOG -->
<!--
  Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
  If it fixes a bug or resolves a feature request, be sure to link to that issue below.
  This description will appear in the release notes if we accept the contribution.
-->
This PR removes the confusion between the `show message in main thread` and the function `also to send to channel`. In the past, we used the `show message in main thread` as a solution to help users to understand the thread feature, as this feature is now mature enough there's no reason to maintain this preference.

Send the thread message to the main channel or just inside of the thread, should be a decision from the user where the function `also send to channel` appears. Because of that, and because of a bunch of requests and issues we received, we're introducing a new preference `also send thread to channel` where users will be able to decide the behavior of the checkbox.

![image](https://user-images.githubusercontent.com/27704687/175655594-023c5907-adc8-4924-ba7d-467608d06fec.png)

Now there are three behavior options
- `Default`: when it unchecks after sending the first message
<img width='250px' height='350px' src='https://user-images.githubusercontent.com/27704687/175656500-34817639-7f13-4641-b4fa-9dd106e99443.gif' />

- `Always`: stay checked for all messages
<img width='250px' height='350px' src='https://user-images.githubusercontent.com/27704687/175657299-d88efaba-1c2b-4bb9-a23a-f9755dcec5ca.gif' />

- `Never`: stay unchecked for all messages
<img width='250px' height='350px' src='https://user-images.githubusercontent.com/27704687/175657544-3dcd0adc-05cf-4196-83a6-f6cc29a1de2b.gif' />

<!-- END CHANGELOG -->

## Issue(s)
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
Closes #20695
Closes #19167
Closes #18347

## Steps to test or reproduce
<!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->

## Further comments
<!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->


Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com>
---
 .../meteor/app/lib/server/startup/settings.ts | 20 +++++++++++--
 .../app/threads/client/flextab/thread.js      | 22 +++++++++++++--
 .../ui-utils/client/lib/RoomHistoryManager.js |  6 ++--
 .../app/ui-utils/client/lib/messageContext.js |  2 --
 apps/meteor/app/ui/client/views/app/room.js   |  5 +---
 .../preferences/PreferencesMessagesSection.js | 28 ++++++++++++++-----
 .../client/views/admin/settings/Setting.tsx   |  2 +-
 .../room/MessageList/hooks/useMessages.ts     |  8 ++----
 .../rocketchat-i18n/i18n/en.i18n.json         |  2 ++
 .../meteor/server/startup/migrations/index.ts |  1 +
 apps/meteor/server/startup/migrations/v271.ts | 11 ++++++++
 .../tests/end-to-end/api/00-miscellaneous.js  |  2 +-
 .../v1/users/UsersSetPreferenceParamsPOST.ts  |  5 ----
 13 files changed, 79 insertions(+), 35 deletions(-)
 create mode 100644 apps/meteor/server/startup/migrations/v271.ts

diff --git a/apps/meteor/app/lib/server/startup/settings.ts b/apps/meteor/app/lib/server/startup/settings.ts
index 112241a71f69..82d817f6f976 100644
--- a/apps/meteor/app/lib/server/startup/settings.ts
+++ b/apps/meteor/app/lib/server/startup/settings.ts
@@ -426,10 +426,23 @@ settingsRegistry.addGroup('Accounts', function () {
 			i18nLabel: 'Sort_By',
 		});
 
-		this.add('Accounts_Default_User_Preferences_showMessageInMainThread', false, {
-			type: 'boolean',
+		this.add('Accounts_Default_User_Preferences_alsoSendThreadToChannel', 'default', {
+			type: 'select',
+			values: [
+				{
+					key: 'default',
+					i18nLabel: 'Default',
+				},
+				{
+					key: 'always',
+					i18nLabel: 'Always',
+				},
+				{
+					key: 'never',
+					i18nLabel: 'Never',
+				},
+			],
 			public: true,
-			i18nLabel: 'Show_Message_In_Main_Thread',
 		});
 
 		this.add('Accounts_Default_User_Preferences_sidebarShowFavorites', true, {
@@ -457,6 +470,7 @@ settingsRegistry.addGroup('Accounts', function () {
 			public: true,
 			i18nLabel: 'Enter_Behaviour',
 		});
+
 		this.add('Accounts_Default_User_Preferences_messageViewMode', 0, {
 			type: 'select',
 			values: [
diff --git a/apps/meteor/app/threads/client/flextab/thread.js b/apps/meteor/app/threads/client/flextab/thread.js
index da1cd730642b..6c71447980be 100644
--- a/apps/meteor/app/threads/client/flextab/thread.js
+++ b/apps/meteor/app/threads/client/flextab/thread.js
@@ -77,6 +77,8 @@ Template.thread.helpers({
 		} = Template.currentData();
 
 		const showFormattingTips = settings.get('Message_ShowFormattingTips');
+		const alsoSendPreferenceState = getUserPreference(Meteor.userId(), 'alsoSendThreadToChannel');
+
 		return {
 			showFormattingTips,
 			tshow: instance.state.get('sendToChannel'),
@@ -85,7 +87,9 @@ Template.thread.helpers({
 			tmid,
 			onSend: (...args) => {
 				instance.sendToBottom();
-				instance.state.set('sendToChannel', false);
+				if (alsoSendPreferenceState === 'default') {
+					instance.state.set('sendToChannel', false);
+				}
 				return instance.chatMessages && instance.chatMessages.send.apply(instance.chatMessages, args);
 			},
 			onKeyUp: (...args) => instance.chatMessages && instance.chatMessages.keyup.apply(instance.chatMessages, args),
@@ -243,8 +247,22 @@ Template.thread.onRendered(function () {
 Template.thread.onCreated(async function () {
 	this.Threads = new Mongo.Collection(null);
 
+	const preferenceState = getUserPreference(Meteor.userId(), 'alsoSendThreadToChannel');
+
+	let sendToChannel;
+	switch (preferenceState) {
+		case 'always':
+			sendToChannel = true;
+			break;
+		case 'never':
+			sendToChannel = false;
+			break;
+		default:
+			sendToChannel = !this.data.mainMessage.tcount;
+	}
+
 	this.state = new ReactiveDict({
-		sendToChannel: !this.data.mainMessage.tcount,
+		sendToChannel,
 	});
 
 	this.loadMore = async () => {
diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.js b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.js
index 3ce3b93a5cb1..16f6af3e58ff 100644
--- a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.js
+++ b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.js
@@ -14,7 +14,6 @@ import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { ChatMessage, ChatSubscription, ChatRoom } from '../../../models/client';
 import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 import { filterMarkdown } from '../../../markdown/lib/markdown';
-import { getUserPreference } from '../../../utils/client';
 import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
 import {
 	setHighlightMessage,
@@ -197,8 +196,7 @@ export const RoomHistoryManager = new (class extends Emitter {
 			typeName = (curRoomDoc ? curRoomDoc.t : undefined) + (curRoomDoc ? curRoomDoc.name : undefined);
 		}
 
-		const showMessageInMainThread = getUserPreference(Meteor.userId(), 'showMessageInMainThread', false);
-		const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls, showMessageInMainThread);
+		const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls);
 
 		this.unqueue();
 
@@ -224,7 +222,7 @@ export const RoomHistoryManager = new (class extends Emitter {
 			room.loaded = 0;
 		}
 
-		const visibleMessages = messages.filter((msg) => !msg.tmid || showMessageInMainThread || msg.tshow);
+		const visibleMessages = messages.filter((msg) => !msg.tmid || msg.tshow);
 
 		room.loaded += visibleMessages.length;
 
diff --git a/apps/meteor/app/ui-utils/client/lib/messageContext.js b/apps/meteor/app/ui-utils/client/lib/messageContext.js
index 878199c11de1..afce9a16d217 100644
--- a/apps/meteor/app/ui-utils/client/lib/messageContext.js
+++ b/apps/meteor/app/ui-utils/client/lib/messageContext.js
@@ -18,7 +18,6 @@ const fields = {
 	'name': 1,
 	'username': 1,
 	'settings.preferences.enableNewMessageTemplate': 1,
-	'settings.preferences.showMessageInMainThread': 1,
 	'settings.preferences.autoImageLoad': 1,
 	'settings.preferences.saveMobileBandwidth': 1,
 	'settings.preferences.collapseMediaByDefault': 1,
@@ -115,7 +114,6 @@ export function messageContext({ rid } = Template.instance()) {
 		},
 		settings: {
 			translateLanguage: AutoTranslate.getLanguage(rid),
-			showMessageInMainThread: getUserPreference(user, 'showMessageInMainThread'),
 			autoImageLoad: getUserPreference(user, 'autoImageLoad'),
 			enableNewMessageTemplate: getUserPreference(user, 'enableNewMessageTemplate'),
 			saveMobileBandwidth: Meteor.Device.isPhone() && getUserPreference(user, 'saveMobileBandwidth'),
diff --git a/apps/meteor/app/ui/client/views/app/room.js b/apps/meteor/app/ui/client/views/app/room.js
index a659a1a3bc0c..385cdbd9532b 100644
--- a/apps/meteor/app/ui/client/views/app/room.js
+++ b/apps/meteor/app/ui/client/views/app/room.js
@@ -180,7 +180,6 @@ Template.roomOld.helpers({
 		return state.get('subscribed');
 	},
 	messagesHistory() {
-		const showInMainThread = getUserPreference(Meteor.userId(), 'showMessageInMainThread', false);
 		const { rid } = Template.instance();
 		const room = Rooms.findOne(rid, { fields: { sysMes: 1 } });
 		const hideSettings = settings.collection.findOne('Hide_System_Messages') || {};
@@ -191,9 +190,7 @@ Template.roomOld.helpers({
 		const query = {
 			rid,
 			_hidden: { $ne: true },
-			...(!showInMainThread && {
-				$or: [{ tmid: { $exists: 0 } }, { tshow: { $eq: true } }],
-			}),
+			$or: [{ tmid: { $exists: 0 } }, { tshow: { $eq: true } }],
 		};
 
 		if (hideMessagesOfType.size) {
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.js b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.js
index eebedb8ba77e..84afaa5eddec 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.js
+++ b/apps/meteor/client/views/account/preferences/PreferencesMessagesSection.js
@@ -11,7 +11,7 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }) => {
 
 	const settings = {
 		unreadAlert: useUserPreference('unreadAlert'),
-		showMessageInMainThread: useUserPreference('showMessageInMainThread'),
+		alsoSendThreadToChannel: useUserPreference('alsoSendThreadToChannel'),
 		useEmojis: useUserPreference('useEmojis'),
 		convertAsciiEmoji: useUserPreference('convertAsciiEmoji'),
 		autoImageLoad: useUserPreference('autoImageLoad'),
@@ -30,7 +30,7 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }) => {
 
 	const {
 		unreadAlert,
-		showMessageInMainThread,
+		alsoSendThreadToChannel,
 		useEmojis,
 		convertAsciiEmoji,
 		autoImageLoad,
@@ -47,7 +47,7 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }) => {
 
 	const {
 		handleUnreadAlert,
-		handleShowMessageInMainThread,
+		handleAlsoSendThreadToChannel,
 		handleUseEmojis,
 		handleConvertAsciiEmoji,
 		handleAutoImageLoad,
@@ -62,6 +62,15 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }) => {
 		handleMessageViewMode,
 	} = handlers;
 
+	const alsoSendThreadMessageToChannelOptions = useMemo(
+		() => [
+			['default', t('Default')],
+			['always', t('Always')],
+			['never', t('Never')],
+		],
+		[t],
+	);
+
 	const timeFormatOptions = useMemo(
 		() => [
 			[0, t('Default')],
@@ -109,14 +118,19 @@ const PreferencesMessagesSection = ({ onChange, commitRef, ...props }) => {
 				)}
 				{useMemo(
 					() => (
-						<Field display='flex' flexDirection='row' justifyContent='spaceBetween' flexGrow={1}>
-							<Field.Label>{t('Show_Message_In_Main_Thread')}</Field.Label>
+						<Field>
+							<Field.Label>{t('Also_send_thread_message_to_channel_behavior')}</Field.Label>
 							<Field.Row>
-								<ToggleSwitch checked={showMessageInMainThread} onChange={handleShowMessageInMainThread} />
+								<Select
+									value={alsoSendThreadToChannel}
+									onChange={handleAlsoSendThreadToChannel}
+									options={alsoSendThreadMessageToChannelOptions}
+								/>
 							</Field.Row>
+							<Field.Hint>{t('Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description')}</Field.Hint>
 						</Field>
 					),
-					[handleShowMessageInMainThread, showMessageInMainThread, t],
+					[alsoSendThreadToChannel, handleAlsoSendThreadToChannel, t, alsoSendThreadMessageToChannelOptions],
 				)}
 				{useMemo(
 					() => (
diff --git a/apps/meteor/client/views/admin/settings/Setting.tsx b/apps/meteor/client/views/admin/settings/Setting.tsx
index 89a9a1f52ab6..3fc29e733ee9 100644
--- a/apps/meteor/client/views/admin/settings/Setting.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting.tsx
@@ -89,7 +89,7 @@ function Setting({ className = undefined, settingId, sectionChanged }: SettingPr
 
 	const label = (t.has(i18nLabel) && t(i18nLabel)) || (t.has(_id) && t(_id));
 	const hint = useMemo(
-		() => (t.has(i18nDescription) ? <MarkdownText preserveHtml content={t(i18nDescription)} /> : undefined),
+		() => (t.has(i18nDescription) ? <MarkdownText variant='inline' preserveHtml content={t(i18nDescription)} /> : undefined),
 		[i18nDescription, t],
 	);
 	const callout = useMemo(() => (alert && t.has(alert) ? <span dangerouslySetInnerHTML={{ __html: t(alert) }} /> : undefined), [alert, t]);
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
index ea9e4ca783f3..eb5eeb27e083 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
@@ -1,6 +1,5 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { IMessage } from '@rocket.chat/core-typings';
-import { useUserPreference } from '@rocket.chat/ui-contexts';
 import { useCallback, useMemo } from 'react';
 
 import { ChatMessage } from '../../../../../app/models/client';
@@ -43,7 +42,6 @@ const removePossibleNullValues = ({
 });
 
 export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
-	const showInMainThread = useUserPreference<boolean>('showMessageInMainThread', false);
 	// const hideSettings = !!useSetting('Hide_System_Messages');
 
 	// const room = Rooms.findOne(rid, { fields: { sysMes: 1 } });
@@ -53,11 +51,9 @@ export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
 		() => ({
 			rid,
 			_hidden: { $ne: true },
-			...(!showInMainThread && {
-				$or: [{ tmid: { $exists: 0 } }, { tshow: { $eq: true } }],
-			}),
+			$or: [{ tmid: { $exists: 0 } }, { tshow: { $eq: true } }],
 		}),
-		[rid, showInMainThread],
+		[rid],
 	);
 
 	// if (hideMessagesOfType.size) {
diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
index 27831a5b888c..4042867a17fc 100644
--- a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -70,6 +70,7 @@
   "Accounts_CustomFieldsToShowInUserInfo": "Custom Fields to Show in User Info",
   "Accounts_Default_User_Preferences": "Default User Preferences",
   "Accounts_Default_User_Preferences_audioNotifications": "Audio Notifications Default Alert",
+  "Accounts_Default_User_Preferences_alsoSendThreadToChannel_Description": "Allow users to select the Also send to channel behavior",
   "Accounts_Default_User_Preferences_desktopNotifications": "Desktop Notifications Default Alert",
   "Accounts_Default_User_Preferences_pushNotifications": "Push Notifications Default Alert",
   "Accounts_Default_User_Preferences_not_available": "Failed to retrieve User Preferences because they haven't been set up by the user yet",
@@ -341,6 +342,7 @@
   "Allow_switching_departments": "Allow Visitor to Switch Departments",
   "Almost_done": "Almost done",
   "Alphabetical": "Alphabetical",
+  "Also_send_thread_message_to_channel_behavior": "Also send thread message to channel behavior",
   "Also_send_to_channel": "Also send to channel",
   "Always_open_in_new_window": "Always Open in New Window",
   "Analytics": "Analytics",
diff --git a/apps/meteor/server/startup/migrations/index.ts b/apps/meteor/server/startup/migrations/index.ts
index f589e6e4d2f2..15b770031342 100644
--- a/apps/meteor/server/startup/migrations/index.ts
+++ b/apps/meteor/server/startup/migrations/index.ts
@@ -93,4 +93,5 @@ import './v266';
 import './v267';
 import './v268';
 import './v269';
+import './v271';
 import './xrun';
diff --git a/apps/meteor/server/startup/migrations/v271.ts b/apps/meteor/server/startup/migrations/v271.ts
new file mode 100644
index 000000000000..2395b7a3be2d
--- /dev/null
+++ b/apps/meteor/server/startup/migrations/v271.ts
@@ -0,0 +1,11 @@
+import { Settings } from '@rocket.chat/models';
+
+import { addMigration } from '../../lib/migrations';
+
+// Removes deprecated Show Message In Main Thread preference
+addMigration({
+	version: 271,
+	async up() {
+		await Settings.removeById('Accounts_Default_User_Preferences_showMessageInMainThread');
+	},
+});
diff --git a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
index 35057ab54b3a..08c30981e7cc 100644
--- a/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
+++ b/apps/meteor/tests/end-to-end/api/00-miscellaneous.js
@@ -137,6 +137,7 @@ describe('miscellaneous', function () {
 			.expect(200)
 			.expect((res) => {
 				const allUserPreferencesKeys = [
+					'alsoSendThreadToChannel',
 					// 'language',
 					'newRoomNotification',
 					'newMessageNotification',
@@ -154,7 +155,6 @@ describe('miscellaneous', function () {
 					'enableAutoAway',
 					'enableNewMessageTemplate',
 					// 'highlights',
-					'showMessageInMainThread',
 					'desktopNotificationRequireInteraction',
 					'messageViewMode',
 					'hideUsernames',
diff --git a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
index 5379276b4dee..d41fb1d707ae 100644
--- a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
@@ -24,7 +24,6 @@ export type UsersSetPreferencesParamsPOST = {
 		highlights?: string[];
 		desktopNotificationRequireInteraction?: boolean;
 		messageViewMode?: number;
-		showMessageInMainThread?: boolean;
 		hideUsernames?: boolean;
 		hideRoles?: boolean;
 		displayAvatars?: boolean;
@@ -122,10 +121,6 @@ const UsersSetPreferencesParamsPostSchema = {
 					type: 'number',
 					nullable: true,
 				},
-				showMessageInMainThread: {
-					type: 'boolean',
-					nullable: true,
-				},
 				hideUsernames: {
 					type: 'boolean',
 					nullable: true,

From 89546dd82c7516fd196e8b198d87190a2ebc2f6f Mon Sep 17 00:00:00 2001
From: souzaramon <ramon.souza@objective.com.br>
Date: Mon, 27 Jun 2022 11:03:40 -0300
Subject: [PATCH 5/5] Chore: Major refactors in pageobjects (#26015)

## Proposed changes (including videos or screenshots)
- Simplify pageobjects
- Remove unused code
---
 .github/workflows/build_and_test.yml          |   2 +-
 .../meteor/app/ui-message/client/message.html |   2 +-
 apps/meteor/playwright.config.ts              |  20 +--
 apps/meteor/tests/e2e/00-wizard.spec.ts       |  21 +--
 .../tests/e2e/01-forgot-password.spec.ts      |  23 ++-
 apps/meteor/tests/e2e/02-register.spec.ts     |  28 +++-
 apps/meteor/tests/e2e/03-login.spec.ts        |  11 +-
 .../tests/e2e/04-main-elements-render.spec.ts |   4 +-
 .../tests/e2e/05-channel-creation.spec.ts     |  12 +-
 apps/meteor/tests/e2e/06-messaging.spec.ts    |  10 +-
 apps/meteor/tests/e2e/07-emoji.spec.ts        |  11 +-
 apps/meteor/tests/e2e/08-resolutions.spec.ts  |  53 +++----
 apps/meteor/tests/e2e/09-channel.spec.ts      |  75 +++++-----
 .../tests/e2e/10-user-preferences.spec.ts     | 137 +++++-------------
 apps/meteor/tests/e2e/11-admin.spec.ts        |  44 +++---
 apps/meteor/tests/e2e/12-settings.spec.ts     |  10 +-
 apps/meteor/tests/e2e/13-permissions.spec.ts  |   2 +-
 .../tests/e2e/14-setting-permissions.spec.ts  |  21 ++-
 .../meteor/tests/e2e/15-message-popup.spec.ts |   2 +-
 apps/meteor/tests/e2e/16-discussion.spec.ts   |   2 +-
 .../tests/e2e/{utils => }/configs/setup.ts    |  13 +-
 .../tests/e2e/{utils => }/configs/teardown.ts |   2 +-
 .../tests/e2e/pageobjects/Administration.ts   |   8 +-
 apps/meteor/tests/e2e/pageobjects/Agents.ts   |  12 +-
 apps/meteor/tests/e2e/pageobjects/BasePage.ts |   8 -
 .../tests/e2e/pageobjects/ChannelCreation.ts  |  17 ---
 .../tests/e2e/pageobjects/Departments.ts      |  12 +-
 .../tests/e2e/pageobjects/Discussion.ts       |   2 +-
 apps/meteor/tests/e2e/pageobjects/FlexTab.ts  |  18 +--
 apps/meteor/tests/e2e/pageobjects/Global.ts   |   4 +-
 .../meteor/tests/e2e/pageobjects/LoginPage.ts |  58 ++------
 .../tests/e2e/pageobjects/MainContent.ts      |  38 ++---
 .../e2e/pageobjects/PreferencesMainContent.ts |  19 +--
 .../tests/e2e/pageobjects/SetupWizard.ts      |  19 ++-
 apps/meteor/tests/e2e/pageobjects/SideNav.ts  |  32 +---
 apps/meteor/tests/e2e/pageobjects/index.ts    |   1 -
 .../e2e/utils/{helpers => }/MongoHelper.ts    |   5 +
 .../e2e/utils/configs/verifyTestBaseUrl.ts    |  15 --
 apps/meteor/tests/e2e/utils/constants.ts      |   9 ++
 apps/meteor/tests/e2e/utils/enums/Checkbox.ts |   8 -
 .../tests/e2e/utils/helpers/clearMessages.ts  |  11 --
 apps/meteor/tests/e2e/utils/mocks/channel.ts  |   2 -
 .../tests/e2e/utils/mocks/initialData.ts      |   3 -
 .../tests/e2e/utils/mocks/interations.ts      |   2 -
 .../e2e/utils/mocks/userAndPasswordMock.ts    |  20 +--
 45 files changed, 309 insertions(+), 519 deletions(-)
 rename apps/meteor/tests/e2e/{utils => }/configs/setup.ts (68%)
 rename apps/meteor/tests/e2e/{utils => }/configs/teardown.ts (95%)
 delete mode 100644 apps/meteor/tests/e2e/pageobjects/ChannelCreation.ts
 rename apps/meteor/tests/e2e/utils/{helpers => }/MongoHelper.ts (99%)
 delete mode 100644 apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
 create mode 100644 apps/meteor/tests/e2e/utils/constants.ts
 delete mode 100644 apps/meteor/tests/e2e/utils/enums/Checkbox.ts
 delete mode 100644 apps/meteor/tests/e2e/utils/helpers/clearMessages.ts
 delete mode 100644 apps/meteor/tests/e2e/utils/mocks/channel.ts
 delete mode 100644 apps/meteor/tests/e2e/utils/mocks/initialData.ts
 delete mode 100644 apps/meteor/tests/e2e/utils/mocks/interations.ts

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index e62ee8217486..c398bc0f7ed3 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -681,7 +681,7 @@ jobs:
           docker logs presence --tail=50
 
           cd ./apps/meteor
-          npm run test:playwright
+          IS_EE=true npm run test:playwright
 
       - name: Store playwright test trace
         uses: actions/upload-artifact@v2
diff --git a/apps/meteor/app/ui-message/client/message.html b/apps/meteor/app/ui-message/client/message.html
index 4837a2bb0df5..fb29dbfbd5dd 100644
--- a/apps/meteor/app/ui-message/client/message.html
+++ b/apps/meteor/app/ui-message/client/message.html
@@ -1,5 +1,5 @@
 <template name="message">
-	<li id="{{templatePrefix}}{{msg._id}}" data-id="{{msg._id}}" data-own={{isOwnMessageAndNotSystem}} data-context={{actionContext}} class="message {{className}} {{ignoredClass}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{collapsed}} {{customClass}}" data-username="{{msg.u.username}}" data-tmid="{{msg.tmid}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}" data-alias="{{msg.alias}}" data-qa-type="message">
+	<li data-qa-id="UserMessage" id="{{templatePrefix}}{{msg._id}}" data-id="{{msg._id}}" data-own={{isOwnMessageAndNotSystem}} data-context={{actionContext}} class="message {{className}} {{ignoredClass}} {{system}} {{t}} {{own}} {{isTemp}} {{chatops}} {{collapsed}} {{customClass}}" data-username="{{msg.u.username}}" data-tmid="{{msg.tmid}}" data-groupable="{{isGroupable}}" data-date="{{date}}" data-timestamp="{{timestamp}}" data-alias="{{msg.alias}}" data-qa-type="message">
 		{{#if isThreadReply}}
 			{{> messageThread parentMessage=parentMessage msg=msg tmid=msg.tmid class=bodyClass following=msg.following}}
 			<div class="thread-replied js-open-thread">
diff --git a/apps/meteor/playwright.config.ts b/apps/meteor/playwright.config.ts
index f729b707c136..12144d4091f4 100644
--- a/apps/meteor/playwright.config.ts
+++ b/apps/meteor/playwright.config.ts
@@ -1,18 +1,16 @@
 import { PlaywrightTestConfig } from '@playwright/test';
 
-import { verifyTestBaseUrl } from './tests/e2e/utils/configs/verifyTestBaseUrl';
+import * as constants from './tests/e2e/utils/constants';
 
-const { isLocal, baseURL } = verifyTestBaseUrl();
-
-const localInserts = isLocal
+const setupIsLocalhost = constants.IS_LOCALHOST
 	? {
-			globalSetup: require.resolve('./tests/e2e/utils/configs/setup.ts'),
-			globalTeardown: require.resolve('./tests/e2e/utils/configs/teardown.ts'),
+			globalSetup: require.resolve('./tests/e2e/configs/setup.ts'),
+			globalTeardown: require.resolve('./tests/e2e/configs/teardown.ts'),
 	  }
 	: { testIgnore: '00-wizard.spec.ts' };
 
-const config: PlaywrightTestConfig = {
-	...localInserts,
+export default {
+	...setupIsLocalhost,
 	use: {
 		headless: true,
 		viewport: { width: 1368, height: 768 },
@@ -20,7 +18,7 @@ const config: PlaywrightTestConfig = {
 		video: 'retain-on-failure',
 		screenshot: 'only-on-failure',
 		trace: 'retain-on-failure',
-		baseURL,
+		baseURL: constants.BASE_URL,
 	},
 	outputDir: 'tests/e2e/test-failures',
 	reporter: process.env.CI ? 'github' : 'list',
@@ -28,6 +26,4 @@ const config: PlaywrightTestConfig = {
 	retries: 3,
 	workers: 1,
 	timeout: 42 * 1000,
-};
-
-export default config;
+} as PlaywrightTestConfig;
diff --git a/apps/meteor/tests/e2e/00-wizard.spec.ts b/apps/meteor/tests/e2e/00-wizard.spec.ts
index 35ae763753cc..80f2ed71d6a2 100644
--- a/apps/meteor/tests/e2e/00-wizard.spec.ts
+++ b/apps/meteor/tests/e2e/00-wizard.spec.ts
@@ -1,6 +1,6 @@
-import { test, expect } from '@playwright/test';
+import { test, expect, Page } from '@playwright/test';
 
-import { VALID_EMAIL, adminLogin } from './utils/mocks/userAndPasswordMock';
+import { adminLogin } from './utils/mocks/userAndPasswordMock';
 import { setupWizardStepRegex } from './utils/mocks/urlMock';
 import { HOME_SELECTOR } from './utils/mocks/waitSelectorsMock';
 import { LoginPage, SetupWizard } from './pageobjects';
@@ -8,16 +8,17 @@ import { LoginPage, SetupWizard } from './pageobjects';
 test.describe('[Wizard]', () => {
 	let setupWizard: SetupWizard;
 	let loginPage: LoginPage;
+	let page: Page;
 
-	test.beforeEach(async ({ page }) => {
+	test.beforeEach(async ({ browser }) => {
+		page = await browser.newPage();
 		setupWizard = new SetupWizard(page);
 		loginPage = new LoginPage(page);
 	});
 
 	test.describe('[Step 2]', async () => {
-		test.beforeEach(async ({ baseURL }) => {
-			const baseUrl = baseURL;
-			await setupWizard.goto(baseUrl as string);
+		test.beforeEach(async () => {
+			await page.goto('/');
 			await loginPage.doLogin(adminLogin, false);
 		});
 
@@ -33,7 +34,7 @@ test.describe('[Wizard]', () => {
 
 	test.describe('[Step 3]', async () => {
 		test.beforeEach(async () => {
-			await setupWizard.goto('');
+			await page.goto('');
 			await loginPage.doLogin(adminLogin, false);
 			await setupWizard.stepTwoSuccess();
 		});
@@ -51,7 +52,7 @@ test.describe('[Wizard]', () => {
 		});
 
 		test('expect enable "Register" button when email is valid and terms checked', async () => {
-			await setupWizard.registeredServer.type(VALID_EMAIL);
+			await setupWizard.registeredServer.type('mail@mail.com');
 			await setupWizard.agreementField.click();
 			await expect(setupWizard.registerButton).toBeEnabled();
 		});
@@ -63,7 +64,7 @@ test.describe('[Wizard]', () => {
 
 	test.describe('[Final Step]', async () => {
 		test.beforeEach(async () => {
-			await setupWizard.goto('');
+			await page.goto('');
 			await loginPage.doLogin(adminLogin, false);
 			await setupWizard.stepTwoSuccess();
 			await setupWizard.stepThreeSuccess();
@@ -76,7 +77,7 @@ test.describe('[Wizard]', () => {
 
 		test('expect confirm standalone', async () => {
 			await setupWizard.goToWorkspace.click();
-			await setupWizard.waitForSelector(HOME_SELECTOR);
+			await page.waitForSelector(HOME_SELECTOR);
 		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/01-forgot-password.spec.ts b/apps/meteor/tests/e2e/01-forgot-password.spec.ts
index 3f2c1edeb03e..b8b29e1575e9 100644
--- a/apps/meteor/tests/e2e/01-forgot-password.spec.ts
+++ b/apps/meteor/tests/e2e/01-forgot-password.spec.ts
@@ -1,41 +1,40 @@
 import { test, expect } from '@playwright/test';
 
 import { Global, LoginPage } from './pageobjects';
-import { VALID_EMAIL, INVALID_EMAIL, INVALID_EMAIL_WITHOUT_MAIL_PROVIDER } from './utils/mocks/userAndPasswordMock';
 
 test.describe('[Forgot Password]', () => {
 	let loginPage: LoginPage;
 	let global: Global;
 
-	test.beforeEach(async ({ page, baseURL }) => {
+	test.beforeEach(async ({ page }) => {
 		loginPage = new LoginPage(page);
 		global = new Global(page);
-		const baseUrl = baseURL as string;
-		await loginPage.goto(baseUrl);
-		await loginPage.gotToForgotPassword();
+
+		await page.goto('/');
+		await loginPage.btnForgotPassword.click();
 	});
 
 	test('expect be required', async () => {
-		loginPage.submit();
+		loginPage.btnSubmit.click();
 
 		await expect(loginPage.emailInvalidText).toBeVisible();
 	});
 
 	test('expect invalid for email without domain', async () => {
-		await loginPage.emailField.type(INVALID_EMAIL_WITHOUT_MAIL_PROVIDER);
-		await loginPage.submit();
+		await loginPage.emailField.type('mail');
+		await loginPage.btnSubmit.click();
 		await expect(loginPage.emailInvalidText).toBeVisible();
 	});
 
 	test('expect be invalid for email with invalid domain', async () => {
-		await loginPage.emailField.type(INVALID_EMAIL);
-		await loginPage.submit();
+		await loginPage.emailField.type('mail@mail');
+		await loginPage.btnSubmit.click();
 		await expect(loginPage.emailInvalidText).toBeVisible();
 	});
 
 	test('expect user type a valid email', async () => {
-		await loginPage.emailField.type(VALID_EMAIL);
-		await loginPage.submit();
+		await loginPage.emailField.type('mail@mail.com');
+		await loginPage.btnSubmit.click();
 		await expect(global.getToastBarSuccess).toBeVisible();
 	});
 });
diff --git a/apps/meteor/tests/e2e/02-register.spec.ts b/apps/meteor/tests/e2e/02-register.spec.ts
index ec81337f05e7..7a5c2cecac8e 100644
--- a/apps/meteor/tests/e2e/02-register.spec.ts
+++ b/apps/meteor/tests/e2e/02-register.spec.ts
@@ -1,27 +1,39 @@
-import { test } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
-import { registerUser, WRONG_PASSWORD } from './utils/mocks/userAndPasswordMock';
+import { registerUser } from './utils/mocks/userAndPasswordMock';
 import { LoginPage } from './pageobjects';
 
 test.describe('[Register]', () => {
 	let loginPage: LoginPage;
 
-	test.beforeEach(async ({ page, baseURL }) => {
-		const URL = baseURL as string;
+	test.beforeEach(async ({ page }) => {
 		loginPage = new LoginPage(page);
-		await loginPage.goto(URL);
+		await page.goto('/');
 	});
 
 	test('expect user click in register button without data', async () => {
-		await loginPage.registerFail();
+		await loginPage.btnRegister.click();
+		await loginPage.btnSubmit.click();
+
+		await expect(loginPage.nameInvalidText).toBeVisible();
+		await expect(loginPage.emailInvalidText).toBeVisible();
+		await expect(loginPage.passwordInvalidText).toBeVisible();
 	});
 
 	test('expect user click in register button with different password', async () => {
-		await loginPage.registerFailWithDifferentPassword(registerUser, WRONG_PASSWORD);
+		await loginPage.btnRegister.click();
+		await loginPage.passwordField.type(registerUser.password);
+		await loginPage.emailField.type(registerUser.email);
+		await loginPage.nameField.type(registerUser.name);
+		await loginPage.confirmPasswordField.type('wrong_password');
+
+		await loginPage.btnSubmit.click();
+		await expect(loginPage.confirmPasswordInvalidText).toBeVisible();
+		await expect(loginPage.confirmPasswordInvalidText).toHaveText('The password confirmation does not match password');
 	});
 
 	test('expect new user is created', async () => {
-		await loginPage.gotToRegister();
+		await loginPage.btnRegister.click();
 		await loginPage.registerNewUser(registerUser);
 	});
 });
diff --git a/apps/meteor/tests/e2e/03-login.spec.ts b/apps/meteor/tests/e2e/03-login.spec.ts
index 8dbb8293700e..0eb5b4ac0694 100644
--- a/apps/meteor/tests/e2e/03-login.spec.ts
+++ b/apps/meteor/tests/e2e/03-login.spec.ts
@@ -1,18 +1,19 @@
-import { test, expect } from '@playwright/test';
+import { test, expect, Page } from '@playwright/test';
 
 import { validUser } from './utils/mocks/userAndPasswordMock';
 import { Global, LoginPage } from './pageobjects';
 import { HOME_SELECTOR } from './utils/mocks/waitSelectorsMock';
 
 test.describe('[Login]', () => {
+	let page: Page;
 	let loginPage: LoginPage;
 	let global: Global;
 
-	test.beforeEach(async ({ page, baseURL }) => {
-		const baseUrl = baseURL;
+	test.beforeEach(async ({ browser }) => {
+		page = await browser.newPage();
 		loginPage = new LoginPage(page);
 		global = new Global(page);
-		await loginPage.goto(baseUrl as string);
+		await page.goto('/');
 	});
 
 	test('expect user write a password incorrectly', async () => {
@@ -26,6 +27,6 @@ test.describe('[Login]', () => {
 
 	test('expect user make login', async () => {
 		await loginPage.doLogin(validUser);
-		await loginPage.waitForSelector(HOME_SELECTOR);
+		await page.waitForSelector(HOME_SELECTOR);
 	});
 });
diff --git a/apps/meteor/tests/e2e/04-main-elements-render.spec.ts b/apps/meteor/tests/e2e/04-main-elements-render.spec.ts
index 577da9f0aa8f..02c12b53632e 100644
--- a/apps/meteor/tests/e2e/04-main-elements-render.spec.ts
+++ b/apps/meteor/tests/e2e/04-main-elements-render.spec.ts
@@ -18,14 +18,14 @@ test.describe('[Main Elements Render]', function () {
 		mainContent = new MainContent(page);
 		flexTab = new FlexTab(page);
 
-		await loginPage.goto('/');
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 	});
 
 	test.describe('[Side Nav Bar]', () => {
 		test.describe('[Render]', () => {
 			test('expect show the new channel button', async () => {
-				await expect(sideNav.newChannelBtnToolbar).toBeVisible();
+				await expect(sideNav.btnSidebarCreate).toBeVisible();
 			});
 
 			test('expect show "general" channel', async () => {
diff --git a/apps/meteor/tests/e2e/05-channel-creation.spec.ts b/apps/meteor/tests/e2e/05-channel-creation.spec.ts
index d7beb268b1c7..ed1e3a65f8fa 100644
--- a/apps/meteor/tests/e2e/05-channel-creation.spec.ts
+++ b/apps/meteor/tests/e2e/05-channel-creation.spec.ts
@@ -1,27 +1,27 @@
 import { test } from '@playwright/test';
 import { faker } from '@faker-js/faker';
 
-import { LoginPage, ChannelCreation } from './pageobjects';
+import { LoginPage, SideNav } from './pageobjects';
 import { adminLogin } from './utils/mocks/userAndPasswordMock';
 
 test.describe('[Channel]', async () => {
-	let channelCreation: ChannelCreation;
+	let sideNav: SideNav;
 	let loginPage: LoginPage;
 
 	test.beforeAll(async ({ browser }) => {
 		const page = await browser.newPage();
 		loginPage = new LoginPage(page);
-		channelCreation = new ChannelCreation(page);
+		sideNav = new SideNav(page);
 
-		await loginPage.goto('/');
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 	});
 
 	test('expect create private channel', async () => {
-		await channelCreation.doCreateChannel(faker.animal.type() + Date.now(), true);
+		await sideNav.doCreateChannel(faker.animal.type() + Date.now(), true);
 	});
 
 	test('expect create public channel', async () => {
-		await channelCreation.doCreateChannel(faker.animal.type() + Date.now());
+		await sideNav.doCreateChannel(faker.animal.type() + Date.now());
 	});
 });
diff --git a/apps/meteor/tests/e2e/06-messaging.spec.ts b/apps/meteor/tests/e2e/06-messaging.spec.ts
index 32d88125bb27..fb6162a70789 100644
--- a/apps/meteor/tests/e2e/06-messaging.spec.ts
+++ b/apps/meteor/tests/e2e/06-messaging.spec.ts
@@ -16,7 +16,7 @@ const createBrowserContextForChat = async (
 	const mainContent = new MainContent(page);
 	const sideNav = new SideNav(page);
 
-	await loginPage.goto(baseURL);
+	await page.goto(baseURL);
 	await loginPage.doLogin(validUserInserted);
 
 	return { mainContent, sideNav };
@@ -27,17 +27,15 @@ test.describe('[Messaging]', () => {
 	let mainContent: MainContent;
 	let sideNav: SideNav;
 	let flexTab: FlexTab;
-	test.beforeAll(async ({ browser, baseURL }) => {
-		const context = await browser.newContext();
-		const page = await context.newPage();
+	test.beforeAll(async ({ browser }) => {
+		const page = await browser.newPage();
 
 		loginPage = new LoginPage(page);
 		mainContent = new MainContent(page);
 		sideNav = new SideNav(page);
 		flexTab = new FlexTab(page);
 
-		await loginPage.goto(baseURL as string);
-
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 	});
 
diff --git a/apps/meteor/tests/e2e/07-emoji.spec.ts b/apps/meteor/tests/e2e/07-emoji.spec.ts
index 61d20489ac30..26e8eb5947e9 100644
--- a/apps/meteor/tests/e2e/07-emoji.spec.ts
+++ b/apps/meteor/tests/e2e/07-emoji.spec.ts
@@ -8,17 +8,14 @@ test.describe('[Emoji]', () => {
 	let mainContent: MainContent;
 	let sideNav: SideNav;
 
-	test.beforeAll(async ({ browser, baseURL }) => {
-		const context = await browser.newContext();
-		const page = await context.newPage();
-		const URL = baseURL as string;
+	test.beforeAll(async ({ browser }) => {
+		const page = await browser.newPage();
 		loginPage = new LoginPage(page);
-		await loginPage.goto(URL);
-
-		await loginPage.doLogin(adminLogin);
 		sideNav = new SideNav(page);
 		mainContent = new MainContent(page);
 
+		await page.goto('/');
+		await loginPage.doLogin(adminLogin);
 		await sideNav.doOpenChat('general');
 	});
 
diff --git a/apps/meteor/tests/e2e/08-resolutions.spec.ts b/apps/meteor/tests/e2e/08-resolutions.spec.ts
index 18d4b45b0fed..dfb354f84075 100644
--- a/apps/meteor/tests/e2e/08-resolutions.spec.ts
+++ b/apps/meteor/tests/e2e/08-resolutions.spec.ts
@@ -8,40 +8,34 @@ let mainContent: MainContent;
 let sideNav: SideNav;
 let global: Global;
 
-async function initConfig(
-	browser: Browser,
-	baseURL: string | undefined,
-	options = { viewport: { width: 650, height: 800 } },
-): Promise<any> {
-	const context = await browser.newContext(options);
-	const page = await context.newPage();
-	const URL = baseURL as string;
+async function initConfig(browser: Browser, options = { viewport: { width: 650, height: 800 } }): Promise<any> {
+	const page = await browser.newPage(options);
 	loginPage = new LoginPage(page);
-	await loginPage.goto(URL);
-
-	await loginPage.doLogin(adminLogin);
 	sideNav = new SideNav(page);
 	mainContent = new MainContent(page);
 	global = new Global(page);
+
+	await page.goto('/');
+	await loginPage.doLogin(adminLogin);
 	return { loginPage, sideNav, mainContent };
 }
 
 test.describe('[Resolution]', function () {
 	test.describe('[Mobile Render]', async () => {
-		test.beforeAll(async ({ browser, baseURL }) => {
-			await initConfig(browser, baseURL);
+		test.beforeAll(async ({ browser }) => {
+			await initConfig(browser);
 		});
 
-		test.afterAll(async ({ browser, baseURL }) => {
-			await initConfig(browser, baseURL, { viewport: { width: 1600, height: 1600 } });
+		test.afterAll(async ({ browser }) => {
+			await initConfig(browser, { viewport: { width: 1600, height: 1600 } });
 
 			await expect(sideNav.spotlightSearchIcon).toBeVisible();
 		});
 
 		test('expect close the sidenav', async () => {
 			const position = await mainContent.mainContent.boundingBox();
-			await expect(position?.x).toEqual(0);
-			await expect(await sideNav.isSideBarOpen()).toBeFalsy;
+			expect(position?.x).toEqual(0);
+			expect(await sideNav.isSideBarOpen()).toBeFalsy;
 		});
 
 		test.describe('moving elements:', async () => {
@@ -53,24 +47,24 @@ test.describe('[Resolution]', function () {
 
 			test('expect open the sidenav', async () => {
 				const position = await mainContent.mainContent.boundingBox();
-				await expect(position?.x).toEqual(0);
-				await expect(await sideNav.isSideBarOpen()).toBeTruthy;
+				expect(position?.x).toEqual(0);
+				expect(await sideNav.isSideBarOpen()).toBeTruthy;
 			});
 
 			test('expect not close sidebar on pressing the sidebar item menu', async () => {
 				await sideNav.firstSidebarItemMenu.click();
 
 				const position = await mainContent.mainContent.boundingBox();
-				await expect(position?.x).toEqual(0);
+				expect(position?.x).toEqual(0);
 
-				await expect(await sideNav.isSideBarOpen()).toBeTruthy;
+				expect(await sideNav.isSideBarOpen()).toBeTruthy;
 
 				await sideNav.firstSidebarItemMenu.click();
 			});
 
 			test('expect close the sidenav when open general channel', async () => {
 				await sideNav.doOpenChat('general');
-				await expect(await sideNav.isSideBarOpen()).toBeFalsy;
+				expect(await sideNav.isSideBarOpen()).toBeFalsy;
 			});
 
 			test.describe('Preferences', async () => {
@@ -87,22 +81,19 @@ test.describe('[Resolution]', function () {
 					await sideNav.returnToMenuInLowResolution.click();
 				});
 
-				test('expect close the sidenav when press the preferences link', async () => {
+				test.skip('expect close the sidenav when press the preferences link', async () => {
 					await sideNav.preferences.click();
-					await sideNav.page.mouse.click(640, 30);
-					await expect(await global.flexNav.isVisible()).toBeFalsy;
+					await expect(global.flexNav).toBeHidden();
 				});
 
-				test('expect close the sidenav when press the profile link', async () => {
+				test.skip('expect close the sidenav when press the profile link', async () => {
 					await sideNav.profile.click();
-					await sideNav.page.mouse.click(640, 30);
-					await expect(await sideNav.flexNav.isVisible()).toBeFalsy;
+					await expect(sideNav.flexNav).toBeHidden();
 				});
 
-				test('expect close the preferences nav', async () => {
+				test.skip('expect close the preferences nav', async () => {
 					await sideNav.preferencesClose.click();
-					await sideNav.page.mouse.click(640, 30);
-					await expect(await sideNav.flexNav.isVisible()).toBeTruthy;
+					await expect(sideNav.flexNav).toBeHidden();
 				});
 			});
 		});
diff --git a/apps/meteor/tests/e2e/09-channel.spec.ts b/apps/meteor/tests/e2e/09-channel.spec.ts
index 342a9834ffc8..c5c575788344 100644
--- a/apps/meteor/tests/e2e/09-channel.spec.ts
+++ b/apps/meteor/tests/e2e/09-channel.spec.ts
@@ -2,10 +2,10 @@ import { test, expect } from '@playwright/test';
 
 import { Global, FlexTab, MainContent, SideNav, LoginPage } from './pageobjects';
 import { adminLogin } from './utils/mocks/userAndPasswordMock';
-import { LOCALHOST } from './utils/mocks/urlMock';
 import { publicChannelCreated, setPublicChannelCreated } from './utils/mocks/checks';
-import { publicChannelName } from './utils/mocks/channel';
-import { targetUser } from './utils/mocks/interations';
+
+const anyUser = 'rocket.cat';
+const anyChannelName = `channel-test-${Date.now()}`;
 
 let hasUserAddedInChannel = false;
 
@@ -16,39 +16,36 @@ test.describe('[Channel]', () => {
 	let sideNav: SideNav;
 	let global: Global;
 
-	test.beforeAll(async ({ browser, baseURL }) => {
-		const context = await browser.newContext();
-		const page = await context.newPage();
-		const URL = baseURL || LOCALHOST;
-		loginPage = new LoginPage(page);
-		await loginPage.goto(URL);
+	test.beforeAll(async ({ browser }) => {
+		const page = await browser.newPage();
 
-		await loginPage.doLogin(adminLogin);
+		loginPage = new LoginPage(page);
 		sideNav = new SideNav(page);
 		mainContent = new MainContent(page);
 		flexTab = new FlexTab(page);
 		global = new Global(page);
 
+		await page.goto('/');
+		await loginPage.doLogin(adminLogin);
+
 		if (!publicChannelCreated) {
-			await sideNav.createChannel(publicChannelName, false);
+			await sideNav.doCreateChannel(anyChannelName, false);
 			setPublicChannelCreated(true);
 		}
+
 		await sideNav.doOpenChat('general');
 	});
+
 	test.describe('[Search]', () => {
 		test.describe('[SpotlightSearch]', async () => {
-			test.describe('general:', () => {
-				test('expect go to general', async () => {
-					await sideNav.doOpenChat('general');
-					await expect(mainContent.channelTitle('general')).toContainText('general');
-				});
+			test('expect go to general', async () => {
+				await sideNav.doOpenChat('general');
+				await expect(mainContent.channelTitle('general')).toContainText('general');
 			});
 
-			test.describe('user created channel:', () => {
-				test('expect go to the user created channel', async () => {
-					await sideNav.doOpenChat(publicChannelName);
-					await expect(mainContent.channelTitle(publicChannelName)).toContainText(publicChannelName);
-				});
+			test('expect go to the user created channel', async () => {
+				await sideNav.doOpenChat(anyChannelName);
+				await expect(mainContent.channelTitle(anyChannelName)).toContainText(anyChannelName);
 			});
 		});
 
@@ -57,23 +54,19 @@ test.describe('[Channel]', () => {
 				await mainContent.messageInput.click();
 			});
 
-			test.describe('general:', async () => {
-				test('expect go to the general channel', async () => {
-					await sideNav.doOpenChat('general');
-				});
+			test('expect go to the general channel', async () => {
+				await sideNav.doOpenChat('general');
 			});
 
-			test.describe('user created channel:', async () => {
-				test('expect go to the user created channel', async () => {
-					await sideNav.doOpenChat(publicChannelName);
-				});
+			test('expect go to the user created channel', async () => {
+				await sideNav.doOpenChat(anyChannelName);
 			});
 		});
 	});
 
 	test.describe('[Usage]', () => {
 		test.beforeAll(async () => {
-			await sideNav.doOpenChat(publicChannelName);
+			await sideNav.doOpenChat(anyChannelName);
 		});
 
 		test.describe('Adding a user to the room:', async () => {
@@ -92,7 +85,7 @@ test.describe('[Channel]', () => {
 			});
 
 			test('expect add people to the room', async () => {
-				await flexTab.addPeopleToChannel(targetUser);
+				await flexTab.addPeopleToChannel(anyUser);
 				hasUserAddedInChannel = true;
 				await expect(global.getToastBarSuccess).toBeVisible();
 			});
@@ -190,7 +183,7 @@ test.describe('[Channel]', () => {
 				test.beforeAll(async () => {
 					if (!hasUserAddedInChannel) {
 						await flexTab.btnTabMembers.click();
-						await flexTab.addPeopleToChannel(targetUser);
+						await flexTab.addPeopleToChannel(anyUser);
 						await flexTab.btnTabMembers.click();
 					}
 					await flexTab.btnTabMembers.click();
@@ -204,7 +197,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect mute rocket cat', async () => {
-					await flexTab.muteUser(targetUser);
+					await flexTab.muteUser(anyUser);
 				});
 			});
 
@@ -212,7 +205,7 @@ test.describe('[Channel]', () => {
 				test.beforeAll(async () => {
 					if (!hasUserAddedInChannel) {
 						await flexTab.btnTabMembers.click();
-						await flexTab.addPeopleToChannel(targetUser);
+						await flexTab.addPeopleToChannel(anyUser);
 						await flexTab.btnTabMembers.click();
 					}
 					await flexTab.btnTabMembers.click();
@@ -226,7 +219,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect set rocket cat as owner', async () => {
-					await flexTab.setUserOwner(targetUser);
+					await flexTab.setUserOwner(anyUser);
 				});
 
 				test('expect dismiss the toast', async () => {
@@ -240,7 +233,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect show the target username in owner add message', async () => {
-					await expect(mainContent.lastMessageRoleAdded).toContainText(targetUser);
+					await expect(mainContent.lastMessageRoleAdded).toContainText(anyUser);
 				});
 			});
 
@@ -248,7 +241,7 @@ test.describe('[Channel]', () => {
 				test.beforeAll(async () => {
 					if (!hasUserAddedInChannel) {
 						await flexTab.btnTabMembers.click();
-						await flexTab.addPeopleToChannel(targetUser);
+						await flexTab.addPeopleToChannel(anyUser);
 						await flexTab.btnTabMembers.click();
 					}
 					await flexTab.btnTabMembers.click();
@@ -262,7 +255,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect set rocket cat as moderator', async () => {
-					await flexTab.setUserModerator(targetUser);
+					await flexTab.setUserModerator(anyUser);
 				});
 
 				test('expect be that the last message is a subscription role added', async () => {
@@ -289,7 +282,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect show the old name', async () => {
-					await expect(flexTab.firstSetting).toHaveText(publicChannelName);
+					await expect(flexTab.firstSetting).toHaveText(anyChannelName);
 				});
 
 				test('expect click the edit name', async () => {
@@ -297,7 +290,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect edit the name input', async () => {
-					await flexTab.editNameTextInput.fill(`NAME-EDITED-${publicChannelName}`);
+					await flexTab.editNameTextInput.fill(`NAME-EDITED-${anyChannelName}`);
 				});
 
 				test('expect save the name', async () => {
@@ -305,7 +298,7 @@ test.describe('[Channel]', () => {
 				});
 
 				test('expect to find and open with new name', async () => {
-					await sideNav.doOpenChat(`NAME-EDITED-${publicChannelName}`);
+					await sideNav.doOpenChat(`NAME-EDITED-${anyChannelName}`);
 				});
 			});
 		});
diff --git a/apps/meteor/tests/e2e/10-user-preferences.spec.ts b/apps/meteor/tests/e2e/10-user-preferences.spec.ts
index aeea9b8d96c6..f1a57caa07f4 100644
--- a/apps/meteor/tests/e2e/10-user-preferences.spec.ts
+++ b/apps/meteor/tests/e2e/10-user-preferences.spec.ts
@@ -3,117 +3,54 @@ import faker from '@faker-js/faker';
 
 import { PreferencesMainContent, MainContent, SideNav, LoginPage, FlexTab } from './pageobjects';
 import { adminLogin } from './utils/mocks/userAndPasswordMock';
-import { clearMessages } from './utils/helpers/clearMessages';
-import { verifyTestBaseUrl } from './utils/configs/verifyTestBaseUrl';
 
 test.describe('[User Preferences]', () => {
-	test.beforeAll(async () => {
-		const { isLocal } = verifyTestBaseUrl();
-		if (isLocal) {
-			await clearMessages(['GENERAL']);
-		}
+	let flexTab: FlexTab;
+	let loginPage: LoginPage;
+	let mainContent: MainContent;
+	let sideNav: SideNav;
+	let preferencesMainContent: PreferencesMainContent;
+
+	test.beforeAll(async ({ browser }) => {
+		const page = await browser.newPage();
+		loginPage = new LoginPage(page);
+		sideNav = new SideNav(page);
+		mainContent = new MainContent(page);
+		preferencesMainContent = new PreferencesMainContent(page);
+		flexTab = new FlexTab(page);
+
+		await page.goto('/');
+		await loginPage.doLogin(adminLogin);
+		await sideNav.sidebarUserMenu.click();
+		await sideNav.account.click();
 	});
-	test.describe('default', () => {
-		let flexTab: FlexTab;
-		let loginPage: LoginPage;
-		let mainContent: MainContent;
-		let sideNav: SideNav;
-		let preferencesMainContent: PreferencesMainContent;
 
-		test.beforeAll(async ({ browser, baseURL }) => {
-			const context = await browser.newContext();
-			const page = await context.newPage();
-			const URL = baseURL as string;
-			loginPage = new LoginPage(page);
-			await loginPage.goto(URL);
+	test.describe('[Update UserInfo]', () => {
+		const newName = faker.name.findName();
+		const newUserName = faker.internet.userName(newName);
 
-			await loginPage.doLogin(adminLogin);
-			sideNav = new SideNav(page);
-			mainContent = new MainContent(page);
-			preferencesMainContent = new PreferencesMainContent(page);
-			flexTab = new FlexTab(page);
-
-			await sideNav.sidebarUserMenu.click();
-			await sideNav.account.click();
+		test('expect update profile with new name/username', async () => {
+			await sideNav.profile.click();
+			await preferencesMainContent.inputName.fill(newName);
+			await preferencesMainContent.inputUsername.fill(newUserName);
+			await preferencesMainContent.submitBtn.click();
 		});
 
-		test.describe('render:', () => {
-			test('expect show the preferences link', async () => {
-				await expect(sideNav.preferences).toBeVisible();
-			});
-
-			test('expect show the profile link', async () => {
-				await expect(sideNav.profile).toBeVisible();
-			});
-
-			test('expect click on the profile link', async () => {
-				await sideNav.profile.click();
-			});
-
-			test('expect show the username input', async () => {
-				await expect(preferencesMainContent.userNameTextInput).toBeVisible();
-			});
+		test('expect show new username in the last message', async () => {
+			await sideNav.preferencesClose.click();
+			await sideNav.doOpenChat('general');
+			await mainContent.sendMessage('HI');
 
-			test('expect show the real name input', async () => {
-				await expect(preferencesMainContent.realNameTextInput).toBeVisible();
-			});
-
-			test('expect show the email input', async () => {
-				await expect(preferencesMainContent.emailTextInput).toBeVisible(); // .scrollIntoView()
-			});
-
-			test('expect show the password input', async () => {
-				await expect(preferencesMainContent.passwordTextInput).toBeVisible(); // .scrollIntoView()
-			});
-
-			test('expect show the submit button', async () => {
-				await expect(preferencesMainContent.submitBtn).toBeVisible();
-				await expect(preferencesMainContent.submitBtn).toBeDisabled();
-			});
+			await expect(mainContent.lastUserMessage).toContainText(newUserName);
 		});
 
-		test.describe('[User Info Change]', () => {
-			const newName = faker.name.findName();
-			const newUserName = `${faker.internet.userName(newName)}`;
-
-			test('expect click on the profile link', async () => {
-				await sideNav.profile.click();
-			});
-
-			test('expect change the name field', async () => {
-				await preferencesMainContent.changeRealName(newName);
-			});
-
-			test('expect change the Username field', async () => {
-				await preferencesMainContent.changeUsername(newUserName);
-			});
-
-			test('expect save the settings', async () => {
-				await preferencesMainContent.saveChanges();
-			});
-
-			test('expect close the preferences menu', async () => {
-				await sideNav.preferencesClose.click();
-				await sideNav.doOpenChat('general');
-			});
-
-			test('send message with different user name', async () => {
-				await mainContent.sendMessage('HI');
-			});
-
-			test('expect be that the name on the last message is the edited one', async () => {
-				await expect(mainContent.lastMessageUser).toContainText(newUserName);
-			});
-
-			test('expect be that the user name on the members flex tab is the edited one', async () => {
-				await mainContent.lastMessageUser.click();
-				await expect(mainContent.userCard).toBeVisible();
-			});
+		test('expect show new username in card and profile', async () => {
+			await mainContent.sendMessage('HI');
+			await mainContent.btnLastUserMessage.click();
+			await expect(mainContent.userCard).toBeVisible();
 
-			test('expect that the real name on the members flex tab is the edited one', async () => {
-				await mainContent.viewUserProfile.click();
-				await expect(flexTab.memberRealName).toHaveText(newUserName);
-			});
+			await mainContent.viewUserProfile.click();
+			await expect(flexTab.userUsername).toHaveText(newUserName);
 		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/11-admin.spec.ts b/apps/meteor/tests/e2e/11-admin.spec.ts
index f56e9b402e32..9e933397e88e 100644
--- a/apps/meteor/tests/e2e/11-admin.spec.ts
+++ b/apps/meteor/tests/e2e/11-admin.spec.ts
@@ -1,24 +1,26 @@
-import { test, expect } from '@playwright/test';
+import { test, expect, Page } from '@playwright/test';
 
-import { adminLogin, ROCKET_CAT } from './utils/mocks/userAndPasswordMock';
+import { adminLogin } from './utils/mocks/userAndPasswordMock';
 import { FlexTab, Administration, LoginPage, SideNav } from './pageobjects';
 import { ROCKET_CAT_SELECTOR } from './utils/mocks/waitSelectorsMock';
-import { Checkbox } from './utils/enums/Checkbox';
 
 test.describe('[Administration]', () => {
+	let page: Page;
 	let loginPage: LoginPage;
 	let sideNav: SideNav;
 	let admin: Administration;
 	let flexTab: FlexTab;
+
 	const checkBoxesSelectors = ['Direct', 'Public', 'Private', 'Omnichannel', 'Discussions', 'Teams'];
-	test.beforeAll(async ({ browser, baseURL }) => {
-		const context = await browser.newContext();
-		const page = await context.newPage();
+
+	test.beforeAll(async ({ browser }) => {
+		page = await browser.newPage();
 		loginPage = new LoginPage(page);
 		sideNav = new SideNav(page);
 		flexTab = new FlexTab(page);
 		admin = new Administration(page);
-		await loginPage.goto(baseURL as string);
+
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 	});
 	test.describe('[Admin View]', () => {
@@ -80,43 +82,43 @@ test.describe('[Administration]', () => {
 				});
 
 				test('expect not show the general channel with direct', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Direct]).click();
+					await admin.adminCheckBox('Direct').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'detached' });
 					await expect(admin.roomsGeneralChannel).not.toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Direct]).click();
+					await admin.adminCheckBox('Direct').click();
 				});
 
 				test('expect show the general channel with public ', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Public]).click();
+					await admin.adminCheckBox('Public').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'visible' });
 					await expect(admin.roomsGeneralChannel).toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Public]).click();
+					await admin.adminCheckBox('Public').click();
 				});
 
 				test('expect not show the general channel with private ', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Private]).click();
+					await admin.adminCheckBox('Private').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'detached' });
 					await expect(admin.roomsGeneralChannel).not.toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Private]).click();
+					await admin.adminCheckBox('Private').click();
 				});
 
 				test('expect not show the general channel with omnichannel', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Omnichannel]).click();
+					await admin.adminCheckBox('Omnichannel').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'detached' });
 					await expect(admin.roomsGeneralChannel).not.toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Omnichannel]).click();
+					await admin.adminCheckBox('Omnichannel').click();
 				});
 				test('expect not show the general channel with discussion', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Discussions]).click();
+					await admin.adminCheckBox('Discussions').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'detached' });
 					await expect(admin.roomsGeneralChannel).not.toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Discussions]).click();
+					await admin.adminCheckBox('Discussions').click();
 				});
 				test('expect not show the general channel with teams', async () => {
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Teams]).click();
+					await admin.adminCheckBox('Teams').click();
 					await admin.roomsGeneralChannel.waitFor({ state: 'detached' });
 					await expect(admin.roomsGeneralChannel).not.toBeVisible();
-					await admin.adminCheckBox(checkBoxesSelectors[Checkbox.Teams]).click();
+					await admin.adminCheckBox('Teams').click();
 				});
 			});
 			test.describe('[Users]', () => {
@@ -139,8 +141,8 @@ test.describe('[Administration]', () => {
 					});
 
 					test('expect should show rocket.cat', async () => {
-						await admin.usersFilter.type(ROCKET_CAT);
-						await admin.waitForSelector(ROCKET_CAT_SELECTOR);
+						await admin.usersFilter.type('rocket.cat');
+						await page.waitForSelector(ROCKET_CAT_SELECTOR);
 					});
 					test('expect dont user when write wrong name', async () => {
 						await admin.usersFilter.type('any_user_wrong');
diff --git a/apps/meteor/tests/e2e/12-settings.spec.ts b/apps/meteor/tests/e2e/12-settings.spec.ts
index d5ad4940fb91..bbcebb070d05 100644
--- a/apps/meteor/tests/e2e/12-settings.spec.ts
+++ b/apps/meteor/tests/e2e/12-settings.spec.ts
@@ -23,7 +23,7 @@ test.describe.skip('[Settings]', async () => {
 		sideNav = new SideNav(page);
 		userPreferences = new PreferencesMainContent(page);
 
-		await loginPage.goto('/');
+		await page.goto('/');
 		await loginPage.doLogin(validUserInserted);
 		await sideNav.general.click();
 	});
@@ -342,8 +342,8 @@ test.describe.skip('[Settings]', async () => {
 
 			expect(userPreferences.avatarFileInput.isDisabled()).toBeTruthy();
 			expect(userPreferences.emailTextInput.isDisabled()).toBeTruthy();
-			expect(userPreferences.realNameTextInput.isDisabled()).toBeTruthy();
-			expect(userPreferences.userNameTextInput.isDisabled()).toBeTruthy();
+			expect(userPreferences.inputName.isDisabled()).toBeTruthy();
+			expect(userPreferences.inputUsername.isDisabled()).toBeTruthy();
 		});
 
 		test('(API) expect enable profile change', async ({ request }) => {
@@ -406,7 +406,7 @@ test.describe.skip('[Settings (admin)]', async () => {
 		sideNav = new SideNav(page);
 		admin = new Administration(page);
 
-		await loginPage.goto('/');
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 		await sideNav.general.click();
 	});
@@ -473,7 +473,7 @@ test.describe.skip('[Settings (admin)]', async () => {
 
 		test.describe('(UI) expect activate/deactivate flow as admin', () => {
 			test('expect open /users as admin', async () => {
-				await admin.goto('/admin');
+				await page.goto('/admin');
 				await admin.usersLink.click();
 			});
 
diff --git a/apps/meteor/tests/e2e/13-permissions.spec.ts b/apps/meteor/tests/e2e/13-permissions.spec.ts
index c082a5c34cf3..efdced3073b5 100644
--- a/apps/meteor/tests/e2e/13-permissions.spec.ts
+++ b/apps/meteor/tests/e2e/13-permissions.spec.ts
@@ -76,7 +76,7 @@ test.describe('[Permissions]', () => {
 	test.describe('assert "userToBeCreated" permissions', () => {
 		test.beforeAll(async () => {
 			await sideNav.doLogout();
-			await loginPage.goto('/');
+			await page.goto('/');
 			await loginPage.doLogin(userToBeCreated);
 			await sideNav.general.click();
 		});
diff --git a/apps/meteor/tests/e2e/14-setting-permissions.spec.ts b/apps/meteor/tests/e2e/14-setting-permissions.spec.ts
index cfdc65f5cd0c..00f0142397a0 100644
--- a/apps/meteor/tests/e2e/14-setting-permissions.spec.ts
+++ b/apps/meteor/tests/e2e/14-setting-permissions.spec.ts
@@ -1,10 +1,11 @@
-import { test, expect } from '@playwright/test';
+import { test, expect, Page } from '@playwright/test';
 import faker from '@faker-js/faker';
 
 import { adminLogin, validUserInserted } from './utils/mocks/userAndPasswordMock';
 import { SideNav, Administration, LoginPage } from './pageobjects';
 
 test.describe('[Rocket.Chat Settings based permissions]', () => {
+	let page: Page;
 	let admin: Administration;
 	let sideNav: SideNav;
 	let loginPage: LoginPage;
@@ -12,8 +13,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 	const newHomeTitle = faker.animal.type();
 
 	test.beforeAll(async ({ browser }) => {
-		const page = await browser.newPage();
-
+		page = await browser.newPage();
 		sideNav = new SideNav(page);
 		admin = new Administration(page);
 		loginPage = new LoginPage(page);
@@ -21,7 +21,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 
 	test.describe('[Give User Permissions]', async () => {
 		test.beforeAll(async () => {
-			await loginPage.goto('/');
+			await page.goto('/');
 			await loginPage.doLogin(adminLogin);
 			await sideNav.sidebarUserMenu.click();
 			await sideNav.admin.click();
@@ -29,8 +29,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 		});
 
 		test.afterAll(async () => {
-			await loginPage.goto('/home');
-			await loginPage.logout();
+			await sideNav.doLogout();
 		});
 
 		test('Set permission for user to manage settings', async () => {
@@ -58,7 +57,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 
 	test.describe('[Test new user setting permissions]', async () => {
 		test.beforeAll(async () => {
-			await loginPage.goto('/');
+			await page.goto('/');
 			await loginPage.doLogin(validUserInserted);
 
 			await sideNav.sidebarUserMenu.click();
@@ -68,8 +67,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 		});
 
 		test.afterAll(async () => {
-			await loginPage.goto('/home');
-			await loginPage.logout();
+			await sideNav.doLogout();
 		});
 
 		test('expect new permissions is enabled for user', async () => {
@@ -80,7 +78,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 
 	test.describe('[Verify settings change and cleanup]', async () => {
 		test.beforeAll(async () => {
-			await loginPage.goto('/');
+			await page.goto('/');
 			await loginPage.doLogin(adminLogin);
 			await sideNav.sidebarUserMenu.click();
 			await sideNav.admin.click();
@@ -90,8 +88,7 @@ test.describe('[Rocket.Chat Settings based permissions]', () => {
 		});
 
 		test.afterAll(async () => {
-			await loginPage.goto('/home');
-			await loginPage.logout();
+			await sideNav.doLogout();
 		});
 
 		test('New settings value visible for admin as well', async () => {
diff --git a/apps/meteor/tests/e2e/15-message-popup.spec.ts b/apps/meteor/tests/e2e/15-message-popup.spec.ts
index 7de60a43d274..9700d0dc1b97 100644
--- a/apps/meteor/tests/e2e/15-message-popup.spec.ts
+++ b/apps/meteor/tests/e2e/15-message-popup.spec.ts
@@ -18,7 +18,7 @@ test.describe('[Message Popup]', () => {
 		mainContent = new MainContent(page);
 		sideNav = new SideNav(page);
 
-		await loginPage.goto('/');
+		await page.goto('/');
 		await loginPage.doLogin(adminLogin);
 		await sideNav.doOpenChat('public channel');
 	});
diff --git a/apps/meteor/tests/e2e/16-discussion.spec.ts b/apps/meteor/tests/e2e/16-discussion.spec.ts
index 5746c13f3e31..f95ae20ea9a3 100644
--- a/apps/meteor/tests/e2e/16-discussion.spec.ts
+++ b/apps/meteor/tests/e2e/16-discussion.spec.ts
@@ -29,7 +29,7 @@ test.describe('[Discussion]', () => {
 		test('expect discussion is created', async () => {
 			const discussionName = faker.animal.type() + Date.now();
 			message = faker.animal.type();
-			await sideNav.newChannelBtnToolbar.click();
+			await sideNav.btnSidebarCreate.click();
 			await discussion.doCreateDiscussion('public channel', discussionName, message);
 		});
 	});
diff --git a/apps/meteor/tests/e2e/utils/configs/setup.ts b/apps/meteor/tests/e2e/configs/setup.ts
similarity index 68%
rename from apps/meteor/tests/e2e/utils/configs/setup.ts
rename to apps/meteor/tests/e2e/configs/setup.ts
index 27950f4e0cf9..71a2650be237 100644
--- a/apps/meteor/tests/e2e/utils/configs/setup.ts
+++ b/apps/meteor/tests/e2e/configs/setup.ts
@@ -1,9 +1,8 @@
-import { MongoHelper } from '../helpers/MongoHelper';
-import { roomMock, subscriptionMock, userMock } from '../mocks/initialData';
-
-const mongoBaseUrl = process.env.MONGO_URL
-	? `${process.env.MONGO_URL}?retryWrites=false`
-	: 'mongodb://localhost:3001/meteor?retryWrites=false';
+import { MongoHelper } from '../utils/MongoHelper';
+import { URL_MONGODB } from '../utils/constants';
+import { roomMock } from '../utils/mocks/roomMock';
+import { userMock } from '../utils/mocks/userMock';
+import { subscriptionMock } from '../utils/mocks/subscriptionMock';
 
 const insertRoom = async (): Promise<void> => {
 	const roomCollection = await MongoHelper.getCollection('rocketchat_room');
@@ -21,7 +20,7 @@ const subscribeUserInChannels = async (): Promise<void> => {
 };
 
 export default async (): Promise<void> => {
-	await MongoHelper.connect(mongoBaseUrl);
+	await MongoHelper.connect(URL_MONGODB);
 	await insertRoom();
 	await insertUser();
 	await subscribeUserInChannels();
diff --git a/apps/meteor/tests/e2e/utils/configs/teardown.ts b/apps/meteor/tests/e2e/configs/teardown.ts
similarity index 95%
rename from apps/meteor/tests/e2e/utils/configs/teardown.ts
rename to apps/meteor/tests/e2e/configs/teardown.ts
index ef7457971992..fc358d3eb2d6 100644
--- a/apps/meteor/tests/e2e/utils/configs/teardown.ts
+++ b/apps/meteor/tests/e2e/configs/teardown.ts
@@ -1,4 +1,4 @@
-import { MongoHelper } from '../helpers/MongoHelper';
+import { MongoHelper } from '../utils/MongoHelper';
 
 const mongoBaseUrl = process.env.MONGO_URL
 	? `${process.env.MONGO_URL}?retryWrites=false`
diff --git a/apps/meteor/tests/e2e/pageobjects/Administration.ts b/apps/meteor/tests/e2e/pageobjects/Administration.ts
index b0c4e45c5a59..5a742cec693b 100644
--- a/apps/meteor/tests/e2e/pageobjects/Administration.ts
+++ b/apps/meteor/tests/e2e/pageobjects/Administration.ts
@@ -63,7 +63,7 @@ export class Administration extends BasePage {
 		return this.page.locator('input[placeholder ="Search Rooms"]');
 	}
 
-	public async verifyCheckBoxRendered(checkBoxes: string[]): Promise<void> {
+	async verifyCheckBoxRendered(checkBoxes: string[]): Promise<void> {
 		const expected = [];
 		for (const checkBox of checkBoxes) {
 			expected.push(expect(this.adminCheckBox(checkBox)).toBeVisible());
@@ -87,7 +87,7 @@ export class Administration extends BasePage {
 		return this.page.locator('input[placeholder="Search Users"]');
 	}
 
-	public userInTable(id: string): Locator {
+	userInTable(id: string): Locator {
 		return this.page.locator(`tr > td:has-text("${id}")`);
 	}
 
@@ -347,7 +347,7 @@ export class Administration extends BasePage {
 		return this.page.locator('[data-qa-setting-id="Accounts_Default_User_Preferences_notificationsSoundVolume"]');
 	}
 
-	public adminCheckBox(checkBox: string): Locator {
+	adminCheckBox(checkBox: string): Locator {
 		return this.page.locator(`//label[text()="${checkBox}"]/preceding-sibling::label/i`);
 	}
 
@@ -355,7 +355,7 @@ export class Administration extends BasePage {
 		return this.page.locator('.main-content input[placeholder="Search"]');
 	}
 
-	public getCheckboxPermission(label: string, column = 6): Locator {
+	getCheckboxPermission(label: string, column = 6): Locator {
 		return this.page.locator(`tr td:has-text("${label}") ~ td:nth-child(${column})`).locator('label').first();
 	}
 
diff --git a/apps/meteor/tests/e2e/pageobjects/Agents.ts b/apps/meteor/tests/e2e/pageobjects/Agents.ts
index 62980052e6f2..8964aea58f5b 100644
--- a/apps/meteor/tests/e2e/pageobjects/Agents.ts
+++ b/apps/meteor/tests/e2e/pageobjects/Agents.ts
@@ -60,7 +60,7 @@ export class Agents extends BasePage {
 		return this.page.locator('[data-qa="AgentInfoAction-Remove"]');
 	}
 
-	public availabilityOption(availability: string): Locator {
+	availabilityOption(availability: string): Locator {
 		return this.page.locator(`div.rcx-options[role="listbox"] div.rcx-box ol[role="listbox"] li[value="${availability}"]`);
 	}
 
@@ -78,11 +78,11 @@ export class Agents extends BasePage {
 		return this.page.locator('[data-qa="AgentEditButtonSave"]');
 	}
 
-	public getAgentInputs(id: string): Locator {
+	getAgentInputs(id: string): Locator {
 		return this.page.locator(`[data-qa="AgentEditTextInput-${id}"]`);
 	}
 
-	public async doAddAgent(): Promise<void> {
+	async doAddAgent(): Promise<void> {
 		await this.textAgentsTitle.waitFor();
 		await this.inputAgentsUserName.type('rocket.cat', { delay: 100 });
 		// FIXME: temp solution for rocket.chat instability
@@ -93,13 +93,13 @@ export class Agents extends BasePage {
 		await this.btnAddAgents.click();
 	}
 
-	public async getListOfExpectedInputs(): Promise<void> {
+	async getListOfExpectedInputs(): Promise<void> {
 		const inputs = ['Name', 'Username', 'Email', 'Departaments', 'Status'].map((id) => this.getAgentInputs(id));
 		await Promise.all(inputs.map((input) => expect(input).toBeVisible()));
 		await this.btnClose.click();
 	}
 
-	public async doChangeUserStatus(availability: string): Promise<void> {
+	async doChangeUserStatus(availability: string): Promise<void> {
 		await this.agentAdded.click();
 		await this.btnEdit.click();
 		await this.agentStatus.click();
@@ -107,7 +107,7 @@ export class Agents extends BasePage {
 		await this.btnAgentSave.click();
 	}
 
-	public async doRemoveAgent(): Promise<void> {
+	async doRemoveAgent(): Promise<void> {
 		await this.agentAdded.click();
 		await this.btnRemove.click();
 	}
diff --git a/apps/meteor/tests/e2e/pageobjects/BasePage.ts b/apps/meteor/tests/e2e/pageobjects/BasePage.ts
index 424e88a43e32..7e14b2470f56 100644
--- a/apps/meteor/tests/e2e/pageobjects/BasePage.ts
+++ b/apps/meteor/tests/e2e/pageobjects/BasePage.ts
@@ -7,14 +7,6 @@ export class BasePage {
 		this.page = page;
 	}
 
-	async goto(path: string): Promise<void> {
-		await this.page.goto(path);
-	}
-
-	async waitForSelector(selector: string): Promise<void> {
-		await this.page.waitForSelector(selector);
-	}
-
 	async keyboardPress(key: string): Promise<void> {
 		await this.page.keyboard.press(key);
 	}
diff --git a/apps/meteor/tests/e2e/pageobjects/ChannelCreation.ts b/apps/meteor/tests/e2e/pageobjects/ChannelCreation.ts
deleted file mode 100644
index 8a2d31bd5803..000000000000
--- a/apps/meteor/tests/e2e/pageobjects/ChannelCreation.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { BasePage } from './BasePage';
-
-export class ChannelCreation extends BasePage {
-	// TODO: replace old selectors with data-qa-id
-	async doCreateChannel(name: string, isPrivate = false): Promise<void> {
-		await this.page.locator('[data-qa="sidebar-create"]').click();
-		await this.page.locator('//ul[@class="rc-popover__list"]//li[@class="rcx-option"][1]').click();
-		await this.page.locator('[placeholder="Channel Name"]').type(name);
-		await this.page.locator('[placeholder="What is this channel about?"]').type('any_description');
-
-		if (!isPrivate) {
-			await this.page.locator('//label[contains(text(),"Private")]/../following-sibling::label/i').click();
-		}
-
-		await this.page.locator('//button[contains(text(), "Create" )]').click();
-	}
-}
diff --git a/apps/meteor/tests/e2e/pageobjects/Departments.ts b/apps/meteor/tests/e2e/pageobjects/Departments.ts
index c3f15aa5e146..4b97a46cc1a1 100644
--- a/apps/meteor/tests/e2e/pageobjects/Departments.ts
+++ b/apps/meteor/tests/e2e/pageobjects/Departments.ts
@@ -59,7 +59,7 @@ export class Departments extends BasePage {
 		return this.page.locator('button.rcx-button--primary.rcx-button >> text="Add"');
 	}
 
-	public virtuosoOptions(option: string): Locator {
+	virtuosoOptions(option: string): Locator {
 		return this.page.locator(`[data-test-id="virtuoso-scroller"] .rcx-option >> text="${option}"`);
 	}
 
@@ -83,7 +83,7 @@ export class Departments extends BasePage {
 		return this.page.locator('#modal-root');
 	}
 
-	public async getAddScreen(): Promise<void> {
+	async getAddScreen(): Promise<void> {
 		const textInputs = [this.nameInput, this.descriptionInput, this.emailInput];
 		const toggleButtons = [this.enabledToggle, this.showOnOfflinePageToggle, this.requestTagBeforeClosingChatToggle];
 		const selects = [this.selectLiveChatDepartmentOfflineMessageToChannel, this.selectAgentsTable];
@@ -93,12 +93,12 @@ export class Departments extends BasePage {
 		await Promise.all(addScreenSelectors.map((addScreenSelector) => expect(addScreenSelector).toBeVisible()));
 	}
 
-	public async doAddAgent(): Promise<void> {
+	async doAddAgent(): Promise<void> {
 		await this.enabledToggle.click();
 		await this.nameInput.type('rocket.cat');
 	}
 
-	public async doAddDepartments(): Promise<void> {
+	async doAddDepartments(): Promise<void> {
 		await this.enabledToggle.click();
 		await this.nameInput.type('any_name');
 		await this.descriptionInput.type('any_description');
@@ -112,7 +112,7 @@ export class Departments extends BasePage {
 		await this.btnSaveDepartment.click();
 	}
 
-	public async doEditDepartments(): Promise<void> {
+	async doEditDepartments(): Promise<void> {
 		await this.enabledToggle.click();
 		await this.nameInput.click({ clickCount: 3 });
 		await this.keyboardPress('Backspace');
@@ -123,7 +123,7 @@ export class Departments extends BasePage {
 		await this.btnSaveDepartment.click();
 	}
 
-	public async doBackToPrincipalScreen(): Promise<void> {
+	async doBackToPrincipalScreen(): Promise<void> {
 		await this.departmentAdded.click();
 		await this.btnBack.click();
 	}
diff --git a/apps/meteor/tests/e2e/pageobjects/Discussion.ts b/apps/meteor/tests/e2e/pageobjects/Discussion.ts
index 618bbdd42b1c..18dcaf6910ba 100644
--- a/apps/meteor/tests/e2e/pageobjects/Discussion.ts
+++ b/apps/meteor/tests/e2e/pageobjects/Discussion.ts
@@ -27,7 +27,7 @@ export class Discussion extends BasePage {
 		return this.page.locator('button.rcx-button--primary.rcx-button >> text="Create"');
 	}
 
-	public discussionCreated(discussionName: string): Locator {
+	discussionCreated(discussionName: string): Locator {
 		return this.page.locator(`[data-qa="sidebar-item-title"] >> text='${discussionName}'`);
 	}
 
diff --git a/apps/meteor/tests/e2e/pageobjects/FlexTab.ts b/apps/meteor/tests/e2e/pageobjects/FlexTab.ts
index 8440eac56bf4..5a167704baf2 100644
--- a/apps/meteor/tests/e2e/pageobjects/FlexTab.ts
+++ b/apps/meteor/tests/e2e/pageobjects/FlexTab.ts
@@ -125,7 +125,7 @@ export class FlexTab extends BasePage {
 		return this.page.locator('[value="muteUser"]');
 	}
 
-	get memberRealName(): Locator {
+	get userUsername(): Locator {
 		return this.page.locator('[data-qa="UserInfoUserName"]');
 	}
 
@@ -145,7 +145,7 @@ export class FlexTab extends BasePage {
 		return this.page.locator('//aside//i[contains(@class, "rcx-icon--name-hashtag")]/../div');
 	}
 
-	public secondSetting(topic: string): Locator {
+	secondSetting(topic: string): Locator {
 		return this.page.locator(`//header//*[contains(text(), "${topic}")]`);
 	}
 
@@ -223,7 +223,7 @@ export class FlexTab extends BasePage {
 		return this.page.locator('//html//body//div[1]//div//div[3]//div[1]//main//div//aside//div[2]//div//div//h3//div//div[2]//button[2]');
 	}
 
-	public getUserEl(username: string): Locator {
+	getUserEl(username: string): Locator {
 		return this.page.locator(`[data-qa="MemberItem-${username}"]`);
 	}
 
@@ -251,20 +251,20 @@ export class FlexTab extends BasePage {
 		return this.page.locator('[data-qa="UserUserInfo-menu"]');
 	}
 
-	public async setUserOwner(user: string): Promise<void> {
+	async setUserOwner(user: string): Promise<void> {
 		await this.enterUserView(user);
 		await this.setOwnerBtn.waitFor();
 		await this.setOwnerBtn.click();
 	}
 
-	public async setUserModerator(user: string): Promise<void> {
+	async setUserModerator(user: string): Promise<void> {
 		await this.enterUserView(user);
 		await this.userMoreActions.click();
 		await this.setModeratorBtn.waitFor();
 		await this.setModeratorBtn.click();
 	}
 
-	public async muteUser(user: string): Promise<void> {
+	async muteUser(user: string): Promise<void> {
 		await this.enterUserView(user);
 		await this.userMoreActions.click();
 		await this.muteUserBtn.waitFor();
@@ -273,13 +273,13 @@ export class FlexTab extends BasePage {
 		await this.mainSideBarBack.click();
 	}
 
-	public async enterUserView(user: string): Promise<void> {
+	async enterUserView(user: string): Promise<void> {
 		const userEl = this.getUserEl(user);
 		await userEl.waitFor();
 		await userEl.click();
 	}
 
-	public async addPeopleToChannel(user: string): Promise<void> {
+	async addPeopleToChannel(user: string): Promise<void> {
 		await this.addUserButton.click();
 		await this.chooseUserSearch.type(user);
 		await this.page.waitForTimeout(3000);
@@ -293,7 +293,7 @@ export class FlexTab extends BasePage {
 		);
 	}
 
-	public async doAddRole(role: string): Promise<void> {
+	async doAddRole(role: string): Promise<void> {
 		await this.usersAddUserRoleList.click();
 		await this.page.locator(`li[value=${role}]`).click();
 	}
diff --git a/apps/meteor/tests/e2e/pageobjects/Global.ts b/apps/meteor/tests/e2e/pageobjects/Global.ts
index 0a19087ff667..dc4e9318c351 100644
--- a/apps/meteor/tests/e2e/pageobjects/Global.ts
+++ b/apps/meteor/tests/e2e/pageobjects/Global.ts
@@ -27,12 +27,12 @@ export class Global extends BasePage {
 		return this.page.locator('.flex-nav');
 	}
 
-	public async confirmPopup(): Promise<void> {
+	async confirmPopup(): Promise<void> {
 		await this.modalConfirm.waitFor();
 		await this.modalConfirm.click();
 	}
 
-	public async dismissToastBar(): Promise<void> {
+	async dismissToastBar(): Promise<void> {
 		await this.getToastBar.locator('button').click();
 	}
 
diff --git a/apps/meteor/tests/e2e/pageobjects/LoginPage.ts b/apps/meteor/tests/e2e/pageobjects/LoginPage.ts
index ec2d07e20f5d..ce17487adbe6 100644
--- a/apps/meteor/tests/e2e/pageobjects/LoginPage.ts
+++ b/apps/meteor/tests/e2e/pageobjects/LoginPage.ts
@@ -1,19 +1,19 @@
-import { Locator, expect } from '@playwright/test';
+import { Locator } from '@playwright/test';
 
 import { ILogin, IRegister } from '../utils/interfaces/Login';
 import { BasePage } from './BasePage';
 import { HOME_SELECTOR, REGISTER_STEP2_BUTTON } from '../utils/mocks/waitSelectorsMock';
 
 export class LoginPage extends BasePage {
-	private get registerButton(): Locator {
+	get btnRegister(): Locator {
 		return this.page.locator('button.register');
 	}
 
-	private get forgotPasswordButton(): Locator {
+	get btnForgotPassword(): Locator {
 		return this.page.locator('.forgot-password');
 	}
 
-	get submitButton(): Locator {
+	get btnSubmit(): Locator {
 		return this.page.locator('.login');
 	}
 
@@ -61,63 +61,25 @@ export class LoginPage extends BasePage {
 		return this.page.locator('[data-qa="sidebar-avatar-button"]');
 	}
 
-	public async gotToRegister(): Promise<void> {
-		await this.registerButton.click();
-	}
-
-	public async gotToForgotPassword(): Promise<void> {
-		await this.forgotPasswordButton.click();
-	}
-
-	public async registerNewUser({ name, email, password }: IRegister): Promise<void> {
+	async registerNewUser({ name, email, password }: IRegister): Promise<void> {
 		await this.nameField.type(name);
 		await this.emailField.type(email);
 		await this.passwordField.type(password);
 		await this.confirmPasswordField.type(password);
-		await this.submit();
+		await this.btnSubmit.click();
 
-		await this.waitForSelector(REGISTER_STEP2_BUTTON);
+		await this.page.waitForSelector(REGISTER_STEP2_BUTTON);
 		await this.registerNextButton.click();
-		await this.waitForSelector(HOME_SELECTOR);
+		await this.page.waitForSelector(HOME_SELECTOR);
 	}
 
 	async doLogin({ email, password }: ILogin, shouldWaitForHomeScreen = true): Promise<void> {
 		await this.emailOrUsernameField.type(email);
 		await this.passwordField.type(password);
-		await this.submitButton.click();
+		await this.btnSubmit.click();
 
 		if (shouldWaitForHomeScreen) {
-			await this.waitForSelector('.main-content');
+			await this.page.waitForSelector('.main-content');
 		}
 	}
-
-	public async submit(): Promise<void> {
-		await this.submitButton.click();
-	}
-
-	public async registerFail(): Promise<void> {
-		await this.gotToRegister();
-		await this.submit();
-
-		await expect(this.nameInvalidText).toBeVisible();
-		await expect(this.emailInvalidText).toBeVisible();
-		await expect(this.passwordInvalidText).toBeVisible();
-	}
-
-	public async registerFailWithDifferentPassword({ name, email, password }: IRegister, invalidPassword: string): Promise<void> {
-		await this.gotToRegister();
-		await this.passwordField.type(password);
-		await this.emailField.type(email);
-		await this.nameField.type(name);
-		await this.confirmPasswordField.type(invalidPassword);
-
-		await this.submit();
-		await expect(this.confirmPasswordInvalidText).toBeVisible();
-		await expect(this.confirmPasswordInvalidText).toHaveText('The password confirmation does not match password');
-	}
-
-	public async logout(): Promise<void> {
-		await this.getSideBarAvatarButton.click();
-		await this.page.locator('li.rcx-option >> text="Logout"').click();
-	}
 }
diff --git a/apps/meteor/tests/e2e/pageobjects/MainContent.ts b/apps/meteor/tests/e2e/pageobjects/MainContent.ts
index b800a6519bd6..e49b35791282 100644
--- a/apps/meteor/tests/e2e/pageobjects/MainContent.ts
+++ b/apps/meteor/tests/e2e/pageobjects/MainContent.ts
@@ -17,7 +17,7 @@ export class MainContent extends BasePage {
 		return this.page.locator('//*[contains(@class, "rcx-room-header")]//*[contains(@class, "rcx-icon--name-star-filled")]');
 	}
 
-	public channelTitle(title: string): Locator {
+	channelTitle(title: string): Locator {
 		return this.page.locator('.rcx-room-header', { hasText: title });
 	}
 
@@ -57,8 +57,12 @@ export class MainContent extends BasePage {
 		return this.page.locator('.popup-item.selected');
 	}
 
-	get lastMessageUser(): Locator {
-		return this.page.locator('.message:last-child div:nth-child(2) button');
+	get lastUserMessage(): Locator {
+		return this.page.locator('[data-qa-id=UserMessage]').last();
+	}
+
+	get btnLastUserMessage(): Locator {
+		return this.page.locator('[data-qa-id=UserMessage]:not(.sequential) > button').last();
 	}
 
 	get lastMessageFileName(): Locator {
@@ -203,30 +207,30 @@ export class MainContent extends BasePage {
 		return this.page.locator('//div[@id="modal-root"]//fieldset//div[2]//label');
 	}
 
-	public async waitForLastMessageEqualsHtml(text: string): Promise<void> {
+	async waitForLastMessageEqualsHtml(text: string): Promise<void> {
 		await expect(this.page.locator('(//*[contains(@class, "message") and contains(@class, "body")])[last()]')).toContainText(text);
 	}
 
-	public async waitForLastMessageEqualsText(text: string): Promise<void> {
+	async waitForLastMessageEqualsText(text: string): Promise<void> {
 		await expect(this.page.locator('(//*[contains(@class, "message") and contains(@class, "body")])[last()]')).toContainText(text);
 	}
 
-	public async sendMessage(text: string): Promise<void> {
+	async sendMessage(text: string): Promise<void> {
 		await this.setTextToInput(text);
 		await this.keyboardPress('Enter');
 	}
 
-	public async addTextToInput(text: any): Promise<void> {
+	async addTextToInput(text: any): Promise<void> {
 		await this.messageInput.type(text);
 	}
 
-	public async setTextToInput(text: string, options: { delay?: number } = {}): Promise<void> {
+	async setTextToInput(text: string, options: { delay?: number } = {}): Promise<void> {
 		await this.messageInput.click({ clickCount: 3 });
 		await this.page.keyboard.press('Backspace');
 		await this.messageInput.type(text, { delay: options.delay ?? 0 });
 	}
 
-	public async dragAndDropFile(): Promise<void> {
+	async dragAndDropFile(): Promise<void> {
 		const contract = await fs.promises.readFile('./tests/e2e/utils/fixtures/any_file.txt', 'utf-8');
 
 		const dataTransfer = await this.page.evaluateHandle((contract) => {
@@ -245,7 +249,7 @@ export class MainContent extends BasePage {
 		);
 	}
 
-	public async sendFileClick(): Promise<void> {
+	async sendFileClick(): Promise<void> {
 		await this.buttonSend.click();
 	}
 
@@ -257,11 +261,11 @@ export class MainContent extends BasePage {
 		return this.page.locator('//div[@id="modal-root"]//fieldset//div[1]//span//input');
 	}
 
-	public async setFileName(): Promise<void> {
+	async setFileName(): Promise<void> {
 		await this.fileNameInput.fill('any_file1.txt');
 	}
 
-	public async setDescription(): Promise<void> {
+	async setDescription(): Promise<void> {
 		await this.descriptionInput.type('any_description');
 	}
 
@@ -269,7 +273,7 @@ export class MainContent extends BasePage {
 		return this.page.locator('[data-qa-type="message"]:last-child div:nth-child(3) div:nth-child(2) div p');
 	}
 
-	public async selectAction(action: string): Promise<void> {
+	async selectAction(action: string): Promise<void> {
 		switch (action) {
 			case 'edit':
 				await this.messageEdit.click();
@@ -311,18 +315,18 @@ export class MainContent extends BasePage {
 		}
 	}
 
-	public async openMessageActionMenu(): Promise<void> {
+	async openMessageActionMenu(): Promise<void> {
 		await this.page.locator('.messages-box [data-qa-type="message"]:last-child').hover();
 		await this.page.locator('[data-qa-type="message"]:last-child div.message-actions__menu').waitFor();
 		await this.page.locator('[data-qa-type="message"]:last-child div.message-actions__menu').click();
 	}
 
-	public async openMoreActionMenu(): Promise<void> {
+	async openMoreActionMenu(): Promise<void> {
 		await this.page.locator('.rc-message-box [data-qa-id="menu-more-actions"]').click();
 		await this.page.waitForSelector('.rc-popover__content');
 	}
 
-	public async acceptDeleteMessage(): Promise<void> {
+	async acceptDeleteMessage(): Promise<void> {
 		await this.modalDeleteMessageButton.click();
 	}
 
@@ -338,7 +342,7 @@ export class MainContent extends BasePage {
 		return this.page.locator('[data-qa="UserCard"] a');
 	}
 
-	public async doReload(): Promise<void> {
+	async doReload(): Promise<void> {
 		await this.page.reload({ waitUntil: 'load' });
 		await this.page.waitForSelector('.messages-box');
 	}
diff --git a/apps/meteor/tests/e2e/pageobjects/PreferencesMainContent.ts b/apps/meteor/tests/e2e/pageobjects/PreferencesMainContent.ts
index 6111ebed34f6..d2545ca406fa 100644
--- a/apps/meteor/tests/e2e/pageobjects/PreferencesMainContent.ts
+++ b/apps/meteor/tests/e2e/pageobjects/PreferencesMainContent.ts
@@ -1,13 +1,13 @@
-import { expect, Locator } from '@playwright/test';
+import { Locator } from '@playwright/test';
 
 import { BasePage } from './BasePage';
 
 export class PreferencesMainContent extends BasePage {
-	get realNameTextInput(): Locator {
+	get inputName(): Locator {
 		return this.page.locator('//label[contains(text(), "Name")]/..//input');
 	}
 
-	get userNameTextInput(): Locator {
+	get inputUsername(): Locator {
 		return this.page.locator('//label[contains(text(), "Username")]/..//input');
 	}
 
@@ -30,17 +30,4 @@ export class PreferencesMainContent extends BasePage {
 	get submitBtn(): Locator {
 		return this.page.locator('[data-qa="AccountProfilePageSaveButton"]');
 	}
-
-	public async changeUsername(userName: string): Promise<void> {
-		await this.userNameTextInput.fill(userName);
-	}
-
-	public async changeRealName(realName: string): Promise<void> {
-		await this.realNameTextInput.fill(realName);
-	}
-
-	public async saveChanges(): Promise<void> {
-		await expect(this.submitBtn).toBeEnabled();
-		await this.submitBtn.click();
-	}
 }
diff --git a/apps/meteor/tests/e2e/pageobjects/SetupWizard.ts b/apps/meteor/tests/e2e/pageobjects/SetupWizard.ts
index 89ce5c70e457..9400be3619ec 100644
--- a/apps/meteor/tests/e2e/pageobjects/SetupWizard.ts
+++ b/apps/meteor/tests/e2e/pageobjects/SetupWizard.ts
@@ -1,7 +1,6 @@
 import { expect, Locator } from '@playwright/test';
 
 import { BasePage } from './BasePage';
-import { reason, INVALID_EMAIL_WITHOUT_MAIL_PROVIDER } from '../utils/mocks/userAndPasswordMock';
 import { IRegister } from '../utils/interfaces/Login';
 import { BACKSPACE } from '../utils/mocks/keyboardKeyMock';
 
@@ -118,8 +117,8 @@ export class SetupWizard extends BasePage {
 		return this.page.locator('//input[@name="email"]/../../span[contains(text(), "This field is required")]');
 	}
 
-	public async stepTwoSuccess(): Promise<void> {
-		await this.organizationName.type(reason);
+	async stepTwoSuccess(): Promise<void> {
+		await this.organizationName.type('rocket.chat.reason');
 		await this.organizationType.click();
 		await this.organizationTypeSelect.click();
 		await expect(this.page.locator('.rcx-options')).toHaveCount(0);
@@ -134,11 +133,11 @@ export class SetupWizard extends BasePage {
 		await this.nextStep.click();
 	}
 
-	public async stepThreeSuccess(): Promise<void> {
+	async stepThreeSuccess(): Promise<void> {
 		await this.standaloneServer.click();
 	}
 
-	public async stepOneFailedBlankFields(): Promise<void> {
+	async stepOneFailedBlankFields(): Promise<void> {
 		await this.nextStep.click();
 		await expect(this.fullNameInvalidText).toBeVisible();
 		await expect(this.userNameInvalidText).toBeVisible();
@@ -146,16 +145,16 @@ export class SetupWizard extends BasePage {
 		await expect(this.passwordInvalidText).toBeVisible();
 	}
 
-	public async stepOneFailedWithInvalidEmail(adminCredentials: IRegister): Promise<void> {
+	async stepOneFailedWithInvalidEmail(adminCredentials: IRegister): Promise<void> {
 		await this.fullName.type(adminCredentials.name);
 		await this.userName.type(adminCredentials.name);
-		await this.companyEmail.type(INVALID_EMAIL_WITHOUT_MAIL_PROVIDER);
+		await this.companyEmail.type('mail');
 		await this.password.type(adminCredentials.password);
 		await this.nextStep.click();
 		await expect(this.companyEmail).toBeFocused();
 	}
 
-	public async stepTwoFailedWithBlankFields(): Promise<void> {
+	async stepTwoFailedWithBlankFields(): Promise<void> {
 		await this.nextStep.click();
 		await expect(this.organizationName).toBeVisible();
 		await expect(this.industryInvalidSelect).toBeVisible();
@@ -163,8 +162,8 @@ export class SetupWizard extends BasePage {
 		await expect(this.countryInvalidSelect).toBeVisible();
 	}
 
-	public async stepThreeFailedWithInvalidField(): Promise<void> {
-		await this.registeredServer.type(INVALID_EMAIL_WITHOUT_MAIL_PROVIDER);
+	async stepThreeFailedWithInvalidField(): Promise<void> {
+		await this.registeredServer.type('mail');
 		await this.registeredServer.click({ clickCount: 3 });
 		await this.keyboardPress(BACKSPACE);
 		await expect(this.stepThreeInputInvalidMail).toBeVisible();
diff --git a/apps/meteor/tests/e2e/pageobjects/SideNav.ts b/apps/meteor/tests/e2e/pageobjects/SideNav.ts
index 37da198e9804..b15a2a230e95 100644
--- a/apps/meteor/tests/e2e/pageobjects/SideNav.ts
+++ b/apps/meteor/tests/e2e/pageobjects/SideNav.ts
@@ -13,10 +13,6 @@ export class SideNav extends BasePage {
 		return this.page.locator('#modal-root [placeholder="Channel Name"]');
 	}
 
-	get saveChannelBtn(): Locator {
-		return this.page.locator('//*[@id="modal-root"]//button[contains(text(), "Create")]');
-	}
-
 	get sidebarUserMenu(): Locator {
 		return this.page.locator('[data-qa="sidebar-avatar-button"]');
 	}
@@ -77,7 +73,7 @@ export class SideNav extends BasePage {
 		return this.page.locator('[data-qa="sidebar-search-result"]');
 	}
 
-	get newChannelBtnToolbar(): Locator {
+	get btnSidebarCreate(): Locator {
 		return this.page.locator('[data-qa="sidebar-create"]');
 	}
 
@@ -86,7 +82,7 @@ export class SideNav extends BasePage {
 	}
 
 	get general(): Locator {
-		return this.getChannelFromList('general');
+		return this.page.locator('[data-qa="sidebar-item-title"]', { hasText: 'general' });
 	}
 
 	get preferences(): Locator {
@@ -113,22 +109,10 @@ export class SideNav extends BasePage {
 		return this.page.locator('//button[@aria-label="Close menu"]');
 	}
 
-	public async isSideBarOpen(): Promise<boolean> {
+	async isSideBarOpen(): Promise<boolean> {
 		return !!(await this.sideNavBar.getAttribute('style'));
 	}
 
-	public getChannelFromList(channelName: any): Locator {
-		return this.page.locator('[data-qa="sidebar-item-title"]', { hasText: channelName });
-	}
-
-	get searchUser(): Locator {
-		return this.page.locator('[data-qa="sidebar-search"]');
-	}
-
-	get searchInput(): Locator {
-		return this.page.locator('[data-qa="sidebar-search-input"]');
-	}
-
 	async doOpenChat(name: string): Promise<void> {
 		await expect(this.page.locator('[data-qa="sidebar-search"]')).toBeVisible();
 
@@ -137,19 +121,19 @@ export class SideNav extends BasePage {
 		await this.page.locator('[data-qa="sidebar-item-title"]', { hasText: name }).first().click();
 	}
 
-	public async createChannel(channelName: any, isPrivate: any /* isReadOnly*/): Promise<void> {
-		await this.newChannelBtnToolbar.click();
-		await this.newChannelBtn.click();
+	async doCreateChannel(channelName: string, isPrivate = false): Promise<void> {
+		await this.page.locator('[data-qa="sidebar-create"]').click();
+		await this.page.locator('li.rcx-option >> text="Channel"').click();
 
 		if (!isPrivate) {
 			await this.channelType.click();
 		}
 
 		await this.channelName.type(channelName);
-		await this.saveChannelBtn.click();
+		await this.page.locator('//*[@id="modal-root"]//button[contains(text(), "Create")]').click();
 	}
 
-	public async doLogout(): Promise<void> {
+	async doLogout(): Promise<void> {
 		await this.page.goto('/home');
 		await this.sidebarUserMenu.click();
 		await this.logout.click();
diff --git a/apps/meteor/tests/e2e/pageobjects/index.ts b/apps/meteor/tests/e2e/pageobjects/index.ts
index 7a9bcd67006e..f84d31c84453 100644
--- a/apps/meteor/tests/e2e/pageobjects/index.ts
+++ b/apps/meteor/tests/e2e/pageobjects/index.ts
@@ -1,6 +1,5 @@
 export * from './Administration';
 export * from './Agents';
-export * from './ChannelCreation';
 export * from './FlexTab';
 export * from './Global';
 export * from './LoginPage';
diff --git a/apps/meteor/tests/e2e/utils/helpers/MongoHelper.ts b/apps/meteor/tests/e2e/utils/MongoHelper.ts
similarity index 99%
rename from apps/meteor/tests/e2e/utils/helpers/MongoHelper.ts
rename to apps/meteor/tests/e2e/utils/MongoHelper.ts
index f7d55a7a9ace..2b398f772ee5 100644
--- a/apps/meteor/tests/e2e/utils/helpers/MongoHelper.ts
+++ b/apps/meteor/tests/e2e/utils/MongoHelper.ts
@@ -11,6 +11,7 @@ type MongoHelperConfig = {
 export const MongoHelper: MongoHelperConfig = {
 	uri: null,
 	client: null,
+
 	async connect(uri: string) {
 		this.uri = uri;
 		this.client = await MongoClient.connect(uri, {
@@ -18,19 +19,23 @@ export const MongoHelper: MongoHelperConfig = {
 			useUnifiedTopology: true,
 		});
 	},
+
 	async disconnect() {
 		if (this.client) {
 			this.client.close();
 			this.client = null;
 		}
 	},
+
 	async getCollection(name: string) {
 		if (this.client) {
 			if (!this.client.isConnected() && this.uri) {
 				await this.connect(this.uri);
 			}
+
 			return this.client.db().collection(name);
 		}
+
 		return {} as Collection;
 	},
 };
diff --git a/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts b/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
deleted file mode 100644
index 6e2cb09c199f..000000000000
--- a/apps/meteor/tests/e2e/utils/configs/verifyTestBaseUrl.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-const getBaseUrl = (): string => {
-	if (process.env.BASE_URL) {
-		return process.env.BASE_URL;
-	}
-
-	return 'http://localhost:3000';
-};
-
-export const verifyTestBaseUrl = (): { baseURL: string; isLocal: boolean } => {
-	const baseURL = getBaseUrl();
-	return {
-		baseURL,
-		isLocal: baseURL.startsWith('http://localhost'),
-	};
-};
diff --git a/apps/meteor/tests/e2e/utils/constants.ts b/apps/meteor/tests/e2e/utils/constants.ts
new file mode 100644
index 000000000000..5038cd87105a
--- /dev/null
+++ b/apps/meteor/tests/e2e/utils/constants.ts
@@ -0,0 +1,9 @@
+export const BASE_URL = process.env.BASE_URL ?? 'http://localhost:3000';
+
+export const IS_LOCALHOST = BASE_URL.startsWith('http://localhost');
+
+export const IS_EE = Boolean(process.env.IS_EE);
+
+export const URL_MONGODB = process.env.MONGO_URL
+	? `${process.env.MONGO_URL}?retryWrites=false`
+	: 'mongodb://localhost:3001/meteor?retryWrites=false';
diff --git a/apps/meteor/tests/e2e/utils/enums/Checkbox.ts b/apps/meteor/tests/e2e/utils/enums/Checkbox.ts
deleted file mode 100644
index 617805d96b31..000000000000
--- a/apps/meteor/tests/e2e/utils/enums/Checkbox.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export enum Checkbox {
-	Direct = 0,
-	Public = 1,
-	Private = 2,
-	Omnichannel = 3,
-	Discussions = 4,
-	Teams = 5,
-}
diff --git a/apps/meteor/tests/e2e/utils/helpers/clearMessages.ts b/apps/meteor/tests/e2e/utils/helpers/clearMessages.ts
deleted file mode 100644
index 4b33b44cc860..000000000000
--- a/apps/meteor/tests/e2e/utils/helpers/clearMessages.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { MongoHelper } from './MongoHelper';
-
-const mongoBaseUrl = process.env.MONGO_URL
-	? `${process.env.MONGO_URL}?retryWrites=false`
-	: 'mongodb://localhost:3001/meteor?retryWrites=false';
-export const clearMessages = async (channelIds: string[]): Promise<void> => {
-	await MongoHelper.connect(mongoBaseUrl);
-	const messageCollection = await MongoHelper.getCollection('rocketchat_message');
-	await messageCollection.deleteMany({ rid: { $in: channelIds } });
-	await MongoHelper.disconnect();
-};
diff --git a/apps/meteor/tests/e2e/utils/mocks/channel.ts b/apps/meteor/tests/e2e/utils/mocks/channel.ts
deleted file mode 100644
index e3a23691b7ba..000000000000
--- a/apps/meteor/tests/e2e/utils/mocks/channel.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const publicChannelName = `channel-test-${Date.now()}`;
-export const privateChannelName = `private-channel-test-${Date.now()}`;
diff --git a/apps/meteor/tests/e2e/utils/mocks/initialData.ts b/apps/meteor/tests/e2e/utils/mocks/initialData.ts
deleted file mode 100644
index 24933dca5cbf..000000000000
--- a/apps/meteor/tests/e2e/utils/mocks/initialData.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './roomMock';
-export * from './subscriptionMock';
-export * from './userMock';
diff --git a/apps/meteor/tests/e2e/utils/mocks/interations.ts b/apps/meteor/tests/e2e/utils/mocks/interations.ts
deleted file mode 100644
index dbc78d07f2c9..000000000000
--- a/apps/meteor/tests/e2e/utils/mocks/interations.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const targetUser = 'rocket.cat';
-export const imgURL = './public/images/logo/1024x1024.png';
diff --git a/apps/meteor/tests/e2e/utils/mocks/userAndPasswordMock.ts b/apps/meteor/tests/e2e/utils/mocks/userAndPasswordMock.ts
index 8c755a4aa5a5..fcb4d6da6879 100644
--- a/apps/meteor/tests/e2e/utils/mocks/userAndPasswordMock.ts
+++ b/apps/meteor/tests/e2e/utils/mocks/userAndPasswordMock.ts
@@ -2,14 +2,6 @@ import { faker } from '@faker-js/faker';
 
 import { ILogin, IRegister } from '../interfaces/Login';
 
-export const reason = 'rocket.chat.reason';
-
-export const adminRegister: IRegister = {
-	name: 'rocketchat.internal.admin.test',
-	email: 'rocketchat.internal.admin.test@rocket.chat',
-	password: 'rocketchat.internal.admin.test',
-};
-
 export const adminLogin: ILogin = {
 	email: 'rocketchat.internal.admin.test@rocket.chat',
 	password: 'rocketchat.internal.admin.test',
@@ -20,10 +12,8 @@ export const validUserInserted: ILogin = {
 	password: 'any_password',
 };
 
-const validEmail = faker.internet.email();
-
 export const registerUser: IRegister = {
-	email: validEmail,
+	email: faker.internet.email(),
 	password: 'any_password',
 	name: faker.name.findName(),
 };
@@ -40,7 +30,7 @@ export const createRegisterUser = (): IRegister => {
 };
 
 export const validUser: ILogin = {
-	email: validEmail,
+	email: registerUser.email,
 	password: 'any_password',
 };
 
@@ -48,9 +38,3 @@ export const incorrectUser: ILogin = {
 	email: faker.internet.email(),
 	password: 'any_password',
 };
-
-export const VALID_EMAIL = 'email@email.com';
-export const INVALID_EMAIL = 'mail@mail';
-export const INVALID_EMAIL_WITHOUT_MAIL_PROVIDER = 'email';
-export const ROCKET_CAT = 'rocket.cat';
-export const WRONG_PASSWORD = 'passwo1';