Merge branch 'develop' into feature/fga/some_room_related_fixes

2023-04-27 17:25:12 +02:00 · 2023-04-27 17:25:12 +02:00 · f4c98aeef5
commit f4c98aeef5
parent 4b4c8c9e4d e2db1cf7a9
109 changed files with 1395 additions and 460 deletions
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/blockuser/BlockUserSection.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/blockuser/BlockUserSection.kt
@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.features.roomdetails.blockuser
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Block
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsEvents
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
+import io.element.android.features.roomdetails.impl.R
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
+import io.element.android.libraries.designsystem.components.preferences.PreferenceText
+import io.element.android.libraries.designsystem.theme.LocalColors
+
+@Composable
+internal fun BlockUserSection(state: RoomMemberDetailsState, modifier: Modifier = Modifier) {
+    PreferenceCategory(showDivider = false, modifier = modifier) {
+        if (state.isBlocked) {
+            PreferenceText(
+                title = stringResource(R.string.screen_dm_details_unblock_user),
+                icon = Icons.Outlined.Block,
+                onClick = { state.eventSink(RoomMemberDetailsEvents.UnblockUser(needsConfirmation = true)) },
+            )
+        } else {
+            PreferenceText(
+                title = stringResource(R.string.screen_dm_details_block_user),
+                icon = Icons.Outlined.Block,
+                tintColor = LocalColors.current.textActionCritical,
+                onClick = { state.eventSink(RoomMemberDetailsEvents.BlockUser(needsConfirmation = true)) },
+            )
+        }
+    }
+}
+
+@Composable
+internal fun BlockUserDialogs(state: RoomMemberDetailsState) {
+    when (state.displayConfirmationDialog) {
+        null -> Unit
+        RoomMemberDetailsState.ConfirmationDialog.Block -> {
+            BlockConfirmationDialog(
+                onBlockAction = { state.eventSink(RoomMemberDetailsEvents.BlockUser(needsConfirmation = false)) },
+                onDismiss = { state.eventSink(RoomMemberDetailsEvents.ClearConfirmationDialog) }
+            )
+        }
+        RoomMemberDetailsState.ConfirmationDialog.Unblock -> {
+            UnblockConfirmationDialog(
+                onUnblockAction = { state.eventSink(RoomMemberDetailsEvents.UnblockUser(needsConfirmation = false)) },
+                onDismiss = { state.eventSink(RoomMemberDetailsEvents.ClearConfirmationDialog) }
+            )
+        }
+    }
+}
+
+@Composable
+internal fun BlockConfirmationDialog(onBlockAction: () -> Unit, onDismiss: () -> Unit) {
+    ConfirmationDialog(
+        content = stringResource(R.string.screen_dm_details_block_alert_description),
+        submitText = stringResource(R.string.screen_dm_details_block_alert_action),
+        onSubmitClicked = onBlockAction,
+        onDismiss = onDismiss
+    )
+}
+
+@Composable
+internal fun UnblockConfirmationDialog(onUnblockAction: () -> Unit, onDismiss: () -> Unit) {
+    ConfirmationDialog(
+        content = stringResource(R.string.screen_dm_details_unblock_alert_description),
+        submitText = stringResource(R.string.screen_dm_details_unblock_alert_action),
+        onSubmitClicked = onUnblockAction,
+        onDismiss = onDismiss
+    )
+}
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
@ -63,7 +63,10 @@ class RoomDetailsNode @AssistedInject constructor(
                activityResultLauncher = null,
                chooserTitle = context.getString(R.string.screen_room_details_share_room_title),
                text = permalink,
+                noActivityFoundMessage = context.getString(AndroidUtilsR.string.error_no_compatible_app_found)
            )
+        }.onFailure {
+            Timber.e(it)
        }
    }

