From 0dc92de9f9aba69fffbb62a2d60afb55f265096b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 12 Dec 2022 17:18:23 +0100
Subject: [PATCH] Fix detekted issues.

---
 .../x/features/roomlist/components/RoomListTopBar.kt  |  5 ++++-
 .../components/dialogs/ConfirmationDialog.kt          | 11 +++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
index 8e28c534a7..f45d0ac244 100644
--- a/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
+++ b/features/roomlist/src/main/java/io/element/android/x/features/roomlist/components/RoomListTopBar.kt
@@ -198,10 +198,13 @@ private fun DefaultRoomListTopBar(
     )
     // Log out confirmation dialog
     ConfirmationDialog(
-        openDialog,
+        isDisplayed = openDialog.value,
         title = "Log out",
         content = "Do you confirm you want to log out?",
         submitText = "Log out",
         onSubmitClicked = onLogoutClicked,
+        onDismiss = {
+            openDialog.value = false
+        }
     )
 }
diff --git a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
index 360c62bf2e..1c23ec5c80 100644
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
@@ -8,16 +8,13 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 @Composable
 fun ConfirmationDialog(
-    isDisplayed: MutableState<Boolean>,
+    isDisplayed: Boolean,
     title: String,
     content: String,
     modifier: Modifier = Modifier,
@@ -26,7 +23,7 @@ fun ConfirmationDialog(
     onSubmitClicked: () -> Unit = {},
     onDismiss: () -> Unit = {},
 ) {
-    if (!isDisplayed.value) return
+    if (!isDisplayed) return
     AlertDialog(
         modifier = modifier,
         onDismissRequest = onDismiss,
@@ -44,7 +41,6 @@ fun ConfirmationDialog(
                 Button(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = {
-                        isDisplayed.value = false
                         onDismiss()
                         onSubmitClicked()
                     })
@@ -61,7 +57,6 @@ fun ConfirmationDialog(
                 Button(
                     modifier = Modifier.fillMaxWidth(),
                     onClick = {
-                        isDisplayed.value = false
                         onDismiss()
                     }) {
                     Text(cancelText)
@@ -75,7 +70,7 @@ fun ConfirmationDialog(
 @Preview
 fun ConfirmationDialogPreview() {
     ConfirmationDialog(
-        isDisplayed = remember { mutableStateOf(true) },
+        isDisplayed = true,
         title = "Title",
         content = "Content",
     )