fix: check if custom field is required to apply rule (#28428)

RocketChat · Apr 6, 2023 · 5b20104 · 5b20104
1 parent 8332fa6
commit 5b20104
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/meteor/client/components/CustomFieldsFormV2.tsx b/apps/meteor/client/components/CustomFieldsFormV2.tsx
@@ -50,7 +50,7 @@ const CustomField = <T extends FieldValues>({
 			name={name}
 			control={control}
 			defaultValue={defaultValue ?? ''}
-			rules={{ required: t('The_field_is_required', label || name) }}
+			rules={{ required: required && t('The_field_is_required', label || name) }}
 			render={({ field, formState: { errors } }) => (
 				<Field>
 					<Field.Label>

diff --git a/apps/meteor/client/views/omnichannel/components/CustomField.tsx b/apps/meteor/client/views/omnichannel/components/CustomField.tsx
@@ -16,7 +16,7 @@ type CustomFieldProps = {
 const CustomField = ({ id, value }: CustomFieldProps) => {
 	const t = useTranslation();
 	const getCustomField = useEndpoint('GET', '/v1/livechat/custom-fields/:_id', { _id: id });
-	const { data, isLoading, isError } = useQuery(['/v1/livechat/custom-fields', id], () => getCustomField());
+	const { data, isLoading, isError } = useQuery(['/v1/livechat/custom-field', id], () => getCustomField());
 
 	if (isLoading) {
 		return <FormSkeleton />;