From 7c0aa9b3531d2cf661a714c32e7e82b20eec5f70 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Sat, 6 Aug 2022 22:16:03 +0200
Subject: [PATCH] fix: project time entry form.

---
 .../ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx    | 2 +-
 .../containers/ProjectTimeEntryFormDialog/utils.ts         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx b/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx
index 2072eb5fa..810214949 100644
--- a/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx
+++ b/src/containers/Projects/containers/ProjectTimeEntryFormDialog/ProjectTimeEntryForm.tsx
@@ -73,7 +73,7 @@ function ProjectTimeEntryForm({
       setSubmitting(false);
     };
     if (isNewMode) {
-      createProjectTimeEntryMutate([values.taskId, form])
+      createProjectTimeEntryMutate([values.task_id, form])
         .then(onSuccess)
         .catch(onError);
     } else {
diff --git a/src/containers/Projects/containers/ProjectTimeEntryFormDialog/utils.ts b/src/containers/Projects/containers/ProjectTimeEntryFormDialog/utils.ts
index cc3248c48..5930df458 100644
--- a/src/containers/Projects/containers/ProjectTimeEntryFormDialog/utils.ts
+++ b/src/containers/Projects/containers/ProjectTimeEntryFormDialog/utils.ts
@@ -1,14 +1,15 @@
 import React from 'react';
+import { isNull } from 'lodash';
 import { useFormikContext } from 'formik';
 import { useProjectTimeEntryFormContext } from './ProjectTimeEntryFormProvider';
 
 export const useSetProjectToForm = () => {
   const { values } = useFormikContext();
-  const { setProjectPayload } = useProjectTimeEntryFormContext();
+  const { setProjectPayload, projectId } = useProjectTimeEntryFormContext();
 
   React.useEffect(() => {
-    if (values.project_id) {
+    if (isNull(projectId)) {
       setProjectPayload(values.project_id);
     }
-  }, [values.projectId]);
+  }, [values.project_id]);
 };