2 files changed, 10 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
index e07a34bef1..bab992bcc1 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
@@ -26,6 +26,7 @@ fun BaseCell(
     title: @Composable () -> Unit,
     bodyView: @Composable () -> Unit,
     modifier: Modifier = Modifier,
+    isRowEnabled: Boolean = true,
     onCellClicked: () -> Unit = {},
     subtitle: @Composable (() -> Unit)? = null,
     subtitleModifier: Modifier = Modifier,
@@ -38,13 +39,19 @@ fun BaseCell(
     val subtitleVerticalSpacing = dimensionResource(id = R.dimen.cell_footer_top_padding)
 
     Column(modifier = Modifier.fillMaxWidth().wrapContentHeight().background(background)) {
+        val rowModifier =
+            Modifier.let {
+                if (isRowEnabled) {
+                    it.clickable { onCellClicked() }
+                } else it
+            }
         Row(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Start,
             modifier =
-                Modifier.height(cellHeight)
+                rowModifier
+                    .height(cellHeight)
                     .fillMaxWidth()
-                    .clickable { onCellClicked.invoke() }
                     .padding(start = startPadding, end = endPadding)
         ) {
             title()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
index 1112ae01b3..e41fed10ad 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
@@ -58,6 +58,7 @@ fun SwitchComposeCell(
 
     BaseCell(
         title = { SwitchCellTitle(title = title, modifier = titleModifier) },
+        isRowEnabled = isEnabled,
         bodyView = {
             SwitchCellView(
                 onSwitchClicked = null,