diff --git a/src/components/Activities/InfraPlanning.jsx b/src/components/Activities/InfraPlanning.jsx
index ef417ded..b38316d7 100644
--- a/src/components/Activities/InfraPlanning.jsx
+++ b/src/components/Activities/InfraPlanning.jsx
@@ -13,7 +13,7 @@ import {useHasUserPermission} from "../../hooks/useHasUserPermission";
 import {MANAGE_PROJECT_INFRA} from "../../utils/constants";
 import {useDispatch, useSelector} from "react-redux";
 import {useProfile} from "../../hooks/useProfile";
-import {setProjectId} from "../../slices/localVariablesSlice";
+import {refreshData, setProjectId} from "../../slices/localVariablesSlice";
 import InfraTable from "../Project/Infrastructure/InfraTable";
 
 
@@ -25,11 +25,23 @@ const InfraPlanning = () =>
 
   const selectedProject = useSelector((store)=>store.localVariables.projectId)
   const ManageInfra = useHasUserPermission( MANAGE_PROJECT_INFRA )
-  const {projects_Details, loading: project_deatilsLoader, error: project_error} = useProjectDetails(selectedProject)
+  const {projects_Details, loading: project_deatilsLoader, error: project_error,refetch} = useProjectDetails( selectedProject )
+  const reloadedData = useSelector( ( store ) => store.localVariables.reload )
+ 
   useEffect( () =>
   {
     dispatch(setProjectId(projects[0]?.id))
-  },[projects])
+  }, [ projects ] )
+  
+   useEffect( () =>
+   {
+     if (reloadedData)
+     {
+       refetch()
+       dispatch( refreshData( false ) )
+     }
+
+   },[reloadedData])
 
   return (
     <div className="col-md-12 col-lg-12 col-xl-12 order-0 mb-4">
diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx
index e8927ae3..60c5403c 100644
--- a/src/components/Project/Infrastructure/EditActivityModal.jsx
+++ b/src/components/Project/Infrastructure/EditActivityModal.jsx
@@ -71,12 +71,14 @@ const EditActivityModal = ({
 
   const handleActivityChange = (e) => {
     const selectedId = Number(e.target.value);
-    const selected = activityData.find((a) => a.id === selectedId);
+    const selected = activityData.find( ( a ) => a.id === selectedId );
     setSelectedActivity(selected || null);
     setValue("activityID", selectedId);
   };
 
-  const onSubmitForm = async (data) => {
+  const onSubmitForm = async ( data ) =>
+  {
+    setIsSubmitting(true)
     const updatedProject = { ...projects_Details };
     const finalData = {
       ...data,
@@ -142,13 +144,17 @@ const EditActivityModal = ({
           });
           resetForm();
           dispatch( refreshData( true ) );
+          setIsSubmitting(false)
           showToast("Activity Updated Successfully","success")
-
           onClose();
         }
       })
-      .catch((error) => {
-        showToast(error.message, "error");
+      .catch( ( error ) =>
+      {
+        setIsSubmitting(false)
+        const message = error.response.data.message || error.message || "Error Occured During Api Call"
+        showToast( message, "error" );
+        
       });
   };
 
@@ -327,7 +333,7 @@ const EditActivityModal = ({
               {/* )} */}
 
               <div className="col-12 text-center">
-                <button type="submit" className="btn btn-sm btn-primary me-3" disabled={activities.length === 0}>
+                <button type="submit" className="btn btn-sm btn-primary me-3" disabled={activities.length === 0 || isSubmitting}>
                   {isSubmitting ? "Please Wait.." : "Edit Task"}
                 </button>
                 <button