From ffb9a058022baa346d5ca242a2a7129c0eae8b03 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Thu, 11 Dec 2025 14:28:52 -0300
Subject: [PATCH 1/7] regression: truncate abac table cells

---
 .../views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx | 4 ++--
 .../client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx    | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
index 24e3967fbb42e..0309c8a73df28 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
@@ -83,8 +83,8 @@ const AttributesPage = () => {
 						<GenericTableBody>
 							{data?.attributes?.map((attribute) => (
 								<GenericTableRow key={attribute._id}>
-									<GenericTableCell>{attribute.key}</GenericTableCell>
-									<GenericTableCell>{attribute.values.join(', ')}</GenericTableCell>
+									<GenericTableCell withTruncatedText>{attribute.key}</GenericTableCell>
+									<GenericTableCell withTruncatedText>{attribute.values.join(', ')}</GenericTableCell>
 									<GenericTableCell>
 										<AttributeMenu attribute={attribute} />
 									</GenericTableCell>
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx
index c7a93d5d600e9..7864e5670c6c6 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsPage.tsx
@@ -106,8 +106,12 @@ const RoomsPage = () => {
 								<GenericTableRow key={room._id}>
 									<GenericTableCell>{room.fname || room.name}</GenericTableCell>
 									<GenericTableCell>{room.usersCount}</GenericTableCell>
-									<GenericTableCell>{room.abacAttributes?.flatMap((attribute) => attribute.key ?? []).join(', ')}</GenericTableCell>
-									<GenericTableCell>{room.abacAttributes?.flatMap((attribute) => attribute.values ?? []).join(', ')}</GenericTableCell>
+									<GenericTableCell withTruncatedText>
+										{room.abacAttributes?.flatMap((attribute) => attribute.key ?? []).join(', ')}
+									</GenericTableCell>
+									<GenericTableCell withTruncatedText>
+										{room.abacAttributes?.flatMap((attribute) => attribute.values ?? []).join(', ')}
+									</GenericTableCell>
 									<GenericTableCell>
 										<RoomMenu room={{ rid: room._id, name: room.fname || room.name || room._id }} />
 									</GenericTableCell>

From b0cc02beb4a675c1037010dbf7919c6a1097afa6 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Thu, 11 Dec 2025 16:13:16 -0300
Subject: [PATCH 2/7] regression: add validation for duplicated attribute
 values

---
 .../AttributesContextualBar.tsx               |  1 +
 .../ABAC/ABACAttributesTab/AttributesForm.tsx | 76 +++++++++++++------
 packages/i18n/src/locales/en.i18n.json        |  1 +
 3 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
index 78990e95b6b83..c346c1ce5de64 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
@@ -38,6 +38,7 @@ const AttributesContextualBar = ({ attributeData, onClose }: AttributesContextua
 					attributeValues: [{ value: '' }],
 					lockedAttributes: [],
 				},
+		mode: 'onChange',
 	});
 
 	const { getValues } = methods;
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
index 390e4eccf2ba6..cba1a6d6a5e56 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
@@ -11,7 +11,7 @@ import {
 	TextInput,
 } from '@rocket.chat/fuselage';
 import { ContextualbarScrollableContent } from '@rocket.chat/ui-client';
-import { useCallback, useId, useMemo } from 'react';
+import { useCallback, useId, useMemo, Fragment } from 'react';
 import { useFieldArray, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
@@ -35,29 +35,42 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 		watch,
 	} = useFormContext<AttributesFormFormData>();
 
+	const { t } = useTranslation();
+
+	const attributeValues = watch('attributeValues');
+	const lockedAttributes = watch('lockedAttributes');
+
 	const { fields: lockedAttributesFields, remove: removeLockedAttribute } = useFieldArray({
 		name: 'lockedAttributes',
 	});
 
+	const validateRepeatedValues = useCallback(
+		(value: string) => {
+			// Only one instance of the same attribute value is allowed to be in the form at a time
+			const repeatedAttributes = [...lockedAttributes, ...attributeValues].filter((attribute) => attribute.value === value).length > 1;
+			return repeatedAttributes ? t('ABAC_No_repeated_values') : undefined;
+		},
+		[lockedAttributes, attributeValues, t],
+	);
+
 	const { fields, append, remove } = useFieldArray({
 		name: 'attributeValues',
 		rules: {
 			minLength: 1,
 		},
 	});
-	const { t } = useTranslation();
 
 	const formId = useId();
 	const nameField = useId();
 	const valuesField = useId();
-	const attributeValues = watch('attributeValues');
 
 	const getAttributeValuesError = useCallback(() => {
 		if (errors.attributeValues?.length && errors.attributeValues?.length > 0) {
-			return t('Required_field', { field: t('Values') });
+			return errors.attributeValues[0]?.value?.message;
 		}
+
 		return '';
-	}, [errors.attributeValues, t]);
+	}, [errors.attributeValues]);
 
 	const hasValuesErrors = useMemo(() => {
 		const attributeValuesErrors = Array.isArray(errors?.attributeValues) && errors.attributeValues.some((error) => !!error?.value?.message);
@@ -89,29 +102,42 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 							{t('Values')}
 						</FieldLabel>
 						{lockedAttributesFields.map((field, index) => (
-							<FieldRow key={field.id}>
-								<TextInput
-									disabled
-									aria-labelledby={valuesField}
-									error={errors.lockedAttributes?.[index]?.value?.message || ''}
-									{...register(`lockedAttributes.${index}.value`, { required: t('Required_field', { field: t('Values') }) })}
-								/>
-								{index !== 0 && <IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => removeLockedAttribute(index)} />}
-							</FieldRow>
+							<Fragment key={field.id}>
+								<FieldRow key={field.id}>
+									<TextInput
+										disabled
+										aria-labelledby={valuesField}
+										error={errors.lockedAttributes?.[index]?.value?.message || ''}
+										{...register(`lockedAttributes.${index}.value`, {
+											required: t('Required_field', { field: t('Values') }),
+											validate: (value: string) => validateRepeatedValues(value),
+										})}
+									/>
+									{index !== 0 && (
+										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => removeLockedAttribute(index)} />
+									)}
+								</FieldRow>
+								<FieldError>{errors.lockedAttributes?.[index]?.value?.message || ''}</FieldError>
+							</Fragment>
 						))}
 						{fields.map((field, index) => (
-							<FieldRow key={field.id}>
-								<TextInput
-									aria-labelledby={valuesField}
-									error={errors.attributeValues?.[index]?.value?.message || ''}
-									{...register(`attributeValues.${index}.value`, { required: t('Required_field', { field: t('Values') }) })}
-								/>
-								{(index !== 0 || lockedAttributesFields.length > 0) && (
-									<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => remove(index)} />
-								)}
-							</FieldRow>
+							<Fragment key={field.id}>
+								<FieldRow>
+									<TextInput
+										aria-labelledby={valuesField}
+										error={errors.attributeValues?.[index]?.value?.message || ''}
+										{...register(`attributeValues.${index}.value`, {
+											required: t('Required_field', { field: t('Values') }),
+											validate: (value: string) => validateRepeatedValues(value),
+										})}
+									/>
+									{(index !== 0 || lockedAttributesFields.length > 0) && (
+										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => remove(index)} />
+									)}
+								</FieldRow>
+								<FieldError>{errors.attributeValues?.[index]?.value?.message || ''}</FieldError>
+							</Fragment>
 						))}
