From afda088f3b283f7aebe4101c0d0d2a9b4a947f75 Mon Sep 17 00:00:00 2001
From: Xavier Molloy <xavi@dhis2.org>
Date: Wed, 26 Jun 2024 09:37:05 +0200
Subject: [PATCH] fix: [ANDROAPP-6101] Do not allow to save form with errors in
 completed events (#3696)

* fix: [ANDROAPP-6101] Do not show save anyway button if there are errors, only with warnings

* ci: [ANDROAPP-6101] Ignore Compose table flaky
---
 .../eventCapture/domain/ConfigureEventCompletionDialog.kt     | 4 ++--
 .../androidTest/java/org/dhis2/composetable/CellTableTest.kt  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
index 7e6a53f935..a4b1869d06 100644
--- a/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
+++ b/app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/domain/ConfigureEventCompletionDialog.kt
@@ -37,9 +37,9 @@ class ConfigureEventCompletionDialog(
             !canComplete && onCompleteMessage != null,
         )
         val mainButton = getMainButton(dialogType, eventState)
-        val secondaryButton = if (canSkipErrorFix || eventState == EventStatus.COMPLETED) {
+        val secondaryButton = if (canSkipErrorFix || dialogType == WARNING) {
             EventCompletionButtons(
-                SecondaryButton(if (eventState == EventStatus.COMPLETED) provider.provideSaveAnyway() else provider.provideNotNow()),
+                SecondaryButton(provider.provideNotNow()),
                 FormBottomDialog.ActionType.FINISH,
             )
         } else {
diff --git a/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt b/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
index 7741a65550..1df4d003da 100644
--- a/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
+++ b/compose-table/src/androidTest/java/org/dhis2/composetable/CellTableTest.kt
@@ -40,6 +40,7 @@ class CellTableTest {
         }
     }
 
+    @Ignore("Flaky test, to be resolved in a separate ticket")
     @Test
     fun shouldUpdateValueWhenTypingInComponent() {
         tableRobot(composeTestRule) {