From 5562ab62dc17bc97f2f35a511a7ee7fcbb380886 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 10:36:10 -0300
Subject: [PATCH 1/8] test: remove `data-qa-reset-setting-id`

---
 .../views/admin/settings/Setting/inputs/ActionSettingInput.tsx  | 2 +-
 .../views/admin/settings/Setting/inputs/BooleanSettingInput.tsx | 2 +-
 .../views/admin/settings/Setting/inputs/CodeSettingInput.tsx    | 2 +-
 .../views/admin/settings/Setting/inputs/ColorSettingInput.tsx   | 2 +-
 .../views/admin/settings/Setting/inputs/FontSettingInput.tsx    | 2 +-
 .../views/admin/settings/Setting/inputs/GenericSettingInput.tsx | 2 +-
 .../views/admin/settings/Setting/inputs/IntSettingInput.tsx     | 2 +-
 .../admin/settings/Setting/inputs/LanguageSettingInput.tsx      | 2 +-
 .../views/admin/settings/Setting/inputs/LookupSettingInput.tsx  | 2 +-
 .../admin/settings/Setting/inputs/MultiSelectSettingInput.tsx   | 2 +-
 .../admin/settings/Setting/inputs/PasswordSettingInput.tsx      | 2 +-
 .../views/admin/settings/Setting/inputs/RangeSettingInput.tsx   | 2 +-
 .../admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx   | 2 +-
 .../admin/settings/Setting/inputs/RoomPickSettingInput.tsx      | 2 +-
 .../views/admin/settings/Setting/inputs/SelectSettingInput.tsx  | 2 +-
 .../settings/Setting/inputs/SelectTimezoneSettingInput.tsx      | 2 +-
 .../views/admin/settings/Setting/inputs/StringSettingInput.tsx  | 2 +-
 .../admin/settings/Setting/inputs/TimespanSettingInput.tsx      | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