-						<FieldError>{getAttributeValuesError()}</FieldError>
 						<Button
 							onClick={() => append({ value: '' })}
 							// Checking for values since rhf does consider the newly added field as dirty after an append() call
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 482c9cbb70a71..78586f4751c82 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -53,6 +53,7 @@
   "ABAC_Edit_Room": "Edit Room",
   "ABAC_Add_room": "Add Room",
   "ABAC_No_repeated_attributes": "Attribute already added",
+  "ABAC_No_repeated_values": "Value already added",
   "ABAC_Room_created": "Access to {{roomName}} is now restricted to attribute-compliant users",
   "ABAC_Room_to_be_managed": "Room to be ABAC-managed",
   "ABAC_Room_updated": "{{roomName}} ABAC room updated",

From 9851abe35f048e291483cd8bfaed6bb9bbc8c415 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Thu, 11 Dec 2025 16:15:22 -0300
Subject: [PATCH 3/7] regression: form resetting on error

---
 .../admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx    | 2 +-
 .../client/views/admin/ABAC/ABACRoomsTab/RoomsContextualBar.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
index c346c1ce5de64..a41e7b6b87ca2 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
@@ -75,7 +75,7 @@ const AttributesContextualBar = ({ attributeData, onClose }: AttributesContextua
 			dispatchToastMessage({ type: 'error', message: error });
 		},
 		onSettled: () => {
-			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.roomAttributes.all() });
+			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.roomAttributes.list() });
 		},
 	});
 
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsContextualBar.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsContextualBar.tsx
index 8f6edb6605cda..25c9037c86e67 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsContextualBar.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomsContextualBar.tsx
@@ -64,7 +64,7 @@ const RoomsContextualBar = ({ roomInfo, attributesData, onClose }: RoomsContextu
 			dispatchToastMessage({ type: 'error', message: error });
 		},
 		onSettled: () => {
-			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.rooms.all() });
+			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.rooms.list() });
 		},
 	});
 

