diff --git a/src/pages/master/conversion/blocks/AddDialog.tsx b/src/pages/master/conversion/blocks/AddDialog.tsx index 3d04251..e249997 100644 --- a/src/pages/master/conversion/blocks/AddDialog.tsx +++ b/src/pages/master/conversion/blocks/AddDialog.tsx @@ -35,7 +35,7 @@ import { import { useManageConversionContext } from '../hooks/useManageConversionContext'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { RefreshCw } from 'lucide-react'; -import { initialState, validateForm } from './Types'; +import { initialStateConversion, validateFormConversion } from './Types'; interface CurrencyProps { ID: string; name: string; @@ -52,13 +52,13 @@ const AddDialog = () => { const [currencies, setCurrencies] = useState([]); const [open, setOpen] = useState(false); const [errors, setErrors] = useState>({}); - const [formField, setFormField] = useState(initialState); + const [formField, setFormField] = useState(initialStateConversion); const created_time = new Date(); const formattedTime = created_time.toISOString().slice(0, 19).replace('T', ' '); const [isSubmitting, setIsSubmitting] = useState(false); const resetForm = () => { - setFormField(initialState); + setFormField(initialStateConversion); setErrors({}); }; @@ -114,7 +114,7 @@ const AddDialog = () => { const handleSubmit = (e: React.FormEvent) => { e.preventDefault(); - if (!validateForm(formField, setErrors)) { + if (!validateFormConversion(formField, setErrors)) { return; } diff --git a/src/pages/master/conversion/blocks/EditDialog.tsx b/src/pages/master/conversion/blocks/EditDialog.tsx index 85805ac..1d83ab0 100644 --- a/src/pages/master/conversion/blocks/EditDialog.tsx +++ b/src/pages/master/conversion/blocks/EditDialog.tsx @@ -35,7 +35,7 @@ import { import { useManageConversionContext } from '../hooks/useManageConversionContext'; import { doSaveLogActivity } from '@/actions/GlobalActions'; import { RefreshCw } from 'lucide-react'; -import { initialState, validateForm } from './Types'; +import { initialStateConversion, validateFormConversion } from './Types'; interface CurrencyProps { ID: string; name: string; @@ -55,12 +55,12 @@ const EditDialog = () => { const [isLoading, setIsLoading] = useState(false); const [errors, setErrors] = useState>({}); - const [formField, setFormField] = useState(initialState); + const [formField, setFormField] = useState(initialStateConversion); const updated_time = new Date(); const formattedTime = updated_time.toISOString().slice(0, 19).replace('T', ' '); const resetForm = () => { - setFormField(initialState); + setFormField(initialStateConversion); setErrors({}); }; @@ -69,7 +69,7 @@ const EditDialog = () => { e.preventDefault(); setIsSubmitting(true); - if (!validateForm(formField, setErrors)) { + if (!validateFormConversion(formField, setErrors)) { setIsSubmitting(false); return; } diff --git a/src/pages/master/conversion/blocks/Types.ts b/src/pages/master/conversion/blocks/Types.ts index 196e0a0..ec88aa9 100644 --- a/src/pages/master/conversion/blocks/Types.ts +++ b/src/pages/master/conversion/blocks/Types.ts @@ -1,6 +1,9 @@ import { toast } from 'sonner'; -export const validateForm = (formField: any, setErrors: any) => { +export const validateFormConversion = ( + formField: typeof initialStateConversion, + setErrors: React.Dispatch>> +) => { const requiredFields = [ { key: 'id_currency_origin', label: 'Currency Origin' }, { key: 'id_currency_destination', label: 'Currency Destination' }, @@ -28,7 +31,7 @@ export const validateForm = (formField: any, setErrors: any) => { return isValid; }; -export const initialState: { +export const initialStateConversion: { status: string; id_currency_origin: string; id_currency_destination: string;