Merge branch 'crash-in-devicelistscreen-on-googletv-droid-1236'

Author: albin-mullvad

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt

@@ -271,10 +271,7 @@ class VpnSettingsScreenTest {
                 )
 
             // Assert
-            onNodeWithTagAndText(
-                    testTag = String.format(LAZY_LIST_UDP_OVER_TCP_PORT_ITEM_X_TEST_TAG, 5001),
-                    text = "5001"
-                )
+            onNodeWithTag(String.format(LAZY_LIST_UDP_OVER_TCP_PORT_ITEM_X_TEST_TAG, 5001))
                 .assertExists()
                 .performClick()
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt

@@ -73,7 +73,15 @@ internal fun BaseCell(
         horizontalArrangement = Arrangement.Start,
         modifier =
             modifier
-                .clickable(isRowEnabled, onClick = onCellClicked)
+                // This is to avoid a crash when a child view is focused and clickable is set to
+                // false on the parent view
+                .then(
+                    if (isRowEnabled) {
+                        Modifier.clickable(onClick = onCellClicked)
+                    } else {
+                        Modifier
+                    }
+                )
                 .wrapContentHeight()
                 .defaultMinSize(minHeight = minHeight)
                 .fillMaxWidth()