diff --git a/src/Front_end/homepage/ToDo_list/viewchanneltask.jsx b/src/Front_end/homepage/ToDo_list/viewchanneltask.jsx
index 6d5fb27..f0a28b4 100644
--- a/src/Front_end/homepage/ToDo_list/viewchanneltask.jsx
+++ b/src/Front_end/homepage/ToDo_list/viewchanneltask.jsx
@@ -11,6 +11,7 @@ const Viewchanneltask = () => {
   const { currentUser, setViewchanneltask } = useContext(Allconvers);
   const [isAdmin, setIsAdmin] = useState(false);
   const [tasks, setTasks] = useState([]);
+  const [refresh, setRefresh] = useState(false);
 
   if (channel_data?.channel_id) {
     useEffect(() => {
@@ -29,7 +30,14 @@ const Viewchanneltask = () => {
       const interval = setInterval(fetchTasks, 60000); // Update every minute
       return () => clearInterval(interval); // Clean up interval on component unmount
     }, [channel_data, currentUser]);
-
+    useEffect(() => {
+      const fetchTasks = async () => {
+        const fetchedTasks = await fetchchanneltodo(channel_data.channel_id);
+        setTasks(fetchedTasks);
+        setRefresh(false);
+      };
+      fetchTasks();
+    }, [refresh]);
     // Function to calculate time remaining until due date
     const calculateTimeRemaining = (dueDate) => {
       if (!dueDate)
@@ -66,6 +74,10 @@ const Viewchanneltask = () => {
       const updatedTasks = tasks.filter((task) => task.task_id !== task_id);
       setTasks(updatedTasks);
       await updateTasks(updatedTasks);
+      const { error: dele } = await supabase
+        .from("Mails_sent")
+        .delete()
+        .eq("task_id", task_id);
     };
     const undoTask = async (task_id) => {
       //to bring back tasks back into To Do
@@ -82,7 +94,7 @@ const Viewchanneltask = () => {
         .eq("id", channel_data.channel_id);
     };
     // Sort tasks by due date (nearest due date first), with "None" due date at the bottom
-    const sortedTasks = tasks.slice().sort((a, b) => {
+    const sortedTasks = tasks?.slice().sort((a, b) => {
       //slice is used so that a new copy be created which decreses the risk of db data changing
       if (!a.duedate && !b.duedate) return 0; // Both have no due date
       if (!a.duedate) return 1; // a has no due date, place it after b
@@ -92,6 +104,33 @@ const Viewchanneltask = () => {
       const dueDateB = new Date(b.duedate).getTime();
       return dueDateA - dueDateB; // Ascending order (nearest due date first)
     });
+    useEffect(() => {
+      const channeltodoupdate = () => {
+        const chtdupd = supabase
+          .channel("chanel-todo-update")
+          .on(
+            "postgres_changes",
+            {
+              event: "*", //channels are used to listen to real time changes
+              schema: "public", //here we listen to the changes in realtime and update the postgres changes here
+              table: "Channel_todolist",
+              select: "todo_list",
+              filter: `id=eq.${channel_data.channel_id}`,
+            },
+            (payload) => {
+              console.log("refreshed");
+              setRefresh(true);
+            }
+          )
+          .subscribe();
+
+        // Cleanup function to unsubscribe from the channel to avoid data leakage
+        return () => {
+          supabase.removeChannel(chtdupd);
+        };
+      };
+      channeltodoupdate();
+    }, [channel_data]);
 
     return (
       <>
@@ -112,7 +151,7 @@ const Viewchanneltask = () => {
                 <h2 className={viewchanneltaskCSS.sectionHeading}>To Do</h2>
                 <ul className={viewchanneltaskCSS.taskList}>
                   {sortedTasks //calls the sorting function for the filtered tasks
-                    .filter((task) => !task.taskdone)
+                    ?.filter((task) => !task.taskdone)
                     .map((task) => {
                       const { days, hours, minutes, seconds, distance } =
                         calculateTimeRemaining(task.duedate); //time left is calculated to change the due date color accordingly
@@ -182,7 +221,7 @@ const Viewchanneltask = () => {
                 <h2 className={viewchanneltaskCSS.sectionHeading}>Done</h2>
                 <ul className={viewchanneltaskCSS.taskList}>
                   {sortedTasks
-                    .filter((task) => task.taskdone)
+                    ?.filter((task) => task.taskdone)
                     .map((task) => (
                       <li
                         key={task.task_id}
diff --git a/src/Front_end/homepage/ToDo_list/viewusertask.jsx b/src/Front_end/homepage/ToDo_list/viewusertask.jsx
index 7e12d6d..091ceff 100644
--- a/src/Front_end/homepage/ToDo_list/viewusertask.jsx
+++ b/src/Front_end/homepage/ToDo_list/viewusertask.jsx
@@ -9,6 +9,7 @@ const Viewutask = () => {
   const { currentUser, setViewtask } = useContext(Allconvers);
   const [isAdmin, setIsAdmin] = useState(false);
   const [tasks, setTasks] = useState([]);
+  const [refresh, setRefresh] = useState(false);
 
   useEffect(() => {
     if (currentUser) {
@@ -23,7 +24,14 @@ const Viewutask = () => {
     const interval = setInterval(fetchTasks, 60000); // Update every minute
     return () => clearInterval(interval); // Clean up interval on component unmount
   }, [currentUser]);
-
+  useEffect(() => {
+    const fetchTasks = async () => {
+      const fetchedTasks = await fetchusertodo(currentUser[0].id);
+      setTasks(fetchedTasks);
+      setRefresh(false);
+    };
+    fetchTasks();
+  }, [refresh]);
   // Function to calculate time remaining until due date
   const calculateTimeRemaining = (dueDate) => {
     if (!dueDate)
@@ -60,6 +68,10 @@ const Viewutask = () => {
     const updatedTasks = tasks.filter((task) => task.task_id !== task_id);
     setTasks(updatedTasks);
     await updateTasks(updatedTasks);
+    const { error: dele } = await supabase
+      .from("Mails_sent")
+      .delete()
+      .eq("task_id", task_id);
   };
   const undoTask = async (task_id) => {
     //to bring back tasks back into To Do
@@ -87,6 +99,34 @@ const Viewutask = () => {
     return dueDateA - dueDateB; // Ascending order (nearest due date first)
   });
 
+  useEffect(() => {
+    const usertodoupdate = () => {
+      const usrdupd = supabase
+        .channel("user-todo-update")
+        .on(
+          "postgres_changes",
+          {
+            event: "*", //channels are used to listen to real time changes
+            schema: "public", //here we listen to the changes in realtime and update the postgres changes here
+            table: "Todo_list",
+            select: "todo_list",
+            filter: `id=eq.${currentUser[0].id}`,
+          },
+          (payload) => {
+            console.log("refreshed");
+            setRefresh(true);
+          }
+        )
+        .subscribe();
+
+      // Cleanup function to unsubscribe from the channel to avoid data leakage
+      return () => {
+        supabase.removeChannel(usrdupd);
+      };
+    };
+    usertodoupdate();
+  }, [currentUser[0]]);
+
   return (
     <>
       <div className={viewusertaskCSS.body}>
diff --git a/src/Front_end/homepage/Totalsearch/totalsearch.jsx b/src/Front_end/homepage/Totalsearch/totalsearch.jsx
index 40b184d..644b370 100644
--- a/src/Front_end/homepage/Totalsearch/totalsearch.jsx
+++ b/src/Front_end/homepage/Totalsearch/totalsearch.jsx
@@ -4,6 +4,7 @@ import totalsearchCSS from "./totalsearch.module.css";
 import { Allconvers } from "../../context api/context";
 import { Channelcontext } from "../../context api/channelcontext.jsx";
 import { Chatcontext } from "../../context api/chatcontext";
+import supabase from "../../supabase.jsx";
 
 const Totalsearch = () => {
   const { currentUser, setDm, setChannelchat, setConformdm, setchat } =
@@ -14,119 +15,192 @@ const Totalsearch = () => {
   const [channels, setchannels] = useState([]);
   const [search, setSearch] = useState("");
   const [searchResults, setSearchResults] = useState([]);
+  const [fetchchannelupdate, setFetchchanupdate] = useState(false);
+  const [fetchdmupdate, setFetchdmupdate] = useState(false);
 
-  useEffect(() => {
-    const fetchdata = async () => {
-      const fetcheddm = await fetchUserDmChats(currentUser[0]);
-      const filteredDm = fetcheddm.filter((contact) => contact.showstatus);
-      setdmcontacts(filteredDm);
-      const fetchedchannel = await fetchUserchannelsbyid(currentUser[0].id);
-      setchannels(fetchedchannel);
+  if (currentUser[0]?.id) {
+    useEffect(() => {
+      const fetchdata = async () => {
+        const fetcheddm = await fetchUserDmChats(currentUser[0]);
+        const filteredDm = fetcheddm.filter((contact) => contact.showstatus);
+        setdmcontacts(filteredDm);
+        const fetchedchannel = await fetchUserchannelsbyid(currentUser[0].id);
+        setchannels(fetchedchannel);
+      };
+      fetchdata();
+    }, [currentUser]);
+    useEffect(() => {
+      const fetchdata = async () => {
+        const fetcheddm = await fetchUserDmChats(currentUser[0]);
+        const filteredDm = fetcheddm.filter((contact) => contact.showstatus);
+        setdmcontacts(filteredDm);
+        const fetchedchannel = await fetchUserchannelsbyid(currentUser[0].id);
+        setchannels(fetchedchannel);
+        setFetchchanupdate(false);
+        setFetchdmupdate(false);
+      };
+      fetchdata();
+    }, [fetchchannelupdate, fetchdmupdate]);
+
+    useEffect(() => {
+      const dmchatslisten = () => {
+        const dmchannel = supabase
+          .channel("currentdmchatschannel") //to listen to the real time changes in the dm contacts and i also tried updating the contacts
+          .on(
+            //by using the new payload we get but i faced a lag in the time to change the state after the payload
+            "postgres_changes", //is recieved but got errors so i instead used a state to get like a signal that there is contact
+            {
+              //added and then again fetched the contact details again
+              event: "*",
+              schema: "public",
+              table: "direct_messages",
+              select: "dm_chats",
+              filter: `id=eq.${currentUser[0].id}`,
+            },
+            (payload) => {
+              setFetchdmupdate(true);
+              console.log("Change received!", payload);
+            }
+          )
+          .subscribe();
+
+        // Cleanup function to unsubscribe from the channel
+        return () => {
+          supabase.removeChannel(dmchannel);
+        };
+      };
+      const channelslisten = () => {
+        const channels = supabase
+          .channel("currentchannellist") //to listen to the real time changes in the dm contacts and i also tried updating the contacts
+          .on(
+            //by using the new payload we get but i faced a lag in the time to change the state after the payload
+            "postgres_changes", //is recieved but got errors so i instead used a state to get like a signal that there is contact
+            {
+              //added and then again fetched the contact details again
+              event: "*",
+              schema: "public",
+              table: "channels_list",
+              select: "channels",
+              filter: `id=eq.${currentUser[0].id}`,
+            },
+            (payload) => {
+              setFetchchanupdate(true);
+              console.log("Change received!", payload);
+            }
+          )
+          .subscribe();
+
+        // Cleanup function to unsubscribe from the channel
+        return () => {
+          supabase.removeChannel(channels);
+        };
+      };
+      dmchatslisten();
+      channelslisten();
+    }, [currentUser[0]]);
+
+    useEffect(() => {
+      if (search.trim() === "") {
+        setSearchResults([]);
+        return;
+      }
+
+      const filteredDmContacts = dmcontacts.filter((contact) =>
+        contact.userinfo.uusername.toLowerCase().includes(search.toLowerCase())
+      );
+
+      const filteredChannels = channels.filter((channel) =>
+        channel.channelname.toLowerCase().includes(search.toLowerCase())
+      );
+
+      setSearchResults([...filteredDmContacts, ...filteredChannels]);
+    }, [dmcontacts, channels, search]);
+
+    const handleInput = (e) => {
+      setSearch(e.target.value);
     };
-    fetchdata();
-  }, [currentUser]);
 
-  useEffect(() => {
-    if (search.trim() === "") {
+    const handleChannelSelect = (channel) => {
+      dispatchchannel({ type: "Change_channel", payload: channel });
+      resetSearch();
+      setDm(false);
+      setChannelchat(true);
+      setConformdm(false);
+      setchat(false);
+    };
+
+    const handleDMSelect = (userinfo) => {
+      dispatch({ type: "Change_user", payload: userinfo });
+      resetSearch();
+      setDm(false);
+      setChannelchat(false);
+      setConformdm(false);
+      setchat(true);
+    };
+
+    const resetSearch = () => {
+      setSearch("");
       setSearchResults([]);
-      return;
-    }
+    };
 
-    const filteredDmContacts = dmcontacts.filter((contact) =>
-      contact.userinfo.uusername.toLowerCase().includes(search.toLowerCase())
-    );
+    const handleBlur = (e) => {
+      // Check if the relatedTarget (where focus is going) is not inside results
+      if (
+        e.relatedTarget &&
+        !e.currentTarget.contains(e.relatedTarget) &&
+        e.relatedTarget.className !== totalsearchCSS.resultItem
+      ) {
+        setShowResults(false);
+      }
+    };
 
-    const filteredChannels = channels.filter((channel) =>
-      channel.channelname.toLowerCase().includes(search.toLowerCase())
+    return (
+      <div className={totalsearchCSS.container}>
+        <input
+          type="text"
+          value={search}
+          onChange={handleInput}
+          onClick={() => setSearchResults([])}
+          onBlur={handleBlur}
+          placeholder="Search a Channel or Contact...."
+          className={totalsearchCSS.input}
+        />
+        {search.trim() !== "" && (
+          <div className={totalsearchCSS.results}>
+            {searchResults.map((result, index) => (
+              <div
+                key={index}
+                className={totalsearchCSS.resultItem}
+                onClick={() => {
+                  if (result.userinfo) {
+                    handleDMSelect(result.userinfo);
+                  } else {
+                    handleChannelSelect(result);
+                  }
+                }}
+              >
+                {result.userinfo ? (
+                  <div
+                    className={`${totalsearchCSS.dmContact} ${totalsearchCSS.item}`}
+                  >
+                    <p>DM Contact: {result.userinfo.uusername}</p>
+                    <p>Email: {result.userinfo.uemail}</p>
+                  </div>
+                ) : (
+                  <div
+                    className={`${totalsearchCSS.channel} ${totalsearchCSS.item}`}
+                  >
+                    <p>Channel: {result.channelname}</p>
+                    <p>Created by: {result.channelinfo.createdby}</p>
+                  </div>
+                )}
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
     );
-
-    setSearchResults([...filteredDmContacts, ...filteredChannels]);
-  }, [dmcontacts, channels, search]);
-
-  const handleInput = (e) => {
-    setSearch(e.target.value);
-  };
-
-  const handleChannelSelect = (channel) => {
-    dispatchchannel({ type: "Change_channel", payload: channel });
-    resetSearch();
-    setDm(false);
-    setChannelchat(true);
-    setConformdm(false);
-    setchat(false);
-  };
-
-  const handleDMSelect = (userinfo) => {
-    dispatch({ type: "Change_user", payload: userinfo });
-    resetSearch();
-    setDm(false);
-    setChannelchat(false);
-    setConformdm(false);
-    setchat(true);
-  };
-
-  const resetSearch = () => {
-    setSearch("");
-    setSearchResults([]);
-  };
-
-  const handleBlur = (e) => {
-    // Check if the relatedTarget (where focus is going) is not inside results
-    if (
-      e.relatedTarget &&
-      !e.currentTarget.contains(e.relatedTarget) &&
-      e.relatedTarget.className !== totalsearchCSS.resultItem
-    ) {
-      setShowResults(false);
-    }
-  };
-
-  return (
-    <div className={totalsearchCSS.container}>
-      <input
-        type="text"
-        value={search}
-        onChange={handleInput}
-        onClick={() => setSearchResults([])}
-        onBlur={handleBlur}
-        placeholder="Search a Channel or Contact...."
-        className={totalsearchCSS.input}
-      />
-      {search.trim() !== "" && (
-        <div className={totalsearchCSS.results}>
-          {searchResults.map((result, index) => (
-            <div
-              key={index}
-              className={totalsearchCSS.resultItem}
-              onClick={() => {
-                if (result.userinfo) {
-                  handleDMSelect(result.userinfo);
-                } else {
-                  handleChannelSelect(result);
-                }
-              }}
-            >
-              {result.userinfo ? (
-                <div
-                  className={`${totalsearchCSS.dmContact} ${totalsearchCSS.item}`}
-                >
-                  <p>DM Contact: {result.userinfo.uusername}</p>
-                  <p>Email: {result.userinfo.uemail}</p>
-                </div>
-              ) : (
-                <div
-                  className={`${totalsearchCSS.channel} ${totalsearchCSS.item}`}
-                >
-                  <p>Channel: {result.channelname}</p>
-                  <p>Created by: {result.channelinfo.createdby}</p>
-                </div>
-              )}
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
+  }
 };
 
 export default Totalsearch;
diff --git a/src/Front_end/homepage/channels/channelchat.jsx b/src/Front_end/homepage/channels/channelchat.jsx
index 1d53fa7..e845305 100644
--- a/src/Front_end/homepage/channels/channelchat.jsx
+++ b/src/Front_end/homepage/channels/channelchat.jsx
@@ -321,6 +321,10 @@ export const Channelchats = () => {
           .from("channels_message")
           .delete()
           .eq("channel_id", channel_data.channel_id);
+        const { error: dele } = await supabase
+          .from("Channel_todolist")
+          .delete()
+          .eq("id", channel_data.channel_id);
 
         const channelscurrent = await fetchUserchannelsbyid(currentUser[0].id);
         console.log(channelscurrent);
diff --git a/src/Front_end/homepage/homepage.jsx b/src/Front_end/homepage/homepage.jsx
index 4210d4e..42105da 100644
--- a/src/Front_end/homepage/homepage.jsx
+++ b/src/Front_end/homepage/homepage.jsx
@@ -244,7 +244,7 @@ function Home(data) {
           <div className={homepaseCSS.box}>
             <div className={homepaseCSS.top}>
               <div className={homepaseCSS.search}>
-                <Totalsearch />
+                {currentUser[0]?.id ? <Totalsearch /> : <></>}
               </div>
               <div className={homepaseCSS.logo}></div>
             </div>