diff --git a/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFilterFragment.kt b/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFilterFragment.kt
index bbe1d621..b6d8e321 100644
--- a/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFilterFragment.kt
+++ b/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFilterFragment.kt
@@ -1,22 +1,22 @@
-package com.tahaproject.todoy_app.ui.search
-
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.tahaproject.todoy_app.R
-import com.tahaproject.todoy_app.databinding.FragmentSearchFilterBinding
-import com.tahaproject.todoy_app.ui.base.BaseBottomSheetDialogFragment
-
-
-class SearchFilterFragment : BaseBottomSheetDialogFragment<FragmentSearchFilterBinding>() {
-    override val bindingInflate: (LayoutInflater, ViewGroup?, Boolean) -> FragmentSearchFilterBinding
-        get() = FragmentSearchFilterBinding::inflate
-
-    override fun getLayoutResourceId(): Int = R.layout.fragment_search_filter
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-    }
-}
\ No newline at end of file
+//package com.tahaproject.todoy_app.ui.search
+//
+//
+//import android.os.Bundle
+//import android.view.LayoutInflater
+//import android.view.View
+//import android.view.ViewGroup
+//import com.tahaproject.todoy_app.R
+//import com.tahaproject.todoy_app.databinding.FragmentSearchFilterBinding
+//import com.tahaproject.todoy_app.ui.base.BaseBottomSheetDialogFragment
+//
+//
+//class SearchFilterFragment : BaseBottomSheetDialogFragment<FragmentSearchFilterBinding>() {
+//    override val bindingInflate: (LayoutInflater, ViewGroup?, Boolean) -> FragmentSearchFilterBinding
+//        get() = FragmentSearchFilterBinding::inflate
+//
+//    override fun getLayoutResourceId(): Int = R.layout.fragment_search_filter
+//
+//    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+//        super.onViewCreated(view, savedInstanceState)
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFragment.kt b/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFragment.kt
index 4de700a7..ea2a8c3f 100644
--- a/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFragment.kt
+++ b/app/src/main/java/com/tahaproject/todoy_app/ui/search/SearchFragment.kt
@@ -1,45 +1,45 @@
-package com.tahaproject.todoy_app.ui.search
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.mindorks.editdrawabletext.DrawablePosition
-import com.mindorks.editdrawabletext.onDrawableClickListener
-import com.tahaproject.todoy_app.databinding.FragmentSearchBinding
-
-import com.tahaproject.todoy_app.ui.base.BaseFragment
-import com.tahaproject.todoy_app.ui.search.presenter.ISearchContract
-import com.tahaproject.todoy_app.ui.search.presenter.SearchPresenter
-import java.io.IOException
-
-
-class SearchFragment (override val presenter: SearchPresenter): BaseFragment<SearchPresenter,FragmentSearchBinding,>(),
-    ISearchContract.ISearchView {
-
-    override val bindingInflate: (LayoutInflater, ViewGroup?, Boolean) -> FragmentSearchBinding
-        get() = FragmentSearchBinding::inflate
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        binding.searchBar.setDrawableClickListener(object : onDrawableClickListener {
-            override fun onClick(target: DrawablePosition) {
-                 if (target == DrawablePosition.RIGHT) {
-                     SearchFilterFragment().show(parentFragmentManager, Const.FILTER_TAG)
-                 }
-            }
-        })
-    }
-
-    object Const {
-        const val FILTER_TAG = "newFilterTag"
-    }
-
-    override fun showData() {
-
-    }
-
-    override fun showError(error: IOException) {
-
-    }
-}
\ No newline at end of file
+//package com.tahaproject.todoy_app.ui.search
+//
+//import android.os.Bundle
+//import android.view.LayoutInflater
+//import android.view.View
+//import android.view.ViewGroup
+//import com.mindorks.editdrawabletext.DrawablePosition
+//import com.mindorks.editdrawabletext.onDrawableClickListener
+//import com.tahaproject.todoy_app.databinding.FragmentSearchBinding
+//
+//import com.tahaproject.todoy_app.ui.base.BaseFragment
+//import com.tahaproject.todoy_app.ui.search.presenter.ISearchContract
+//import com.tahaproject.todoy_app.ui.search.presenter.SearchPresenter
+//import java.io.IOException
+//
+//
+//class SearchFragment (override val presenter: SearchPresenter): BaseFragment<SearchPresenter,FragmentSearchBinding,>(),
+//    ISearchContract.ISearchView {
+//
+//    override val bindingInflate: (LayoutInflater, ViewGroup?, Boolean) -> FragmentSearchBinding
+//        get() = FragmentSearchBinding::inflate
+//
+//    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+//        super.onViewCreated(view, savedInstanceState)
+//        binding.searchBar.setDrawableClickListener(object : onDrawableClickListener {
+//            override fun onClick(target: DrawablePosition) {
+//                 if (target == DrawablePosition.RIGHT) {
+//                     SearchFilterFragment().show(parentFragmentManager, Const.FILTER_TAG)
+//                 }
+//            }
+//        })
+//    }
+//
+//    object Const {
+//        const val FILTER_TAG = "newFilterTag"
+//    }
+//
+//    override fun showData() {
+//
+//    }
+//
+//    override fun showError(error: IOException) {
+//
+//    }
+//}
\ No newline at end of file
diff --git a/app/src/main/java/com/tahaproject/todoy_app/ui/todo/personal/PersonalTodoFragment.kt b/app/src/main/java/com/tahaproject/todoy_app/ui/todo/personal/PersonalTodoFragment.kt
index c49060e8..c08929e9 100644
--- a/app/src/main/java/com/tahaproject/todoy_app/ui/todo/personal/PersonalTodoFragment.kt
+++ b/app/src/main/java/com/tahaproject/todoy_app/ui/todo/personal/PersonalTodoFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.widget.addTextChangedListener
 import com.tahaproject.todoy_app.R
 import com.tahaproject.todoy_app.data.models.responses.todosListResponse.ToDosResponse
 import com.tahaproject.todoy_app.data.models.responses.todosListResponse.Todo