index 53a0ac53df419..c5d3fae8d426b 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
@@ -33,7 +33,7 @@ function ActionSettingInput({ _id, actionText, value, hint, disabled, sectionCha
 	return (
 		<>
 			<FieldRow>
-				<Button data-qa-setting-id={_id} disabled={disabled || sectionChanged} primary onClick={handleClick}>
+				<Button disabled={disabled || sectionChanged} primary onClick={handleClick}>
 					{t(actionText)}
 				</Button>
 			</FieldRow>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
index 624150b1709b6..92cac75dcedc9 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
@@ -30,7 +30,7 @@ function BooleanSettingInput({
 					{label}
 				</FieldLabel>
 				<Box display='flex' alignItems='center'>
-					{hasResetButton && <ResetSettingButton mie={8} data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+					{hasResetButton && <ResetSettingButton mie={8} onClick={onResetButtonClick} />}
 					<ToggleSwitch
 						data-qa-setting-id={_id}
 						id={_id}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
index 4302ad165000e..25e72f9829219 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
@@ -38,7 +38,7 @@ function CodeSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
 			<CodeMirrorBox label={label}>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index 6cdc22a33ad17..44fc12d8426df 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -53,7 +53,7 @@ function ColorSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<Margins inline={4}>
 				<FieldRow>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
index 7863bc59852fb..9aeb9a6954657 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
@@ -32,7 +32,7 @@ function FontSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<TextInput
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
index b6f2fca1ea634..ce4b5d34516e2 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
@@ -32,7 +32,7 @@ function GenericSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<TextInput
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
index 49f09f0b97f19..7f910281a7e57 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
@@ -32,7 +32,7 @@ function IntSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<InputBox
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
index ad0d5a72ba50c..f642a2705c67f 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
@@ -33,7 +33,7 @@ function LanguageSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
index 5395f28d3634c..83edfad9a4aee 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
@@ -46,7 +46,7 @@ function LookupSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index d16dee10c07bf..3d5cbb6e32b71 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -39,7 +39,7 @@ function MultiSelectSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Component
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
index 70e9d69cefed1..3c572c3b8315d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
@@ -30,7 +30,7 @@ function PasswordSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<PasswordInput
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
index 4cf81057049d5..cd4e09ab6ffe4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
@@ -30,7 +30,7 @@ function RangeSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			{hint && (
 				<FieldRow>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
index d4f5666ab8ee1..0080c566242b4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
@@ -33,7 +33,7 @@ function RelativeUrlSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<UrlInput
 				data-qa-setting-id={_id}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
index e61e12483943a..6d8d7e7e4e13d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RoomPickSettingInput.tsx
@@ -36,7 +36,7 @@ function RoomPickSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<RoomAutoCompleteMultiple
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index cbd456ea25f08..8b424ba95bb2c 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -37,7 +37,7 @@ function SelectSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
index 8da5da22d51a5..679d8eebc1f8d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
@@ -31,7 +31,7 @@ function SelectTimezoneSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<Select
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
index b1dcb1be74ba3..b171857058ae9 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
@@ -37,7 +37,7 @@ function StringSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={onResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				{multiline ? (
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index 18d8f62611ca6..201c18002eb18 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -88,7 +88,7 @@ function TimespanSettingInput({
 				<FieldLabel htmlFor={_id} title={_id} required={required}>
 					{label}
 				</FieldLabel>
-				{hasResetButton && <ResetSettingButton data-qa-reset-setting-id={_id} onClick={handleResetButtonClick} />}
+				{hasResetButton && <ResetSettingButton onClick={handleResetButtonClick} />}
 			</FieldRow>
 			<FieldRow>
 				<InputBox

From b998b4cce6173acd4b4f81e5ff9e86545198f5b9 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 10:47:19 -0300
Subject: [PATCH 2/8] chore: update snapshots

---
 .../ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap     | 1 -
 .../Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
index 7c48a94fb6800..68045c0c089b3 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
@@ -82,7 +82,6 @@ exports[`AbacEnabledToggle should render the setting toggle when setting exists
             >
               <button
                 class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-danger rcx-button--square rcx-button--icon rcx-button rcx-css-1rtu0k9"
-                data-qa-reset-setting-id="ABAC_Enabled"
                 title="Reset"
                 type="button"
               >
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
index 3ba94a3d26ec2..27a32bcb542a1 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/__snapshots__/RangeSettingInput.spec.tsx.snap
@@ -264,7 +264,6 @@ exports[`renders WithResetButton without crashing 1`] = `
           </label>
           <button
             class="rcx-box rcx-box--full rcx-button--small-square rcx-button--icon-danger rcx-button--square rcx-button--icon rcx-button"
-            data-qa-reset-setting-id="setting_id"
             title="Reset"
             type="button"
           >

From 5fb06cc3d2fce3b4aa454334b4962c393fee511b Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 10:56:02 -0300
Subject: [PATCH 3/8] test: remove `data-qa-setting-id`

---
 .../admin/settings/Setting/inputs/ActionSettingInput.tsx  | 2 +-
 .../admin/settings/Setting/inputs/BooleanSettingInput.tsx | 8 +-------
 .../admin/settings/Setting/inputs/CodeSettingInput.tsx    | 1 -
 .../admin/settings/Setting/inputs/ColorSettingInput.tsx   | 3 ---
 .../admin/settings/Setting/inputs/FontSettingInput.tsx    | 1 -
 .../admin/settings/Setting/inputs/GenericSettingInput.tsx | 1 -
 .../admin/settings/Setting/inputs/IntSettingInput.tsx     | 1 -
 .../settings/Setting/inputs/LanguageSettingInput.tsx      | 1 -
 .../admin/settings/Setting/inputs/LookupSettingInput.tsx  | 1 -
 .../settings/Setting/inputs/MultiSelectSettingInput.tsx   | 1 -
 .../settings/Setting/inputs/PasswordSettingInput.tsx      | 1 -
 .../admin/settings/Setting/inputs/RangeSettingInput.tsx   | 1 -
 .../settings/Setting/inputs/RelativeUrlSettingInput.tsx   | 1 -
 .../admin/settings/Setting/inputs/SelectSettingInput.tsx  | 1 -
 .../Setting/inputs/SelectTimezoneSettingInput.tsx         | 1 -
 .../admin/settings/Setting/inputs/StringSettingInput.tsx  | 2 --
 .../settings/Setting/inputs/TimespanSettingInput.tsx      | 1 -
 17 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
index c5d3fae8d426b..2ecfb77084a27 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
@@ -13,7 +13,7 @@ type ActionSettingInputProps = SettingInputProps & {
 	sectionChanged: boolean;
 };
 
-function ActionSettingInput({ _id, actionText, value, hint, disabled, sectionChanged }: ActionSettingInputProps): ReactElement {
+function ActionSettingInput({ actionText, value, hint, disabled, sectionChanged }: ActionSettingInputProps): ReactElement {
 	const { t } = useTranslation();
 
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
index 92cac75dcedc9..367a8efe5aff7 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/BooleanSettingInput.tsx
@@ -31,13 +31,7 @@ function BooleanSettingInput({
 				</FieldLabel>
 				<Box display='flex' alignItems='center'>
 					{hasResetButton && <ResetSettingButton mie={8} onClick={onResetButtonClick} />}
-					<ToggleSwitch
-						data-qa-setting-id={_id}
-						id={_id}
-						checked={value === true}
-						disabled={disabled || readonly}
-						onChange={handleChange}
-					/>
+					<ToggleSwitch id={_id} checked={value === true} disabled={disabled || readonly} onChange={handleChange} />
 				</Box>
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
index 25e72f9829219..bed4565cf80aa 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.tsx
@@ -43,7 +43,6 @@ function CodeSettingInput({
 			{hint && <FieldHint>{hint}</FieldHint>}
 			<CodeMirrorBox label={label}>
 				<CodeMirror
-					data-qa-setting-id={_id}
 					id={_id}
 					mode={code}
 					value={value}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
index 44fc12d8426df..ff2c4e0b63d3d 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ColorSettingInput.tsx
@@ -61,7 +61,6 @@ function ColorSettingInput({
 						<Flex.Item grow={2}>
 							{editor === 'color' && (
 								<InputBox
-									data-qa-setting-id={_id}
 									type='color'
 									id={_id}
 									value={value}
@@ -74,7 +73,6 @@ function ColorSettingInput({
 							)}
 							{editor === 'expression' && (
 								<TextInput
-									data-qa-setting-id={_id}
 									id={_id}
 									value={value}
 									placeholder={placeholder}
@@ -86,7 +84,6 @@ function ColorSettingInput({
 							)}
 						</Flex.Item>
 						<Select
-							data-qa-setting-id={`${_id}_editor`}
 							type='color'
 							id={`${_id}_editor`}
 							value={editor}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
index 9aeb9a6954657..eadb36247e370 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/FontSettingInput.tsx
@@ -36,7 +36,6 @@ function FontSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<TextInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
index ce4b5d34516e2..2b773900239de 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/GenericSettingInput.tsx
@@ -36,7 +36,6 @@ function GenericSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<TextInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
index 7f910281a7e57..acde6b2f72399 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/IntSettingInput.tsx
@@ -36,7 +36,6 @@ function IntSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<InputBox
-					data-qa-setting-id={_id}
 					id={_id}
 					type='number'
 					value={value}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
index f642a2705c67f..634e83e91a557 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LanguageSettingInput.tsx
@@ -37,7 +37,6 @@ function LanguageSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
index 83edfad9a4aee..8dee0642607ca 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/LookupSettingInput.tsx
@@ -50,7 +50,6 @@ function LookupSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index 3d5cbb6e32b71..371f33c984783 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -44,7 +44,6 @@ function MultiSelectSettingInput({
 			<FieldRow>
 				<Component
 					max-width='full'
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
index 3c572c3b8315d..41be622361672 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/PasswordSettingInput.tsx
@@ -34,7 +34,6 @@ function PasswordSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<PasswordInput
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
index cd4e09ab6ffe4..1cc286a917558 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RangeSettingInput.tsx
@@ -39,7 +39,6 @@ function RangeSettingInput({
 			)}
 			<FieldRow>
 				<Slider
-					data-qa-setting-id={_id}
 					disabled={disabled || readonly}
 					minValue={minValue}
 					maxValue={maxValue}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
index 0080c566242b4..c56c50ad2d9d2 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/RelativeUrlSettingInput.tsx
@@ -36,7 +36,6 @@ function RelativeUrlSettingInput({
 				{hasResetButton && <ResetSettingButton onClick={onResetButtonClick} />}
 			</FieldRow>
 			<UrlInput
-				data-qa-setting-id={_id}
 				id={_id}
 				value={getAbsoluteUrl(value || '')}
 				placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
index 8b424ba95bb2c..6fe42897a161a 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectSettingInput.tsx
@@ -41,7 +41,6 @@ function SelectSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
index 679d8eebc1f8d..f0b74595999c4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/SelectTimezoneSettingInput.tsx
@@ -35,7 +35,6 @@ function SelectTimezoneSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<Select
-					data-qa-setting-id={_id}
 					id={_id}
 					value={value}
 					placeholder={placeholder}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
index b171857058ae9..3d524784237e0 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/StringSettingInput.tsx
@@ -42,7 +42,6 @@ function StringSettingInput({
 			<FieldRow>
 				{multiline ? (
 					<TextAreaInput
-						data-qa-setting-id={_id}
 						id={_id}
 						name={name}
 						rows={4}
@@ -56,7 +55,6 @@ function StringSettingInput({
 					/>
 				) : (
 					<TextInput
-						data-qa-setting-id={_id}
 						id={_id}
 						value={value}
 						name={name}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
index 201c18002eb18..c81b9dfdff97e 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.tsx
@@ -92,7 +92,6 @@ function TimespanSettingInput({
 			</FieldRow>
 			<FieldRow>
 				<InputBox
-					data-qa-setting-id={_id}
 					id={_id}
 					type='number'
 					value={internalValue}

From a4e0871a397c04c394d2cebc0e8a74ec56b47f1d Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 10:56:09 -0300
Subject: [PATCH 4/8] chore: update snapshots

---
 .../ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
index 68045c0c089b3..78b091fbbf32f 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACSettingTab/__snapshots__/SettingToggle.spec.tsx.snap
@@ -31,7 +31,6 @@ exports[`AbacEnabledToggle should be disabled when abac license is not installed
                 <input
                   checked=""
                   class="rcx-box rcx-box--full rcx-toggle-switch__input"
-                  data-qa-setting-id="ABAC_Enabled"
                   disabled=""
                   id="ABAC_Enabled"
                   type="checkbox"
@@ -98,7 +97,6 @@ exports[`AbacEnabledToggle should render the setting toggle when setting exists
                 <input
                   checked=""
                   class="rcx-box rcx-box--full rcx-toggle-switch__input"
-                  data-qa-setting-id="ABAC_Enabled"
                   id="ABAC_Enabled"
                   type="checkbox"
                 />

From 90c0ced649b819d384cfb7d4f9f4950b3d2b4fd1 Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 11:44:31 -0300
Subject: [PATCH 5/8] test: adjust locators

---
 .../admin/settings/Setting/inputs/MultiSelectSettingInput.tsx | 1 +
 apps/meteor/tests/e2e/page-objects/admin-settings.ts          | 2 +-
 apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts    | 2 +-
 .../tests/e2e/settings-persistence-on-ui-navigation.spec.ts   | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
index 371f33c984783..8b32553027ea4 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/MultiSelectSettingInput.tsx
@@ -52,6 +52,7 @@ function MultiSelectSettingInput({
 					// autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
 					options={values.map(({ key, i18nLabel }) => [key, t(i18nLabel)])}
+					aria-label={_id} // FIXME: Multiselect (fuselage) should be associating the FieldLabel automatically. This is a workaround for accessibility and test locators.
 				/>
 			</FieldRow>
 			{hint && <FieldHint>{hint}</FieldHint>}
diff --git a/apps/meteor/tests/e2e/page-objects/admin-settings.ts b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
index 2c6e3e6d2f765..db3acb56703ea 100644
--- a/apps/meteor/tests/e2e/page-objects/admin-settings.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
@@ -12,7 +12,7 @@ export class AdminSettings extends Admin {
 	}
 
 	get inputSiteURL(): Locator {
-		return this.page.locator('[data-qa-setting-id="Site_Url"]');
+		return this.page.getByRole('textbox', { name: 'Site_Url' });
 	}
 
 	get btnResetSiteURL(): Locator {
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
index c853fb43a1018..952959fda2cac 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-settings.ts
@@ -28,7 +28,7 @@ export class OmnichannelSettings {
 	}
 
 	get labelHideWatermark(): Locator {
-		return this.page.locator('label', { has: this.page.locator('[data-qa-setting-id="Livechat_hide_watermark"]') });
+		return this.page.locator('label').getByText('Hide "powered by Rocket.Chat"');
 	}
 
 	get btnSave(): Locator {
diff --git a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
index a3b1daebcd49c..b486ec29802b5 100644
--- a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
+++ b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
@@ -25,8 +25,8 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {
 
 	test.afterAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));
 
-	test.skip('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
-		const settingInput = page.locator('[data-qa-setting-id="Hide_System_Messages"] input');
+	test('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
+		const settingInput = page.getByLabel('Hide_System_Messages').getByRole('textbox');
 		await settingInput.pressSequentially('User joined');
 		await settingInput.press('Enter');
 

From d1b84b050bac9cdd35ef6d09ee85b149198e763f Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 29 Dec 2025 19:19:40 -0300
Subject: [PATCH 6/8] test: improve test reliability by adopting `getByRole`,
 `getByLabel`, and `pressSequentially`

---
 .../tests/e2e/administration-settings.spec.ts  |  2 +-
 .../tests/e2e/page-objects/admin-settings.ts   |  2 +-
 ...ttings-persistence-on-ui-navigation.spec.ts | 18 +++++++-----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/apps/meteor/tests/e2e/administration-settings.spec.ts b/apps/meteor/tests/e2e/administration-settings.spec.ts
index 6c6df34536b2b..43dcd821ad660 100644
--- a/apps/meteor/tests/e2e/administration-settings.spec.ts
+++ b/apps/meteor/tests/e2e/administration-settings.spec.ts
@@ -55,7 +55,7 @@ test.describe.parallel('administration-settings', () => {
 		});
 
 		test('should be able to reset a setting after a change', async () => {
-			await poAdminSettings.inputSiteURL.fill('any_text');
+			await poAdminSettings.inputSiteURL.pressSequentially('any_text');
 			await poAdminSettings.btnResetSiteURL.click();
 
 			await expect(poAdminSettings.inputSiteURL).toHaveValue(inputSiteURLSetting);
diff --git a/apps/meteor/tests/e2e/page-objects/admin-settings.ts b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
index db3acb56703ea..7750666129d39 100644
--- a/apps/meteor/tests/e2e/page-objects/admin-settings.ts
+++ b/apps/meteor/tests/e2e/page-objects/admin-settings.ts
@@ -12,7 +12,7 @@ export class AdminSettings extends Admin {
 	}
 
 	get inputSiteURL(): Locator {
-		return this.page.getByRole('textbox', { name: 'Site_Url' });
+		return this.page.getByRole('textbox', { name: 'Site URL' });
 	}
 
 	get btnResetSiteURL(): Locator {
diff --git a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
index b486ec29802b5..af2e1120535f7 100644
--- a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
+++ b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
@@ -25,22 +25,18 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {
 
 	test.afterAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));
 
-	test('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
+	test.skip('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
 		const settingInput = page.getByLabel('Hide_System_Messages').getByRole('textbox');
 		await settingInput.pressSequentially('User joined');
 		await settingInput.press('Enter');
 
-		const responsePromise = page.waitForResponse(
-			(response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200,
-		);
+		await page.getByRole('button', { name: 'Save changes', exact: true }).click();
+		const saveRequestPromise = page.waitForRequest((request) => request.url().includes('/api/v1/method.call/saveSettings'));
+		await saveRequestPromise;
+		await page.getByRole('button', { name: 'Back', exact: true }).click();
 
-		await page.locator('button:has-text("Save changes")').click();
-		await page.locator('button[title="Back"]').click();
+		await page.getByRole('region', { name: 'Message', exact: true }).getByRole('link', { name: 'Open', exact: true }).click();
 
-		await responsePromise;
-
-		await page.locator('a[href="/admin/settings/Message"] >> text=Open').click();
-
-		await expect(page.locator('label[for="Hide_System_Messages"][title="Hide_System_Messages"]')).toBeVisible();
+		await expect(page.getByLabel('Hide_System_Messages').getByRole('option', { name: 'User joined' })).toBeVisible();
 	});
 });

From 4e90324817e43cb2d45a5d1599d3be628b62e62b Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Tue, 30 Dec 2025 19:07:09 -0300
Subject: [PATCH 7/8] test: change `pressSequentially` to `fill`

---
 apps/meteor/tests/e2e/administration-settings.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/tests/e2e/administration-settings.spec.ts b/apps/meteor/tests/e2e/administration-settings.spec.ts
index 43dcd821ad660..6c6df34536b2b 100644
--- a/apps/meteor/tests/e2e/administration-settings.spec.ts
+++ b/apps/meteor/tests/e2e/administration-settings.spec.ts
@@ -55,7 +55,7 @@ test.describe.parallel('administration-settings', () => {
 		});
 
 		test('should be able to reset a setting after a change', async () => {
-			await poAdminSettings.inputSiteURL.pressSequentially('any_text');
+			await poAdminSettings.inputSiteURL.fill('any_text');
 			await poAdminSettings.btnResetSiteURL.click();
 
 			await expect(poAdminSettings.inputSiteURL).toHaveValue(inputSiteURLSetting);

From 40800992cb564a8332855347117cc5a348b86ada Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Mon, 5 Jan 2026 10:29:25 -0300
Subject: [PATCH 8/8] test: settings-persistence

---
 .../settings-persistence-on-ui-navigation.spec.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
index af2e1120535f7..741a9159bd83a 100644
--- a/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
+++ b/apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts
@@ -27,15 +27,20 @@ test.describe.serial('settings-persistence-on-ui-navigation', () => {
 
 	test.skip('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
 		const settingInput = page.getByLabel('Hide_System_Messages').getByRole('textbox');
+
 		await settingInput.pressSequentially('User joined');
 		await settingInput.press('Enter');
 
-		await page.getByRole('button', { name: 'Save changes', exact: true }).click();
-		const saveRequestPromise = page.waitForRequest((request) => request.url().includes('/api/v1/method.call/saveSettings'));
-		await saveRequestPromise;
-		await page.getByRole('button', { name: 'Back', exact: true }).click();
+		const responsePromise = page.waitForResponse(
+			(response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200,
+		);
+
+		await page.getByRole('button', { name: 'Save changes' }).click();
+		await page.getByRole('button', { name: 'Back' }).click();
+
+		await responsePromise;
 
-		await page.getByRole('region', { name: 'Message', exact: true }).getByRole('link', { name: 'Open', exact: true }).click();
+		await page.locator('a[href="/admin/settings/Message"] >> text=Open').click();
 
 		await expect(page.getByLabel('Hide_System_Messages').getByRole('option', { name: 'User joined' })).toBeVisible();
 	});