From bc74337eae1aad742bdaf182b8108bdb0f16942e Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Fri, 31 Oct 2025 12:37:04 -0500
Subject: [PATCH] Add Push chevron to Block autofill button (#6102)

---
 .../settings/autofill/AutoFillScreen.kt       |  9 +++----
 .../components/row/BitwardenPushRow.kt        | 24 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
index 6a53111356..51b30fed30 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/AutoFillScreen.kt
@@ -53,6 +53,7 @@ import com.bitwarden.ui.platform.components.header.BitwardenListHeaderText
 import com.bitwarden.ui.platform.components.model.CardStyle
 import com.bitwarden.ui.platform.components.model.TooltipData
 import com.bitwarden.ui.platform.components.row.BitwardenExternalLinkRow
+import com.bitwarden.ui.platform.components.row.BitwardenPushRow
 import com.bitwarden.ui.platform.components.row.BitwardenTextRow
 import com.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
 import com.bitwarden.ui.platform.components.toggle.BitwardenSwitch
@@ -327,11 +328,11 @@ private fun AutoFillScreenContent(
                 .fillMaxWidth(),
         )
         Spacer(modifier = Modifier.height(8.dp))
-        BitwardenTextRow(
+        BitwardenPushRow(
             text = stringResource(id = BitwardenString.block_auto_fill),
-            description = BitwardenString
-                .auto_fill_will_not_be_offered_for_these_ur_is
-                .toAnnotatedString(),
+            description = stringResource(
+                id = BitwardenString.auto_fill_will_not_be_offered_for_these_ur_is,
+            ),
             onClick = autoFillHandlers.onBlockAutoFillClick,
             cardStyle = CardStyle.Full,
             modifier = Modifier
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenPushRow.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenPushRow.kt
index 52e834511e..3db736bb39 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenPushRow.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenPushRow.kt
@@ -32,6 +32,7 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
  * @param onClick The callback when the row is clicked.
  * @param cardStyle The [CardStyle] to be applied to this row.
  * @param modifier The modifier for this composable.
+ * @param description The optional displayable description text.
  * @param leadingIcon An optional leading icon.
  * @param notificationCount The optional notification count to be displayed.
  */
@@ -41,6 +42,7 @@ fun BitwardenPushRow(
     onClick: () -> Unit,
     cardStyle: CardStyle,
     modifier: Modifier = Modifier,
+    description: String? = null,
     leadingIcon: IconData? = null,
     notificationCount: Int = 0,
 ) {
@@ -73,12 +75,22 @@ fun BitwardenPushRow(
                 )
                 Spacer(modifier = Modifier.width(width = 12.dp))
             }
-            Text(
-                text = text,
-                style = BitwardenTheme.typography.bodyLarge,
-                color = BitwardenTheme.colorScheme.text.primary,
-                modifier = Modifier.fillMaxWidth(),
-            )
+            Column {
+                Text(
+                    text = text,
+                    style = BitwardenTheme.typography.bodyLarge,
+                    color = BitwardenTheme.colorScheme.text.primary,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+                description?.let {
+                    Text(
+                        text = it,
+                        style = BitwardenTheme.typography.bodyMedium,
+                        color = BitwardenTheme.colorScheme.text.secondary,
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+            }
         }
         TrailingContent(notificationCount = notificationCount)
     }