From c3407250ebe75c17b13d88b6c6af2fb1880a619d Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@matrix.org>
Date: Tue, 4 Mar 2025 14:51:16 +0100
Subject: [PATCH] change(invites) : fix compilation after last changes

---
 .../response/AcceptDeclineInvitePresenter.kt  |  5 ++---
 .../joinroom/impl/JoinRoomPresenterTest.kt    |  4 ++--
 .../joinroom/impl/JoinRoomViewTest.kt         | 19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
index af9058e03e..9f4a7ee848 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
@@ -121,9 +121,8 @@ class AcceptDeclineInvitePresenter @Inject constructor(
             client.getPendingRoom(inviteData.roomId)?.use {
                 it.leave().getOrThrow()
             }
-            val senderId = inviteData.senderId
-            if (blockUser && senderId != null) {
-                client.ignoreUser(senderId).getOrThrow()
+            if (blockUser) {
+                client.ignoreUser(inviteData.senderId).getOrThrow()
             }
             notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, inviteData.roomId)
             inviteData.roomId
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
index 5febed1b70..1c146285c2 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
@@ -167,9 +167,9 @@ class JoinRoomPresenterTest {
 
             awaitItem().also { state ->
                 state.eventSink(JoinRoomEvents.AcceptInvite)
-                state.eventSink(JoinRoomEvents.DeclineInvite)
+                state.eventSink(JoinRoomEvents.DeclineInvite(false))
 
-                val inviteData = state.contentState.toInviteData()!!
+                val inviteData = state.contentState.toInviteData()
 
                 assert(eventSinkRecorder)
                     .isCalledExactly(2)
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
index b654bc7c4b..e9ac23d76e 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
@@ -139,7 +139,7 @@ class JoinRoomViewTest {
     }
 
     @Test
-    fun `clicking on Accept invitation IsInvited room emits the expected Event`() {
+    fun `clicking on Accept when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
         rule.setJoinRoomView(
             aJoinRoomState(
@@ -152,7 +152,7 @@ class JoinRoomViewTest {
     }
 
     @Test
-    fun `clicking on Decline invitation on IsInvited room emits the expected Event`() {
+    fun `clicking on Decline when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
         rule.setJoinRoomView(
             aJoinRoomState(
@@ -161,7 +161,20 @@ class JoinRoomViewTest {
             ),
         )
         rule.clickOn(CommonStrings.action_decline)
-        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite)
+        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(false))
+    }
+
+    @Test
+    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        rule.setJoinRoomView(
+            aJoinRoomState(
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
+        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(true))
     }
 
     @Test