Merge branch 'release/25.08.4'

2025-08-26 15:22:02 +02:00
parent 76fe53ed23 72b5ca90f9
commit d59627bfa4
1801 changed files with 10841 additions and 5599 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -39,7 +39,7 @@ jobs:
      - name: Clone submodules
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/generate_github_pages.yml
+++ b/.github/workflows/generate_github_pages.yml
@@ -14,7 +14,7 @@ jobs:
      - name: ⏬ Checkout with LFS
        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -12,7 +12,7 @@ jobs:
    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
    steps:
      - uses: actions/checkout@v5
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
        name: Use JDK 21
        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
        with:
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -28,7 +28,7 @@ jobs:
          # Ensure we are building the branch and not the branch after being merged on develop
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.ref }}
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
        name: Use JDK 21
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -21,7 +21,7 @@ jobs:
        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3

      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -62,7 +62,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -47,7 +47,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -85,7 +85,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -125,7 +125,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -169,7 +169,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -209,7 +209,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -249,7 +249,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -34,7 +34,7 @@ jobs:
        with:
          persist-credentials: false
      - name: ☕️ Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -61,7 +61,7 @@ jobs:
      - name: Clone submodules
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -89,7 +89,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -28,7 +28,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -13,7 +13,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,7 +47,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: ☕️ Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -82,7 +82,7 @@ jobs:

      # https://github.com/codecov/codecov-action
      - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.2.0" />
+    <option name="version" value="2.2.10" />
  </component>
 </project>
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -3,18 +3,18 @@ appId: ${MAESTRO_APP_ID}
 # Purpose: Test the creation and deletion of a room
 - tapOn: "Create a new conversation or room"
 - tapOn: "New room"
- tapOn: "Search for someone"
- inputText: ${MAESTRO_INVITEE1_MXID}
- tapOn:
-    text: ${MAESTRO_INVITEE1_MXID}
-    index: 1
- tapOn: "Next"
 - tapOn: "e.g. your project name"
 - inputText: "aRoomName"
 - tapOn: "What is this room about?"
 - inputText: "aRoomTopic"
 - tapOn: "Create"
 - takeScreenshot: build/maestro/320-createAndDeleteRoom
+- tapOn: "Search for someone"
+- inputText: ${MAESTRO_INVITEE1_MXID}
+- tapOn:
+    text: ${MAESTRO_INVITEE1_MXID}
+    index: 1
+- tapOn: "Finish"
 - tapOn: "aRoomName"
 - tapOn: "Invite"
 # assert there's 1 member and 1 invitee
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,41 @@
+Changes in Element X v25.08.3
+=============================
+
+## What's Changed
+### ✨ Features
+* Add media file limit size warning and media quality selection by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5131
+### 🐛 Bugfixes
+* Fix cursor position in room list search by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5138
+* Fix leaving the room not always dismissing the room screen by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5089
+* Do not automatically initialize `DefaultVideoMetadataExtractor`'s data source by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5157
+* Provide calculated server names when opening a room from another by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5155
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5146
+### 🧱 Build
+* Compile and target sdk36 by @bmarty in https://github.com/element-hq/element-x-android/pull/5150
+* Fix Maestro regression when coming back from room to the search screen by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5156
+### Dependency upgrades
+* Update android.gradle.plugin to v8.12.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5106
+* Update wysiwyg to v2.39.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5080
+* Update dependency python to 3.13 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5144
+* Update rnkdsh/action-upload-diawi action to v1.5.11 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5141
+* Update dependency io.github.sergio-sastre.ComposablePreviewScanner:android to v0.7.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5143
+* Update actions/checkout action to v5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5148
+* Update dependency io.sentry:sentry-android to v8.19.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5149
+* Update dependency io.sentry:sentry-android to v8.19.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5158
+* Update dependency androidx.browser:browser to v1.9.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5096
+* Update Compose bom to 2025.07.00 by @bmarty in https://github.com/element-hq/element-x-android/pull/5164
+* Update showkase to v1.0.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5117
+* Update haze to v1.6.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5167
+### Others
+* Let enterprise build be able to override (or disable) the bug report URL. by @bmarty in https://github.com/element-hq/element-x-android/pull/5139
+* Hide the recovery key while we are entering it by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5147
+* Remove old feature flags by @bmarty in https://github.com/element-hq/element-x-android/pull/5160
+* Move push history entry point from notification settings to developer settings by @bmarty in https://github.com/element-hq/element-x-android/pull/5161
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.08.2...v25.08.3
+
 Changes in Element X v25.08.2
 =============================

--- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
@@ -28,6 +28,7 @@ import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.ksp.addOriginatingKSFile
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
 import dagger.Binds
@@ -78,6 +79,7 @@ class ContributesNodeProcessor(
        )
            .addType(
                TypeSpec.classBuilder(moduleClassName)
+                    .addOriginatingKSFile(ksClass.containingFile!!)
                    .addModifiers(KModifier.ABSTRACT)
                    .addAnnotation(Module::class)
                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build())
@@ -102,10 +104,7 @@ class ContributesNodeProcessor(

        content.writeTo(
            codeGenerator = codeGenerator,
-            dependencies = Dependencies(
-                aggregating = true,
-                ksClass.containingFile!!
-            ),
+            dependencies = Dependencies(aggregating = false),
        )
    }

