From 0185456dcac2b26ac82f64593d1bef6358e7dc41 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Wed, 8 Nov 2023 11:59:24 -0600
Subject: [PATCH] Fix minor TalkBack issues in VaultScreen (#225)

---
 .../components/BitwardenAccountActionItem.kt   | 18 ++++++------------
 ...itwardenListHeaderTextWithSupportingText.kt |  4 +++-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountActionItem.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountActionItem.kt
index abc52286d1..06328a1d06 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountActionItem.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenAccountActionItem.kt
@@ -1,11 +1,9 @@
 package com.x8bit.bitwarden.ui.platform.components
 
-import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
@@ -36,16 +34,12 @@ fun BitwardenAccountActionItem(
     val iconPainter = painterResource(id = R.drawable.ic_account_initials_container)
     val contentDescription = stringResource(id = R.string.account)
 
-    Box(
-        contentAlignment = Alignment.Center,
-    ) {
-        IconButton(onClick = onClick) {
-            Icon(
-                painter = iconPainter,
-                contentDescription = contentDescription,
-                tint = color,
-            )
-        }
+    IconButton(onClick = onClick) {
+        Icon(
+            painter = iconPainter,
+            contentDescription = contentDescription,
+            tint = color,
+        )
         Text(
             text = initials,
             style = TextStyle(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenListHeaderTextWithSupportingText.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenListHeaderTextWithSupportingText.kt
index f51e2e4c0f..2ffcb4779e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenListHeaderTextWithSupportingText.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/BitwardenListHeaderTextWithSupportingText.kt
@@ -7,6 +7,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
@@ -29,7 +30,8 @@ fun BitwardenListHeaderTextWithSupportLabel(
             .padding(
                 top = 12.dp,
                 bottom = 4.dp,
-            ),
+            )
+            .semantics(mergeDescendants = true) { },
         horizontalArrangement = Arrangement.SpaceBetween,
     ) {
         Text(