From a5f188dc65e5abbb1e97798909a9285056403784 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Thu, 11 Dec 2025 16:28:56 -0300
Subject: [PATCH 4/7] snap

---
 .../__snapshots__/AttributesForm.spec.tsx.snap              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
index ef0ce316ebcae..6fd7b435377ec 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
@@ -268,6 +268,9 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       type="text"
                     />
                   </span>
+                  <span
+                    class="rcx-box rcx-box--full rcx-field__error"
+                  />
                   <span
                     class="rcx-box rcx-box--full rcx-field__row"
                   >
@@ -292,6 +295,9 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       </i>
                     </button>
                   </span>
+                  <span
+                    class="rcx-box rcx-box--full rcx-field__error"
+                  />
                   <span
                     class="rcx-box rcx-box--full rcx-field__row"
                   >

From c4bffe098c369d48a187f42059b013d48fbf1e5b Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Fri, 12 Dec 2025 14:47:02 -0300
Subject: [PATCH 5/7] fix: don't render empty fieldError

---
 .../views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx   | 6 +++---
 .../client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx       | 2 +-
 .../admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
index cba1a6d6a5e56..35a83d97d30ca 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
@@ -95,7 +95,7 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 								{...register('name', { required: t('Required_field', { field: t('Name') }) })}
 							/>
 						</FieldRow>
-						<FieldError>{errors.name?.message || ''}</FieldError>
+						{errors.name && <FieldError>{errors.name.message}</FieldError>}
 					</Field>
 					<Field mb={16}>
 						<FieldLabel required id={valuesField}>
@@ -117,7 +117,7 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => removeLockedAttribute(index)} />
 									)}
 								</FieldRow>
-								<FieldError>{errors.lockedAttributes?.[index]?.value?.message || ''}</FieldError>
+								{errors.lockedAttributes?.[index]?.value && <FieldError>{errors.lockedAttributes?.[index]?.value?.message}</FieldError>}
 							</Fragment>
 						))}
 						{fields.map((field, index) => (
@@ -135,7 +135,7 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => remove(index)} />
 									)}
 								</FieldRow>
-								<FieldError>{errors.attributeValues?.[index]?.value?.message || ''}</FieldError>
+								{errors.attributeValues?.[index]?.value && <FieldError>{errors.attributeValues[index].value.message}</FieldError>}
 							</Fragment>
 						))}
 						<Button
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
index 0a98056683cbe..fac8418292ded 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
@@ -102,7 +102,7 @@ const RoomForm = ({ onClose, onSave, roomInfo, setSelectedRoomLabel }: RoomFormP
 								/>
 							)}
 						</FieldRow>
