Merge pull request #3667 from element-hq/feature/bma/asyncActionConfirmingWithParam

AsyncAction confirming with param

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenter.kt

@@ -51,7 +51,7 @@ class AccountDeactivationPresenter @Inject constructor(
                             action
                         )
                     } else {
-                        action.value = AsyncAction.Confirming
+                        action.value = AsyncAction.ConfirmingNoParams
                     }
                 AccountDeactivationEvents.CloseDialogs -> {
                     action.value = AsyncAction.Uninitialized

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/AccountDeactivationStateProvider.kt

@@ -20,7 +20,7 @@ open class AccountDeactivationStateProvider : PreviewParameterProvider<AccountDe
             ),
             anAccountDeactivationState(
                 deactivateFormState = filledForm,
-                accountDeactivationAction = AsyncAction.Confirming,
+                accountDeactivationAction = AsyncAction.ConfirmingNoParams,
             ),
             anAccountDeactivationState(
                 deactivateFormState = filledForm,

features/deactivation/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/AccountDeactivationActionDialog.kt

@@ -24,7 +24,7 @@ fun AccountDeactivationActionDialog(
     when (state) {
         AsyncAction.Uninitialized ->
             Unit
-        AsyncAction.Confirming ->
+        is AsyncAction.Confirming ->
             AccountDeactivationConfirmationDialog(
                 onSubmitClick = onConfirmClick,
                 onDismiss = onDismissDialog

features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationPresenterTest.kt

@@ -74,7 +74,7 @@ class AccountDeactivationPresenterTest {
             skipItems(1)
             initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
-            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
@@ -102,7 +102,7 @@ class AccountDeactivationPresenterTest {
             skipItems(2)
             initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
-            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)
@@ -135,7 +135,7 @@ class AccountDeactivationPresenterTest {
             skipItems(2)
             initialState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState = awaitItem()
-            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(updatedState.accountDeactivationAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             updatedState.eventSink(AccountDeactivationEvents.DeactivateAccount(isRetry = false))
             val updatedState2 = awaitItem()
             assertThat(updatedState2.accountDeactivationAction).isEqualTo(AsyncAction.Loading)

features/deactivation/impl/src/test/kotlin/io/element/android/features/logout/impl/AccountDeactivationViewTest.kt

@@ -71,7 +71,7 @@ class AccountDeactivationViewTest {
                 deactivateFormState = aDeactivateFormState(
                     password = A_PASSWORD,
                 ),
-                accountDeactivationAction = AsyncAction.Confirming,
+                accountDeactivationAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             ),
         )

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteState.kt

@@ -9,10 +9,8 @@ package io.element.android.features.invite.api.response
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
-import java.util.Optional
 
 data class AcceptDeclineInviteState(
-    val invite: Optional<InviteData>,
     val acceptAction: AsyncAction<RoomId>,
     val declineAction: AsyncAction<RoomId>,
     val eventSink: (AcceptDeclineInviteEvents) -> Unit,

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt

@@ -10,23 +10,20 @@ package io.element.android.features.invite.api.response
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
-import java.util.Optional
 
 open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDeclineInviteState> {
     override val values: Sequence<AcceptDeclineInviteState>
         get() = sequenceOf(
             anAcceptDeclineInviteState(),
             anAcceptDeclineInviteState(
-                invite = Optional.of(
+                declineAction = ConfirmingDeclineInvite(
-                    InviteData(RoomId("!room:matrix.org"), isDm = true, roomName = "Alice"),
+                    InviteData(RoomId("!room:matrix.org"), isDm = true, roomName = "Alice")
                 ),
-                declineAction = AsyncAction.Confirming,
             ),
             anAcceptDeclineInviteState(
-                invite = Optional.of(
+                declineAction = ConfirmingDeclineInvite(
-                    InviteData(RoomId("!room:matrix.org"), isDm = false, roomName = "Some room"),
+                    InviteData(RoomId("!room:matrix.org"), isDm = false, roomName = "Some room")
                 ),
-                declineAction = AsyncAction.Confirming,
             ),
             anAcceptDeclineInviteState(
                 acceptAction = AsyncAction.Failure(Throwable("Whoops")),
@@ -38,12 +35,10 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
 }
 
 fun anAcceptDeclineInviteState(
-    invite: Optional<InviteData> = Optional.empty(),
     acceptAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
     declineAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
     eventSink: (AcceptDeclineInviteEvents) -> Unit = {}
 ) = AcceptDeclineInviteState(
-    invite = invite,
     acceptAction = acceptAction,
     declineAction = declineAction,
     eventSink = eventSink,

features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/ConfirmingDeclineInvite.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.features.invite.api.response
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data class ConfirmingDeclineInvite(
+    val inviteData: InviteData,
+) : AsyncAction.Confirming

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt

@@ -9,15 +9,13 @@ package io.element.android.features.invite.impl.response
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.InviteData
+import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
@@ -29,9 +27,7 @@ import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import java.util.Optional
 import javax.inject.Inject
-import kotlin.jvm.optionals.getOrNull
 
 class AcceptDeclineInvitePresenter @Inject constructor(
     private val client: MatrixClient,
@@ -43,35 +39,22 @@ class AcceptDeclineInvitePresenter @Inject constructor(
         val localCoroutineScope = rememberCoroutineScope()
         val acceptedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val declinedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
-        var currentInvite by remember {
-            mutableStateOf<Optional<InviteData>>(Optional.empty())
-        }
 
         fun handleEvents(event: AcceptDeclineInviteEvents) {
             when (event) {
                 is AcceptDeclineInviteEvents.AcceptInvite -> {
-                    // currentInvite is used to render the decline confirmation dialog
-                    // and to reuse the roomId when the user confirm the rejection of the invitation.
-                    // Just set it to empty here.
-                    currentInvite = Optional.empty()
                     localCoroutineScope.acceptInvite(event.invite.roomId, acceptedAction)
                 }
 
                 is AcceptDeclineInviteEvents.DeclineInvite -> {
-                    currentInvite = Optional.of(event.invite)
+                    declinedAction.value = ConfirmingDeclineInvite(event.invite)
-                    declinedAction.value = AsyncAction.Confirming
                 }
 
                 is InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite -> {
-                    declinedAction.value = AsyncAction.Uninitialized
+                    localCoroutineScope.declineInvite(event.roomId, declinedAction)
-                    currentInvite.getOrNull()?.let {
-                        localCoroutineScope.declineInvite(it.roomId, declinedAction)
-                    }
-                    currentInvite = Optional.empty()
                 }
 
                 is InternalAcceptDeclineInviteEvents.CancelDeclineInvite -> {
-                    currentInvite = Optional.empty()
                     declinedAction.value = AsyncAction.Uninitialized
                 }
 
@@ -86,7 +69,6 @@ class AcceptDeclineInvitePresenter @Inject constructor(
         }
 
         return AcceptDeclineInviteState(
-            invite = currentInvite,
             acceptAction = acceptedAction.value,
             declineAction = declinedAction.value,
             eventSink = ::handleEvents

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
 import io.element.android.features.invite.api.response.AcceptDeclineInviteStateProvider
+import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
 import io.element.android.features.invite.api.response.InviteData
 import io.element.android.features.invite.impl.R
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
@@ -22,7 +23,6 @@ import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
-import kotlin.jvm.optionals.getOrNull
 
 @Composable
 fun AcceptDeclineInviteView(
@@ -45,13 +45,13 @@ fun AcceptDeclineInviteView(
             onErrorDismiss = {
                 state.eventSink(InternalAcceptDeclineInviteEvents.DismissDeclineError)
             },
-            confirmationDialog = {
+            confirmationDialog = { confirming ->
-                val invite = state.invite.getOrNull()
+                // Note: confirming will always be of type ConfirmingDeclineInvite.
-                if (invite != null) {
+                if (confirming is ConfirmingDeclineInvite) {
                     DeclineConfirmationDialog(
-                        invite = invite,
+                        invite = confirming.inviteData,
                         onConfirmClick = {
-                            state.eventSink(InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite)
+                            state.eventSink(InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite(confirming.inviteData.roomId))
                         },
                         onDismissClick = {
                             state.eventSink(InternalAcceptDeclineInviteEvents.CancelDeclineInvite)

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InternalAcceptDeclineInviteEvents.kt

@@ -8,9 +8,10 @@
 package io.element.android.features.invite.impl.response
 
 import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
+import io.element.android.libraries.matrix.api.core.RoomId
 
 sealed interface InternalAcceptDeclineInviteEvents : AcceptDeclineInviteEvents {
-    data object ConfirmDeclineInvite : InternalAcceptDeclineInviteEvents
+    data class ConfirmDeclineInvite(val roomId: RoomId) : InternalAcceptDeclineInviteEvents
     data object CancelDeclineInvite : InternalAcceptDeclineInviteEvents
     data object DismissAcceptError : InternalAcceptDeclineInviteEvents
     data object DismissDeclineError : InternalAcceptDeclineInviteEvents

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt

@@ -10,6 +10,7 @@ package io.element.android.features.invite.impl.response
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
 import io.element.android.features.invite.api.response.InviteData
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -33,7 +34,6 @@ import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
-import java.util.Optional
 
 class AcceptDeclineInvitePresenterTest {
     @get:Rule
@@ -46,7 +46,6 @@ class AcceptDeclineInvitePresenterTest {
             awaitItem().also { state ->
                 assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
                 assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
             }
         }
     }
@@ -61,17 +60,13 @@ class AcceptDeclineInvitePresenterTest {
                     AcceptDeclineInviteEvents.DeclineInvite(inviteData)
                 )
             }
-            skipItems(1)
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.of(inviteData))
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData))
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Confirming::class.java)
                 state.eventSink(
                     InternalAcceptDeclineInviteEvents.CancelDeclineInvite
                 )
             }
-            skipItems(1)
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
                 assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
             }
         }
@@ -93,22 +88,20 @@ class AcceptDeclineInvitePresenterTest {
                     AcceptDeclineInviteEvents.DeclineInvite(inviteData)
                 )
             }
-            skipItems(1)
             awaitItem().also { state ->
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData))
                 state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
+                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite(inviteData.roomId)
                 )
             }
-            skipItems(2)
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
             awaitItem().also { state ->
                 assertThat(state.declineAction).isInstanceOf(AsyncAction.Failure::class.java)
                 state.eventSink(
                     InternalAcceptDeclineInviteEvents.DismissDeclineError
                 )
             }
-            skipItems(1)
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
                 assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
             }
             cancelAndConsumeRemainingEvents()
@@ -141,13 +134,13 @@ class AcceptDeclineInvitePresenterTest {
                     AcceptDeclineInviteEvents.DeclineInvite(inviteData)
                 )
             }
-            skipItems(1)
             awaitItem().also { state ->
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData))
                 state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
+                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite(inviteData.roomId)
                 )
             }
-            skipItems(2)
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
             awaitItem().also { state ->
                 assertThat(state.declineAction).isInstanceOf(AsyncAction.Success::class.java)
             }
@@ -173,7 +166,6 @@ class AcceptDeclineInvitePresenterTest {
                 )
             }
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
                 assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
             }
             awaitItem().also { state ->
@@ -183,7 +175,6 @@ class AcceptDeclineInvitePresenterTest {
                 )
             }
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
                 assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
             }
             cancelAndConsumeRemainingEvents()
@@ -220,7 +211,6 @@ class AcceptDeclineInvitePresenterTest {
                 )
             }
             awaitItem().also { state ->
-                assertThat(state.invite).isEqualTo(Optional.empty<InviteData>())
                 assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
             }
             awaitItem().also { state ->

features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt

@@ -96,7 +96,7 @@ fun PinUnlockView(
                     latestOnSuccessLogout(state.signOutAction.data)
                 }
             }
-            AsyncAction.Confirming,
+            is AsyncAction.Confirming,
             is AsyncAction.Failure,
             AsyncAction.Uninitialized -> Unit
         }

features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanView.kt

@@ -189,7 +189,7 @@ private fun ColumnScope.Buttons(
                 }
             }
             AsyncAction.Uninitialized,
-            AsyncAction.Confirming -> Unit
+            is AsyncAction.Confirming -> Unit
         }
     }
 }

