diff --git a/src/components/Select.tsx b/src/components/Select.tsx index f1eb7ea..5bae2a7 100644 --- a/src/components/Select.tsx +++ b/src/components/Select.tsx @@ -33,7 +33,7 @@ const Select: FC = (props: Props) => { )}> { props.placeholder && - + } { props.items?.map((item) => { diff --git a/src/pages/setting/address/components/AddressForm.tsx b/src/pages/setting/address/components/AddressForm.tsx index 02b2407..0c3e68c 100644 --- a/src/pages/setting/address/components/AddressForm.tsx +++ b/src/pages/setting/address/components/AddressForm.tsx @@ -32,7 +32,7 @@ const AddressForm: FC = ({ selectedAddress, isEditMode, onCanc type FormData = CreateAddressType & { password?: string; quotaMB?: number } - const { register, handleSubmit, formState: { errors }, setValue, reset, setError, clearErrors, getValues + const { register, handleSubmit, formState: { errors }, setValue, reset, setError, clearErrors } = useForm({ defaultValues: { domainId: domain?.data?.domain?.id, @@ -134,7 +134,7 @@ const AddressForm: FC = ({ selectedAddress, isEditMode, onCanc password: '', domainId: selectedAddress.domain.id, quotaMB: selectedAddress.emailQuota ? Math.round(selectedAddress.emailQuota / (1024 * 1024)) : undefined, - templateId: selectedAddress.template || undefined, + templateId: selectedAddress.template || '', }) setForwarders(selectedAddress.forwarders || []) } else if (!isEditMode) { @@ -144,11 +144,11 @@ const AddressForm: FC = ({ selectedAddress, isEditMode, onCanc password: '', domainId: domain?.data?.domain?.id, quotaMB: undefined, - templateId: domain?.data?.template, + templateId: domain?.data?.template || '', }) setForwarders([]) } - }, [selectedAddress, isEditMode, reset, domain]) + }, [selectedAddress, isEditMode, reset, domain, templates]) return (
@@ -196,8 +196,7 @@ const AddressForm: FC = ({ selectedAddress, isEditMode, onCanc })) : [] } - onChange={(e) => setValue('templateId', e.target.value)} - value={getValues('templateId')} + {...register('templateId')} />