diff --git a/src/components/Activities/ReportTask.jsx b/src/components/Activities/ReportTask.jsx
index 286d3df4..5c618215 100644
--- a/src/components/Activities/ReportTask.jsx
+++ b/src/components/Activities/ReportTask.jsx
@@ -26,7 +26,8 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: {errors},
+    reset
   } = useForm({
     resolver: zodResolver(schema),
     defaultValues: { completedTask: 0, comment: "" },
@@ -43,11 +44,15 @@ export const ReportTask = ({ report, closeModal, refetch }) => {
       };
 
       let response = await TasksRepository.reportTask(reportData);
-      showToast("Task reported successfully.", "success");
+      showToast("Task Reported Successfully.", "success");
       refetch();
+      reset()
+      setloading(false);
       closeModal();
-    } catch (error) {
-      showToast("Somthing wrog", "error");
+    } catch ( error )
+    {
+      const msg = error.response.data.message || error.message || "Error Occur During Api Call"
+      showToast(msg, "error");
     }
   };
   const handleClose = () => {
diff --git a/src/components/Activities/ReportTaskComments.jsx b/src/components/Activities/ReportTaskComments.jsx
index afe2b33f..94ee1c7b 100644
--- a/src/components/Activities/ReportTaskComments.jsx
+++ b/src/components/Activities/ReportTaskComments.jsx
@@ -102,7 +102,7 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
             style={{ maxHeight: "400px" }}
           >
             {comments &&
-              comments.map((data) => {
+              comments?.map((data) => {
                 const fullName = `${data?.employee?.firstName} ${data?.employee?.lastName}`;
                 const bgClass = getBgClassFromHash(fullName);
                 return (
@@ -116,10 +116,10 @@ const ReportTaskComments = ({ commentsData, closeModal }) => {
                         <span
                           className={`avatar-initial rounded-circle bg-label-primary}`}
                         >
-                          {`${data?.employee?.firstName.slice(
+                          {`${data?.employee?.firstName?.slice(
                             0,
                             1
-                          )} ${data?.employee?.lastName.slice(0, 1)}`}
+                          )} ${data?.employee?.lastName?.slice(0, 1)}`}
                         </span>
                       </div>
 
diff --git a/src/components/Project/AssignRole.jsx b/src/components/Project/AssignRole.jsx
index a4f38386..e5a567e9 100644
--- a/src/components/Project/AssignRole.jsx
+++ b/src/components/Project/AssignRole.jsx
@@ -40,7 +40,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
   );
-  const { employees } = useEmployeesAllOrByProjectId(selectedProject,false);
+  const { employees,loading:employeeLoading } = useEmployeesAllOrByProjectId(selectedProject,false);
 
   const dispatch = useDispatch();
   const { data, loading } = useMaster();
@@ -67,7 +67,7 @@ const AssignRoleModel = ({ assignData, onClose }) => {
 
   const handleRoleChange = (event) => {
     reset();
-    setSelectedEmployees([]);
+    // setSelectedEmployees([]);
     setSelectedRole(event.target.value);
   };
 
@@ -188,7 +188,8 @@ const AssignRoleModel = ({ assignData, onClose }) => {
                 <div className="divider text-start">
                   <div className="divider-text">Employee</div>
                 </div>
-                {filteredEmployees?.length === 0 && employees && (
+                {employeeLoading && <div>Loading...</div>}
+                {!employeeLoading && filteredEmployees?.length === 0 && employees && (
                   <div>No employees found</div>
                 )}
 
diff --git a/src/components/Project/ManageProjectInfo.jsx b/src/components/Project/ManageProjectInfo.jsx
index a2bfc3a2..41d2cb24 100644
--- a/src/components/Project/ManageProjectInfo.jsx
+++ b/src/components/Project/ManageProjectInfo.jsx
@@ -101,8 +101,8 @@ const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
 
   const onSubmitForm = (updatedProject) => {
     setLoading(true);
-
- handleSubmitForm( updatedProject ,setLoading);
+    handleSubmitForm( updatedProject, setLoading,reset );
+   
 
 
   };
diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx
index b4aaacfe..0f1dca9b 100644
--- a/src/pages/project/ProjectList.jsx
+++ b/src/pages/project/ProjectList.jsx
@@ -66,13 +66,15 @@ const ProjectList = () => {
     }
   }, [loginUser, HasManageProjectPermission]);
 
-  const handleSubmitForm = (newProject) => {
+  const handleSubmitForm = (newProject,setloading,reset) => {
     ProjectRepository.manageProject(newProject)
       .then((response) => {
         const cachedProjects = getCachedData("projectslist") || [];
         const updatedProjects = [...cachedProjects, response.data];
         cacheData("projectslist", updatedProjects);
-        setProjectList((prev) => [...prev, response.data]);
+        setProjectList( ( prev ) => [ ...prev, response.data ] );
+        setloading( false )
+        reset()
         showToast("Project Created successfully.", "success");
         setShowModal(false);
       })