Additional test case and fix

safe-global · Apr 1, 2021 · d364900 · d364900
1 parent 749b2d7
commit d364900
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/app/src/main/java/io/gnosis/safe/ui/transactions/details/ButtonStateHelper.kt b/app/src/main/java/io/gnosis/safe/ui/transactions/details/ButtonStateHelper.kt
@@ -36,6 +36,9 @@ class ButtonStateHelper(
             !isRejection && !hasBeenRejected && !needsExecution -> {
                 true
             }
+            needsExecution && !canReject && !needsYourConfirmation-> {
+                false
+            }
             !isRejection && !needsYourConfirmation && hasBeenRejected && needsExecution -> {
                 true
             }

diff --git a/app/src/test/java/io/gnosis/safe/ui/transactions/details/ButtonStateHelperTest.kt b/app/src/test/java/io/gnosis/safe/ui/transactions/details/ButtonStateHelperTest.kt
@@ -279,4 +279,26 @@ class ButtonStateHelperTest {
         assertFalse(buttonStateHelper.confirmButtonIsEnabled())
         assertFalse(buttonStateHelper.buttonContainerIsVisible())
     }
+
+    @Test
+    fun `(issue #1346) when (needsExecution & !canReject & !needsYourConfirmation) should hide both buttons`() {
+        val buttonStateHelper =
+            ButtonStateHelper(
+                isRejection = false,
+                needsYourConfirmation = false,
+                hasBeenRejected = true,
+                needsExecution = true,
+                canReject = false,
+                isOwner = true,
+                completed = false
+            )
+
+        assertFalse(buttonStateHelper.confirmButtonIsVisible())
+        assertFalse(buttonStateHelper.buttonContainerIsVisible())
+        assertFalse(buttonStateHelper.rejectButtonIsVisible())
+        assertFalse(buttonStateHelper.rejectButtonIsEnabled())
+        assertFalse(buttonStateHelper.spacerIsVisible())
+        assertFalse(buttonStateHelper.confirmButtonIsEnabled())
+    }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,9 @@ class ButtonStateHelper( @@
                 !isRejection && !hasBeenRejected && !needsExecution -> {
                     true
                 }
+                needsExecution && !canReject && !needsYourConfirmation-> {
+                    false
+                }
                 !isRejection && !needsYourConfirmation && hasBeenRejected && needsExecution -> {
                     true
                 }
@@ Expand Down @@