diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt index ca21b337e..9c3600553 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/viewmodels/TaskListViewModel.kt @@ -27,13 +27,16 @@ class TaskListViewModel @Inject constructor( val taskType = TaskType.from(savedStateHandle.get("task_type")) val tasks = taskRepository.getTasks(taskType ?: TaskType.HABIT) .map { - val taskList: MutableList = it.sortedBy { it.completed }.toMutableList() - var firstCompletedIndex = taskList.indexOfFirst { it is Task && it.completed } - if (firstCompletedIndex < 0) { - firstCompletedIndex = 0 + if (taskType == TaskType.DAILY || taskType == TaskType.TODO) { + val taskList: MutableList = it.sortedBy { it.completed }.toMutableList() + val firstCompletedIndex = taskList.indexOfFirst { it is Task && it.completed } + if (firstCompletedIndex >= 0) { + taskList.add(firstCompletedIndex, "Done today") + } + taskList + } else { + it } - taskList.add(firstCompletedIndex, "Done today") - taskList } .asLiveData() val user = userRepository.getUser()