From 349cbaa7a572d438f7257963428f13a71702b841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20G=C3=B6ransson?= <david.goransson@mullvad.net>
Date: Mon, 23 Sep 2024 15:02:10 +0200
Subject: [PATCH] Fix select server navigation on TV

---
 .../compose/cell/RelayLocationCell.kt         | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
index 24e368a20156..3ae348752657 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt
@@ -140,19 +140,26 @@ fun RelayItemCell(
                         isSelected -> MaterialTheme.colorScheme.selected
                         else -> depth.toBackgroundColor()
                     }
-                )
-                .combinedClickable(
-                    enabled = item.active,
-                    onClick = onClick,
-                    onLongClick = onLongClick,
-                )
-                .padding(start = startPadding),
+                ),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        if (leadingContent != null) {
-            leadingContent()
+        // Duplicate row is needed for selection of the item on TV.
+        Row(
+            modifier =
+                Modifier.combinedClickable(
+                        enabled = item.active,
+                        onClick = onClick,
+                        onLongClick = onLongClick,
+                    )
+                    .padding(start = startPadding)
+                    .weight(1f),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            if (leadingContent != null) {
+                leadingContent()
+            }
+            Name(relay = item)
         }
-        Name(modifier = Modifier.weight(1f), relay = item)
 
         if (item.hasChildren) {
             ExpandButton(