From 4698b0f372cd25b00aec9b56bef299b579a1f87c Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 18 Jan 2025 01:12:37 -0600
Subject: [PATCH] Fix change loss when completing from edit screen

---
 app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt | 3 +--
 app/src/main/java/org/tasks/ui/TaskEditViewModel.kt        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt b/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
index b2e952abe..c406e7af4 100644
--- a/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
+++ b/app/src/main/java/org/tasks/compose/edit/TaskEditScreen.kt
@@ -1,7 +1,6 @@
 package org.tasks.compose.edit
 
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -35,7 +34,7 @@ import org.tasks.themes.TasksTheme
 import org.tasks.ui.TaskEditViewModel
 import org.tasks.utility.copyToClipboard
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TaskEditScreen(
     viewState: TaskEditViewModel.ViewState,
diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
index 049c4df38..a0bbacb1e 100644
--- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
+++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt
@@ -600,7 +600,7 @@ class TaskEditViewModel @Inject constructor(
     fun setComplete(completed: Boolean) {
         _viewState.update { state ->
             state.copy(
-                task = task.copy(
+                task = state.task.copy(
                     completionDate = when {
                         !completed -> 0
                         task.isCompleted -> task.completionDate