From 0da8b5a58dff027ece49d43da8f1322133bd6b53 Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Wed, 5 Apr 2023 17:33:52 +0200
Subject: [PATCH] Remove RetryStartDM action

---
 .../features/createroom/impl/root/CreateRoomRootEvents.kt   | 1 -
 .../createroom/impl/root/CreateRoomRootPresenter.kt         | 4 ----
 .../features/createroom/impl/root/CreateRoomRootView.kt     | 6 +++++-
 .../createroom/impl/root/CreateRoomRootPresenterTests.kt    | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt
index de9810f34a..87f35e4b1b 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt
@@ -21,6 +21,5 @@ import io.element.android.libraries.matrix.ui.model.MatrixUser
 sealed interface CreateRoomRootEvents {
     object InvitePeople : CreateRoomRootEvents
     data class StartDM(val matrixUser: MatrixUser) : CreateRoomRootEvents
-    object RetryStartDM : CreateRoomRootEvents
     object CancelStartDM : CreateRoomRootEvents
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenter.kt
index 43ca377771..89932b0cdb 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenter.kt
@@ -69,10 +69,6 @@ class CreateRoomRootPresenter @Inject constructor(
         fun handleEvents(event: CreateRoomRootEvents) {
             when (event) {
                 is CreateRoomRootEvents.StartDM -> startDm(event.matrixUser)
-                CreateRoomRootEvents.RetryStartDM -> {
-                    startDmAction.value = Async.Uninitialized
-                    userListState.selectedUsers.firstOrNull()?.let { startDm(it) }
-                }
                 CreateRoomRootEvents.CancelStartDM -> startDmAction.value = Async.Uninitialized
                 CreateRoomRootEvents.InvitePeople -> Unit // Todo Handle invite people action
             }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index 146c447996..61b8b8738e 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -112,7 +112,11 @@ fun CreateRoomRootView(
             RetryDialog(
                 content = stringResource(id = StringR.string.screen_start_chat_error_starting_chat),
                 onDismiss = { state.eventSink(CreateRoomRootEvents.CancelStartDM) },
-                onRetry = { state.eventSink(CreateRoomRootEvents.RetryStartDM) },
+                onRetry = {
+                    state.userListState.selectedUsers.firstOrNull()?.let {
+                        state.eventSink(CreateRoomRootEvents.StartDM(it))
+                    }
+                },
             )
         }
         else -> Unit
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt
index f1467485db..cf399fdbd3 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTests.kt
@@ -145,7 +145,7 @@ class CreateRoomRootPresenterTests {
 
             // Retry with success
             fakeMatrixClient.givenCreateDmError(null)
-            stateAfterSecondAttempt.eventSink(CreateRoomRootEvents.RetryStartDM)
+            stateAfterSecondAttempt.eventSink(CreateRoomRootEvents.StartDM(matrixUser))
             assertThat(awaitItem().startDmAction).isInstanceOf(Async.Uninitialized::class.java)
             assertThat(awaitItem().startDmAction).isInstanceOf(Async.Loading::class.java)
             val stateAfterRetryStartDM = awaitItem()