@@ -231,12 +231,7 @@ class HomeController extends GetxController {
231231
232232 void _profileSet () {
233233 pendingFilter.value = Query (storage.tabs.tab ()).getPendingFilter ();
234- if (! Query (storage.tabs.tab ()).getWaitingFilter ()) {
235- waitingFilter.value = Query (storage.tabs.tab ()).getWaitingFilter ();
236- } else {
237- Query (storage.tabs.tab ()).toggleWaitingFilter ();
238- waitingFilter.value = Query (storage.tabs.tab ()).getWaitingFilter ();
239- }
234+ waitingFilter.value = Query (storage.tabs.tab ()).getWaitingFilter ();
240235 projectFilter.value = Query (storage.tabs.tab ()).projectFilter ();
241236 tagUnion.value = Query (storage.tabs.tab ()).tagUnion ();
242237 selectedSort.value = Query (storage.tabs.tab ()).getSelectedSort ();
@@ -268,7 +263,11 @@ class HomeController extends GetxController {
268263 .where ((task) => task.status == 'pending' )
269264 .toList ();
270265 } else {
271- queriedTasks.value = storage.data.pendingData ();
266+ var currentTime = DateTime .now ();
267+ queriedTasks.value = storage.data.pendingData ().where ((task) =>
268+ task.status != 'waiting' &&
269+ ! (task.wait != null && task.wait! .isAfter (currentTime))
270+ ).toList ();
272271 }
273272
274273 if (hideBlocked.value) {
@@ -281,9 +280,10 @@ class HomeController extends GetxController {
281280 // Rest of the method stays the same...
282281 if (waitingFilter.value) {
283282 var currentTime = DateTime .now ();
284- queriedTasks.value = queriedTasks
285- .where ((task) => task.wait != null && task.wait! .isAfter (currentTime))
286- .toList ();
283+ queriedTasks.value = storage.data.pendingData ().where ((task) =>
284+ task.status == 'waiting' ||
285+ (task.wait != null && task.wait! .isAfter (currentTime))
286+ ).toList ();
287287 }
288288
289289 if (projectFilter.value.isNotEmpty) {
0 commit comments