@@ -13,6 +14,7 @@ import com.tahaproject.todoy_app.ui.todo.ToDoFragment
 import com.tahaproject.todoy_app.ui.todo.personal.adapter.PersonalAdapter
 import com.tahaproject.todoy_app.ui.todo.personal.presenter.IPersonalTodoContract
 import com.tahaproject.todoy_app.ui.todo.personal.presenter.PersonalTodoPresenter
+import com.tahaproject.todoy_app.ui.todo.team.adapter.TeamAdapter
 import com.tahaproject.todoy_app.util.Constants
 import com.tahaproject.todoy_app.util.SharedPreferenceUtil
 import com.tahaproject.todoy_app.util.showToast
@@ -42,12 +44,29 @@ class PersonalTodoFragment : ToDoFragment<FragmentPersonalTodoBinding, PersonalT
         chooseGroup()
         setChipClickListeners()
         presenter.fetchData()
+        searchPersonal()
     }
     override fun addCallBack() {
         binding.appBarPersonalTodo.setNavigationOnClickListener {
             parentFragmentManager.popBackStack()
         }
     }
+    private fun searchPersonal(){
+        binding.searchBar.addTextChangedListener {
+            getPersonalTodo()
+        }
+    }
+    private fun getPersonalTodo(){
+        val filterList: List<Todo> = toDosResponse.value.filter {
+            it.title == Constants.Todo.TITLE
+                    &&
+                    it.description == Constants.Todo.DESCRIPTION
+                    &&
+                    it.assignee == Constants.Todo.ASSIGNEE
+        }
+        adapter = PersonalAdapter(filterList)
+        binding.recyclerPersonalTodo.adapter = adapter
+    }
 
     private fun chooseGroup() {
         binding.chipGroupPersonalTodo.setOnCheckedStateChangeListener { _, checkedId ->
diff --git a/app/src/main/java/com/tahaproject/todoy_app/ui/todo/team/TeamTodoFragment.kt b/app/src/main/java/com/tahaproject/todoy_app/ui/todo/team/TeamTodoFragment.kt
index 256eebae..a4ac9c30 100644
--- a/app/src/main/java/com/tahaproject/todoy_app/ui/todo/team/TeamTodoFragment.kt
+++ b/app/src/main/java/com/tahaproject/todoy_app/ui/todo/team/TeamTodoFragment.kt
@@ -4,10 +4,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import androidx.core.widget.addTextChangedListener
 import com.tahaproject.todoy_app.R
 import com.tahaproject.todoy_app.data.models.responses.todosListResponse.ToDosResponse
 import com.tahaproject.todoy_app.data.models.responses.todosListResponse.Todo
 import com.tahaproject.todoy_app.databinding.FragmentTeamTodoBinding
+import com.tahaproject.todoy_app.ui.addtask.AddNewTaskFragment
 import com.tahaproject.todoy_app.ui.home.HomeActivity
 import com.tahaproject.todoy_app.ui.todo.ToDoFragment
 import com.tahaproject.todoy_app.ui.todo.team.adapter.TeamAdapter
@@ -19,16 +22,19 @@ import com.tahaproject.todoy_app.util.showToast
 import java.io.IOException
 
 
+
 class TeamTodoFragment : ToDoFragment<FragmentTeamTodoBinding, TeamTodoPresenter>(),
     ITeamTodoContract.IView {
 
+
+
     override val presenter: TeamTodoPresenter
         get() = TeamTodoPresenter(this, SharedPreferenceUtil(activity as HomeActivity).getToken())
 
     override val bindingInflate: (LayoutInflater, ViewGroup?, Boolean) -> FragmentTeamTodoBinding
         get() = FragmentTeamTodoBinding::inflate
 
-    private var selectedTaskChip: TaskChip = TaskChip.TODO
+    private var selectedTaskChip:TaskChip = TaskChip.TODO
 
     private lateinit var toDosResponse: ToDosResponse
     private lateinit var adapter: TeamAdapter
@@ -43,6 +49,7 @@ class TeamTodoFragment : ToDoFragment<FragmentTeamTodoBinding, TeamTodoPresenter
     override fun setup() {
         chooseGroup()
         setChipClickListeners()
+        searchTeam()
         presenter.fetchData()
     }
 
@@ -51,6 +58,22 @@ class TeamTodoFragment : ToDoFragment<FragmentTeamTodoBinding, TeamTodoPresenter
             parentFragmentManager.popBackStack()
         }
     }
+    private fun searchTeam(){
+        binding.searchBar.addTextChangedListener {
+            getTeamTodoData()
+        }
+    }
+    private fun getTeamTodoData(){
+       val filterList: List<Todo> = toDosResponse.value.filter {
+            it.title == Constants.Todo.TITLE
+                    &&
+                    it.description == Constants.Todo.DESCRIPTION
+                    &&
+                    it.assignee == Constants.Todo.ASSIGNEE
+        }
+        adapter = TeamAdapter(filterList)
+        binding.recyclerviewTeamTodo.adapter = adapter
+    }
 
     private fun chooseGroup() {
         binding.chipGroupTeamTodo.setOnCheckedStateChangeListener { _, checkedId ->
@@ -112,6 +135,4 @@ class TeamTodoFragment : ToDoFragment<FragmentTeamTodoBinding, TeamTodoPresenter
     enum class TaskChip {
         TODO, IN_PROGRESS, DONE
     }
-}
-
-
+}
\ No newline at end of file