@ -86,12 +89,21 @@ class RoomDetailsNode @AssistedInject constructor(
    override fun View(modifier: Modifier) {
        val context = LocalContext.current
        val state = presenter.present()
+
+        fun onShareRoom() {
+            this.onShareRoom(context)
+        }
+
+        fun onShareMember(roomMember: RoomMember) {
+            this.onShareMember(context, roomMember)
+        }
+
        RoomDetailsView(
            state = state,
            modifier = modifier,
-            goBack = { navigateUp() },
-            onShareRoom = { onShareRoom(context) },
-            onShareMember = { onShareMember(context, it) },
+            goBack = this::navigateUp,
+            onShareRoom = ::onShareRoom,
+            onShareMember = ::onShareMember,
            openRoomMemberList = ::openRoomMemberList,
        )
    }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@ -25,6 +25,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@ -41,6 +42,7 @@ class RoomDetailsPresenter @Inject constructor(
    private val room: MatrixRoom,
    private val roomMembershipObserver: RoomMembershipObserver,
    private val coroutineDispatchers: CoroutineDispatchers,
+    private val roomMembersDetailsPresenterFactory: RoomMemberDetailsPresenter.Factory,
 ) : Presenter<RoomDetailsState> {

    @Composable
@ -57,6 +59,8 @@ class RoomDetailsPresenter @Inject constructor(
        val dmMemberState by room.getDmMemberFlow()
            .collectAsState(initial = null, context = coroutineDispatchers.computation)

+        val roomMemberDetailsPresenter = roomMemberDetailsPresenter(dmMemberState)
+
        val roomType = getRoomType(dmMemberState)

        fun handleEvents(event: RoomDetailsEvent) {
@ -74,6 +78,8 @@ class RoomDetailsPresenter @Inject constructor(
            }
        }

+        val roomMemberDetailsState = roomMemberDetailsPresenter?.present()
+
        return RoomDetailsState(
            roomId = room.roomId.value,
            roomName = room.name ?: room.displayName,
@ -85,10 +91,18 @@ class RoomDetailsPresenter @Inject constructor(
            displayLeaveRoomWarning = leaveRoomWarning.value,
            error = error.value,
            roomType = roomType.value,
+            roomMemberDetailsState = roomMemberDetailsState,
            eventSink = ::handleEvents,
        )
    }

+    @Composable
+    private fun roomMemberDetailsPresenter(dmMemberState: RoomMember?) = remember(dmMemberState) {
+        dmMemberState?.let { roomMember ->
+            roomMembersDetailsPresenterFactory.create(roomMember)
+        }
+    }
+
    @Composable
    private fun getRoomType(dmMember: RoomMember?): State<RoomDetailsType> = remember(dmMember) {
        derivedStateOf {
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@ -16,10 +16,8 @@

 package io.element.android.features.roomdetails.impl

+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
 import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.architecture.isLoading
-
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember

 data class RoomDetailsState(
@ -33,6 +31,7 @@ data class RoomDetailsState(
    val displayLeaveRoomWarning: LeaveRoomWarning?,
    val error: RoomDetailsError?,
    val roomType: RoomDetailsType,
+    val roomMemberDetailsState: RoomMemberDetailsState?,
    val eventSink: (RoomDetailsEvent) -> Unit
 )

--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@ -71,5 +71,6 @@ fun aRoomDetailsState() = RoomDetailsState(
    displayLeaveRoomWarning = null,
    error = null,
    roomType = RoomDetailsType.Room,
+    roomMemberDetailsState = null,
    eventSink = {}
 )
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@ -42,7 +42,8 @@ import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
-import io.element.android.features.roomdetails.impl.members.details.BlockSection
+import io.element.android.features.roomdetails.blockuser.BlockUserDialogs
+import io.element.android.features.roomdetails.blockuser.BlockUserSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberHeaderSection
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberShareSection
 import io.element.android.libraries.architecture.Async
@ -135,10 +136,11 @@ fun RoomDetailsView(
                    })
                }
                is RoomDetailsType.Dm -> {
-                    BlockSection(
-                        isBlocked = state.roomType.roomMember.isIgnored,
-                        onToggleBlock = { /*TODO*/ }
-                    )
+                    if (state.roomMemberDetailsState != null) {
+                        val roomMemberState = state.roomMemberDetailsState
+                        BlockUserSection(roomMemberState)
+                        BlockUserDialogs(roomMemberState)
+                    }
                }
            }

--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModules.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModules.kt
@ -20,7 +20,6 @@ import com.squareup.anvil.annotations.ContributesTo
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
-import io.element.android.features.roomdetails.impl.RoomDetailsPresenter
 import io.element.android.features.roomdetails.impl.members.RoomUserListDataSource
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
 import io.element.android.features.userlist.api.UserListDataSource
@ -28,7 +27,6 @@ import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import javax.inject.Named

@Module
@ -46,11 +44,12 @@ object RoomMemberProvidesModule {

    @Provides
    fun provideRoomMemberDetailsPresenterFactory(
+        matrixClient: MatrixClient,
        room: MatrixRoom,
    ): RoomMemberDetailsPresenter.Factory {
        return object : RoomMemberDetailsPresenter.Factory {
            override fun create(roomMember: RoomMember): RoomMemberDetailsPresenter {
-                return RoomMemberDetailsPresenter(room, roomMember)
+                return RoomMemberDetailsPresenter(matrixClient.sessionId, room, roomMember)
            }
        }
    }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListNode.kt
@ -26,14 +26,12 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember

@ContributesNode(RoomScope::class)
 class RoomMemberListNode @AssistedInject constructor(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    private val room: MatrixRoom,
    private val presenter: RoomMemberListPresenter,
 ) : Node(buildContext, plugins = plugins) {

--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomUserListDataSource.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomUserListDataSource.kt
@ -28,8 +28,6 @@ import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import kotlinx.coroutines.flow.dropWhile
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.skip
-import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.withContext
 import javax.inject.Inject

@ -40,7 +38,7 @@ class RoomUserListDataSource @Inject constructor(

    override suspend fun search(query: String): List<MatrixUser> = withContext(coroutineDispatchers.io) {
        val roomMembers = room.membersStateFlow
-            .dropWhile { it !is MatrixRoomMembersState.Ready}
+            .dropWhile { it !is MatrixRoomMembersState.Ready }
            .first()
            .roomMembers()
        val filteredMembers = if (query.isBlank()) {
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsEvents.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsEvents.kt
@ -16,4 +16,8 @@

 package io.element.android.features.roomdetails.impl.members.details

-sealed interface RoomMemberDetailsEvents
+sealed interface RoomMemberDetailsEvents {
+    data class BlockUser(val needsConfirmation: Boolean = false) : RoomMemberDetailsEvents
+    data class UnblockUser(val needsConfirmation: Boolean = false) : RoomMemberDetailsEvents
+    object ClearConfirmationDialog : RoomMemberDetailsEvents
+}
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
@ -30,7 +30,6 @@ import io.element.android.libraries.androidutils.system.startSharePlainTextInten
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.room.RoomMember
 import timber.log.Timber
@ -52,7 +51,6 @@ class RoomMemberDetailsNode @AssistedInject constructor(

    @Composable
    override fun View(modifier: Modifier) {
-
        val context = LocalContext.current

        fun onShareUser() {
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
@ -17,15 +17,26 @@
 package io.element.android.features.roomdetails.impl.members.details

 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState.ConfirmationDialog
 import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch

 class RoomMemberDetailsPresenter @AssistedInject constructor(
+    private val currentUserSessionId: SessionId,
    private val room: MatrixRoom,
    @Assisted private val roomMember: RoomMember,
 ) : Presenter<RoomMemberDetailsState> {
@ -36,11 +47,31 @@ class RoomMemberDetailsPresenter @AssistedInject constructor(

    @Composable
    override fun present(): RoomMemberDetailsState {
+        val coroutineScope = rememberCoroutineScope()
+        var confirmationDialog by remember { mutableStateOf<ConfirmationDialog?>(null) }
+        val isBlocked = remember { mutableStateOf(roomMember.isIgnored) }

-//        fun handleEvents(event: RoomMemberDetailsEvents) {
-//            when (event) {
-//            }
-//        }
+        fun handleEvents(event: RoomMemberDetailsEvents) {
+            when (event) {
+                is RoomMemberDetailsEvents.BlockUser -> {
+                    if (event.needsConfirmation) {
+                        confirmationDialog = ConfirmationDialog.Block
+                    } else {
+                        confirmationDialog = null
+                        coroutineScope.blockUser(roomMember.userId, isBlocked)
+                    }
+                }
+                is RoomMemberDetailsEvents.UnblockUser -> {
+                    if (event.needsConfirmation) {
+                        confirmationDialog = ConfirmationDialog.Unblock
+                    } else {
+                        confirmationDialog = null
+                        coroutineScope.unblockUser(roomMember.userId, isBlocked)
+                    }
+                }
+                RoomMemberDetailsEvents.ClearConfirmationDialog -> confirmationDialog = null
+            }
+        }

        val userName by produceState(initialValue = roomMember.displayName) {
            room.userDisplayName(roomMember.userId).onSuccess { displayName ->
@ -58,8 +89,18 @@ class RoomMemberDetailsPresenter @AssistedInject constructor(
            userId = roomMember.userId.value,
            userName = userName,
            avatarUrl = userAvatar,
-            isBlocked = roomMember.isIgnored,
-//            eventSink = ::handleEvents
+            isBlocked = isBlocked.value,
+            displayConfirmationDialog = confirmationDialog,
+            isCurrentUser = roomMember.userId == currentUserSessionId,
+            eventSink = ::handleEvents
        )
    }
+
+    private fun CoroutineScope.blockUser(userId: UserId, isBlockedState: MutableState<Boolean>) = launch {
+        room.ignoreUser(userId).onSuccess { isBlockedState.value = true }
+    }
+
+    private fun CoroutineScope.unblockUser(userId: UserId, isBlockedState: MutableState<Boolean>) = launch {
+        room.unignoreUser(userId).onSuccess { isBlockedState.value = false }
+    }
 }
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsState.kt
@ -21,5 +21,11 @@ data class RoomMemberDetailsState(
    val userName: String?,
    val avatarUrl: String?,
    val isBlocked: Boolean,
-//    val eventSink: (RoomMemberDetailsEvents) -> Unit
-)
+    val displayConfirmationDialog: ConfirmationDialog? = null,
+    val isCurrentUser: Boolean,
+    val eventSink: (RoomMemberDetailsEvents) -> Unit
+) {
+    enum class ConfirmationDialog {
+        Block, Unblock
+    }
+}
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsStateProvider.kt
@ -24,6 +24,8 @@ open class RoomMemberDetailsStateProvider : PreviewParameterProvider<RoomMemberD
            aRoomMemberDetailsState(),
            aRoomMemberDetailsState().copy(userName = null),
            aRoomMemberDetailsState().copy(isBlocked = true),
+            aRoomMemberDetailsState().copy(displayConfirmationDialog = RoomMemberDetailsState.ConfirmationDialog.Block),
+            aRoomMemberDetailsState().copy(displayConfirmationDialog = RoomMemberDetailsState.ConfirmationDialog.Unblock),
            // Add other states here
        )
 }
@ -33,5 +35,6 @@ fun aRoomMemberDetailsState() = RoomMemberDetailsState(
    userName = "Daniel",
    avatarUrl = null,
    isBlocked = false,
-//    eventSink = {},
+    isCurrentUser = false,
+    eventSink = {},
 )
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsView.kt
@ -39,12 +39,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.features.roomdetails.blockuser.BlockUserDialogs
+import io.element.android.features.roomdetails.blockuser.BlockUserSection
 import io.element.android.features.roomdetails.impl.R
 import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.preferences.PreferenceCategory
 import io.element.android.libraries.designsystem.components.preferences.PreferenceText
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
@ -86,9 +89,10 @@ fun RoomMemberDetailsView(
                // TODO implement send DM
            })

-            BlockSection(isBlocked = state.isBlocked, onToggleBlock = {
-                // TODO implement block & unblock
-            })
+            if (!state.isCurrentUser) {
+                BlockUserSection(state)
+                BlockUserDialogs(state)
+            }
        }
    }
 }
@ -139,24 +143,6 @@ internal fun SendMessageSection(onSendMessage: () -> Unit, modifier: Modifier =
    }
 }

-@Composable
-internal fun BlockSection(isBlocked: Boolean, onToggleBlock: () -> Unit, modifier: Modifier = Modifier) {
-    PreferenceCategory(showDivider = false, modifier = modifier) {
-        if (isBlocked) {
-            PreferenceText(
-                title = stringResource(R.string.screen_dm_details_unblock_user),
-                icon = Icons.Outlined.Block,
-            )
-        } else {
-            PreferenceText(
-                title = stringResource(R.string.screen_dm_details_block_user),
-                icon = Icons.Outlined.Block,
-                tintColor = LocalColors.current.textActionCritical,
-            )
-        }
-    }
-}
-
@Preview
@Composable
 fun RoomMemberDetailsViewLightPreview(@PreviewParameter(RoomMemberDetailsStateProvider::class) state: RoomMemberDetailsState) =
--- a/features/roomdetails/impl/src/main/res/values-de/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-de/translations.xml
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"1 Person"</item>
+    <item quantity="other">"%1$d Personen"</item>
+  </plurals>
+  <string name="screen_room_details_share_room_title">"Raum teilen"</string>
+  <string name="screen_dm_details_block_alert_action">"Blockieren"</string>
+  <string name="screen_dm_details_block_user">"Nutzer blockieren"</string>
+  <string name="screen_dm_details_unblock_alert_action">"Blockierung aufheben"</string>
+  <string name="screen_dm_details_unblock_user">"Nutzer entblockieren"</string>
+  <string name="screen_room_details_leave_room_title">"Raum verlassen"</string>
+  <string name="screen_room_details_security_title">"Sicherheit"</string>
+  <string name="screen_room_details_topic_title">"Thema"</string>
+</resources>
--- a/features/roomdetails/impl/src/main/res/values-es/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-es/translations.xml
@ -4,18 +4,18 @@
    <item quantity="one">"Una persona"</item>
    <item quantity="other">"%1$d personas"</item>
  </plurals>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Los mensajes están protegidos con \"candados\". Sólo tú y los destinatarios tenéis las llaves únicas para abrirlos."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Cifrado de mensajes activado"</string>
+  <string name="screen_room_details_invite_people_title">"Invitar a otras personas"</string>
+  <string name="screen_room_details_share_room_title">"Compartir sala"</string>
  <string name="screen_dm_details_block_alert_action">"Bloquear"</string>
-  <string name="screen_dm_details_block_alert_description">"Los usuarios bloqueados no podrán enviarte mensajes y se ocultarán todos sus mensajes. Puedes revertir esta acción en cualquier momento."</string>
+  <string name="screen_dm_details_block_alert_description">"Los usuarios bloqueados no podrán enviarte mensajes y se ocultarán todos sus mensajes. Puede revertir esta acción en cualquier momento."</string>
  <string name="screen_dm_details_block_user">"Bloquear usuario"</string>
  <string name="screen_dm_details_unblock_alert_action">"Desbloquear"</string>
  <string name="screen_dm_details_unblock_alert_description">"Al desbloquear al usuario, podrás volver a ver todos sus mensajes."</string>
  <string name="screen_dm_details_unblock_user">"Desbloquear usuario"</string>
-  <string name="screen_room_details_encryption_enabled_subtitle">"Los mensajes están protegidos con \"candados\". Sólo tú y los destinatarios tenéis las llaves únicas para abrirlos."</string>
-  <string name="screen_room_details_encryption_enabled_title">"Cifrado de mensajes activado"</string>
-  <string name="screen_room_details_invite_people_title">"Invitar a otras personas"</string>
  <string name="screen_room_details_leave_room_title">"Salir de la sala"</string>
  <string name="screen_room_details_people_title">"Personas"</string>
  <string name="screen_room_details_security_title">"Seguridad"</string>
-  <string name="screen_room_details_share_room_title">"Compartir sala"</string>
  <string name="screen_room_details_topic_title">"Tema"</string>
 </resources>
--- a/features/roomdetails/impl/src/main/res/values-it/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-it/translations.xml
@ -4,18 +4,18 @@
    <item quantity="one">"1 persona"</item>
    <item quantity="other">"%1$d persone"</item>
  </plurals>
+  <string name="screen_room_details_encryption_enabled_subtitle">"I messaggi sono protetti da lucchetti. Solo tu e i destinatari avete le chiavi univoche per sbloccarli."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Crittografia messaggi abilitata"</string>
+  <string name="screen_room_details_invite_people_title">"Invita persone"</string>
+  <string name="screen_room_details_share_room_title">"Condividi stanza"</string>
  <string name="screen_dm_details_block_alert_action">"Blocca"</string>
-  <string name="screen_dm_details_block_alert_description">"Gli utenti bloccati non saranno in grado di inviarti messaggi e tutti i loro messaggi saranno nascosti. Potrai annullare questa azione in qualsiasi momento."</string>
+  <string name="screen_dm_details_block_alert_description">"Gli utenti bloccati non saranno in grado di inviarti nuovi messaggi e tutti quelli già esistenti saranno nascosti. Potrai annullare questa azione in qualsiasi momento."</string>
  <string name="screen_dm_details_block_user">"Blocca utente"</string>
  <string name="screen_dm_details_unblock_alert_action">"Sblocca"</string>
  <string name="screen_dm_details_unblock_alert_description">"Dopo aver sbloccato l\'utente, potrai vedere nuovamente tutti i suoi messaggi."</string>
  <string name="screen_dm_details_unblock_user">"Sblocca utente"</string>
-  <string name="screen_room_details_encryption_enabled_subtitle">"I messaggi sono protetti da lucchetti. Solo tu e i destinatari avete le chiavi univoche per sbloccarli."</string>
-  <string name="screen_room_details_encryption_enabled_title">"Crittografia messaggi abilitata"</string>
-  <string name="screen_room_details_invite_people_title">"Invita persone"</string>
  <string name="screen_room_details_leave_room_title">"Esci dalla stanza"</string>
  <string name="screen_room_details_people_title">"Persone"</string>
  <string name="screen_room_details_security_title">"Sicurezza"</string>
-  <string name="screen_room_details_share_room_title">"Condividi stanza"</string>
  <string name="screen_room_details_topic_title">"Oggetto"</string>
 </resources>
--- a/features/roomdetails/impl/src/main/res/values-ro/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ro/translations.xml
@ -5,18 +5,18 @@
    <item quantity="few"></item>
    <item quantity="other">"%1$d persoane"</item>
  </plurals>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Mesajele sunt securizate cu încuietori. Doar dumneavoastră și destinatarii aveți cheile unice pentru a le debloca."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Criptarea mesajelor este activată"</string>
+  <string name="screen_room_details_invite_people_title">"Invitați persoane"</string>
+  <string name="screen_room_details_share_room_title">"Partajați camera"</string>
  <string name="screen_dm_details_block_alert_action">"Blocați"</string>
  <string name="screen_dm_details_block_alert_description">"Utilizatorii blocați nu vă vor putea trimite mesaje și toate mesajele lor vor fi ascunse. Puteți anula această acțiune oricând."</string>
  <string name="screen_dm_details_block_user">"Blocați utilizatorul"</string>
  <string name="screen_dm_details_unblock_alert_action">"Deblocați"</string>
  <string name="screen_dm_details_unblock_alert_description">"La deblocarea utilizatorului, veți putea vedea din nou toate mesajele de la acesta."</string>
  <string name="screen_dm_details_unblock_user">"Deblocați utilizatorul"</string>
-  <string name="screen_room_details_encryption_enabled_subtitle">"Mesajele sunt securizate cu încuietori. Doar dumneavoastră și destinatarii aveți cheile unice pentru a le debloca."</string>
-  <string name="screen_room_details_encryption_enabled_title">"Criptarea mesajelor este activată"</string>
-  <string name="screen_room_details_invite_people_title">"Invitați persoane"</string>
  <string name="screen_room_details_leave_room_title">"Părăsiți camera"</string>
  <string name="screen_room_details_people_title">"Persoane"</string>
  <string name="screen_room_details_security_title">"Securitate"</string>
-  <string name="screen_room_details_share_room_title">"Partajați camera"</string>
  <string name="screen_room_details_topic_title">"Subiect"</string>
 </resources>
--- a/features/roomdetails/impl/src/main/res/values/localazy.xml
+++ b/features/roomdetails/impl/src/main/res/values/localazy.xml
@ -4,18 +4,18 @@
    <item quantity="one">"1 person"</item>
    <item quantity="other">"%1$d people"</item>
  </plurals>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Messages are secured with locks. Only you and the recipients have the unique keys to unlock them."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Message encryption enabled"</string>
+  <string name="screen_room_details_invite_people_title">"Invite people"</string>
+  <string name="screen_room_details_share_room_title">"Share room"</string>
  <string name="screen_dm_details_block_alert_action">"Block"</string>
  <string name="screen_dm_details_block_alert_description">"Blocked users will not be able to send you messages and all message by them will be hidden. You can reverse this action anytime."</string>
  <string name="screen_dm_details_block_user">"Block user"</string>
  <string name="screen_dm_details_unblock_alert_action">"Unblock"</string>
  <string name="screen_dm_details_unblock_alert_description">"On unblocking the user, you will be able to see all messages by them again."</string>
  <string name="screen_dm_details_unblock_user">"Unblock user"</string>
-  <string name="screen_room_details_encryption_enabled_subtitle">"Messages are secured with locks. Only you and the recipients have the unique keys to unlock them."</string>
-  <string name="screen_room_details_encryption_enabled_title">"Message encryption enabled"</string>
-  <string name="screen_room_details_invite_people_title">"Invite people"</string>
  <string name="screen_room_details_leave_room_title">"Leave room"</string>
  <string name="screen_room_details_people_title">"People"</string>
  <string name="screen_room_details_security_title">"Security"</string>
-  <string name="screen_room_details_share_room_title">"Share room"</string>
  <string name="screen_room_details_topic_title">"Topic"</string>
 </resources>
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/RoomDetailsPresenterTests.kt
@ -23,9 +23,12 @@ import com.google.common.truth.Truth
 import io.element.android.features.roomdetails.impl.LeaveRoomWarning
 import io.element.android.features.roomdetails.impl.RoomDetailsEvent
 import io.element.android.features.roomdetails.impl.RoomDetailsPresenter
+import io.element.android.features.roomdetails.impl.RoomDetailsType
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
 import io.element.android.libraries.architecture.Async
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
@ -33,7 +36,9 @@ import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
+import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@ -49,10 +54,19 @@ class RoomDetailsPresenterTests {
    private val roomMembershipObserver = RoomMembershipObserver()
    private val testCoroutineDispatchers = testCoroutineDispatchers()

+    private fun aRoomDetailsPresenter(room: MatrixRoom): RoomDetailsPresenter {
+        val roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory {
+            override fun create(roomMember: RoomMember): RoomMemberDetailsPresenter {
+                return RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
+            }
+        }
+        return RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers, roomMemberDetailsPresenterFactory)
+    }
+
    @Test
    fun `present - initial state is created from room info`() = runTest {
        val room = aMatrixRoom()
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -71,7 +85,7 @@ class RoomDetailsPresenterTests {
    @Test
    fun `present - room member count is calculated asynchronously`() = runTest {
        val room = aMatrixRoom()
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -86,7 +100,7 @@ class RoomDetailsPresenterTests {
    @Test
    fun `present - initial state with no room name`() = runTest {
        val room = aMatrixRoom(name = null)
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -97,12 +111,41 @@ class RoomDetailsPresenterTests {
        }
    }

+    @Test
+    fun `present - initial state with DM member sets custom DM roomType`() = runTest {
+        val room = aMatrixRoom(
+            isEncrypted = true,
+            isPublic = false,
+            name = null
+        ).apply {
+            val roomMembers = listOf(
+                aRoomMember(A_SESSION_ID),
+                aRoomMember(A_USER_ID_2),
+            )
+            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+        }
+        val presenter = aRoomDetailsPresenter(room)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            // It's not configured yet in the first iteration
+            Truth.assertThat(initialState.roomType).isEqualTo(RoomDetailsType.Room)
+
+            // Once updated, the RoomDetailsType becomes 'Dm'
+            val updatedState = awaitItem()
+            Truth.assertThat(updatedState.roomType).isEqualTo(RoomDetailsType.Dm(aRoomMember()))
+
+            cancelAndIgnoreRemainingEvents()
+        }
+    }
+
    @Test
    fun `present - can handle error while fetching member count`() = runTest {
        val room = aMatrixRoom(name = null).apply {
            givenRoomMembersState(MatrixRoomMembersState.Error(Throwable()))
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -116,7 +159,7 @@ class RoomDetailsPresenterTests {
        val room = aMatrixRoom(isPublic = false).apply {
            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -132,7 +175,7 @@ class RoomDetailsPresenterTests {
        val room = aMatrixRoom().apply {
            givenRoomMembersState(MatrixRoomMembersState.Ready(listOf(aRoomMember())))
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -148,7 +191,7 @@ class RoomDetailsPresenterTests {
        val room = aMatrixRoom().apply {
            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -164,7 +207,7 @@ class RoomDetailsPresenterTests {
        val room = aMatrixRoom().apply {
            givenRoomMembersState(MatrixRoomMembersState.Ready(emptyList()))
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -185,7 +228,7 @@ class RoomDetailsPresenterTests {
        val room = aMatrixRoom().apply {
            givenLeaveRoomError(Throwable())
        }
-        val presenter = RoomDetailsPresenter(room, roomMembershipObserver, testCoroutineDispatchers)
+        val presenter = aRoomDetailsPresenter(room)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/details/RoomMemberDetailsPresenterTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/members/details/RoomMemberDetailsPresenterTests.kt
@ -22,7 +22,10 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth
 import io.element.android.features.roomdetails.aMatrixRoom
 import io.element.android.features.roomdetails.aRoomMember
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsEvents
 import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsPresenter
+import io.element.android.features.roomdetails.impl.members.details.RoomMemberDetailsState
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@ -37,7 +40,7 @@ class RoomMemberDetailsPresenterTests {
            givenUserAvatarUrlResult(Result.success("A custom avatar"))
        }
        val roomMember = aRoomMember(displayName = "Alice")
-        val presenter = RoomMemberDetailsPresenter(room, roomMember)
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -60,7 +63,7 @@ class RoomMemberDetailsPresenterTests {
            givenUserAvatarUrlResult(Result.failure(Throwable()))
        }
        val roomMember = aRoomMember(displayName = "Alice")
-        val presenter = RoomMemberDetailsPresenter(room, roomMember)
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -79,7 +82,7 @@ class RoomMemberDetailsPresenterTests {
            givenUserAvatarUrlResult(Result.success(null))
        }
        val roomMember = aRoomMember(displayName = "Alice")
-        val presenter = RoomMemberDetailsPresenter(room, roomMember)
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
        moleculeFlow(RecompositionClock.Immediate) {
            presenter.present()
        }.test {
@ -90,4 +93,63 @@ class RoomMemberDetailsPresenterTests {
            ensureAllEventsConsumed()
        }
    }
+
+    @Test
+    fun `present - BlockUser needing confirmation displays confirmation dialog`() = runTest {
+        val room = aMatrixRoom()
+        val roomMember = aRoomMember()
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink(RoomMemberDetailsEvents.BlockUser(needsConfirmation = true))
+
+            val dialogState = awaitItem()
+            Truth.assertThat(dialogState.displayConfirmationDialog).isEqualTo(RoomMemberDetailsState.ConfirmationDialog.Block)
+
+            dialogState.eventSink(RoomMemberDetailsEvents.ClearConfirmationDialog)
+            Truth.assertThat(awaitItem().displayConfirmationDialog).isNull()
+
+            ensureAllEventsConsumed()
+        }
+    }
+
+    @Test
+    fun `present - BlockUser and UnblockUser without confirmation change the 'blocked' state`() = runTest {
+        val room = aMatrixRoom()
+        val roomMember = aRoomMember()
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink(RoomMemberDetailsEvents.BlockUser(needsConfirmation = false))
+            Truth.assertThat(awaitItem().isBlocked).isTrue()
+
+            initialState.eventSink(RoomMemberDetailsEvents.UnblockUser(needsConfirmation = false))
+            Truth.assertThat(awaitItem().isBlocked).isFalse()
+        }
+    }
+
+    @Test
+    fun `present - UnblockUser needing confirmation displays confirmation dialog`() = runTest {
+        val room = aMatrixRoom()
+        val roomMember = aRoomMember()
+        val presenter = RoomMemberDetailsPresenter(A_SESSION_ID, room, roomMember)
+        moleculeFlow(RecompositionClock.Immediate) {
+            presenter.present()
+        }.test {
+            val initialState = awaitItem()
+            initialState.eventSink(RoomMemberDetailsEvents.UnblockUser(needsConfirmation = true))
+
+            val dialogState = awaitItem()
+            Truth.assertThat(dialogState.displayConfirmationDialog).isEqualTo(RoomMemberDetailsState.ConfirmationDialog.Unblock)
+
+            dialogState.eventSink(RoomMemberDetailsEvents.ClearConfirmationDialog)
+            Truth.assertThat(awaitItem().displayConfirmationDialog).isNull()
+
+            ensureAllEventsConsumed()
+        }
+    }
 }