-						<FieldError>{errors.room?.message}</FieldError>
+						{errors.room && <FieldError>{errors.room.message}</FieldError>}
 					</Field>
 					{fields.map((field, index) => (
 						<Field key={field.id} mb={16}>
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
index e85c56aad5df5..91c36e9630f80 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
@@ -77,7 +77,7 @@ const RoomFormAttributeField = ({ onRemove, index }: ABACAttributeAutocompletePr
 					error={keyFieldState.error?.message}
 				/>
 			</FieldRow>
-			<FieldError>{keyFieldState.error?.message || ''}</FieldError>
+			{keyFieldState.error && <FieldError>{keyFieldState.error.message}</FieldError>}
 
 			<FieldRow>
 				<MultiSelect
@@ -87,7 +87,7 @@ const RoomFormAttributeField = ({ onRemove, index }: ABACAttributeAutocompletePr
 					error={valuesFieldState.error?.message}
 				/>
 			</FieldRow>
-			<FieldError>{valuesFieldState.error?.message || ''}</FieldError>
+			{valuesFieldState.error && <FieldError>{valuesFieldState.error.message}</FieldError>}
 
 			<Button onClick={onRemove} title={t('Remove')} mbs={4}>
 				{t('Remove')}

From 81da92a1e24833b2eca379fa7e00c38eb106b002 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Fri, 12 Dec 2025 15:02:36 -0300
Subject: [PATCH 6/7] fix: ty to protect selects from big values

---
 .../views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
index 91c36e9630f80..8e63e492a537a 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
@@ -75,12 +75,14 @@ const RoomFormAttributeField = ({ onRemove, index }: ABACAttributeAutocompletePr
 					placeholder={t('ABAC_Search_Attribute')}
 					mbe={4}
 					error={keyFieldState.error?.message}
+					withTruncatedText
 				/>
 			</FieldRow>
 			{keyFieldState.error && <FieldError>{keyFieldState.error.message}</FieldError>}
 
 			<FieldRow>
 				<MultiSelect
+					withTruncatedText
 					{...valuesField}
 					options={valueOptions}
 					placeholder={t('ABAC_Select_Attribute_Values')}

From 308ad7c7e3e2b7a128dcdbb75984b7d6ea503ac3 Mon Sep 17 00:00:00 2001
From: MartinSchoeler <martinschoeler8@gmail.com>
Date: Fri, 12 Dec 2025 16:30:37 -0300
Subject: [PATCH 7/7] snaps

---
 .../__snapshots__/AttributesForm.spec.tsx.snap | 18 ------------------
 .../RoomFormAttributeField.spec.tsx.snap       | 10 ++--------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
index 6fd7b435377ec..29c536a2741dd 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
@@ -64,9 +64,6 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
                       type="text"
                     />
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                 </div>
                 <div
                   class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
@@ -94,9 +91,6 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
                       type="text"
                     />
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                   <button
                     class="rcx-box rcx-box--full rcx-button"
                     disabled=""
@@ -237,9 +231,6 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       type="text"
                     />
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                 </div>
                 <div
                   class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
@@ -268,9 +259,6 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       type="text"
                     />
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                   <span
                     class="rcx-box rcx-box--full rcx-field__row"
                   >
@@ -295,9 +283,6 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       </i>
                     </button>
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                   <span
                     class="rcx-box rcx-box--full rcx-field__row"
                   >
@@ -322,9 +307,6 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
                       </i>
                     </button>
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__error"
-                  />
                   <button
                     class="rcx-box rcx-box--full rcx-button"
                     type="button"
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
index ab20183a5b6d1..de31c45c5e177 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
@@ -13,7 +13,7 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-field__row"
         >
           <div
-            class="rcx-box rcx-box--full rcx-select rcx-css-18q594f"
+            class="rcx-box rcx-box--full rcx-select rcx-css-1hx4au7"
             name="attributes.0.key"
           >
             <div
@@ -38,14 +38,11 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
             </div>
           </div>
         </span>
-        <span
-          class="rcx-box rcx-box--full rcx-field__error"
-        />
         <span
           class="rcx-box rcx-box--full rcx-field__row"
         >
           <div
-            class="rcx-box rcx-box--full rcx-select"
+            class="rcx-box rcx-box--full rcx-select rcx-css-1te28na"
             name="attributes.0.values"
           >
             <div
@@ -76,9 +73,6 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
             </div>
           </div>
         </span>
-        <span
-          class="rcx-box rcx-box--full rcx-field__error"
-        />
         <button
           class="rcx-box rcx-box--full rcx-button rcx-css-1qsx7et"
           title="Remove"