From 26ea6be44ca976b7ffcfc6be5b88807c9bfb152b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 28 Sep 2026 17:31:42 +0200
Subject: [PATCH] Logout: do not double render the progress state and disable
 the cancel button during the process.

---
 .../io/element/android/features/logout/impl/LogoutView.kt | 6 ++++++
 .../logout/impl/direct/DefaultDirectLogoutView.kt         | 1 +
 .../android/features/logout/impl/ui/LogoutActionDialog.kt | 8 ++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
index 2e604af7ca..32a83b823e 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
@@ -47,6 +47,9 @@ import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.ui.strings.CommonStrings
 
+/**
+ * Ref: https://www.figma.com/design/kEAcfun9iSpszeUDvdKZ6b/ER-351--Multi-account-in-EX?node-id=442-34581
+ */
 @Composable
 fun LogoutView(
     state: LogoutState,
@@ -78,6 +81,8 @@ fun LogoutView(
 
     LogoutActionDialog(
         state.logoutAction,
+        // Do not show the progress dialog, the progress is rendered in the button.
+        showProgressDialog = false,
         onConfirmClick = {
             eventSink(LogoutEvent.Logout(ignoreSdkError = false))
         },
@@ -149,6 +154,7 @@ private fun ColumnScope.Buttons(
     )
     TextButton(
         text = stringResource(id = CommonStrings.action_cancel),
+        enabled = logoutAction !is AsyncAction.Loading,
         modifier = Modifier.fillMaxWidth(),
         onClick = onCancelClick,
     )
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
index 901e4e9654..454a7a25fb 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
@@ -27,6 +27,7 @@ class DefaultDirectLogoutView : DirectLogoutView {
         val eventSink = state.eventSink
         LogoutActionDialog(
             state.logoutAction,
+            showProgressDialog = true,
             onConfirmClick = {
                 eventSink(DirectLogoutEvent.Logout(ignoreSdkError = false))
             },
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
index 0222a991db..ca9e6d9a16 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
@@ -19,6 +19,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun LogoutActionDialog(
     state: AsyncAction<Unit>,
+    showProgressDialog: Boolean,
     onConfirmClick: () -> Unit,
     onForceLogoutClick: () -> Unit,
     onDismissDialog: () -> Unit,
@@ -31,8 +32,11 @@ fun LogoutActionDialog(
                 onSubmitClick = onConfirmClick,
                 onDismiss = onDismissDialog
             )
-        is AsyncAction.Loading ->
-            ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
+        is AsyncAction.Loading -> {
+            if (showProgressDialog) {
+                ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
+            }
+        }
         is AsyncAction.Failure ->
             RetryDialog(
                 title = stringResource(id = CommonStrings.dialog_title_error),