review

Co-authored-by: Copilot <copilot@github.com>

Author: juliajforesti

apps/meteor/client/views/omnichannel/modals/TranscriptModal.tsx

@@ -109,7 +109,7 @@ const TranscriptModal = ({ email: emailDefault = '', room, onRequest, onSend, on
 								)}
 							/>
 						</FieldRow>
-						<FieldError>{errors.subject?.message}</FieldError>
+						{errors.subject && <FieldError>{errors.subject?.message}</FieldError>}
 					</Field>
 				</FieldGroup>
 			</ModalContent>

apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesDateTimeRow.tsx

@@ -1,6 +1,7 @@
 import { Box, Margins, Field, FieldLabel, InputBox } from '@rocket.chat/fuselage';
-import { useId, type ReactElement } from 'react';
+import { type ReactElement } from 'react';
 import { useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type PruneMessagesDateTimeRowProps = {
 	label: string;
@@ -9,17 +10,15 @@ type PruneMessagesDateTimeRowProps = {
 
 const PruneMessagesDateTimeRow = ({ label, field }: PruneMessagesDateTimeRowProps): ReactElement => {
 	const { register } = useFormContext();
-	const fieldId = useId();
+	const { t } = useTranslation();
 
 	return (
 		<Field>
-			<FieldLabel id={fieldId} flexGrow={0}>
-				{label}
-			</FieldLabel>
+			<FieldLabel flexGrow={0}>{label}</FieldLabel>
 			<Box display='flex' mi='neg-x4'>
 				<Margins inline={4}>
-					<InputBox aria-labelledby={fieldId} type='date' flexGrow={1} h='x20' {...register(`${field}.date`)} />
-					<InputBox aria-labelledby={fieldId} type='time' flexGrow={1} h='x20' {...register(`${field}.time`)} />
+					<InputBox aria-label={`${label} ${t('Date')}`} type='date' flexGrow={1} h='x20' {...register(`${field}.date`)} />
+					<InputBox aria-label={`${label} ${t('Time')}`} type='time' flexGrow={1} h='x20' {...register(`${field}.time`)} />
 				</Margins>
 			</Box>
 		</Field>