Create spaces (#5982)

* Allow creating a space with `CreateRoomParameters` * Add 'Create space' menu item in the spaces home screen. Also, imports new strings related to spaces. * Link the 'Create space' button with the screen to create the space * Unify room access and visibility for `ConfigureRoom`, use the updated design * Fix `EditRoomDetails` avatar size (68dp) * Replace `EditableAvatarView` and `UnsavedAvatar` copmonents with `AvatarPickerView` * `AvatarDataFetcherFactory`: Make sure we use a fallback image fetcher when the URL is not an MXC one (a local one, i.e.). This removes the previous need for a separate `UnsavedAvatarView` * Use `AvatarPickerView` in all the screens where `EditableAvatarView` was used * Improve naming and previews * Update strings, remove unused ones for `RoomAccessItem` * Make `isSpace` part of the `CreateRoomConfig` * Ensure the content fits in the screenshots for `AvatarPickerSizesPreview` * Add `AvatarDataFetcherFactoryTest` * Add new feature flag for creating spaces * Fix ripple being too large for the `Pick` state * Tweak margins and section titles a bit * Add preview for `HomeTopBar` with the spaces case * Update screenshots --------- Co-authored-by: ElementBot <android@element.io>
2026-01-13 14:35:49 +01:00
parent a234eb3e29
commit 03d14087e6
150 changed files with 1097 additions and 778 deletions
--- a/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
+++ b/features/createroom/api/src/main/kotlin/io/element/android/features/createroom/api/CreateRoomEntryPoint.kt
@@ -16,6 +16,7 @@ import io.element.android.libraries.matrix.api.core.RoomId

 interface CreateRoomEntryPoint : FeatureEntryPoint {
    fun createNode(
+        isSpace: Boolean,
        parentNode: Node,
        buildContext: BuildContext,
        callback: Callback,
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomFlowNode.kt
@@ -24,6 +24,7 @@ import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
 import io.element.android.features.createroom.impl.configureroom.ConfigureRoomNode
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
@@ -37,23 +38,29 @@ class CreateRoomFlowNode(
    @Assisted plugins: List<Plugin>,
 ) : BaseFlowNode<CreateRoomFlowNode.NavTarget>(
    backstack = BackStack(
-        initialElement = NavTarget.ConfigureRoom,
+        initialElement = NavTarget.ConfigureRoom(isSpace = plugins.filterIsInstance<Inputs>().first().isSpace),
        savedStateMap = buildContext.savedStateMap,
    ),
    buildContext = buildContext,
    plugins = plugins
 ) {
+    @Parcelize
+    data class Inputs(
+        val isSpace: Boolean
+    ) : NodeInputs, Parcelable
+
    private val callback: CreateRoomEntryPoint.Callback = callback()

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
-            NavTarget.ConfigureRoom -> {
+            is NavTarget.ConfigureRoom -> {
+                val inputs = ConfigureRoomNode.Inputs(isSpace = navTarget.isSpace)
                val callback = object : ConfigureRoomNode.Callback {
                    override fun onCreateRoomSuccess(roomId: RoomId) {
                        backstack.replace(NavTarget.AddPeople(roomId))
                    }
                }
-                createNode<ConfigureRoomNode>(buildContext, plugins = listOf(callback))
+                createNode<ConfigureRoomNode>(buildContext, plugins = listOf(inputs, callback))
            }
            is NavTarget.AddPeople -> {
                val inputs = AddPeopleNode.Inputs(navTarget.roomId)
@@ -74,7 +81,7 @@ class CreateRoomFlowNode(

    sealed interface NavTarget : Parcelable {
        @Parcelize
-        data object ConfigureRoom : NavTarget
+        data class ConfigureRoom(val isSpace: Boolean) : NavTarget

        @Parcelize
        data class AddPeople(val roomId: RoomId) : NavTarget
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPoint.kt
@@ -18,10 +18,12 @@ import io.element.android.libraries.di.SessionScope
@ContributesBinding(SessionScope::class)
 class DefaultCreateRoomEntryPoint : CreateRoomEntryPoint {
    override fun createNode(
+        isSpace: Boolean,
        parentNode: Node,
        buildContext: BuildContext,
        callback: CreateRoomEntryPoint.Callback,
    ): Node {
-        return parentNode.createNode<CreateRoomFlowNode>(buildContext, listOf(callback))
+        val inputs = CreateRoomFlowNode.Inputs(isSpace)
+        return parentNode.createNode<CreateRoomFlowNode>(buildContext, listOf(inputs, callback))
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
@@ -8,6 +8,7 @@

 package io.element.android.features.createroom.impl.configureroom

+import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.lifecycle.subscribe
@@ -18,23 +19,35 @@ import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.callback
+import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.parcelize.Parcelize

@ContributesNode(SessionScope::class)
@AssistedInject
 class ConfigureRoomNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    private val presenter: ConfigureRoomPresenter,
+    presenterFactory: ConfigureRoomPresenter.Factory,
    private val analyticsService: AnalyticsService,
 ) : Node(buildContext, plugins = plugins) {
    interface Callback : Plugin {
        fun onCreateRoomSuccess(roomId: RoomId)
    }

+    @Parcelize
+    data class Inputs(
+        val isSpace: Boolean,
+    ) : NodeInputs, Parcelable
+
+    private val inputs = inputs<Inputs>()
+
+    private val presenter = presenterFactory.create(inputs.isSpace)
+
    init {
        lifecycle.subscribe(
            onResume = {
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
@@ -19,7 +19,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.core.net.toUri
-import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.CreatedRoom
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
@@ -49,8 +51,9 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import kotlin.jvm.optionals.getOrDefault

-@Inject
+@AssistedInject
 class ConfigureRoomPresenter(
+    @Assisted private val isSpace: Boolean,
    private val dataStore: CreateRoomConfigStore,
    private val matrixClient: MatrixClient,
    private val mediaPickerProvider: PickerProvider,
@@ -61,13 +64,22 @@ class ConfigureRoomPresenter(
    private val roomAliasHelper: RoomAliasHelper,
    private val mediaOptimizationConfigProvider: MediaOptimizationConfigProvider,
 ) : Presenter<ConfigureRoomState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(isSpace: Boolean): ConfigureRoomPresenter
+    }
+
    private val cameraPermissionPresenter: PermissionsPresenter = permissionsPresenterFactory.create(android.Manifest.permission.CAMERA)
    private var pendingPermissionRequest = false

+    init {
+        dataStore.setIsSpace(isSpace)
+    }
+
    @Composable
    override fun present(): ConfigureRoomState {
        val cameraPermissionState = cameraPermissionPresenter.present()
-        val createRoomConfig by dataStore.getCreateRoomConfigFlow().collectAsState(CreateRoomConfig())
+        val createRoomConfig by dataStore.getCreateRoomConfigFlow().collectAsState()
        val homeserverName = remember { matrixClient.userIdServerName() }
        val isKnockFeatureEnabled by remember {
            featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
@@ -171,7 +183,8 @@ class ConfigureRoomPresenter(
                    preset = RoomPreset.PUBLIC_CHAT,
                    invite = config.invites.map { it.userId },
                    avatar = avatarUrl,
-                    roomAliasName = config.roomVisibility.roomAddress()
+                    roomAliasName = config.roomVisibility.roomAddress(),
+                    isSpace = isSpace,
                )
            } else {
                CreateRoomParameters(
@@ -184,6 +197,7 @@ class ConfigureRoomPresenter(
                    preset = RoomPreset.PRIVATE_CHAT,
                    invite = config.invites.map { it.userId },
                    avatar = avatarUrl,
+                    isSpace = isSpace,
                )
            }
            matrixClient.createRoom(params)
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt
@@ -78,6 +78,18 @@ open class ConfigureRoomStateProvider : PreviewParameterProvider<ConfigureRoomSt
                ),
                roomAddressValidity = RoomAddressValidity.Valid,
            ),
+            aConfigureRoomState(
+                config = CreateRoomConfig(
+                    isSpace = true,
+                    roomName = "Space 101",
+                    topic = "Space topic for this space when the text goes onto multiple lines and is really long, there shouldn’t be more than 3 lines",
+                    roomVisibility = RoomVisibilityState.Public(
+                        roomAddress = RoomAddress.AutoFilled("Space-101"),
+                        roomAccess = RoomAccess.Anyone,
+                    ),
+                ),
+                roomAddressValidity = RoomAddressValidity.Valid,
+            ),
        )
 }

--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -8,15 +8,16 @@

 package io.element.android.features.createroom.impl.configureroom

-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.foundation.text.KeyboardOptions
@@ -27,10 +28,9 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.clearAndSetSemantics
-import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
@@ -41,15 +41,18 @@ import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtom
 import io.element.android.libraries.designsystem.atomic.atoms.RoundedIconAtomSize
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.async.AsyncActionViewDefaults
+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.avatar.AvatarType
 import io.element.android.libraries.designsystem.components.button.BackButton
 import io.element.android.libraries.designsystem.components.list.ListItemContent
+import io.element.android.libraries.designsystem.icons.CompoundDrawables
 import io.element.android.libraries.designsystem.modifiers.clearFocusOnTap
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 import io.element.android.libraries.designsystem.preview.PreviewWithLargeHeight
 import io.element.android.libraries.designsystem.theme.components.ListItem
+import io.element.android.libraries.designsystem.theme.components.ListSectionHeader
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
@@ -57,10 +60,12 @@ import io.element.android.libraries.designsystem.theme.components.TextField
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.AvatarActionBottomSheet
-import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
+import io.element.android.libraries.matrix.ui.components.AvatarPickerState
+import io.element.android.libraries.matrix.ui.components.AvatarPickerView
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressField
 import io.element.android.libraries.permissions.api.PermissionsView
 import io.element.android.libraries.ui.strings.CommonStrings
+import kotlin.jvm.optionals.getOrNull

@Composable
 fun ConfigureRoomView(
@@ -69,6 +74,7 @@ fun ConfigureRoomView(
    onCreateRoomSuccess: (RoomId) -> Unit,
    modifier: Modifier = Modifier,
 ) {
+    val isSpace = state.config.isSpace
    val focusManager = LocalFocusManager.current
    val isAvatarActionsSheetVisible = remember { mutableStateOf(false) }

@@ -81,6 +87,7 @@ fun ConfigureRoomView(
        modifier = modifier.clearFocusOnTap(focusManager),
        topBar = {
            ConfigureRoomToolbar(
+                isSpace = isSpace,
                isNextActionEnabled = state.isValid,
                onBackClick = onBackClick,
                onNextClick = {
@@ -96,9 +103,10 @@ fun ConfigureRoomView(
                .imePadding()
                .verticalScroll(rememberScrollState())
                .consumeWindowInsets(padding),
-            verticalArrangement = Arrangement.spacedBy(24.dp),
+            verticalArrangement = Arrangement.spacedBy(16.dp),
        ) {
            RoomNameWithAvatar(
+                isSpace = isSpace,
                modifier = Modifier.padding(horizontal = 16.dp),
                avatarUri = state.config.avatarUri,
                roomName = state.config.roomName.orEmpty(),
@@ -110,37 +118,35 @@ fun ConfigureRoomView(
                topic = state.config.topic.orEmpty(),
                onTopicChange = { state.eventSink(ConfigureRoomEvents.TopicChanged(it)) },
            )
-            RoomVisibilityOptions(
+
+            RoomVisibilityAndAccessOptions(
                selected = when (state.config.roomVisibility) {
                    is RoomVisibilityState.Private -> RoomVisibilityItem.Private
-                    is RoomVisibilityState.Public -> RoomVisibilityItem.Public
+                    is RoomVisibilityState.Public -> when (state.config.roomVisibility.roomAccess) {
+                        RoomAccess.Knocking -> RoomVisibilityItem.AskToJoin
+                        RoomAccess.Anyone -> RoomVisibilityItem.Public
+                    }
                },
+                isKnockingEnabled = state.isKnockFeatureEnabled,
                onOptionClick = {
                    focusManager.clearFocus()
                    state.eventSink(ConfigureRoomEvents.RoomVisibilityChanged(it))
                },
            )
-            if (state.config.roomVisibility is RoomVisibilityState.Public && state.isKnockFeatureEnabled) {
-                RoomAccessOptions(
-                    selected = when (state.config.roomVisibility.roomAccess) {
-                        RoomAccess.Anyone -> RoomAccessItem.Anyone
-                        RoomAccess.Knocking -> RoomAccessItem.AskToJoin
-                    },
-                    onOptionClick = {
-                        focusManager.clearFocus()
-                        state.eventSink(ConfigureRoomEvents.RoomAccessChanged(it))
-                    },
-                )
-                RoomAddressField(
-                    modifier = Modifier.padding(horizontal = 16.dp),
-                    address = state.config.roomVisibility.roomAddress.value,
-                    homeserverName = state.homeserverName,
-                    addressValidity = state.roomAddressValidity,
-                    onAddressChange = { state.eventSink(ConfigureRoomEvents.RoomAddressChanged(it)) },
-                    label = stringResource(R.string.screen_create_room_room_address_section_title),
-                    supportingText = stringResource(R.string.screen_create_room_room_address_section_footer),
-                )
-                Spacer(Modifier)
+
+            if (state.config.roomVisibility !is RoomVisibilityState.Private) {
+                Column {
+                    ListSectionHeader(title = stringResource(R.string.screen_create_room_room_address_section_title))
+                    RoomAddressField(
+                        modifier = Modifier.padding(horizontal = 16.dp),
+                        address = state.config.roomVisibility.roomAddress().getOrNull().orEmpty(),
+                        homeserverName = state.homeserverName,
+                        addressValidity = state.roomAddressValidity,
+                        onAddressChange = { state.eventSink(ConfigureRoomEvents.RoomAddressChanged(it)) },
+                        label = null,
+                        supportingText = stringResource(R.string.screen_create_room_room_address_section_footer),
+                    )
+                }
            }
        }
    }
@@ -156,11 +162,11 @@ fun ConfigureRoomView(
        async = state.createRoomAction,
        progressDialog = {
            AsyncActionViewDefaults.ProgressDialog(
-                progressText = stringResource(CommonStrings.common_creating_room),
+                progressText = stringResource(if (isSpace) CommonStrings.common_creating_space else CommonStrings.common_creating_room),
            )
        },
        onSuccess = { onCreateRoomSuccess(it) },
-        errorMessage = { stringResource(R.string.screen_create_room_error_creating_room) },
+        errorMessage = { stringResource(if (isSpace) R.string.screen_create_room_error_creating_space else R.string.screen_create_room_error_creating_room) },
        onRetry = { state.eventSink(ConfigureRoomEvents.CreateRoom) },
        onErrorDismiss = { state.eventSink(ConfigureRoomEvents.CancelCreateRoom) },
    )
@@ -173,12 +179,13 @@ fun ConfigureRoomView(
@OptIn(ExperimentalMaterial3Api::class)
@Composable
 private fun ConfigureRoomToolbar(
+    isSpace: Boolean,
    isNextActionEnabled: Boolean,
    onBackClick: () -> Unit,
    onNextClick: () -> Unit,
 ) {
    TopAppBar(
-        titleStr = stringResource(R.string.screen_create_room_title),
+        titleStr = stringResource(if (isSpace) R.string.screen_create_room_new_space_title else R.string.screen_create_room_new_room_title),
        navigationIcon = { BackButton(onClick = onBackClick) },
        actions = {
            TextButton(
@@ -192,6 +199,7 @@ private fun ConfigureRoomToolbar(

@Composable
 private fun RoomNameWithAvatar(
+    isSpace: Boolean,
    avatarUri: String?,
    roomName: String,
    onAvatarClick: () -> Unit,
@@ -203,25 +211,33 @@ private fun RoomNameWithAvatar(
        horizontalArrangement = Arrangement.spacedBy(16.dp),
        verticalAlignment = Alignment.CenterVertically,
    ) {
-        val a11yAvatar = stringResource(CommonStrings.a11y_room_avatar)
-        UnsavedAvatar(
-            avatarUri = avatarUri,
-            avatarSize = AvatarSize.EditRoomDetails,
-            avatarType = AvatarType.Room(),
-            modifier = Modifier
-                .clickable(
-                    onClick = onAvatarClick,
-                    onClickLabel = stringResource(CommonStrings.action_open_context_menu),
-                )
-                .clearAndSetSemantics {
-                    contentDescription = a11yAvatar
-                },
-        )
+        Box(
+            modifier = Modifier.padding(end = 8.dp).size(AvatarSize.EditRoomDetails.dp),
+            contentAlignment = Alignment.Center,
+        ) {
+            val avatarState = remember(avatarUri) {
+                if (avatarUri != null) {
+                    AvatarPickerState.Selected(
+                        avatarData = AvatarData(id = "#", name = null, url = avatarUri, size = AvatarSize.EditRoomDetails),
+                        type = if (isSpace) AvatarType.Space() else AvatarType.Room(),
+                    )
+                } else {
+                    val containerSize = 48.dp
+                    val padding = PaddingValues((AvatarSize.EditRoomDetails.dp - containerSize) / 2)
+                    AvatarPickerState.Pick(buttonSize = 48.dp, iconSize = 24.dp, externalPadding = padding)
+                }
+            }
+            AvatarPickerView(
+                state = avatarState,
+                onClick = onAvatarClick,
+            )
+        }

        TextField(
-            label = stringResource(R.string.screen_create_room_room_name_label),
+            modifier = Modifier.padding(bottom = 18.dp),
+            label = stringResource(CommonStrings.common_name),
            value = roomName,
-            placeholder = stringResource(CommonStrings.common_room_name_placeholder),
+            placeholder = stringResource(R.string.screen_create_room_name_placeholder),
            singleLine = true,
            onValueChange = onChangeRoomName,
        )
@@ -240,7 +256,7 @@ private fun RoomTopic(
        value = topic,
        onValueChange = onTopicChange,
        maxLines = 3,
-        supportingText = stringResource(CommonStrings.common_topic_placeholder),
+        placeholder = stringResource(R.string.screen_create_room_topic_placeholder),
        keyboardOptions = KeyboardOptions(
            capitalization = KeyboardCapitalization.Sentences,
        ),
@@ -256,38 +272,58 @@ private fun ConfigureRoomOptions(
    Column(
        modifier = modifier.selectableGroup()
    ) {
-        Text(
-            text = title,
-            style = ElementTheme.typography.fontBodyLgMedium,
-            color = ElementTheme.colors.textPrimary,
-            modifier = Modifier.padding(horizontal = 16.dp),
-        )
+        ListSectionHeader(title = title)
        content()
    }
 }

@Composable
-private fun RoomVisibilityOptions(
+private fun RoomVisibilityAndAccessOptions(
    selected: RoomVisibilityItem,
+    isKnockingEnabled: Boolean,
    onOptionClick: (RoomVisibilityItem) -> Unit,
    modifier: Modifier = Modifier,
 ) {
    ConfigureRoomOptions(
-        title = stringResource(R.string.screen_create_room_room_visibility_section_title),
+        title = stringResource(R.string.screen_create_room_room_access_section_title),
        modifier = modifier,
    ) {
        RoomVisibilityItem.entries.forEach { item ->
+            if (item == RoomVisibilityItem.AskToJoin && !isKnockingEnabled) {
+                return@forEach
+            }
+
            val isSelected = item == selected
            ListItem(
                leadingContent = ListItemContent.Custom {
                    RoundedIconAtom(
                        size = RoundedIconAtomSize.Big,
-                        resourceId = item.icon,
+                        resourceId = when (item) {
+                            RoomVisibilityItem.Public -> CompoundDrawables.ic_compound_public
+                            RoomVisibilityItem.AskToJoin -> CompoundDrawables.ic_compound_user_add
+                            RoomVisibilityItem.Private -> CompoundDrawables.ic_compound_lock
+                        },
                        tint = if (isSelected) ElementTheme.colors.iconPrimary else ElementTheme.colors.iconSecondary,
+                        backgroundTint = Color.Transparent,
                    )
                },
-                headlineContent = { Text(text = stringResource(item.title)) },
-                supportingContent = { Text(text = stringResource(item.description)) },
+                headlineContent = {
+                    val title = when (item) {
+                        RoomVisibilityItem.Public -> stringResource(R.string.screen_create_room_public_option_title)
+                        RoomVisibilityItem.AskToJoin -> stringResource(R.string.screen_create_room_room_access_section_knocking_option_title)
+                        RoomVisibilityItem.Private -> stringResource(R.string.screen_create_room_private_option_title)
+                    }
+                    Text(text = title)
+                },
+                supportingContent = {
+                    // TODO handle description of items in a certain space/org
+                    val description = when (item) {
+                        RoomVisibilityItem.Public -> stringResource(R.string.screen_create_room_public_option_short_description)
+                        RoomVisibilityItem.AskToJoin -> stringResource(R.string.screen_create_room_room_access_section_knocking_option_description)
+                        RoomVisibilityItem.Private -> stringResource(R.string.screen_create_room_private_option_description)
+                    }
+                    Text(text = description)
+                },
                trailingContent = ListItemContent.RadioButton(selected = isSelected),
                onClick = { onOptionClick(item) },
            )
@@ -295,27 +331,6 @@ private fun RoomVisibilityOptions(
    }
 }

-@Composable
-private fun RoomAccessOptions(
-    selected: RoomAccessItem,
-    onOptionClick: (RoomAccessItem) -> Unit,
-    modifier: Modifier = Modifier,
-) {
-    ConfigureRoomOptions(
-        title = stringResource(R.string.screen_create_room_room_access_section_header),
-        modifier = modifier,
-    ) {
-        RoomAccessItem.entries.forEach { item ->
-            ListItem(
-                headlineContent = { Text(text = stringResource(item.title)) },
-                supportingContent = { Text(text = stringResource(item.description)) },
-                trailingContent = ListItemContent.RadioButton(selected = item == selected),
-                onClick = { onOptionClick(item) },
-            )
-        }
-    }
-}
-
@PreviewWithLargeHeight
@Composable
 internal fun ConfigureRoomViewLightPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) =
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfig.kt
@@ -13,6 +13,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf

 data class CreateRoomConfig(
+    val isSpace: Boolean = false,
    val roomName: String? = null,
    val topic: String? = null,
    val avatarUri: String? = null,
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/CreateRoomConfigStore.kt
@@ -72,11 +72,11 @@ class CreateRoomConfigStore(
            config.copy(
                roomVisibility = when (visibility) {
                    RoomVisibilityItem.Private -> RoomVisibilityState.Private
-                    RoomVisibilityItem.Public -> {
+                    RoomVisibilityItem.Public, RoomVisibilityItem.AskToJoin -> {
                        val roomAliasName = roomAliasHelper.roomAliasNameFromRoomDisplayName(config.roomName.orEmpty())
                        RoomVisibilityState.Public(
                            roomAddress = RoomAddress.AutoFilled(roomAliasName),
-                            roomAccess = RoomAccess.Anyone,
+                            roomAccess = if (visibility == RoomVisibilityItem.AskToJoin) RoomAccess.Knocking else RoomAccess.Anyone,
                        )
                    }
                }
@@ -114,6 +114,12 @@ class CreateRoomConfigStore(
        }
    }

+    fun setIsSpace(isSpace: Boolean) {
+        createRoomConfigFlow.getAndUpdate { config ->
+            config.copy(isSpace = isSpace)
+        }
+    }
+
    fun clearCachedData() {
        cachedAvatarUri = null
    }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomAccessItem.kt
@@ -8,19 +8,7 @@

 package io.element.android.features.createroom.impl.configureroom

-import androidx.annotation.StringRes
-import io.element.android.features.createroom.impl.R
-
-enum class RoomAccessItem(
-    @StringRes val title: Int,
-    @StringRes val description: Int
-) {
-    Anyone(
-        title = R.string.screen_create_room_room_access_section_anyone_option_title,
-        description = R.string.screen_create_room_room_access_section_anyone_option_description,
-    ),
-    AskToJoin(
-        title = R.string.screen_create_room_room_access_section_knocking_option_title,
-        description = R.string.screen_create_room_room_access_section_knocking_option_description,
-    ),
+enum class RoomAccessItem {
+    Anyone,
+    AskToJoin,
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/RoomVisibilityItem.kt
@@ -8,24 +8,8 @@

 package io.element.android.features.createroom.impl.configureroom

-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import io.element.android.features.createroom.impl.R
-import io.element.android.libraries.designsystem.icons.CompoundDrawables
-
-enum class RoomVisibilityItem(
-    @DrawableRes val icon: Int,
-    @StringRes val title: Int,
-    @StringRes val description: Int
-) {
-    Private(
-        icon = CompoundDrawables.ic_compound_lock,
-        title = R.string.screen_create_room_private_option_title,
-        description = R.string.screen_create_room_private_option_description,
-    ),
-    Public(
-        icon = CompoundDrawables.ic_compound_public,
-        title = R.string.screen_create_room_public_option_title,
-        description = R.string.screen_create_room_public_option_description,
-    )
+enum class RoomVisibilityItem {
+    Public,
+    AskToJoin,
+    Private
 }
--- a/features/createroom/impl/src/main/res/values-be/translations.xml
+++ b/features/createroom/impl/src/main/res/values-be/translations.xml
@@ -8,10 +8,6 @@
  <string name="screen_create_room_public_option_description">"Любы можа знайсці гэты пакой. 
 Вы можаце змяніць гэта ў любы час у наладах пакоя."</string>
  <string name="screen_create_room_public_option_title">"Публічны пакой"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Хто заўгодна"</string>
-  <string name="screen_create_room_room_access_section_header">"Доступ у пакой"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Папрасіце далучыцца"</string>
-  <string name="screen_create_room_room_name_label">"Назва пакоя"</string>
-  <string name="screen_create_room_title">"Стварыце пакой"</string>
  <string name="screen_create_room_topic_label">"Тэма (неабавязкова)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-bg/translations.xml
+++ b/features/createroom/impl/src/main/res/values-bg/translations.xml
@@ -8,11 +8,7 @@
  <string name="screen_create_room_public_option_description">"Всеки може да намери тази стая.
 Можете да промените това по всяко време в настройките на стаята."</string>
  <string name="screen_create_room_public_option_title">"Общодостъпна стая"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Всеки може да се присъедини към тази стая"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Всеки"</string>
  <string name="screen_create_room_room_address_section_footer">"За да бъде тази стая видима в директорията на общодостъпните стаи, ще ви е необходим адрес на стаята."</string>
-  <string name="screen_create_room_room_name_label">"Име на стаята"</string>
  <string name="screen_create_room_room_visibility_section_title">"Видимост на стаята"</string>
-  <string name="screen_create_room_title">"Създаване на стая"</string>
  <string name="screen_create_room_topic_label">"Тема за разговор (незадължително)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-cs/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cs/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Tuto místnost může najít kdokoli.
 To můžete kdykoli změnit v nastavení místnosti."</string>
  <string name="screen_create_room_public_option_title">"Veřejná místnost"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Do této místnosti může vstoupit kdokoli"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Kdokoliv"</string>
-  <string name="screen_create_room_room_access_section_header">"Přístup do místnosti"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Kdokoli může požádat o vstup do místnosti, ale správce nebo moderátor bude muset žádost přijmout"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Požádat o připojení"</string>
  <string name="screen_create_room_room_address_section_footer">"Aby byla tato místnost viditelná v adresáři veřejných místností, budete potřebovat adresu místnosti."</string>
  <string name="screen_create_room_room_address_section_title">"Adresa místnosti"</string>
-  <string name="screen_create_room_room_name_label">"Název místnosti"</string>
  <string name="screen_create_room_room_visibility_section_title">"Viditelnost místnosti"</string>
-  <string name="screen_create_room_title">"Vytvořit místnost"</string>
  <string name="screen_create_room_topic_label">"Téma (nepovinné)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-cy/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cy/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Gall unrhyw un ddod o hyd i\'r ystafell hon.
 Gallwch newid hyn unrhyw bryd yng ngosodiadau ystafell."</string>
  <string name="screen_create_room_public_option_title">"Ystafell gyhoeddus"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Gall unrhyw un ymuno â\'r ystafell hon"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Unrhyw un"</string>
-  <string name="screen_create_room_room_access_section_header">"Mynediad i\'r Ystafell"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Gall unrhyw un ofyn am gael ymuno â\'r ystafell ond bydd rhaid i weinyddwr neu gymedrolwr dderbyn y cais"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Gofyn i gael ymuno"</string>
  <string name="screen_create_room_room_address_section_footer">"Er mwyn i\'r ystafell hon fod yn weladwy yn y cyfeiriadur ystafelloedd cyhoeddus, bydd angen cyfeiriad ystafell arnoch."</string>
  <string name="screen_create_room_room_address_section_title">"Cyfeiriad yr ystafell"</string>
-  <string name="screen_create_room_room_name_label">"Enw\'r ystafell"</string>
  <string name="screen_create_room_room_visibility_section_title">"Gwelededd yr ystafell"</string>
-  <string name="screen_create_room_title">"Creu ystafell"</string>
  <string name="screen_create_room_topic_label">"Pwnc (dewisol)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-da/translations.xml
+++ b/features/createroom/impl/src/main/res/values-da/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Alle kan finde dette rum.
 Du kan ændre dette når som helst i rummets indstillinger."</string>
  <string name="screen_create_room_public_option_title">"Offentligt rum"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Alle kan deltage i dette rum"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Enhver"</string>
-  <string name="screen_create_room_room_access_section_header">"Adgang til rummet"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Alle kan bede om at deltage i rummet, men en administrator eller en moderator skal acceptere anmodningen"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Spørg om at deltage"</string>
  <string name="screen_create_room_room_address_section_footer">"Hvis dette rum skal være synligt i det offentlige register, skal du bruge en rum-adresse."</string>
  <string name="screen_create_room_room_address_section_title">"Rummets adresse"</string>
-  <string name="screen_create_room_room_name_label">"Navn på rum"</string>
  <string name="screen_create_room_room_visibility_section_title">"Rummets synlighed"</string>
-  <string name="screen_create_room_title">"Opret et rum"</string>
  <string name="screen_create_room_topic_label">"Emne (valgfrit)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-de/translations.xml
+++ b/features/createroom/impl/src/main/res/values-de/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Jeder kann diesen Chat finden.
 Du kannst dies jederzeit in den Einstellungen des Chats ändern."</string>
  <string name="screen_create_room_public_option_title">"Öffentlicher Chat"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Jeder darf diesem Chat beitreten"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Jeder"</string>
-  <string name="screen_create_room_room_access_section_header">"Chat Zugang"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Jeder kann den Beitritt zum Chat erbitten, aber ein Admin oder Moderator muss die Anfrage akzeptieren."</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Beitritt beantragen"</string>
  <string name="screen_create_room_room_address_section_footer">"Du benötigst eine Chat-Adresse, damit dieser Chat im öffentlichen Verzeichnis sichtbar ist."</string>
  <string name="screen_create_room_room_address_section_title">"Chatroom Adresse"</string>
-  <string name="screen_create_room_room_name_label">"Chat-Name"</string>
  <string name="screen_create_room_room_visibility_section_title">" Sichtbarkeit des Chats"</string>
-  <string name="screen_create_room_title">"Chat erstellen"</string>
  <string name="screen_create_room_topic_label">"Thema (optional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-el/translations.xml
+++ b/features/createroom/impl/src/main/res/values-el/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Ο καθένας μπορεί να βρει αυτή την αίθουσα.
 Αυτό μπορείτε να το αλλάξετε ανά πάσα στιγμή στις ρυθμίσεις της αίθουσας."</string>
  <string name="screen_create_room_public_option_title">"Δημόσια αίθουσα"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Οποιοσδήποτε μπορεί να συμμετάσχει σε αυτή την αίθουσα"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Οποιοσδήποτε"</string>
-  <string name="screen_create_room_room_access_section_header">"Πρόσβαση στην Αίθουσα"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει στην αίθουσα, αλλά ένας διαχειριστής ή ένας συντονιστής θα πρέπει να αποδεχτεί το αίτημα"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Αίτημα συμμετοχής"</string>
  <string name="screen_create_room_room_address_section_footer">"Για να είναι ορατή αυτή η αίθουσα στον δημόσιο κατάλογο αιθουσών, θα χρειαστείτε μια διεύθυνση αίθουσας."</string>
  <string name="screen_create_room_room_address_section_title">"Διεύθυνση δωματίου"</string>
-  <string name="screen_create_room_room_name_label">"Όνομα αίθουσας"</string>
  <string name="screen_create_room_room_visibility_section_title">"Ορατότητα αίθουσας"</string>
-  <string name="screen_create_room_title">"Δημιουργία αίθουσας"</string>
  <string name="screen_create_room_topic_label">"Θέμα (προαιρετικό)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-es/translations.xml
+++ b/features/createroom/impl/src/main/res/values-es/translations.xml
@@ -8,14 +8,9 @@
  <string name="screen_create_room_public_option_description">"Cualquiera puede encontrar esta sala.
 Puedes cambiar esto en cualquier momento en los ajustes de la sala."</string>
  <string name="screen_create_room_public_option_title">"Sala pública"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Cualquiera puede unirse a esta sala"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Cualquiera"</string>
-  <string name="screen_create_room_room_access_section_header">"Acceso a la sala"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Cualquiera puede solicitar unirse a la sala, pero un administrador o un moderador tendrá que aceptar la solicitud"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Solicitud para unirse"</string>
  <string name="screen_create_room_room_address_section_footer">"Para que esta sala sea visible en el directorio de salas públicas, necesitarás una dirección de sala."</string>
-  <string name="screen_create_room_room_name_label">"Nombre de la sala"</string>
  <string name="screen_create_room_room_visibility_section_title">"Visibilidad de la sala"</string>
-  <string name="screen_create_room_title">"Crear una sala"</string>
  <string name="screen_create_room_topic_label">"Tema (opcional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-et/translations.xml
+++ b/features/createroom/impl/src/main/res/values-et/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Kõik saavad seda jututuba leida.
 Sa võid seda jututoa seadistustest alati muuta."</string>
  <string name="screen_create_room_public_option_title">"Avalik jututuba"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Kõik võivad selle jututoaga liituda"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Kõik kasutajad"</string>
-  <string name="screen_create_room_room_access_section_header">"Ligipääs jututoale"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Kõik võivad paluda selle jututoaga liitumist, kuid peakasutaja või moderaator peavad selle kinnitama"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Küsi võimalust liitumiseks"</string>
  <string name="screen_create_room_room_address_section_footer">"Selleks, et see jututuba oleks nähtav jututubade avalikus kataloogis, sa vajad jututoa aadressi."</string>
  <string name="screen_create_room_room_address_section_title">"Jututoa aadress"</string>
-  <string name="screen_create_room_room_name_label">"Jututoa nimi"</string>
  <string name="screen_create_room_room_visibility_section_title">"Jututoa nähtavus"</string>
-  <string name="screen_create_room_title">"Loo jututuba"</string>
  <string name="screen_create_room_topic_label">"Teema (kui soovid lisada)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-eu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-eu/translations.xml
@@ -8,12 +8,7 @@
  <string name="screen_create_room_public_option_description">"Edonork aurki dezake gela hau.
 Gelaren ezarpenetan aldatu dezakezu hobespena."</string>
  <string name="screen_create_room_public_option_title">"Gela publikoa"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Edonor sar daiteke gela honetara"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Edonork"</string>
-  <string name="screen_create_room_room_access_section_header">"Gelarako sarbidea"</string>
  <string name="screen_create_room_room_address_section_title">"Gelaren helbidea"</string>
-  <string name="screen_create_room_room_name_label">"Gelaren izena"</string>
  <string name="screen_create_room_room_visibility_section_title">"Gelaren ikusgarritasuna"</string>
-  <string name="screen_create_room_title">"Sortu gela"</string>
  <string name="screen_create_room_topic_label">"Mintzagaia (aukerakoa)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fa/translations.xml
@@ -8,13 +8,8 @@
  <string name="screen_create_room_public_option_description">"هرکسی می‌تواند اتاق را بیابد.
 می‌توانید بعداً در تظیمات اتاق عوضش کنید."</string>
  <string name="screen_create_room_public_option_title">"اتاق عمومی"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"هرکسی می‌تواند به این اتاق بپیوندد"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"هرکسی"</string>
-  <string name="screen_create_room_room_access_section_header">"دسترسی اتاق"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"درخواست دعوت"</string>
  <string name="screen_create_room_room_address_section_title">"نشانی اتاق"</string>
-  <string name="screen_create_room_room_name_label">"نام اتاق"</string>
  <string name="screen_create_room_room_visibility_section_title">"نمایانی اتاق"</string>
-  <string name="screen_create_room_title">"ایجاد اتاق"</string>
  <string name="screen_create_room_topic_label">"موضوع (اختیاری)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fi/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fi/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Kuka tahansa voi löytää tämän huoneen.
 Voit muuttaa tämän milloin tahansa huoneen asetuksista."</string>
  <string name="screen_create_room_public_option_title">"Julkinen huone"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Kuka tahansa voi liittyä tähän huoneeseen"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Kuka tahansa"</string>
-  <string name="screen_create_room_room_access_section_header">"Huoneeseen Pääsy"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Kuka tahansa voi pyytää saada liittyä huoneeseen, mutta ylläpitäjän tai valvojan on hyväksyttävä pyyntö"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Pyydä liittymistä"</string>
  <string name="screen_create_room_room_address_section_footer">"Jotta tämä huone näkyisi julkisessa huonehakemistossa, tarvitset huoneen osoitteen."</string>
  <string name="screen_create_room_room_address_section_title">"Huoneen osoite"</string>
-  <string name="screen_create_room_room_name_label">"Huoneen nimi"</string>
  <string name="screen_create_room_room_visibility_section_title">"Huoneen näkyvyys"</string>
-  <string name="screen_create_room_title">"Luo huone"</string>
  <string name="screen_create_room_topic_label">"Aihe (valinnainen)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fr/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"N’importe qui peut trouver ce salon.
 Vous pouvez modifier cela à tout moment dans les paramètres du salon."</string>
  <string name="screen_create_room_public_option_title">"Salon public"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Tout le monde peut rejoindre ce salon"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Tout le monde"</string>
-  <string name="screen_create_room_room_access_section_header">"Accès au salon"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Tout le monde peut demander à rejoindre le salon, mais un administrateur ou un modérateur devra accepter la demande"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Demander à rejoindre"</string>
  <string name="screen_create_room_room_address_section_footer">"Pour que ce salon soit visible dans le répertoire des salons publics, vous aurez besoin d’une adresse de salon."</string>
  <string name="screen_create_room_room_address_section_title">"Adresse du salon"</string>
-  <string name="screen_create_room_room_name_label">"Nom du salon"</string>
  <string name="screen_create_room_room_visibility_section_title">"Visibilité du salon"</string>
-  <string name="screen_create_room_title">"Créer un salon"</string>
  <string name="screen_create_room_topic_label">"Sujet (facultatif)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-hr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hr/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Svatko može pronaći ovu sobu.
 To možete u svakom trenutku promijeniti u postavkama sobe."</string>
  <string name="screen_create_room_public_option_title">"Javna soba"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Svatko se može pridružiti ovoj sobi"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Svatko"</string>
-  <string name="screen_create_room_room_access_section_header">"Pristup sobi"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Svatko može zatražiti pridruživanje sobi, ali administrator ili moderator morat će prihvatiti zahtjev."</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Zatraži pridruživanje"</string>
  <string name="screen_create_room_room_address_section_footer">"Da bi ova soba bila vidljiva u javnom direktoriju soba, trebat će vam adresa sobe."</string>
  <string name="screen_create_room_room_address_section_title">"Adresa sobe"</string>
-  <string name="screen_create_room_room_name_label">"Naziv sobe"</string>
  <string name="screen_create_room_room_visibility_section_title">"Vidljivost sobe"</string>
-  <string name="screen_create_room_title">"Stvori sobu"</string>
  <string name="screen_create_room_topic_label">"Tema (neobavezno)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-hu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hu/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Bárki megtalálhatja ezt a szobát.
 Ezt bármikor módosíthatja a szobabeállításokban."</string>
  <string name="screen_create_room_public_option_title">"Nyilvános szoba"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Bárki csatlakozhat ehhez a szobához"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Bárki"</string>
-  <string name="screen_create_room_room_access_section_header">"Szobahozzáférés"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Bárki kérheti, hogy csatlakozzon a szobához, de egy adminisztrátornak vagy moderátornak el kell fogadnia a kérést"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Csatlakozás kérése"</string>
  <string name="screen_create_room_room_address_section_footer">"Ahhoz, hogy ez a szoba látható legyen a nyilvános szobák címtárában, meg kell adnia a szoba címét."</string>
  <string name="screen_create_room_room_address_section_title">"Szoba címe"</string>
-  <string name="screen_create_room_room_name_label">"Szoba neve"</string>
  <string name="screen_create_room_room_visibility_section_title">"Szoba láthatósága"</string>
-  <string name="screen_create_room_title">"Szoba létrehozása"</string>
  <string name="screen_create_room_topic_label">"Téma (nem kötelező)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-in/translations.xml
+++ b/features/createroom/impl/src/main/res/values-in/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Siapa pun dapat mencari ruangan ini.
 Anda dapat mengubah ini kapan pun dalam pengaturan ruangan."</string>
  <string name="screen_create_room_public_option_title">"Ruangan publik"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Siapa pun dapat bergabung dengan ruangan ini"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Siapa pun"</string>
-  <string name="screen_create_room_room_access_section_header">"Akses Ruangan"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Minta untuk bergabung"</string>
  <string name="screen_create_room_room_address_section_footer">"Supaya ruangan ini terlihat di direktori ruangan publik, Anda memerlukan alamat ruangan."</string>
  <string name="screen_create_room_room_address_section_title">"Alamat ruangan"</string>
-  <string name="screen_create_room_room_name_label">"Nama ruangan"</string>
  <string name="screen_create_room_room_visibility_section_title">"Keterlihatan ruangan"</string>
-  <string name="screen_create_room_title">"Buat ruangan"</string>
  <string name="screen_create_room_topic_label">"Topik (opsional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-it/translations.xml
+++ b/features/createroom/impl/src/main/res/values-it/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Chiunque può trovare questa stanza.
 Puoi modificarlo in qualsiasi momento nelle impostazioni della stanza."</string>
  <string name="screen_create_room_public_option_title">"Stanza pubblica"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Chiunque può entrare in questa stanza"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Chiunque"</string>
-  <string name="screen_create_room_room_access_section_header">"Accesso alla stanza"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Chiunque può chiedere di entrare nella stanza, ma un amministratore o un moderatore dovrà accettare la richiesta"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Chiedi di entrare"</string>
  <string name="screen_create_room_room_address_section_footer">"Affinché questa stanza sia visibile nell\'elenco delle stanze pubbliche, è necessario un indirizzo della stanza."</string>
  <string name="screen_create_room_room_address_section_title">"Indirizzo della stanza"</string>
-  <string name="screen_create_room_room_name_label">"Nome stanza"</string>
  <string name="screen_create_room_room_visibility_section_title">"Visibilità della stanza"</string>
-  <string name="screen_create_room_title">"Crea una stanza"</string>
  <string name="screen_create_room_topic_label">"Argomento (facoltativo)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ka/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ka/translations.xml
@@ -7,7 +7,5 @@
  <string name="screen_create_room_private_option_title">"კერძო ოთახი"</string>
  <string name="screen_create_room_public_option_description">"ყველას ამ ოთახის მოძებნა შეუძლია.
 თქვენ ნებისმიერ დროს შეგიძლიათ ამის შეცვლა ოთახის პარამეტრებში."</string>
-  <string name="screen_create_room_room_name_label">"ოთახის სახელი"</string>
-  <string name="screen_create_room_title">"ოთახის შექმნა"</string>
  <string name="screen_create_room_topic_label">"თემა (სურვილისამებრ)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ko/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ko/translations.xml
@@ -8,14 +8,9 @@
  <string name="screen_create_room_public_option_description">"누구나 이 방을 찾을 수 있습니다.
 방 설정에서 언제든지 변경할 수 있습니다."</string>
  <string name="screen_create_room_public_option_title">"공개 방"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"누구나 이 방에 참여할 수 있습니다."</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"누구나"</string>
-  <string name="screen_create_room_room_access_section_header">"방 액세스"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"누구나 방에 참여 요청을 할 수 있지만, 관리자나 운영자가 요청을 수락해야 합니다."</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"참가 요청"</string>
  <string name="screen_create_room_room_address_section_footer">"이 방이 공개 방 디렉토리에 표시되려면 방 주소가 필요합니다."</string>
-  <string name="screen_create_room_room_name_label">"방 이름"</string>
  <string name="screen_create_room_room_visibility_section_title">"방 표시 여부"</string>
-  <string name="screen_create_room_title">"방 만들기"</string>
  <string name="screen_create_room_topic_label">"주제 (선택)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-lt/translations.xml
+++ b/features/createroom/impl/src/main/res/values-lt/translations.xml
@@ -7,7 +7,5 @@
  <string name="screen_create_room_private_option_title">"Privatus kambarys"</string>
  <string name="screen_create_room_public_option_description">"Bet kas gali rasti šį kambarį.
 Tai galite bet kada pakeisti kambario nustatymuose."</string>
-  <string name="screen_create_room_room_name_label">"Kambario pavadinimas"</string>
-  <string name="screen_create_room_title">"Kurti kambarį"</string>
  <string name="screen_create_room_topic_label">"Tema (nebūtina)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-nb/translations.xml
+++ b/features/createroom/impl/src/main/res/values-nb/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Alle kan finne dette rommet.
 Du kan endre dette når som helst i rominnstillingene."</string>
  <string name="screen_create_room_public_option_title">"Offentlig rom"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Alle kan bli med i dette rommet"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Alle"</string>
-  <string name="screen_create_room_room_access_section_header">"Tilgang til rom"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Alle kan be om å få bli med i rommet, men en administrator eller moderator må godta forespørselen"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Be om å bli med"</string>
  <string name="screen_create_room_room_address_section_footer">"For at dette rommet skal være synlig i den offentlige romkatalogen, trenger du en romadresse."</string>
  <string name="screen_create_room_room_address_section_title">"Romadresse"</string>
-  <string name="screen_create_room_room_name_label">"Romnavn"</string>
  <string name="screen_create_room_room_visibility_section_title">"Romsynlighet"</string>
-  <string name="screen_create_room_title">"Opprett et rom"</string>
  <string name="screen_create_room_topic_label">"Emne (valgfritt)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-nl/translations.xml
+++ b/features/createroom/impl/src/main/res/values-nl/translations.xml
@@ -8,12 +8,7 @@
  <string name="screen_create_room_public_option_description">"Iedereen kan deze kamer vinden.
 Je kunt dit op elk gewenst moment wijzigen in de kamerinstellingen."</string>
  <string name="screen_create_room_public_option_title">"Openbare kamer"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Iedereen kan toetreden tot deze kamer"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Iedereen"</string>
-  <string name="screen_create_room_room_access_section_header">"Toegang tot de kamer"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Iedereen kan vragen om toe te treden tot de kamer, maar een beheerder of moderator moet het verzoek accepteren"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Vraag om toe te treden"</string>
-  <string name="screen_create_room_room_name_label">"Naam van de kamer"</string>
-  <string name="screen_create_room_title">"Creëer een kamer"</string>
  <string name="screen_create_room_topic_label">"Onderwerp (optioneel)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-pl/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pl/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Każdy może znaleźć ten pokój.
 Możesz to zmienić w ustawieniach pokoju."</string>
  <string name="screen_create_room_public_option_title">"Pokój publiczny"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Każdy może dołączyć do tego pokoju"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Wszyscy"</string>
-  <string name="screen_create_room_room_access_section_header">"Dostęp do pokoju"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Każdy może poprosić o dołączenie do pokoju, ale administrator lub moderator będzie musiał zatwierdzić prośbę"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Poproś o dołączenie"</string>
  <string name="screen_create_room_room_address_section_footer">"Aby ten pokój był widoczny w katalogu pomieszczeń publicznych, będziesz potrzebował adres pokoju."</string>
  <string name="screen_create_room_room_address_section_title">"Adres pokoju"</string>
-  <string name="screen_create_room_room_name_label">"Nazwa pokoju"</string>
  <string name="screen_create_room_room_visibility_section_title">"Widoczność pomieszczenia"</string>
-  <string name="screen_create_room_title">"Utwórz pokój"</string>
  <string name="screen_create_room_topic_label">"Temat (opcjonalnie)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pt-rBR/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Qualquer um pode encontrar esta sala.
 Você pode mudar isso a qualquer momento nas configurações da sala."</string>
  <string name="screen_create_room_public_option_title">"Sala pública"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Qualquer pessoa pode entrar nesta sala"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Qualquer pessoa"</string>
-  <string name="screen_create_room_room_access_section_header">"Acesso à sala"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou moderador terá de aceitar a solicitação"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Pedir para entrar"</string>
  <string name="screen_create_room_room_address_section_footer">"Para que esta sala fique visível no diretório público de salas, você precisará de um endereço de sala."</string>
  <string name="screen_create_room_room_address_section_title">"Endereço da sala"</string>
-  <string name="screen_create_room_room_name_label">"Nome da sala"</string>
  <string name="screen_create_room_room_visibility_section_title">"Visibilidade da sala"</string>
-  <string name="screen_create_room_title">"Criar uma sala"</string>
  <string name="screen_create_room_topic_label">"Tópico (opcional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-pt/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pt/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Qualquer um pode encontrar esta sala. 
 Pode alterar esta opção nas definições da sala."</string>
  <string name="screen_create_room_public_option_title">"Sala pública"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Qualquer pessoa pode entrar nesta sala"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Qualquer pessoa"</string>
-  <string name="screen_create_room_room_access_section_header">"Acesso à sala"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Qualquer pessoa pode pedir para entrar na sala, mas um administrador ou um moderador terá de aceitar o pedido"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Pedir para participar"</string>
  <string name="screen_create_room_room_address_section_footer">"Para que esta sala seja visível no diretório público de salas, precisas de um endereço de sala."</string>
  <string name="screen_create_room_room_address_section_title">"Endereço da sala"</string>
-  <string name="screen_create_room_room_name_label">"Nome da sala"</string>
  <string name="screen_create_room_room_visibility_section_title">"Visibilidade da sala"</string>
-  <string name="screen_create_room_title">"Criar uma sala"</string>
  <string name="screen_create_room_topic_label">"Descrição (opcional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ro/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ro/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Oricine poate găsi această cameră.
 Puteți modifica acest lucru oricând în setări."</string>
  <string name="screen_create_room_public_option_title">"Cameră publică"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Oricine se poate alătura acestei camere"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Oricine"</string>
-  <string name="screen_create_room_room_access_section_header">"Acces la cameră"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Oricine poate cere să se alăture camerei, dar un administrator sau un moderator va trebui să accepte cererea"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Cereți să vă alăturați"</string>
  <string name="screen_create_room_room_address_section_footer">"Pentru ca această cameră să fie vizibilă în directorul de camere publice, veți avea nevoie de o adresă de cameră."</string>
  <string name="screen_create_room_room_address_section_title">"Adresa camerei"</string>
-  <string name="screen_create_room_room_name_label">"Numele camerei"</string>
  <string name="screen_create_room_room_visibility_section_title">"Vizibilitatea camerei"</string>
-  <string name="screen_create_room_title">"Creați o cameră"</string>
  <string name="screen_create_room_topic_label">"Subiect (opțional)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ru/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Любой желающий может найти эту комнату.
 Вы можете изменить это в любое время в настройках комнаты."</string>
  <string name="screen_create_room_public_option_title">"Общедоступная комната"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Любой желающий может присоединиться к этой комнате"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Любой"</string>
-  <string name="screen_create_room_room_access_section_header">"Доступ в комнату"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Любой желающий может подать заявку на присоединение к комнате, но администратор или модератор должен будет принять запрос."</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Попросить присоединиться"</string>
  <string name="screen_create_room_room_address_section_footer">"Чтобы эта комната была видна в каталоге общедоступных, вам необходим ее адрес"</string>
  <string name="screen_create_room_room_address_section_title">"Адрес комнаты"</string>
-  <string name="screen_create_room_room_name_label">"Название комнаты"</string>
  <string name="screen_create_room_room_visibility_section_title">"Видимость комнаты"</string>
-  <string name="screen_create_room_title">"Создать комнату"</string>
  <string name="screen_create_room_topic_label">"Тема (необязательно)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-sk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sk/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Túto miestnosť môže nájsť ktokoľvek.
 Môžete to kedykoľvek zmeniť v nastaveniach miestnosti."</string>
  <string name="screen_create_room_public_option_title">"Verejná miestnosť"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Do tejto miestnosti sa môže pripojiť ktokoľvek"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Ktokoľvek"</string>
-  <string name="screen_create_room_room_access_section_header">"Prístup do miestnosti"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Ktokoľvek môže požiadať o pripojenie sa k miestnosti, ale administrátor alebo moderátor bude musieť žiadosť schváliť"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Požiadať o pripojenie"</string>
  <string name="screen_create_room_room_address_section_footer">"Aby bola táto miestnosť viditeľná v adresári verejných miestností, budete potrebovať adresu miestnosti."</string>
  <string name="screen_create_room_room_address_section_title">"Adresa miestnosti"</string>
-  <string name="screen_create_room_room_name_label">"Názov miestnosti"</string>
  <string name="screen_create_room_room_visibility_section_title">"Viditeľnosť miestnosti"</string>
-  <string name="screen_create_room_title">"Vytvoriť miestnosť"</string>
  <string name="screen_create_room_topic_label">"Téma (voliteľné)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-sv/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sv/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Vem som helst kan hitta det här rummet.
 Du kan ändra detta när som helst i rumsinställningarna."</string>
  <string name="screen_create_room_public_option_title">"Offentligt rum"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Vem som helst kan gå med i det här rummet"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Vem som helst"</string>
-  <string name="screen_create_room_room_access_section_header">"Rumsåtkomst"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Vem som helst kan be om att gå med i rummet men en administratör eller en moderator måste acceptera begäran"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Be om att gå med"</string>
  <string name="screen_create_room_room_address_section_footer">"För att detta rum ska vara synligt i den allmänna rumskatalogen behöver du en rumsadress."</string>
  <string name="screen_create_room_room_address_section_title">"Rumsadress"</string>
-  <string name="screen_create_room_room_name_label">"Rumsnamn"</string>
  <string name="screen_create_room_room_visibility_section_title">"Rumssynlighet"</string>
-  <string name="screen_create_room_title">"Skapa ett rum"</string>
  <string name="screen_create_room_topic_label">"Ämne (valfritt)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-tr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-tr/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Bu odayı herkes bulabilir.
 Bunu istediğiniz zaman oda ayarlarından değiştirebilirsiniz."</string>
  <string name="screen_create_room_public_option_title">"Herkese açık oda"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Bu odaya herkes katılabilir"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Herkes"</string>
-  <string name="screen_create_room_room_access_section_header">"Oda Erişimi"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Herkes odaya katılmayı isteyebilir ancak bir yönetici veya moderatörün isteği kabul etmesi gerekecektir"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Katılmak için sor"</string>
  <string name="screen_create_room_room_address_section_footer">"Bu odanın genel oda dizininde görünür olması için bir oda adresine ihtiyacınız olacaktır."</string>
  <string name="screen_create_room_room_address_section_title">"Oda adresi"</string>
-  <string name="screen_create_room_room_name_label">"Oda adı"</string>
  <string name="screen_create_room_room_visibility_section_title">"Oda görünürlüğü"</string>
-  <string name="screen_create_room_title">"Bir oda oluştur"</string>
  <string name="screen_create_room_topic_label">"Konu (isteğe bağlı)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uk/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"Будь-хто може знайти цю кімнату. 
 Ви можете змінити це в будь-який час у налаштуваннях кімнати."</string>
  <string name="screen_create_room_public_option_title">"Загальнодоступна кімната"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Будь-хто може приєднатися до цієї кімнати"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Кожний"</string>
-  <string name="screen_create_room_room_access_section_header">"Доступ до кімнати"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Будь-хто може попросити приєднатися до кімнати, але адміністратор або модератор повинен буде прийняти запит"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Запросити приєднатися"</string>
  <string name="screen_create_room_room_address_section_footer">"Щоб цю кімнату було видно в каталозі загальнодоступних кімнат, вам знадобиться її адреса."</string>
  <string name="screen_create_room_room_address_section_title">"Адреса кімнати"</string>
-  <string name="screen_create_room_room_name_label">"Назва кімнати"</string>
  <string name="screen_create_room_room_visibility_section_title">"Видимість кімнати"</string>
-  <string name="screen_create_room_title">"Створити кімнату"</string>
  <string name="screen_create_room_topic_label">"Тема (необов\'язково)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ur/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ur/translations.xml
@@ -8,7 +8,5 @@
  <string name="screen_create_room_public_option_description">"کوئی بھی یہ کمرہ ڈھونڈ سکتا ہے۔
 آپ اسے کمرے کی ترتیبات میں کسی بھی وقت تبدیل کرسکتے ہیں۔"</string>
  <string name="screen_create_room_public_option_title">"عوامی کمرہ"</string>
-  <string name="screen_create_room_room_name_label">"کمرے کا نام"</string>
-  <string name="screen_create_room_title">"ایک کمرہ بنائیں"</string>
  <string name="screen_create_room_topic_label">"موضوع (اختیاری)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uz/translations.xml
@@ -8,14 +8,9 @@
  <string name="screen_create_room_public_option_description">"Bu xonani har kim topishi mumkin.
 Buni xona sozlamalaridan istalgan vaqtda oʻzgartirishingiz mumkin."</string>
  <string name="screen_create_room_public_option_title">"Jamoat xonasi"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Bu xonaga istalgan kishi qo‘shilishi mumkin"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Har kim"</string>
-  <string name="screen_create_room_room_access_section_header">"Xonaga kirish"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"Xonaga qo‘shilishni istalgan kishi so‘rashi mumkin, lekin administrator yoki moderator so‘rovni qabul qilishi kerak"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"Qo‘shilishni so‘rang"</string>
  <string name="screen_create_room_room_address_section_footer">"Ushbu xona ommaviy xonalar ro‘yxatida ko‘rinishi uchun sizga xona manzili kerak bo‘ladi."</string>
-  <string name="screen_create_room_room_name_label">"Xona nomi"</string>
  <string name="screen_create_room_room_visibility_section_title">"Xonaning ko‘rinishi"</string>
-  <string name="screen_create_room_title">"Xonani yaratish"</string>
  <string name="screen_create_room_topic_label">"Mavzu (ixtiyoriy)"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"任何人都可以找到此聊天室。
 您隨時都可以在聊天室設定中變更此設定。"</string>
  <string name="screen_create_room_public_option_title">"公開的聊天室"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"任何人都可以加入此聊天室"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"任何人"</string>
-  <string name="screen_create_room_room_access_section_header">"聊天室存取權"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可以要求加入聊天室，但管理員或版主必須接受該請求"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"要求加入"</string>
  <string name="screen_create_room_room_address_section_footer">"為了讓此聊天室在公開聊天室目錄中可見，您需要聊天室地址。"</string>
  <string name="screen_create_room_room_address_section_title">"聊天室地址"</string>
-  <string name="screen_create_room_room_name_label">"聊天室名稱"</string>
  <string name="screen_create_room_room_visibility_section_title">"聊天室能見度"</string>
-  <string name="screen_create_room_title">"建立聊天室"</string>
  <string name="screen_create_room_topic_label">"主題（非必填）"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh/translations.xml
@@ -8,15 +8,10 @@
  <string name="screen_create_room_public_option_description">"任何人都能找到此聊天室。
 你可以随时在聊天室设置中更改。"</string>
  <string name="screen_create_room_public_option_title">"公共聊天室"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"任何人都可以加入此房间"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"任何人"</string>
-  <string name="screen_create_room_room_access_section_header">"房间访问权限"</string>
  <string name="screen_create_room_room_access_section_knocking_option_description">"任何人都可以请求加入房间，但必须由管理员或审核人接受"</string>
  <string name="screen_create_room_room_access_section_knocking_option_title">"请求加入"</string>
  <string name="screen_create_room_room_address_section_footer">"要使该房间在公开房间目录中可见，您需要一个房间地址。"</string>
  <string name="screen_create_room_room_address_section_title">"房间地址"</string>
-  <string name="screen_create_room_room_name_label">"聊天室名称"</string>
  <string name="screen_create_room_room_visibility_section_title">"房间可见性"</string>
-  <string name="screen_create_room_title">"创建聊天室"</string>
  <string name="screen_create_room_topic_label">"主题（可选）"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values/localazy.xml
+++ b/features/createroom/impl/src/main/res/values/localazy.xml
@@ -3,20 +3,26 @@
  <string name="screen_create_room_action_create_room">"New room"</string>
  <string name="screen_create_room_add_people_title">"Invite people"</string>
  <string name="screen_create_room_error_creating_room">"An error occurred when creating the room"</string>
-  <string name="screen_create_room_private_option_description">"Only people invited can access this room. All messages are end-to-end encrypted."</string>
-  <string name="screen_create_room_private_option_title">"Private room"</string>
+  <string name="screen_create_room_error_creating_space">"The space could not be created because of an unknown error. Try again later."</string>
+  <string name="screen_create_room_name_placeholder">"Add name…"</string>
+  <string name="screen_create_room_new_room_title">"New room"</string>
+  <string name="screen_create_room_new_space_title">"New space"</string>
+  <string name="screen_create_room_private_option_description">"Only people invited can join."</string>
+  <string name="screen_create_room_private_option_title">"Private"</string>
  <string name="screen_create_room_public_option_description">"Anyone can find this room.
 You can change this anytime in room settings."</string>
-  <string name="screen_create_room_public_option_title">"Public room"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_description">"Anyone can join this room"</string>
-  <string name="screen_create_room_room_access_section_anyone_option_title">"Anyone"</string>
-  <string name="screen_create_room_room_access_section_header">"Room Access"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_description">"Anyone can ask to join the room but an administrator or a moderator will have to accept the request"</string>
-  <string name="screen_create_room_room_access_section_knocking_option_title">"Ask to join"</string>
-  <string name="screen_create_room_room_address_section_footer">"In order for this room to be visible in the public room directory, you will need a room address."</string>
-  <string name="screen_create_room_room_address_section_title">"Room address"</string>
-  <string name="screen_create_room_room_name_label">"Room name"</string>
+  <string name="screen_create_room_public_option_short_description">"Anyone can join."</string>
+  <string name="screen_create_room_public_option_title">"Public"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_description">"Anyone can ask to join but an administrator or a moderator must accept the request."</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"Allow ask to join"</string>
+  <string name="screen_create_room_room_access_section_private_option_description">"Only people invited can join."</string>
+  <string name="screen_create_room_room_access_section_private_option_title">"Private"</string>
+  <string name="screen_create_room_room_access_section_public_option_description">"Anyone can join."</string>
+  <string name="screen_create_room_room_access_section_public_option_title">"Public"</string>
+  <string name="screen_create_room_room_access_section_title">"Who has access"</string>
+  <string name="screen_create_room_room_address_section_footer">"You’ll need an address in order to make it visible in the public directory."</string>
+  <string name="screen_create_room_room_address_section_title">"Address"</string>
  <string name="screen_create_room_room_visibility_section_title">"Room visibility"</string>
-  <string name="screen_create_room_title">"Create a room"</string>
  <string name="screen_create_room_topic_label">"Topic (optional)"</string>
+  <string name="screen_create_room_topic_placeholder">"Add description…"</string>
 </resources>
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/DefaultCreateRoomEntryPointTest.kt
@@ -40,6 +40,7 @@ class DefaultCreateRoomEntryPointTest {
            override fun onRoomCreated(roomId: RoomId) = lambdaError()
        }
        val result = entryPoint.createNode(
+            isSpace = false,
            parentNode = parentNode,
            buildContext = BuildContext.root(null),
            callback = callback,
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/startchat/impl/configureroom/ConfigureRoomPresenterTest.kt
@@ -380,6 +380,7 @@ class ConfigureRoomPresenterTest {
    )

    private fun createConfigureRoomPresenter(
+        isSpace: Boolean = false,
        roomAliasHelper: RoomAliasHelper = FakeRoomAliasHelper(),
        dataStore: CreateRoomConfigStore = CreateRoomConfigStore(roomAliasHelper),
        matrixClient: MatrixClient = createMatrixClient(),
@@ -390,6 +391,7 @@ class ConfigureRoomPresenterTest {
        isKnockFeatureEnabled: Boolean = true,
        mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
    ) = ConfigureRoomPresenter(
+        isSpace = isSpace,
        dataStore = dataStore,
        matrixClient = matrixClient,
        mediaPickerProvider = pickerProvider,
--- a/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
+++ b/features/createroom/test/src/main/kotlin/io/element/android/features/createroom/api/FakeCreateRoomEntryPoint.kt
@@ -14,6 +14,7 @@ import io.element.android.tests.testutils.lambda.lambdaError

 class FakeCreateRoomEntryPoint : CreateRoomEntryPoint {
    override fun createNode(
+        isSpace: Boolean,
        parentNode: Node,
        buildContext: BuildContext,
        callback: CreateRoomEntryPoint.Callback,