features/logout/api/src/main/kotlin/io/element/android/features/logout/api/direct/DirectLogoutStateProvider.kt

@@ -14,7 +14,7 @@ open class DirectLogoutStateProvider : PreviewParameterProvider<DirectLogoutStat
     override val values: Sequence<DirectLogoutState>
         get() = sequenceOf(
             aDirectLogoutState(),
-            aDirectLogoutState(logoutAction = AsyncAction.Confirming),
+            aDirectLogoutState(logoutAction = AsyncAction.ConfirmingNoParams),
             aDirectLogoutState(logoutAction = AsyncAction.Loading),
             aDirectLogoutState(logoutAction = AsyncAction.Failure(Exception("Error"))),
             aDirectLogoutState(logoutAction = AsyncAction.Success("success")),

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutPresenter.kt

@@ -64,7 +64,7 @@ class LogoutPresenter @Inject constructor(
                     if (logoutAction.value.isConfirming() || event.ignoreSdkError) {
                         localCoroutineScope.logout(logoutAction, event.ignoreSdkError)
                     } else {
-                        logoutAction.value = AsyncAction.Confirming
+                        logoutAction.value = AsyncAction.ConfirmingNoParams
                     }
                 }
                 LogoutEvents.CloseDialogs -> {

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutStateProvider.kt

@@ -21,7 +21,7 @@ open class LogoutStateProvider : PreviewParameterProvider<LogoutState> {
             aLogoutState(isLastDevice = true),
             aLogoutState(isLastDevice = false, backupUploadState = BackupUploadState.Uploading(66, 200)),
             aLogoutState(isLastDevice = true, backupUploadState = BackupUploadState.Done),
-            aLogoutState(logoutAction = AsyncAction.Confirming),
+            aLogoutState(logoutAction = AsyncAction.ConfirmingNoParams),
             aLogoutState(logoutAction = AsyncAction.Loading),
             aLogoutState(logoutAction = AsyncAction.Failure(Exception("Failed to logout"))),
             aLogoutState(backupUploadState = BackupUploadState.SteadyException(SteadyStateException.Connection("No network"))),

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenter.kt

@@ -52,7 +52,7 @@ class DirectLogoutPresenter @Inject constructor(
                     if (logoutAction.value.isConfirming() || event.ignoreSdkError) {
                         localCoroutineScope.logout(logoutAction, event.ignoreSdkError)
                     } else {
-                        logoutAction.value = AsyncAction.Confirming
+                        logoutAction.value = AsyncAction.ConfirmingNoParams
                     }
                 }
                 DirectLogoutEvents.CloseDialogs -> {

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt

@@ -29,7 +29,7 @@ fun LogoutActionDialog(
     when (state) {
         AsyncAction.Uninitialized ->
             Unit
-        AsyncAction.Confirming ->
+        is AsyncAction.Confirming ->
             LogoutConfirmationDialog(
                 onSubmitClick = onConfirmClick,
                 onDismiss = onDismissDialog

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutPresenterTest.kt

@@ -107,7 +107,7 @@ class LogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             initialState.eventSink.invoke(LogoutEvents.CloseDialogs)
             val finalState = awaitItem()
             assertThat(finalState.logoutAction).isEqualTo(AsyncAction.Uninitialized)
@@ -123,7 +123,7 @@ class LogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -148,7 +148,7 @@ class LogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -180,7 +180,7 @@ class LogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(LogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt

@@ -48,7 +48,7 @@ class LogoutViewTest {
         val eventsRecorder = EventsRecorder<LogoutEvents>()
         rule.setLogoutView(
             aLogoutState(
-                logoutAction = AsyncAction.Confirming,
+                logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutViewTest.kt

@@ -36,7 +36,7 @@ class DefaultDirectLogoutViewTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
         rule.setDefaultDirectLogoutView(
             state = aDirectLogoutState(
-                logoutAction = AsyncAction.Confirming,
+                logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )
@@ -49,7 +49,7 @@ class DefaultDirectLogoutViewTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
         rule.setDefaultDirectLogoutView(
             state = aDirectLogoutState(
-                logoutAction = AsyncAction.Confirming,
+                logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )
@@ -63,7 +63,7 @@ class DefaultDirectLogoutViewTest {
         val eventsRecorder = EventsRecorder<DirectLogoutEvents>()
         rule.setDefaultDirectLogoutView(
             state = aDirectLogoutState(
-                logoutAction = AsyncAction.Confirming,
+                logoutAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             )
         )

features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/direct/DirectLogoutPresenterTest.kt

@@ -88,7 +88,7 @@ class DirectLogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             initialState.eventSink.invoke(DirectLogoutEvents.CloseDialogs)
             val finalState = awaitItem()
             assertThat(finalState.logoutAction).isEqualTo(AsyncAction.Uninitialized)
@@ -104,7 +104,7 @@ class DirectLogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -129,7 +129,7 @@ class DirectLogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -161,7 +161,7 @@ class DirectLogoutPresenterTest {
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val confirmationState = awaitItem()
-            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmationState.logoutAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             confirmationState.eventSink.invoke(DirectLogoutEvents.Logout(ignoreSdkError = false))
             val loadingState = awaitItem()
             assertThat(loadingState.logoutAction).isInstanceOf(AsyncAction.Loading::class.java)

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersPresenter.kt

@@ -67,7 +67,7 @@ class BlockedUsersPresenter @Inject constructor(
             when (event) {
                 is BlockedUsersEvents.Unblock -> {
                     pendingUserToUnblock = event.userId
-                    unblockUserAction.value = AsyncAction.Confirming
+                    unblockUserAction.value = AsyncAction.ConfirmingNoParams
                 }
                 BlockedUsersEvents.ConfirmUnblock -> {
                     pendingUserToUnblock?.let {

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersStatePreviewProvider.kt

@@ -19,7 +19,7 @@ class BlockedUsersStatePreviewProvider : PreviewParameterProvider<BlockedUsersSt
             aBlockedUsersState(),
             aBlockedUsersState(blockedUsers = aMatrixUserList().map { it.copy(displayName = null, avatarUrl = null) }),
             aBlockedUsersState(blockedUsers = emptyList()),
-            aBlockedUsersState(unblockUserAction = AsyncAction.Confirming),
+            aBlockedUsersState(unblockUserAction = AsyncAction.ConfirmingNoParams),
             aBlockedUsersState(unblockUserAction = AsyncAction.Loading),
             aBlockedUsersState(unblockUserAction = AsyncAction.Failure(Throwable("Failed to unblock user"))),
             aBlockedUsersState(unblockUserAction = AsyncAction.Success(Unit)),

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt

@@ -65,7 +65,7 @@ class BlockedUserViewTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>()
         rule.setBlockedUsersView(
             aBlockedUsersState(
-                unblockUserAction = AsyncAction.Confirming,
+                unblockUserAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )
@@ -78,7 +78,7 @@ class BlockedUserViewTest {
         val eventsRecorder = EventsRecorder<BlockedUsersEvents>()
         rule.setBlockedUsersView(
             aBlockedUsersState(
-                unblockUserAction = AsyncAction.Confirming,
+                unblockUserAction = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder
             ),
         )

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenter.kt

@@ -77,7 +77,7 @@ class RoomMembersModerationPresenter @Inject constructor(
                     coroutineScope.launch {
                         selectedMember = event.roomMember
                         if (event.roomMember.membership == RoomMembershipState.BAN && canBan()) {
-                            unbanUserAsyncAction.value = AsyncAction.Confirming
+                            unbanUserAsyncAction.value = AsyncAction.ConfirmingNoParams
                         } else {
                             moderationActions = buildList {
                                 add(ModerationAction.DisplayProfile(event.roomMember.userId))
@@ -109,7 +109,7 @@ class RoomMembersModerationPresenter @Inject constructor(
                             coroutineScope.banUser(it.userId, banUserAsyncAction)
                         }
                     } else {
-                        banUserAsyncAction.value = AsyncAction.Confirming
+                        banUserAsyncAction.value = AsyncAction.ConfirmingNoParams
                     }
                 }
                 is RoomMembersModerationEvents.UnbanUser -> {
@@ -119,7 +119,7 @@ class RoomMembersModerationPresenter @Inject constructor(
                             coroutineScope.unbanUser(it.userId, unbanUserAsyncAction)
                         }
                     } else {
-                        unbanUserAsyncAction.value = AsyncAction.Confirming
+                        unbanUserAsyncAction.value = AsyncAction.ConfirmingNoParams
                     }
                 }
                 is RoomMembersModerationEvents.Reset -> {

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationStatePreviewProvider.kt

@@ -56,11 +56,11 @@ class RoomMembersModerationStatePreviewProvider : PreviewParameterProvider<RoomM
             ),
             aRoomMembersModerationState(
                 selectedRoomMember = anAlice(),
-                banUserAsyncAction = AsyncAction.Confirming,
+                banUserAsyncAction = AsyncAction.ConfirmingNoParams,
             ),
             aRoomMembersModerationState(
                 selectedRoomMember = anAlice(),
-                unbanUserAsyncAction = AsyncAction.Confirming,
+                unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
             ),
             aRoomMembersModerationState(
                 kickUserAsyncAction = AsyncAction.Success(Unit),

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt

@@ -64,7 +64,7 @@ class RolesAndPermissionsPresenter @Inject constructor(
         fun handleEvent(event: RolesAndPermissionsEvents) {
             when (event) {
                 is RolesAndPermissionsEvents.ChangeOwnRole -> {
-                    changeOwnRoleAction.value = AsyncAction.Confirming
+                    changeOwnRoleAction.value = AsyncAction.ConfirmingNoParams
                 }
                 is RolesAndPermissionsEvents.CancelPendingAction -> {
                     changeOwnRoleAction.value = AsyncAction.Uninitialized
@@ -77,7 +77,7 @@ class RolesAndPermissionsPresenter @Inject constructor(
                 is RolesAndPermissionsEvents.ResetPermissions -> if (resetPermissionsAction.value.isConfirming()) {
                     coroutineScope.resetPermissions(resetPermissionsAction)
                 } else {
-                    resetPermissionsAction.value = AsyncAction.Confirming
+                    resetPermissionsAction.value = AsyncAction.ConfirmingNoParams
                 }
             }
         }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsStateProvider.kt

@@ -18,7 +18,7 @@ class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermis
             aRolesAndPermissionsState(
                 adminCount = 1,
                 moderatorCount = 2,
-                changeOwnRoleAction = AsyncAction.Confirming,
+                changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
             ),
             aRolesAndPermissionsState(
                 adminCount = 1,
@@ -33,7 +33,7 @@ class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermis
             aRolesAndPermissionsState(
                 adminCount = 1,
                 moderatorCount = 2,
-                resetPermissionsAction = AsyncAction.Confirming,
+                resetPermissionsAction = AsyncAction.ConfirmingNoParams,
             ),
             aRolesAndPermissionsState(
                 adminCount = 1,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenter.kt

@@ -134,7 +134,7 @@ class ChangeRolesPresenter @AssistedInject constructor(
                 is ChangeRolesEvent.Save -> {
                     if (role == RoomMember.Role.ADMIN && selectedUsers != usersWithRole && !saveState.value.isConfirming()) {
                         // Confirm adding admin
-                        saveState.value = AsyncAction.Confirming
+                        saveState.value = AsyncAction.ConfirmingNoParams
                     } else if (!saveState.value.isLoading()) {
                         coroutineScope.save(usersWithRole.value, selectedUsers, saveState)
                     }
@@ -145,7 +145,7 @@ class ChangeRolesPresenter @AssistedInject constructor(
                 is ChangeRolesEvent.Exit -> {
                     exitState.value = if (exitState.value.isUninitialized() && hasPendingChanges) {
                         // Has pending changes, confirm exit
-                        AsyncAction.Confirming
+                        AsyncAction.ConfirmingNoParams
                     } else {
                         // No pending changes, exit immediately
                         AsyncAction.Success(Unit)

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesStateProvider.kt

@@ -36,8 +36,8 @@ class ChangeRolesStateProvider : PreviewParameterProvider<ChangeRolesState> {
                 searchResults = SearchBarResultState.Results(MembersByRole(aRoomMemberList().take(1).toImmutableList())),
                 selectedUsers = aMatrixUserList().take(1).toImmutableList(),
             ),
-            aChangeRolesStateWithSelectedUsers().copy(exitState = AsyncAction.Confirming),
+            aChangeRolesStateWithSelectedUsers().copy(exitState = AsyncAction.ConfirmingNoParams),
-            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Confirming),
+            aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.ConfirmingNoParams),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Loading),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Success(Unit)),
             aChangeRolesStateWithSelectedUsers().copy(savingState = AsyncAction.Failure(Exception("boom"))),

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt

@@ -95,7 +95,7 @@ class ChangeRoomPermissionsPresenter @AssistedInject constructor(
                     confirmExitAction = if (!hasChanges || confirmExitAction.isConfirming()) {
                         AsyncAction.Success(Unit)
                     } else {
-                        AsyncAction.Confirming
+                        AsyncAction.ConfirmingNoParams
                     }
                 }
                 is ChangeRoomPermissionsEvent.ResetPendingActions -> {

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStatePreviewProvider.kt

@@ -26,7 +26,11 @@ class ChangeRoomPermissionsStatePreviewProvider : PreviewParameterProvider<Chang
                 hasChanges = true,
                 saveAction = AsyncAction.Failure(IllegalStateException("Failed to save changes"))
             ),
-            aChangeRoomPermissionsState(section = ChangeRoomPermissionsSection.RoomDetails, hasChanges = true, confirmExitAction = AsyncAction.Confirming),
+            aChangeRoomPermissionsState(
+                section = ChangeRoomPermissionsSection.RoomDetails,
+                hasChanges = true,
+                confirmExitAction = AsyncAction.ConfirmingNoParams,
+            ),
         )
 }
 

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/moderation/RoomMembersModerationPresenterTest.kt

@@ -142,7 +142,7 @@ class RoomMembersModerationPresenterTest {
             awaitItem().eventSink(RoomMembersModerationEvents.SelectRoomMember(selectedMember))
             with(awaitItem()) {
                 assertThat(selectedRoomMember).isNotNull()
-                assertThat(unbanUserAsyncAction).isEqualTo(AsyncAction.Confirming)
+                assertThat(unbanUserAsyncAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             }
         }
     }
@@ -193,7 +193,7 @@ class RoomMembersModerationPresenterTest {
             awaitItem().eventSink(RoomMembersModerationEvents.SelectRoomMember(selectedMember))
             awaitItem().eventSink(RoomMembersModerationEvents.BanUser)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.banUserAsyncAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmingState.banUserAsyncAction).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             // Confirm
             confirmingState.eventSink(RoomMembersModerationEvents.BanUser)

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/moderation/RoomMembersModerationViewTest.kt

@@ -130,7 +130,7 @@ class RoomMembersModerationViewTest {
         val roomMember = anAlice()
         val state = aRoomMembersModerationState(
             selectedRoomMember = roomMember,
-            banUserAsyncAction = AsyncAction.Confirming,
+            banUserAsyncAction = AsyncAction.ConfirmingNoParams,
             eventSink = eventsRecorder
         )
         rule.setRoomMembersModerationView(
@@ -147,7 +147,7 @@ class RoomMembersModerationViewTest {
         val roomMember = anAlice()
         val state = aRoomMembersModerationState(
             selectedRoomMember = roomMember,
-            banUserAsyncAction = AsyncAction.Confirming,
+            banUserAsyncAction = AsyncAction.ConfirmingNoParams,
             eventSink = eventsRecorder
         )
         rule.setRoomMembersModerationView(
@@ -164,7 +164,7 @@ class RoomMembersModerationViewTest {
         val roomMember = anAlice()
         val state = aRoomMembersModerationState(
             selectedRoomMember = roomMember,
-            unbanUserAsyncAction = AsyncAction.Confirming,
+            unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
             eventSink = eventsRecorder
         )
         rule.setRoomMembersModerationView(
@@ -181,7 +181,7 @@ class RoomMembersModerationViewTest {
         val roomMember = anAlice()
         val state = aRoomMembersModerationState(
             selectedRoomMember = roomMember,
-            unbanUserAsyncAction = AsyncAction.Confirming,
+            unbanUserAsyncAction = AsyncAction.ConfirmingNoParams,
             eventSink = eventsRecorder
         )
         rule.setRoomMembersModerationView(

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionPresenterTest.kt

@@ -52,7 +52,7 @@ class RolesAndPermissionPresenterTest {
             val initialState = awaitItem()
             initialState.eventSink(RolesAndPermissionsEvents.ChangeOwnRole)
 
-            assertThat(awaitItem().changeOwnRoleAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(awaitItem().changeOwnRoleAction).isEqualTo(AsyncAction.ConfirmingNoParams)
         }
     }
 

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionsViewTest.kt

@@ -98,7 +98,7 @@ class RolesAndPermissionsViewTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
         rule.setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
-                resetPermissionsAction = AsyncAction.Confirming,
+                resetPermissionsAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
@@ -111,7 +111,7 @@ class RolesAndPermissionsViewTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
         rule.setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
-                resetPermissionsAction = AsyncAction.Confirming,
+                resetPermissionsAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
@@ -124,7 +124,7 @@ class RolesAndPermissionsViewTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
         rule.setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
-                changeOwnRoleAction = AsyncAction.Confirming,
+                changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
@@ -138,7 +138,7 @@ class RolesAndPermissionsViewTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
         rule.setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
-                changeOwnRoleAction = AsyncAction.Confirming,
+                changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )
@@ -152,7 +152,7 @@ class RolesAndPermissionsViewTest {
         val recorder = EventsRecorder<RolesAndPermissionsEvents>()
         rule.setRolesAndPermissionsView(
             state = aRolesAndPermissionsState(
-                changeOwnRoleAction = AsyncAction.Confirming,
+                changeOwnRoleAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
         )

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesPresenterTest.kt

@@ -229,7 +229,7 @@ class ChangeRolesPresenterTest {
 
             awaitItem().eventSink(ChangeRolesEvent.Exit)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.exitState).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmingState.exitState).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             confirmingState.eventSink(ChangeRolesEvent.CancelExit)
             assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Uninitialized)
@@ -257,7 +257,7 @@ class ChangeRolesPresenterTest {
             skipItems(1)
 
             updatedState.eventSink(ChangeRolesEvent.Exit)
-            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Confirming)
+            assertThat(awaitItem().exitState).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             updatedState.eventSink(ChangeRolesEvent.Exit)
             assertThat(awaitItem().exitState).isEqualTo(AsyncAction.Success(Unit))
@@ -284,7 +284,7 @@ class ChangeRolesPresenterTest {
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             confirmingState.eventSink(ChangeRolesEvent.Save)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
@@ -309,7 +309,7 @@ class ChangeRolesPresenterTest {
 
             awaitItem().eventSink(ChangeRolesEvent.Save)
             val confirmingState = awaitItem()
-            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.Confirming)
+            assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             confirmingState.eventSink(ChangeRolesEvent.CancelSave)
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Uninitialized)

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesViewTest.kt

@@ -140,7 +140,7 @@ class ChangeRolesViewTest {
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
-                exitState = AsyncAction.Confirming,
+                exitState = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             ),
         )
@@ -156,7 +156,7 @@ class ChangeRolesViewTest {
         rule.setChangeRolesContent(
             state = aChangeRolesState(
                 isSearchActive = true,
-                exitState = AsyncAction.Confirming,
+                exitState = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             ),
         )
@@ -173,7 +173,7 @@ class ChangeRolesViewTest {
             state = aChangeRolesState(
                 role = RoomMember.Role.ADMIN,
                 isSearchActive = true,
-                savingState = AsyncAction.Confirming,
+                savingState = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             ),
         )
@@ -190,7 +190,7 @@ class ChangeRolesViewTest {
             state = aChangeRolesState(
                 role = RoomMember.Role.ADMIN,
                 isSearchActive = true,
-                savingState = AsyncAction.Confirming,
+                savingState = AsyncAction.ConfirmingNoParams,
                 eventSink = eventsRecorder,
             ),
         )

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsPresenterTest.kt

@@ -267,7 +267,7 @@ class ChangeRoomPermissionsPresenterTest {
             assertThat(awaitItem().hasChanges).isTrue()
 
             state.eventSink(ChangeRoomPermissionsEvent.Exit)
-            assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             state.eventSink(ChangeRoomPermissionsEvent.Exit)
             assertThat(awaitItem().confirmExitAction).isEqualTo(AsyncAction.Success(Unit))

features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsViewTest.kt

@@ -82,7 +82,7 @@ class ChangeRoomPermissionsViewTest {
             state = aChangeRoomPermissionsState(
                 section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
-                confirmExitAction = AsyncAction.Confirming,
+                confirmExitAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
             eventsRecorder = recorder,
@@ -98,7 +98,7 @@ class ChangeRoomPermissionsViewTest {
             state = aChangeRoomPermissionsState(
                 section = ChangeRoomPermissionsSection.RoomDetails,
                 hasChanges = true,
-                confirmExitAction = AsyncAction.Confirming,
+                confirmExitAction = AsyncAction.ConfirmingNoParams,
                 eventSink = recorder,
             ),
             eventsRecorder = recorder,

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenter.kt

@@ -40,7 +40,7 @@ class SecureBackupDisablePresenter @Inject constructor(
                 is SecureBackupDisableEvents.DisableBackup -> if (disableAction.value.isConfirming()) {
                     coroutineScope.disableBackup(disableAction)
                 } else {
-                    disableAction.value = AsyncAction.Confirming
+                    disableAction.value = AsyncAction.ConfirmingNoParams
                 }
                 SecureBackupDisableEvents.DismissDialogs -> {
                     disableAction.value = AsyncAction.Uninitialized

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableStateProvider.kt

@@ -15,7 +15,7 @@ open class SecureBackupDisableStateProvider : PreviewParameterProvider<SecureBac
     override val values: Sequence<SecureBackupDisableState>
         get() = sequenceOf(
             aSecureBackupDisableState(),
-            aSecureBackupDisableState(disableAction = AsyncAction.Confirming),
+            aSecureBackupDisableState(disableAction = AsyncAction.ConfirmingNoParams),
             aSecureBackupDisableState(disableAction = AsyncAction.Loading),
             aSecureBackupDisableState(disableAction = AsyncAction.Failure(Exception("Failed to disable"))),
             // Add other states here

features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisablePresenterTest.kt

@@ -47,7 +47,7 @@ class SecureBackupDisablePresenterTest {
             val initialState = awaitItem()
             initialState.eventSink(SecureBackupDisableEvents.DisableBackup)
             val state = awaitItem()
-            assertThat(state.disableAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(state.disableAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             initialState.eventSink(SecureBackupDisableEvents.DismissDialogs)
             val finalState = awaitItem()
             assertThat(finalState.disableAction).isEqualTo(AsyncAction.Uninitialized)
@@ -64,7 +64,7 @@ class SecureBackupDisablePresenterTest {
             assertThat(initialState.disableAction).isEqualTo(AsyncAction.Uninitialized)
             initialState.eventSink(SecureBackupDisableEvents.DisableBackup)
             val state = awaitItem()
-            assertThat(state.disableAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(state.disableAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             initialState.eventSink(SecureBackupDisableEvents.DisableBackup)
             val loadingState = awaitItem()
             assertThat(loadingState.disableAction).isInstanceOf(AsyncAction.Loading::class.java)
@@ -88,7 +88,7 @@ class SecureBackupDisablePresenterTest {
             assertThat(initialState.disableAction).isEqualTo(AsyncAction.Uninitialized)
             initialState.eventSink(SecureBackupDisableEvents.DisableBackup)
             val state = awaitItem()
-            assertThat(state.disableAction).isEqualTo(AsyncAction.Confirming)
+            assertThat(state.disableAction).isEqualTo(AsyncAction.ConfirmingNoParams)
             initialState.eventSink(SecureBackupDisableEvents.DisableBackup)
             val loadingState = awaitItem()
             assertThat(loadingState.disableAction).isInstanceOf(AsyncAction.Loading::class.java)

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt

@@ -158,7 +158,7 @@ fun VerifySelfSessionView(
                 latestOnSuccessLogout(state.signOutAction.data)
             }
         }
-        AsyncAction.Confirming,
+        is AsyncAction.Confirming,
         is AsyncAction.Failure,
         AsyncAction.Uninitialized -> Unit
     }

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt

@@ -26,7 +26,9 @@ sealed interface AsyncAction<out T> {
     /**
      * Represents an operation that is currently waiting for user confirmation.
      */
-    data object Confirming : AsyncAction<Nothing>
+    interface Confirming : AsyncAction<Nothing>
+
+    data object ConfirmingNoParams : Confirming
 
     /**
      * Represents an operation that is currently ongoing.
@@ -70,7 +72,7 @@ sealed interface AsyncAction<out T> {
 
     fun isUninitialized(): Boolean = this == Uninitialized
 
-    fun isConfirming(): Boolean = this == Confirming
+    fun isConfirming(): Boolean = this is Confirming
 
     fun isLoading(): Boolean = this == Loading
 

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt

@@ -14,7 +14,7 @@ open class AsyncActionProvider : PreviewParameterProvider<AsyncAction<Unit>> {
     override val values: Sequence<AsyncAction<Unit>>
         get() = sequenceOf(
             AsyncAction.Uninitialized,
-            AsyncAction.Confirming,
+            AsyncAction.ConfirmingNoParams,
             AsyncAction.Loading,
             AsyncAction.Failure(Exception("An error occurred")),
             AsyncAction.Success(Unit),

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt

@@ -34,7 +34,7 @@ fun <T> AsyncActionView(
     async: AsyncAction<T>,
     onSuccess: (T) -> Unit,
     onErrorDismiss: () -> Unit,
-    confirmationDialog: @Composable () -> Unit = { },
+    confirmationDialog: @Composable (AsyncAction.Confirming) -> Unit = { },
     progressDialog: @Composable () -> Unit = { AsyncActionViewDefaults.ProgressDialog() },
     errorTitle: @Composable (Throwable) -> String = { ErrorDialogDefaults.title },
     errorMessage: @Composable (Throwable) -> String = { it.message ?: it.toString() },
@@ -42,7 +42,7 @@ fun <T> AsyncActionView(
 ) {
     when (async) {
         AsyncAction.Uninitialized -> Unit
-        AsyncAction.Confirming -> confirmationDialog()
+        is AsyncAction.Confirming -> confirmationDialog(async)
         is AsyncAction.Loading -> progressDialog()
         is AsyncAction.Failure -> {
             if (onRetry == null) {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeInvitedRoom.kt

@@ -13,14 +13,15 @@ import io.element.android.libraries.matrix.api.room.InvitedRoom
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
 
 class FakeInvitedRoom(
     override val sessionId: SessionId = A_SESSION_ID,
     override val roomId: RoomId = A_ROOM_ID,
     private val declineInviteResult: () -> Result<Unit> = { lambdaError() }
 ) : InvitedRoom {
-    override suspend fun declineInvite(): Result<Unit> {
+    override suspend fun declineInvite(): Result<Unit> = simulateLongTask {
-        return declineInviteResult()
+        declineInviteResult()
     }
 
     override fun close() = Unit

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt

@@ -122,7 +122,7 @@ private fun ColumnScope.TroubleshootTestView(
 private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNotificationsState) {
     when (state.testSuiteState.mainState) {
         AsyncAction.Loading,
-        AsyncAction.Confirming,
+        is AsyncAction.Confirming,
         is AsyncAction.Success,
         is AsyncAction.Failure -> {
             TestSuiteView(
@@ -150,7 +150,7 @@ private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNoti
             })
             RunTestButton(state = state)
         }
-        AsyncAction.Confirming -> {
+        is AsyncAction.Confirming -> {
             ListItem(headlineContent = {
                 Text(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_waiting)

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt

@@ -102,7 +102,7 @@ fun List<NotificationTroubleshootTestState>.computeMainState(): AsyncAction<Unit
         isRunning -> AsyncAction.Loading
         else -> {
             if (any { it.status is NotificationTroubleshootTestState.Status.WaitingForUser }) {
-                AsyncAction.Confirming
+                AsyncAction.ConfirmingNoParams
             } else if (any { it.status is NotificationTroubleshootTestState.Status.Failure }) {
                 AsyncAction.Failure(Exception("Some tests failed"))
             } else {