From 155bba2f81050cba1acb8c6027e42b09d67f1d95 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Mon, 11 May 2026 10:19:23 -0400
Subject: [PATCH] Expand touch area for key transparency bottom sheet.

---
 .../securesms/verify/VerifyDisplayScreen.kt   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreen.kt
index be2ebc91c6..52ab39ebaa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayScreen.kt
@@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Dialogs
-import org.signal.core.ui.compose.IconButtons.IconButton
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
@@ -298,11 +297,21 @@ private fun AutomaticKeyVerificationBlock(
         .background(color = SignalTheme.colors.colorSurface1, shape = RoundedCornerShape(38.dp))
         .padding(horizontal = 16.dp)
     ) { targetStatus ->
+      val hasInfoSheet = targetStatus != AutomaticVerificationStatus.NONE && targetStatus != AutomaticVerificationStatus.VERIFYING
+
       Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.clickable(enabled = targetStatus == AutomaticVerificationStatus.NONE, onClick = {
-          emitter(VerifyDisplayScreenEvent.VerifyAutomaticallyClick)
-        }, role = Role.Button)
+        modifier = Modifier.clickable(
+          enabled = targetStatus == AutomaticVerificationStatus.NONE || hasInfoSheet,
+          onClick = {
+            if (targetStatus == AutomaticVerificationStatus.NONE) {
+              emitter(VerifyDisplayScreenEvent.VerifyAutomaticallyClick)
+            } else {
+              displayEncryptedSheet = true
+            }
+          },
+          role = Role.Button
+        )
       ) {
         if (targetStatus == AutomaticVerificationStatus.VERIFYING) {
           CircularProgressIndicator(
@@ -324,19 +333,15 @@ private fun AutomaticKeyVerificationBlock(
             .padding(start = 12.dp)
         )
 
-        if (targetStatus != AutomaticVerificationStatus.NONE && targetStatus != AutomaticVerificationStatus.VERIFYING) {
-          IconButton(onClick = {
-            displayEncryptedSheet = true
-          }) {
-            Icon(
-              imageVector = SignalIcons.ChevronRight.imageVector,
-              contentDescription = null,
-              tint = MaterialTheme.colorScheme.outline,
-              modifier = Modifier
-                .padding(start = 2.dp)
-                .size(16.dp)
-            )
-          }
+        if (hasInfoSheet) {
+          Icon(
+            imageVector = SignalIcons.ChevronRight.imageVector,
+            contentDescription = null,
+            tint = MaterialTheme.colorScheme.outline,
+            modifier = Modifier
+              .padding(start = 2.dp)
+              .size(16.dp)
+          )
         }
       }
     }