@@ -139,6 +138,7 @@ class ContributesNodeProcessor(
        val content = FileSpec.builder(generatedPackage, assistedFactoryClassName)
            .addType(
                TypeSpec.interfaceBuilder(assistedFactoryClassName)
+                    .addOriginatingKSFile(ksClass.containingFile!!)
                    .addSuperinterface(ClassName.bestGuess(assistedNodeFactoryFqName.asString()).parameterizedBy(nodeClassName))
                    .addAnnotation(AssistedFactory::class)
                    .addFunction(
@@ -155,10 +155,7 @@ class ContributesNodeProcessor(

        content.writeTo(
            codeGenerator = codeGenerator,
-            dependencies = Dependencies(
-                aggregating = true,
-                ksClass.containingFile!!
-            ),
+            dependencies = Dependencies(aggregating = false),
        )
    }

--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -301,6 +301,7 @@ dependencies {
    testImplementation(libs.test.turbine)
    testImplementation(projects.libraries.matrix.test)
    testImplementation(projects.services.toolbox.test)
+    testImplementation(projects.tests.testutils)

    koverDependencies()
 }
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -42,3 +42,12 @@
 }

 -keep class io.element.android.x.di.** { *; }
+
+
+# Keep LogSessionId class and related classes (https://github.com/androidx/media/issues/2535)
+-keep class android.media.metrics.LogSessionId { *; }
+-keep class android.media.metrics.** { *; }
+
+# Keep Media3 classes that use reflection (https://github.com/androidx/media/issues/2535)
+-keep class androidx.media3.** { *; }
+-dontwarn android.media.metrics.**
--- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
@@ -10,10 +10,14 @@ package io.element.android.x.initializer
 import android.content.Context
 import androidx.startup.Initializer
 import io.element.android.features.rageshake.impl.crash.VectorUncaughtExceptionHandler
+import io.element.android.features.rageshake.impl.di.RageshakeBindings
+import io.element.android.libraries.architecture.bindings

 class CrashInitializer : Initializer<Unit> {
    override fun create(context: Context) {
-        VectorUncaughtExceptionHandler(context).activate()
+        VectorUncaughtExceptionHandler(
+            context.bindings<RageshakeBindings>().preferencesCrashDataStore(),
+        ).activate()
    }

    override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
--- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
@@ -11,7 +11,7 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.net.toUri
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.deeplink.DeepLinkCreator
+import io.element.android.libraries.deeplink.api.DeepLinkCreator
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -33,7 +33,7 @@ class DefaultIntentProvider @Inject constructor(
    ): Intent {
        return Intent(context, MainActivity::class.java).apply {
            action = Intent.ACTION_VIEW
-            data = deepLinkCreator.room(sessionId, roomId, threadId).toUri()
+            data = deepLinkCreator.create(sessionId, roomId, threadId).toUri()
        }
    }
 }
--- a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
+++ b/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
@@ -5,15 +5,22 @@
 * Please see LICENSE files in the repository root for full details.
 */

+@file:Suppress("SameParameterValue")
+
 package io.element.android.x.intent

 import android.content.Context
 import android.content.Intent
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.deeplink.DeepLinkCreator
+import io.element.android.libraries.deeplink.api.DeepLinkCreator
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.A_THREAD_ID
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
 import io.element.android.x.MainActivity
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -23,45 +30,31 @@ import org.robolectric.RuntimeEnvironment
@RunWith(RobolectricTestRunner::class)
 class DefaultIntentProviderTest {
    @Test
-    fun `test getViewRoomIntent with Session`() {
-        val sut = createDefaultIntentProvider()
-        val result = sut.getViewRoomIntent(
-            sessionId = A_SESSION_ID,
-            roomId = null,
-            threadId = null,
+    fun `test getViewRoomIntent with data`() {
+        val deepLinkCreator = lambdaRecorder<SessionId, RoomId?, ThreadId?, String> { _, _, _ -> "deepLinkCreatorResult" }
+        val sut = createDefaultIntentProvider(
+            deepLinkCreator = { sessionId, roomId, threadId -> deepLinkCreator.invoke(sessionId, roomId, threadId) },
        )
-        result.commonAssertions()
-        assertThat(result.data.toString()).isEqualTo("elementx://open/@alice:server.org")
-    }
-
-    @Test
-    fun `test getViewRoomIntent with Session and Room`() {
-        val sut = createDefaultIntentProvider()
-        val result = sut.getViewRoomIntent(
-            sessionId = A_SESSION_ID,
-            roomId = A_ROOM_ID,
-            threadId = null,
-        )
-        result.commonAssertions()
-        assertThat(result.data.toString()).isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain")
-    }
-
-    @Test
-    fun `test getViewRoomIntent with Session, Room and Thread`() {
-        val sut = createDefaultIntentProvider()
        val result = sut.getViewRoomIntent(
            sessionId = A_SESSION_ID,
            roomId = A_ROOM_ID,
            threadId = A_THREAD_ID,
        )
        result.commonAssertions()
-        assertThat(result.data.toString()).isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId")
+        assertThat(result.data.toString()).isEqualTo("deepLinkCreatorResult")
+        deepLinkCreator.assertions().isCalledOnce().with(
+            value(A_SESSION_ID),
+            value(A_ROOM_ID),
+            value(A_THREAD_ID),
+        )
    }

-    private fun createDefaultIntentProvider(): DefaultIntentProvider {
+    private fun createDefaultIntentProvider(
+        deepLinkCreator: DeepLinkCreator = DeepLinkCreator { _, _, _ -> "" },
+    ): DefaultIntentProvider {
        return DefaultIntentProvider(
            context = RuntimeEnvironment.getApplication() as Context,
-            deepLinkCreator = DeepLinkCreator(),
+            deepLinkCreator = deepLinkCreator,
        )
    }

--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
    implementation(projects.libraries.core)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.architecture)
-    implementation(projects.libraries.deeplink)
+    implementation(projects.libraries.deeplink.api)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.oidc.api)
    implementation(projects.libraries.preferences.api)
@@ -65,6 +65,7 @@ dependencies {
    testImplementation(projects.features.rageshake.test)
    testImplementation(projects.services.appnavstate.test)
    testImplementation(projects.services.analytics.test)
+    testImplementation(projects.services.toolbox.test)
    testImplementation(libs.test.appyx.junit)
    testImplementation(libs.test.arch.core)
 }
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -46,7 +46,6 @@ import io.element.android.appnav.loggedin.SendQueues
 import io.element.android.appnav.room.RoomFlowNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
-import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.features.enterprise.api.SessionEnterpriseService
 import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.features.ftue.api.state.FtueService
@@ -60,6 +59,7 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.share.api.ShareEntryPoint
+import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
 import io.element.android.libraries.architecture.BackstackView
@@ -81,6 +81,7 @@ import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
+import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
@@ -94,15 +95,6 @@ import java.time.Duration
 import java.time.Instant
 import java.util.Optional
 import java.util.UUID
-import kotlin.collections.List
-import kotlin.collections.any
-import kotlin.collections.emptyList
-import kotlin.collections.first
-import kotlin.collections.forEach
-import kotlin.collections.listOf
-import kotlin.collections.mapNotNull
-import kotlin.collections.plus
-import kotlin.collections.setOf
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration
@@ -113,7 +105,7 @@ class LoggedInFlowNode @AssistedInject constructor(
    @Assisted plugins: List<Plugin>,
    private val homeEntryPoint: HomeEntryPoint,
    private val preferencesEntryPoint: PreferencesEntryPoint,
-    private val createRoomEntryPoint: CreateRoomEntryPoint,
+    private val startChatEntryPoint: StartChatEntryPoint,
    private val appNavigationStateService: AppNavigationStateService,
    private val secureBackupEntryPoint: SecureBackupEntryPoint,
    private val userProfileEntryPoint: UserProfileEntryPoint,
@@ -130,6 +122,7 @@ class LoggedInFlowNode @AssistedInject constructor(
    private val mediaPreviewConfigMigration: MediaPreviewConfigMigration,
    private val sessionEnterpriseService: SessionEnterpriseService,
    private val networkMonitor: NetworkMonitor,
+    private val notificationConversationService: NotificationConversationService,
    snackbarDispatcher: SnackbarDispatcher,
 ) : BaseFlowNode<LoggedInFlowNode.NavTarget>(
    backstack = BackStack(
@@ -215,6 +208,12 @@ class LoggedInFlowNode @AssistedInject constructor(
                    }
                    .launchIn(lifecycleScope)
            },
+            onResume = {
+                lifecycleScope.launch {
+                    val availableRoomIds = matrixClient.getJoinedRoomIds().getOrNull() ?: return@launch
+                    notificationConversationService.onAvailableRoomsChanged(sessionId = matrixClient.sessionId, roomIds = availableRoomIds)
+                }
+            },
            onDestroy = {
                appNavigationStateService.onLeavingSpace(id)
                appNavigationStateService.onLeavingSession(id)
@@ -304,7 +303,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                        backstack.push(NavTarget.Settings())
                    }

-                    override fun onCreateRoomClick() {
+                    override fun onStartChatClick() {
                        backstack.push(NavTarget.CreateRoom)
                    }

@@ -422,7 +421,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                    .build()
            }
            NavTarget.CreateRoom -> {
-                val callback = object : CreateRoomEntryPoint.Callback {
+                val callback = object : StartChatEntryPoint.Callback {
                    override fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>) {
                        backstack.replace(NavTarget.Room(roomIdOrAlias = roomIdOrAlias, serverNames = serverNames))
                    }
@@ -432,7 +431,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                    }
                }

-                createRoomEntryPoint
+                startChatEntryPoint
                    .nodeBuilder(this, buildContext)
                    .callback(callback)
                    .build()
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -44,7 +44,7 @@ import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.core.uri.ensureProtocol
-import io.element.android.libraries.deeplink.DeeplinkData
+import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
--- a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
@@ -10,8 +10,8 @@ package io.element.android.appnav.intent
 import android.content.Intent
 import io.element.android.features.login.api.LoginIntentResolver
 import io.element.android.features.login.api.LoginParams
-import io.element.android.libraries.deeplink.DeeplinkData
-import io.element.android.libraries.deeplink.DeeplinkParser
+import io.element.android.libraries.deeplink.api.DeeplinkData
+import io.element.android.libraries.deeplink.api.DeeplinkParser
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.oidc.api.OidcAction
--- a/appnav/src/main/res/values-ur/translations.xml
+++ b/appnav/src/main/res/values-ur/translations.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"لاگ آؤٹ اور اپ گریڈ کریں"</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"آپ کا homeserver اب پرانے پروٹوکول کو سپورٹ نہیں کرتا ہے۔ براہ کرم لاگ آؤٹ کریں اور ایپ کا استعمال جاری رکھنے کے لیے دوبارہ لاگ ان کریں۔"</string>
+</resources>
--- a/appnav/src/main/res/values-uz/translations.xml
+++ b/appnav/src/main/res/values-uz/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"Tizmdan chiqish va yangilash"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s endi eski protokolni qoʻllab-quvvatlamaydi. Iltimos, ilovadan foydalanishni davom ettirish uchun tizimdan chiqing va qayta kiring."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Sizning uy serveringiz endi eski protokolni qoʻllab-quvvatlamaydi. Iltimos, ilovadan foydalanishni davom ettirish uchun tizimdan qayta chiqib-kiring."</string>
+</resources>
--- a/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/RootPresenterTest.kt
@@ -19,6 +19,7 @@ import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.services.apperror.api.AppErrorState
 import io.element.android.services.apperror.api.AppErrorStateService
 import io.element.android.services.apperror.impl.DefaultAppErrorStateService
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
@@ -42,7 +43,9 @@ class RootPresenterTest {
    @Test
    fun `present - passes app error state`() = runTest {
        val presenter = createRootPresenter(
-            appErrorService = DefaultAppErrorStateService().apply {
+            appErrorService = DefaultAppErrorStateService(
+                stringProvider = FakeStringProvider(),
+            ).apply {
                showError("Bad news", "Something bad happened")
            }
        )
@@ -61,7 +64,9 @@ class RootPresenterTest {
    }

    private fun createRootPresenter(
-        appErrorService: AppErrorStateService = DefaultAppErrorStateService(),
+        appErrorService: AppErrorStateService = DefaultAppErrorStateService(
+            stringProvider = FakeStringProvider(),
+        ),
    ): RootPresenter {
        return RootPresenter(
            crashDetectionPresenter = { aCrashDetectionState() },
--- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
@@ -14,9 +14,7 @@ import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.login.api.LoginParams
 import io.element.android.features.login.test.FakeLoginIntentResolver
-import io.element.android.libraries.deeplink.DeepLinkCreator
-import io.element.android.libraries.deeplink.DeeplinkData
-import io.element.android.libraries.deeplink.DeeplinkParser
+import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -46,15 +44,11 @@ class IntentResolverTest {

    @Test
    fun `test resolve navigation intent root`() {
-        val sut = createIntentResolver()
+        val sut = createIntentResolver(
+            deeplinkParserResult = DeeplinkData.Root(A_SESSION_ID)
+        )
        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
            action = Intent.ACTION_VIEW
-            data = DeepLinkCreator().room(
-                sessionId = A_SESSION_ID,
-                roomId = null,
-                threadId = null,
-            )
-                .toUri()
        }
        val result = sut.resolve(intent)
        assertThat(result).isEqualTo(
@@ -68,15 +62,15 @@ class IntentResolverTest {

    @Test
    fun `test resolve navigation intent room`() {
-        val sut = createIntentResolver()
-        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
-            action = Intent.ACTION_VIEW
-            data = DeepLinkCreator().room(
+        val sut = createIntentResolver(
+            deeplinkParserResult = DeeplinkData.Room(
                sessionId = A_SESSION_ID,
                roomId = A_ROOM_ID,
                threadId = null,
            )
-                .toUri()
+        )
+        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
+            action = Intent.ACTION_VIEW
        }
        val result = sut.resolve(intent)
        assertThat(result).isEqualTo(
@@ -92,15 +86,15 @@ class IntentResolverTest {

    @Test
    fun `test resolve navigation intent thread`() {
-        val sut = createIntentResolver()
-        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
-            action = Intent.ACTION_VIEW
-            data = DeepLinkCreator().room(
+        val sut = createIntentResolver(
+            deeplinkParserResult = DeeplinkData.Room(
                sessionId = A_SESSION_ID,
                roomId = A_ROOM_ID,
                threadId = A_THREAD_ID,
            )
-                .toUri()
+        )
+        val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
+            action = Intent.ACTION_VIEW
        }
        val result = sut.resolve(intent)
        assertThat(result).isEqualTo(
@@ -240,12 +234,13 @@ class IntentResolverTest {
    }

    private fun createIntentResolver(
+        deeplinkParserResult: DeeplinkData? = null,
        permalinkParserResult: (String) -> PermalinkData = { lambdaError() },
        loginIntentResolverResult: (String) -> LoginParams? = { lambdaError() },
        oidcIntentResolverResult: (Intent) -> OidcAction? = { lambdaError() },
    ): IntentResolver {
        return IntentResolver(
-            deeplinkParser = DeeplinkParser(),
+            deeplinkParser = { deeplinkParserResult },
            loginIntentResolver = FakeLoginIntentResolver(
                parseResult = loginIntentResolverResult,
            ),
--- a/fastlane/metadata/android/en-US/changelogs/202508040.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202508040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: you can now create shortcuts to your recent conversations, several bug fixes related to media processing and downloading.
+Full changelog: https://github.com/element-hq/element-x-android/releases
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
@@ -8,9 +8,8 @@
 package io.element.android.features.analytics.impl

 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import javax.inject.Inject

-open class AnalyticsOptInStateProvider @Inject constructor() : PreviewParameterProvider<AnalyticsOptInState> {
+open class AnalyticsOptInStateProvider : PreviewParameterProvider<AnalyticsOptInState> {
    override val values: Sequence<AnalyticsOptInState>
        get() = sequenceOf(
            aAnalyticsOptInState(),
--- a/features/call/impl/src/main/res/values-uz/translations.xml
+++ b/features/call/impl/src/main/res/values-uz/translations.xml
@@ -2,5 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="call_foreground_service_channel_title_android">"Davom etayotgan qo\'ng\'iroq"</string>
  <string name="call_foreground_service_message_android">"Qo\'ng\'iroqqa qaytish uchun bosing"</string>
-  <string name="call_foreground_service_title_android">"☎️ Qo‘ng‘iroq davom etmoqda"</string>
+  <string name="call_foreground_service_title_android">"☎️ Qoʻngʻiroq davom etmoqda"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call ushbu Android versiyasida Bluetooth audio qurilmalaridan foydalanishni qoʻllab-quvvatlamaydi. Iltimos, boshqa audio qurilmani tanlang."</string>
 </resources>
--- a/features/call/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/call/impl/src/main/res/values-zh-rTW/translations.xml
@@ -3,5 +3,6 @@
  <string name="call_foreground_service_channel_title_android">"進行中的通話"</string>
  <string name="call_foreground_service_message_android">"點擊以返回到通話頁面"</string>
  <string name="call_foreground_service_title_android">"☎️ 通話中"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支援在此 Android 版本中使用藍牙音訊裝置。請選取其他音訊裝置。"</string>
  <string name="screen_incoming_call_subtitle_android">"Element 來電"</string>
 </resources>
--- a/features/call/impl/src/main/res/values-zh/translations.xml
+++ b/features/call/impl/src/main/res/values-zh/translations.xml
@@ -3,5 +3,6 @@
  <string name="call_foreground_service_channel_title_android">"通话进行中"</string>
  <string name="call_foreground_service_message_android">"点按即可返回通话"</string>
  <string name="call_foreground_service_title_android">"☎️ 通话中"</string>
+  <string name="call_invalid_audio_device_bluetooth_devices_disabled">"Element Call 不支持在此 Android 版本中使用蓝牙音频设备。请选择其他音频设备。"</string>
  <string name="screen_incoming_call_subtitle_android">"Element 来电"</string>
 </resources>
--- a/features/changeroommemberroles/api/build.gradle.kts
+++ b/features/changeroommemberroles/api/build.gradle.kts
@@ -1,5 +1,3 @@
-import extension.setupAnvil
-
 /*
 * Copyright 2025 New Vector Ltd.
 *
@@ -16,8 +14,6 @@ android {
    namespace = "io.element.android.features.changeroommemberroles.api"
 }

-setupAnvil()
-
 dependencies {
    implementation(projects.anvilannotations)
    implementation(projects.libraries.architecture)
--- a/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-et/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_room_change_permissions_administrators">"Vaid peakasutajad"</string>
  <string name="screen_room_change_permissions_ban_people">"Suhtluskeelu seadmine"</string>
-  <string name="screen_room_change_permissions_delete_messages">"Sõnumite kustutamine"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Eemalda sõnumid"</string>
  <string name="screen_room_change_permissions_everyone">"Kõik"</string>
  <string name="screen_room_change_permissions_invite_people">"Kutsu teisi osalejaid ja vasta ise liitumiskutsetele"</string>
  <string name="screen_room_change_permissions_member_moderation">"Jututoas osalejate modereerimine"</string>
--- a/features/changeroommemberroles/impl/src/main/res/values-eu/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-eu/translations.xml
@@ -16,6 +16,7 @@
  <string name="screen_room_change_permissions_send_messages">"Bidali mezuak"</string>
  <string name="screen_room_change_role_administrators_title">"Editatu administratzaileak"</string>
  <string name="screen_room_change_role_confirm_add_admin_title">"Administratzailea gehitu?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Jabetza eskualdatu?"</string>
  <string name="screen_room_change_role_confirm_demote_self_action">"Jaitsi mailaz"</string>
  <string name="screen_room_change_role_confirm_demote_self_description">"Ezin izango duzu hau aldatu zure burua mailaz jaisten ari zarelako, zu bazara gelan baimenak dituen azken erabiltzailea ezin izango dira baimenak berreskuratu."</string>
  <string name="screen_room_change_role_confirm_demote_self_title">"Zure burua mailaz jaitsi?"</string>
@@ -23,6 +24,7 @@
  <string name="screen_room_change_role_invited_member_name_android">"(Egiteke)"</string>
  <string name="screen_room_change_role_moderators_admin_section_footer">"Administratzaileek automatikoki dute moderatzaile-pribilegioak"</string>
  <string name="screen_room_change_role_moderators_title">"Editatu moderatzaileak"</string>
+  <string name="screen_room_change_role_owners_title">"Aukeratu jabeak"</string>
  <string name="screen_room_change_role_section_administrators">"Administratzaileak"</string>
  <string name="screen_room_change_role_section_moderators">"Moderatzaileak"</string>
  <string name="screen_room_change_role_section_users">"Kideak"</string>
@@ -42,15 +44,18 @@
  <string name="screen_room_member_list_pending_header_title">"Zain"</string>
  <string name="screen_room_member_list_role_administrator">"Kudeatzailea"</string>
  <string name="screen_room_member_list_role_moderator">"Moderatzailea"</string>
+  <string name="screen_room_member_list_role_owner">"Jabea"</string>
  <string name="screen_room_member_list_room_members_header_title">"Gelako kideak"</string>
  <string name="screen_room_member_list_unbanning_user">"%1$s(r)i debekua kentzen"</string>
  <string name="screen_room_roles_and_permissions_admins">"Administratzaileak"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Administratzaileak eta jabeak"</string>
  <string name="screen_room_roles_and_permissions_change_my_role">"Aldatu nire rola"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Jaitsi maila, kidera"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Jaitsi maila, moderatzailera"</string>
  <string name="screen_room_roles_and_permissions_member_moderation">"Kideen moderazioa"</string>
  <string name="screen_room_roles_and_permissions_messages_and_content">"Mezuak eta edukiak"</string>
  <string name="screen_room_roles_and_permissions_moderators">"Moderatzaileak"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Jabeak"</string>
  <string name="screen_room_roles_and_permissions_permissions_header">"Baimenak"</string>
  <string name="screen_room_roles_and_permissions_reset">"Berrezarri baimenak"</string>
  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Baimenak berrezarritakoan, uneko ezarpenak galduko dituzu."</string>
--- a/features/changeroommemberroles/impl/src/main/res/values-fa/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-fa/translations.xml
@@ -29,6 +29,10 @@
  <string name="screen_room_change_role_section_users">"اعضا"</string>
  <string name="screen_room_change_role_unsaved_changes_description">"تغییراتی ذخیره نشده دارید."</string>
  <string name="screen_room_change_role_unsaved_changes_title">"ذخیرهٔ تغییرات؟"</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="one">"%1$d نفر"</item>
+    <item quantity="other">"%1$d نفر"</item>
+  </plurals>
  <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"برداشت و تحریم عضو"</string>
  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"تنها برداشتن عضو"</string>
  <string name="screen_room_member_list_manage_member_unban_action">"رفع انسداد"</string>
--- a/features/changeroommemberroles/impl/src/main/res/values-in/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-in/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="screen_room_change_permissions_administrators">"Hanya admin"</string>
  <string name="screen_room_change_permissions_ban_people">"Cekal orang-orang"</string>
-  <string name="screen_room_change_permissions_delete_messages">"Hapus pesan"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Hilangkan pesan"</string>
  <string name="screen_room_change_permissions_everyone">"Semua orang"</string>
  <string name="screen_room_change_permissions_invite_people">"Undang orang-orang dan terima permintaan untuk bergabung"</string>
  <string name="screen_room_change_permissions_member_moderation">"Moderasi anggota"</string>
--- a/features/changeroommemberroles/impl/src/main/res/values-sv/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-sv/translations.xml
@@ -17,13 +17,17 @@
  <string name="screen_room_change_role_administrators_title">"Redigera administratörer"</string>
  <string name="screen_room_change_role_confirm_add_admin_description">"Du kommer inte att kunna ångra den här åtgärden. Du befordrar användaren till att ha samma behörighetsnivå som du."</string>
  <string name="screen_room_change_role_confirm_add_admin_title">"Lägg till Admin?"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"Du kommer inte att kunna ångra den här åtgärden. Du överför ägarskapet till de valda användarna. När du lämnar kommer detta att vara permanent."</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"Överför ägarskap?"</string>
  <string name="screen_room_change_role_confirm_demote_self_action">"Degradera"</string>
  <string name="screen_room_change_role_confirm_demote_self_description">"Du kommer inte att kunna ångra denna ändring eftersom du degraderar dig själv, om du är den sista privilegierade användaren i rummet kommer det att vara omöjligt att återfå privilegier."</string>
  <string name="screen_room_change_role_confirm_demote_self_title">"Degradera dig själv?"</string>
  <string name="screen_room_change_role_invited_member_name">"%1$s (Väntar)"</string>
  <string name="screen_room_change_role_invited_member_name_android">"(Väntar)"</string>
  <string name="screen_room_change_role_moderators_admin_section_footer">"Administratörer har automatiskt moderatorbehörighet"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"Ägare har automatiskt administratörsbehörighet."</string>
  <string name="screen_room_change_role_moderators_title">"Redigera moderatorer"</string>
+  <string name="screen_room_change_role_owners_title">"Välj ägare"</string>
  <string name="screen_room_change_role_section_administrators">"Administratörer"</string>
  <string name="screen_room_change_role_section_moderators">"Moderatorer"</string>
  <string name="screen_room_change_role_section_users">"Medlemmar"</string>
@@ -44,15 +48,18 @@
  <string name="screen_room_member_list_pending_header_title">"Väntar"</string>
  <string name="screen_room_member_list_role_administrator">"Admin"</string>
  <string name="screen_room_member_list_role_moderator">"Moderator"</string>
+  <string name="screen_room_member_list_role_owner">"Ägare"</string>
  <string name="screen_room_member_list_room_members_header_title">"Rumsmedlemmar"</string>
  <string name="screen_room_member_list_unbanning_user">"Avbannar %1$s"</string>
  <string name="screen_room_roles_and_permissions_admins">"Administratörer"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"Administratörer och ägare"</string>
  <string name="screen_room_roles_and_permissions_change_my_role">"Ändra min roll"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Degradera till medlem"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Degradera till moderator"</string>
  <string name="screen_room_roles_and_permissions_member_moderation">"Medlemsmoderering"</string>
  <string name="screen_room_roles_and_permissions_messages_and_content">"Meddelanden och innehåll"</string>
  <string name="screen_room_roles_and_permissions_moderators">"Moderatorer"</string>
+  <string name="screen_room_roles_and_permissions_owners">"Ägare"</string>
  <string name="screen_room_roles_and_permissions_permissions_header">"Behörigheter"</string>
  <string name="screen_room_roles_and_permissions_reset">"Återställ behörigheter"</string>
  <string name="screen_room_roles_and_permissions_reset_confirm_description">"När du har återställt behörigheterna kommer du att förlora de aktuella inställningarna."</string>
--- a/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/changeroommemberroles/impl/src/main/res/values-zh-rTW/translations.xml
@@ -17,13 +17,17 @@
  <string name="screen_room_change_role_administrators_title">"編輯管理員"</string>
  <string name="screen_room_change_role_confirm_add_admin_description">"您將無法復原此動作。您正將使用者提昇至與您相同的權力等級。"</string>
  <string name="screen_room_change_role_confirm_add_admin_title">"要新增管理員嗎？"</string>
+  <string name="screen_room_change_role_confirm_change_owners_description">"您將無法撤銷此動作。您正在將所有權轉移給選定的使用者。一旦您離開，此動作將永久有效。"</string>
+  <string name="screen_room_change_role_confirm_change_owners_title">"轉移所有權？"</string>
  <string name="screen_room_change_role_confirm_demote_self_action">"降級"</string>
  <string name="screen_room_change_role_confirm_demote_self_description">"當您自行降級時，您將無法復原此變更，若您是聊天室中的最後一位特權使用者，則無法重新獲得權限。"</string>
  <string name="screen_room_change_role_confirm_demote_self_title">"將自己降級？"</string>
  <string name="screen_room_change_role_invited_member_name">"%1$s（擱置中）"</string>
  <string name="screen_room_change_role_invited_member_name_android">"（擱置中）"</string>
  <string name="screen_room_change_role_moderators_admin_section_footer">"管理員自動擁有版主權限"</string>
+  <string name="screen_room_change_role_moderators_owner_section_footer">"擁有者自動擁有管理員權限。"</string>
  <string name="screen_room_change_role_moderators_title">"編輯版主"</string>
+  <string name="screen_room_change_role_owners_title">"選擇擁有者"</string>
  <string name="screen_room_change_role_section_administrators">"管理員"</string>
  <string name="screen_room_change_role_section_moderators">"版主"</string>
  <string name="screen_room_change_role_section_users">"成員"</string>
@@ -43,15 +47,18 @@
  <string name="screen_room_member_list_pending_header_title">"待定"</string>
  <string name="screen_room_member_list_role_administrator">"管理員"</string>
  <string name="screen_room_member_list_role_moderator">"版主"</string>
+  <string name="screen_room_member_list_role_owner">"擁有者"</string>
  <string name="screen_room_member_list_room_members_header_title">"聊天室成員"</string>
  <string name="screen_room_member_list_unbanning_user">"正在解除黑名單 %1$s"</string>
  <string name="screen_room_roles_and_permissions_admins">"管理員"</string>
+  <string name="screen_room_roles_and_permissions_admins_and_owners">"管理員與擁有者"</string>
  <string name="screen_room_roles_and_permissions_change_my_role">"變更我的身份"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"降級為普通成員"</string>
  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"降級為版主"</string>
  <string name="screen_room_roles_and_permissions_member_moderation">"成員管理"</string>
  <string name="screen_room_roles_and_permissions_messages_and_content">"訊息與內容"</string>
  <string name="screen_room_roles_and_permissions_moderators">"版主"</string>
+  <string name="screen_room_roles_and_permissions_owners">"擁有者"</string>
  <string name="screen_room_roles_and_permissions_permissions_header">"權限"</string>
  <string name="screen_room_roles_and_permissions_reset">"重設權限"</string>
  <string name="screen_room_roles_and_permissions_reset_confirm_description">"重設之後，您會遺失當前的設定。"</string>
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -11,17 +11,17 @@ import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.libraries.architecture.FeatureEntryPoint
-import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.RoomId

 interface CreateRoomEntryPoint : FeatureEntryPoint {
    fun nodeBuilder(parentNode: Node, buildContext: BuildContext): NodeBuilder
+
    interface NodeBuilder {
        fun callback(callback: Callback): NodeBuilder
        fun build(): Node
    }

    interface Callback : Plugin {
-        fun onOpenRoom(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>)
-        fun onOpenRoomDirectory()
+        fun onRoomCreated(roomId: RoomId)
    }
 }
--- a/features/createroom/impl/build.gradle.kts
+++ b/features/createroom/impl/build.gradle.kts
@@ -1,4 +1,3 @@
-import extension.ComponentMergingStrategy
 import extension.setupAnvil

 /*
@@ -23,7 +22,7 @@ android {
    }
 }

-setupAnvil(componentMergingStrategy = ComponentMergingStrategy.KSP)
+setupAnvil()

 dependencies {
    implementation(projects.libraries.core)
@@ -33,7 +32,7 @@ dependencies {
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.uiStrings)
    implementation(projects.libraries.androidutils)
-    implementation(projects.libraries.deeplink)
+    implementation(projects.libraries.deeplink.api)
    implementation(projects.libraries.mediapickers.api)
    implementation(projects.libraries.mediaupload.api)
    implementation(projects.libraries.permissions.api)
@@ -41,6 +40,7 @@ dependencies {
    implementation(projects.services.analytics.api)
    implementation(libs.coil.compose)
    implementation(projects.libraries.featureflag.api)
+    implementation(projects.features.invitepeople.api)
    api(projects.features.createroom.api)

    testImplementation(libs.test.junit)
@@ -56,7 +56,7 @@ dependencies {
    testImplementation(projects.libraries.mediaupload.test)
    testImplementation(projects.libraries.permissions.test)
    testImplementation(projects.libraries.usersearch.test)
-    testImplementation(projects.features.createroom.test)
+    testImplementation(projects.features.startchat.test)
    testImplementation(projects.libraries.featureflag.test)
    testImplementation(projects.tests.testutils)
    testImplementation(libs.androidx.compose.ui.test.junit)
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/ConfigureRoomFlowNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/ConfigureRoomFlowNode.kt
@@ -1,83 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl
-
-import android.os.Parcelable
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.node.Node
-import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
-import com.bumble.appyx.navmodel.backstack.BackStack
-import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.createroom.CreateRoomNavigator
-import io.element.android.features.createroom.impl.addpeople.AddPeopleNode
-import io.element.android.features.createroom.impl.configureroom.ConfigureRoomNode
-import io.element.android.features.createroom.impl.di.CreateRoomComponent
-import io.element.android.libraries.architecture.BackstackView
-import io.element.android.libraries.architecture.BaseFlowNode
-import io.element.android.libraries.architecture.bindings
-import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.libraries.di.SessionScope
-import kotlinx.parcelize.Parcelize
-
-@ContributesNode(SessionScope::class)
-class ConfigureRoomFlowNode @AssistedInject constructor(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-) : DaggerComponentOwner,
-    BaseFlowNode<ConfigureRoomFlowNode.NavTarget>(
-        backstack = BackStack(
-            initialElement = NavTarget.Root,
-            savedStateMap = buildContext.savedStateMap,
-        ),
-        buildContext = buildContext,
-        plugins = plugins
-    ) {
-    private val component by lazy {
-        parent!!.bindings<CreateRoomComponent.ParentBindings>().createRoomComponentBuilder().build()
-    }
-    private val navigator = plugins<CreateRoomNavigator>().first()
-
-    override val daggerComponent: Any
-        get() = component
-
-    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object Root : NavTarget
-
-        @Parcelize
-        data object ConfigureRoom : NavTarget
-    }
-
-    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
-        return when (navTarget) {
-            NavTarget.Root -> {
-                val callback = object : AddPeopleNode.Callback {
-                    override fun onContinue() {
-                        backstack.push(NavTarget.ConfigureRoom)
-                    }
-                }
-                createNode<AddPeopleNode>(buildContext = buildContext, plugins = listOf(callback))
-            }
-            NavTarget.ConfigureRoom -> {
-                createNode<ConfigureRoomNode>(buildContext = buildContext, plugins = listOf(navigator))
-            }
-        }
-    }
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        BackstackView()
-    }
-}
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -8,28 +8,25 @@
 package io.element.android.features.createroom.impl

 import android.os.Parcelable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
-import com.bumble.appyx.core.navigation.transition.JumpToEndTransitionHandler
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
+import com.bumble.appyx.navmodel.backstack.operation.replace
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.createroom.DefaultCreateRoomNavigator
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
-import io.element.android.features.createroom.impl.joinbyaddress.JoinRoomByAddressNode
-import io.element.android.features.createroom.impl.root.CreateRoomRootNode
+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.OverlayView
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.parcelize.Parcelize

@ContributesNode(SessionScope::class)
@@ -38,53 +35,48 @@ class CreateRoomFlowNode @AssistedInject constructor(
    @Assisted plugins: List<Plugin>,
 ) : BaseFlowNode<CreateRoomFlowNode.NavTarget>(
    backstack = BackStack(
-        initialElement = NavTarget.Root,
+        initialElement = NavTarget.ConfigureRoom,
        savedStateMap = buildContext.savedStateMap,
    ),
    buildContext = buildContext,
    plugins = plugins
 ) {
-    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object Root : NavTarget
-
-        @Parcelize
-        data object NewRoom : NavTarget
-
-        @Parcelize
-        data object JoinByAddress : NavTarget
+    private fun onRoomCreated(roomId: RoomId) {
+        plugins<CreateRoomEntryPoint.Callback>().forEach { it.onRoomCreated(roomId) }
    }

-    private val navigator = DefaultCreateRoomNavigator(
-        backstack = backstack,
-        overlay = overlay,
-        openRoom = { roomIdOrAlias, viaServers ->
-            plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoom(roomIdOrAlias, viaServers) }
-        },
-        openRoomDirectory = {
-            plugins<CreateRoomEntryPoint.Callback>().forEach { it.onOpenRoomDirectory() }
-        }
-    )
-
    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
-            NavTarget.Root -> {
-                createNode<CreateRoomRootNode>(buildContext = buildContext, plugins = listOf(navigator))
+            NavTarget.ConfigureRoom -> {
+                val callback = object : ConfigureRoomNode.Callback {
+                    override fun onCreateRoomSuccess(roomId: RoomId) {
+                        backstack.replace(NavTarget.AddPeople(roomId))
+                    }
+                }
+                createNode<ConfigureRoomNode>(buildContext, plugins = listOf(callback))
            }
-            NavTarget.NewRoom -> {
-                createNode<ConfigureRoomFlowNode>(buildContext = buildContext, plugins = listOf(navigator))
-            }
-            NavTarget.JoinByAddress -> {
-                createNode<JoinRoomByAddressNode>(buildContext = buildContext, plugins = listOf(navigator))
+            is NavTarget.AddPeople -> {
+                val inputs = AddPeopleNode.Inputs(navTarget.roomId)
+                val callback: AddPeopleNode.Callback = object : AddPeopleNode.Callback {
+                    override fun onFinish() {
+                        onRoomCreated(navTarget.roomId)
+                    }
+                }
+                createNode<AddPeopleNode>(buildContext, plugins = listOf(inputs, callback))
            }
        }
    }

    @Composable
    override fun View(modifier: Modifier) {
-        Box(modifier = modifier) {
-            BackstackView()
-            OverlayView(transitionHandler = remember { JumpToEndTransitionHandler() })
-        }
+        BackstackView()
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object ConfigureRoom : 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -13,10 +13,10 @@ import com.bumble.appyx.core.plugin.Plugin
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.di.SessionScope
 import javax.inject.Inject

-@ContributesBinding(AppScope::class)
+@ContributesBinding(SessionScope::class)
 class DefaultCreateRoomEntryPoint @Inject constructor() : CreateRoomEntryPoint {
    override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
        val plugins = ArrayList<Plugin>()
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2023, 2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -16,30 +16,46 @@ import com.bumble.appyx.core.plugin.plugins
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.createroom.impl.di.CreateRoomScope
+import io.element.android.features.invitepeople.api.InvitePeoplePresenter
+import io.element.android.features.invitepeople.api.InvitePeopleRenderer
+import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId

-@ContributesNode(CreateRoomScope::class)
+@ContributesNode(SessionScope::class)
 class AddPeopleNode @AssistedInject constructor(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    private val presenter: AddPeoplePresenter,
+    invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,
+    private val invitePeopleRenderer: InvitePeopleRenderer,
 ) : Node(buildContext, plugins = plugins) {
+    data class Inputs(
+        val roomId: RoomId,
+    ) : NodeInputs
+
    interface Callback : Plugin {
-        fun onContinue()
+        fun onFinish()
    }

-    private fun onContinue() {
-        plugins<Callback>().forEach { it.onContinue() }
+    private fun onFinish() {
+        plugins<Callback>().forEach { it.onFinish() }
    }

+    private val roomId = inputs<Inputs>().roomId
+    private val invitePeoplePresenter = invitePeoplePresenterFactory.create(
+        joinedRoom = null,
+        roomId = roomId,
+    )
+
    @Composable
    override fun View(modifier: Modifier) {
-        val state = presenter.present()
+        val state = invitePeoplePresenter.present()
        AddPeopleView(
            state = state,
-            modifier = modifier,
-            onBackClick = this::navigateUp,
-            onNextClick = this::onContinue,
-        )
+            onFinish = ::onFinish,
+        ) {
+            invitePeopleRenderer.Render(state, Modifier)
+        }
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenter.kt
@@ -1,37 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.addpeople
-
-import androidx.compose.runtime.Composable
-import io.element.android.features.createroom.impl.CreateRoomDataStore
-import io.element.android.features.createroom.impl.userlist.SelectionMode
-import io.element.android.features.createroom.impl.userlist.UserListPresenter
-import io.element.android.features.createroom.impl.userlist.UserListPresenterArgs
-import io.element.android.features.createroom.impl.userlist.UserListState
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.usersearch.api.UserRepository
-import javax.inject.Inject
-
-class AddPeoplePresenter @Inject constructor(
-    userListPresenterFactory: UserListPresenter.Factory,
-    userRepository: UserRepository,
-    dataStore: CreateRoomDataStore,
-) : Presenter<UserListState> {
-    private val userListPresenter = userListPresenterFactory.create(
-        UserListPresenterArgs(
-            selectionMode = SelectionMode.Multiple,
-        ),
-        userRepository,
-        dataStore.selectedUserListDataStore,
-    )
-
-    @Composable
-    override fun present(): UserListState {
-        return userListPresenter.present()
-    }
-}
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleUserListStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleUserListStateProvider.kt
@@ -1,46 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.addpeople
-
-import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.createroom.impl.userlist.SelectionMode
-import io.element.android.features.createroom.impl.userlist.UserListState
-import io.element.android.features.createroom.impl.userlist.aRecentDirectRoomList
-import io.element.android.features.createroom.impl.userlist.aUserListState
-import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.ui.components.aMatrixUserList
-import io.element.android.libraries.usersearch.api.UserSearchResult
-import kotlinx.collections.immutable.toImmutableList
-
-open class AddPeopleUserListStateProvider : PreviewParameterProvider<UserListState> {
-    override val values: Sequence<UserListState>
-        get() = sequenceOf(
-            aUserListState(),
-            aUserListState(
-                searchResults = SearchBarResultState.Results(aMatrixUserList().toImmutableList()),
-                selectedUsers = aMatrixUserList().toImmutableList(),
-                isSearchActive = false,
-                selectionMode = SelectionMode.Multiple,
-            ),
-            aUserListState(
-                searchResults = SearchBarResultState.Results(
-                    aMatrixUserList()
-                        .mapIndexed { index, matrixUser ->
-                            UserSearchResult(matrixUser, index % 2 == 0)
-                        }
-                        .toImmutableList()
-                ),
-                selectedUsers = aMatrixUserList().toImmutableList(),
-                isSearchActive = true,
-                selectionMode = SelectionMode.Multiple,
-            ),
-            aUserListState(
-                recentDirectRooms = aRecentDirectRoomList(),
-            ),
-        )
-}
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2024 New Vector Ltd.
+ * Copyright 2025 New Vector Ltd.
 *
 * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 * Please see LICENSE files in the repository root for full details.
@@ -7,77 +7,68 @@

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

-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
 import io.element.android.features.createroom.impl.R
-import io.element.android.features.createroom.impl.components.UserListView
-import io.element.android.features.createroom.impl.userlist.UserListEvents
-import io.element.android.features.createroom.impl.userlist.UserListState
-import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.features.invitepeople.api.InvitePeopleEvents
+import io.element.android.features.invitepeople.api.InvitePeopleState
+import io.element.android.features.invitepeople.api.InvitePeopleStateProvider
+import io.element.android.libraries.designsystem.atomic.pages.HeaderFooterPage
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
-import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Button
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.ui.strings.CommonStrings

@Composable
 fun AddPeopleView(
-    state: UserListState,
-    onBackClick: () -> Unit,
-    onNextClick: () -> Unit,
+    state: InvitePeopleState,
+    onFinish: () -> Unit,
    modifier: Modifier = Modifier,
+    invitePeopleView: @Composable () -> Unit,
 ) {
-    Scaffold(
+    HeaderFooterPage(
        modifier = modifier,
+        contentPadding = PaddingValues(0.dp),
        topBar = {
-            AddPeopleViewTopBar(
-                hasSelectedUsers = state.selectedUsers.isNotEmpty(),
-                onBackClick = {
-                    if (state.isSearchActive) {
-                        state.eventSink(UserListEvents.OnSearchActiveChanged(false))
-                    } else {
-                        onBackClick()
-                    }
+            AddPeopleTopBar(onSkipClick = onFinish)
+        },
+        footer = {
+            Button(
+                text = stringResource(CommonStrings.action_finish),
+                onClick = {
+                    state.eventSink(InvitePeopleEvents.SendInvites)
+                    onFinish()
                },
-                onNextClick = onNextClick,
+                enabled = state.canInvite,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(bottom = 16.dp)
            )
-        }
-    ) { padding ->
-        UserListView(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-                .consumeWindowInsets(padding),
-            state = state,
-            showBackButton = false,
-            onSelectUser = {},
-            onDeselectUser = {},
-        )
-    }
+        },
+        content = invitePeopleView
+    )
 }

@OptIn(ExperimentalMaterial3Api::class)
@Composable
-private fun AddPeopleViewTopBar(
-    hasSelectedUsers: Boolean,
-    onBackClick: () -> Unit,
-    onNextClick: () -> Unit,
+private fun AddPeopleTopBar(
+    onSkipClick: () -> Unit,
 ) {
    TopAppBar(
-        titleStr = stringResource(id = R.string.screen_create_room_add_people_title),
-        navigationIcon = { BackButton(onClick = onBackClick) },
+        titleStr = stringResource(R.string.screen_create_room_add_people_title),
        actions = {
-            val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip
            TextButton(
-                text = stringResource(id = textActionResId),
-                onClick = onNextClick,
+                text = stringResource(CommonStrings.action_skip),
+                onClick = onSkipClick,
            )
        }
    )
@@ -85,10 +76,10 @@ private fun AddPeopleViewTopBar(

@PreviewsDayNight
@Composable
-internal fun AddPeopleViewPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) = ElementPreview {
+internal fun AddPeopleViewPreview(@PreviewParameter(InvitePeopleStateProvider::class) state: InvitePeopleState) = ElementPreview {
    AddPeopleView(
        state = state,
-        onBackClick = {},
-        onNextClick = {},
+        invitePeopleView = {},
+        onFinish = {},
    )
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt
@@ -7,7 +7,6 @@

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

-import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.ui.media.AvatarAction

 sealed interface ConfigureRoomEvents {
@@ -16,7 +15,6 @@ sealed interface ConfigureRoomEvents {
    data class RoomVisibilityChanged(val visibilityItem: RoomVisibilityItem) : ConfigureRoomEvents
    data class RoomAccessChanged(val roomAccess: RoomAccessItem) : ConfigureRoomEvents
    data class RoomAddressChanged(val roomAddress: String) : ConfigureRoomEvents
-    data class RemoveUserFromSelection(val matrixUser: MatrixUser) : ConfigureRoomEvents
    data object CreateRoom : ConfigureRoomEvents
    data class HandleAvatarAction(val action: AvatarAction) : ConfigureRoomEvents
    data object CancelCreateRoom : ConfigureRoomEvents
--- 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
@@ -18,19 +18,20 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.createroom.CreateRoomNavigator
-import io.element.android.features.createroom.impl.di.CreateRoomScope
-import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.services.analytics.api.AnalyticsService

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

    init {
        lifecycle.subscribe(
@@ -40,6 +41,10 @@ class ConfigureRoomNode @AssistedInject constructor(
        )
    }

+    private fun onCreateRoomSuccess(roomId: RoomId) {
+        plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
+    }
+
    @Composable
    override fun View(modifier: Modifier) {
        val state = presenter.present()
@@ -47,9 +52,7 @@ class ConfigureRoomNode @AssistedInject constructor(
            state = state,
            modifier = modifier,
            onBackClick = this::navigateUp,
-            onCreateRoomSuccess = {
-                navigator.onOpenRoom(roomIdOrAlias = it.toRoomIdOrAlias(), serverNames = emptyList())
-            },
+            onCreateRoomSuccess = ::onCreateRoomSuccess,
        )
    }
 }
--- 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
@@ -18,8 +18,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import im.vector.app.features.analytics.plan.CreatedRoom
-import io.element.android.features.createroom.impl.CreateRoomConfig
-import io.element.android.features.createroom.impl.CreateRoomDataStore
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
@@ -50,7 +48,7 @@ import javax.inject.Inject
 import kotlin.jvm.optionals.getOrDefault

 class ConfigureRoomPresenter @Inject constructor(
-    private val dataStore: CreateRoomDataStore,
+    private val dataStore: CreateRoomConfigStore,
    private val matrixClient: MatrixClient,
    private val mediaPickerProvider: PickerProvider,
    private val mediaPreProcessor: MediaPreProcessor,
@@ -66,7 +64,7 @@ class ConfigureRoomPresenter @Inject constructor(
    @Composable
    override fun present(): ConfigureRoomState {
        val cameraPermissionState = cameraPermissionPresenter.present()
-        val createRoomConfig by dataStore.createRoomConfigWithInvites.collectAsState(CreateRoomConfig())
+        val createRoomConfig by dataStore.getCreateRoomConfigFlow().collectAsState(CreateRoomConfig())
        val homeserverName = remember { matrixClient.userIdServerName() }
        val isKnockFeatureEnabled by remember {
            featureFlagService.isFeatureEnabledFlow(FeatureFlags.Knock)
@@ -121,7 +119,6 @@ class ConfigureRoomPresenter @Inject constructor(
                is ConfigureRoomEvents.RoomNameChanged -> dataStore.setRoomName(event.name)
                is ConfigureRoomEvents.TopicChanged -> dataStore.setTopic(event.topic)
                is ConfigureRoomEvents.RoomVisibilityChanged -> dataStore.setRoomVisibility(event.visibilityItem)
-                is ConfigureRoomEvents.RemoveUserFromSelection -> dataStore.selectedUserListDataStore.removeUserFromSelection(event.matrixUser)
                is ConfigureRoomEvents.RoomAccessChanged -> dataStore.setRoomAccess(event.roomAccess)
                is ConfigureRoomEvents.RoomAddressChanged -> dataStore.setRoomAddress(event.roomAddress)
                is ConfigureRoomEvents.CreateRoom -> createRoom(createRoomConfig)
@@ -206,6 +203,6 @@ class ConfigureRoomPresenter @Inject constructor(
            mediaOptimizationConfig = mediaOptimizationConfigProvider.get(),
        ).getOrThrow()
        val byteArray = preprocessed.file.readBytes()
-        return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray, null).getOrThrow()
+        return matrixClient.uploadMedia(MimeTypes.Jpeg, byteArray).getOrThrow()
    }
 }
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt
@@ -7,7 +7,6 @@

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

-import io.element.android.features.createroom.impl.CreateRoomConfig
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.media.AvatarAction
--- 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
@@ -8,7 +8,6 @@
 package io.element.android.features.createroom.impl.configureroom

 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.createroom.impl.CreateRoomConfig
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
--- 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
@@ -12,7 +12,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 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
@@ -58,7 +57,6 @@ 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.SelectedUsersRowList
 import io.element.android.libraries.matrix.ui.components.UnsavedAvatar
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressField
 import io.element.android.libraries.permissions.api.PermissionsView
@@ -112,16 +110,6 @@ fun ConfigureRoomView(
                topic = state.config.topic.orEmpty(),
                onTopicChange = { state.eventSink(ConfigureRoomEvents.TopicChanged(it)) },
            )
-            if (state.config.invites.isNotEmpty()) {
-                SelectedUsersRowList(
-                    contentPadding = PaddingValues(horizontal = 24.dp),
-                    selectedUsers = state.config.invites,
-                    onUserRemove = {
-                        focusManager.clearFocus()
-                        state.eventSink(ConfigureRoomEvents.RemoveUserFromSelection(it))
-                    },
-                )
-            }
            RoomVisibilityOptions(
                selected = when (state.config.roomVisibility) {
                    is RoomVisibilityState.Private -> RoomVisibilityItem.Private
--- 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
@@ -5,10 +5,9 @@
 * Please see LICENSE files in the repository root for full details.
 */

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

 import android.net.Uri
-import io.element.android.features.createroom.impl.configureroom.RoomVisibilityState
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
--- 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
@@ -5,45 +5,29 @@
 * Please see LICENSE files in the repository root for full details.
 */

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

 import android.net.Uri
-import io.element.android.features.createroom.impl.configureroom.RoomAccess
-import io.element.android.features.createroom.impl.configureroom.RoomAccessItem
-import io.element.android.features.createroom.impl.configureroom.RoomAddress
-import io.element.android.features.createroom.impl.configureroom.RoomVisibilityItem
-import io.element.android.features.createroom.impl.configureroom.RoomVisibilityState
-import io.element.android.features.createroom.impl.di.CreateRoomScope
-import io.element.android.features.createroom.impl.userlist.UserListDataStore
 import io.element.android.libraries.androidutils.file.safeDelete
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
-import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.getAndUpdate
 import java.io.File
 import javax.inject.Inject

-@SingleIn(CreateRoomScope::class)
-class CreateRoomDataStore @Inject constructor(
-    val selectedUserListDataStore: UserListDataStore,
+class CreateRoomConfigStore @Inject constructor(
    private val roomAliasHelper: RoomAliasHelper,
 ) {
    private val createRoomConfigFlow: MutableStateFlow<CreateRoomConfig> = MutableStateFlow(CreateRoomConfig())
+
    private var cachedAvatarUri: Uri? = null
        set(value) {
            field?.path?.let { File(it) }?.safeDelete()
            field = value
        }

-    val createRoomConfigWithInvites: Flow<CreateRoomConfig> = combine(
-        selectedUserListDataStore.selectedUsers,
-        createRoomConfigFlow,
-    ) { selectedUsers, config ->
-        config.copy(invites = selectedUsers.toImmutableList())
-    }
+    fun getCreateRoomConfigFlow(): StateFlow<CreateRoomConfig> = createRoomConfigFlow

    fun setRoomName(roomName: String) {
        createRoomConfigFlow.getAndUpdate { config ->
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/di/CreateRoomComponent.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/di/CreateRoomComponent.kt
@@ -1,28 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.di
-
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.MergeSubcomponent
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
-
-@SingleIn(CreateRoomScope::class)
-@MergeSubcomponent(CreateRoomScope::class)
-interface CreateRoomComponent : NodeFactoriesBindings {
-    @MergeSubcomponent.Builder
-    interface Builder {
-        fun build(): CreateRoomComponent
-    }
-
-    @ContributesTo(SessionScope::class)
-    interface ParentBindings {
-        fun createRoomComponentBuilder(): Builder
-    }
-}
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootEvents.kt
@@ -1,15 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.root
-
-import io.element.android.libraries.matrix.api.user.MatrixUser
-
-sealed interface CreateRoomRootEvents {
-    data class StartDM(val matrixUser: MatrixUser) : CreateRoomRootEvents
-    data object CancelStartDM : CreateRoomRootEvents
-}
--- a/features/createroom/impl/src/main/res/values-be/translations.xml
+++ b/features/createroom/impl/src/main/res/values-be/translations.xml
@@ -14,6 +14,4 @@
  <string name="screen_create_room_room_name_label">"Назва пакоя"</string>
  <string name="screen_create_room_title">"Стварыце пакой"</string>
  <string name="screen_create_room_topic_label">"Тэма (неабавязкова)"</string>
-  <string name="screen_room_directory_search_title">"Каталог пакояў"</string>
-  <string name="screen_start_chat_error_starting_chat">"Пры спробе пачаць чат адбылася памылка"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-bg/translations.xml
+++ b/features/createroom/impl/src/main/res/values-bg/translations.xml
@@ -15,9 +15,4 @@
  <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>
-  <string name="screen_start_chat_join_room_by_address_action">"Присъединяване към стая по адрес"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Не е валиден адрес"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Въведете…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Стаята не е намерена"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"напр. #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-cs/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cs/translations.xml
@@ -19,12 +19,4 @@ To můžete kdykoli změnit v nastavení 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>
-  <string name="screen_room_directory_search_title">"Adresář místností"</string>
-  <string name="screen_start_chat_error_starting_chat">"Při pokusu o zahájení chatu došlo k chybě"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Vstoupit do místnosti pomocí adresy"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Neplatná adresa"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Zadejte…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Odpovídající místnost nalezena"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Místnost nebyla nalezena"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"např. #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-cy/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cy/translations.xml
@@ -19,12 +19,4 @@ Gallwch newid hyn unrhyw bryd yng ngosodiadau 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>
-  <string name="screen_room_directory_search_title">"Cyfeiriadur ystafelloedd"</string>
-  <string name="screen_start_chat_error_starting_chat">"Digwyddodd gwall wrth geisio cychwyn sgwrs"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Ymuno â\'r ystafell yn ôl cyfeiriad"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Ddim yn gyfeiriad dilys"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Ewch i mewn…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Cafwyd hyd i ystafell gyfatebol"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Heb ganfod yr ystafell"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"e.e. #enw-ystafell:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-da/translations.xml
+++ b/features/createroom/impl/src/main/res/values-da/translations.xml
@@ -19,12 +19,4 @@ Du kan ændre dette når som helst i rummets indstillinger."</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>
-  <string name="screen_room_directory_search_title">"Register over rum"</string>
-  <string name="screen_start_chat_error_starting_chat">"Der opstod en fejl under forsøget på at starte en samtale"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Tilslut dig rummet med adressen"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Ikke en gyldig adresse"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Indtast…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Matchende rum fundet"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Rum ikke fundet"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"f.eks. #rummets-navn:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-de/translations.xml
+++ b/features/createroom/impl/src/main/res/values-de/translations.xml
@@ -19,12 +19,4 @@ Sie können dies aber jederzeit in den Chatroomeinstellungen ändern."</string>
  <string name="screen_create_room_room_visibility_section_title">" Sichtbarkeit des Chatrooms"</string>
  <string name="screen_create_room_title">"Raum erstellen"</string>
  <string name="screen_create_room_topic_label">"Thema (optional)"</string>
-  <string name="screen_room_directory_search_title">"Raum-Verzeichnis"</string>
-  <string name="screen_start_chat_error_starting_chat">"Beim Versuch, einen Chat zu starten, ist ein Fehler aufgetreten"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Raum per Adresse betreten"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Keine gültige Adresse"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Eintreten…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Passender Raum gefunden"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Raum nicht gefunden"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"z. B. #room -name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-el/translations.xml
+++ b/features/createroom/impl/src/main/res/values-el/translations.xml
@@ -19,12 +19,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"Κατάλογος αιθουσών"</string>
-  <string name="screen_start_chat_error_starting_chat">"Παρουσιάστηκε σφάλμα κατά την προσπάθεια έναρξης μιας συνομιλίας"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Συμμετοχή σε αίθουσα μέσω διεύθυνσης"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Μη έγκυρη διεύθυνση"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Εισάγετε…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Βρέθηκε η αντίστοιχη αίθουσα"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Η αίθουσα δεν βρέθηκε"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"π.χ. #όνομα-αίθουσας:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-es/translations.xml
+++ b/features/createroom/impl/src/main/res/values-es/translations.xml
@@ -19,12 +19,4 @@ Puedes cambiar esto en cualquier momento en los ajustes 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>
-  <string name="screen_room_directory_search_title">"Directorio de salas"</string>
-  <string name="screen_start_chat_error_starting_chat">"Se ha producido un error al intentar iniciar un chat"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Unirse a una sala por su dirección"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Dirección no válida"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Introducir…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Sala encontrada"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"No se encontró la sala"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"p. ej., #nombre-de-la-sala:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-et/translations.xml
+++ b/features/createroom/impl/src/main/res/values-et/translations.xml
@@ -19,12 +19,4 @@ Sa võid seda jututoa seadistustest alati muuta."</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>
-  <string name="screen_room_directory_search_title">"Jututubade kataloog"</string>
-  <string name="screen_start_chat_error_starting_chat">"Vestluse alustamisel tekkis viga"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Liitu jututoaga aadressi alusel"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"See pole kehtiv aadress"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Sisene…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Leidsime vastava jututoa"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Jututuba ei leidu"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"nt. #jututoa-nimi:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-eu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-eu/translations.xml
@@ -16,8 +16,4 @@ Gelaren ezarpenetan aldatu dezakezu hobespena."</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>
-  <string name="screen_room_directory_search_title">"Gelen direktorioa"</string>
-  <string name="screen_start_chat_error_starting_chat">"Errorea gertatu da txata hasten saiatzean"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Sartu…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Ez da gela aurkitu"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fa/translations.xml
@@ -17,12 +17,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"فهرست اتاق‌ها"</string>
-  <string name="screen_start_chat_error_starting_chat">"هنگام تلاش برای شروع چت خطایی روی داد"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"پیوستن به اتاق با نشانی"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"نشانی معتبری نیست"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"ورود…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"اتاق مطابق پیدا شد"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"اتاق پیدا نشد"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"نمونه: ‪#room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fi/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fi/translations.xml
@@ -19,12 +19,4 @@ Voit muuttaa tämän milloin tahansa huoneen asetuksista."</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>
-  <string name="screen_room_directory_search_title">"Huoneluettelo"</string>
-  <string name="screen_start_chat_error_starting_chat">"Keskustelun aloituksessa tapahtui virhe"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Liity huoneeseen osoitteella"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Osoite ei ole kelvollinen"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Syötä…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Täsmäävä huone löytyi"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Huonetta ei löytynyt"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"esim. #huoneen-nimi:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-fr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fr/translations.xml
@@ -19,12 +19,4 @@ Vous pouvez modifier cela à tout moment dans les paramètres 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>
-  <string name="screen_room_directory_search_title">"Annuaire des salons"</string>
-  <string name="screen_start_chat_error_starting_chat">"Une erreur s’est produite lors de la tentative de création de la discussion"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Saisir une adresse de salon"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Ce n’est pas une adresse valide"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Saisir…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Ce salon existe"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Salon non trouvé"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"ex: #nom-du-salon:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-hu/translations.xml
+++ b/features/createroom/impl/src/main/res/values-hu/translations.xml
@@ -19,12 +19,4 @@ Ezt bármikor módosíthatja a szobabeállításokban."</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>
-  <string name="screen_room_directory_search_title">"Szobakatalógus"</string>
-  <string name="screen_start_chat_error_starting_chat">"Hiba történt a csevegés indításakor"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Csatlakozás a szobához cím szerint"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Nem érvényes cím"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Írja be…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Megfelelő szoba található"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Szoba nem található"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"pl. #szoba-neve:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-in/translations.xml
+++ b/features/createroom/impl/src/main/res/values-in/translations.xml
@@ -19,12 +19,4 @@ Anda dapat mengubah ini kapan pun dalam pengaturan 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>
-  <string name="screen_room_directory_search_title">"Direktori ruangan"</string>
-  <string name="screen_start_chat_error_starting_chat">"Terjadi kesalahan saat mencoba memulai obrolan"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Bergabung dalam ruangan berdasarkan alamat"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Bukan alamat yang valid"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Masuk…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Ruangan yang cocok ditemukan"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Ruangan tidak ditemukan"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"mis. #nama-ruangan:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-it/translations.xml
+++ b/features/createroom/impl/src/main/res/values-it/translations.xml
@@ -19,12 +19,4 @@ Puoi modificarlo in qualsiasi momento nelle impostazioni della 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>
-  <string name="screen_room_directory_search_title">"Elenco delle stanze"</string>
-  <string name="screen_start_chat_error_starting_chat">"Si è verificato un errore durante il tentativo di avviare una chat"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Accedi alla stanza tramite indirizzo"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Indirizzo non valido"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Inserisci…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Stanza trovata"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Stanza non trovata"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"ad esempio #room -name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ka/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ka/translations.xml
@@ -10,6 +10,4 @@
  <string name="screen_create_room_room_name_label">"ოთახის სახელი"</string>
  <string name="screen_create_room_title">"ოთახის შექმნა"</string>
  <string name="screen_create_room_topic_label">"თემა (სურვილისამებრ)"</string>
-  <string name="screen_room_directory_search_title">"ოთახის კატალოგი"</string>
-  <string name="screen_start_chat_error_starting_chat">"ჩატის დაწყების მცდელობისას შეცდომა მოხდა"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-lt/translations.xml
+++ b/features/createroom/impl/src/main/res/values-lt/translations.xml
@@ -10,5 +10,4 @@ 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>
-  <string name="screen_start_chat_error_starting_chat">"Bandant pradėti pokalbį įvyko klaida"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-nb/translations.xml
+++ b/features/createroom/impl/src/main/res/values-nb/translations.xml
@@ -19,12 +19,4 @@ Du kan endre dette når som helst i rominnstillingene."</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>
-  <string name="screen_room_directory_search_title">"Romkatalog"</string>
-  <string name="screen_start_chat_error_starting_chat">"Det oppstod en feil når du prøvde å starte en chat"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Bli med i rommet med adresse"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Ikke en gyldig adresse"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Gå inn…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Matchende rom funnet"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Rom ikke funnet"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"f.eks. #rom-navn:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-nl/translations.xml
+++ b/features/createroom/impl/src/main/res/values-nl/translations.xml
@@ -16,6 +16,4 @@ Je kunt dit op elk gewenst moment wijzigen in de kamerinstellingen."</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>
-  <string name="screen_room_directory_search_title">"Kamergids"</string>
-  <string name="screen_start_chat_error_starting_chat">"Er is een fout opgetreden bij het starten van een chat"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-pl/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pl/translations.xml
@@ -19,12 +19,4 @@ Możesz to zmienić w ustawieniach 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>
-  <string name="screen_room_directory_search_title">"Katalog pokoi"</string>
-  <string name="screen_start_chat_error_starting_chat">"Wystąpił błąd podczas próby rozpoczęcia czatu"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Dołącz do pokoju za pomocą adresu"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Nieprawidłowy adres"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Wprowadź…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Znaleziono pasujący pokój"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Nie znaleziono pokoju"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"np. #room-name:matrix.org"</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
@@ -19,12 +19,4 @@ Você pode mudar isso a qualquer momento nas configurações 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>
-  <string name="screen_room_directory_search_title">"Diretório de salas"</string>
-  <string name="screen_start_chat_error_starting_chat">"Ocorreu um erro ao tentar iniciar um chat"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Entrar na sala pelo endereço"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Não é um endereço válido"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Entrar…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Foi encontrada uma sala correspondente"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Sala não encontrada"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"Por exemplo, #nome-da-sala:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-pt/translations.xml
+++ b/features/createroom/impl/src/main/res/values-pt/translations.xml
@@ -19,12 +19,4 @@ Pode alterar esta opção nas definições 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>
-  <string name="screen_room_directory_search_title">"Diretório de salas"</string>
-  <string name="screen_start_chat_error_starting_chat">"Ocorreu um erro ao tentar iniciar uma conversa"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Entrar na sala pelo endereço"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Não é um endereço válido"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Entrar…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Sala correspondente encontrado"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Sala não encontrada"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"por exemplo, #sala:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ro/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ro/translations.xml
@@ -17,6 +17,4 @@ Puteți modifica acest lucru oricând în setări."</string>
  <string name="screen_create_room_room_name_label">"Numele camerei"</string>
  <string name="screen_create_room_title">"Creați o cameră"</string>
  <string name="screen_create_room_topic_label">"Subiect (opțional)"</string>
-  <string name="screen_room_directory_search_title">"Director de camere"</string>
-  <string name="screen_start_chat_error_starting_chat">"A apărut o eroare la încercarea începerii conversației"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ru/translations.xml
@@ -19,12 +19,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"Каталог комнат"</string>
-  <string name="screen_start_chat_error_starting_chat">"Произошла ошибка при запуске чата"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Присоединиться к комнате по адресу"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Недействительный адрес"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Ввести…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Соответствующая комната найдена"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Комната не найдена"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"прим. #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-sk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sk/translations.xml
@@ -19,12 +19,4 @@ Môžete to kedykoľvek zmeniť v nastaveniach 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>
-  <string name="screen_room_directory_search_title">"Adresár miestností"</string>
-  <string name="screen_start_chat_error_starting_chat">"Pri pokuse o spustenie konverzácie sa vyskytla chyba"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Pripojte sa do miestnosti podľa adresy"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Neplatná adresa"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Zadajte…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Nájdená zodpovedajúca miestnosť"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Miestnosť sa nenašla"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"napr. #nazov-miestnosti:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-sv/translations.xml
+++ b/features/createroom/impl/src/main/res/values-sv/translations.xml
@@ -19,12 +19,4 @@ Du kan ändra detta när som helst i rumsinställningarna."</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>
-  <string name="screen_room_directory_search_title">"Rumskatalog"</string>
-  <string name="screen_start_chat_error_starting_chat">"Ett fel uppstod när du försökte starta en chatt"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Gå med i rum med adress"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Inte en giltig adress"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Ange …"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Matchande rum hittades"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Rummet hittades inte"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"t.ex. #rumsnamn:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-tr/translations.xml
+++ b/features/createroom/impl/src/main/res/values-tr/translations.xml
@@ -19,6 +19,4 @@ Bunu istediğiniz zaman oda ayarlarından değiştirebilirsiniz."</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>
-  <string name="screen_room_directory_search_title">"Oda dizini"</string>
-  <string name="screen_start_chat_error_starting_chat">"Sohbet başlatmaya çalışırken bir hata oluştu"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-uk/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uk/translations.xml
@@ -19,12 +19,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"Каталог кімнат"</string>
-  <string name="screen_start_chat_error_starting_chat">"Під час спроби почати бесіду сталася помилка"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Приєднатися до кімнати за адресою"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Недійсна адреса"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Введіть…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Знайдено відповідну кімнату"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Кімната не знайдена"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"наприклад, #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-ur/translations.xml
+++ b/features/createroom/impl/src/main/res/values-ur/translations.xml
@@ -11,6 +11,4 @@
  <string name="screen_create_room_room_name_label">"کمرے کا نام"</string>
  <string name="screen_create_room_title">"ایک کمرہ بنائیں"</string>
  <string name="screen_create_room_topic_label">"موضوع (اختیاری)"</string>
-  <string name="screen_room_directory_search_title">"کمرے کا راہنامچہ"</string>
-  <string name="screen_start_chat_error_starting_chat">"گفتگو شروع کرنے کی کوشش کرتے وقت ایک خرابی واقع ہوگئی"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-uz/translations.xml
+++ b/features/createroom/impl/src/main/res/values-uz/translations.xml
@@ -3,11 +3,11 @@
  <string name="screen_create_room_action_create_room">"Yangi xona"</string>
  <string name="screen_create_room_add_people_title">"Odamlarni taklif qiling"</string>
  <string name="screen_create_room_error_creating_room">"Xonani yaratishda xatolik yuz berdi"</string>
-  <string name="screen_create_room_private_option_description">"Bu xonadagi xabarlar shifrlangan. Keyinchalik shifrlashni o‘chirib bo‘lmaydi."</string>
-  <string name="screen_create_room_private_option_title">"Shaxsiy xona (faqat taklif)"</string>
-  <string name="screen_create_room_public_option_description">"Xabarlar shifrlanmagan va har kim ularni o\'qiy oladi. Keyinchalik shifrlashni yoqishingiz mumkin."</string>
+  <string name="screen_create_room_private_option_description">"Faqat taklif etilgan shaxslargina bu xonaga kira oladi. Barcha xabarlar boshdan-oxirigacha shifrlanadi."</string>
+  <string name="screen_create_room_private_option_title">"Shaxsiy xona"</string>
+  <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_room_name_label">"Xona nomi"</string>
  <string name="screen_create_room_title">"Xonani yaratish"</string>
  <string name="screen_create_room_topic_label">"Mavzu (ixtiyoriy)"</string>
-  <string name="screen_start_chat_error_starting_chat">"Suhbatni boshlashda xatolik yuz berdi"</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
@@ -19,12 +19,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"聊天室目錄"</string>
-  <string name="screen_start_chat_error_starting_chat">"嘗試開始聊天時發生錯誤"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"按地址加入聊天室"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"不是有效的位址"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"輸入……"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"找到相符的聊天室"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"找不到聊天室"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"例如 #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values-zh/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh/translations.xml
@@ -19,6 +19,4 @@
  <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>
-  <string name="screen_room_directory_search_title">"聊天室目录"</string>
-  <string name="screen_start_chat_error_starting_chat">"在开始聊天时发生了错误"</string>
 </resources>
--- a/features/createroom/impl/src/main/res/values/localazy.xml
+++ b/features/createroom/impl/src/main/res/values/localazy.xml
@@ -19,12 +19,4 @@ You can change this anytime in room settings."</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_room_directory_search_title">"Room directory"</string>
-  <string name="screen_start_chat_error_starting_chat">"An error occurred when trying to start a chat"</string>
-  <string name="screen_start_chat_join_room_by_address_action">"Join room by address"</string>
-  <string name="screen_start_chat_join_room_by_address_invalid_address">"Not a valid address"</string>
-  <string name="screen_start_chat_join_room_by_address_placeholder">"Enter…"</string>
-  <string name="screen_start_chat_join_room_by_address_room_found">"Matching room found"</string>
-  <string name="screen_start_chat_join_room_by_address_room_not_found">"Room not found"</string>
-  <string name="screen_start_chat_join_room_by_address_supporting_text">"e.g. #room-name:matrix.org"</string>
 </resources>
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeoplePresenterTest.kt
@@ -1,50 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.addpeople
-
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import app.cash.turbine.test
-import com.google.common.truth.Truth.assertThat
-import io.element.android.features.createroom.impl.CreateRoomDataStore
-import io.element.android.features.createroom.impl.userlist.FakeUserListPresenterFactory
-import io.element.android.features.createroom.impl.userlist.UserListDataStore
-import io.element.android.libraries.matrix.test.room.alias.FakeRoomAliasHelper
-import io.element.android.libraries.usersearch.test.FakeUserRepository
-import io.element.android.tests.testutils.WarmUpRule
-import kotlinx.coroutines.test.runTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-
-class AddPeoplePresenterTest {
-    @get:Rule
-    val warmUpRule = WarmUpRule()
-
-    private lateinit var presenter: AddPeoplePresenter
-
-    @Before
-    fun setup() {
-        presenter = AddPeoplePresenter(
-            FakeUserListPresenterFactory(),
-            FakeUserRepository(),
-            CreateRoomDataStore(UserListDataStore(), FakeRoomAliasHelper())
-        )
-    }
-
-    @Test
-    fun `present - initial state`() = runTest {
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            // TODO This doesn't actually test anything...
-            val initialState = awaitItem()
-            assertThat(initialState)
-        }
-    }
-}
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt
@@ -1,89 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.features.createroom.impl.addpeople
-
-import androidx.activity.ComponentActivity
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.element.android.features.createroom.impl.userlist.UserListEvents
-import io.element.android.features.createroom.impl.userlist.UserListState
-import io.element.android.features.createroom.impl.userlist.aUserListState
-import io.element.android.libraries.ui.strings.CommonStrings
-import io.element.android.tests.testutils.EnsureNeverCalled
-import io.element.android.tests.testutils.EventsRecorder
-import io.element.android.tests.testutils.clickOn
-import io.element.android.tests.testutils.ensureCalledOnce
-import io.element.android.tests.testutils.pressBack
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TestRule
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class AddPeopleViewTest {
-    @get:Rule
-    val rule = createAndroidComposeRule<ComponentActivity>()
-
-    @Test
-    fun `clicking on back invokes the expected callback`() {
-        val eventsRecorder = EventsRecorder<UserListEvents>()
-        ensureCalledOnce {
-            rule.setAddPeopleView(
-                aUserListState(
-                    eventSink = eventsRecorder,
-                ),
-                onBackClick = it
-            )
-            rule.pressBack()
-        }
-        eventsRecorder.assertSingle(UserListEvents.UpdateSearchQuery(""))
-    }
-
-    @Test
-    fun `clicking on back during search emits the expected Event`() {
-        val eventsRecorder = EventsRecorder<UserListEvents>()
-        rule.setAddPeopleView(
-            aUserListState(
-                isSearchActive = true,
-                eventSink = eventsRecorder,
-            ),
-        )
-        rule.pressBack()
-        eventsRecorder.assertSingle(UserListEvents.OnSearchActiveChanged(false))
-    }
-
-    @Test
-    fun `clicking on skip invokes the expected callback`() {
-        val eventsRecorder = EventsRecorder<UserListEvents>()
-        ensureCalledOnce {
-            rule.setAddPeopleView(
-                aUserListState(
-                    eventSink = eventsRecorder,
-                ),
-                onNextClick = it
-            )
-            rule.clickOn(CommonStrings.action_skip)
-        }
-        eventsRecorder.assertSingle(UserListEvents.UpdateSearchQuery(""))
-    }
-}
-
-private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAddPeopleView(
-    state: UserListState,
-    onBackClick: () -> Unit = EnsureNeverCalled(),
-    onNextClick: () -> Unit = EnsureNeverCalled(),
-) {
-    setContent {
-        AddPeopleView(
-            state = state,
-            onBackClick = onBackClick,
-            onNextClick = onNextClick,
-        )
-    }
-}
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureBaseRoomPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureBaseRoomPresenterTest.kt
@@ -5,15 +5,21 @@
 * Please see LICENSE files in the repository root for full details.
 */

-package io.element.android.features.createroom.impl.configureroom
+package io.element.android.features.startchat.impl.configureroom

 import android.net.Uri
 import app.cash.turbine.TurbineTestContext
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.CreatedRoom
-import io.element.android.features.createroom.impl.CreateRoomConfig
-import io.element.android.features.createroom.impl.CreateRoomDataStore
-import io.element.android.features.createroom.impl.userlist.UserListDataStore
+import io.element.android.features.createroom.impl.configureroom.ConfigureRoomEvents
+import io.element.android.features.createroom.impl.configureroom.ConfigureRoomPresenter
+import io.element.android.features.createroom.impl.configureroom.ConfigureRoomState
+import io.element.android.features.createroom.impl.configureroom.CreateRoomConfig
+import io.element.android.features.createroom.impl.configureroom.CreateRoomConfigStore
+import io.element.android.features.createroom.impl.configureroom.RoomAccess
+import io.element.android.features.createroom.impl.configureroom.RoomAddress
+import io.element.android.features.createroom.impl.configureroom.RoomVisibilityItem
+import io.element.android.features.createroom.impl.configureroom.RoomVisibilityState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
@@ -28,7 +34,6 @@ 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.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.alias.FakeRoomAliasHelper
-import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.media.AvatarAction
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
 import io.element.android.libraries.mediapickers.api.PickerProvider
@@ -48,8 +53,6 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import io.mockk.unmockkAll
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
@@ -67,7 +70,7 @@ private const val AN_URI_FROM_CAMERA_2 = "content://uri_from_camera_2"
 private const val AN_URI_FROM_GALLERY = "content://uri_from_gallery"

@RunWith(RobolectricTestRunner::class)
-class ConfigureBaseRoomPresenterTest {
+class ConfigureRoomPresenterTest {
    @get:Rule
    val warmUpRule = WarmUpRule()

@@ -124,12 +127,11 @@ class ConfigureBaseRoomPresenterTest {

    @Test
    fun `present - state is updated when fields are changed`() = runTest {
-        val userListDataStore = UserListDataStore()
        val pickerProvider = FakePickerProvider()
        val permissionsPresenter = FakePermissionsPresenter()
        val roomAliasHelper = FakeRoomAliasHelper()
        val presenter = createConfigureRoomPresenter(
-            createRoomDataStore = CreateRoomDataStore(userListDataStore, roomAliasHelper),
+            dataStore = CreateRoomConfigStore(roomAliasHelper),
            pickerProvider = pickerProvider,
            permissionsPresenter = permissionsPresenter,
        )
@@ -137,20 +139,9 @@ class ConfigureBaseRoomPresenterTest {
            val initialState = initialState()
            var expectedConfig = CreateRoomConfig()
            assertThat(initialState.config).isEqualTo(expectedConfig)
-
-            // Select User
-            val selectedUser1 = aMatrixUser()
-            val selectedUser2 = aMatrixUser("@id_of_bob:server.org", "Bob")
-            userListDataStore.selectUser(selectedUser1)
-            skipItems(1)
-            userListDataStore.selectUser(selectedUser2)
-            var newState = awaitItem()
-            expectedConfig = expectedConfig.copy(invites = persistentListOf(selectedUser1, selectedUser2))
-            assertThat(newState.config).isEqualTo(expectedConfig)
-
            // Room name
            initialState.eventSink(ConfigureRoomEvents.RoomNameChanged(A_ROOM_NAME))
-            newState = awaitItem()
+            var newState = awaitItem()
            expectedConfig = expectedConfig.copy(roomName = A_ROOM_NAME)
            assertThat(newState.config).isEqualTo(expectedConfig)

@@ -206,12 +197,6 @@ class ConfigureBaseRoomPresenterTest {
                )
            )
            assertThat(newState.config).isEqualTo(expectedConfig)
-
-            // Remove user
-            newState.eventSink(ConfigureRoomEvents.RemoveUserFromSelection(selectedUser1))
-            newState = awaitItem()
-            expectedConfig = expectedConfig.copy(invites = expectedConfig.invites.minus(selectedUser1).toImmutableList())
-            assertThat(newState.config).isEqualTo(expectedConfig)
        }
    }

@@ -263,16 +248,16 @@ class ConfigureBaseRoomPresenterTest {
        val matrixClient = createMatrixClient()
        val analyticsService = FakeAnalyticsService()
        val mediaPreProcessor = FakeMediaPreProcessor()
-        val createRoomDataStore = CreateRoomDataStore(UserListDataStore(), FakeRoomAliasHelper())
+        val dataStore = CreateRoomConfigStore(FakeRoomAliasHelper())
        val presenter = createConfigureRoomPresenter(
-            createRoomDataStore = createRoomDataStore,
+            dataStore = dataStore,
            mediaPreProcessor = mediaPreProcessor,
            matrixClient = matrixClient,
            analyticsService = analyticsService
        )
        presenter.test {
            val initialState = initialState()
-            createRoomDataStore.setAvatarUri(Uri.parse(AN_URI_FROM_GALLERY))
+            dataStore.setAvatarUri(Uri.parse(AN_URI_FROM_GALLERY))
            skipItems(1)
            mediaPreProcessor.givenResult(Result.success(MediaUploadInfo.Image(mockk(), mockk(), mockk())))
            matrixClient.givenUploadMediaResult(Result.failure(AN_EXCEPTION))
@@ -405,7 +390,7 @@ class ConfigureBaseRoomPresenterTest {

    private fun createConfigureRoomPresenter(
        roomAliasHelper: RoomAliasHelper = FakeRoomAliasHelper(),
-        createRoomDataStore: CreateRoomDataStore = CreateRoomDataStore(UserListDataStore(), roomAliasHelper),
+        dataStore: CreateRoomConfigStore = CreateRoomConfigStore(roomAliasHelper),
        matrixClient: MatrixClient = createMatrixClient(),
        pickerProvider: PickerProvider = FakePickerProvider(),
        mediaPreProcessor: MediaPreProcessor = FakeMediaPreProcessor(),
@@ -414,7 +399,7 @@ class ConfigureBaseRoomPresenterTest {
        isKnockFeatureEnabled: Boolean = true,
        mediaOptimizationConfigProvider: FakeMediaOptimizationConfigProvider = FakeMediaOptimizationConfigProvider(),
    ) = ConfigureRoomPresenter(
-        dataStore = createRoomDataStore,
+        dataStore = dataStore,
        matrixClient = matrixClient,
        mediaPickerProvider = pickerProvider,
        mediaPreProcessor = mediaPreProcessor,
--- a/features/deactivation/impl/src/main/res/values-ur/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-ur/translations.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_deactivate_account_confirmation_dialog_content">"براہ کرم تصدیق کریں کہ آپ اپنا اکاؤنٹ غیر فعال کرنا چاہتے ہیں۔ اس کارروائی کو کالعدم نہیں کیا جا سکتا۔"</string>
+  <string name="screen_deactivate_account_delete_all_messages">"میرے تمام پیغامات ڈیلیٹ کریں۔"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"انتباہ: مستقبل کے صارفین نامکمل گفتگو دیکھ سکتے ہیں۔"</string>
+  <string name="screen_deactivate_account_description">"اپنے اکاؤنٹ کو غیر فعال کرنا %1$s ہے، یہ کرے گا:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"ناقابل واپسی"</string>
+  <string name="screen_deactivate_account_list_item_1">"‏%1$s آپ کا اکاؤنٹ (آپ دوبارہ لاگ ان نہیں ہو سکتے، اور آپ کی ID کو دوبارہ استعمال نہیں کیا جا سکتا)۔"</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"مستقل طور پر غیر فعال کریں"</string>
+  <string name="screen_deactivate_account_list_item_2">"آپ کو تمام چیت رومز سے ہٹا دے گا۔"</string>
+  <string name="screen_deactivate_account_list_item_3">"ہمارے شناختی سرور سے اپنے اکاؤنٹ کی معلومات کو حذف کریں۔"</string>
+  <string name="screen_deactivate_account_list_item_4">"آپ کے پیغامات اب بھی رجسٹرڈ صارفین کو نظر آئیں گے لیکن اگر آپ انہیں حذف کرنے کا انتخاب کرتے ہیں تو نئے یا غیر رجسٹرڈ صارفین کے لیے دستیاب نہیں ہوں گے۔"</string>
+  <string name="screen_deactivate_account_title">"اکاؤنٹ کو غیر فعال کریں"</string>
+</resources>
--- a/features/deactivation/impl/src/main/res/values-uz/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-uz/translations.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_deactivate_account_title">"Hisobni faolsizlantirish"</string>
+</resources>
--- a/Show More
+++ b/Show More