project bug fixes (#256)

NEARBuilders · Apr 28, 2024 · 640ac63 · 640ac63
1 parent 812f0d3
commit 640ac63
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 23 deletions.
diff --git a/apps/builddao/widget/components/modals/CreateProject.jsx b/apps/builddao/widget/components/modals/CreateProject.jsx
@@ -305,7 +305,9 @@ function onCreateProject() {
       gas: 200000000000000,
     });
   } else {
-    Social.set(data);
+    Social.set(data, {
+      onCommit: () => toggleModal(),
+    });
   }
 }
 
@@ -492,7 +494,13 @@ return (
       <Button
         variant="primary"
         onClick={onCreateProject}
-        disabled={invalidContributorFound || invalidProjectAccount}
+        disabled={
+          invalidContributorFound ||
+          invalidProjectAccount ||
+          !title ||
+          !description ||
+          !projectAccount
+        }
       >
         Create
       </Button>

diff --git a/apps/builddao/widget/components/project/page/Task.jsx b/apps/builddao/widget/components/project/page/Task.jsx
@@ -311,7 +311,9 @@ const onAddTask = () => {
       },
     },
   };
-  Social.set(data);
+  Social.set(data, {
+    onCommit: () => setShowAddTaskModal(false),
+  });
 };
 
 const onEditTask = useCallback(
@@ -335,32 +337,34 @@ const onEditTask = useCallback(
         },
       },
     };
-    Social.set(updatedData, { force: true });
+    Social.set(updatedData, {
+      force: true,
+      onCommit: () => setShowAddTaskModal(false),
+    });
   },
   [taskDetail, currentEditTaskId],
 );
 
-const onDeleteTask = useCallback(
-  (data) => {
-    const taskId = currentEditTaskId;
-    const updatedData = {
-      [type]: {
-        [taskId]: null,
-      },
-      [app]: {
-        [projectTask]: {
-          [projectID]: {
-            [type]: {
-              [`${context.accountId}_task_${taskId}`]: null,
-            },
+const onDeleteTask = useCallback(() => {
+  const taskId = currentEditTaskId;
+  const updatedData = {
+    [type]: {
+      [taskId]: null,
+    },
+    [app]: {
+      [projectTask]: {
+        [projectID]: {
+          [type]: {
+            [`${context.accountId}_task_${taskId}`]: null,
           },
         },
       },
-    };
-    Social.set(updatedData, { force: true });
-  },
-  [taskDetail, currentEditTaskId],
-);
+    },
+  };
+  Social.set(updatedData, {
+    force: true,
+  });
+}, [taskDetail, currentEditTaskId]);
 
 function handleDropdownToggle(columnTitle, index, value) {
   setShowDropdownIndex((prevState) => ({
@@ -456,7 +460,13 @@ const DeleteConfirmationModal = () => {
           >
             Cancel
           </Button>
-          <Button variant="primary" onClick={onDeleteTask}>
+          <Button
+            variant="primary"
+            onClick={() => {
+              setDeleteConfirmationIndex(null);
+              onDeleteTask();
+            }}
+          >
             Delete
           </Button>
         </div>