src/components/Expenses/ManageExpense.jsx

@@ -181,6 +181,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
   useEffect(() => {
     setExpenseType(ExpenseTypes?.find((type) => type.id === ExpenseTypeId));
+    return () => reset(defaultExpense);
   }, [ExpenseTypeId]);
 
   const handleClose = () => {
@@ -188,6 +189,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
     closeModal();
   };
   if (
+    EmpLoading ||
     StatusLoadding ||
     projectLoading ||
     ExpenseLoading ||
@@ -534,7 +536,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             className="btn btn-primary btn-sm mt-3"
             disabled={isPending}
           >
-            {isPending || createPending ? "Please Wait..." : expenseToEdit ? "Update" : "Submit"}
+            {isPending ? "Please Wait..." : expenseToEdit ? "Update" : "Submit"}
           </button>
           <button
             type="reset"