diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3280551607..1668cd2b1f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
           retention-days: 5
           overwrite: true
           if-no-files-found: error
-      - uses: rnkdsh/action-upload-diawi@v1.5.8
+      - uses: rnkdsh/action-upload-diawi@605adbad0db6c000eee26adfd8fc128d7df8f7ab # v1.5.9
         id: diawi
         # Do not fail the whole build if Diawi upload fails
         continue-on-error: true
@@ -81,7 +81,7 @@ jobs:
           file: app/build/outputs/apk/gplay/debug/app-gplay-arm64-v8a-debug.apk
       - name: Add or update PR comment with QR Code to download APK.
         if: ${{ matrix.variant == 'debug' && github.event_name == 'pull_request' && steps.diawi.conclusion == 'success' }}
-        uses: NejcZdovc/comment-pr@v2
+        uses: NejcZdovc/comment-pr@a423635d183a8259308e80593c96fecf31539c26 # v2.1.0
         with:
           message: |
             :iphone: Scan the QR code below to install the build (arm64 only) for this PR.
diff --git a/.github/workflows/build_enterprise.yml b/.github/workflows/build_enterprise.yml
index 73c7b6d893..a1ec5063c0 100644
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -33,7 +33,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
       - name: Clone submodules
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 7fc9405912..9de62e104c 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
       - name: Clone submodules
@@ -20,7 +20,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@13.0.4
+        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
         with:
           args: "--dangerfile ./tools/danger/dangerfile.js"
         env:
diff --git a/.github/workflows/generate_github_pages.yml b/.github/workflows/generate_github_pages.yml
index e63cb52cc8..1f5551ca8c 100644
--- a/.github/workflows/generate_github_pages.yml
+++ b/.github/workflows/generate_github_pages.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:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@v1.2.3
+        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
       - name: Use JDK 21
         uses: actions/setup-java@v4
         with:
@@ -32,7 +32,7 @@ jobs:
           mkdir -p screenshots/en
           cp tests/uitests/src/test/snapshots/images/* screenshots/en
       - name: Deploy GitHub Pages
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./screenshots
diff --git a/.github/workflows/gradle-wrapper-update.yml b/.github/workflows/gradle-wrapper-update.yml
index f5a5b3c94c..dcc7bc5f0a 100644
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '21'
       - name: Update Gradle Wrapper
-        uses: gradle-update/update-gradle-wrapper-action@v2
+        uses: gradle-update/update-gradle-wrapper-action@512b1875f3b6270828abfe77b247d5895a2da1e5 # v2.1.0
         with:
           repo-token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           target-branch: develop
diff --git a/.github/workflows/nightlyReports.yml b/.github/workflows/nightlyReports.yml
index 55293f972f..7cc4f766c2 100644
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -18,7 +18,7 @@ jobs:
     if: ${{ github.repository == 'element-hq/element-x-android' }}
     steps:
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@v1.2.3
+        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
 
       - name: Use JDK 21
         uses: actions/setup-java@v4
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 50a2a59170..43ef188415 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -77,7 +77,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -117,7 +117,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -161,7 +161,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -201,7 +201,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -241,7 +241,7 @@ jobs:
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -294,7 +294,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@13.0.4
+        uses: danger/danger-js@bdccecb77e0144055fbaea9224f10cf8b1229b68 # 13.0.4
         with:
           args: "--dangerfile ./tools/danger/dangerfile-lint.js"
         env:
diff --git a/.github/workflows/recordScreenshots.yml b/.github/workflows/recordScreenshots.yml
index 17012282e3..a5172188ee 100644
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -19,18 +19,18 @@ jobs:
     steps:
       - name: Remove Record-Screenshots label
         if: github.event.label.name == 'Record-Screenshots'
-        uses: actions-ecosystem/action-remove-labels@v1
+        uses: actions-ecosystem/action-remove-labels@2ce5d41b4b6aa8503e285553f75ed56e0a40bae0 # v1.3.0
         with:
           labels: Record-Screenshots
       - name: ⏬ Checkout with LFS (PR)
         if: github.event.label.name == 'Record-Screenshots'
-        uses: nschloe/action-cached-lfs-checkout@v1.2.3
+        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
         with:
           persist-credentials: false
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref }}
       - name: ⏬ Checkout with LFS (Branch)
         if: github.event_name == 'workflow_dispatch'
-        uses: nschloe/action-cached-lfs-checkout@v1.2.3
+        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
         with:
           persist-credentials: false
       - name: ☕️ Use JDK 21
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f04b203611..704802258e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,7 +54,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
diff --git a/.github/workflows/sync-localazy.yml b/.github/workflows/sync-localazy.yml
index dc688cb5a4..3e9e4692a4 100644
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -36,7 +36,7 @@ jobs:
           ./tools/localazy/importSupportedLocalesFromLocalazy.py
           ./tools/test/generateAllScreenshots.py
       - name: Create Pull Request for Strings
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
           token: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
           commit-message: Sync Strings from Localazy
diff --git a/.github/workflows/sync-sas-strings.yml b/.github/workflows/sync-sas-strings.yml
index 632eb5d8ec..f9224853fd 100644
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Run SAS String script
         run: ./tools/sas/import_sas_strings.py
       - name: Create Pull Request for SAS Strings
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
           commit-message: Sync SAS Strings
           title: Sync SAS Strings
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b5b4359970..580f3799dd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,13 +33,13 @@ jobs:
           sudo swapon /mnt/swapfile
           sudo swapon --show
       - name: ⏬ Checkout with LFS
-        uses: nschloe/action-cached-lfs-checkout@v1.2.3
+        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
         with:
           # Ensure we are building the branch and not the branch after being merged on develop
           # https://github.com/actions/checkout/issues/881
           ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
       - name: Add SSH private keys for submodule repositories
-        uses: webfactory/ssh-agent@v0.9.1
+        uses: webfactory/ssh-agent@a6f90b1f127823b31d4d4a8d96047790581349bd # v0.9.1
         if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
         with:
           ssh-private-key: ${{ secrets.ELEMENT_ENTERPRISE_DEPLOY_KEY }}
@@ -82,7 +82,7 @@ jobs:
 
       # https://github.com/codecov/codecov-action
       - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
index 109b8cc82d..34c9767da3 100644
--- a/.github/workflows/triage-incoming.yml
+++ b/.github/workflows/triage-incoming.yml
@@ -8,7 +8,7 @@ jobs:
   triage-new-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/91
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/triage-labelled.yml b/.github/workflows/triage-labelled.yml
index f6a9de700c..b1c776c6ea 100644
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -12,7 +12,7 @@ jobs:
     if: >
       github.repository == 'element-hq/element-x-android'
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/43
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -21,7 +21,7 @@ jobs:
     name: Move triaged needs info issues on board
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         id: addItem
         with:
           project-url: https://github.com/orgs/element-hq/projects/91
@@ -29,7 +29,7 @@ jobs:
           labeled: X-Needs-Info
       - name: Print itemId
         run: echo ${{ steps.addItem.outputs.itemId }}
-      - uses: kalgurn/update-project-item-status@main
+      - uses: kalgurn/update-project-item-status@31e54df46a2cdaef4f85c31ac839fbcd2fd7c3a2 # 0.0.3
         if: ${{ steps.addItem.outputs.itemId }}
         with:
           project-url: https://github.com/orgs/element-hq/projects/91
@@ -43,7 +43,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'Team: Element X Feature')
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/73
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -54,7 +54,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'Team: Verticals Feature')
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/57
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -66,7 +66,7 @@ jobs:
       contains(github.event.issue.labels.*.name, 'Team: QA') ||
       contains(github.event.issue.labels.*.name, 'X-Needs-Signoff')
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/69
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
@@ -77,7 +77,7 @@ jobs:
     if: >
       contains(github.event.issue.labels.*.name, 'X-Needs-Signoff')
     steps:
-      - uses: actions/add-to-project@main
+      - uses: actions/add-to-project@v1.0.2
         with:
           project-url: https://github.com/orgs/element-hq/projects/89
           github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
diff --git a/.github/workflows/validate-lfs.yml b/.github/workflows/validate-lfs.yml
index dd6cc5e64f..3246cbd1a8 100644
--- a/.github/workflows/validate-lfs.yml
+++ b/.github/workflows/validate-lfs.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Validate
     steps:
-      - uses: nschloe/action-cached-lfs-checkout@v1.2.3
+      - uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
 
       - run: |
           ./tools/git/validate_lfs.sh
diff --git a/CHANGES.md b/CHANGES.md
index 2cb9347e1d..2ff2ab0e58 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,44 @@
+Changes in Element X v25.04.3
+=============================
+
+### 🙌 Improvements
+* Use PreferenceDropdown for appearance by @ganfra in https://github.com/element-hq/element-x-android/pull/4581
+### 🐛 Bugfixes
+* Use in-call volume and mode for EC by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4481
+* Send SVG images as files by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4595
+* Fetch the initial ignored user list manually when subscribing by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4598
+* Fix audio output selection for Element Call by @bmarty in https://github.com/element-hq/element-x-android/pull/4602
+* [a11y] Make more items focusable by @bmarty in https://github.com/element-hq/element-x-android/pull/4605
+* Fix ringing calls not stopping when the other user cancels the call by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4613
+* Ensure that pinning an event makes the pinned messages banner appear by @bmarty in https://github.com/element-hq/element-x-android/pull/4606
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4590
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/4612
+### 📄 Documentation
+* Improve onboarding docs: by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4578
+### Dependency upgrades
+* Upgrade Rust bindings to `v25.04.11` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4580
+* fix(deps): update dependency androidx.sqlite:sqlite-ktx to v2.5.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4568
+* fix(deps): update dependency app.cash.molecule:molecule-runtime to v2.1.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4585
+* fix(deps): update core to v1.16.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4564
+* Upate datastore to 1.1.4 by @bmarty in https://github.com/element-hq/element-x-android/pull/4551
+* fix(deps): update media3 to v1.6.1 by @renovate in https://github.com/element-hq/element-x-android/pull/4592
+* chore(deps): update danger/danger-js action to v13 by @renovate in https://github.com/element-hq/element-x-android/pull/4596
+* fix(deps): update dependency io.element.android:emojibase-bindings to v1.4.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4591
+* fix(deps): update dagger to v2.56.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4603
+* fix(deps): update dependency io.sentry:sentry-android to v8.8.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4557
+* fix(deps): update dependency androidx.compose:compose-bom to v2025.04.00 - autoclosed by @renovate in https://github.com/element-hq/element-x-android/pull/4565
+* fix(deps): update dependency com.posthog:posthog-android to v3.14.0 by @renovate in https://github.com/element-hq/element-x-android/pull/4616
+* fix(deps): update android.gradle.plugin to v8.9.2 by @renovate in https://github.com/element-hq/element-x-android/pull/4615
+* fix(deps): update dependency org.matrix.rustcomponents:sdk-android to v25.4.22 by @renovate in https://github.com/element-hq/element-x-android/pull/4622
+### Others
+* Improve accessibility of the timeline by @jmartinesp in https://github.com/element-hq/element-x-android/pull/4579
+* Push: improve Push history screen, log and stored data by @bmarty in https://github.com/element-hq/element-x-android/pull/4601
+* Push gateway config by @bmarty in https://github.com/element-hq/element-x-android/pull/4608
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.04.2...v25.04.3
+
 Changes in Element X v25.04.2
 =============================
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8e6d68bada..cd484c95b0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -106,14 +106,25 @@ android {
     logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)")
 
     buildTypes {
+        val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
         getByName("debug") {
             resValue("string", "app_name", "$baseAppName dbg")
+            resValue(
+                "string",
+                "login_redirect_scheme",
+                "$oidcRedirectSchemeBase.debug",
+            )
             applicationIdSuffix = ".debug"
             signingConfig = signingConfigs.getByName("debug")
         }
 
         getByName("release") {
             resValue("string", "app_name", baseAppName)
+            resValue(
+                "string",
+                "login_redirect_scheme",
+                oidcRedirectSchemeBase,
+            )
             signingConfig = signingConfigs.getByName("debug")
 
             postprocessing {
@@ -131,6 +142,11 @@ android {
             applicationIdSuffix = ".nightly"
             versionNameSuffix = "-nightly"
             resValue("string", "app_name", "$baseAppName nightly")
+            resValue(
+                "string",
+                "login_redirect_scheme",
+                "$oidcRedirectSchemeBase.nightly",
+            )
             matchingFallbacks += listOf("release")
             signingConfig = signingConfigs.getByName("nightly")
 
@@ -284,6 +300,7 @@ dependencies {
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
     testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.services.toolbox.test)
 
     koverDependencies()
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3450fcd55e..c26c9a5a51 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="io.element" />
+                <data android:scheme="@string/login_redirect_scheme" />
             </intent-filter>
             <!--
               Element web links
diff --git a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
index 5ed8e89e24..fb7a24ae8a 100644
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
@@ -10,14 +10,17 @@ package io.element.android.x.di
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.appnav.di.RoomComponentFactory
 import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
 class DefaultRoomComponentFactory @Inject constructor(
     private val roomComponentBuilder: RoomComponent.Builder
 ) : RoomComponentFactory {
-    override fun create(room: MatrixRoom): Any {
-        return roomComponentBuilder.room(room).build()
+    override fun create(room: JoinedRoom): Any {
+        return roomComponentBuilder
+            .joinedRoom(room)
+            .baseRoom(room)
+            .build()
     }
 }
diff --git a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
index e595818051..ac126ce0f0 100644
--- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
@@ -14,7 +14,8 @@ import io.element.android.libraries.architecture.NodeFactoriesBindings
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @SingleIn(RoomScope::class)
 @MergeSubcomponent(RoomScope::class)
@@ -22,7 +23,11 @@ interface RoomComponent : NodeFactoriesBindings {
     @MergeSubcomponent.Builder
     interface Builder {
         @BindsInstance
-        fun room(room: MatrixRoom): Builder
+        fun joinedRoom(room: JoinedRoom): Builder
+
+        @BindsInstance
+        fun baseRoom(room: BaseRoom): Builder
+
         fun build(): RoomComponent
     }
 
diff --git a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
new file mode 100644
index 0000000000..4a103b4daa
--- /dev/null
+++ b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+package io.element.android.x.oidc
+
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
+import io.element.android.services.toolbox.api.strings.StringProvider
+import io.element.android.x.R
+import javax.inject.Inject
+
+@ContributesBinding(AppScope::class)
+class DefaultOidcRedirectUrlProvider @Inject constructor(
+    private val stringProvider: StringProvider,
+) : OidcRedirectUrlProvider {
+    override fun provide() = buildString {
+        append(stringProvider.getString(R.string.login_redirect_scheme))
+        append(":/")
+    }
+}
diff --git a/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
new file mode 100644
index 0000000000..5a0df57bda
--- /dev/null
+++ b/app/src/test/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProviderTest.kt
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+package io.element.android.x.oidc
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.services.toolbox.test.strings.FakeStringProvider
+import io.element.android.x.R
+import org.junit.Test
+
+class DefaultOidcRedirectUrlProviderTest {
+    @Test
+    fun `test provide`() {
+        val stringProvider = FakeStringProvider(
+            defaultResult = "str"
+        )
+        val sut = DefaultOidcRedirectUrlProvider(
+            stringProvider = stringProvider,
+        )
+        val result = sut.provide()
+        assertThat(result).isEqualTo("str:/")
+        assertThat(stringProvider.lastResIdParam).isEqualTo(R.string.login_redirect_scheme)
+    }
+}
diff --git a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
index a8f424bd08..d5bc728bd9 100644
--- a/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
+++ b/appconfig/src/main/kotlin/io/element/android/appconfig/MatrixConfiguration.kt
@@ -10,4 +10,7 @@ package io.element.android.appconfig
 object MatrixConfiguration {
     const val MATRIX_TO_PERMALINK_BASE_URL: String = "https://matrix.to/#/"
     val clientPermalinkBaseUrl: String? = null
+
+    // TODO remove this when report is fixed
+    const val CAN_REPORT_ROOM = false
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt b/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt
index 16575f1a91..4911ab50b5 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt
@@ -7,8 +7,8 @@
 
 package io.element.android.appnav.di
 
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 interface RoomComponentFactory {
-    fun create(room: MatrixRoom): Any
+    fun create(room: JoinedRoom): Any
 }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
index 8e66baf836..cbb247569a 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
@@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import timber.log.Timber
 import javax.inject.Inject
 
 @VisibleForTesting
@@ -42,7 +43,9 @@ class SendQueues @Inject constructor(
         ) { syncState, _ -> syncState }
             .debounce(SEND_QUEUES_RETRY_DELAY_MILLIS)
             .onEach { syncState ->
+                Timber.tag("SendQueues").d("Sync state changed: $syncState")
                 if (syncState == SyncState.Running) {
+                    Timber.tag("SendQueues").d("Enabling send queues again")
                     matrixClient.setAllSendQueuesEnabled(enabled = true)
                 }
             }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index a2016a9171..0dca1d6221 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -28,7 +28,6 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.appnav.room.joined.JoinedRoomFlowNode
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
 import io.element.android.appnav.room.joined.LoadingRoomNodeView
-import io.element.android.appnav.room.joined.LoadingRoomState
 import io.element.android.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint
 import io.element.android.features.roomdirectory.api.RoomDescription
@@ -49,6 +48,7 @@ import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.sync.SyncService
+import io.element.android.libraries.matrix.ui.room.LoadingRoomState
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.first
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
index 3c6f30af72..07580060c7 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
@@ -36,6 +36,8 @@ import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.sync.SyncService
+import io.element.android.libraries.matrix.ui.room.LoadingRoomState
+import io.element.android.libraries.matrix.ui.room.LoadingRoomStateFlowFactory
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index 543c2558e1..094009f3d3 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -35,7 +35,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -72,7 +72,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
     }
 
     data class Inputs(
-        val room: MatrixRoom,
+        val room: JoinedRoom,
         val initialElement: RoomNavigationTarget,
     ) : NodeInputs
 
@@ -95,6 +95,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
             },
             onDestroy = {
                 Timber.v("OnDestroy")
+                inputs.room.destroy()
                 appNavigationStateService.onLeavingRoom(id)
             }
         )
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
index 83c4e0e623..938e46f915 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
@@ -31,6 +31,8 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.matrix.ui.room.LoadingRoomState
+import io.element.android.libraries.matrix.ui.room.LoadingRoomStateProvider
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
diff --git a/appnav/src/main/res/values-cy/translations.xml b/appnav/src/main/res/values-cy/translations.xml
index 86953eb820..06d53cd61b 100644
--- a/appnav/src/main/res/values-cy/translations.xml
+++ b/appnav/src/main/res/values-cy/translations.xml
@@ -2,5 +2,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="banner_migrate_to_native_sliding_sync_action">"Allgofnodi ac Uwchraddio"</string>
   <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"Nid yw %1$s bellach yn cefnogi\'r hen brotocol. Allgofnodwch a mewngofnodi\'n ôl i barhau i ddefnyddio\'r ap."</string>
-  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Nid yw eich gweinydd cartref yn cefnogi\'r hen brotocol mwyach. Allgofnodwch a mewngofnodwch yn ôl i barhau i ddefnyddio\'r ap."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Nid yw eich gweinydd cartref yn cefnogi\'r hen brotocol mwyach. Allgofnodwch a mewngofnodi yn ôl i barhau i ddefnyddio\'r ap."</string>
 </resources>
diff --git a/appnav/src/main/res/values-el/translations.xml b/appnav/src/main/res/values-el/translations.xml
index ef9f8d3c7d..03848d79c0 100644
--- a/appnav/src/main/res/values-el/translations.xml
+++ b/appnav/src/main/res/values-el/translations.xml
@@ -1,5 +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">"Αποσύνδεση &amp; Αναβάθμιση"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"Το %1$s δεν υποστηρίζει πλέον το παλιό πρωτόκολλο. Αποσυνδεθείτε και συνδεθείτε ξανά για να συνεχίσετε να χρησιμοποιείτε την εφαρμογή."</string>
   <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Ο οικιακός διακομιστής σου δεν υποστηρίζει πλέον το παλιό πρωτόκολλο. Αποσυνδέσου και συνδέσου ξανά για να συνεχίσεις να χρησιμοποιείς την εφαρμογή."</string>
 </resources>
diff --git a/appnav/src/main/res/values-zh/translations.xml b/appnav/src/main/res/values-zh/translations.xml
index 134f3c07fe..406471196e 100644
--- a/appnav/src/main/res/values-zh/translations.xml
+++ b/appnav/src/main/res/values-zh/translations.xml
@@ -1,5 +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">"登出并升级"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s 不再支持旧协议。请注销并重新登录以继续使用该应用程序。"</string>
   <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"您的服务器不再支持旧协议。请登出并重新登录以继续使用此应用。"</string>
 </resources>
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinBaseRoomLoadedFlowNodeTest.kt
similarity index 93%
rename from appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt
rename to appnav/src/test/kotlin/io/element/android/appnav/JoinBaseRoomLoadedFlowNodeTest.kt
index be317701bb..bb15ed6bb9 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinBaseRoomLoadedFlowNodeTest.kt
@@ -23,16 +23,17 @@ import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.libraries.architecture.childNode
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.services.appnavstate.test.FakeAppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class JoinRoomLoadedFlowNodeTest {
+class JoinBaseRoomLoadedFlowNodeTest {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
@@ -68,7 +69,7 @@ class JoinRoomLoadedFlowNodeTest {
     }
 
     private class FakeRoomComponentFactory : RoomComponentFactory {
-        override fun create(room: MatrixRoom): Any {
+        override fun create(room: JoinedRoom): Any {
             return Unit
         }
     }
@@ -114,9 +115,7 @@ class JoinRoomLoadedFlowNodeTest {
     @Test
     fun `given a room flow node when initialized then it loads messages entry point`() = runTest {
         // GIVEN
-        val room = FakeMatrixRoom(
-            updateMembersResult = { }
-        )
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
         val roomFlowNode = createJoinedRoomLoadedFlowNode(
@@ -137,9 +136,7 @@ class JoinRoomLoadedFlowNodeTest {
     @Test
     fun `given a room flow node when callback on room details is triggered then it loads room details entry point`() = runTest {
         // GIVEN
-        val room = FakeMatrixRoom(
-            updateMembersResult = { }
-        )
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(updateMembersResult = {}))
         val fakeMessagesEntryPoint = FakeMessagesEntryPoint()
         val fakeRoomDetailsEntryPoint = FakeRoomDetailsEntryPoint()
         val inputs = JoinedRoomLoadedFlowNode.Inputs(room, RoomNavigationTarget.Messages())
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
index 0d79b5847a..46c54a98d0 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
@@ -20,10 +20,11 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkData
 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.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.impl.DefaultOidcIntentResolver
-import io.element.android.libraries.oidc.impl.OidcUrlParser
+import io.element.android.libraries.oidc.impl.DefaultOidcUrlParser
 import io.element.android.tests.testutils.lambda.lambdaError
 import org.junit.Assert.assertThrows
 import org.junit.Test
@@ -119,7 +120,7 @@ class IntentResolverTest {
         val sut = createIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
-            data = "io.element:/callback?error=access_denied&state=IFF1UETGye2ZA8pO".toUri()
+            data = "io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO".toUri()
         }
         val result = sut.resolve(intent)
         assertThat(result).isEqualTo(
@@ -134,13 +135,13 @@ class IntentResolverTest {
         val sut = createIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
-            data = "io.element:/callback?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB".toUri()
+            data = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB".toUri()
         }
         val result = sut.resolve(intent)
         assertThat(result).isEqualTo(
             ResolvedIntent.Oidc(
                 oidcAction = OidcAction.Success(
-                    url = "io.element:/callback?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+                    url = "io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
                 )
             )
         )
@@ -151,7 +152,7 @@ class IntentResolverTest {
         val sut = createIntentResolver()
         val intent = Intent(RuntimeEnvironment.getApplication(), Activity::class.java).apply {
             action = Intent.ACTION_VIEW
-            data = "io.element:/callback/invalid".toUri()
+            data = "io.element.android:/invalid".toUri()
         }
         assertThrows(IllegalStateException::class.java) {
             sut.resolve(intent)
@@ -246,7 +247,9 @@ class IntentResolverTest {
         return IntentResolver(
             deeplinkParser = DeeplinkParser(),
             oidcIntentResolver = DefaultOidcIntentResolver(
-                oidcUrlParser = OidcUrlParser()
+                oidcUrlParser = DefaultOidcUrlParser(
+                    oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+                )
             ),
             permalinkParser = FakePermalinkParser(
                 result = permalinkParserResult
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
index 597139c5e9..c117dfb8f7 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/SendQueuesTest.kt
@@ -10,7 +10,7 @@ package io.element.android.appnav.loggedin
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.sync.SyncState
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -35,8 +35,8 @@ class SendQueuesTest {
         matrixClient.sendQueueDisabledFlow = sendQueueDisabledFlow
         matrixClient.setAllSendQueuesEnabledLambda = setAllSendQueuesEnabledLambda
         val setRoomSendQueueEnabledLambda = lambdaRecorder { _: Boolean -> }
-        val room = FakeMatrixRoom(
-            setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
+        val room = FakeJoinedRoom(
+            setSendQueueEnabledResult = setRoomSendQueueEnabledLambda
         )
         matrixClient.givenGetRoomResult(room.roomId, room)
         sut.launchIn(backgroundScope)
@@ -61,8 +61,8 @@ class SendQueuesTest {
         matrixClient.setAllSendQueuesEnabledLambda = setAllSendQueuesEnabledLambda
         syncService.emitSyncState(SyncState.Offline)
         val setRoomSendQueueEnabledLambda = lambdaRecorder { _: Boolean -> }
-        val room = FakeMatrixRoom(
-            setSendQueueEnabledLambda = setRoomSendQueueEnabledLambda
+        val room = FakeJoinedRoom(
+            setSendQueueEnabledResult = setRoomSendQueueEnabledLambda
         )
         matrixClient.givenGetRoomResult(room.roomId, room)
 
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
similarity index 83%
rename from appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt
rename to appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
index c94cbd229a..91e0b9f968 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingRoomStateFlowFactoryTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/room/LoadingBaseRoomStateFlowFactoryTest.kt
@@ -9,21 +9,22 @@ package io.element.android.appnav.room
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.appnav.room.joined.LoadingRoomState
-import io.element.android.appnav.room.joined.LoadingRoomStateFlowFactory
 import io.element.android.libraries.matrix.api.roomlist.RoomList
 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.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
+import io.element.android.libraries.matrix.ui.room.LoadingRoomState
+import io.element.android.libraries.matrix.ui.room.LoadingRoomStateFlowFactory
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class LoadingRoomStateFlowFactoryTest {
+class LoadingBaseRoomStateFlowFactoryTest {
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache`() = runTest {
-        val room = FakeMatrixRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID)
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
         val matrixClient = FakeMatrixClient(A_SESSION_ID).apply {
             givenGetRoomResult(A_ROOM_ID, room)
         }
@@ -38,7 +39,7 @@ class LoadingRoomStateFlowFactoryTest {
 
     @Test
     fun `flow should emit Loading and then Loaded when there is a room in cache after SS is loaded`() = runTest {
-        val room = FakeMatrixRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID)
+        val room = FakeJoinedRoom(baseRoom = FakeBaseRoom(sessionId = A_SESSION_ID, roomId = A_ROOM_ID))
         val roomListService = FakeRoomListService()
         val matrixClient = FakeMatrixClient(A_SESSION_ID, roomListService = roomListService)
         val flowFactory = LoadingRoomStateFlowFactory(matrixClient)
diff --git a/docs/oidc.md b/docs/oidc.md
index 94b22660c0..23709b608c 100644
--- a/docs/oidc.md
+++ b/docs/oidc.md
@@ -11,7 +11,7 @@ Server list: https://github.com/element-hq/oidc-playground
 Metadata iOS: (from https://github.com/element-hq/element-x-ios/blob/5f9d07377cebc4f21d9668b1a25f6e3bb22f64a1/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift#L28)
 
 clientName: InfoPlistReader.main.bundleDisplayName,
-redirectUri: "io.element:/callback",
+redirectUri: "io.element.android:/",
 clientUri: "https://element.io",
 tosUri: "https://element.io/user-terms-of-service",
 policyUri: "https://element.io/privacy"
@@ -19,7 +19,7 @@ policyUri: "https://element.io/privacy"
 
 Android:
 clientName = "Element",
-redirectUri = "io.element:/callback",
+redirectUri = "io.element.android:/",
 clientUri = "https://element.io",
 tosUri = "https://element.io/user-terms-of-service",
 policyUri = "https://element.io/privacy"
diff --git a/fastlane/metadata/android/en-US/changelogs/202505000.txt b/fastlane/metadata/android/en-US/changelogs/202505000.txt
new file mode 100644
index 0000000000..8955ade680
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/202505000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: bug fixes and improvements.
+Full changelog: https://github.com/element-hq/element-x-android/releases
diff --git a/features/analytics/api/src/main/res/values-cy/translations.xml b/features/analytics/api/src/main/res/values-cy/translations.xml
index 5971515095..308d8a07f1 100644
--- a/features/analytics/api/src/main/res/values-cy/translations.xml
+++ b/features/analytics/api/src/main/res/values-cy/translations.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_settings_help_us_improve">"Rhannu data defnydd dienw i\'n helpu i nodi problemau."</string>
+  <string name="screen_analytics_settings_read_terms">"Gallwch ddarllen ein holl amodau %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"yma"</string>
+  <string name="screen_analytics_settings_share_data">"Rhannu data dadansoddeg"</string>
 </resources>
diff --git a/features/analytics/api/src/main/res/values-de/translations.xml b/features/analytics/api/src/main/res/values-de/translations.xml
index ec26ff08fc..bf3584e3b4 100644
--- a/features/analytics/api/src/main/res/values-de/translations.xml
+++ b/features/analytics/api/src/main/res/values-de/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"Teile anonyme Nutzungsdaten, um uns bei der Identifizierung von Problemen zu helfen."</string>
-  <string name="screen_analytics_settings_read_terms">"Weitere Informationen findest du %1$s ."</string>
+  <string name="screen_analytics_settings_read_terms">"Weitere Informationen findest du %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"hier"</string>
   <string name="screen_analytics_settings_share_data">"Analysedaten teilen"</string>
 </resources>
diff --git a/features/analytics/api/src/main/res/values-eu/translations.xml b/features/analytics/api/src/main/res/values-eu/translations.xml
index 872363f92f..52e18f32ef 100644
--- a/features/analytics/api/src/main/res/values-eu/translations.xml
+++ b/features/analytics/api/src/main/res/values-eu/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"Partekatu erabilerari buruzko datu anonimoak arazoak identifikatzen laguntzeko."</string>
-  <string name="screen_analytics_settings_read_terms">"Gure baldintza guztiak irakur ditzakezu %1$s ."</string>
+  <string name="screen_analytics_settings_read_terms">"Gure baldintza guztiak irakur ditzakezu %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"hemen"</string>
   <string name="screen_analytics_settings_share_data">"Partekatu analisi-datuak"</string>
 </resources>
diff --git a/features/analytics/api/src/main/res/values-lt/translations.xml b/features/analytics/api/src/main/res/values-lt/translations.xml
index 3d5b510b99..08dd155332 100644
--- a/features/analytics/api/src/main/res/values-lt/translations.xml
+++ b/features/analytics/api/src/main/res/values-lt/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
-  <string name="screen_analytics_settings_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s ."</string>
+  <string name="screen_analytics_settings_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"čia"</string>
   <string name="screen_analytics_settings_share_data">"Dalytis analitiniais duomenimis"</string>
 </resources>
diff --git a/features/analytics/api/src/main/res/values-pt-rBR/translations.xml b/features/analytics/api/src/main/res/values-pt-rBR/translations.xml
index 4e7dc9775f..ab649cc9ff 100644
--- a/features/analytics/api/src/main/res/values-pt-rBR/translations.xml
+++ b/features/analytics/api/src/main/res/values-pt-rBR/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_settings_help_us_improve">"Compartilhe dados de uso anônimos para nos ajudar a identificar problemas."</string>
-  <string name="screen_analytics_settings_read_terms">"Você pode ler todos os nossos termos %1$s ."</string>
+  <string name="screen_analytics_settings_read_terms">"Você pode ler todos os nossos termos %1$s."</string>
   <string name="screen_analytics_settings_read_terms_content_link">"aqui"</string>
   <string name="screen_analytics_settings_share_data">"Compartilhar dados de utilização"</string>
 </resources>
diff --git a/features/analytics/impl/src/main/res/values-cy/translations.xml b/features/analytics/impl/src/main/res/values-cy/translations.xml
index b3f6539e7c..1a53e3600e 100644
--- a/features/analytics/impl/src/main/res/values-cy/translations.xml
+++ b/features/analytics/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_analytics_prompt_data_usage">"Fyddwn ni ddim yn cofnodi nac yn proffilio unrhyw ddata personol"</string>
+  <string name="screen_analytics_prompt_help_us_improve">"Rhannu data defnydd dienw i\'n helpu i nodi problemau."</string>
+  <string name="screen_analytics_prompt_read_terms">"Gallwch ddarllen ein holl amodau %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"yma"</string>
+  <string name="screen_analytics_prompt_settings">"Gallwch ddiffodd hwn unrhyw bryd"</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"Fyddwn ni ddim yn rhannu eich data gyda thrydydd parti"</string>
+  <string name="screen_analytics_prompt_title">"Helpwch i wella %1$s"</string>
 </resources>
diff --git a/features/analytics/impl/src/main/res/values-de/translations.xml b/features/analytics/impl/src/main/res/values-de/translations.xml
index e2180092d9..2a91e8ce25 100644
--- a/features/analytics/impl/src/main/res/values-de/translations.xml
+++ b/features/analytics/impl/src/main/res/values-de/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_data_usage">"Wir zeichnen keine persönlichen Daten auf und erstellen keine Profile."</string>
   <string name="screen_analytics_prompt_help_us_improve">"Teile anonyme Nutzungsdaten, um uns bei der Identifizierung von Problemen zu helfen."</string>
-  <string name="screen_analytics_prompt_read_terms">"Weitere Informationen findest du %1$s ."</string>
+  <string name="screen_analytics_prompt_read_terms">"Weitere Informationen findest du %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"hier"</string>
   <string name="screen_analytics_prompt_settings">"Du kannst diese Funktion jederzeit deaktivieren"</string>
   <string name="screen_analytics_prompt_third_party_sharing">"Wir geben deine Daten nicht an Dritte weiter"</string>
diff --git a/features/analytics/impl/src/main/res/values-eu/translations.xml b/features/analytics/impl/src/main/res/values-eu/translations.xml
index 2b3a29c0af..a0083af67b 100644
--- a/features/analytics/impl/src/main/res/values-eu/translations.xml
+++ b/features/analytics/impl/src/main/res/values-eu/translations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_help_us_improve">"Partekatu erabilerari buruzko datu anonimoak arazoak identifikatzen laguntzeko."</string>
-  <string name="screen_analytics_prompt_read_terms">"Gure baldintza guztiak irakur ditzakezu %1$s ."</string>
+  <string name="screen_analytics_prompt_read_terms">"Gure baldintza guztiak irakur ditzakezu %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"hemen"</string>
   <string name="screen_analytics_prompt_settings">"Edozein unetan desaktibatu dezakezu"</string>
   <string name="screen_analytics_prompt_third_party_sharing">"Ez ditugu zure datuak hirugarrenekin partekatuko"</string>
diff --git a/features/analytics/impl/src/main/res/values-lt/translations.xml b/features/analytics/impl/src/main/res/values-lt/translations.xml
index bdd2bbb1d1..11f2cbc74e 100644
--- a/features/analytics/impl/src/main/res/values-lt/translations.xml
+++ b/features/analytics/impl/src/main/res/values-lt/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_data_usage">"Mes nekaupsime ir neprofiliuosime jokių asmens duomenų"</string>
   <string name="screen_analytics_prompt_help_us_improve">"Dalinkitės anoniminiais naudojimo duomenimis ir padėkite mums nustatyti problemas."</string>
-  <string name="screen_analytics_prompt_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s ."</string>
+  <string name="screen_analytics_prompt_read_terms">"Galite perskaityti visas mūsų sąlygas %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"čia"</string>
   <string name="screen_analytics_prompt_settings">"Tai galite bet kada išjungti"</string>
   <string name="screen_analytics_prompt_third_party_sharing">"Mes nesidalinsime Jūsų duomenimis su trečiosiomis šalimis"</string>
diff --git a/features/analytics/impl/src/main/res/values-pt-rBR/translations.xml b/features/analytics/impl/src/main/res/values-pt-rBR/translations.xml
index b2fe6e00bc..b91ab36256 100644
--- a/features/analytics/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/analytics/impl/src/main/res/values-pt-rBR/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_analytics_prompt_data_usage">"Não registraremos nem criaremos perfil baseado em qualquer dado pessoal"</string>
   <string name="screen_analytics_prompt_help_us_improve">"Compartilhe dados de uso anônimos para nos ajudar a identificar problemas."</string>
-  <string name="screen_analytics_prompt_read_terms">"Você pode ler todos os nossos termos %1$s ."</string>
+  <string name="screen_analytics_prompt_read_terms">"Você pode ler todos os nossos termos %1$s."</string>
   <string name="screen_analytics_prompt_read_terms_content_link">"aqui"</string>
   <string name="screen_analytics_prompt_settings">"Você pode desativar isso a qualquer momento"</string>
   <string name="screen_analytics_prompt_third_party_sharing">"Não compartilharemos seus dados com terceiros"</string>
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
index 6baffd8143..7156a3e603 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
@@ -241,7 +241,7 @@ class CallScreenPresenter @AssistedInject constructor(
 
     private suspend fun MatrixClient.notifyCallStartIfNeeded(roomId: RoomId) {
         if (!notifiedCallStart) {
-            getRoom(roomId)?.sendCallNotificationIfNeeded()
+            getJoinedRoom(roomId)?.use { it.sendCallNotificationIfNeeded() }
                 ?.onSuccess { notifiedCallStart = true }
         }
     }
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
index a1906ff99a..90f89ce7c6 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/ElementCallActivity.kt
@@ -10,7 +10,6 @@ package io.element.android.features.call.impl.ui
 import android.Manifest
 import android.app.PictureInPictureParams
 import android.content.Intent
-import android.content.res.Configuration
 import android.media.AudioAttributes
 import android.media.AudioFocusRequest
 import android.media.AudioManager
@@ -78,7 +77,6 @@ class ElementCallActivity :
 
     private val requestPermissionsLauncher = registerPermissionResultLauncher()
 
-    private var isDarkMode = false
     private val webViewTarget = mutableStateOf<CallType?>(null)
 
     private var eventSink: ((CallScreenEvents) -> Unit)? = null
@@ -102,10 +100,6 @@ class ElementCallActivity :
             return
         }
 
-        if (savedInstanceState == null) {
-            updateUiMode(resources.configuration)
-        }
-
         pictureInPicturePresenter.setPipView(this)
 
         audioManager = getSystemService(AUDIO_SERVICE) as AudioManager
@@ -174,11 +168,6 @@ class ElementCallActivity :
         }
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        updateUiMode(newConfig)
-    }
-
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setCallType(intent)
@@ -283,19 +272,6 @@ class ElementCallActivity :
         }
     }
 
-    private fun updateUiMode(configuration: Configuration) {
-        val prevDarkMode = isDarkMode
-        val currentNightMode = configuration.uiMode and Configuration.UI_MODE_NIGHT_YES
-        isDarkMode = currentNightMode != 0
-        if (prevDarkMode != isDarkMode) {
-            if (isDarkMode) {
-                window.setBackgroundDrawableResource(android.R.drawable.screen_background_dark)
-            } else {
-                window.setBackgroundDrawableResource(android.R.drawable.screen_background_light)
-            }
-        }
-    }
-
     @RequiresApi(Build.VERSION_CODES.O)
     override fun setPipParams() {
         setPictureInPictureParams(getPictureInPictureParams())
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
index 59e19d3fe2..8804a91f79 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/ActiveCallManager.kt
@@ -13,6 +13,8 @@ import android.os.PowerManager
 import androidx.annotation.VisibleForTesting
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.getSystemService
+import coil3.SingletonImageLoader
+import coil3.annotation.DelicateCoilApi
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.appconfig.ElementCallConfig
 import io.element.android.features.call.api.CallType
@@ -23,6 +25,8 @@ import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClientProvider
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import io.element.android.libraries.push.api.notifications.ForegroundServiceType
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
 import io.element.android.libraries.push.api.notifications.OnMissedCallNotificationHandler
@@ -89,6 +93,7 @@ class DefaultActiveCallManager @Inject constructor(
     private val matrixClientProvider: MatrixClientProvider,
     private val defaultCurrentCallService: DefaultCurrentCallService,
     private val appForegroundStateService: AppForegroundStateService,
+    private val imageLoaderHolder: ImageLoaderHolder,
 ) : ActiveCallManager {
     private val tag = "DefaultActiveCallManager"
     private var timedOutCallJob: Job? = null
@@ -125,6 +130,7 @@ class DefaultActiveCallManager @Inject constructor(
             )
 
             timedOutCallJob = coroutineScope.launch {
+                setUpCoil(notificationData.sessionId)
                 showIncomingCallNotification(notificationData)
 
                 // Wait for the ringing call to time out
@@ -140,6 +146,13 @@ class DefaultActiveCallManager @Inject constructor(
         }
     }
 
+    @OptIn(DelicateCoilApi::class)
+    private suspend fun setUpCoil(sessionId: SessionId) {
+        val matrixClient = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return
+        // Ensure that the image loader is set, else the IncomingCallActivity will not be able to render the caller avatar
+        SingletonImageLoader.setUnsafe(imageLoaderHolder.get(matrixClient))
+    }
+
     /**
      * Called when the incoming call timed out. It will remove the active call and remove any associated UI, adding a 'missed call' notification.
      */
diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
index a4c05e8e5c..30977eb05f 100644
--- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
+++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/utils/DefaultCallWidgetProvider.kt
@@ -33,7 +33,7 @@ class DefaultCallWidgetProvider @Inject constructor(
         theme: String?,
     ): Result<CallWidgetProvider.GetWidgetResult> = runCatching {
         val matrixClient = matrixClientsProvider.getOrRestore(sessionId).getOrThrow()
-        val room = matrixClient.getRoom(roomId) ?: error("Room not found")
+        val room = matrixClient.getJoinedRoom(roomId) ?: error("Room not found")
 
         val customBaseUrl = appPreferencesStore.getCustomElementCallBaseUrlFlow().firstOrNull()
         val baseUrl = customBaseUrl ?: EMBEDDED_CALL_WIDGET_BASE_URL
@@ -47,8 +47,11 @@ class DefaultCallWidgetProvider @Inject constructor(
             theme = theme,
         ).getOrThrow()
 
+        val driver = room.getWidgetDriver(widgetSettings).getOrThrow()
+        room.destroy()
+
         CallWidgetProvider.GetWidgetResult(
-            driver = room.getWidgetDriver(widgetSettings).getOrThrow(),
+            driver = driver,
             url = callUrl,
         )
     }
diff --git a/features/call/impl/src/main/res/values-cy/translations.xml b/features/call/impl/src/main/res/values-cy/translations.xml
index 13f92c64d4..4b1edd1b82 100644
--- a/features/call/impl/src/main/res/values-cy/translations.xml
+++ b/features/call/impl/src/main/res/values-cy/translations.xml
@@ -3,4 +3,5 @@
   <string name="call_foreground_service_channel_title_android">"Galwad cyfredol"</string>
   <string name="call_foreground_service_message_android">"Tapio i ddychwelyd i\'r alwad"</string>
   <string name="call_foreground_service_title_android">"☎️ Galwad ar y gweill"</string>
+  <string name="screen_incoming_call_subtitle_android">"Galwad Element"</string>
 </resources>
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
index 5ec48ce6a1..43a1e7ceba 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
@@ -26,7 +26,7 @@ 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.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.network.useragent.UserAgentProvider
@@ -84,7 +84,7 @@ import kotlin.time.Duration.Companion.seconds
     fun `present - with CallType RoomCall sets call as active, loads URL, runs WidgetDriver and notifies the other clients a call started`() = runTest {
         val sendCallNotificationIfNeededLambda = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
         val syncService = FakeSyncService(SyncState.Running)
-        val fakeRoom = FakeMatrixRoom(sendCallNotificationIfNeededResult = sendCallNotificationIfNeededLambda)
+        val fakeRoom = FakeJoinedRoom(sendCallNotificationIfNeededResult = sendCallNotificationIfNeededLambda)
         val client = FakeMatrixClient(syncService = syncService).apply {
             givenGetRoomResult(A_ROOM_ID, fakeRoom)
         }
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
index d6e06882a2..2059e9836e 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultActiveCallManagerTest.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID_2
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.push.api.notifications.ForegroundServiceType
 import io.element.android.libraries.push.api.notifications.NotificationIdProvider
@@ -227,7 +227,7 @@ class DefaultActiveCallManagerTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `observeRingingCalls - will cancel the active ringing call if the call is cancelled`() = runTest {
-        val room = FakeMatrixRoom().apply {
+        val room = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo())
         }
         val client = FakeMatrixClient().apply {
@@ -254,7 +254,7 @@ class DefaultActiveCallManagerTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `observeRingingCalls - will do nothing if either the session or the room are not found`() = runTest {
-        val room = FakeMatrixRoom().apply {
+        val room = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo())
         }
         val client = FakeMatrixClient().apply {
@@ -325,5 +325,6 @@ class DefaultActiveCallManagerTest {
         matrixClientProvider = matrixClientProvider,
         defaultCurrentCallService = DefaultCurrentCallService(),
         appForegroundStateService = FakeAppForegroundStateService(),
+        imageLoaderHolder = FakeImageLoaderHolder(),
     )
 }
diff --git a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
index 66a85d1c36..cd81533a47 100644
--- a/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
+++ b/features/call/impl/src/test/kotlin/io/element/android/features/call/utils/DefaultCallWidgetProviderTest.kt
@@ -15,7 +15,7 @@ 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.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.widget.FakeCallWidgetSettingsProvider
 import io.element.android.libraries.matrix.test.widget.FakeMatrixWidgetDriver
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
@@ -41,7 +41,7 @@ class DefaultCallWidgetProviderTest {
 
     @Test
     fun `getWidget - fails if it can't generate the URL for the widget`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             generateWidgetWebViewUrlResult = { _, _, _, _ -> Result.failure(Exception("Can't generate URL for widget")) }
         )
         val client = FakeMatrixClient().apply {
@@ -53,7 +53,7 @@ class DefaultCallWidgetProviderTest {
 
     @Test
     fun `getWidget - fails if it can't get the widget driver`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             generateWidgetWebViewUrlResult = { _, _, _, _ -> Result.success("url") },
             getWidgetDriverResult = { Result.failure(Exception("Can't get a widget driver")) }
         )
@@ -66,7 +66,7 @@ class DefaultCallWidgetProviderTest {
 
     @Test
     fun `getWidget - returns a widget driver when all steps are successful`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             generateWidgetWebViewUrlResult = { _, _, _, _ -> Result.success("url") },
             getWidgetDriverResult = { Result.success(FakeMatrixWidgetDriver()) },
         )
@@ -79,7 +79,7 @@ class DefaultCallWidgetProviderTest {
 
     @Test
     fun `getWidget - will use a custom base url if it exists`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             generateWidgetWebViewUrlResult = { _, _, _, _ -> Result.success("url") },
             getWidgetDriverResult = { Result.success(FakeMatrixWidgetDriver()) },
         )
diff --git a/features/createroom/impl/src/main/res/values-be/translations.xml b/features/createroom/impl/src/main/res/values-be/translations.xml
index 4706fc4092..8acb990b02 100644
--- a/features/createroom/impl/src/main/res/values-be/translations.xml
+++ b/features/createroom/impl/src/main/res/values-be/translations.xml
@@ -3,9 +3,10 @@
   <string name="screen_create_room_action_create_room">"Новы пакой"</string>
   <string name="screen_create_room_add_people_title">"Запрасіць карыстальнікаў"</string>
   <string name="screen_create_room_error_creating_room">"Пры стварэнні пакоя адбылася памылка"</string>
-  <string name="screen_create_room_private_option_description">"Паведамленні ў гэтым пакоі зашыфраваны. Гэта шыфраванне нельга адключыць."</string>
-  <string name="screen_create_room_private_option_title">"Прыватны пакой (толькі па запрашэнні)"</string>
-  <string name="screen_create_room_public_option_description">"Паведамленні не зашыфраваны, і кожны можа іх прачытаць. Вы можаце ўключыць шыфраванне пазней."</string>
+  <string name="screen_create_room_private_option_description">"Толькі запрошаныя людзі могуць атрымаць доступ да гэтага пакоя. Усе паведамленні абаронены end-to-end шыфраваннем."</string>
+  <string name="screen_create_room_private_option_title">"Прыватны пакой"</string>
+  <string name="screen_create_room_public_option_description">"Любы можа знайсці гэты пакой. 
+Вы можаце змяніць гэта ў любы час у наладах пакоя."</string>
   <string name="screen_create_room_public_option_title">"Публічны пакой"</string>
   <string name="screen_create_room_room_access_section_anyone_option_title">"Хто заўгодна"</string>
   <string name="screen_create_room_room_access_section_header">"Доступ у пакой"</string>
diff --git a/features/createroom/impl/src/main/res/values-cy/translations.xml b/features/createroom/impl/src/main/res/values-cy/translations.xml
index 78f88a2112..a3a9e30e35 100644
--- a/features/createroom/impl/src/main/res/values-cy/translations.xml
+++ b/features/createroom/impl/src/main/res/values-cy/translations.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_create_room_action_create_room">"Ystafell newydd"</string>
   <string name="screen_create_room_add_people_title">"Gwahodd pobl"</string>
+  <string name="screen_create_room_error_creating_room">"Bu gwall wrth greu\'r ystafell"</string>
+  <string name="screen_create_room_private_option_description">"Dim ond pobl wahoddwyd all gael mynediad i\'r ystafell hon. Mae pob neges wedi\'i hamgryptio o\'r dechrau i\'r diwedd."</string>
+  <string name="screen_create_room_private_option_title">"Ystafell breifat"</string>
+  <string name="screen_create_room_public_option_description">"Gall unrhyw un ddod o hyd i\'r ystafell hon.
+Gallwch newid hyn unrhyw bryd yng ngosodiadau ystafell."</string>
+  <string name="screen_create_room_public_option_title">"Ystafell gyhoeddus"</string>
   <string name="screen_create_room_room_access_section_anyone_option_description">"Gall unrhyw un ymuno â\'r ystafell hon"</string>
   <string name="screen_create_room_room_access_section_anyone_option_title">"Unrhyw un"</string>
   <string name="screen_create_room_room_access_section_header">"Mynediad i\'r Ystafell"</string>
@@ -11,4 +18,13 @@
   <string name="screen_create_room_room_name_label">"Enw\'r ystafell"</string>
   <string name="screen_create_room_room_visibility_section_title">"Gwelededd yr ystafell"</string>
   <string name="screen_create_room_title">"Creu ystafell"</string>
+  <string name="screen_create_room_topic_label">"Pwnc (dewisol)"</string>
+  <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>
diff --git a/features/createroom/impl/src/main/res/values-el/translations.xml b/features/createroom/impl/src/main/res/values-el/translations.xml
index 3ea4924c8d..a225550684 100644
--- a/features/createroom/impl/src/main/res/values-el/translations.xml
+++ b/features/createroom/impl/src/main/res/values-el/translations.xml
@@ -14,10 +14,17 @@
   <string name="screen_create_room_room_access_section_knocking_option_description">"Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει στο δωμάτιο, αλλά ένας διαχειριστής ή συντονιστής θα πρέπει να αποδεχθεί το αίτημα"</string>
   <string name="screen_create_room_room_access_section_knocking_option_title">"Αίτημα συμμετοχής"</string>
   <string name="screen_create_room_room_address_section_footer">"Για να είναι ορατό αυτό το δωμάτιο στον κατάλογο των δημόσιων δωματίων, θα χρειαστείς μια διεύθυνση δωματίου."</string>
+  <string name="screen_create_room_room_address_section_title">"Διεύθυνση δωματίου"</string>
   <string name="screen_create_room_room_name_label">"Όνομα δωματίου"</string>
   <string name="screen_create_room_room_visibility_section_title">"Ορατότητα δωματίου"</string>
   <string name="screen_create_room_title">"Δημιούργησε ένα δωμάτιο"</string>
   <string name="screen_create_room_topic_label">"Θέμα (προαιρετικό)"</string>
   <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>
diff --git a/features/createroom/impl/src/main/res/values-fa/translations.xml b/features/createroom/impl/src/main/res/values-fa/translations.xml
index 0a52a6fc8d..b807bfa189 100644
--- a/features/createroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/createroom/impl/src/main/res/values-fa/translations.xml
@@ -3,12 +3,25 @@
   <string name="screen_create_room_action_create_room">"اتاق جدید"</string>
   <string name="screen_create_room_add_people_title">"دعوت افراد"</string>
   <string name="screen_create_room_error_creating_room">"هنگام ایجاد اتاق خطایی رخ داد"</string>
-  <string name="screen_create_room_private_option_description">"پیام‌های این اتاق رمز شده‌اند. رمزنگاری نمی‌تواند از این پس تغییر کند."</string>
-  <string name="screen_create_room_private_option_title">"اتاق خصوصی (فقط دعوت)"</string>
-  <string name="screen_create_room_public_option_description">"پیام‌ها رمزنگاری نشده و هرکسی می‌تواند بخواندشان. می‌توانید بعداً رمزنگاری را به کار بیندازید."</string>
+  <string name="screen_create_room_private_option_description">"تنها افراد دعوت شده می‌توانند به این اتاق دسترسی داشته باشند. همهٔ پیام‌ها رمزنگاری سرتاسری شده‌اند."</string>
+  <string name="screen_create_room_private_option_title">"اتاق خصوصی"</string>
+  <string name="screen_create_room_public_option_description">"هرکسی می‌تواند اتاق را بیابد.
+می‌توانید بعداً در تظیمات اتاق عوضش کنید."</string>
   <string name="screen_create_room_public_option_title">"اتاق عمومی"</string>
+  <string name="screen_create_room_room_access_section_anyone_option_description">"هرکسی می‌تواند به این اتاق بپیوندد"</string>
+  <string name="screen_create_room_room_access_section_anyone_option_title">"هرکسی"</string>
+  <string name="screen_create_room_room_access_section_header">"دسترسی اتاق"</string>
+  <string name="screen_create_room_room_access_section_knocking_option_title">"درخواست دعوت"</string>
+  <string name="screen_create_room_room_address_section_title">"نشانی اتاق"</string>
   <string name="screen_create_room_room_name_label">"نام اتاق"</string>
+  <string name="screen_create_room_room_visibility_section_title">"نمایانی اتاق"</string>
   <string name="screen_create_room_title">"ایجاد اتاق"</string>
   <string name="screen_create_room_topic_label">"موضوع (اختیاری)"</string>
   <string name="screen_room_directory_search_title">"فهرست اتاق‌ها"</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>
diff --git a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
index 04e2d53ea2..0d67c883c7 100644
--- a/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/createroom/impl/src/main/res/values-zh-rTW/translations.xml
@@ -21,4 +21,10 @@
   <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>
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenterTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureBaseRoomPresenterTest.kt
similarity index 99%
rename from features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenterTest.kt
rename to features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureBaseRoomPresenterTest.kt
index 60698b8e98..d8a7085f0d 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureBaseRoomPresenterTest.kt
@@ -66,7 +66,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 ConfigureRoomPresenterTest {
+class ConfigureBaseRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressPresenterTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
similarity index 99%
rename from features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressPresenterTest.kt
rename to features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
index d1ee3e801c..10cca20fa3 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressPresenterTest.kt
@@ -21,7 +21,7 @@ import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class JoinRoomByAddressPresenterTest {
+class JoinBaseRoomByAddressPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createJoinRoomByAddressPresenter()
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressViewTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
similarity index 98%
rename from features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressViewTest.kt
rename to features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
index bb3ee3e493..93db738d35 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressViewTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinBaseRoomByAddressViewTest.kt
@@ -23,7 +23,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class JoinRoomByAddressViewTest {
+class JoinBaseRoomByAddressViewTest {
     @get:Rule
     val rule = createAndroidComposeRule<ComponentActivity>()
 
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootPresenterTest.kt
similarity index 99%
rename from features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTest.kt
rename to features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootPresenterTest.kt
index 2d81580319..54cd1d201c 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootPresenterTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootPresenterTest.kt
@@ -36,7 +36,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
 
-class CreateRoomRootPresenterTest {
+class CreateBaseRoomRootPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootViewTest.kt
similarity index 99%
rename from features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt
rename to features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootViewTest.kt
index 239248a57c..9104b2dfb2 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateBaseRoomRootViewTest.kt
@@ -33,7 +33,7 @@ import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-class CreateRoomRootViewTest {
+class CreateBaseRoomRootViewTest {
     @get:Rule
     val rule = createAndroidComposeRule<ComponentActivity>()
 
diff --git a/features/deactivation/impl/src/main/res/values-cy/translations.xml b/features/deactivation/impl/src/main/res/values-cy/translations.xml
index 8c2c6e1609..e49073c36e 100644
--- a/features/deactivation/impl/src/main/res/values-cy/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +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">"Cadarnhewch eich bod am gau\'r cyfrif. Does dom modd dadwneud y weithred hon."</string>
+  <string name="screen_deactivate_account_delete_all_messages">"Dileu fy holl negeseuon"</string>
+  <string name="screen_deactivate_account_delete_all_messages_notice">"Rhybudd: Mae\'n bosibl y bydd defnyddwyr y dyfodol yn gweld sgyrsiau anghyflawn."</string>
+  <string name="screen_deactivate_account_description">"Bydd cau eich cyfrif yn %1$s yn:"</string>
+  <string name="screen_deactivate_account_description_bold_part">"dim modd ei adfer"</string>
+  <string name="screen_deactivate_account_list_item_1">"%1$s eich cyfrif (does dim modd i chi fewngofnodi eto, ac nid oes modd ailddefnyddio\'ch dull adnabod)."</string>
+  <string name="screen_deactivate_account_list_item_1_bold_part">"Analluogi\'n barhaol"</string>
+  <string name="screen_deactivate_account_list_item_2">"Eich tynnu o bob ystafell sgwrsio."</string>
+  <string name="screen_deactivate_account_list_item_3">"Dileu manylion eich cyfrif o\'n gweinydd hunaniaeth."</string>
+  <string name="screen_deactivate_account_list_item_4">"Bydd eich negeseuon yn dal i fod yn weladwy i ddefnyddwyr cofrestredig ond fyddan nhw ddim ar gael i ddefnyddwyr newydd neu anghofrestredig os byddwch yn dewis eu dileu."</string>
   <string name="screen_deactivate_account_title">"Cau cyfrif"</string>
 </resources>
diff --git a/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml b/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
index 4125db4664..734df67962 100644
--- a/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/deactivation/impl/src/main/res/values-pt-rBR/translations.xml
@@ -2,4 +2,5 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_deactivate_account_description">"Desativar sua conta é %1$s, isso irá:"</string>
   <string name="screen_deactivate_account_list_item_2">"Te remover de todas as salas de conversa."</string>
+  <string name="screen_deactivate_account_title">"Desativar conta"</string>
 </resources>
diff --git a/features/ftue/impl/src/main/res/values-cy/translations.xml b/features/ftue/impl/src/main/res/values-cy/translations.xml
index 63630b863d..bf87c2ca70 100644
--- a/features/ftue/impl/src/main/res/values-cy/translations.xml
+++ b/features/ftue/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_welcome_button">"Ffwrdd â ni!"</string>
+  <string name="screen_identity_confirmation_cannot_confirm">"Methu cadarnhau?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Crëwch allwedd adfer newydd"</string>
+  <string name="screen_identity_confirmation_subtitle">"Dilyswch y ddyfais hon er mwyn gosod negeseuon diogel."</string>
+  <string name="screen_identity_confirmation_title">"Cadarnhewch eich hunaniaeth"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Defnyddiwch ddyfais arall"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Defnyddiwch allwedd adfer"</string>
+  <string name="screen_identity_confirmed_subtitle">"Nawr gallwch chi ddarllen neu anfon negeseuon yn ddiogel, a gall unrhyw un rydych chi\'n sgwrsio â nhw ymddiried yn y ddyfais hon hefyd."</string>
+  <string name="screen_identity_confirmed_title">"Dyfais wedi\'i dilysu"</string>
+  <string name="screen_identity_use_another_device">"Defnyddiwch ddyfais arall"</string>
+  <string name="screen_identity_waiting_on_other_device">"Yn aros ar ddyfais arall…"</string>
+  <string name="screen_notification_optin_subtitle">"Gallwch newid eich gosodiadau yn nes ymlaen."</string>
+  <string name="screen_notification_optin_title">"Caniatáu hysbysiadau a pheidio byth â cholli neges"</string>
+  <string name="screen_session_verification_enter_recovery_key">"Rhowch eich allwedd adfer"</string>
+  <string name="screen_welcome_bullet_1">"Bydd galwadau, pleidleisiau, chwilio a mwy yn cael eu hychwanegu yn ddiweddarach eleni."</string>
+  <string name="screen_welcome_bullet_2">"Nid yw hanes negeseuon ar gyfer ystafelloedd sydd wedi\'u hamgryptio ar gael eto."</string>
+  <string name="screen_welcome_bullet_3">"Byddem wrth ein bodd yn clywed gennych, gadewch i ni wybod beth yw eich barn drwy\'r dudalen gosodiadau."</string>
+  <string name="screen_welcome_button">"Ymlaen!"</string>
+  <string name="screen_welcome_subtitle">"Dyma beth sydd angen i chi ei wybod:"</string>
+  <string name="screen_welcome_title">"Croeso i %1$s!"</string>
 </resources>
diff --git a/features/invite/api/build.gradle.kts b/features/invite/api/build.gradle.kts
index c4039e2382..d17b392e59 100644
--- a/features/invite/api/build.gradle.kts
+++ b/features/invite/api/build.gradle.kts
@@ -7,6 +7,7 @@
 
 plugins {
     id("io.element.android-compose-library")
+    id("kotlin-parcelize")
 }
 
 android {
@@ -16,5 +17,7 @@ android {
 dependencies {
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
     implementation(projects.services.analytics.api)
 }
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt
new file mode 100644
index 0000000000..eb1dfd3df6
--- /dev/null
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/InviteData.kt
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.api
+
+import android.os.Parcelable
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.isDm
+import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class InviteData(
+    val roomId: RoomId,
+    val roomName: String,
+    val isDm: Boolean,
+) : Parcelable
+
+fun RoomPreviewInfo.toInviteData(): InviteData {
+    return InviteData(
+        roomId = roomId,
+        roomName = name ?: roomId.value,
+        isDm = false,
+    )
+}
+
+fun RoomInfo.toInviteData(): InviteData {
+    return InviteData(
+        roomId = id,
+        roomName = name ?: id.value,
+        isDm = isDm,
+    )
+}
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt
new file mode 100644
index 0000000000..015fc16182
--- /dev/null
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteEvents.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.invite.api.acceptdecline
+
+import io.element.android.features.invite.api.InviteData
+
+interface AcceptDeclineInviteEvents {
+    data class AcceptInvite(val invite: InviteData) : AcceptDeclineInviteEvents
+    data class DeclineInvite(val invite: InviteData, val blockUser: Boolean, val shouldConfirm: Boolean) : AcceptDeclineInviteEvents
+}
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteState.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
similarity index 88%
rename from features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteState.kt
rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
index ad883119cb..f4645383df 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteState.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteState.kt
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.api.response
+package io.element.android.features.invite.api.acceptdecline
 
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
similarity index 67%
rename from features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt
rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
index 4ad3ae4781..b0450975af 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteStateProvider.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteStateProvider.kt
@@ -5,12 +5,12 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.api.response
+package io.element.android.features.invite.api.acceptdecline
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.UserId
 
 open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDeclineInviteState> {
     override val values: Sequence<AcceptDeclineInviteState>
@@ -18,27 +18,21 @@ open class AcceptDeclineInviteStateProvider : PreviewParameterProvider<AcceptDec
             anAcceptDeclineInviteState(),
             anAcceptDeclineInviteState(
                 declineAction = ConfirmingDeclineInvite(
-                    InviteData(roomId = RoomId("!room:matrix.org"), isDm = true, roomName = "Alice", senderId = UserId("@alice:matrix.org")),
+                    InviteData(roomId = RoomId("!room:matrix.org"), isDm = true, roomName = "Alice"),
                     blockUser = false,
                 ),
             ),
             anAcceptDeclineInviteState(
                 declineAction = ConfirmingDeclineInvite(
-                    InviteData(roomId = RoomId("!room:matrix.org"), isDm = false, roomName = "Some room", senderId = UserId("@alice:matrix.org")),
-                    blockUser = false,
-                ),
-            ),
-            anAcceptDeclineInviteState(
-                declineAction = ConfirmingDeclineInvite(
-                    InviteData(roomId = RoomId("!room:matrix.org"), isDm = true, roomName = "Alice", senderId = UserId("@alice:matrix.org")),
+                    InviteData(roomId = RoomId("!room:matrix.org"), isDm = true, roomName = "Alice"),
                     blockUser = true,
                 ),
             ),
             anAcceptDeclineInviteState(
-                acceptAction = AsyncAction.Failure(Throwable("Whoops")),
+                acceptAction = AsyncAction.Failure(Throwable("Error while accepting invite")),
             ),
             anAcceptDeclineInviteState(
-                declineAction = AsyncAction.Failure(Throwable("Whoops")),
+                declineAction = AsyncAction.Failure(Throwable("Error while declining invite")),
             ),
         )
 }
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
similarity index 74%
rename from features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt
rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
index cdcd5b15ec..78be5ebd16 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/AcceptDeclineInviteView.kt
@@ -5,7 +5,7 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.api.response
+package io.element.android.features.invite.api.acceptdecline
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -15,8 +15,8 @@ interface AcceptDeclineInviteView {
     @Composable
     fun Render(
         state: AcceptDeclineInviteState,
-        onAcceptInvite: (RoomId) -> Unit,
-        onDeclineInvite: (RoomId) -> Unit,
+        onAcceptInviteSuccess: (RoomId) -> Unit,
+        onDeclineInviteSuccess: (RoomId) -> Unit,
         modifier: Modifier,
     )
 }
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/ConfirmingDeclineInvite.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
similarity index 52%
rename from features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/ConfirmingDeclineInvite.kt
rename to features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
index 0e428eda4a..f0c4366351 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/ConfirmingDeclineInvite.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/acceptdecline/ConfirmingDeclineInvite.kt
@@ -5,11 +5,9 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.api.response
+package io.element.android.features.invite.api.acceptdecline
 
+import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.architecture.AsyncAction
 
-data class ConfirmingDeclineInvite(
-    val inviteData: InviteData,
-    val blockUser: Boolean,
-) : AsyncAction.Confirming
+data class ConfirmingDeclineInvite(val inviteData: InviteData, val blockUser: Boolean) : AsyncAction.Confirming
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
new file mode 100644
index 0000000000..27080ee354
--- /dev/null
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/declineandblock/DeclineInviteAndBlockEntryPoint.kt
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.api.declineandblock
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.features.invite.api.InviteData
+import io.element.android.libraries.architecture.FeatureEntryPoint
+
+interface DeclineInviteAndBlockEntryPoint : FeatureEntryPoint {
+    fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node
+}
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteEvents.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteEvents.kt
deleted file mode 100644
index 5734fcf152..0000000000
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteEvents.kt
+++ /dev/null
@@ -1,13 +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.invite.api.response
-
-interface AcceptDeclineInviteEvents {
-    data class AcceptInvite(val invite: InviteData?) : AcceptDeclineInviteEvents
-    data class DeclineInvite(val invite: InviteData?, val blockUser: Boolean = false) : AcceptDeclineInviteEvents
-}
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/InviteData.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/InviteData.kt
deleted file mode 100644
index be283e8dcd..0000000000
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/InviteData.kt
+++ /dev/null
@@ -1,18 +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.invite.api.response
-
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.UserId
-
-data class InviteData(
-    val senderId: UserId,
-    val roomId: RoomId,
-    val roomName: String,
-    val isDm: Boolean,
-)
diff --git a/features/invite/impl/build.gradle.kts b/features/invite/impl/build.gradle.kts
index 7f052bea09..d6337f65c9 100644
--- a/features/invite/impl/build.gradle.kts
+++ b/features/invite/impl/build.gradle.kts
@@ -14,6 +14,11 @@ plugins {
 
 android {
     namespace = "io.element.android.features.invite.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
 }
 
 setupAnvil()
@@ -36,9 +41,12 @@ dependencies {
     testImplementation(libs.molecule.runtime)
     testImplementation(libs.test.truth)
     testImplementation(libs.test.turbine)
+    testImplementation(libs.test.robolectric)
     testImplementation(projects.features.invite.test)
     testImplementation(projects.libraries.matrix.test)
     testImplementation(projects.libraries.push.test)
     testImplementation(projects.services.analytics.test)
     testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt
new file mode 100644
index 0000000000..c4d520a6b8
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl
+
+import com.squareup.anvil.annotations.ContributesBinding
+import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.features.invite.api.SeenInvitesStore
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.matrix.api.room.join.JoinRoom
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
+import javax.inject.Inject
+
+interface AcceptInvite {
+    suspend operator fun invoke(roomId: RoomId): Result<RoomId>
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultAcceptInvite @Inject constructor(
+    private val client: MatrixClient,
+    private val joinRoom: JoinRoom,
+    private val notificationCleaner: NotificationCleaner,
+    private val seenInvitesStore: SeenInvitesStore,
+) : AcceptInvite {
+    override suspend fun invoke(roomId: RoomId): Result<RoomId> {
+        return joinRoom(
+            roomIdOrAlias = roomId.toRoomIdOrAlias(),
+            serverNames = emptyList(),
+            trigger = JoinedRoom.Trigger.Invite,
+        ).onSuccess {
+            notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, roomId)
+            seenInvitesStore.markAsUnSeen(roomId)
+        }.map { roomId }
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt
new file mode 100644
index 0000000000..9276f37365
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/DeclineInvite.kt
@@ -0,0 +1,74 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl
+
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.invite.api.SeenInvitesStore
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.push.api.notifications.NotificationCleaner
+import javax.inject.Inject
+
+interface DeclineInvite {
+    suspend operator fun invoke(
+        roomId: RoomId,
+        blockUser: Boolean,
+        reportRoom: Boolean,
+        reportReason: String?
+    ): Result<RoomId>
+
+    sealed class Exception : kotlin.Exception() {
+        data object RoomNotFound : Exception()
+        data object DeclineInviteFailed : Exception()
+        data object ReportRoomFailed : Exception()
+        data object BlockUserFailed : Exception()
+    }
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultDeclineInvite @Inject constructor(
+    private val client: MatrixClient,
+    private val notificationCleaner: NotificationCleaner,
+    private val seenInvitesStore: SeenInvitesStore,
+) : DeclineInvite {
+    override suspend fun invoke(
+        roomId: RoomId,
+        blockUser: Boolean,
+        reportRoom: Boolean,
+        reportReason: String?
+    ): Result<RoomId> {
+        val room = client.getRoom(roomId) ?: return Result.failure(DeclineInvite.Exception.RoomNotFound)
+        room.use {
+            room.leave()
+                .onFailure { return Result.failure(DeclineInvite.Exception.DeclineInviteFailed) }
+                .onSuccess {
+                    notificationCleaner.clearMembershipNotificationForRoom(
+                        sessionId = client.sessionId,
+                        roomId = roomId
+                    )
+                    seenInvitesStore.markAsUnSeen(roomId)
+                }
+
+            if (blockUser) {
+                val userIdToBlock = room.info().inviter?.userId
+                if (userIdToBlock != null) {
+                    client
+                        .ignoreUser(userIdToBlock)
+                        .onFailure { return Result.failure(DeclineInvite.Exception.BlockUserFailed) }
+                }
+            }
+            if (reportRoom) {
+                room
+                    .reportRoom(reportReason)
+                    .onFailure { return Result.failure(DeclineInvite.Exception.ReportRoomFailed) }
+            }
+        }
+        return Result.success(roomId)
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt
new file mode 100644
index 0000000000..6dd75761d3
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenter.kt
@@ -0,0 +1,103 @@
+/*
+ * 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.invite.impl.acceptdecline
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
+import io.element.android.features.invite.impl.AcceptInvite
+import io.element.android.features.invite.impl.DeclineInvite
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runUpdatingState
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class AcceptDeclineInvitePresenter @Inject constructor(
+    private val acceptInvite: AcceptInvite,
+    private val declineInvite: DeclineInvite,
+) : Presenter<AcceptDeclineInviteState> {
+    @Composable
+    override fun present(): AcceptDeclineInviteState {
+        val localCoroutineScope = rememberCoroutineScope()
+        val acceptedAction: MutableState<AsyncAction<RoomId>> =
+            remember { mutableStateOf(AsyncAction.Uninitialized) }
+        val declinedAction: MutableState<AsyncAction<RoomId>> =
+            remember { mutableStateOf(AsyncAction.Uninitialized) }
+
+        fun handleEvents(event: AcceptDeclineInviteEvents) {
+            when (event) {
+                is AcceptDeclineInviteEvents.AcceptInvite -> {
+                    localCoroutineScope.acceptInvite(event.invite.roomId, acceptedAction)
+                }
+
+                is AcceptDeclineInviteEvents.DeclineInvite -> {
+                    val inviteData = event.invite
+                    if (event.shouldConfirm) {
+                        declinedAction.value = ConfirmingDeclineInvite(inviteData, event.blockUser)
+                    } else {
+                        localCoroutineScope.declineInvite(
+                            inviteData = inviteData,
+                            blockUser = event.blockUser,
+                            declinedAction = declinedAction,
+                        )
+                    }
+                }
+                is InternalAcceptDeclineInviteEvents.CancelDeclineInvite -> {
+                    declinedAction.value = AsyncAction.Uninitialized
+                }
+
+                is InternalAcceptDeclineInviteEvents.DismissAcceptError -> {
+                    acceptedAction.value = AsyncAction.Uninitialized
+                }
+
+                is InternalAcceptDeclineInviteEvents.DismissDeclineError -> {
+                    declinedAction.value = AsyncAction.Uninitialized
+                }
+            }
+        }
+
+        return AcceptDeclineInviteState(
+            acceptAction = acceptedAction.value,
+            declineAction = declinedAction.value,
+            eventSink = ::handleEvents
+        )
+    }
+
+    private fun CoroutineScope.acceptInvite(
+        roomId: RoomId,
+        acceptedAction: MutableState<AsyncAction<RoomId>>,
+    ) = launch {
+        acceptedAction.runUpdatingState {
+            acceptInvite(roomId)
+        }
+    }
+
+    private fun CoroutineScope.declineInvite(
+        inviteData: InviteData,
+        blockUser: Boolean,
+        declinedAction: MutableState<AsyncAction<RoomId>>,
+    ) = launch {
+        declinedAction.runUpdatingState {
+            declineInvite(
+                roomId = inviteData.roomId,
+                blockUser = blockUser,
+                reportRoom = false,
+                reportReason = null
+            )
+        }
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
similarity index 62%
rename from features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
index 4039a0aefb..2585300431 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInviteView.kt
@@ -5,17 +5,18 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.impl.response
+package io.element.android.features.invite.impl.acceptdecline
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.AcceptDeclineInviteStateProvider
-import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
-import io.element.android.features.invite.api.response.InviteData
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteStateProvider
+import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
 import io.element.android.features.invite.impl.R
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
@@ -27,21 +28,21 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun AcceptDeclineInviteView(
     state: AcceptDeclineInviteState,
-    onAcceptInvite: (RoomId) -> Unit,
-    onDeclineInvite: (RoomId) -> Unit,
+    onAcceptInviteSuccess: (RoomId) -> Unit,
+    onDeclineInviteSuccess: (RoomId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
         AsyncActionView(
             async = state.acceptAction,
-            onSuccess = onAcceptInvite,
+            onSuccess = onAcceptInviteSuccess,
             onErrorDismiss = {
                 state.eventSink(InternalAcceptDeclineInviteEvents.DismissAcceptError)
             },
         )
         AsyncActionView(
             async = state.declineAction,
-            onSuccess = onDeclineInvite,
+            onSuccess = onDeclineInviteSuccess,
             onErrorDismiss = {
                 state.eventSink(InternalAcceptDeclineInviteEvents.DismissDeclineError)
             },
@@ -52,7 +53,13 @@ fun AcceptDeclineInviteView(
                         invite = confirming.inviteData,
                         blockUser = confirming.blockUser,
                         onConfirmClick = {
-                            state.eventSink(InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite)
+                            state.eventSink(
+                                AcceptDeclineInviteEvents.DeclineInvite(
+                                    confirming.inviteData,
+                                    blockUser = confirming.blockUser,
+                                    shouldConfirm = false
+                                )
+                            )
                         },
                         onDismissClick = {
                             state.eventSink(InternalAcceptDeclineInviteEvents.CancelDeclineInvite)
@@ -72,30 +79,21 @@ private fun DeclineConfirmationDialog(
     onDismissClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    val senderId = invite.senderId.value
-    val content = when {
-        blockUser -> stringResource(R.string.screen_join_room_decline_and_block_alert_message, senderId)
-        invite.isDm -> stringResource(R.string.screen_invites_decline_direct_chat_message, invite.roomName)
-        else -> stringResource(R.string.screen_invites_decline_chat_message, invite.roomName)
-    }
-    val title = when {
-        blockUser -> stringResource(R.string.screen_join_room_decline_and_block_alert_title)
-        invite.isDm -> stringResource(R.string.screen_invites_decline_direct_chat_title)
-        else -> stringResource(R.string.screen_invites_decline_chat_title)
-    }
-    val submitText = if (blockUser) {
-        stringResource(R.string.screen_join_room_decline_and_block_alert_confirmation)
-    } else {
-        stringResource(CommonStrings.action_decline)
-    }
     ConfirmationDialog(
         modifier = modifier,
-        content = content,
-        title = title,
-        submitText = submitText,
+        content = stringResource(R.string.screen_invites_decline_chat_message, invite.roomName),
+        title = if (blockUser) {
+            stringResource(R.string.screen_join_room_decline_and_block_alert_title)
+        } else {
+            stringResource(R.string.screen_invites_decline_chat_title)
+        },
+        submitText = if (blockUser) {
+            stringResource(R.string.screen_join_room_decline_and_block_alert_confirmation)
+        } else {
+            stringResource(CommonStrings.action_decline)
+        },
         cancelText = stringResource(CommonStrings.action_cancel),
         onSubmitClick = onConfirmClick,
-        destructiveSubmit = blockUser,
         onDismiss = onDismissClick,
     )
 }
@@ -106,7 +104,7 @@ internal fun AcceptDeclineInviteViewPreview(@PreviewParameter(AcceptDeclineInvit
     ElementPreview {
         AcceptDeclineInviteView(
             state = state,
-            onAcceptInvite = {},
-            onDeclineInvite = {},
+            onAcceptInviteSuccess = {},
+            onDeclineInviteSuccess = {},
         )
     }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/DefaultAcceptDeclineInviteView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
similarity index 64%
rename from features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/DefaultAcceptDeclineInviteView.kt
rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
index 8d52c26df7..e37582f63f 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/DefaultAcceptDeclineInviteView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/DefaultAcceptDeclineInviteView.kt
@@ -5,13 +5,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.impl.response
+package io.element.android.features.invite.impl.acceptdecline
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.AcceptDeclineInviteView
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteView
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.RoomId
 import javax.inject.Inject
@@ -21,14 +21,14 @@ class DefaultAcceptDeclineInviteView @Inject constructor() : AcceptDeclineInvite
     @Composable
     override fun Render(
         state: AcceptDeclineInviteState,
-        onAcceptInvite: (RoomId) -> Unit,
-        onDeclineInvite: (RoomId) -> Unit,
+        onAcceptInviteSuccess: (RoomId) -> Unit,
+        onDeclineInviteSuccess: (RoomId) -> Unit,
         modifier: Modifier,
     ) {
         AcceptDeclineInviteView(
             state = state,
-            onAcceptInvite = onAcceptInvite,
-            onDeclineInvite = onDeclineInvite,
+            onAcceptInviteSuccess = onAcceptInviteSuccess,
+            onDeclineInviteSuccess = onDeclineInviteSuccess,
             modifier = modifier
         )
     }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InternalAcceptDeclineInviteEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
similarity index 69%
rename from features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InternalAcceptDeclineInviteEvents.kt
rename to features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
index 8895c80328..4423430432 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InternalAcceptDeclineInviteEvents.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/acceptdecline/InternalAcceptDeclineInviteEvents.kt
@@ -5,12 +5,11 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.impl.response
+package io.element.android.features.invite.impl.acceptdecline
 
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
 
 sealed interface InternalAcceptDeclineInviteEvents : AcceptDeclineInviteEvents {
-    data object ConfirmDeclineInvite : InternalAcceptDeclineInviteEvents
     data object CancelDeclineInvite : InternalAcceptDeclineInviteEvents
     data object DismissAcceptError : InternalAcceptDeclineInviteEvents
     data object DismissDeclineError : InternalAcceptDeclineInviteEvents
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt
new file mode 100644
index 0000000000..033d2e58de
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockEvents.kt
@@ -0,0 +1,16 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+sealed interface DeclineAndBlockEvents {
+    data class UpdateReportReason(val reason: String) : DeclineAndBlockEvents
+    data object ToggleReportRoom : DeclineAndBlockEvents
+    data object ToggleBlockUser : DeclineAndBlockEvents
+    data object Decline : DeclineAndBlockEvents
+    data object ClearDeclineAction : DeclineAndBlockEvents
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt
new file mode 100644
index 0000000000..100a5de4b8
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockNode.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+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 dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.anvilannotations.ContributesNode
+import io.element.android.features.invite.api.InviteData
+import io.element.android.libraries.architecture.NodeInputs
+import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.di.SessionScope
+
+@ContributesNode(SessionScope::class)
+class DeclineAndBlockNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: DeclineAndBlockPresenter.Factory,
+) : Node(buildContext, plugins = plugins) {
+    data class Inputs(val inviteData: InviteData) : NodeInputs
+
+    private val inviteData = inputs<Inputs>().inviteData
+    private val presenter = presenterFactory.create(inviteData)
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        DeclineAndBlockView(
+            state = state,
+            onBackClick = ::navigateUp,
+            modifier = modifier
+        )
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt
new file mode 100644
index 0000000000..9a18aa746b
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenter.kt
@@ -0,0 +1,92 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.impl.DeclineInvite
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
+import io.element.android.libraries.ui.strings.CommonStrings
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+class DeclineAndBlockPresenter @AssistedInject constructor(
+    @Assisted private val inviteData: InviteData,
+    private val declineInvite: DeclineInvite,
+    private val snackbarDispatcher: SnackbarDispatcher,
+) : Presenter<DeclineAndBlockState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(inviteData: InviteData): DeclineAndBlockPresenter
+    }
+
+    @Composable
+    override fun present(): DeclineAndBlockState {
+        var reportReason by rememberSaveable { mutableStateOf("") }
+        var blockUser by rememberSaveable { mutableStateOf(true) }
+        var reportRoom by rememberSaveable { mutableStateOf(false) }
+        val declineAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
+
+        val coroutineScope = rememberCoroutineScope()
+
+        fun handleEvents(event: DeclineAndBlockEvents) {
+            when (event) {
+                DeclineAndBlockEvents.ClearDeclineAction -> declineAction.value = AsyncAction.Uninitialized
+                DeclineAndBlockEvents.Decline -> coroutineScope.decline(reportReason, blockUser, reportRoom, declineAction)
+                DeclineAndBlockEvents.ToggleBlockUser -> blockUser = !blockUser
+                DeclineAndBlockEvents.ToggleReportRoom -> reportRoom = !reportRoom
+                is DeclineAndBlockEvents.UpdateReportReason -> reportReason = event.reason
+            }
+        }
+
+        return DeclineAndBlockState(
+            reportRoom = reportRoom,
+            reportReason = reportReason,
+            blockUser = blockUser,
+            declineAction = declineAction.value,
+            eventSink = ::handleEvents
+        )
+    }
+
+    private fun CoroutineScope.decline(
+        reason: String,
+        blockUser: Boolean,
+        reportRoom: Boolean,
+        action: MutableState<AsyncAction<Unit>>
+    ) = launch {
+        action.value = AsyncAction.Loading
+        declineInvite(
+            roomId = inviteData.roomId,
+            blockUser = blockUser,
+            reportRoom = reportRoom,
+            reportReason = reason
+        ).onSuccess {
+            action.value = AsyncAction.Success(Unit)
+        }.onFailure { error ->
+            if (error is DeclineInvite.Exception.DeclineInviteFailed) {
+                action.value = AsyncAction.Failure(error)
+            } else {
+                action.value = AsyncAction.Uninitialized
+                snackbarDispatcher.post(SnackbarMessage(CommonStrings.error_unknown))
+            }
+        }
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt
new file mode 100644
index 0000000000..0ee7444b2c
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockState.kt
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data class DeclineAndBlockState(
+    val reportRoom: Boolean,
+    val reportReason: String,
+    val blockUser: Boolean,
+    val declineAction: AsyncAction<Unit>,
+    val eventSink: (DeclineAndBlockEvents) -> Unit
+) {
+    val canDecline = blockUser || reportRoom && reportReason.isNotEmpty()
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt
new file mode 100644
index 0000000000..87016d13cc
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockStateProvider.kt
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
+
+open class DeclineAndBlockStateProvider : PreviewParameterProvider<DeclineAndBlockState> {
+    override val values: Sequence<DeclineAndBlockState>
+        get() = sequenceOf(
+            aDeclineAndBlockState(),
+            aDeclineAndBlockState(
+                reportRoom = true,
+                reportReason = "Inappropriate content",
+            ),
+            aDeclineAndBlockState(
+                blockUser = true,
+            ),
+            aDeclineAndBlockState(
+                declineAction = AsyncAction.Loading,
+            ),
+            aDeclineAndBlockState(
+                declineAction = AsyncAction.Failure(Exception("Failed to decline")),
+            ),
+        )
+}
+
+fun aDeclineAndBlockState(
+    reportRoom: Boolean = false,
+    reportReason: String = "",
+    blockUser: Boolean = false,
+    declineAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    eventSink: (DeclineAndBlockEvents) -> Unit = {},
+) = DeclineAndBlockState(
+    reportRoom = reportRoom,
+    reportReason = reportReason,
+    blockUser = blockUser,
+    declineAction = declineAction,
+    eventSink = eventSink,
+)
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt
new file mode 100644
index 0000000000..c313382b27
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockView.kt
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.invite.impl.R
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.list.ListItemContent
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ListItem
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextField
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DeclineAndBlockView(
+    state: DeclineAndBlockState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val focusManager = LocalFocusManager.current
+
+    val isDeclining = state.declineAction is AsyncAction.Loading
+    AsyncActionView(
+        async = state.declineAction,
+        onSuccess = { onBackClick() },
+        errorMessage = { stringResource(CommonStrings.error_unknown) },
+        onRetry = { state.eventSink(DeclineAndBlockEvents.Decline) },
+        onErrorDismiss = { state.eventSink(DeclineAndBlockEvents.ClearDeclineAction) }
+    )
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        stringResource(R.string.screen_decline_and_block_title),
+                        style = ElementTheme.typography.aliasScreenTitle,
+                    )
+                },
+                navigationIcon = {
+                    BackButton(onClick = onBackClick)
+                }
+            )
+        },
+        modifier = modifier
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .padding(padding)
+                .consumeWindowInsets(padding)
+                .imePadding()
+                .fillMaxSize()
+                .verticalScroll(rememberScrollState())
+                .padding(vertical = 16.dp)
+        ) {
+            ListItem(
+                modifier = Modifier.padding(end = 8.dp),
+                headlineContent = {
+                    Text(text = stringResource(R.string.screen_decline_and_block_block_user_option_title))
+                },
+                supportingContent = {
+                    Text(text = stringResource(R.string.screen_decline_and_block_block_user_option_description))
+                },
+                onClick = {
+                    state.eventSink(DeclineAndBlockEvents.ToggleBlockUser)
+                },
+                trailingContent = ListItemContent.Switch(checked = state.blockUser)
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+            ListItem(
+                modifier = Modifier.padding(end = 8.dp),
+                headlineContent = {
+                    Text(text = stringResource(CommonStrings.action_report_room))
+                },
+                supportingContent = {
+                    Text(text = stringResource(R.string.screen_decline_and_block_report_user_option_description))
+                },
+                onClick = {
+                    state.eventSink(DeclineAndBlockEvents.ToggleReportRoom)
+                },
+                trailingContent = ListItemContent.Switch(checked = state.reportRoom)
+            )
+
+            if (state.reportRoom) {
+                Spacer(modifier = Modifier.height(24.dp))
+                TextField(
+                    value = state.reportReason,
+                    onValueChange = { state.eventSink(DeclineAndBlockEvents.UpdateReportReason(it)) },
+                    placeholder = stringResource(R.string.screen_decline_and_block_report_user_reason_placeholder),
+                    minLines = 3,
+                    enabled = !isDeclining,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp)
+                        .heightIn(min = 90.dp),
+                )
+            }
+
+            Spacer(modifier = Modifier.height(24.dp))
+            Button(
+                text = stringResource(CommonStrings.action_decline),
+                destructive = true,
+                showProgress = isDeclining,
+                enabled = !isDeclining && state.canDecline,
+                onClick = {
+                    focusManager.clearFocus(force = true)
+                    state.eventSink(DeclineAndBlockEvents.Decline)
+                },
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 16.dp)
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun DeclineAndBlockViewPreview(
+    @PreviewParameter(DeclineAndBlockStateProvider::class) state: DeclineAndBlockState
+) = ElementPreview {
+    DeclineAndBlockView(
+        state = state,
+        onBackClick = {},
+    )
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
new file mode 100644
index 0000000000..5eab22dd91
--- /dev/null
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/declineandblock/DefaultDeclineAndBlockEntryPoint.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.AppScope
+import javax.inject.Inject
+
+@ContributesBinding(AppScope::class)
+class DefaultDeclineAndBlockEntryPoint @Inject constructor() : DeclineInviteAndBlockEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData): Node {
+        val inputs = DeclineAndBlockNode.Inputs(inviteData)
+        return parentNode.createNode<DeclineAndBlockNode>(buildContext, plugins = listOf(inputs))
+    }
+}
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
index a9308ca0fc..4f5da603a6 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/di/InviteModule.kt
@@ -12,9 +12,9 @@ import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.invite.impl.SeenInvitesStoreFactory
-import io.element.android.features.invite.impl.response.AcceptDeclineInvitePresenter
+import io.element.android.features.invite.impl.acceptdecline.AcceptDeclineInvitePresenter
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
deleted file mode 100644
index e02642c32e..0000000000
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt
+++ /dev/null
@@ -1,135 +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.invite.impl.response
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
-import io.element.android.features.invite.api.response.InviteData
-import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.architecture.runCatchingUpdatingState
-import io.element.android.libraries.architecture.runUpdatingState
-import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
-import io.element.android.libraries.matrix.api.room.join.JoinRoom
-import io.element.android.libraries.push.api.notifications.NotificationCleaner
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-class AcceptDeclineInvitePresenter @Inject constructor(
-    private val client: MatrixClient,
-    private val joinRoom: JoinRoom,
-    private val notificationCleaner: NotificationCleaner,
-    private val seenInvitesStore: SeenInvitesStore,
-) : Presenter<AcceptDeclineInviteState> {
-    @Composable
-    override fun present(): AcceptDeclineInviteState {
-        val localCoroutineScope = rememberCoroutineScope()
-        val acceptedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
-        val declinedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
-
-        fun handleEvents(event: AcceptDeclineInviteEvents) {
-            when (event) {
-                is AcceptDeclineInviteEvents.AcceptInvite -> {
-                    val inviteData = event.invite
-                    if (inviteData == null) {
-                        acceptedAction.value = AsyncAction.Failure(InvalidDataException())
-                    } else {
-                        localCoroutineScope.acceptInvite(inviteData.roomId, acceptedAction)
-                    }
-                }
-
-                is AcceptDeclineInviteEvents.DeclineInvite -> {
-                    val inviteData = event.invite
-                    if (inviteData == null) {
-                        declinedAction.value = AsyncAction.Failure(InvalidDataException())
-                    } else {
-                        declinedAction.value = ConfirmingDeclineInvite(inviteData, event.blockUser)
-                    }
-                }
-
-                is InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite -> {
-                    when (val declinedActionValue = declinedAction.value) {
-                        is ConfirmingDeclineInvite -> {
-                            localCoroutineScope.declineInvite(
-                                inviteData = declinedActionValue.inviteData,
-                                declinedAction = declinedAction,
-                                blockUser = declinedActionValue.blockUser,
-                            )
-                        }
-                        else -> Unit
-                    }
-                }
-
-                is InternalAcceptDeclineInviteEvents.CancelDeclineInvite -> {
-                    declinedAction.value = AsyncAction.Uninitialized
-                }
-
-                is InternalAcceptDeclineInviteEvents.DismissAcceptError -> {
-                    acceptedAction.value = AsyncAction.Uninitialized
-                }
-
-                is InternalAcceptDeclineInviteEvents.DismissDeclineError -> {
-                    declinedAction.value = AsyncAction.Uninitialized
-                }
-            }
-        }
-
-        return AcceptDeclineInviteState(
-            acceptAction = acceptedAction.value,
-            declineAction = declinedAction.value,
-            eventSink = ::handleEvents
-        )
-    }
-
-    private fun CoroutineScope.acceptInvite(
-        roomId: RoomId,
-        acceptedAction: MutableState<AsyncAction<RoomId>>,
-    ) = launch {
-        acceptedAction.runUpdatingState {
-            joinRoom(
-                roomIdOrAlias = roomId.toRoomIdOrAlias(),
-                serverNames = emptyList(),
-                trigger = JoinedRoom.Trigger.Invite,
-            )
-                .onSuccess {
-                    notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, roomId)
-                    seenInvitesStore.markAsUnSeen(roomId)
-                }
-                .map { roomId }
-        }
-    }
-
-    private fun CoroutineScope.declineInvite(
-        inviteData: InviteData,
-        blockUser: Boolean,
-        declinedAction: MutableState<AsyncAction<RoomId>>,
-    ) = launch {
-        suspend {
-            client.getPendingRoom(inviteData.roomId)?.use {
-                it.leave().getOrThrow()
-            }
-            if (blockUser) {
-                client.ignoreUser(inviteData.senderId).getOrThrow()
-            }
-            notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, inviteData.roomId)
-            seenInvitesStore.markAsUnSeen(inviteData.roomId)
-            inviteData.roomId
-        }.runCatchingUpdatingState(declinedAction)
-    }
-}
diff --git a/features/invite/impl/src/main/res/values-cs/translations.xml b/features/invite/impl/src/main/res/values-cs/translations.xml
index 58876c3392..f576269343 100644
--- a/features/invite/impl/src/main/res/values-cs/translations.xml
+++ b/features/invite/impl/src/main/res/values-cs/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Od tohoto uživatele neuvidíte žádné zprávy ani pozvánky do místnosti"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Zablokovat uživatele"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Nahlaste tuto místnost svému poskytovateli účtu."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Popište důvod nahlášení…"</string>
+  <string name="screen_decline_and_block_title">"Odmítnout a zablokovat"</string>
   <string name="screen_invites_decline_chat_message">"Opravdu chcete odmítnout pozvánku do %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Odmítnout pozvání"</string>
   <string name="screen_invites_decline_direct_chat_message">"Opravdu chcete odmítnout tuto soukromou konverzaci s %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-cy/translations.xml b/features/invite/impl/src/main/res/values-cy/translations.xml
index 08fc08910c..a84fa2397a 100644
--- a/features/invite/impl/src/main/res/values-cy/translations.xml
+++ b/features/invite/impl/src/main/res/values-cy/translations.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Fyddwch chi ddim yn gweld unrhyw negeseuon neu wahoddiadau ystafell gan y defnyddiwr hwn"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Rhwystro defnyddiwr"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Adrodd am yr ystafell hon i ddarparwr eich cyfrif."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Disgrifiwch y rheswm dros adrodd…"</string>
+  <string name="screen_decline_and_block_title">"Gwrthod a rhwystro"</string>
+  <string name="screen_invites_decline_chat_message">"Ydych chi\'n siŵr eich bod am wrthod y gwahoddiad i ymuno â %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Gwrthod y gwahoddiad"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Ydych chi\'n siŵr eich bod am wrthod y sgwrs breifat hon gyda %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Gwrthod sgwrs"</string>
+  <string name="screen_invites_empty_list">"Dim Gwahoddiadau"</string>
+  <string name="screen_invites_invited_you">"Mae %1$s (%2$s) wedi eich gwahodd"</string>
   <string name="screen_join_room_decline_and_block_alert_confirmation">"Iawn, gwrthod a rhwystro"</string>
   <string name="screen_join_room_decline_and_block_alert_message">"Ydych chi\'n siŵr eich bod am wrthod y gwahoddiad i ymuno â\'r ystafell hon? Bydd hyn hefyd yn atal %1$s rhag cysylltu â chi neu eich gwahodd i ystafelloedd."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Gwrthod gwahoddiad a rhwystro"</string>
diff --git a/features/invite/impl/src/main/res/values-de/translations.xml b/features/invite/impl/src/main/res/values-de/translations.xml
index fb390c4354..13fae055e7 100644
--- a/features/invite/impl/src/main/res/values-de/translations.xml
+++ b/features/invite/impl/src/main/res/values-de/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Sie werden keine Nachrichten oder Chatroomeinladungen von diesem Benutzer sehen."</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Benutzer blockieren"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Melden Sie diesen Raum Ihrem Kontoanbieter."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beschreiben Sie den Grund für die Meldung…"</string>
+  <string name="screen_decline_and_block_title">"Ablehnen und blockieren"</string>
   <string name="screen_invites_decline_chat_message">"Möchtest du die Einladung zum Betreten von %1$s wirklich ablehnen?"</string>
   <string name="screen_invites_decline_chat_title">"Einladung ablehnen"</string>
   <string name="screen_invites_decline_direct_chat_message">"Bist du sicher, dass du diese Direktnachricht von %1$s ablehnen möchtest?"</string>
diff --git a/features/invite/impl/src/main/res/values-el/translations.xml b/features/invite/impl/src/main/res/values-el/translations.xml
index 78f2871617..e7e55379f6 100644
--- a/features/invite/impl/src/main/res/values-el/translations.xml
+++ b/features/invite/impl/src/main/res/values-el/translations.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Δε θα δείτε μηνύματα ή προσκλήσεις δωματίου από αυτόν τον χρήστη"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Αποκλεισμός χρήστη"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Αναφέρετε αυτό το δωμάτιο στον πάροχο του λογαριασμού σας."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Περιγράψτε τον λόγο αναφοράς…"</string>
+  <string name="screen_decline_and_block_title">"Απόρριψη και αποκλεισμός"</string>
   <string name="screen_invites_decline_chat_message">"Σίγουρα θες να απορρίψεις την πρόσκληση συμμετοχής στο %1$s;"</string>
   <string name="screen_invites_decline_chat_title">"Απόρριψη πρόσκλησης"</string>
   <string name="screen_invites_decline_direct_chat_message">"Σίγουρα θες να απορρίψεις την ιδιωτική συνομιλία με τον χρήστη %1$s;"</string>
   <string name="screen_invites_decline_direct_chat_title">"Απόρριψη συνομιλίας"</string>
   <string name="screen_invites_empty_list">"Χωρίς προσκλήσεις"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) σέ προσκάλεσε"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ναι, απόρριψη και αποκλεισμός"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Είστε βέβαιοι ότι θέλετε να απορρίψετε την πρόσκληση συμμετοχής σε αυτό το δωμάτιο; Αυτό θα εμποδίσει επίσης το χρήστη %1$s να επικοινωνήσει μαζί σας ή να σας προσκαλέσει σε δωμάτια."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Απόρριψη πρόσκλησης και αποκλεισμός"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Απόρριψη και αποκλεισμός"</string>
 </resources>
diff --git a/features/invite/impl/src/main/res/values-et/translations.xml b/features/invite/impl/src/main/res/values-et/translations.xml
index 59a6b112c6..91906fa877 100644
--- a/features/invite/impl/src/main/res/values-et/translations.xml
+++ b/features/invite/impl/src/main/res/values-et/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Sa ei näe enam selle kasutaja saadetud sõnumeid ja jututubade kutseid"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Blokeeri kasutaja"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Teata sellest jututoast oma teenusepakkujale."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Kirjelda teatamise põhjust…"</string>
+  <string name="screen_decline_and_block_title">"Keeldu ja blokeeri"</string>
   <string name="screen_invites_decline_chat_message">"Kas sa oled kindel, et soovid keelduda liitumiskutsest: %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Lükka kutse tagasi"</string>
   <string name="screen_invites_decline_direct_chat_message">"Kas sa oled kindel, et soovid keelduda privaatsest vestlusest kasutajaga %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-fa/translations.xml b/features/invite/impl/src/main/res/values-fa/translations.xml
index 8102a3be57..9cbad94f91 100644
--- a/features/invite/impl/src/main/res/values-fa/translations.xml
+++ b/features/invite/impl/src/main/res/values-fa/translations.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_title">"انسداد کاربر"</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"شرح دلیل گزارش…"</string>
+  <string name="screen_decline_and_block_title">"رد و انسداد"</string>
   <string name="screen_invites_decline_chat_message">"مطمئنید که می‌خواهید دعوت پیوستن به %1$s را رد کنید؟"</string>
   <string name="screen_invites_decline_chat_title">"رد دعوت"</string>
   <string name="screen_invites_decline_direct_chat_message">"مطمئنید که می‌خواهید این گپ خصوصی با %1$s را رد کنید؟"</string>
   <string name="screen_invites_decline_direct_chat_title">"رد گپ"</string>
   <string name="screen_invites_empty_list">"بدون دعوت"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) دعوتتان کرد"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"بله. رد و انسداد"</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"رد دعوت و انسداد"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"رد و انسداد"</string>
 </resources>
diff --git a/features/invite/impl/src/main/res/values-fi/translations.xml b/features/invite/impl/src/main/res/values-fi/translations.xml
index c97a8c709e..47ad368d73 100644
--- a/features/invite/impl/src/main/res/values-fi/translations.xml
+++ b/features/invite/impl/src/main/res/values-fi/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Et tule näkemään viestejä tai kutsuja tältä käyttäjältä"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Estä käyttäjä"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Ilmoita tästä huoneesta palveluntarjoajallesi."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Kerro syy ilmoittamiseen…"</string>
+  <string name="screen_decline_and_block_title">"Hylkää ja estä"</string>
   <string name="screen_invites_decline_chat_message">"Haluatko varmasti hylätä kutsun liittyä %1$s -huoneeseen?"</string>
   <string name="screen_invites_decline_chat_title">"Hylkää kutsu"</string>
   <string name="screen_invites_decline_direct_chat_message">"Haluatko varmasti hylätä kutsun yksityiseen keskusteluun käyttäjän %1$s kanssa?"</string>
diff --git a/features/invite/impl/src/main/res/values-fr/translations.xml b/features/invite/impl/src/main/res/values-fr/translations.xml
index eae8484897..1775da0538 100644
--- a/features/invite/impl/src/main/res/values-fr/translations.xml
+++ b/features/invite/impl/src/main/res/values-fr/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Vous ne verrez aucun messages ou invitation à un salon de la part de cet utilisateur"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Bloquer l’utilisateur"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Signalez ce salon à votre fournisseur de compte."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Décrivez la raison du signalement…"</string>
+  <string name="screen_decline_and_block_title">"Refuser et bloquer"</string>
   <string name="screen_invites_decline_chat_message">"Êtes-vous sûr de vouloir décliner l’invitation à rejoindre %1$s ?"</string>
   <string name="screen_invites_decline_chat_title">"Refuser l’invitation"</string>
   <string name="screen_invites_decline_direct_chat_message">"Êtes-vous sûr de vouloir refuser cette discussion privée avec %1$s ?"</string>
diff --git a/features/invite/impl/src/main/res/values-hu/translations.xml b/features/invite/impl/src/main/res/values-hu/translations.xml
index 1ba1b208b8..97595ed421 100644
--- a/features/invite/impl/src/main/res/values-hu/translations.xml
+++ b/features/invite/impl/src/main/res/values-hu/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Ettől a felhasználótól nem fog többé üzeneteket vagy meghívásokat látni."</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Felhasználó letiltása"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"A szoba jelentése a fiókszolgáltatójának."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Írja le a jelentés okát…"</string>
+  <string name="screen_decline_and_block_title">"Elutasítás és blokkolás"</string>
   <string name="screen_invites_decline_chat_message">"Biztos, hogy elutasítja a meghívást, hogy csatlakozzon ehhez: %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Meghívás elutasítása"</string>
   <string name="screen_invites_decline_direct_chat_message">"Biztos, hogy elutasítja ezt a privát csevegést vele: %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-nb/translations.xml b/features/invite/impl/src/main/res/values-nb/translations.xml
index 224ad72689..2523466348 100644
--- a/features/invite/impl/src/main/res/values-nb/translations.xml
+++ b/features/invite/impl/src/main/res/values-nb/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Du vil ikke se noen meldinger eller rominvitasjoner fra denne brukeren"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Blokker bruker"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Rapporter dette rommet til din kontoleverandør."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beskriv årsaken for å rapportere…"</string>
+  <string name="screen_decline_and_block_title">"Avslå og blokker"</string>
   <string name="screen_invites_decline_chat_message">"Er du sikker på at du vil takke nei til invitasjonen til å bli med i %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Avvis invitasjon"</string>
   <string name="screen_invites_decline_direct_chat_message">"Er du sikker på at du vil avslå denne private chatten med %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-pl/translations.xml b/features/invite/impl/src/main/res/values-pl/translations.xml
index b507ee1e2c..e8636fc3dc 100644
--- a/features/invite/impl/src/main/res/values-pl/translations.xml
+++ b/features/invite/impl/src/main/res/values-pl/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Nie zobaczysz żadnych wiadomości ani zaproszeń od tego użytkownika"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Zablokuj użytkownika"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Zgłoś pokój dostawcy swojego konta."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Opisz powód zgłoszenia…"</string>
+  <string name="screen_decline_and_block_title">"Odrzuć i zablokuj"</string>
   <string name="screen_invites_decline_chat_message">"Czy na pewno chcesz odrzucić zaproszenie dołączenia do %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Odrzuć zaproszenie"</string>
   <string name="screen_invites_decline_direct_chat_message">"Czy na pewno chcesz odrzucić rozmowę prywatną z %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-ru/translations.xml b/features/invite/impl/src/main/res/values-ru/translations.xml
index 2a38a96e1b..da7bb1c449 100644
--- a/features/invite/impl/src/main/res/values-ru/translations.xml
+++ b/features/invite/impl/src/main/res/values-ru/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_title">"Заблокировать пользователя"</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Опишите причину жалобы…"</string>
+  <string name="screen_decline_and_block_title">"Отклонить и заблокировать"</string>
   <string name="screen_invites_decline_chat_message">"Вы уверены, что хотите отклонить приглашение в %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Отклонить приглашение"</string>
   <string name="screen_invites_decline_direct_chat_message">"Вы уверены, что хотите отказаться от личного общения с %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-sk/translations.xml b/features/invite/impl/src/main/res/values-sk/translations.xml
index 5ad69a009c..a14b5b0dae 100644
--- a/features/invite/impl/src/main/res/values-sk/translations.xml
+++ b/features/invite/impl/src/main/res/values-sk/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Od tohto používateľa sa vám nezobrazia žiadne správy ani pozvánky do miestnosti"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Zablokovať používateľa"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Nahlásiť túto miestnosť poskytovateľovi účtu."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Opíšte dôvod nahlásenia…"</string>
+  <string name="screen_decline_and_block_title">"Odmietnuť a zablokovať"</string>
   <string name="screen_invites_decline_chat_message">"Naozaj chcete odmietnuť pozvánku na pripojenie do %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Odmietnuť pozvanie"</string>
   <string name="screen_invites_decline_direct_chat_message">"Naozaj chcete odmietnuť túto súkromnú konverzáciu s %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-sv/translations.xml b/features/invite/impl/src/main/res/values-sv/translations.xml
index 1145e80df0..a57336b50e 100644
--- a/features/invite/impl/src/main/res/values-sv/translations.xml
+++ b/features/invite/impl/src/main/res/values-sv/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Du kommer inte att se några meddelanden eller rumsinbjudningar från den här användaren"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Blockera användare"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Rapportera det här rummet till din kontoleverantör."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beskriv skälet för anmälan …"</string>
+  <string name="screen_decline_and_block_title">"Avvisa och blockera"</string>
   <string name="screen_invites_decline_chat_message">"Är du säker på att du vill tacka nej till inbjudan att gå med%1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Avböj inbjudan"</string>
   <string name="screen_invites_decline_direct_chat_message">"Är du säker på att du vill avböja denna privata chatt med %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-uk/translations.xml b/features/invite/impl/src/main/res/values-uk/translations.xml
index 2f09bf4ea8..9a5aef7298 100644
--- a/features/invite/impl/src/main/res/values-uk/translations.xml
+++ b/features/invite/impl/src/main/res/values-uk/translations.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"Ви не бачитимете повідомлень або запрошень у кімнату від цього користувача"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Заблокувати користувача"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Поскаржитися на цю кімнату постачальнику облікового запису."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Опишіть причину скарги…"</string>
+  <string name="screen_decline_and_block_title">"Відхилити та заблокувати"</string>
   <string name="screen_invites_decline_chat_message">"Ви впевнені, що хочете відхилити запрошення приєднатися до %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Відхилити запрошення"</string>
   <string name="screen_invites_decline_direct_chat_message">"Ви дійсно хочете відмовитися від приватної бесіди з %1$s?"</string>
diff --git a/features/invite/impl/src/main/res/values-zh-rTW/translations.xml b/features/invite/impl/src/main/res/values-zh-rTW/translations.xml
index 90e2a840df..63cac65d3d 100644
--- a/features/invite/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/invite/impl/src/main/res/values-zh-rTW/translations.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"您將不會看到來自此使用者的任何訊息或聊天室邀請"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"封鎖使用者"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"向您的帳號提供者回報此聊天室。"</string>
+  <string name="screen_decline_and_block_title">"拒絕並封鎖"</string>
   <string name="screen_invites_decline_chat_message">"您確定您想要拒絕加入 %1$s 的邀請嗎？"</string>
   <string name="screen_invites_decline_chat_title">"拒絕邀請"</string>
   <string name="screen_invites_decline_direct_chat_message">"您確定您要拒絕此與 %1$s 的私人聊天嗎？"</string>
diff --git a/features/invite/impl/src/main/res/values/localazy.xml b/features/invite/impl/src/main/res/values/localazy.xml
index 7800bdae07..425602595f 100644
--- a/features/invite/impl/src/main/res/values/localazy.xml
+++ b/features/invite/impl/src/main/res/values/localazy.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_decline_and_block_block_user_option_description">"You will not see any messages or room invites from this user"</string>
+  <string name="screen_decline_and_block_block_user_option_title">"Block user"</string>
+  <string name="screen_decline_and_block_report_user_option_description">"Report this room to your account provider."</string>
+  <string name="screen_decline_and_block_report_user_reason_placeholder">"Describe the reason to report…"</string>
+  <string name="screen_decline_and_block_title">"Decline and block"</string>
   <string name="screen_invites_decline_chat_message">"Are you sure you want to decline the invitation to join %1$s?"</string>
   <string name="screen_invites_decline_chat_title">"Decline invite"</string>
   <string name="screen_invites_decline_direct_chat_message">"Are you sure you want to decline this private chat with %1$s?"</string>
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt
new file mode 100644
index 0000000000..e2a9a65f8a
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultAcceptInviteTest.kt
@@ -0,0 +1,94 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl
+
+import com.google.common.truth.Truth.assertThat
+import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.features.invite.test.InMemorySeenInvitesStore
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.join.FakeJoinRoom
+import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
+import io.element.android.tests.testutils.lambda.any
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultAcceptInviteTest {
+    private val roomId = A_ROOM_ID
+    private val client = FakeMatrixClient()
+    private val seenInvitesStore = InMemorySeenInvitesStore(initialRoomIds = setOf(roomId))
+
+    private val clearMembershipNotificationForRoomLambda =
+        lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> }
+    private val notificationCleaner =
+        FakeNotificationCleaner(clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda)
+
+    @Test
+    fun `accept invite success scenario`() = runTest {
+        val joinRoomLambda =
+            lambdaRecorder<RoomIdOrAlias, List<String>, JoinedRoom.Trigger, Result<Unit>> { _, _, _ ->
+                Result.success(Unit)
+            }
+
+        val acceptInvite = DefaultAcceptInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            joinRoom = FakeJoinRoom(lambda = joinRoomLambda),
+            seenInvitesStore = seenInvitesStore
+        )
+
+        val result = acceptInvite(roomId)
+
+        assertThat(result.isSuccess).isTrue()
+
+        assert(joinRoomLambda)
+            .isCalledOnce()
+            .with(value(roomId.toRoomIdOrAlias()), any(), any())
+
+        assert(clearMembershipNotificationForRoomLambda)
+            .isCalledOnce()
+            .with(value(client.sessionId), value(roomId))
+
+        assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
+    }
+
+    @Test
+    fun `accept invite failure scenario`() = runTest {
+        val joinRoomLambda =
+            lambdaRecorder<RoomIdOrAlias, List<String>, JoinedRoom.Trigger, Result<Unit>> { _, _, _ ->
+                Result.failure(Throwable("Join room failed"))
+            }
+
+        val acceptInvite = DefaultAcceptInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            joinRoom = FakeJoinRoom(lambda = joinRoomLambda),
+            seenInvitesStore = seenInvitesStore
+        )
+
+        val result = acceptInvite(roomId)
+
+        assertThat(result.isFailure).isTrue()
+
+        assert(joinRoomLambda)
+            .isCalledOnce()
+            .with(value(roomId.toRoomIdOrAlias()), any(), any())
+
+        assert(clearMembershipNotificationForRoomLambda).isNeverCalled()
+
+        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(roomId)
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt
new file mode 100644
index 0000000000..cb07bd5191
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/DefaultDeclineInviteTest.kt
@@ -0,0 +1,178 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.invite.test.InMemorySeenInvitesStore
+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.UserId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.aRoomMember
+import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultDeclineInviteTest {
+    private val roomId = A_ROOM_ID
+    private val inviter = aRoomMember()
+    private val seenInvitesStore = InMemorySeenInvitesStore(initialRoomIds = setOf(roomId))
+    private val clearMembershipNotificationForRoomLambda =
+        lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> }
+    private val notificationCleaner =
+        FakeNotificationCleaner(clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda)
+
+    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { -> Result.success(Unit) }
+    private val successIgnoreUserLambda =
+        lambdaRecorder<UserId, Result<Unit>> { _ -> Result.success(Unit) }
+    private val successReportRoomLambda =
+        lambdaRecorder<String?, Result<Unit>> { _ -> Result.success(Unit) }
+
+    private val failureLeaveRoomLambda =
+        lambdaRecorder<Result<Unit>> { -> Result.failure(Exception("Leave room error")) }
+    private val failureIgnoreUserLambda =
+        lambdaRecorder<UserId, Result<Unit>> { _ -> Result.failure(Exception("Ignore user error")) }
+    private val failureReportRoomLambda =
+        lambdaRecorder<String?, Result<Unit>> { _ -> Result.failure(Exception("Report room error")) }
+
+    @Test
+    fun `decline invite, block=false, report=false, all success`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient(ignoreUserResult = successIgnoreUserLambda).apply {
+            givenGetRoomResult(roomId, room)
+        }
+
+        val declineInvite = DefaultDeclineInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            seenInvitesStore = seenInvitesStore
+        )
+
+        val result =
+            declineInvite(roomId, blockUser = false, reportRoom = false, reportReason = null)
+
+        assertThat(result.isSuccess).isTrue()
+
+        assert(clearMembershipNotificationForRoomLambda)
+            .isCalledOnce()
+            .with(value(client.sessionId), value(roomId))
+
+        assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
+    }
+
+    @Test
+    fun `decline invite, block=true, report=true, all success`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda,
+            initialRoomInfo = aRoomInfo(inviter = inviter)
+        )
+        val client = FakeMatrixClient(ignoreUserResult = successIgnoreUserLambda).apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val declineInvite = DefaultDeclineInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            seenInvitesStore = seenInvitesStore
+        )
+        val result = declineInvite(roomId, blockUser = true, reportRoom = true, reportReason = null)
+
+        assertThat(result.isSuccess).isTrue()
+
+        assert(clearMembershipNotificationForRoomLambda)
+            .isCalledOnce()
+            .with(value(client.sessionId), value(roomId))
+
+        assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
+    }
+
+    @Test
+    fun `decline invite, block=true, report=true, decline invite failed`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = failureLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient(ignoreUserResult = successIgnoreUserLambda).apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val declineInvite = DefaultDeclineInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            seenInvitesStore = seenInvitesStore
+        )
+        val result = declineInvite(roomId, blockUser = true, reportRoom = true, reportReason = null)
+
+        assertThat(result.exceptionOrNull()).isEqualTo(DeclineInvite.Exception.DeclineInviteFailed)
+
+        assert(clearMembershipNotificationForRoomLambda)
+            .isNeverCalled()
+
+        assertThat(seenInvitesStore.seenRoomIds().first()).isNotEmpty()
+    }
+
+    @Test
+    fun `decline invite, block=true, report=true, ignore user failed`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda,
+            initialRoomInfo = aRoomInfo(inviter = inviter)
+        )
+        val client = FakeMatrixClient(ignoreUserResult = failureIgnoreUserLambda).apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val declineInvite = DefaultDeclineInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            seenInvitesStore = seenInvitesStore
+        )
+        val result = declineInvite(roomId, blockUser = true, reportRoom = true, reportReason = null)
+
+        assertThat(result.exceptionOrNull()).isEqualTo(DeclineInvite.Exception.BlockUserFailed)
+
+        assert(clearMembershipNotificationForRoomLambda).isCalledOnce()
+        assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
+    }
+
+    @Test
+    fun `decline invite, block=true, report=true, report room failed`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = failureReportRoomLambda,
+            initialRoomInfo = aRoomInfo(inviter = inviter)
+        )
+        val client = FakeMatrixClient(ignoreUserResult = successIgnoreUserLambda).apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val declineInvite = DefaultDeclineInvite(
+            client = client,
+            notificationCleaner = notificationCleaner,
+            seenInvitesStore = seenInvitesStore
+        )
+        val result = declineInvite(roomId, blockUser = true, reportRoom = true, reportReason = null)
+
+        assertThat(result.exceptionOrNull()).isEqualTo(DeclineInvite.Exception.ReportRoomFailed)
+
+        assert(clearMembershipNotificationForRoomLambda).isCalledOnce()
+        assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt
new file mode 100644
index 0000000000..c8a427bea6
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/acceptdecline/AcceptDeclineInvitePresenterTest.kt
@@ -0,0 +1,217 @@
+/*
+ * 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.invite.impl.acceptdecline
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.ConfirmingDeclineInvite
+import io.element.android.features.invite.impl.AcceptInvite
+import io.element.android.features.invite.impl.DeclineInvite
+import io.element.android.features.invite.impl.fake.FakeAcceptInvite
+import io.element.android.features.invite.impl.fake.FakeDeclineInvite
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class AcceptDeclineInvitePresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createAcceptDeclineInvitePresenter()
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+        }
+    }
+
+    @Test
+    fun `present - declining invite cancel flow`() = runTest {
+        val presenter = createAcceptDeclineInvitePresenter()
+        presenter.test {
+            val inviteData = anInviteData()
+            awaitItem().also { state ->
+                state.eventSink(
+                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
+                state.eventSink(
+                    InternalAcceptDeclineInviteEvents.CancelDeclineInvite
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+        }
+    }
+
+    @Test
+    fun `present - declining invite error flow`() = runTest {
+        val declineInviteFailure = lambdaRecorder<RoomId, Boolean, Boolean, String?, Result<RoomId>> { _, _, _, _ ->
+            Result.failure(DeclineInvite.Exception.DeclineInviteFailed)
+        }
+        val presenter = createAcceptDeclineInvitePresenter(
+            declineInvite = FakeDeclineInvite(lambda = declineInviteFailure)
+        )
+        presenter.test {
+            val inviteData = anInviteData()
+            awaitItem().also { state ->
+                state.eventSink(
+                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
+                state.eventSink(
+                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
+                )
+            }
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Failure::class.java)
+                state.eventSink(
+                    InternalAcceptDeclineInviteEvents.DismissDeclineError
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(declineInviteFailure)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID), value(false), value(false), value(null))
+    }
+
+    @Test
+    fun `present - declining invite success flow`() = runTest {
+        val declineInviteSuccess = lambdaRecorder<RoomId, Boolean, Boolean, String?, Result<RoomId>> { roomId, _, _, _ -> Result.success(roomId) }
+        val presenter = createAcceptDeclineInvitePresenter(
+            declineInvite = FakeDeclineInvite(lambda = declineInviteSuccess)
+        )
+        presenter.test {
+            val inviteData = anInviteData()
+            awaitItem().also { state ->
+                state.eventSink(
+                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true)
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, blockUser = false))
+                state.eventSink(
+                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false)
+                )
+            }
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Success::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(declineInviteSuccess)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID), value(false), value(false), value(null))
+    }
+
+    @Test
+    fun `present - accepting invite error flow`() = runTest {
+        val acceptInviteFailure = lambdaRecorder<RoomId, Result<RoomId>> { roomId: RoomId ->
+            Result.failure(RuntimeException("Failed to accept invite"))
+        }
+        val presenter = createAcceptDeclineInvitePresenter(
+            acceptInvite = FakeAcceptInvite(lambda = acceptInviteFailure),
+        )
+        presenter.test {
+            val inviteData = anInviteData()
+            awaitItem().also { state ->
+                state.eventSink(
+                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
+            }
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Failure::class.java)
+                state.eventSink(
+                    InternalAcceptDeclineInviteEvents.DismissAcceptError
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(acceptInviteFailure)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID))
+    }
+
+    @Test
+    fun `present - accepting invite success flow`() = runTest {
+        val acceptInviteSuccess = lambdaRecorder<RoomId, Result<RoomId>> { roomId: RoomId -> Result.success(roomId) }
+        val presenter = createAcceptDeclineInvitePresenter(
+            acceptInvite = FakeAcceptInvite(lambda = acceptInviteSuccess)
+        )
+        presenter.test {
+            val inviteData = anInviteData()
+            awaitItem().also { state ->
+                state.eventSink(
+                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
+                )
+            }
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
+            }
+            awaitItem().also { state ->
+                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Success::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        acceptInviteSuccess.assertions()
+            .isCalledOnce()
+            .with(value(A_ROOM_ID))
+    }
+
+    private fun anInviteData(
+        roomId: RoomId = A_ROOM_ID,
+        name: String = A_ROOM_NAME,
+        isDm: Boolean = false,
+    ): InviteData {
+        return InviteData(
+            roomId = roomId,
+            roomName = name,
+            isDm = isDm,
+        )
+    }
+
+    private fun createAcceptDeclineInvitePresenter(
+        acceptInvite: AcceptInvite = FakeAcceptInvite(),
+        declineInvite: DeclineInvite = FakeDeclineInvite(),
+    ): AcceptDeclineInvitePresenter {
+        return AcceptDeclineInvitePresenter(
+            acceptInvite = acceptInvite,
+            declineInvite = declineInvite,
+        )
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt
new file mode 100644
index 0000000000..c5d2f53c92
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockPresenterTest.kt
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.impl.DeclineInvite
+import io.element.android.features.invite.impl.fake.FakeDeclineInvite
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+import io.element.android.tests.testutils.WarmUpRule
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Rule
+import org.junit.Test
+
+class DeclineAndBlockPresenterTest {
+    @get:Rule
+    val warmUpRule = WarmUpRule()
+
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createDeclineAndBlockPresenter()
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.blockUser).isTrue()
+                assertThat(state.reportRoom).isFalse()
+                assertThat(state.reportReason).isEmpty()
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+                assertThat(state.canDecline).isTrue()
+            }
+        }
+    }
+
+    @Test
+    fun `present - update form values`() = runTest {
+        val presenter = createDeclineAndBlockPresenter()
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.reportRoom).isFalse()
+                assertThat(state.blockUser).isTrue()
+                assertThat(state.reportReason).isEmpty()
+                assertThat(state.canDecline).isTrue()
+                state.eventSink(DeclineAndBlockEvents.ToggleBlockUser)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportRoom).isFalse()
+                assertThat(state.blockUser).isFalse()
+                assertThat(state.reportReason).isEmpty()
+                assertThat(state.canDecline).isFalse()
+                state.eventSink(DeclineAndBlockEvents.ToggleReportRoom)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportRoom).isTrue()
+                assertThat(state.blockUser).isFalse()
+                assertThat(state.reportReason).isEmpty()
+                assertThat(state.canDecline).isFalse()
+                state.eventSink(DeclineAndBlockEvents.UpdateReportReason("Spam"))
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportRoom).isTrue()
+                assertThat(state.blockUser).isFalse()
+                assertThat(state.reportReason).isEqualTo("Spam")
+                assertThat(state.canDecline).isTrue()
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+    }
+
+    @Test
+    fun `present - declining invite success flow`() = runTest {
+        val declineInviteSuccess = lambdaRecorder<RoomId, Boolean, Boolean, String?, Result<RoomId>> { roomId, _, _, _ -> Result.success(roomId) }
+        val presenter = createDeclineAndBlockPresenter(
+            declineInvite = FakeDeclineInvite(lambda = declineInviteSuccess)
+        )
+        presenter.test {
+            awaitItem().also { state ->
+                state.eventSink(DeclineAndBlockEvents.Decline)
+            }
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Success::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(declineInviteSuccess)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID), value(true), value(false), value(""))
+    }
+
+    @Test
+    fun `present - declining invite error flow`() = runTest {
+        val declineInviteFailure = lambdaRecorder<RoomId, Boolean, Boolean, String?, Result<RoomId>> { _, _, _, _ ->
+            Result.failure(DeclineInvite.Exception.DeclineInviteFailed)
+        }
+        val presenter = createDeclineAndBlockPresenter(
+            declineInvite = FakeDeclineInvite(lambda = declineInviteFailure)
+        )
+        presenter.test {
+            awaitItem().also { state ->
+                state.eventSink(DeclineAndBlockEvents.Decline)
+            }
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Failure::class.java)
+                state.eventSink(DeclineAndBlockEvents.ClearDeclineAction)
+            }
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(declineInviteFailure)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID), value(true), value(false), value(""))
+    }
+
+    @Test
+    fun `present - block user error flow`() = runTest {
+        val declineInviteFailure = lambdaRecorder<RoomId, Boolean, Boolean, String?, Result<RoomId>> { _, _, _, _ ->
+            Result.failure(DeclineInvite.Exception.BlockUserFailed)
+        }
+        val presenter = createDeclineAndBlockPresenter(
+            declineInvite = FakeDeclineInvite(lambda = declineInviteFailure)
+        )
+        presenter.test {
+            awaitItem().also { state ->
+                state.eventSink(DeclineAndBlockEvents.Decline)
+            }
+            assertThat(awaitItem().declineAction.isLoading()).isTrue()
+            awaitItem().also { state ->
+                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
+            }
+            cancelAndConsumeRemainingEvents()
+        }
+        assert(declineInviteFailure)
+            .isCalledOnce()
+            .with(value(A_ROOM_ID), value(true), value(false), value(""))
+    }
+
+    private fun anInviteData(
+        roomId: RoomId = A_ROOM_ID,
+        name: String = A_ROOM_NAME,
+        isDm: Boolean = false,
+    ): InviteData {
+        return InviteData(
+            roomId = roomId,
+            roomName = name,
+            isDm = isDm,
+        )
+    }
+
+    private fun createDeclineAndBlockPresenter(
+        inviteData: InviteData = anInviteData(),
+        declineInvite: DeclineInvite = FakeDeclineInvite(),
+        snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
+    ): DeclineAndBlockPresenter {
+        return DeclineAndBlockPresenter(
+            inviteData = inviteData,
+            declineInvite = declineInvite,
+            snackbarDispatcher = snackbarDispatcher,
+        )
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt
new file mode 100644
index 0000000000..60e00f8e35
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/declineandblock/DeclineAndBlockViewTest.kt
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.declineandblock
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performTextInput
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.features.invite.impl.R
+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 DeclineAndBlockViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back invoke the expected callback`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>(expectEvents = false)
+        ensureCalledOnce {
+            rule.setDeclineAndBlockView(
+                aDeclineAndBlockState(
+                    eventSink = eventsRecorder,
+                ),
+                onBackClick = it
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `clicking on decline when enabled emits the expected event`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
+        rule.setDeclineAndBlockView(
+            aDeclineAndBlockState(
+                blockUser = true,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_decline)
+        eventsRecorder.assertSingle(DeclineAndBlockEvents.Decline)
+    }
+
+    @Test
+    fun `clicking on decline when disabled does not emit event`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>(expectEvents = false)
+        rule.setDeclineAndBlockView(
+            aDeclineAndBlockState(
+                blockUser = false,
+                reportRoom = false,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_decline)
+        eventsRecorder.assertEmpty()
+    }
+
+    @Test
+    fun `clicking on block option emits the expected event`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
+        rule.setDeclineAndBlockView(
+            aDeclineAndBlockState(
+                blockUser = true,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(R.string.screen_decline_and_block_block_user_option_title)
+        eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleBlockUser)
+    }
+
+    @Test
+    fun `clicking on report room option emits the expected event`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
+        rule.setDeclineAndBlockView(
+            aDeclineAndBlockState(
+                reportRoom = true,
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_report_room)
+        eventsRecorder.assertSingle(DeclineAndBlockEvents.ToggleReportRoom)
+    }
+
+    @Test
+    fun `typing text in the reason field emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<DeclineAndBlockEvents>()
+        rule.setDeclineAndBlockView(
+            aDeclineAndBlockState(
+                reportRoom = true,
+                reportReason = "",
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.onNodeWithText("").performTextInput("Spam!")
+        eventsRecorder.assertSingle(DeclineAndBlockEvents.UpdateReportReason("Spam!"))
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setDeclineAndBlockView(
+    state: DeclineAndBlockState,
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        DeclineAndBlockView(
+            state = state,
+            onBackClick = onBackClick,
+        )
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt
new file mode 100644
index 0000000000..1ba95bc76e
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeAcceptInvite.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.fake
+
+import io.element.android.features.invite.impl.AcceptInvite
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeAcceptInvite(
+    private val lambda: (RoomId) -> Result<RoomId> = { lambdaError() },
+) : AcceptInvite {
+    override suspend fun invoke(roomId: RoomId) = simulateLongTask {
+        lambda(roomId)
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt
new file mode 100644
index 0000000000..18b46dbd5f
--- /dev/null
+++ b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/fake/FakeDeclineInvite.kt
@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.impl.fake
+
+import io.element.android.features.invite.impl.DeclineInvite
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeDeclineInvite(
+    private val lambda: (RoomId, Boolean, Boolean, String?) -> Result<RoomId> = { _, _, _, _ -> lambdaError() },
+) : DeclineInvite {
+    override suspend fun invoke(roomId: RoomId, blockUser: Boolean, reportRoom: Boolean, reportReason: String?): Result<RoomId> = simulateLongTask {
+        lambda(roomId, blockUser, reportRoom, reportReason)
+    }
+}
diff --git a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt b/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt
deleted file mode 100644
index 7feaff091e..0000000000
--- a/features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt
+++ /dev/null
@@ -1,375 +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.invite.impl.response
-
-import com.google.common.truth.Truth.assertThat
-import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.ConfirmingDeclineInvite
-import io.element.android.features.invite.api.response.InviteData
-import io.element.android.features.invite.test.InMemorySeenInvitesStore
-import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.matrix.api.MatrixClient
-import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
-import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
-import io.element.android.libraries.matrix.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.A_ROOM_ID_2
-import io.element.android.libraries.matrix.test.A_ROOM_ID_3
-import io.element.android.libraries.matrix.test.A_ROOM_NAME
-import io.element.android.libraries.matrix.test.A_SESSION_ID
-import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeRoomPreview
-import io.element.android.libraries.matrix.test.room.join.FakeJoinRoom
-import io.element.android.libraries.push.api.notifications.NotificationCleaner
-import io.element.android.libraries.push.test.notifications.FakeNotificationCleaner
-import io.element.android.tests.testutils.WarmUpRule
-import io.element.android.tests.testutils.lambda.assert
-import io.element.android.tests.testutils.lambda.lambdaRecorder
-import io.element.android.tests.testutils.lambda.value
-import io.element.android.tests.testutils.test
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
-import org.junit.Rule
-import org.junit.Test
-
-class AcceptDeclineInvitePresenterTest {
-    @get:Rule
-    val warmUpRule = WarmUpRule()
-
-    @Test
-    fun `present - initial state`() = runTest {
-        val presenter = createAcceptDeclineInvitePresenter()
-        presenter.test {
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-            }
-        }
-    }
-
-    @Test
-    fun `present - declining invite cancel flow`() = runTest {
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.CancelDeclineInvite
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-            }
-        }
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - declining invite error flow`() = runTest {
-        val declineInviteFailure = lambdaRecorder { ->
-            Result.failure<Unit>(RuntimeException("Failed to leave room"))
-        }
-        val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
-                Result.success(FakeRoomPreview(declineInviteResult = declineInviteFailure))
-            }
-        )
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            client = client,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
-                )
-            }
-            assertThat(awaitItem().declineAction.isLoading()).isTrue()
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Failure::class.java)
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.DismissDeclineError
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-            }
-            cancelAndConsumeRemainingEvents()
-        }
-        assert(declineInviteFailure).isCalledOnce()
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - declining invite success flow`() = runTest {
-        val clearMembershipNotificationForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ ->
-            Result.success(Unit)
-        }
-        val fakeNotificationCleaner = FakeNotificationCleaner(
-            clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda
-        )
-        val declineInviteSuccess = lambdaRecorder { ->
-            Result.success(Unit)
-        }
-        val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
-                Result.success(FakeRoomPreview(declineInviteResult = declineInviteSuccess))
-            }
-        )
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            client = client,
-            notificationCleaner = fakeNotificationCleaner,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, false))
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
-                )
-            }
-            assertThat(awaitItem().declineAction.isLoading()).isTrue()
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Success::class.java)
-            }
-            cancelAndConsumeRemainingEvents()
-        }
-        declineInviteSuccess.assertions().isCalledOnce()
-        clearMembershipNotificationForRoomLambda.assertions()
-            .isCalledOnce()
-            .with(value(A_SESSION_ID), value(A_ROOM_ID))
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - declining invite with block success flow`() = runTest {
-        val clearMembershipNotificationForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ ->
-            Result.success(Unit)
-        }
-        val fakeNotificationCleaner = FakeNotificationCleaner(
-            clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda
-        )
-        val declineInviteSuccess = lambdaRecorder { -> Result.success(Unit) }
-        val ignoreUserSuccess = lambdaRecorder { _: UserId -> Result.success(Unit) }
-        val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
-                Result.success(FakeRoomPreview(declineInviteResult = declineInviteSuccess))
-            },
-            ignoreUserResult = ignoreUserSuccess
-        )
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            client = client,
-            notificationCleaner = fakeNotificationCleaner,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = true)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, true))
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
-                )
-            }
-            assertThat(awaitItem().declineAction.isLoading()).isTrue()
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isInstanceOf(AsyncAction.Success::class.java)
-            }
-            cancelAndConsumeRemainingEvents()
-        }
-        declineInviteSuccess.assertions().isCalledOnce()
-        ignoreUserSuccess.assertions().isCalledOnce().with(value(A_USER_ID))
-        clearMembershipNotificationForRoomLambda.assertions()
-            .isCalledOnce()
-            .with(value(A_SESSION_ID), value(A_ROOM_ID))
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - declining invite with block error flow`() = runTest {
-        val declineInviteFailure = lambdaRecorder { ->
-            Result.failure<Unit>(RuntimeException("Failed to leave room"))
-        }
-        val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
-                Result.success(FakeRoomPreview(declineInviteResult = declineInviteFailure))
-            }
-        )
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            client = client,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = true)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.declineAction).isEqualTo(ConfirmingDeclineInvite(inviteData, true))
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite
-                )
-            }
-            assertThat(awaitItem().declineAction.isLoading()).isTrue()
-        }
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - accepting invite error flow`() = runTest {
-        val joinRoomFailure = lambdaRecorder { roomIdOrAlias: RoomIdOrAlias, _: List<String>, _: JoinedRoom.Trigger ->
-            Result.failure<Unit>(RuntimeException("Failed to join room $roomIdOrAlias"))
-        }
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            joinRoomLambda = joinRoomFailure,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
-            }
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Failure::class.java)
-                state.eventSink(
-                    InternalAcceptDeclineInviteEvents.DismissAcceptError
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Uninitialized::class.java)
-            }
-            cancelAndConsumeRemainingEvents()
-        }
-        assert(joinRoomFailure)
-            .isCalledOnce()
-            .with(
-                value(A_ROOM_ID.toRoomIdOrAlias()),
-                value(emptyList<String>()),
-                value(JoinedRoom.Trigger.Invite)
-            )
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    @Test
-    fun `present - accepting invite success flow`() = runTest {
-        val clearMembershipNotificationForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ ->
-            Result.success(Unit)
-        }
-        val fakeNotificationCleaner = FakeNotificationCleaner(
-            clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda
-        )
-        val joinRoomSuccess = lambdaRecorder { _: RoomIdOrAlias, _: List<String>, _: JoinedRoom.Trigger ->
-            Result.success(Unit)
-        }
-        val seenInvitesStore = InMemorySeenInvitesStore(setOf(A_ROOM_ID, A_ROOM_ID_2, A_ROOM_ID_3))
-        val presenter = createAcceptDeclineInvitePresenter(
-            joinRoomLambda = joinRoomSuccess,
-            notificationCleaner = fakeNotificationCleaner,
-            seenInvitesStore = seenInvitesStore,
-        )
-        presenter.test {
-            val inviteData = anInviteData()
-            awaitItem().also { state ->
-                state.eventSink(
-                    AcceptDeclineInviteEvents.AcceptInvite(inviteData)
-                )
-            }
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isEqualTo(AsyncAction.Loading)
-            }
-            awaitItem().also { state ->
-                assertThat(state.acceptAction).isInstanceOf(AsyncAction.Success::class.java)
-            }
-            cancelAndConsumeRemainingEvents()
-        }
-        assert(joinRoomSuccess)
-            .isCalledOnce()
-            .with(
-                value(A_ROOM_ID.toRoomIdOrAlias()),
-                value(emptyList<String>()),
-                value(JoinedRoom.Trigger.Invite)
-            )
-        clearMembershipNotificationForRoomLambda.assertions()
-            .isCalledOnce()
-            .with(value(A_SESSION_ID), value(A_ROOM_ID))
-        assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(A_ROOM_ID_2, A_ROOM_ID_3)
-    }
-
-    private fun anInviteData(
-        roomId: RoomId = A_ROOM_ID,
-        name: String = A_ROOM_NAME,
-        isDm: Boolean = false,
-        senderId: UserId = A_USER_ID,
-    ): InviteData {
-        return InviteData(
-            roomId = roomId,
-            roomName = name,
-            isDm = isDm,
-            senderId = senderId,
-        )
-    }
-
-    private fun createAcceptDeclineInvitePresenter(
-        client: MatrixClient = FakeMatrixClient(),
-        joinRoomLambda: (RoomIdOrAlias, List<String>, JoinedRoom.Trigger) -> Result<Unit> = { _, _, _ ->
-            Result.success(Unit)
-        },
-        notificationCleaner: NotificationCleaner = FakeNotificationCleaner(),
-        seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
-    ): AcceptDeclineInvitePresenter {
-        return AcceptDeclineInvitePresenter(
-            client = client,
-            joinRoom = FakeJoinRoom(joinRoomLambda),
-            notificationCleaner = notificationCleaner,
-            seenInvitesStore = seenInvitesStore,
-        )
-    }
-}
diff --git a/features/invite/test/build.gradle.kts b/features/invite/test/build.gradle.kts
index dc43ba00c3..e504873c3b 100644
--- a/features/invite/test/build.gradle.kts
+++ b/features/invite/test/build.gradle.kts
@@ -25,5 +25,6 @@ android {
 dependencies {
     implementation(libs.coroutines.core)
     implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrix.test)
     api(projects.features.invite.api)
 }
diff --git a/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt
new file mode 100644
index 0000000000..62e6d8b322
--- /dev/null
+++ b/features/invite/test/src/main/kotlin/io/element/android/features/invite/test/InviteData.kt
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.invite.test
+
+import io.element.android.features.invite.api.InviteData
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_ROOM_NAME
+
+fun anInviteData(
+    roomId: RoomId = A_ROOM_ID,
+    roomName: String = A_ROOM_NAME,
+    isDm: Boolean = false,
+) = InviteData(
+    roomId = roomId,
+    roomName = roomName,
+    isDm = isDm,
+)
diff --git a/features/joinroom/impl/build.gradle.kts b/features/joinroom/impl/build.gradle.kts
index 983ae33ce3..e195efd1bc 100644
--- a/features/joinroom/impl/build.gradle.kts
+++ b/features/joinroom/impl/build.gradle.kts
@@ -36,6 +36,7 @@ dependencies {
     implementation(projects.features.roomdirectory.api)
     implementation(projects.services.analytics.api)
     implementation(projects.libraries.preferences.api)
+    implementation(projects.appconfig)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
index 224ea19291..e28b2affe8 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt
@@ -18,7 +18,7 @@ import javax.inject.Inject
 @ContributesBinding(AppScope::class)
 class DefaultJoinRoomEntryPoint @Inject constructor() : JoinRoomEntryPoint {
     override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
-        return parentNode.createNode<JoinRoomNode>(
+        return parentNode.createNode<JoinRoomFlowNode>(
             buildContext = buildContext,
             plugins = listOf(inputs)
         )
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
index 96c16e1f05..323b556c38 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt
@@ -7,6 +7,8 @@
 
 package io.element.android.features.joinroom.impl
 
+import io.element.android.features.invite.api.InviteData
+
 sealed interface JoinRoomEvents {
     data object RetryFetchingContent : JoinRoomEvents
     data object DismissErrorAndHideContent : JoinRoomEvents
@@ -16,6 +18,6 @@ sealed interface JoinRoomEvents {
     data class CancelKnock(val requiresConfirmation: Boolean) : JoinRoomEvents
     data class UpdateKnockMessage(val message: String) : JoinRoomEvents
     data object ClearActionStates : JoinRoomEvents
-    data object AcceptInvite : JoinRoomEvents
-    data class DeclineInvite(val blockUser: Boolean) : JoinRoomEvents
+    data class AcceptInvite(val inviteData: InviteData) : JoinRoomEvents
+    data class DeclineInvite(val inviteData: InviteData, val blockUser: Boolean) : JoinRoomEvents
 }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
new file mode 100644
index 0000000000..4d3d9be86c
--- /dev/null
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomFlowNode.kt
@@ -0,0 +1,101 @@
+/*
+ * 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.joinroom.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.node.node
+import com.bumble.appyx.core.plugin.Plugin
+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.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteView
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.features.joinroom.api.JoinRoomEntryPoint
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.inputs
+import io.element.android.libraries.di.SessionScope
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(SessionScope::class)
+class JoinRoomFlowNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: JoinRoomPresenter.Factory,
+    private val acceptDeclineInviteView: AcceptDeclineInviteView,
+    private val declineAndBlockEntryPoint: DeclineInviteAndBlockEntryPoint
+) : BaseFlowNode<JoinRoomFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins
+) {
+    private val inputs: JoinRoomEntryPoint.Inputs = inputs()
+    private val presenter = presenterFactory.create(
+        inputs.roomId,
+        inputs.roomIdOrAlias,
+        inputs.roomDescription,
+        inputs.serverNames,
+        inputs.trigger,
+    )
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data class DeclineInviteAndBlockUser(val inviteData: InviteData) : NavTarget
+    }
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.DeclineInviteAndBlockUser -> declineAndBlockEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            NavTarget.Root -> rootNode(buildContext)
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        BackstackView(modifier)
+    }
+
+    private fun rootNode(buildContext: BuildContext): Node {
+        return node(buildContext) { modifier ->
+            val state = presenter.present()
+            JoinRoomView(
+                state = state,
+                onBackClick = ::navigateUp,
+                onJoinSuccess = ::navigateUp,
+                onForgetSuccess = ::navigateUp,
+                onCancelKnockSuccess = {},
+                onKnockSuccess = {},
+                onDeclineInviteAndBlockUser = {
+                    backstack.push(
+                        NavTarget.DeclineInviteAndBlockUser(it)
+                    )
+                },
+                modifier = modifier
+            )
+            acceptDeclineInviteView.Render(
+                state = state.acceptDeclineInviteState,
+                onAcceptInviteSuccess = {},
+                onDeclineInviteSuccess = {},
+                modifier = Modifier
+            )
+        }
+    }
+}
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt
deleted file mode 100644
index dbf741f2d8..0000000000
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt
+++ /dev/null
@@ -1,58 +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.joinroom.impl
-
-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 dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.invite.api.response.AcceptDeclineInviteView
-import io.element.android.features.joinroom.api.JoinRoomEntryPoint
-import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.SessionScope
-
-@ContributesNode(SessionScope::class)
-class JoinRoomNode @AssistedInject constructor(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-    presenterFactory: JoinRoomPresenter.Factory,
-    private val acceptDeclineInviteView: AcceptDeclineInviteView,
-) : Node(buildContext, plugins = plugins) {
-    private val inputs: JoinRoomEntryPoint.Inputs = inputs()
-    private val presenter = presenterFactory.create(
-        inputs.roomId,
-        inputs.roomIdOrAlias,
-        inputs.roomDescription,
-        inputs.serverNames,
-        inputs.trigger,
-    )
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        val state = presenter.present()
-        JoinRoomView(
-            state = state,
-            onBackClick = ::navigateUp,
-            onJoinSuccess = ::navigateUp,
-            onForgetSuccess = ::navigateUp,
-            onCancelKnockSuccess = {},
-            onKnockSuccess = {},
-            modifier = modifier
-        )
-        acceptDeclineInviteView.Render(
-            state = state.acceptDeclineInviteState,
-            onAcceptInvite = {},
-            onDeclineInvite = {},
-            modifier = Modifier
-        )
-    }
-}
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
index 53f33be16a..a234bb019b 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt
@@ -23,10 +23,11 @@ import androidx.compose.runtime.setValue
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.appconfig.MatrixConfiguration
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.toInviteData
 import io.element.android.features.joinroom.impl.di.CancelKnockRoom
 import io.element.android.features.joinroom.impl.di.ForgetRoom
 import io.element.android.features.joinroom.impl.di.KnockRoom
@@ -44,7 +45,7 @@ import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.api.exception.ErrorKind
 import io.element.android.libraries.matrix.api.getRoomInfoFlow
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomType
 import io.element.android.libraries.matrix.api.room.isDm
@@ -108,20 +109,25 @@ class JoinRoomPresenter @AssistedInject constructor(
             when {
                 isDismissingContent -> value = ContentState.Dismissing
                 roomInfo.isPresent -> {
+                    val notJoinedRoom = matrixClient.getRoomPreview(roomIdOrAlias, serverNames).getOrNull()
                     val (sender, reason) = when (roomInfo.get().currentUserMembership) {
                         CurrentUserMembership.BANNED -> {
                             // Workaround to get info about the sender for banned rooms
                             // TODO re-do this once we have a better API in the SDK
-                            val preview = matrixClient.getRoomPreview(roomIdOrAlias, serverNames)
-                            val membershipDetalis = preview.getOrNull()?.membershipDetails()?.getOrNull()
-                            membershipDetalis?.senderMember to membershipDetalis?.currentUserMember?.membershipChangeReason
+                            val membershipDetails = notJoinedRoom?.membershipDetails()?.getOrNull()
+                            membershipDetails?.senderMember to membershipDetails?.currentUserMember?.membershipChangeReason
                         }
                         CurrentUserMembership.INVITED -> {
                             roomInfo.get().inviter to null
                         }
                         else -> null to null
                     }
-                    value = roomInfo.get().toContentState(sender, reason)
+                    val joinedMembersCountOverride = notJoinedRoom?.previewInfo?.numberOfJoinedMembers
+                    value = roomInfo.get().toContentState(
+                        membershipSender = sender,
+                        joinedMembersCountOverride = joinedMembersCountOverride,
+                        reason = reason,
+                    )
                 }
                 roomDescription.isPresent -> {
                     value = roomDescription.get().toContentState()
@@ -131,7 +137,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                     val result = matrixClient.getRoomPreview(roomIdOrAlias, serverNames)
                     value = result.fold(
                         onSuccess = { preview ->
-                            val membershipInfo = when (preview.info.membership) {
+                            val membershipInfo = when (preview.previewInfo.membership) {
                                 CurrentUserMembership.INVITED,
                                 CurrentUserMembership.BANNED,
                                 CurrentUserMembership.KNOCKED -> {
@@ -139,7 +145,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                                 }
                                 else -> null
                             }
-                            preview.info.toContentState(
+                            preview.previewInfo.toContentState(
                                 senderMember = membershipInfo?.senderMember,
                                 reason = membershipInfo?.currentUserMember?.membershipChangeReason,
                             )
@@ -165,16 +171,14 @@ class JoinRoomPresenter @AssistedInject constructor(
             when (event) {
                 JoinRoomEvents.JoinRoom -> coroutineScope.joinRoom(joinAction)
                 is JoinRoomEvents.KnockRoom -> coroutineScope.knockRoom(knockAction, knockMessage)
-                JoinRoomEvents.AcceptInvite -> {
-                    val inviteData = contentState.toInviteData()
+                is JoinRoomEvents.AcceptInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.AcceptInvite(inviteData)
+                        AcceptDeclineInviteEvents.AcceptInvite(event.inviteData)
                     )
                 }
                 is JoinRoomEvents.DeclineInvite -> {
-                    val inviteData = contentState.toInviteData()
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.DeclineInvite(invite = inviteData, blockUser = event.blockUser)
+                        AcceptDeclineInviteEvents.DeclineInvite(invite = event.inviteData, blockUser = event.blockUser, shouldConfirm = true)
                     )
                 }
                 is JoinRoomEvents.CancelKnock -> coroutineScope.cancelKnockRoom(event.requiresConfirmation, cancelKnockAction)
@@ -208,6 +212,7 @@ class JoinRoomPresenter @AssistedInject constructor(
             applicationName = buildMeta.applicationName,
             knockMessage = knockMessage,
             hideInviteAvatars = hideInviteAvatars,
+            canReportRoom = MatrixConfiguration.CAN_REPORT_ROOM,
             eventSink = ::handleEvents
         )
     }
@@ -268,7 +273,12 @@ private fun RoomPreviewInfo.toContentState(senderMember: RoomMember?, reason: St
         roomType = roomType,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when (membership) {
-            CurrentUserMembership.INVITED -> JoinAuthorisationStatus.IsInvited(senderMember?.toInviteSender())
+            CurrentUserMembership.INVITED -> {
+                JoinAuthorisationStatus.IsInvited(
+                    inviteData = toInviteData(),
+                    inviteSender = senderMember?.toInviteSender()
+                )
+            }
             CurrentUserMembership.BANNED -> JoinAuthorisationStatus.IsBanned(senderMember?.toInviteSender(), reason)
             CurrentUserMembership.KNOCKED -> JoinAuthorisationStatus.IsKnocked
             else -> joinRule.toJoinAuthorisationStatus()
@@ -296,19 +306,24 @@ internal fun RoomDescription.toContentState(): ContentState {
 }
 
 @VisibleForTesting
-internal fun MatrixRoomInfo.toContentState(membershipSender: RoomMember?, reason: String?): ContentState {
+internal fun RoomInfo.toContentState(
+    membershipSender: RoomMember?,
+    joinedMembersCountOverride: Long?,
+    reason: String?,
+): ContentState {
     return ContentState.Loaded(
         roomId = id,
         name = name,
         topic = topic,
         alias = canonicalAlias,
-        numberOfMembers = joinedMembersCount,
+        numberOfMembers = joinedMembersCountOverride ?: joinedMembersCount,
         isDm = isDm,
         roomType = if (isSpace) RoomType.Space else RoomType.Room,
         roomAvatarUrl = avatarUrl,
         joinAuthorisationStatus = when (currentUserMembership) {
             CurrentUserMembership.INVITED -> JoinAuthorisationStatus.IsInvited(
-                inviteSender = membershipSender?.toInviteSender()
+                inviteData = toInviteData(),
+                inviteSender = membershipSender?.toInviteSender(),
             )
             CurrentUserMembership.BANNED -> JoinAuthorisationStatus.IsBanned(
                 banSender = membershipSender?.toInviteSender(),
@@ -331,23 +346,3 @@ private fun JoinRule?.toJoinAuthorisationStatus(): JoinAuthorisationStatus {
         else -> JoinAuthorisationStatus.Unknown
     }
 }
-
-@VisibleForTesting
-internal fun ContentState.toInviteData(): InviteData? {
-    return when (this) {
-        is ContentState.Loaded -> {
-            if (joinAuthorisationStatus is JoinAuthorisationStatus.IsInvited && joinAuthorisationStatus.inviteSender != null) {
-                InviteData(
-                    roomId = roomId,
-                    // Note: name should not be null at this point, but use Id just in case...
-                    roomName = name ?: roomId.value,
-                    senderId = joinAuthorisationStatus.inviteSender.userId,
-                    isDm = isDm
-                )
-            } else {
-                null
-            }
-        }
-        else -> null
-    }
-}
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
index df2a5fcf8f..e027b5ed9c 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt
@@ -8,7 +8,8 @@
 package io.element.android.features.joinroom.impl
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -32,6 +33,7 @@ data class JoinRoomState(
     private val applicationName: String,
     val knockMessage: String,
     val hideInviteAvatars: Boolean,
+    val canReportRoom: Boolean,
     val eventSink: (JoinRoomEvents) -> Unit
 ) {
     val isJoinActionUnauthorized = joinAction is AsyncAction.Failure && joinAction.error is JoinRoomFailures.UnauthorizedJoin
@@ -95,7 +97,7 @@ sealed interface ContentState {
 sealed interface JoinAuthorisationStatus {
     data object None : JoinAuthorisationStatus
     data class IsSpace(val applicationName: String) : JoinAuthorisationStatus
-    data class IsInvited(val inviteSender: InviteSender?) : JoinAuthorisationStatus
+    data class IsInvited(val inviteData: InviteData, val inviteSender: InviteSender?) : JoinAuthorisationStatus
     data class IsBanned(val banSender: InviteSender?, val reason: String?) : JoinAuthorisationStatus
     data object IsKnocked : JoinAuthorisationStatus
     data object CanKnock : JoinAuthorisationStatus
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
index d191915972..4a5039e364 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt
@@ -8,8 +8,9 @@
 package io.element.android.features.joinroom.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -50,12 +51,20 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
                 joinAction = AsyncAction.Failure(ClientException.Generic("Something went wrong", null))
             ),
             aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null))
+                contentState = aLoadedContentState(
+                    joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(
+                        inviteData = anInviteData(),
+                        inviteSender = null,
+                    )
+                )
             ),
             aJoinRoomState(
                 contentState = aLoadedContentState(
                     numberOfMembers = 123,
-                    joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(anInviteSender()),
+                    joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(
+                        inviteData = anInviteData(),
+                        inviteSender = anInviteSender(),
+                    ),
                 )
             ),
             aJoinRoomState(
@@ -149,7 +158,7 @@ fun aLoadedContentState(
     isDm: Boolean = false,
     roomType: RoomType = RoomType.Room,
     roomAvatarUrl: String? = null,
-    joinAuthorisationStatus: JoinAuthorisationStatus = JoinAuthorisationStatus.Unknown
+    joinAuthorisationStatus: JoinAuthorisationStatus = JoinAuthorisationStatus.Unknown,
 ) = ContentState.Loaded(
     roomId = roomId,
     name = name,
@@ -172,6 +181,7 @@ fun aJoinRoomState(
     cancelKnockAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     knockMessage: String = "",
     hideInviteAvatars: Boolean = false,
+    canReportRoom: Boolean = true,
     eventSink: (JoinRoomEvents) -> Unit = {}
 ) = JoinRoomState(
     roomIdOrAlias = roomIdOrAlias,
@@ -184,6 +194,7 @@ fun aJoinRoomState(
     applicationName = "AppName",
     knockMessage = knockMessage,
     hideInviteAvatars = hideInviteAvatars,
+    canReportRoom = canReportRoom,
     eventSink = eventSink
 )
 
@@ -199,5 +210,15 @@ internal fun anInviteSender(
     membershipChangeReason = membershipChangeReason,
 )
 
+internal fun anInviteData(
+    roomId: RoomId = A_ROOM_ID,
+    roomName: String = "Room name",
+    isDm: Boolean = false,
+) = InviteData(
+    roomId = roomId,
+    roomName = roomName,
+    isDm = isDm,
+)
+
 private val A_ROOM_ID = RoomId("!exa:matrix.org")
 private val A_ROOM_ALIAS = RoomAlias("#exa:matrix.org")
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
index 8aae4a029b..b63bdff347 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -36,6 +36,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.designsystem.atomic.atoms.PlaceholderAtom
 import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewDescriptionAtom
 import io.element.android.libraries.designsystem.atomic.atoms.RoomPreviewSubtitleAtom
@@ -78,6 +79,7 @@ fun JoinRoomView(
     onKnockSuccess: () -> Unit,
     onForgetSuccess: () -> Unit,
     onCancelKnockSuccess: () -> Unit,
+    onDeclineInviteAndBlockUser: (InviteData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -104,11 +106,15 @@ fun JoinRoomView(
             footer = {
                 JoinRoomFooter(
                     joinAuthorisationStatus = state.joinAuthorisationStatus,
-                    onAcceptInvite = {
-                        state.eventSink(JoinRoomEvents.AcceptInvite)
+                    onAcceptInvite = { inviteData ->
+                        state.eventSink(JoinRoomEvents.AcceptInvite(inviteData))
                     },
-                    onDeclineInvite = { blockUser ->
-                        state.eventSink(JoinRoomEvents.DeclineInvite(blockUser))
+                    onDeclineInvite = { inviteData, blockUser ->
+                        if (state.canReportRoom && blockUser) {
+                            onDeclineInviteAndBlockUser(inviteData)
+                        } else {
+                            state.eventSink(JoinRoomEvents.DeclineInvite(inviteData, blockUser = blockUser))
+                        }
                     },
                     onJoinRoom = {
                         state.eventSink(JoinRoomEvents.JoinRoom)
@@ -184,8 +190,8 @@ fun JoinRoomView(
 @Composable
 private fun JoinRoomFooter(
     joinAuthorisationStatus: JoinAuthorisationStatus,
-    onAcceptInvite: () -> Unit,
-    onDeclineInvite: (Boolean) -> Unit,
+    onAcceptInvite: (InviteData) -> Unit,
+    onDeclineInvite: (InviteData, Boolean) -> Unit,
     onJoinRoom: () -> Unit,
     onKnockRoom: () -> Unit,
     onCancelKnock: () -> Unit,
@@ -204,13 +210,13 @@ private fun JoinRoomFooter(
                     ButtonRowMolecule(horizontalArrangement = Arrangement.spacedBy(20.dp)) {
                         OutlinedButton(
                             text = stringResource(CommonStrings.action_decline),
-                            onClick = { onDeclineInvite(false) },
+                            onClick = { onDeclineInvite(joinAuthorisationStatus.inviteData, false) },
                             modifier = Modifier.weight(1f),
                             size = ButtonSize.LargeLowPadding,
                         )
                         Button(
                             text = stringResource(CommonStrings.action_accept),
-                            onClick = onAcceptInvite,
+                            onClick = { onAcceptInvite(joinAuthorisationStatus.inviteData) },
                             modifier = Modifier.weight(1f),
                             size = ButtonSize.LargeLowPadding,
                         )
@@ -218,7 +224,7 @@ private fun JoinRoomFooter(
                     Spacer(modifier = Modifier.height(24.dp))
                     TextButton(
                         text = stringResource(R.string.screen_join_room_decline_and_block_button_title),
-                        onClick = { onDeclineInvite(true) },
+                        onClick = { onDeclineInvite(joinAuthorisationStatus.inviteData, true) },
                         modifier = Modifier.fillMaxWidth(),
                         destructive = true
                     )
@@ -585,5 +591,6 @@ internal fun JoinRoomViewPreview(@PreviewParameter(JoinRoomStateProvider::class)
         onKnockSuccess = { },
         onForgetSuccess = { },
         onCancelKnockSuccess = { },
+        onDeclineInviteAndBlockUser = { },
     )
 }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
index 2d885229bd..7826a819c6 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/CancelKnockRoom.kt
@@ -21,8 +21,8 @@ interface CancelKnockRoom {
 class DefaultCancelKnockRoom @Inject constructor(private val client: MatrixClient) : CancelKnockRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
         return client
-            .getPendingRoom(roomId)
-            ?.leave()
+            .getRoom(roomId)
+            ?.use { it.leave() }
             ?: Result.failure(IllegalStateException("No pending room found"))
     }
 }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
index 496a911b1b..ac17e2c3e2 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/ForgetRoom.kt
@@ -20,9 +20,7 @@ interface ForgetRoom {
 @ContributesBinding(SessionScope::class)
 class DefaultForgetRoom @Inject constructor(private val client: MatrixClient) : ForgetRoom {
     override suspend fun invoke(roomId: RoomId): Result<Unit> {
-        return client
-            .getPendingRoom(roomId)
-            ?.forget()
-            ?: Result.failure(IllegalStateException("No pending room found"))
+        return client.getRoom(roomId)?.use { it.forget() }
+            ?: Result.failure(IllegalStateException("Room not found"))
     }
 }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
index 90e22b70bc..7142133eb1 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/di/JoinRoomModule.kt
@@ -12,7 +12,7 @@ import dagger.Module
 import dagger.Provides
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.joinroom.impl.JoinRoomPresenter
 import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.architecture.Presenter
diff --git a/features/joinroom/impl/src/main/res/values-cy/translations.xml b/features/joinroom/impl/src/main/res/values-cy/translations.xml
index 7b83e67d68..b093d94220 100644
--- a/features/joinroom/impl/src/main/res/values-cy/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-cy/translations.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"Cawsoch eich gwahardd o\'r ystafell hon gan %1$s."</string>
+  <string name="screen_join_room_ban_message">"Cawsoch eich gwahardd o\'r ystafell hon"</string>
+  <string name="screen_join_room_ban_reason">"Rheswm: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Diddymu cais"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Iawn, diddymu"</string>
   <string name="screen_join_room_cancel_knock_alert_description">"Ydych chi\'n siŵr eich bod am ddiddymu\'ch cais i ymuno â\'r ystafell hon?"</string>
@@ -8,9 +11,22 @@
   <string name="screen_join_room_decline_and_block_alert_message">"Ydych chi\'n siŵr eich bod am wrthod y gwahoddiad i ymuno â\'r ystafell hon? Bydd hyn hefyd yn atal %1$s rhag cysylltu â chi neu eich gwahodd i ystafelloedd."</string>
   <string name="screen_join_room_decline_and_block_alert_title">"Gwrthod gwahoddiad a rhwystro"</string>
   <string name="screen_join_room_decline_and_block_button_title">"Gwrthod a rhwystro"</string>
+  <string name="screen_join_room_fail_message">"Methodd yr ymuno â\'r ystafell."</string>
+  <string name="screen_join_room_fail_reason">"Mae\'r ystafell hon naill ai drwy wahoddiad yn unig neu efallai y bydd cyfyngiadau ar fynediad ar lefel y gofod."</string>
+  <string name="screen_join_room_forget_action">"Anghofiwch yr ystafell hon"</string>
+  <string name="screen_join_room_invite_required_message">"Mae angen gwahoddiad arnoch chi er mwyn ymuno â\'r ystafell hon"</string>
+  <string name="screen_join_room_join_action">"Ymuno â\'r ystafell"</string>
+  <string name="screen_join_room_join_restricted_message">"Efallai y bydd angen i chi gael eich gwahodd neu fod yn aelod o ofod er mwyn ymuno."</string>
+  <string name="screen_join_room_knock_action">"Anfon cais i ymuno"</string>
   <string name="screen_join_room_knock_message_description">"Neges (dewisol)"</string>
   <string name="screen_join_room_knock_sent_description">"Byddwch yn derbyn gwahoddiad i ymuno â\'r ystafell os caiff eich cais ei dderbyn."</string>
   <string name="screen_join_room_knock_sent_title">"Anfonwyd y cais i ymuno"</string>
   <string name="screen_join_room_loading_alert_message">"Doedd dim modd dangos rhagolwg yr ystafell. Gall hyn fod oherwydd problemau rhwydwaith neu weinydd."</string>
   <string name="screen_join_room_loading_alert_title">"Doedd dim modd dangos rhagolwg yr ystafell hon"</string>
+  <string name="screen_join_room_space_not_supported_description">"Nid yw %1$s yn cefnogi gofodau eto. Gallwch gael mynediad i ofodau ar y we."</string>
+  <string name="screen_join_room_space_not_supported_title">"Nid yw gofodau\'n cael eu cefnogi eto"</string>
+  <string name="screen_join_room_subtitle_knock">"Cliciwch ar y botwm isod a bydd gweinyddwr ystafell yn cael ei hysbysu. Byddwch yn gallu ymuno â\'r sgwrs ar ôl ei chymeradwyo."</string>
+  <string name="screen_join_room_subtitle_no_preview">"Rhaid i chi fod yn aelod o\'r ystafell hon i weld hanes y neges."</string>
+  <string name="screen_join_room_title_knock">"Eisiau ymuno â\'r ystafell hon?"</string>
+  <string name="screen_join_room_title_no_preview">"Nid yw rhagolwg ar gael"</string>
 </resources>
diff --git a/features/joinroom/impl/src/main/res/values-el/translations.xml b/features/joinroom/impl/src/main/res/values-el/translations.xml
index 0b114b54e6..aea667f51c 100644
--- a/features/joinroom/impl/src/main/res/values-el/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-el/translations.xml
@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"Σας απαγορεύτηκε η είσοδος σε αυτό το δωμάτιο από το χρήστη %1$s."</string>
+  <string name="screen_join_room_ban_message">"Σας απαγορεύτηκε η είσοδος σε αυτό το δωμάτιο"</string>
+  <string name="screen_join_room_ban_reason">"Αιτία: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Ακύρωση αιτήματος"</string>
   <string name="screen_join_room_cancel_knock_alert_confirmation">"Ναι, ακύρωση"</string>
   <string name="screen_join_room_cancel_knock_alert_description">"Σίγουρα θες να ακυρώσεις το αίτημά σου για συμμετοχή σε αυτό το δωμάτιο;"</string>
   <string name="screen_join_room_cancel_knock_alert_title">"Ακύρωση αίτησης συμμετοχής"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"Ναι, απόρριψη και αποκλεισμός"</string>
+  <string name="screen_join_room_decline_and_block_alert_message">"Είστε βέβαιοι ότι θέλετε να απορρίψετε την πρόσκληση συμμετοχής σε αυτό το δωμάτιο; Αυτό θα εμποδίσει επίσης το χρήστη %1$s να επικοινωνήσει μαζί σας ή να σας προσκαλέσει σε δωμάτια."</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"Απόρριψη πρόσκλησης και αποκλεισμός"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"Απόρριψη και αποκλεισμός"</string>
+  <string name="screen_join_room_fail_message">"Η είσοδος στο δωμάτιο απέτυχε."</string>
+  <string name="screen_join_room_fail_reason">"Αυτό το δωμάτιο είναι είτε μόνο για πρόσκληση είτε ενδέχεται να υπάρχουν περιορισμοί στην πρόσβαση σε επίπεδο χώρου."</string>
+  <string name="screen_join_room_forget_action">"Ξεχάστε αυτό το δωμάτιο"</string>
+  <string name="screen_join_room_invite_required_message">"Χρειάζεστε πρόσκληση για να συμμετάσχετε σε αυτό το δωμάτιο"</string>
   <string name="screen_join_room_join_action">"Συμμετοχή στο δωμάτιο"</string>
+  <string name="screen_join_room_join_restricted_message">"Ενδέχεται να χρειαστεί να προσκληθείτε ή να είστε μέλος ενός χώρου για να συμμετάσχετε."</string>
   <string name="screen_join_room_knock_action">"Χτύπα για συμμετοχή"</string>
   <string name="screen_join_room_knock_message_description">"Μήνυμα (προαιρετικό)"</string>
   <string name="screen_join_room_knock_sent_description">"Θα λάβεις πρόσκληση για συμμετοχή στο δωμάτιο εάν το αίτημά σου γίνει αποδεκτό."</string>
   <string name="screen_join_room_knock_sent_title">"Το αίτημα συμμετοχής στάλθηκε"</string>
+  <string name="screen_join_room_loading_alert_message">"Δεν μπορέσαμε να εμφανίσουμε την προεπισκόπηση δωματίου. Αυτό μπορεί να οφείλεται σε προβλήματα δικτύου ή διακομιστή."</string>
+  <string name="screen_join_room_loading_alert_title">"Δεν μπορέσαμε να εμφανίσουμε αυτήν την προεπισκόπηση δωματίου"</string>
   <string name="screen_join_room_space_not_supported_description">"Το %1$s δεν υποστηρίζει ακόμα χώρους. Μπορείς να έχεις πρόσβαση σε χώρους στον ιστό."</string>
   <string name="screen_join_room_space_not_supported_title">"Οι Χώροι δεν υποστηρίζονται ακόμα"</string>
   <string name="screen_join_room_subtitle_knock">"Κάνε κλικ στο παρακάτω κουμπί και ένας διαχειριστής δωματίου θα ειδοποιηθεί. Θα μπορείς να συμμετάσχεις στη συνομιλία μόλις εγκριθεί."</string>
diff --git a/features/joinroom/impl/src/main/res/values-fa/translations.xml b/features/joinroom/impl/src/main/res/values-fa/translations.xml
index 85151ddf64..529177cedb 100644
--- a/features/joinroom/impl/src/main/res/values-fa/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-fa/translations.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_ban_by_message">"به دست %1$s از این اتاق محروم شدید."</string>
+  <string name="screen_join_room_ban_message">"از این اتاق محروم شدید"</string>
+  <string name="screen_join_room_ban_reason">"دلیل: %1$s."</string>
+  <string name="screen_join_room_cancel_knock_action">"لغو درخواست"</string>
+  <string name="screen_join_room_cancel_knock_alert_confirmation">"بله. لغو"</string>
+  <string name="screen_join_room_cancel_knock_alert_title">"لغو درخواست پیوستن"</string>
+  <string name="screen_join_room_decline_and_block_alert_confirmation">"بله. رد و انسداد"</string>
+  <string name="screen_join_room_decline_and_block_alert_title">"رد دعوت و انسداد"</string>
+  <string name="screen_join_room_decline_and_block_button_title">"رد و انسداد"</string>
+  <string name="screen_join_room_fail_message">"پیوستن به اتاق شکست خورد."</string>
+  <string name="screen_join_room_forget_action">"فراموشی این اتاق"</string>
+  <string name="screen_join_room_invite_required_message">"برای پیوستن به این اتاق نیاز به دعوت دارید"</string>
   <string name="screen_join_room_join_action">"پیوستن به اتاق"</string>
   <string name="screen_join_room_knock_action">"در زدن برای پیوستن"</string>
+  <string name="screen_join_room_knock_message_description">"پیام (اختیاری)"</string>
+  <string name="screen_join_room_knock_sent_title">"درخواست پیوستن فرستاده شد"</string>
   <string name="screen_join_room_space_not_supported_description">"%1$s هنوز از فضاها پشتیبانی نمی‌کند. می‌توانید روی وب به فضاها دسترسی داشته باشید."</string>
   <string name="screen_join_room_space_not_supported_title">"فضاها هنوز پشتیبانی نمی‌شوند"</string>
   <string name="screen_join_room_subtitle_knock">"زدن روی این دکمه برای آگاه شدن مدیر اتاق. پس از تأیید می‌توانید به گفت‌وگو بپیوندید."</string>
diff --git a/features/joinroom/impl/src/main/res/values-fr/translations.xml b/features/joinroom/impl/src/main/res/values-fr/translations.xml
index 5d63e8f7a1..0652b0c16d 100644
--- a/features/joinroom/impl/src/main/res/values-fr/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-fr/translations.xml
@@ -23,7 +23,7 @@
   <string name="screen_join_room_knock_sent_title">"Demande de rejoindre le salon envoyée"</string>
   <string name="screen_join_room_loading_alert_message">"Impossible d’afficher l’aperçu du salon. Cela peut être dû à des problèmes de réseau ou de serveur."</string>
   <string name="screen_join_room_loading_alert_title">"Impossible d’afficher l’aperçu de ce salon"</string>
-  <string name="screen_join_room_space_not_supported_description">"Les Spaces ne sont pas encore pris en charge par %1$s . Vous pouvez voir les Spaces sur le Web."</string>
+  <string name="screen_join_room_space_not_supported_description">"Les Spaces ne sont pas encore pris en charge par %1$s. Vous pouvez voir les Spaces sur le Web."</string>
   <string name="screen_join_room_space_not_supported_title">"Les Spaces ne sont pas encore pris en charge"</string>
   <string name="screen_join_room_subtitle_knock">"Cliquez ci-dessous et un administrateur sera prévenu. Une fois votre demande approuvée, pour pourrez rejoindre la discussion."</string>
   <string name="screen_join_room_subtitle_no_preview">"Vous devez être un membre du salon pour pouvoir lire l’historique des messages."</string>
diff --git a/features/joinroom/impl/src/main/res/values-ru/translations.xml b/features/joinroom/impl/src/main/res/values-ru/translations.xml
index 00c44c11f0..58a94019c1 100644
--- a/features/joinroom/impl/src/main/res/values-ru/translations.xml
+++ b/features/joinroom/impl/src/main/res/values-ru/translations.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="screen_join_room_ban_by_message">"Вам был запрещен доступ в комнату %1$s ."</string>
+  <string name="screen_join_room_ban_by_message">"Вам был запрещен доступ в комнату %1$s."</string>
   <string name="screen_join_room_ban_message">"Вам был запрещен доступ в эту комнату"</string>
   <string name="screen_join_room_ban_reason">"Причина: %1$s."</string>
   <string name="screen_join_room_cancel_knock_action">"Отменить запрос"</string>
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
index 7d151e5530..006cc986ab 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt
@@ -9,10 +9,12 @@ package io.element.android.features.joinroom.impl
 
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.features.invite.api.InviteData
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
+import io.element.android.features.invite.api.toInviteData
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.features.joinroom.impl.di.CancelKnockRoom
 import io.element.android.features.joinroom.impl.di.ForgetRoom
@@ -21,6 +23,8 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
+import io.element.android.libraries.designsystem.components.avatar.AvatarData
+import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -46,6 +50,7 @@ import io.element.android.libraries.matrix.test.room.aRoomPreview
 import io.element.android.libraries.matrix.test.room.aRoomPreviewInfo
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.room.join.FakeJoinRoom
+import io.element.android.libraries.matrix.ui.model.InviteSender
 import io.element.android.libraries.matrix.ui.model.toInviteSender
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
@@ -55,7 +60,6 @@ import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.runTest
@@ -85,7 +89,9 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is joined then content state is filled with his data`() = runTest {
         val roomSummary = aRoomSummary()
-        val matrixClient = FakeMatrixClient().apply {
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        ).apply {
             getRoomSummaryFlowLambda = { _ ->
                 flowOf(Optional.of(roomSummary))
             }
@@ -94,7 +100,7 @@ class JoinRoomPresenterTest {
             matrixClient = matrixClient
         )
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().also { state ->
                 val contentState = state.contentState as ContentState.Loaded
                 assertThat(contentState.roomId).isEqualTo(A_ROOM_ID)
@@ -111,7 +117,9 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is invited then join authorization is equal to invited`() = runTest {
         val roomSummary = aRoomSummary(currentUserMembership = CurrentUserMembership.INVITED)
-        val matrixClient = FakeMatrixClient().apply {
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        ).apply {
             getRoomSummaryFlowLambda = { _ ->
                 flowOf(Optional.of(roomSummary))
             }
@@ -121,11 +129,12 @@ class JoinRoomPresenterTest {
             matrixClient = matrixClient,
             seenInvitesStore = seenInvitesStore,
         )
+        val inviteData = roomSummary.info.toInviteData()
         assertThat(seenInvitesStore.seenRoomIds().first()).isEmpty()
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().also { state ->
-                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(null))
+                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(inviteData, null))
             }
             // Check that the roomId is stored in the seen invites store
             assertThat(seenInvitesStore.seenRoomIds().first()).containsExactly(roomSummary.roomId)
@@ -138,9 +147,13 @@ class JoinRoomPresenterTest {
         val expectedInviteSender = inviter.toInviteSender()
         val roomSummary = aRoomSummary(
             currentUserMembership = CurrentUserMembership.INVITED,
+            joinedMembersCount = 5,
             inviter = inviter,
         )
-        val matrixClient = FakeMatrixClient().apply {
+        val inviteData = roomSummary.info.toInviteData()
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        ).apply {
             getRoomSummaryFlowLambda = { _ ->
                 flowOf(Optional.of(roomSummary))
             }
@@ -149,9 +162,43 @@ class JoinRoomPresenterTest {
             matrixClient = matrixClient
         )
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().also { state ->
-                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(expectedInviteSender))
+                assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.IsInvited(inviteData, expectedInviteSender))
+                assertThat((state.contentState as ContentState.Loaded).numberOfMembers).isEqualTo(5)
+            }
+        }
+    }
+
+    @Test
+    fun `present - when room is invited read the number of member from the room preview`() = runTest {
+        val roomSummary = aRoomSummary(
+            currentUserMembership = CurrentUserMembership.INVITED,
+            // It seems that the SDK does not provide this value.
+            joinedMembersCount = 0,
+        )
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ ->
+                Result.success(
+                    aRoomPreview(
+                        info = aRoomPreviewInfo(
+                            numberOfJoinedMembers = 10,
+                        )
+                    )
+                )
+            },
+        ).apply {
+            getRoomSummaryFlowLambda = { _ ->
+                flowOf(Optional.of(roomSummary))
+            }
+        }
+        val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient
+        )
+        presenter.test {
+            skipItems(2)
+            awaitItem().also { state ->
+                assertThat((state.contentState as ContentState.Loaded).numberOfMembers).isEqualTo(10)
             }
         }
     }
@@ -168,6 +215,7 @@ class JoinRoomPresenterTest {
                 flowOf(Optional.of(roomSummary))
             }
         }
+        val inviteData = roomSummary.info.toInviteData()
         val presenter = createJoinRoomPresenter(
             matrixClient = matrixClient,
             acceptDeclineInvitePresenter = acceptDeclinePresenter
@@ -176,16 +224,14 @@ class JoinRoomPresenterTest {
             skipItems(1)
 
             awaitItem().also { state ->
-                state.eventSink(JoinRoomEvents.AcceptInvite)
-                state.eventSink(JoinRoomEvents.DeclineInvite(false))
-
-                val inviteData = state.contentState.toInviteData()
+                state.eventSink(JoinRoomEvents.AcceptInvite(inviteData))
+                state.eventSink(JoinRoomEvents.DeclineInvite(inviteData, false))
 
                 assert(eventSinkRecorder)
                     .isCalledExactly(2)
                     .withSequence(
                         listOf(value(AcceptDeclineInviteEvents.AcceptInvite(inviteData))),
-                        listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData))),
+                        listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = true))),
                     )
             }
         }
@@ -197,7 +243,11 @@ class JoinRoomPresenterTest {
         val joinRoomLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String>, _: JoinedRoom.Trigger ->
             Result.success(Unit)
         }
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        )
         val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient,
             trigger = aTrigger,
             serverNames = A_SERVER_LIST,
             joinRoomLambda = joinRoomLambda,
@@ -221,7 +271,11 @@ class JoinRoomPresenterTest {
 
     @Test
     fun `present - when room is joined with error, it is possible to clear the error`() = runTest {
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        )
         val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient,
             joinRoomLambda = { _, _, _ ->
                 Result.failure(AN_EXCEPTION)
             },
@@ -268,12 +322,11 @@ class JoinRoomPresenterTest {
         }
     }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - when room is banned, then join authorization is equal to IsBanned`() = runTest {
         val roomSummary = aRoomSummary(currentUserMembership = CurrentUserMembership.BANNED, joinRule = JoinRule.Public)
         val matrixClient = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(
                         info = aRoomPreviewInfo(
@@ -317,7 +370,9 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is left and public then join authorization is equal to canJoin`() = runTest {
         val roomSummary = aRoomSummary(currentUserMembership = CurrentUserMembership.LEFT, joinRule = JoinRule.Public)
-        val matrixClient = FakeMatrixClient().apply {
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        ).apply {
             getRoomSummaryFlowLambda = { _ ->
                 flowOf(Optional.of(roomSummary))
             }
@@ -326,7 +381,7 @@ class JoinRoomPresenterTest {
             matrixClient = matrixClient
         )
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().also { state ->
                 assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.CanJoin)
             }
@@ -336,7 +391,9 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is left and join rule null then join authorization is equal to Unknown`() = runTest {
         val roomSummary = aRoomSummary(currentUserMembership = CurrentUserMembership.LEFT, joinRule = null)
-        val matrixClient = FakeMatrixClient().apply {
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        ).apply {
             getRoomSummaryFlowLambda = { _ ->
                 flowOf(Optional.of(roomSummary))
             }
@@ -345,7 +402,7 @@ class JoinRoomPresenterTest {
             matrixClient = matrixClient
         )
         presenter.test {
-            skipItems(1)
+            skipItems(2)
             awaitItem().also { state ->
                 assertThat(state.joinAuthorisationStatus).isEqualTo(JoinAuthorisationStatus.Unknown)
             }
@@ -439,7 +496,13 @@ class JoinRoomPresenterTest {
             Result.failure<Unit>(RuntimeException("Failed to knock room $roomIdOrAlias"))
         }
         val fakeKnockRoom = FakeKnockRoom(knockRoomSuccess)
-        val presenter = createJoinRoomPresenter(knockRoom = fakeKnockRoom)
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient,
+            knockRoom = fakeKnockRoom,
+        )
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
@@ -478,7 +541,13 @@ class JoinRoomPresenterTest {
             Result.failure<Unit>(RuntimeException("Failed to knock room $roomId"))
         }
         val cancelKnockRoom = FakeCancelKnockRoom(cancelKnockRoomSuccess)
-        val presenter = createJoinRoomPresenter(cancelKnockRoom = cancelKnockRoom)
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient,
+            cancelKnockRoom = cancelKnockRoom,
+        )
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
@@ -516,7 +585,13 @@ class JoinRoomPresenterTest {
             Result.failure<Unit>(RuntimeException("Failed to forget room"))
         }
         val fakeForgetRoom = FakeForgetRoom(forgetRoomSuccess)
-        val presenter = createJoinRoomPresenter(forgetRoom = fakeForgetRoom)
+        val matrixClient = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ -> Result.failure(AN_EXCEPTION) },
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = matrixClient,
+            forgetRoom = fakeForgetRoom,
+        )
         presenter.test {
             skipItems(1)
             awaitItem().also { state ->
@@ -544,9 +619,9 @@ class JoinRoomPresenterTest {
     }
 
     @Test
-    fun `present - when room is not known RoomPreview is loaded`() = runTest {
+    fun `present - when room is not known RoomPreview is loaded - membership null`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(
                         info = aRoomPreviewInfo(
@@ -588,10 +663,197 @@ class JoinRoomPresenterTest {
         }
     }
 
+    @Test
+    fun `present - when room is not known RoomPreview is loaded - membership INVITED`() = runTest {
+        val client = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ ->
+                Result.success(
+                    aRoomPreview(
+                        info = aRoomPreviewInfo(
+                            roomId = A_ROOM_ID,
+                            canonicalAlias = RoomAlias("#alias:matrix.org"),
+                            name = "Room name",
+                            topic = "Room topic",
+                            avatarUrl = "avatarUrl",
+                            numberOfJoinedMembers = 2,
+                            isSpace = false,
+                            isHistoryWorldReadable = false,
+                            joinRule = JoinRule.Public,
+                            currentUserMembership = CurrentUserMembership.INVITED,
+                        ),
+                        roomMembershipDetails = {
+                            Result.success(
+                                RoomMembershipDetails(
+                                    currentUserMember = aRoomMember(userId = A_USER_ID, displayName = "Alice"),
+                                    senderMember = aRoomMember(userId = A_USER_ID_2, displayName = "Bob"),
+                                )
+                            )
+                        }
+                    )
+                )
+            }
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = client
+        )
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.contentState).isEqualTo(
+                    ContentState.Loaded(
+                        roomId = A_ROOM_ID,
+                        name = "Room name",
+                        topic = "Room topic",
+                        alias = RoomAlias("#alias:matrix.org"),
+                        numberOfMembers = 2,
+                        isDm = false,
+                        roomType = RoomType.Room,
+                        roomAvatarUrl = "avatarUrl",
+                        joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(
+                            inviteData = InviteData(
+                                roomId = A_ROOM_ID,
+                                roomName = "Room name",
+                                isDm = false,
+                            ),
+                            inviteSender = InviteSender(
+                                userId = A_USER_ID_2,
+                                displayName = "Bob",
+                                avatarData = AvatarData(
+                                    id = A_USER_ID_2.value,
+                                    name = "Bob",
+                                    size = AvatarSize.InviteSender,
+                                ),
+                                membershipChangeReason = null,
+                            ),
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `present - when room is not known RoomPreview is loaded - membership BANNED`() = runTest {
+        val client = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ ->
+                Result.success(
+                    aRoomPreview(
+                        info = aRoomPreviewInfo(
+                            roomId = A_ROOM_ID,
+                            canonicalAlias = RoomAlias("#alias:matrix.org"),
+                            name = null,
+                            topic = "Room topic",
+                            avatarUrl = "avatarUrl",
+                            numberOfJoinedMembers = 2,
+                            isSpace = false,
+                            isHistoryWorldReadable = false,
+                            joinRule = JoinRule.Public,
+                            currentUserMembership = CurrentUserMembership.BANNED,
+                        ),
+                        roomMembershipDetails = {
+                            Result.success(
+                                RoomMembershipDetails(
+                                    currentUserMember = aRoomMember(userId = A_USER_ID, displayName = "Alice"),
+                                    senderMember = aRoomMember(userId = A_USER_ID_2, displayName = "Bob"),
+                                )
+                            )
+                        }
+                    )
+                )
+            }
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = client
+        )
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.contentState).isEqualTo(
+                    ContentState.Loaded(
+                        roomId = A_ROOM_ID,
+                        name = null,
+                        topic = "Room topic",
+                        alias = RoomAlias("#alias:matrix.org"),
+                        numberOfMembers = 2,
+                        isDm = false,
+                        roomType = RoomType.Room,
+                        roomAvatarUrl = "avatarUrl",
+                        joinAuthorisationStatus = JoinAuthorisationStatus.IsBanned(
+                            banSender = InviteSender(
+                                userId = A_USER_ID_2,
+                                displayName = "Bob",
+                                avatarData = AvatarData(
+                                    id = A_USER_ID_2.value,
+                                    name = "Bob",
+                                    size = AvatarSize.InviteSender,
+                                ),
+                                membershipChangeReason = null,
+                            ),
+                            reason = null,
+                        )
+                    )
+                )
+            }
+        }
+    }
+
+    @Test
+    fun `present - when room is not known RoomPreview is loaded - membership KNOCKED`() = runTest {
+        val client = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ ->
+                Result.success(
+                    aRoomPreview(
+                        info = aRoomPreviewInfo(
+                            roomId = A_ROOM_ID,
+                            canonicalAlias = RoomAlias("#alias:matrix.org"),
+                            name = "Room name",
+                            topic = "Room topic",
+                            avatarUrl = "avatarUrl",
+                            numberOfJoinedMembers = 2,
+                            isSpace = false,
+                            isHistoryWorldReadable = false,
+                            joinRule = JoinRule.Public,
+                            currentUserMembership = CurrentUserMembership.KNOCKED,
+                        ),
+                        roomMembershipDetails = {
+                            Result.success(
+                                RoomMembershipDetails(
+                                    currentUserMember = aRoomMember(userId = A_USER_ID, displayName = "Alice"),
+                                    senderMember = aRoomMember(userId = A_USER_ID_2, displayName = "Bob"),
+                                )
+                            )
+                        }
+                    )
+                )
+            }
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = client
+        )
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.contentState).isEqualTo(
+                    ContentState.Loaded(
+                        roomId = A_ROOM_ID,
+                        name = "Room name",
+                        topic = "Room topic",
+                        alias = RoomAlias("#alias:matrix.org"),
+                        numberOfMembers = 2,
+                        isDm = false,
+                        roomType = RoomType.Room,
+                        roomAvatarUrl = "avatarUrl",
+                        joinAuthorisationStatus = JoinAuthorisationStatus.IsKnocked
+                    )
+                )
+            }
+        }
+    }
+
     @Test
     fun `present - when room is not known RoomPreview is loaded as Private`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Private))
                 )
@@ -611,7 +873,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Custom`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Custom("custom")))
                 )
@@ -631,7 +893,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Invite`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Invite))
                 )
@@ -651,7 +913,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as KnockRestricted`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.KnockRestricted(emptyList())))
                 )
@@ -671,7 +933,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Restricted`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(joinRule = JoinRule.Restricted(emptyList())))
                 )
@@ -691,7 +953,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded as Space`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.success(
                     aRoomPreview(info = aRoomPreviewInfo(isSpace = true))
                 )
@@ -711,7 +973,7 @@ class JoinRoomPresenterTest {
     @Test
     fun `present - when room is not known RoomPreview is loaded with error`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.failure(AN_EXCEPTION)
             }
         )
@@ -738,10 +1000,35 @@ class JoinRoomPresenterTest {
         }
     }
 
+    @Test
+    fun `present - when room is not known RoomPreview is loaded with error - dismiss`() = runTest {
+        val client = FakeMatrixClient(
+            getNotJoinedRoomResult = { _, _ ->
+                Result.failure(AN_EXCEPTION)
+            }
+        )
+        val presenter = createJoinRoomPresenter(
+            matrixClient = client
+        )
+        presenter.test {
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.contentState).isEqualTo(
+                    ContentState.Failure(error = AN_EXCEPTION)
+                )
+                state.eventSink(JoinRoomEvents.DismissErrorAndHideContent)
+            }
+            skipItems(1)
+            awaitItem().also { state ->
+                assertThat(state.contentState).isEqualTo(ContentState.Dismissing)
+            }
+        }
+    }
+
     @Test
     fun `present - when room is not known RoomPreview is loaded with error Forbidden`() = runTest {
         val client = FakeMatrixClient(
-            getRoomPreviewResult = { _, _ ->
+            getNotJoinedRoomResult = { _, _ ->
                 Result.failure(ClientException.MatrixApi(ErrorKind.Forbidden, "403", "Forbidden", null))
             }
         )
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
index e9ac23d76e..00d73db03b 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
@@ -11,13 +11,19 @@ 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.invite.api.InviteData
+import io.element.android.features.invite.test.anInviteData
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.test.room.aRoomMember
+import io.element.android.libraries.matrix.ui.model.toInviteSender
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 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.ensureCalledOnceWithParam
 import io.element.android.tests.testutils.pressBack
 import org.junit.Rule
 import org.junit.Test
@@ -141,40 +147,61 @@ class JoinRoomViewTest {
     @Test
     fun `clicking on Accept when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        val inviteData = anInviteData()
         rule.setJoinRoomView(
             aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, null)),
                 eventSink = eventsRecorder,
             ),
         )
         rule.clickOn(CommonStrings.action_accept)
-        eventsRecorder.assertSingle(JoinRoomEvents.AcceptInvite)
+        eventsRecorder.assertSingle(JoinRoomEvents.AcceptInvite(inviteData))
     }
 
     @Test
     fun `clicking on Decline when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
         val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        val inviteData = anInviteData()
         rule.setJoinRoomView(
             aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
+                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, null)),
                 eventSink = eventsRecorder,
             ),
         )
         rule.clickOn(CommonStrings.action_decline)
-        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(false))
+        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(inviteData, false))
     }
 
     @Test
-    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited emits the expected Event`() {
-        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
-        rule.setJoinRoomView(
-            aJoinRoomState(
-                contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(null)),
-                eventSink = eventsRecorder,
-            ),
+    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited and can report room, the expected callback is invoked`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>(expectEvents = false)
+        val inviteData = anInviteData()
+        val joinRoomState = aJoinRoomState(
+            contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, aRoomMember().toInviteSender())),
+            canReportRoom = true,
+            eventSink = eventsRecorder,
         )
-        rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
-        eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(true))
+        ensureCalledOnceWithParam(inviteData) {
+            rule.setJoinRoomView(
+                state = joinRoomState,
+                onDeclineInviteAndBlockUser = it,
+            )
+            rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
+        }
+    }
+
+    @Test
+    fun `clicking on Decline and block when JoinAuthorisationStatus is IsInvited and cant report room, emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<JoinRoomEvents>()
+        val inviteData = anInviteData()
+        val joinRoomState = aJoinRoomState(
+            contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.IsInvited(inviteData, aRoomMember().toInviteSender())),
+            canReportRoom = false,
+            eventSink = eventsRecorder,
+        )
+            rule.setJoinRoomView(state = joinRoomState,)
+            rule.clickOn(R.string.screen_join_room_decline_and_block_button_title)
+            eventsRecorder.assertSingle(JoinRoomEvents.DeclineInvite(inviteData, true))
     }
 
     @Test
@@ -242,6 +269,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinR
     onKnockSuccess: () -> Unit = EnsureNeverCalled(),
     onCancelKnockSuccess: () -> Unit = EnsureNeverCalled(),
     onForgetSuccess: () -> Unit = EnsureNeverCalled(),
+    onDeclineInviteAndBlockUser: (InviteData) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         JoinRoomView(
@@ -251,6 +279,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinR
             onKnockSuccess = onKnockSuccess,
             onForgetSuccess = onForgetSuccess,
             onCancelKnockSuccess = onCancelKnockSuccess,
+            onDeclineInviteAndBlockUser = onDeclineInviteAndBlockUser,
         )
     }
 }
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt
index 901d496836..4de596a623 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPermissions.kt
@@ -7,7 +7,7 @@
 
 package io.element.android.features.knockrequests.impl.data
 
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.canBan
 import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
 import io.element.android.libraries.matrix.api.room.powerlevels.canKick
@@ -22,7 +22,7 @@ data class KnockRequestPermissions(
     val canHandle = canAccept || canDecline || canBan
 }
 
-fun MatrixRoom.knockRequestPermissionsFlow(): Flow<KnockRequestPermissions> {
+fun JoinedRoom.knockRequestPermissionsFlow(): Flow<KnockRequestPermissions> {
     return syncUpdateFlow.map {
         val canAccept = canInvite().getOrDefault(false)
         val canDecline = canKick().getOrDefault(false)
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
index dc3e177d7c..671208e97b 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsModule.kt
@@ -14,14 +14,14 @@ import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @Module
 @ContributesTo(RoomScope::class)
 object KnockRequestsModule {
     @Provides
     @SingleIn(RoomScope::class)
-    fun knockRequestsService(room: MatrixRoom, featureFlagService: FeatureFlagService): KnockRequestsService {
+    fun knockRequestsService(room: JoinedRoom, featureFlagService: FeatureFlagService): KnockRequestsService {
         return KnockRequestsService(
             knockRequestsFlow = room.knockRequestsFlow,
             permissionsFlow = room.knockRequestPermissionsFlow(),
diff --git a/features/knockrequests/impl/src/main/res/values-cy/translations.xml b/features/knockrequests/impl/src/main/res/values-cy/translations.xml
index 2ea2ec041e..8257ae857b 100644
--- a/features/knockrequests/impl/src/main/res/values-cy/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-cy/translations.xml
@@ -25,6 +25,14 @@
   <string name="screen_knock_requests_list_empty_state_title">"Dim cais i ymuno yn disgwyl"</string>
   <string name="screen_knock_requests_list_initial_loading_title">"Yn llwytho ceisiadau i ymuno…"</string>
   <string name="screen_knock_requests_list_title">"Ceisiadau i ymuno"</string>
+  <plurals name="screen_room_multiple_knock_requests_title">
+    <item quantity="zero">"Dyw %1$s na +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+    <item quantity="one">"Mae %1$s +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+    <item quantity="two">"Mae %1$s +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+    <item quantity="few">"Mae %1$s +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+    <item quantity="many">"Mae %1$s +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+    <item quantity="other">"Mae %1$s +%2$d arall eisiau ymuno â\'r ystafell hon"</item>
+  </plurals>
   <string name="screen_room_multiple_knock_requests_view_all_button_title">"Gweld y cyfan"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"Derbyn"</string>
   <string name="screen_room_single_knock_request_title">"Mae %1$s eisiau ymuno â\'r ystafell hon"</string>
diff --git a/features/knockrequests/impl/src/main/res/values-el/translations.xml b/features/knockrequests/impl/src/main/res/values-el/translations.xml
index d07b289382..8d9bbd4f6d 100644
--- a/features/knockrequests/impl/src/main/res/values-el/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-el/translations.xml
@@ -7,6 +7,7 @@
   <string name="screen_knock_requests_list_accept_all_failed_alert_description">"Δεν μπορέσαμε να δεχτούμε όλα τα αιτήματα. Θες να προσπαθήσεις ξανά;"</string>
   <string name="screen_knock_requests_list_accept_all_failed_alert_title">"Αποτυχία αποδοχής όλων των αιτημάτων"</string>
   <string name="screen_knock_requests_list_accept_all_loading_title">"Αποδοχή όλων των αιτημάτων συμμετοχής"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_description">"Δεν μπορέσαμε να δεχτούμε αυτό το αίτημα. Θα θέλατε να προσπαθήσετε ξανά;"</string>
   <string name="screen_knock_requests_list_accept_failed_alert_title">"Αποτυχία αποδοχής αιτήματος"</string>
   <string name="screen_knock_requests_list_accept_loading_title">"Γίνεται αποδοχή αιτήματος συμμετοχής"</string>
   <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"Ναι, απόρριψη και αποκλεισμός"</string>
@@ -17,6 +18,8 @@
   <string name="screen_knock_requests_list_decline_alert_description">"Σίγουρα θες να απορρίψεις το αίτημα του χρήστη %1$s να συμμετάσχει στο δωμάτιο;"</string>
   <string name="screen_knock_requests_list_decline_alert_title">"Απόρριψη πρόσβασης"</string>
   <string name="screen_knock_requests_list_decline_and_ban_action_title">"Απόρριψη και αποκλεισμός"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_description">"Δεν μπορέσαμε να απορρίψουμε αυτό το αίτημα. Θα θέλατε να προσπαθήσετε ξανά;"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"Απέτυχε η απόρριψη του αιτήματος"</string>
   <string name="screen_knock_requests_list_decline_loading_title">"Γίνεται απόρριψη αιτήματος συμμετοχής"</string>
   <string name="screen_knock_requests_list_empty_state_description">"Όταν κάποιος θα ζητήσει να συμμετάσχει στο δωμάτιο, θα μπορείς να δεις το αίτημά του εδώ."</string>
   <string name="screen_knock_requests_list_empty_state_title">"Δεν υπάρχει εκκρεμές αίτημα συμμετοχής"</string>
diff --git a/features/knockrequests/impl/src/main/res/values-fa/translations.xml b/features/knockrequests/impl/src/main/res/values-fa/translations.xml
index 33e231cb85..5b931e4f00 100644
--- a/features/knockrequests/impl/src/main/res/values-fa/translations.xml
+++ b/features/knockrequests/impl/src/main/res/values-fa/translations.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_knock_requests_list_accept_all_alert_confirm_button_title">"بله. پذیرش همه"</string>
+  <string name="screen_knock_requests_list_accept_all_alert_title">"پذیرش همهٔ درخواست‌ها"</string>
+  <string name="screen_knock_requests_list_accept_all_button_title">"پذیرش همه"</string>
+  <string name="screen_knock_requests_list_accept_all_failed_alert_title">"شکست در پذیرش همهٔ درخواست‌ها"</string>
+  <string name="screen_knock_requests_list_accept_all_loading_title">"پذیرفتن همهٔ درخواست‌های پیوستن"</string>
+  <string name="screen_knock_requests_list_accept_failed_alert_title">"شکست در پذیرش درخواست"</string>
+  <string name="screen_knock_requests_list_accept_loading_title">"پذیرفتن درخواست پیوستن"</string>
+  <string name="screen_knock_requests_list_ban_alert_confirm_button_title">"بله. رد و انسداد"</string>
+  <string name="screen_knock_requests_list_ban_alert_title">"رد و تحریم دسترسی"</string>
+  <string name="screen_knock_requests_list_ban_loading_title">"رد کردن و تحریم دسترسی"</string>
+  <string name="screen_knock_requests_list_decline_alert_confirm_button_title">"بله. رد شود"</string>
+  <string name="screen_knock_requests_list_decline_alert_title">"رد کردن دسترسی"</string>
+  <string name="screen_knock_requests_list_decline_and_ban_action_title">"رد و تحریم"</string>
+  <string name="screen_knock_requests_list_decline_failed_alert_title">"شکتس در رد درخواست"</string>
+  <string name="screen_knock_requests_list_decline_loading_title">"در کردن درخواست پیوستن"</string>
+  <string name="screen_knock_requests_list_title">"درخواست‌های پیوستن"</string>
+  <string name="screen_room_multiple_knock_requests_view_all_button_title">"دیدن همه"</string>
   <string name="screen_room_single_knock_request_accept_button_title">"پذیرش"</string>
+  <string name="screen_room_single_knock_request_title">"%1$s می‌خواهد به این اتاق بپیوندد"</string>
+  <string name="screen_room_single_knock_request_view_button_title">"نما"</string>
 </resources>
diff --git a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
index e1c5cde223..28321d1b99 100644
--- a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
+++ b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
@@ -40,9 +40,9 @@ private fun LeaveRoomConfirmationDialog(
         is LeaveRoomState.Confirmation.Hidden -> {}
 
         is LeaveRoomState.Confirmation.Dm -> LeaveRoomConfirmationDialog(
-            text = R.string.leave_conversation_alert_subtitle,
+            text = R.string.leave_room_alert_private_subtitle,
             roomId = state.confirmation.roomId,
-            isDm = true,
+            isDm = false,
             eventSink = state.eventSink,
         )
 
diff --git a/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterTest.kt b/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
similarity index 94%
rename from features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterTest.kt
rename to features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
index 22407c93d4..108c2ddb53 100644
--- a/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterTest.kt
+++ b/features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveBaseRoomPresenterTest.kt
@@ -16,7 +16,7 @@ import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.assert
@@ -30,7 +30,7 @@ import org.junit.Rule
 import org.junit.Test
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class LeaveRoomPresenterTest {
+class LeaveBaseRoomPresenterTest {
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -53,7 +53,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom().apply {
+                    result = FakeBaseRoom().apply {
                         givenRoomInfo(aRoomInfo(isDirect = false, isPublic = true, joinedMembersCount = 10))
                     }
                 )
@@ -75,7 +75,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom().apply {
+                    result = FakeBaseRoom().apply {
                         givenRoomInfo(aRoomInfo(isPublic = false))
                     },
                 )
@@ -97,7 +97,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom().apply {
+                    result = FakeBaseRoom().apply {
                         givenRoomInfo(aRoomInfo(joinedMembersCount = 1))
                     },
                 )
@@ -119,7 +119,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom().apply {
+                    result = FakeBaseRoom().apply {
                         givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 2))
                     },
                 )
@@ -142,7 +142,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom(
+                    result = FakeBaseRoom(
                         leaveRoomLambda = leaveRoomLambda
                     ),
                 )
@@ -167,7 +167,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom(
+                    result = FakeBaseRoom(
                         leaveRoomLambda = { Result.failure(RuntimeException("Blimey!")) }
                     ),
                 )
@@ -191,7 +191,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom(
+                    result = FakeBaseRoom(
                         leaveRoomLambda = { Result.success(Unit) }
                     ),
                 )
@@ -215,7 +215,7 @@ class LeaveRoomPresenterTest {
             client = FakeMatrixClient().apply {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
-                    result = FakeMatrixRoom(
+                    result = FakeBaseRoom(
                         leaveRoomLambda = { Result.failure(RuntimeException("Blimey!")) }
                     ),
                 )
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
index f5f6190855..ce2b06a8b2 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/send/SendLocationPresenter.kt
@@ -24,7 +24,7 @@ import io.element.android.features.location.impl.common.permissions.PermissionsS
 import io.element.android.features.messages.api.MessageComposerContext
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.meta.BuildMeta
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.launch
@@ -32,7 +32,7 @@ import javax.inject.Inject
 
 class SendLocationPresenter @Inject constructor(
     permissionsPresenterFactory: PermissionsPresenter.Factory,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val analyticsService: AnalyticsService,
     private val messageComposerContext: MessageComposerContext,
     private val locationActions: LocationActions,
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
index 69a8d2d032..0c4bb5e067 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/send/SendLocationPresenterTest.kt
@@ -20,12 +20,12 @@ import io.element.android.features.location.impl.common.permissions.PermissionsE
 import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
 import io.element.android.features.location.impl.common.permissions.PermissionsState
 import io.element.android.features.messages.test.FakeMessageComposerContext
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.core.aBuildMeta
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.textcomposer.model.MessageComposerMode
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
@@ -47,12 +47,12 @@ class SendLocationPresenterTest {
     private val fakeBuildMeta = aBuildMeta(applicationName = "app name")
 
     private fun createSendLocationPresenter(
-        matrixRoom: MatrixRoom = FakeMatrixRoom(),
+        joinedRoom: JoinedRoom = FakeJoinedRoom(),
     ): SendLocationPresenter = SendLocationPresenter(
         permissionsPresenterFactory = object : PermissionsPresenter.Factory {
             override fun create(permissions: List<String>): PermissionsPresenter = fakePermissionsPresenter
         },
-        room = matrixRoom,
+        room = joinedRoom,
         analyticsService = fakeAnalyticsService,
         messageComposerContext = fakeMessageComposerContext,
         locationActions = fakeLocationActions,
@@ -265,10 +265,10 @@ class SendLocationPresenterTest {
         val sendLocationResult = lambdaRecorder<String, String, String?, Int?, AssetType?, Result<Unit>> { _, _, _, _, _ ->
             Result.success(Unit)
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             sendLocationResult = sendLocationResult,
         )
-        val sendLocationPresenter = createSendLocationPresenter(matrixRoom)
+        val sendLocationPresenter = createSendLocationPresenter(joinedRoom)
         fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.AllGranted,
@@ -326,10 +326,10 @@ class SendLocationPresenterTest {
         val sendLocationResult = lambdaRecorder<String, String, String?, Int?, AssetType?, Result<Unit>> { _, _, _, _, _ ->
             Result.success(Unit)
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             sendLocationResult = sendLocationResult,
         )
-        val sendLocationPresenter = createSendLocationPresenter(matrixRoom)
+        val sendLocationPresenter = createSendLocationPresenter(joinedRoom)
         fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
@@ -387,10 +387,10 @@ class SendLocationPresenterTest {
         val sendLocationResult = lambdaRecorder<String, String, String?, Int?, AssetType?, Result<Unit>> { _, _, _, _, _ ->
             Result.success(Unit)
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             sendLocationResult = sendLocationResult,
         )
-        val sendLocationPresenter = createSendLocationPresenter(matrixRoom)
+        val sendLocationPresenter = createSendLocationPresenter(joinedRoom)
         fakePermissionsPresenter.givenState(
             aPermissionsState(
                 permissions = PermissionsState.Permissions.NoneGranted,
diff --git a/features/lockscreen/impl/src/main/res/values-cy/translations.xml b/features/lockscreen/impl/src/main/res/values-cy/translations.xml
index 5e7217a738..d82bc28cc7 100644
--- a/features/lockscreen/impl/src/main/res/values-cy/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-cy/translations.xml
@@ -1,5 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_app_lock_biometric_authentication">"dilysu biometreg"</string>
+  <string name="screen_app_lock_biometric_unlock">"datgloi biometreg"</string>
+  <string name="screen_app_lock_biometric_unlock_title_android">"Datgloi gyda biometreg"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"Cadarnhau biometreg"</string>
   <string name="screen_app_lock_forgot_pin">"Wedi anghofio\'ch PIN?"</string>
+  <string name="screen_app_lock_settings_change_pin">"Newid cod PIN"</string>
+  <string name="screen_app_lock_settings_enable_biometric_unlock">"Caniatáu datgloi biometreg"</string>
+  <string name="screen_app_lock_settings_remove_pin">"Dileu PIN"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_message">"Ydych chi\'n siŵr eich bod am ddileu\'r PIN?"</string>
+  <string name="screen_app_lock_settings_remove_pin_alert_title">"Tynnu\'r PIN?"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_allow_title">"Caniatáu %1$s"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_skip">"Byddai\'n well gen i ddefnyddio PIN"</string>
+  <string name="screen_app_lock_setup_biometric_unlock_subtitle">"Arbedwch beth amser i chi\'ch hun a defnyddiwch %1$s i ddatgloi\'r ap bob tro"</string>
+  <string name="screen_app_lock_setup_choose_pin">"Dewiswch PIN"</string>
   <string name="screen_app_lock_setup_confirm_pin">"Cadarnhau eich PIN"</string>
+  <string name="screen_app_lock_setup_pin_context">"Clowch %1$s i ychwanegu diogelwch ychwanegol i\'ch sgyrsiau.
+
+Dewiswch rywbeth cofiadwy. Os byddwch chi\'n anghofio\'r PIN hwn, byddwch chi\'n cael eich allgofnodi o\'r ap."</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_content">"Does dim mod dewis hwn fel eich cod PIN am resymau diogelwch"</string>
+  <string name="screen_app_lock_setup_pin_forbidden_dialog_title">"Dewiswch PIN gwahanol"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_content">"Rhowch yr un PIN ddwywaith"</string>
+  <string name="screen_app_lock_setup_pin_mismatch_dialog_title">"Nid yw\'r PINau\'n cyfateb"</string>
+  <string name="screen_app_lock_signout_alert_message">"Bydd angen i chi ail-fewngofnodi a chreu PIN newydd i barhau"</string>
+  <string name="screen_app_lock_signout_alert_title">"Rydych chi\'n cael eich allgofnodi"</string>
+  <plurals name="screen_app_lock_subtitle">
+    <item quantity="zero">"Does gennych %1$d ceisiadau i ddatgloi"</item>
+    <item quantity="one">"Mae gennych %1$d cais i ddatgloi"</item>
+    <item quantity="two">"Mae gennych %1$d gais i ddatgloi"</item>
+    <item quantity="few">"Mae gennych %1$d chais i ddatgloi"</item>
+    <item quantity="many">"Mae gennych %1$d chais i ddatgloi"</item>
+    <item quantity="other">"Mae gennych %1$d cais i ddatgloi"</item>
+  </plurals>
+  <plurals name="screen_app_lock_subtitle_wrong_pin">
+    <item quantity="zero">"PIN anghywir. Does gennych %1$d cais arall"</item>
+    <item quantity="one">"PIN anghywir. Mae gennych %1$d cais arall"</item>
+    <item quantity="two">"PIN anghywir. Mae gennych %1$d gais arall"</item>
+    <item quantity="few">"PIN anghywir. Mae gennych %1$d chais arall"</item>
+    <item quantity="many">"PIN anghywir. Mae gennych %1$d chais arall"</item>
+    <item quantity="other">"PIN anghywir. Mae gennych %1$d cais arall"</item>
+  </plurals>
+  <string name="screen_app_lock_use_biometric_android">"Defnyddio biometreg"</string>
+  <string name="screen_app_lock_use_pin_android">"Defnyddio PIN"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Yn allgofnodi…"</string>
 </resources>
diff --git a/features/lockscreen/impl/src/main/res/values-fa/translations.xml b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
index f9a1e0d1ed..b311024aaa 100644
--- a/features/lockscreen/impl/src/main/res/values-fa/translations.xml
+++ b/features/lockscreen/impl/src/main/res/values-fa/translations.xml
@@ -3,6 +3,7 @@
   <string name="screen_app_lock_biometric_authentication">"هویت‌سنجی زیستی"</string>
   <string name="screen_app_lock_biometric_unlock">"قفل‌گشایی زیست‌سنجی"</string>
   <string name="screen_app_lock_biometric_unlock_title_android">"قفل‌گشایی با زیست‌سنجی"</string>
+  <string name="screen_app_lock_confirm_biometric_authentication_android">"تأیید زیست‌سنجی"</string>
   <string name="screen_app_lock_forgot_pin">"فراموشی پین؟"</string>
   <string name="screen_app_lock_settings_change_pin">"تغییر کد پین"</string>
   <string name="screen_app_lock_settings_enable_biometric_unlock">"احازه به قفل گشایی زیست‌سنجی"</string>
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
index a3397dc41b..be526ccb0d 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
@@ -14,6 +14,7 @@ import io.element.android.features.login.impl.R
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.LocalBuildMeta
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
@@ -29,7 +30,10 @@ internal fun SlidingSyncNotSupportedDialog(
         onSubmitClick = onLearnMoreClick,
         onCancelClick = onDismiss,
         title = stringResource(CommonStrings.dialog_title_error),
-        content = stringResource(R.string.screen_change_server_error_no_sliding_sync_message),
+        content = stringResource(
+            id = R.string.screen_change_server_error_no_sliding_sync_message,
+            LocalBuildMeta.current.applicationName,
+        ),
     )
 }
 
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
index b450aaea53..618f4f81f6 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/error/ChangeServerError.kt
@@ -12,18 +12,24 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import io.element.android.features.login.impl.R
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
+import io.element.android.libraries.ui.strings.CommonStrings
 
 sealed class ChangeServerError : Throwable() {
-    data class Error(@StringRes val messageId: Int) : ChangeServerError() {
+    data class Error(
+        @StringRes val messageId: Int? = null,
+        val messageStr: String? = null,
+    ) : ChangeServerError() {
         @Composable
-        fun message(): String = stringResource(messageId)
+        fun message(): String = messageStr ?: stringResource(messageId ?: CommonStrings.error_unknown)
     }
+
     data object SlidingSyncAlert : ChangeServerError()
 
     companion object {
         fun from(error: Throwable): ChangeServerError = when (error) {
             is AuthenticationException.SlidingSyncVersion -> SlidingSyncAlert
-            else -> Error(R.string.screen_change_server_error_invalid_homeserver)
+            is AuthenticationException.Oidc -> Error(messageStr = error.message)
+            else -> Error(messageId = R.string.screen_change_server_error_invalid_homeserver)
         }
     }
 }
diff --git a/features/login/impl/src/main/res/values-be/translations.xml b/features/login/impl/src/main/res/values-be/translations.xml
index e4276c99b8..1100b7dc08 100644
--- a/features/login/impl/src/main/res/values-be/translations.xml
+++ b/features/login/impl/src/main/res/values-be/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Нам не ўдалося звязацца з гэтым хатнім серверам. Упэўніцеся, што вы правільна ўвялі URL-адрас хатняга сервера. Калі URL-адрас пазначаны правільна, звярніцеся да адміністратара хатняга сервера за дадатковай дапамогай."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync недаступны з-за праблемы ў вядомым файле:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Выбачце, гэты сервер не падтрымлівае sliding sync."</string>
   <string name="screen_change_server_form_header">"URL хатняга сервера"</string>
-  <string name="screen_change_server_form_notice">"Вы можаце падключыцца толькі да існуючага сервера, які падтрымлівае sliding sync. Адміністратару хатняга сервера запатрабуецца наладзіць яго. %1$s"</string>
   <string name="screen_change_server_subtitle">"Які адрас вашага сервера?"</string>
   <string name="screen_change_server_title">"Выберыце свой сервер"</string>
   <string name="screen_create_account_title">"Стварыць уліковы запіс"</string>
diff --git a/features/login/impl/src/main/res/values-cs/translations.xml b/features/login/impl/src/main/res/values-cs/translations.xml
index 27aea5c811..97b87e6e35 100644
--- a/features/login/impl/src/main/res/values-cs/translations.xml
+++ b/features/login/impl/src/main/res/values-cs/translations.xml
@@ -16,9 +16,9 @@
   <string name="screen_change_server_error_invalid_homeserver">"Nepodařilo se nám připojit k tomuto domovskému serveru. Zkontrolujte prosím, zda jste správně zadali adresu URL domovského serveru. Pokud je adresa URL správná, obraťte se na správce domovského serveru, který vám poskytne další pomoc."</string>
   <string name="screen_change_server_error_invalid_well_known">"Klouzavá synchronizace není k dispozici kvůli problému se souborem well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Tento server v současné době nepodporuje klouzavou synchronizaci."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Vybraný poskytovatel účtu nepodporuje klouzavou synchronizaci. Pro použití %1$s je nutná aktualizace serveru."</string>
   <string name="screen_change_server_form_header">"Adresa URL domovského serveru"</string>
-  <string name="screen_change_server_form_notice">"Můžete se připojit pouze k serveru, který podporuje klouzavou synchronizaci. Správce vašeho domovského serveru jej bude muset nakonfigurovat. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Zadejte adresu domény."</string>
   <string name="screen_change_server_subtitle">"Jaká je adresa vašeho serveru?"</string>
   <string name="screen_change_server_title">"Vyberte váš server"</string>
   <string name="screen_create_account_title">"Vytvořit účet"</string>
diff --git a/features/login/impl/src/main/res/values-cy/translations.xml b/features/login/impl/src/main/res/values-cy/translations.xml
index dc88dc54d0..e44da81b50 100644
--- a/features/login/impl/src/main/res/values-cy/translations.xml
+++ b/features/login/impl/src/main/res/values-cy/translations.xml
@@ -1,15 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_account_provider_change">"Newid darparwr cyfrif"</string>
+  <string name="screen_account_provider_form_hint">"Cyfeiriad y gweinydd cartref"</string>
+  <string name="screen_account_provider_form_notice">"Rhowch derm chwilio neu gyfeiriad parth."</string>
+  <string name="screen_account_provider_form_subtitle">"Chwiliwch am gwmni, gweinyddwr cymunedol neu weinydd preifat."</string>
+  <string name="screen_account_provider_form_title">"Canfod darparwr cyfrif"</string>
+  <string name="screen_account_provider_signin_subtitle">"Dyma lle bydd eich sgyrsiau\'n byw - yn union fel y byddech chi\'n defnyddio darparwr e-bost i gadw\'ch e-byst."</string>
+  <string name="screen_account_provider_signin_title">"Rydych ar fin mewngofnodi i %s"</string>
+  <string name="screen_account_provider_signup_subtitle">"Dyma lle bydd eich sgyrsiau\'n byw - yn union fel y byddech chi\'n defnyddio darparwr e-bost i gadw\'ch e-byst."</string>
+  <string name="screen_account_provider_signup_title">"Rydych chi ar fin creu cyfrif ar %s"</string>
+  <string name="screen_change_account_provider_matrix_org_subtitle">"Mae Matrix.org yn weinydd mawr, rhad ac am ddim ar y rhwydwaith Matrix cyhoeddus ar gyfer cyfathrebu diogel, datganoledig, sy\'n cael ei redeg gan y Matrix.org Foundation."</string>
   <string name="screen_change_account_provider_other">"Arall"</string>
+  <string name="screen_change_account_provider_subtitle">"Defnyddiwch ddarparwr cyfrif gwahanol, fel eich gweinydd preifat eich hun neu gyfrif gwaith."</string>
+  <string name="screen_change_account_provider_title">"Newid darparwr cyfrif"</string>
+  <string name="screen_change_server_error_invalid_homeserver">"Doedd dim modd i ni gyrraedd y gweinydd cartref hwn. Gwiriwch eich bod wedi rhoi URL y gweinydd cartref yn gywir. Os yw\'r URL yn gywir, cysylltwch â gweinyddwr eich gweinydd cartref am ragor o help."</string>
+  <string name="screen_change_server_error_invalid_well_known">"Nid yw cydweddu llithrig ar gael oherwydd problem yn y ffeil adnabyddus:
+%1$s"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Dyw\'r darparwr cyfrif hwn ddim yn cefnogi cydweddu llithro. Mae angen uwchraddio\'r gweinydd i ddefnyddio %1$s."</string>
+  <string name="screen_change_server_form_header">"URL y Gweinydd Cartref"</string>
+  <string name="screen_change_server_form_notice">"Rhowch gyfeiriad parth."</string>
+  <string name="screen_change_server_subtitle">"Beth yw cyfeiriad eich gweinydd?"</string>
+  <string name="screen_change_server_title">"Dewiswch eich gweinydd"</string>
   <string name="screen_create_account_title">"Creu cyfrif"</string>
   <string name="screen_login_error_deactivated_account">"Mae\'r cyfrif hwn wedi\'i gau."</string>
+  <string name="screen_login_error_invalid_credentials">"Enw defnyddiwr a/neu gyfrinair anghywir"</string>
+  <string name="screen_login_error_invalid_user_id">"Nid yw hwn yn ddynodwr defnyddiwr dilys. Fformat disgwyliedig: ‘@user:homeserver.org’"</string>
+  <string name="screen_login_error_refresh_tokens">"Mae\'r gweinydd hwn wedi\'i ffurfweddu i ddefnyddio tocynnau adnewyddu. Nid yw\'r rhain yn cael eu cefnogi wrth ddefnyddio mewngofnodi ar sail cyfrinair."</string>
+  <string name="screen_login_error_unsupported_authentication">"Nid yw\'r gweinydd cartref ddewiswyd yn cefnogi cyfrinair na mewngofnodi OIDC. Cysylltwch â\'ch gweinyddwr neu dewis gweinydd cartref arall."</string>
+  <string name="screen_login_form_header">"Rhowch eich manylion"</string>
+  <string name="screen_login_subtitle">"Mae Matrix yn rhwydwaith agored ar gyfer cyfathrebu diogel, datganoledig."</string>
   <string name="screen_login_title">"Croeso nôl!"</string>
+  <string name="screen_login_title_with_homeserver">"Mewngofnodi i %1$s"</string>
+  <string name="screen_qr_code_login_connecting_subtitle">"Yn creu cysylltiad diogel"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_description">"Nid oedd modd gwneud cysylltiad diogel â\'r ddyfais newydd. Mae eich dyfeisiau presennol yn dal yn ddiogel a does dim angen i chi boeni amdanyn nhw."</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_header">"Beth nawr?"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_1">"Ceisiwch fewngofnodi eto gyda chod QR rhag ofn bod hyn yn broblem rhwydwaith"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_2">"Os ydych chi\'n dod ar draws yr un broblem, rhowch gynnig ar rwydwaith wifi gwahanol neu defnyddiwch eich data symudol yn lle wifi"</string>
+  <string name="screen_qr_code_login_connection_note_secure_state_list_item_3">"Os nad yw hynny\'n gweithio, mewngofnodwch â llaw"</string>
   <string name="screen_qr_code_login_connection_note_secure_state_title">"Nid yw\'r cysylltiad yn ddiogel"</string>
+  <string name="screen_qr_code_login_device_code_subtitle">"Bydd gofyn i chi nodi\'r ddau ddigid sy\'n cael eu dangos ar y ddyfais hon."</string>
+  <string name="screen_qr_code_login_device_code_title">"Rhowch y rhif isod ar eich dyfais arall"</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_description">"Mewngofnodwch i\'ch dyfais arall ac yna ceisio eto, neu defnyddio ddyfais arall sydd eisoes wedi\'fewngofnodi."</string>
+  <string name="screen_qr_code_login_device_not_signed_in_scan_state_subtitle">"Dyw\'r ddyfais arall heb ei mewngofnodi"</string>
   <string name="screen_qr_code_login_error_cancelled_subtitle">"Cafodd y mewngofnodi ei ddiddymu ar y ddyfais arall."</string>
   <string name="screen_qr_code_login_error_cancelled_title">"Cais mewngofnodi wedi\'i ddiddymu"</string>
+  <string name="screen_qr_code_login_error_declined_subtitle">"Cafodd y mewngofnodi ar y ddyfais arall ei wrthod."</string>
   <string name="screen_qr_code_login_error_declined_title">"Gwrthodwyd y mewngofnodi"</string>
+  <string name="screen_qr_code_login_error_expired_subtitle">"Mewngofnodi wedi dod i ben. Ceisiwch eto."</string>
   <string name="screen_qr_code_login_error_expired_title">"Heb gwblhau\'r mewngofnodi mewn pryd"</string>
+  <string name="screen_qr_code_login_error_linking_not_suported_subtitle">"Nid yw eich dyfais arall yn cefnogi mewngofnodi i %s gyda chod QR.
+
+Ceisiwch fewngofnodi â llaw, neu sganiwch y cod QR gyda dyfais arall."</string>
   <string name="screen_qr_code_login_error_linking_not_suported_title">"Nid yw\'r cod QR yn cael ei gefnogi"</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Nid yw darparwr eich cyfrif yn cefnogi %1$s."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s heb ei gefnogi"</string>
+  <string name="screen_qr_code_login_initial_state_button_title">"Yn barod i sganio"</string>
+  <string name="screen_qr_code_login_initial_state_item_1">"Agor %1$s ar ddyfais bwrdd gwaith"</string>
+  <string name="screen_qr_code_login_initial_state_item_2">"Cliciwch ar eich afatar"</string>
+  <string name="screen_qr_code_login_initial_state_item_3">"Dewiswch %1$s"</string>
+  <string name="screen_qr_code_login_initial_state_item_3_action">"“Cysylltu dyfais newydd”"</string>
+  <string name="screen_qr_code_login_initial_state_item_4">"Sganiwch y cod QR gyda\'r ddyfais hon"</string>
+  <string name="screen_qr_code_login_initial_state_subtitle">"Dim ond ar gael os yw darparwr eich cyfrif yn ei gefnogi."</string>
+  <string name="screen_qr_code_login_initial_state_title">"Agorwch %1$s ar ddyfais arall i gael y cod QR"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_description">"Defnyddiwch y cod QR sy\'n cael ei ddangos ar y ddyfais arall."</string>
   <string name="screen_qr_code_login_invalid_scan_state_retry_button">"Ceisiwch eto"</string>
+  <string name="screen_qr_code_login_invalid_scan_state_subtitle">"Cod QR anghywir"</string>
+  <string name="screen_qr_code_login_no_camera_permission_button">"Mynd i osodiadau camera"</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_description">"Mae angen i chi roi caniatâd i %1$s ddefnyddio camera eich dyfais er mwyn parhau."</string>
+  <string name="screen_qr_code_login_no_camera_permission_state_title">"Caniatáu mynediad camera i sganio\'r cod QR"</string>
+  <string name="screen_qr_code_login_scanning_state_title">"Sganiwch y cod QR"</string>
+  <string name="screen_qr_code_login_start_over_button">"Cychwyn eto"</string>
   <string name="screen_qr_code_login_unknown_error_description">"Digwyddodd gwall annisgwyl. Ceisiwch eto."</string>
+  <string name="screen_qr_code_login_verify_code_loading">"Yn aros am eich dyfais arall"</string>
+  <string name="screen_qr_code_login_verify_code_subtitle">"Mae\'n bosibl y bydd darparwr eich cyfrif yn gofyn am y cod canlynol i ddilysu\'r mewngofnodi."</string>
+  <string name="screen_qr_code_login_verify_code_title">"Eich cod dilysu"</string>
+  <string name="screen_server_confirmation_change_server">"Newid darparwr cyfrif"</string>
+  <string name="screen_server_confirmation_message_login_element_dot_io">"Gweinydd preifat ar gyfer gweithwyr Element."</string>
+  <string name="screen_server_confirmation_message_login_matrix_dot_org">"Mae Matrix yn rhwydwaith agored ar gyfer cyfathrebu diogel, datganoledig."</string>
+  <string name="screen_server_confirmation_message_register">"Dyma lle bydd eich sgyrsiau\'n byw - yn union fel y byddech chi\'n defnyddio darparwr e-bost i gadw\'ch e-byst."</string>
+  <string name="screen_server_confirmation_title_login">"Rydych ar fin mewngofnodi i %1$s"</string>
+  <string name="screen_server_confirmation_title_register">"Rydych chi ar fin creu cyfrif ar %1$s"</string>
 </resources>
diff --git a/features/login/impl/src/main/res/values-de/translations.xml b/features/login/impl/src/main/res/values-de/translations.xml
index 0b6dd41c96..1cc05d4e05 100644
--- a/features/login/impl/src/main/res/values-de/translations.xml
+++ b/features/login/impl/src/main/res/values-de/translations.xml
@@ -14,11 +14,11 @@
   <string name="screen_change_account_provider_subtitle">"Verwende einen anderen Kontoanbieter, z. B. deinen eigenen privaten Server oder ein Geschäftskonto."</string>
   <string name="screen_change_account_provider_title">"Kontoanbieter wechseln"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Wir konnten diesen Homeserver nicht erreichen. Bitte überprüfe, ob du die Homeserver-URL korrekt eingegeben hast. Wenn die URL korrekt ist, wende dich an deinen Homeserver-Administrator, um weitere Hilfe zu erhalten."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Sliding Sync ist aufgrund eines Problems im \"well-known file\" nicht verfügbar:
+  <string name="screen_change_server_error_invalid_well_known">"Der Server ist aufgrund eines Problems im \"well-known file\" nicht verfügbar:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Dieser Server unterstützt derzeit kein Sliding Sync."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Der gewählte Kontoanbieter unterstützt Sliding Sync nicht. Für die Verwendung von %1$s ist ein Upgrade des Servers erforderlich."</string>
   <string name="screen_change_server_form_header">"Homeserver-URL"</string>
-  <string name="screen_change_server_form_notice">"Du kannst nur eine Verbindung zu einem vorhandenen Server herstellen, der Sliding Sync unterstützt. Dein Homeserver-Administrator muss das konfigurieren. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Geben Sie eine Domainadresse ein."</string>
   <string name="screen_change_server_subtitle">"Wie lautet die Adresse deines Servers?"</string>
   <string name="screen_change_server_title">"Wähle deinen Server aus"</string>
   <string name="screen_create_account_title">"Konto erstellen"</string>
diff --git a/features/login/impl/src/main/res/values-el/translations.xml b/features/login/impl/src/main/res/values-el/translations.xml
index 532ee17023..c4983563ea 100644
--- a/features/login/impl/src/main/res/values-el/translations.xml
+++ b/features/login/impl/src/main/res/values-el/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Δεν μπορούσαμε να επικοινωνήσουμε με αυτόν τον οικιακό διακομιστή. Βεβαιώσου ότι έχεις εισαγάγει σωστά τη διεύθυνση URL του αρχικού διακομιστή. Εάν η διεύθυνση URL είναι σωστή, επικοινώνησε με τον διαχειριστή του κεντρικού διακομιστή για περαιτέρω βοήθεια."</string>
   <string name="screen_change_server_error_invalid_well_known">"Το Sliding sync δεν είναι διαθέσιμο εξαιτίας ενός ζητήματος σε ένα πολύ γνωστό αρχείο:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Αυτός ο διακομιστής προς το παρόν δεν υποστηρίζει Sliding sync."</string>
   <string name="screen_change_server_form_header">"URL οικιακού διακομιστή"</string>
-  <string name="screen_change_server_form_notice">"Μπορείτε να συνδεθείς μόνο σε υπάρχοντα διακομιστή που υποστηρίζει Sliding sync. Ο διαχειριστής του οικιακού διακομιστή σου θα πρέπει να το ρυθμίσει. %1$s"</string>
   <string name="screen_change_server_subtitle">"Ποια είναι η διεύθυνση του διακομιστή σου;"</string>
   <string name="screen_change_server_title">"Επέλεξε το διακομιστή σου"</string>
   <string name="screen_create_account_title">"Δημιουργία λογαριασμού"</string>
diff --git a/features/login/impl/src/main/res/values-es/translations.xml b/features/login/impl/src/main/res/values-es/translations.xml
index a6df64575a..1e4d4617b5 100644
--- a/features/login/impl/src/main/res/values-es/translations.xml
+++ b/features/login/impl/src/main/res/values-es/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"No hemos podido acceder a este servidor. Comprueba que has introducido correctamente la dirección del servidor. Si la dirección es correcta, ponte en contacto con el administrador del servidor para obtener más ayuda."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync no está disponible debido a un problema en el archivo well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Este servidor no soporta sliding sync."</string>
   <string name="screen_change_server_form_header">"Dirección del homeserver"</string>
-  <string name="screen_change_server_form_notice">"Solo puedes conectarte a un servidor que soporte sliding sync. El administrador de tu servidor tendrá que configurarlo. %1$s"</string>
   <string name="screen_change_server_subtitle">"¿Cuál es la dirección de tu servidor?"</string>
   <string name="screen_change_server_title">"Selecciona tu servidor"</string>
   <string name="screen_create_account_title">"Crear cuenta"</string>
diff --git a/features/login/impl/src/main/res/values-et/translations.xml b/features/login/impl/src/main/res/values-et/translations.xml
index 832b0a5b38..239a871a77 100644
--- a/features/login/impl/src/main/res/values-et/translations.xml
+++ b/features/login/impl/src/main/res/values-et/translations.xml
@@ -14,11 +14,11 @@
   <string name="screen_change_account_provider_subtitle">"Kasuta erinevat teenusepakkujat, milleks võib olla ka sinu oma server või töökoha hallatav server."</string>
   <string name="screen_change_account_provider_title">"Muuda teenusepakkujat"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Me ei suutnud luuaühendust selle koduserveriga. Palun kontrolli, kas koduserveri aadress on õige. Kui aadress on õige, siis täiendavat teavet oskab sulle anda koduserveri haldaja."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Sliding sync režiim pole saadaval vea tõttu well-known failis:
+  <string name="screen_change_server_error_invalid_well_known">"Server pole saadaval vea tõttu well-known failis:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"See koduserver hetkel ei toeta „Sliding sync“ režiimi"</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Valitud teenusepakkuja ei toeta „sliding sync“ režiimi. Rakenduse %1$s kasutamiseks on vaja serverit uuendada."</string>
   <string name="screen_change_server_form_header">"Koduserveri url"</string>
-  <string name="screen_change_server_form_notice">"Sa saad luua ühendust vaid olemasoleva serveriga, mis toetab Sliding sync režiimi. Sinu koduserveri haldur peaks selle seadistama. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Sisesta domeeni aadress."</string>
   <string name="screen_change_server_subtitle">"Mis on sinu koduserveri aadress?"</string>
   <string name="screen_change_server_title">"Vali oma server"</string>
   <string name="screen_create_account_title">"Loo kasutajakonto"</string>
diff --git a/features/login/impl/src/main/res/values-eu/translations.xml b/features/login/impl/src/main/res/values-eu/translations.xml
index 2abc6c823e..aad7020ab8 100644
--- a/features/login/impl/src/main/res/values-eu/translations.xml
+++ b/features/login/impl/src/main/res/values-eu/translations.xml
@@ -10,7 +10,6 @@
   <string name="screen_change_account_provider_other">"Beste bat"</string>
   <string name="screen_change_account_provider_subtitle">"Erabili beste kontu-hornitzaile bat, hala nola zure zerbitzari pribatua edo laneko kontu bat."</string>
   <string name="screen_change_account_provider_title">"Aldatu kontu-hornitzailea"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Zerbitzari hau ez da gaur-gaurkoz sliding sync-ekin bateragarria."</string>
   <string name="screen_change_server_form_header">"Zerbitzariaren URLa"</string>
   <string name="screen_change_server_subtitle">"Zein da zure zerbitzariaren helbidea?"</string>
   <string name="screen_change_server_title">"Hautatu zure zerbitzaria"</string>
diff --git a/features/login/impl/src/main/res/values-fa/translations.xml b/features/login/impl/src/main/res/values-fa/translations.xml
index 29ec79b9fd..1e7cfba770 100644
--- a/features/login/impl/src/main/res/values-fa/translations.xml
+++ b/features/login/impl/src/main/res/values-fa/translations.xml
@@ -13,9 +13,8 @@
   <string name="screen_change_account_provider_other">"دیگر"</string>
   <string name="screen_change_account_provider_subtitle">"استفاده از فراهم کنندهٔ حسابی دیگر چون کارساز خصوصی خوتان یا حسابی کاری."</string>
   <string name="screen_change_account_provider_title">"تغییر فراهم کنندهٔ حساب"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"این کارساز در حال حاضر از هم‌گام سازی اسلایدی پشتیبانی نمی‌کند."</string>
   <string name="screen_change_server_form_header">"نشانی کارساز خانگی"</string>
-  <string name="screen_change_server_form_notice">"تنها می‌توانید به کارسازهای موجودی که از هم‌گام سازی اسلاید پشتیبانی می‌کنند وصل شود. مدیر کارساز خانگیتان باید پیکربندیش کند. %1$s"</string>
+  <string name="screen_change_server_form_notice">"ورود نشانی دامنه."</string>
   <string name="screen_change_server_subtitle">"نشانی کارسازتان چیست؟"</string>
   <string name="screen_change_server_title">"کارسازتان را برگزینید"</string>
   <string name="screen_create_account_title">"ایجاد حساب"</string>
diff --git a/features/login/impl/src/main/res/values-fi/translations.xml b/features/login/impl/src/main/res/values-fi/translations.xml
index 37457a9958..505d777eec 100644
--- a/features/login/impl/src/main/res/values-fi/translations.xml
+++ b/features/login/impl/src/main/res/values-fi/translations.xml
@@ -16,9 +16,9 @@
   <string name="screen_change_server_error_invalid_homeserver">"Kotipalvelimeen ei saatu yhteyttä. Varmista, että olet syöttänyt osoitteen oikein. Jos osoite on oikein, ota yhteyttä palvelimesi ylläpitäjään."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync ei ole saatavilla well-known tiedostossa olevan ongelman vuoksi:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Tämä palvelin ei tällä hetkellä tue sliding syncia."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Valitsemasi palveluntarjoaja ei tue sliding syncia. Palvelimen päivitys tarvitaan %1$s -sovelluksen käyttämiseen."</string>
   <string name="screen_change_server_form_header">"Kotipalvelimen osoite"</string>
-  <string name="screen_change_server_form_notice">"Voit yhdistää vain olemassa olevaan palvelimeen, joka tukee sliding syncia. Kotipalvelimesi ylläpitäjän on otettava se käyttöön. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Anna verkkotunnuksen osoite."</string>
   <string name="screen_change_server_subtitle">"Mikä on palvelimesi osoite?"</string>
   <string name="screen_change_server_title">"Valitse palvelimesi"</string>
   <string name="screen_create_account_title">"Luo tili"</string>
diff --git a/features/login/impl/src/main/res/values-fr/translations.xml b/features/login/impl/src/main/res/values-fr/translations.xml
index 9bc76ef9d7..7154b3f5d1 100644
--- a/features/login/impl/src/main/res/values-fr/translations.xml
+++ b/features/login/impl/src/main/res/values-fr/translations.xml
@@ -16,9 +16,9 @@
   <string name="screen_change_server_error_invalid_homeserver">"Nous n’avons pas pu atteindre ce serveur d’accueil. Vérifiez que vous avez correctement saisi l’URL du serveur d’accueil. Si l’URL est correcte, contactez l’administrateur de votre serveur d’accueil pour obtenir de l’aide."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync n’est pas disponible en raison d’un problème dans le well-known file :
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Ce serveur ne prend actuellement pas en charge la synchronisation glissante."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Le fournisseur de compte sélectionné ne prend pas en charge le sliding sync. Une mise à jour du serveur est nécessaire pour pouvoir utiliser %1$s."</string>
   <string name="screen_change_server_form_header">"URL du serveur d’accueil"</string>
-  <string name="screen_change_server_form_notice">"Vous ne pouvez vous connecter qu’à un serveur existant qui prend en charge le sliding sync. L’administrateur de votre serveur d’accueil devra le configurer. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Saisissez une adresse de domaine."</string>
   <string name="screen_change_server_subtitle">"Quelle est l’adresse de votre serveur ?"</string>
   <string name="screen_change_server_title">"Choisissez votre serveur"</string>
   <string name="screen_create_account_title">"Créer un compte"</string>
diff --git a/features/login/impl/src/main/res/values-hu/translations.xml b/features/login/impl/src/main/res/values-hu/translations.xml
index d278d3a15a..809746f79e 100644
--- a/features/login/impl/src/main/res/values-hu/translations.xml
+++ b/features/login/impl/src/main/res/values-hu/translations.xml
@@ -16,9 +16,9 @@
   <string name="screen_change_server_error_invalid_homeserver">"Nem sikerült elérni ezt a Matrix-kiszolgálót. Ellenőrizze, hogy helyesen adta-e meg a Matrix-kiszolgáló webcímét. Ha a webcím helyes, akkor további segítségért lépjen kapcsolatba a Matrix-kiszolgáló adminisztrátorával."</string>
   <string name="screen_change_server_error_invalid_well_known">"A Sliding sync protokoll a well-known fájl problémája miatt nem érhető el:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"A kiszolgáló jelenleg nem támogatja a Sliding sync protokollt."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"A kiválasztott fiókszolgáltató nem támogatja a csúszóablakos szinkronizálást. Az %1$s használatához kiszolgálófrissítés szükséges."</string>
   <string name="screen_change_server_form_header">"Matrix-kiszolgáló webcíme"</string>
-  <string name="screen_change_server_form_notice">"Csak olyan meglévő kiszolgálóhoz csatlakozhat, amely támogatja a Sliding sync protokollt. Ezt a Matrix-kiszolgáló adminisztrátorának kell beállítania. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Adjon meg egy domaincímet."</string>
   <string name="screen_change_server_subtitle">"Mi a kiszolgálója címe?"</string>
   <string name="screen_change_server_title">"Válassza ki a kiszolgálóját"</string>
   <string name="screen_create_account_title">"Fiók létrehozása"</string>
diff --git a/features/login/impl/src/main/res/values-in/translations.xml b/features/login/impl/src/main/res/values-in/translations.xml
index 0ddc32c212..f089fa5ea8 100644
--- a/features/login/impl/src/main/res/values-in/translations.xml
+++ b/features/login/impl/src/main/res/values-in/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Kami tidak dapat menjangkau server ini. Periksa apakah Anda telah memasukkan URL homeserver dengan benar. Jika URL sudah benar, hubungi administrator homeserver Anda untuk bantuan lebih lanjut."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync tidak tersedia karena adanya masalah dalam berkas .well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Server ini saat ini tidak mendukung sinkronisasi geser."</string>
   <string name="screen_change_server_form_header">"URL Homeserver"</string>
-  <string name="screen_change_server_form_notice">"Anda hanya dapat terhubung ke server yang ada yang mendukung sinkronisasi geser. Admin homeserver Anda perlu mengaturnya. %1$s"</string>
   <string name="screen_change_server_subtitle">"Apa alamat server Anda?"</string>
   <string name="screen_change_server_title">"Pilih server Anda"</string>
   <string name="screen_create_account_title">"Buat akun"</string>
diff --git a/features/login/impl/src/main/res/values-it/translations.xml b/features/login/impl/src/main/res/values-it/translations.xml
index 5b82829b80..494d22a39c 100644
--- a/features/login/impl/src/main/res/values-it/translations.xml
+++ b/features/login/impl/src/main/res/values-it/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Non siamo riusciti a raggiungere questo homeserver. Verifica di aver inserito correttamente l\'URL. Se l\'URL è corretto, contatta l\'amministratore del homeserver per ulteriore assistenza."</string>
   <string name="screen_change_server_error_invalid_well_known">"La sliding sync non è disponibile per un problema nel file well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Questo server attualmente non supporta la sliding sync."</string>
   <string name="screen_change_server_form_header">"URL dell\'homeserver"</string>
-  <string name="screen_change_server_form_notice">"Puoi connetterti solo a un server esistente che supporta la sliding sync. L\'amministratore del tuo homeserver dovrà configurarla. %1$s"</string>
   <string name="screen_change_server_subtitle">"Qual è l\'indirizzo del tuo server?"</string>
   <string name="screen_change_server_title">"Seleziona il tuo server"</string>
   <string name="screen_create_account_title">"Crea account"</string>
@@ -52,7 +50,7 @@
 
 Prova ad accedere manualmente o scansiona il codice QR con un altro dispositivo."</string>
   <string name="screen_qr_code_login_error_linking_not_suported_title">"Codice QR non supportato"</string>
-  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Il tuo fornitore di account non supporta %1$s ."</string>
+  <string name="screen_qr_code_login_error_sliding_sync_not_supported_subtitle">"Il tuo fornitore di account non supporta %1$s."</string>
   <string name="screen_qr_code_login_error_sliding_sync_not_supported_title">"%1$s non supportato"</string>
   <string name="screen_qr_code_login_initial_state_button_title">"Pronto per la scansione"</string>
   <string name="screen_qr_code_login_initial_state_item_1">"Apri %1$s su un dispositivo desktop"</string>
diff --git a/features/login/impl/src/main/res/values-ka/translations.xml b/features/login/impl/src/main/res/values-ka/translations.xml
index b7cddcf7e7..a5dcbec300 100644
--- a/features/login/impl/src/main/res/values-ka/translations.xml
+++ b/features/login/impl/src/main/res/values-ka/translations.xml
@@ -15,9 +15,7 @@
   <string name="screen_change_account_provider_title">"შეცვალეთ ანგარიშის მომწოდებელი"</string>
   <string name="screen_change_server_error_invalid_homeserver">"ჩვენ ვერ მივაღწიეთ ამ სახლის სერვერს. გთხოვთ, შეამოწმოთ, რომ სწორად შეიყვანეთ სახლის სერვერის URL. თუ URL სწორია, დაუკავშირდით თქვენი სახლის სერვერის ადმინისტრატორს დამატებითი დახმარებისთვის."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync არ არის ხელმისაწვდომი well-known ფაილში პრობლემის გამო: %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"ამჟამად ეს სერვერი მხარს არ უჭერს \"sliding sync\"-ს."</string>
   <string name="screen_change_server_form_header">"სახლის სერვერის URL"</string>
-  <string name="screen_change_server_form_notice">"თქვენ შეგიძლიათ დაუკავშირდეთ მხოლოდ იმ სერვერს, რომელიც მხარს უჭერს \"sliding sync\"-ს. თქვენი სახლის სერვერის ადმინისტრატორს დასჭირდება მისი კონფიგურაცია.%1$s"</string>
   <string name="screen_change_server_subtitle">"რა არის თქვენი სერვერის მისამართი?"</string>
   <string name="screen_change_server_title">"აირჩიეთ თქვენი სერვერი"</string>
   <string name="screen_create_account_title">"ანგარიშის შექმნა"</string>
diff --git a/features/login/impl/src/main/res/values-lt/translations.xml b/features/login/impl/src/main/res/values-lt/translations.xml
index dcc959242b..192e8fbc70 100644
--- a/features/login/impl/src/main/res/values-lt/translations.xml
+++ b/features/login/impl/src/main/res/values-lt/translations.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_account_provider_change">"Keisti paskyros teikėją"</string>
+  <string name="screen_account_provider_form_subtitle">"Ieškokite bendrovės, bendruomenės arba privataus serverio."</string>
+  <string name="screen_account_provider_form_title">"Rasti paskyros teikėją"</string>
   <string name="screen_account_provider_signin_subtitle">"Čia bus saugomi Jūsų pokalbiai - panašiai kaip el. pašto paslaugų teikėjas saugo Jūsų el. laiškus."</string>
+  <string name="screen_account_provider_signin_title">"Ketinate prisijungti prie %s"</string>
   <string name="screen_account_provider_signup_subtitle">"Čia bus saugomi Jūsų pokalbiai - panašiai kaip el. pašto paslaugų teikėjas saugo Jūsų el. laiškus."</string>
+  <string name="screen_account_provider_signup_title">"Ketinate sukurti paskyrą teikėjoje %s"</string>
+  <string name="screen_change_account_provider_other">"Kita"</string>
+  <string name="screen_change_account_provider_subtitle">"Naudokite skirtingą paskyros teikėją, pavyzdžiui, savo privatų serverį arba darbo paskyrą."</string>
   <string name="screen_change_account_provider_title">"Keisti paskyros teikėją"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Nepavyko pasiekti šio serverio. Patikrinkite, ar teisingai įvedėte serverio URL. Jei URL yra teisingas, susisiekite su serverio administracija dėl tolimesnės pagalbos."</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Šiuo metu šis serveris nepalaiko slenkančios sinchronizacijos (sliding sync)."</string>
   <string name="screen_change_server_form_header">"Serverio URL"</string>
-  <string name="screen_change_server_form_notice">"Galite prisijungti tik prie serverio, palaikančio slenkančią sinchronizaciją (sliding sync). Jūsų serverio administracija turėtų ją sukonfigūruoti. %1$s"</string>
   <string name="screen_change_server_subtitle">"Koks yra Jūsų serverio adresas?"</string>
   <string name="screen_create_account_title">"Sukurti paskyrą"</string>
   <string name="screen_login_error_deactivated_account">"Ši paskyra buvo išjungta."</string>
diff --git a/features/login/impl/src/main/res/values-nb/translations.xml b/features/login/impl/src/main/res/values-nb/translations.xml
index 1ab5de35c9..552352c648 100644
--- a/features/login/impl/src/main/res/values-nb/translations.xml
+++ b/features/login/impl/src/main/res/values-nb/translations.xml
@@ -14,11 +14,11 @@
   <string name="screen_change_account_provider_subtitle">"Bruk en annen kontotilbyder, for eksempel din egen private server eller en arbeidskonto."</string>
   <string name="screen_change_account_provider_title">"Bytt kontotilbyder"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Vi kunne ikke nå denne hjemmeserveren. Kontroller at du har skrevet inn hjemmeserverens URL riktig. Hvis URL-en er riktig, kontakt administratoren for hjemmeserveren din for å få mer hjelp."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Glidende synkronisering er ikke tilgjengelig på grunn av et problem i den velkjente filen:
+  <string name="screen_change_server_error_invalid_well_known">"Serveren er ikke tilgjengelig på grunn av et problem i den velkjente filen:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Denne serveren støtter for øyeblikket ikke sliding sync."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Den valgte kontoleverandøren støtter ikke sliding sync. En oppgradering av serveren er nødvendig for å bruke %1$s."</string>
   <string name="screen_change_server_form_header">"URL til hjemmeserver"</string>
-  <string name="screen_change_server_form_notice">"Du kan bare koble til en eksisterende server som støtter sliding sync. Administrator for din hjemmeserver må konfigurere det. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Skriv inn en domeneadresse."</string>
   <string name="screen_change_server_subtitle">"Hva er adressen til serveren din?"</string>
   <string name="screen_change_server_title">"Velg din server"</string>
   <string name="screen_create_account_title">"Opprett konto"</string>
diff --git a/features/login/impl/src/main/res/values-nl/translations.xml b/features/login/impl/src/main/res/values-nl/translations.xml
index 4097408d55..edf9f4ad51 100644
--- a/features/login/impl/src/main/res/values-nl/translations.xml
+++ b/features/login/impl/src/main/res/values-nl/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"We konden deze homeserver niet bereiken. Controleer of je de homeserver-URL juist hebt ingevoerd. Als de URL juist is, neem dan contact op met de beheerder van je homeserver voor verdere hulp."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync is niet beschikbaar vanwege een probleem in het well-known bestand:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Deze server ondersteunt op dit moment geen sliding sync."</string>
   <string name="screen_change_server_form_header">"Homeserver-URL"</string>
-  <string name="screen_change_server_form_notice">"Je kunt alleen verbinding maken met een bestaande server die sliding sync ondersteunt. De beheerder van de homeserver moet dit configureren. %1$s"</string>
   <string name="screen_change_server_subtitle">"Wat is het adres van je server?"</string>
   <string name="screen_change_server_title">"Selecteer je server"</string>
   <string name="screen_create_account_title">"Account aanmaken"</string>
diff --git a/features/login/impl/src/main/res/values-pl/translations.xml b/features/login/impl/src/main/res/values-pl/translations.xml
index fc0ad2789c..3257b141cb 100644
--- a/features/login/impl/src/main/res/values-pl/translations.xml
+++ b/features/login/impl/src/main/res/values-pl/translations.xml
@@ -16,9 +16,9 @@
   <string name="screen_change_server_error_invalid_homeserver">"Nie mogliśmy połączyć się z tym serwerem domowym. Sprawdź, czy adres URL serwera został wprowadzony poprawnie. Jeśli adres URL jest poprawny, skontaktuj się z administratorem serwera w celu uzyskania dalszej pomocy."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync nie jest dostępny z powodu problemu w znanym pliku:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Ten serwer obecnie nie obsługuje technologii Sliding Sync."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Wybrany dostawca konta nie wspiera synchronizacji przesuwnej. Wymagana jest aktualizacja serwera %1$s."</string>
   <string name="screen_change_server_form_header">"URL serwera domowego"</string>
-  <string name="screen_change_server_form_notice">"Możesz połączyć się tylko z serwerem, który obsługuje technologię Sliding Sync. Administrator serwera domowego będzie musiał ją skonfigurować. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Wprowadź adres domeny."</string>
   <string name="screen_change_server_subtitle">"Jaki jest adres Twojego serwera?"</string>
   <string name="screen_change_server_title">"Wybierz swój serwer"</string>
   <string name="screen_create_account_title">"Utwórz konto"</string>
diff --git a/features/login/impl/src/main/res/values-pt-rBR/translations.xml b/features/login/impl/src/main/res/values-pt-rBR/translations.xml
index d4702ed3d8..5794b69f92 100644
--- a/features/login/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/login/impl/src/main/res/values-pt-rBR/translations.xml
@@ -14,9 +14,7 @@
   <string name="screen_change_account_provider_subtitle">"Use um provedor de conta diferente, como seu próprio servidor privado ou uma conta corporativa."</string>
   <string name="screen_change_account_provider_title">"Alterar provedor da conta"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Não conseguimos acessar esse servidor. Verifique se você inseriu a URL do servidor corretamente. Se a URL estiver correta, entre em contato com o administrador do servidor para obter mais ajuda."</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Este servidor atualmente não oferece suporte à tecnologia sliding sync."</string>
   <string name="screen_change_server_form_header">"URL do servidor"</string>
-  <string name="screen_change_server_form_notice">"Você só pode se conectar a um servidor existente que ofereça suporte à tecnologia sliding sync. O administrador do seu servidor precisará configurá-lo. %1$s"</string>
   <string name="screen_change_server_subtitle">"Qual é o endereço do seu servidor?"</string>
   <string name="screen_change_server_title">"Selecione seu servidor"</string>
   <string name="screen_create_account_title">"Criar conta"</string>
diff --git a/features/login/impl/src/main/res/values-pt/translations.xml b/features/login/impl/src/main/res/values-pt/translations.xml
index de06747232..dd67f9f19d 100644
--- a/features/login/impl/src/main/res/values-pt/translations.xml
+++ b/features/login/impl/src/main/res/values-pt/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Não foi possível comunicar com este servidor. Por favor, verifica se introduziste o seu URL corretamente. Se sim, contacta o administrador para obteres mais ajuda."</string>
   <string name="screen_change_server_error_invalid_well_known">"A sincronização deslizante (sliding sync) não está disponível devido a um problema no ficheiro \"well-known\":
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Este servidor não suporta sincronização deslizante (sliding sync)."</string>
   <string name="screen_change_server_form_header">"URL do servidor"</string>
-  <string name="screen_change_server_form_notice">"Só te podes ligar a um servidor existente que suporte a sincronização deslizante (sliding sync). O administrador do teu servidor terá de a configurar. %1$s"</string>
   <string name="screen_change_server_subtitle">"Qual é o endereço do teu servidor?"</string>
   <string name="screen_change_server_title">"Seleciona o teu servidor"</string>
   <string name="screen_create_account_title">"Criar conta"</string>
diff --git a/features/login/impl/src/main/res/values-ro/translations.xml b/features/login/impl/src/main/res/values-ro/translations.xml
index 01e0c1a821..65b7c90437 100644
--- a/features/login/impl/src/main/res/values-ro/translations.xml
+++ b/features/login/impl/src/main/res/values-ro/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Nu am putut accesa acest homeserver. Te rugăm să verifici că ai introdus corect adresa URL a homeserver-ului. Dacă adresa URL este corectă, contactează administratorul homeserver-ului pentru ajutor suplimentar."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync nu este disponibil din cauza unei probleme în fișierul well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Momentan acest server nu oferă suport pentru sliding sync."</string>
   <string name="screen_change_server_form_header">"Adresa URL a homeserver-ului"</string>
-  <string name="screen_change_server_form_notice">"Vă putețo conecta numai la un server existent care oferă suport pentru sliding sync. Administratorul homeserver-ului dumneavoastră va trebui să îl configureze. %1$s"</string>
   <string name="screen_change_server_subtitle">"Care este adresa serverului dumneavoastră?"</string>
   <string name="screen_change_server_title">"Selectați serverul dumneavoastra"</string>
   <string name="screen_create_account_title">"Creați un cont"</string>
diff --git a/features/login/impl/src/main/res/values-ru/translations.xml b/features/login/impl/src/main/res/values-ru/translations.xml
index 40a958e7ef..b41dbb66a6 100644
--- a/features/login/impl/src/main/res/values-ru/translations.xml
+++ b/features/login/impl/src/main/res/values-ru/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Нам не удалось связаться с этим домашним сервером. Убедитесь, что вы правильно ввели URL-адрес домашнего сервера. Если URL-адрес указан правильно, обратитесь к администратору домашнего сервера за дополнительной помощью."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync недоступен из-за проблемы в известном файле:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"К сожалению данный сервер не поддерживает sliding sync."</string>
   <string name="screen_change_server_form_header">"URL-адрес домашнего сервера"</string>
-  <string name="screen_change_server_form_notice">"Вы можете подключиться только к существующему серверу, поддерживающему sliding sync. Администратору домашнего сервера потребуется настроить его. %1$s"</string>
   <string name="screen_change_server_subtitle">"Какой адрес у вашего сервера?"</string>
   <string name="screen_change_server_title">"Выберите свой сервер"</string>
   <string name="screen_create_account_title">"Создать учетную запись"</string>
diff --git a/features/login/impl/src/main/res/values-sk/translations.xml b/features/login/impl/src/main/res/values-sk/translations.xml
index d4a5717360..e30db40146 100644
--- a/features/login/impl/src/main/res/values-sk/translations.xml
+++ b/features/login/impl/src/main/res/values-sk/translations.xml
@@ -14,11 +14,11 @@
   <string name="screen_change_account_provider_subtitle">"Použite iného poskytovateľa účtu, ako napríklad vlastný súkromný server alebo pracovný účet."</string>
   <string name="screen_change_account_provider_title">"Zmeniť poskytovateľa účtu"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Nemohli sme sa spojiť s týmto domovským serverom. Skontrolujte prosím, či ste zadali URL adresu domovského servera správne. Ak je adresa URL správna, kontaktujte svoj domovský server pre ďalšiu pomoc."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Posuvná synchronizácia nie je k dispozícii z dôvodu problému v známom súbore:
+  <string name="screen_change_server_error_invalid_well_known">"Server nie je k dispozícii kvôli problému v známom súbore:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Tento server momentálne nepodporuje kĺzavú synchronizáciu."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"Vybraný poskytovateľ účtu nepodporuje kĺzavú synchronizáciu. Na používanie aplikácie %1$s je potrebná aktualizácia servera,"</string>
   <string name="screen_change_server_form_header">"Adresa URL domovského servera"</string>
-  <string name="screen_change_server_form_notice">"Môžete sa pripojiť iba k existujúcemu serveru, ktorý podporuje kĺzavú synchronizáciu. Správca domovského servera ju bude musieť nakonfigurovať. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Zadajte adresu domény."</string>
   <string name="screen_change_server_subtitle">"Aká je adresa vášho servera?"</string>
   <string name="screen_change_server_title">"Vyberte svoj server"</string>
   <string name="screen_create_account_title">"Vytvoriť účet"</string>
diff --git a/features/login/impl/src/main/res/values-sv/translations.xml b/features/login/impl/src/main/res/values-sv/translations.xml
index b63ab01183..69523b21fa 100644
--- a/features/login/impl/src/main/res/values-sv/translations.xml
+++ b/features/login/impl/src/main/res/values-sv/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Vi kunde inte nå den här hemservern. Kontrollera att du har angett hemserverns URL korrekt. Om URL:en är korrekt kontaktar du administratören för hemservern för ytterligare hjälp."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding Sync är inte tillgängligt på grund av ett problem i well-known-filen:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Den här servern stöder för närvarande inte sliding sync."</string>
   <string name="screen_change_server_form_header">"Hemserverns URL"</string>
-  <string name="screen_change_server_form_notice">"Du kan bara ansluta till en befintlig server som stöder sliding sync. Din hemserveradministratör måste konfigurera det. %1$s"</string>
   <string name="screen_change_server_subtitle">"Vad är adressen till din server?"</string>
   <string name="screen_change_server_title">"Välj din server"</string>
   <string name="screen_create_account_title">"Skapa konto"</string>
diff --git a/features/login/impl/src/main/res/values-tr/translations.xml b/features/login/impl/src/main/res/values-tr/translations.xml
index 746163a0e7..07b84e1f5c 100644
--- a/features/login/impl/src/main/res/values-tr/translations.xml
+++ b/features/login/impl/src/main/res/values-tr/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Bu ana sunucuya ulaşamadık. Lütfen ana sunucu URL\'sini doğru girip girmediğinizi kontrol edin. URL doğruysa, daha fazla yardım için ana sunucu yöneticinize başvurun."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync, iyi bilinen dosyadaki bir sorun nedeniyle kullanılamıyor:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Bu sunucu şu anda sliding sync desteklemiyor."</string>
   <string name="screen_change_server_form_header">"Ana sunucu URL\'si"</string>
-  <string name="screen_change_server_form_notice">"Yalnızca sliding sync destekleyen mevcut bir sunucuya bağlanabilirsiniz. Ana sunucu yöneticinizin bunu yapılandırması gerekecektir. %1$s"</string>
   <string name="screen_change_server_subtitle">"Sunucunuzun adresi nedir?"</string>
   <string name="screen_change_server_title">"Sunucunuzu seçin"</string>
   <string name="screen_create_account_title">"Hesap oluştur"</string>
diff --git a/features/login/impl/src/main/res/values-uk/translations.xml b/features/login/impl/src/main/res/values-uk/translations.xml
index 0fa0be9868..57cc379323 100644
--- a/features/login/impl/src/main/res/values-uk/translations.xml
+++ b/features/login/impl/src/main/res/values-uk/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"Не вдалося під\'єднатися до цього домашнього сервера. Перевірте правильність введеної URL-адреси домашнього сервера. Якщо URL-адреса правильна, зверніться по додаткову допомогу до адміністратора домашнього сервера."</string>
   <string name="screen_change_server_error_invalid_well_known">"Sliding sync недоступний через проблему у файлі well-known:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Наразі цей сервер не підтримує sliding sync."</string>
   <string name="screen_change_server_form_header">"URL-адреса домашнього сервера"</string>
-  <string name="screen_change_server_form_notice">"Ви можете під\'єднатися лише до наявного сервера, який підтримує sliding sync. Адміністратор вашого домашнього сервера повинен буде налаштувати його. %1$s"</string>
   <string name="screen_change_server_subtitle">"Яка адреса вашого сервера?"</string>
   <string name="screen_change_server_title">"Виберіть свій сервер"</string>
   <string name="screen_create_account_title">"Створити обліковий запис"</string>
diff --git a/features/login/impl/src/main/res/values-uz/translations.xml b/features/login/impl/src/main/res/values-uz/translations.xml
index d3f1af3ea7..6994a30643 100644
--- a/features/login/impl/src/main/res/values-uz/translations.xml
+++ b/features/login/impl/src/main/res/values-uz/translations.xml
@@ -14,9 +14,7 @@
   <string name="screen_change_account_provider_subtitle">"Shaxsiy serveringiz yoki ishchi hisob qaydnomangiz kabi boshqa hisob provayderidan foydalaning."</string>
   <string name="screen_change_account_provider_title">"Hisob provayderini o\'zgartiring"</string>
   <string name="screen_change_server_error_invalid_homeserver">"Bu uy serveriga kira olmadik. Iltimos, uy serverining URL manzilini to\'ri kiritganingizni tekshiring. Agar URL toʻgʻri boʻlsa, qoʻshimcha yordam olish uchun uy serveri administratoriga murojaat qiling."</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"Hozirda bu server siljish sinxronlashni qo‘llab-quvvatlamaydi."</string>
   <string name="screen_change_server_form_header">"Uy serverining URL manzili"</string>
-  <string name="screen_change_server_form_notice">"Siz faqat siljish sinxronlashni qo\'llab-quvvatlaydigan mavjud serverga ulanishingiz mumkin. Uy serveringiz administratori uni sozlashi kerak.%1$s"</string>
   <string name="screen_change_server_subtitle">"Serveringizning manzili nima?"</string>
   <string name="screen_change_server_title">"Serveringizni tanlang"</string>
   <string name="screen_create_account_title">"Hisob yaratish"</string>
diff --git a/features/login/impl/src/main/res/values-zh-rTW/translations.xml b/features/login/impl/src/main/res/values-zh-rTW/translations.xml
index a87d1c2094..2ca9e3737a 100644
--- a/features/login/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/login/impl/src/main/res/values-zh-rTW/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"我們無法連線至此家伺服器。請檢查您是否已正確輸入家伺服器 URL。若 URL 正確，請聯絡您家伺服器的管理員以取得進一步協助。"</string>
   <string name="screen_change_server_error_invalid_well_known">"因為 well-known 檔案的問題，無法使用 sliding sync：
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"此伺服器目前不支援滑動同步（sliding sync）。"</string>
   <string name="screen_change_server_form_header">"家伺服器 URL"</string>
-  <string name="screen_change_server_form_notice">"您僅能連線至支援 sliding sync 的既有伺服器。您的家伺服器管理員必須設定它。%1$s"</string>
   <string name="screen_change_server_subtitle">"您的伺服器地址？"</string>
   <string name="screen_change_server_title">"選擇您的伺服器"</string>
   <string name="screen_create_account_title">"建立帳號"</string>
diff --git a/features/login/impl/src/main/res/values-zh/translations.xml b/features/login/impl/src/main/res/values-zh/translations.xml
index c23bb10f9f..6b9e9af591 100644
--- a/features/login/impl/src/main/res/values-zh/translations.xml
+++ b/features/login/impl/src/main/res/values-zh/translations.xml
@@ -16,9 +16,7 @@
   <string name="screen_change_server_error_invalid_homeserver">"我们无法访问此服务器。请检查您输入的服务器网址是否正确。如果 URL 正确，请联系您的服务器管理员寻求进一步帮助。"</string>
   <string name="screen_change_server_error_invalid_well_known">"由于 Well Known 文件中的问题，Sliding Sync 不可用：
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"该服务器目前不支持 Sliding Sync。"</string>
   <string name="screen_change_server_form_header">"服务器网址"</string>
-  <string name="screen_change_server_form_notice">"您只能连接到支持 Sliding Sync 的现有服务器。您的服务器管理员需要对其进行配置。%1$s"</string>
   <string name="screen_change_server_subtitle">"您的服务器地址是什么？"</string>
   <string name="screen_change_server_title">"选择服务器"</string>
   <string name="screen_create_account_title">"创建账户"</string>
diff --git a/features/login/impl/src/main/res/values/localazy.xml b/features/login/impl/src/main/res/values/localazy.xml
index be01bd56d5..3c5702ba94 100644
--- a/features/login/impl/src/main/res/values/localazy.xml
+++ b/features/login/impl/src/main/res/values/localazy.xml
@@ -14,11 +14,11 @@
   <string name="screen_change_account_provider_subtitle">"Use a different account provider, such as your own private server or a work account."</string>
   <string name="screen_change_account_provider_title">"Change account provider"</string>
   <string name="screen_change_server_error_invalid_homeserver">"We couldn\'t reach this homeserver. Please check that you have entered the homeserver URL correctly. If the URL is correct, contact your homeserver administrator for further help."</string>
-  <string name="screen_change_server_error_invalid_well_known">"Sliding sync isn\'t available due to an issue in the well-known file:
+  <string name="screen_change_server_error_invalid_well_known">"Server isn\'t available due to an issue in the well-known file:
 %1$s"</string>
-  <string name="screen_change_server_error_no_sliding_sync_message">"This server currently doesn’t support sliding sync."</string>
+  <string name="screen_change_server_error_no_sliding_sync_message">"The selected account provider does not support sliding sync. An upgrade to the server is needed to use %1$s."</string>
   <string name="screen_change_server_form_header">"Homeserver URL"</string>
-  <string name="screen_change_server_form_notice">"You can only connect to an existing server that supports sliding sync. Your homeserver admin will need to configure it. %1$s"</string>
+  <string name="screen_change_server_form_notice">"Enter a domain address."</string>
   <string name="screen_change_server_subtitle">"What is the address of your server?"</string>
   <string name="screen_change_server_title">"Select your server"</string>
   <string name="screen_create_account_title">"Create account"</string>
diff --git a/features/logout/impl/src/main/res/values-cy/translations.xml b/features/logout/impl/src/main/res/values-cy/translations.xml
index 6a915509b2..d476bb69c9 100644
--- a/features/logout/impl/src/main/res/values-cy/translations.xml
+++ b/features/logout/impl/src/main/res/values-cy/translations.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signout_confirmation_dialog_content">"Ydych chi\'n siŵr eich bod am allgofnodi?"</string>
   <string name="screen_signout_confirmation_dialog_submit">"Allgofnodi"</string>
   <string name="screen_signout_confirmation_dialog_title">"Allgofnodi"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Yn allgofnodi…"</string>
+  <string name="screen_signout_key_backup_disabled_subtitle">"Rydych chi ar fin allgofnodi o\'ch sesiwn ddiwethaf. Os byddwch yn allgofnodi nawr, byddwch yn colli mynediad i\'ch negeseuon wedi\'u hamgryptio."</string>
+  <string name="screen_signout_key_backup_disabled_title">"Rydych chi wedi diffodd copïo wrth gefn"</string>
+  <string name="screen_signout_key_backup_offline_subtitle">"Roedd eich allweddi yn dal i gael eu copïo wrth gefn pan aethoch all-lein. Ailgysylltwch fel bod modd gwneud copi wrth gefn o\'ch allweddi cyn allgofnodi."</string>
+  <string name="screen_signout_key_backup_offline_title">"Mae eich allweddi yn dal i gael eu copïo wrth gefn"</string>
+  <string name="screen_signout_key_backup_ongoing_subtitle">"Arhoswch iddo gael ei gwblhau cyn allgofnodi."</string>
+  <string name="screen_signout_key_backup_ongoing_title">"Mae eich allweddi yn dal i gael eu copïo wrth gefn"</string>
   <string name="screen_signout_preference_item">"Allgofnodi"</string>
+  <string name="screen_signout_recovery_disabled_subtitle">"Rydych chi ar fin allgofnodi o\'ch sesiwn ddiwethaf. Os byddwch yn allgofnodi nawr, byddwch yn colli mynediad i\'ch negeseuon wedi\'u hamgryptio."</string>
+  <string name="screen_signout_recovery_disabled_title">"Adfer heb ei osod"</string>
+  <string name="screen_signout_save_recovery_key_subtitle">"Rydych chi ar fin allgofnodi o\'ch sesiwn ddiwethaf. Os ydych chi\'n allgofnodi nawr, efallai y byddwch chi\'n colli mynediad i\'ch negeseuon wedi\'u hamgryptio."</string>
+  <string name="screen_signout_save_recovery_key_title">"Ydych chi wedi cadw\'ch allwedd adfer?"</string>
 </resources>
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
index 6feaa23b62..8f97b6bc19 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
@@ -69,7 +69,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.alias.matches
 import io.element.android.libraries.matrix.api.room.joinedRoomMembers
 import io.element.android.libraries.matrix.api.timeline.Timeline
@@ -101,7 +101,7 @@ class MessagesFlowNode @AssistedInject constructor(
     private val mediaViewerEntryPoint: MediaViewerEntryPoint,
     private val analyticsService: AnalyticsService,
     private val locationService: LocationService,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val roomMemberProfilesCache: RoomMemberProfilesCache,
     private val roomNamesCache: RoomNamesCache,
     private val mentionSpanUpdater: MentionSpanUpdater,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
index 4ea6a1c9d3..d2d4b1c705 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -53,7 +53,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.alias.matches
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.mediaplayer.api.MediaPlayer
@@ -67,7 +67,7 @@ class MessagesNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val coroutineScope: CoroutineScope,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val analyticsService: AnalyticsService,
     messageComposerPresenterFactory: MessageComposerPresenter.Factory,
     timelinePresenterFactory: TimelinePresenter.Factory,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index b5a1842212..8bf5d330d7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -65,10 +65,10 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.powerlevels.canPinUnpin
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
@@ -90,7 +90,7 @@ import timber.log.Timber
 
 class MessagesPresenter @AssistedInject constructor(
     @Assisted private val navigator: MessagesNavigator,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     @Assisted private val composerPresenter: Presenter<MessageComposerState>,
     private val voiceMessageComposerPresenter: Presenter<VoiceMessageComposerState>,
     @Assisted private val timelinePresenter: Presenter<TimelineState>,
@@ -279,7 +279,7 @@ class MessagesPresenter @AssistedInject constructor(
         }
     }
 
-    private fun MatrixRoomInfo.avatarData(): AvatarData {
+    private fun RoomInfo.avatarData(): AvatarData {
         return AvatarData(
             id = id.value,
             name = name,
@@ -288,7 +288,7 @@ class MessagesPresenter @AssistedInject constructor(
         )
     }
 
-    private fun MatrixRoomInfo.heroes(): List<AvatarData> {
+    private fun RoomInfo.heroes(): List<AvatarData> {
         return heroes.map { user ->
             user.getAvatarData(size = AvatarSize.TimelineRoom)
         }
@@ -382,8 +382,8 @@ class MessagesPresenter @AssistedInject constructor(
         inviteProgress.value = AsyncData.Loading()
         runCatching {
             val memberList = when (val memberState = room.membersStateFlow.value) {
-                is MatrixRoomMembersState.Ready -> memberState.roomMembers
-                is MatrixRoomMembersState.Error -> memberState.prevRoomMembers.orEmpty()
+                is RoomMembersState.Ready -> memberState.roomMembers
+                is RoomMembersState.Error -> memberState.prevRoomMembers.orEmpty()
                 else -> emptyList()
             }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
index 2ca03e09ea..ee4f278366 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt
@@ -43,7 +43,7 @@ import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -63,7 +63,7 @@ class DefaultActionListPresenter @AssistedInject constructor(
     private val postProcessor: TimelineItemActionPostProcessor,
     private val appPreferencesStore: AppPreferencesStore,
     private val isPinnedMessagesFeatureEnabled: IsPinnedMessagesFeatureEnabled,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val userSendFailureFactory: VerifiedUserSendFailureFactory,
     private val featureFlagService: FeatureFlagService,
     private val dateFormatter: DateFormatter,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
index 4e37f34559..7b5f07649b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenter.kt
@@ -14,7 +14,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.ui.room.observeRoomMemberIdentityStateChange
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.CoroutineScope
@@ -23,7 +23,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class IdentityChangeStatePresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val encryptionService: EncryptionService,
 ) : Presenter<IdentityChangeState> {
     @Composable
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
index c1fe6fffb5..1052332403 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/VerifiedUserSendFailureFactory.kt
@@ -7,12 +7,12 @@
 
 package io.element.android.features.messages.impl.crypto.sendfailure
 
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import javax.inject.Inject
 
 class VerifiedUserSendFailureFactory @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
 ) {
     suspend fun create(
         sendState: LocalEventSendState?,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
index e947af8346..0373002f7e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenter.kt
@@ -19,13 +19,13 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class ResolveVerifiedUserSendFailurePresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val verifiedUserSendFailureFactory: VerifiedUserSendFailureFactory,
 ) : Presenter<ResolveVerifiedUserSendFailureState> {
     @Composable
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
index 29d6d7a186..166ce212dd 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/VerifiedUserSendFailureResolver.kt
@@ -10,7 +10,7 @@ package io.element.android.features.messages.impl.crypto.sendfailure.resolve
 import androidx.compose.runtime.mutableStateOf
 import io.element.android.libraries.matrix.api.core.SendHandle
 import io.element.android.libraries.matrix.api.core.TransactionId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import timber.log.Timber
 
@@ -21,7 +21,7 @@ import timber.log.Timber
  * This way, the user can resolve and resend the message for each user concerned, one by one.
  */
 class VerifiedUserSendFailureResolver(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val transactionId: TransactionId,
     private val sendHandle: SendHandle,
     private val iterator: VerifiedUserSendFailureIterator,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
index cd9d55b281..b850e7b559 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/draft/MatrixComposerDraftStore.kt
@@ -21,7 +21,7 @@ class MatrixComposerDraftStore @Inject constructor(
     private val client: MatrixClient,
 ) : ComposerDraftStore {
     override suspend fun loadDraft(roomId: RoomId): ComposerDraft? {
-        return client.getRoom(roomId)?.let { room ->
+        return client.getRoom(roomId)?.use { room ->
             room.loadComposerDraft()
                 .onFailure {
                     Timber.e(it, "Failed to load composer draft for room $roomId")
@@ -35,7 +35,7 @@ class MatrixComposerDraftStore @Inject constructor(
     }
 
     override suspend fun updateDraft(roomId: RoomId, draft: ComposerDraft?) {
-        client.getRoom(roomId)?.let { room ->
+        client.getRoom(roomId)?.use { room ->
             val updateDraftResult = if (draft == null) {
                 room.clearComposerDraft()
             } else {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
index 32142734e1..11bb0868e7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
@@ -49,7 +49,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.room.IntentionalMention
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
 import io.element.android.libraries.matrix.api.room.isDm
@@ -98,7 +98,7 @@ import io.element.android.libraries.core.mimetype.MimeTypes.Any as AnyMimeTypes
 class MessageComposerPresenter @AssistedInject constructor(
     @Assisted private val navigator: MessagesNavigator,
     private val appCoroutineScope: CoroutineScope,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val mediaPickerProvider: PickerProvider,
     private val featureFlagService: FeatureFlagService,
     private val sessionPreferencesStore: SessionPreferencesStore,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
index 3b0e9a236a..5055d09a3b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessor.kt
@@ -9,8 +9,8 @@ package io.element.android.features.messages.impl.messagecomposer.suggestions
 
 import io.element.android.libraries.core.data.filterUpTo
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.textcomposer.mentions.ResolvedSuggestion
@@ -33,7 +33,7 @@ class SuggestionsProcessor @Inject constructor() {
      */
     suspend fun process(
         suggestion: Suggestion?,
-        roomMembersState: MatrixRoomMembersState,
+        roomMembersState: RoomMembersState,
         roomAliasSuggestions: List<RoomAliasSuggestion>,
         currentUserId: UserId,
         canSendRoomMention: suspend () -> Boolean,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt
index 1135dcb2d6..5210631409 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/PinnedEventsTimelineProvider.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
@@ -33,7 +33,7 @@ import javax.inject.Inject
 
 @SingleIn(RoomScope::class)
 class PinnedEventsTimelineProvider @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val syncService: SyncService,
     private val featureFlagService: FeatureFlagService,
     private val dispatchers: CoroutineDispatchers,
@@ -62,6 +62,7 @@ class PinnedEventsTimelineProvider @Inject constructor(
                 }
             }
             .launchIn(scope)
+            .invokeOnCompletion { timelineStateFlow.value.dataOrNull()?.close() }
     }
 
     private suspend fun onActive() = coroutineScope {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
index 2a446df0e8..21a137b363 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenter.kt
@@ -20,7 +20,7 @@ import androidx.compose.runtime.setValue
 import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProvider
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 class PinnedMessagesBannerPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val itemFactory: PinnedMessagesBannerItemFactory,
     private val pinnedEventsTimelineProvider: PinnedEventsTimelineProvider,
 ) : Presenter<PinnedMessagesBannerState> {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
index bb88c32f5f..82f98724f1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt
@@ -38,7 +38,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.canPinUnpin
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
@@ -60,7 +60,7 @@ import timber.log.Timber
 
 class PinnedMessagesListPresenter @AssistedInject constructor(
     @Assisted private val navigator: PinnedMessagesListNavigator,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     timelineItemsFactoryCreator: TimelineItemsFactory.Creator,
     private val timelineProvider: PinnedEventsTimelineProvider,
     private val timelineProtectionPresenter: Presenter<TimelineProtectionState>,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
index 471641e6a5..538d9ce25a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenter.kt
@@ -25,13 +25,13 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 class ReportMessagePresenter @AssistedInject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     @Assisted private val inputs: Inputs,
     private val snackbarDispatcher: SnackbarDispatcher,
 ) : Presenter<ReportMessageState> {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
index 985d4f6076..4800d64c9b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
@@ -42,7 +42,7 @@ import javax.inject.Inject
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class, boundType = TimelineProvider::class)
 class TimelineController @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
 ) : Closeable, TimelineProvider {
     private val coroutineScope = CoroutineScope(SupervisorJob())
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index 6ac01c990b..3be27fe7d0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -28,6 +28,7 @@ import io.element.android.features.messages.impl.timeline.factories.TimelineItem
 import io.element.android.features.messages.impl.timeline.factories.TimelineItemsFactoryConfig
 import io.element.android.features.messages.impl.timeline.model.NewEventState
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemTypingNotificationModel
 import io.element.android.features.messages.impl.typing.TypingNotificationState
 import io.element.android.features.messages.impl.voicemessages.timeline.RedactedVoiceMessageManager
 import io.element.android.features.poll.api.actions.EndPollAction
@@ -38,7 +39,7 @@ import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.roomMembers
@@ -62,7 +63,7 @@ const val FOCUS_ON_PINNED_EVENT_DEBOUNCE_DURATION_IN_MILLIS = 200L
 
 class TimelinePresenter @AssistedInject constructor(
     timelineItemsFactoryCreator: TimelineItemsFactory.Creator,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val dispatchers: CoroutineDispatchers,
     private val appScope: CoroutineScope,
     @Assisted private val navigator: MessagesNavigator,
@@ -131,7 +132,7 @@ class TimelinePresenter @AssistedInject constructor(
                         if (event.firstIndex == 0) {
                             newEventState.value = NewEventState.None
                         }
-                        println("## sendReadReceiptIfNeeded firstVisibleIndex: ${event.firstIndex}")
+                        Timber.d("## sendReadReceiptIfNeeded firstVisibleIndex: ${event.firstIndex}")
                         appScope.sendReadReceiptIfNeeded(
                             firstVisibleIndex = event.firstIndex,
                             timelineItems = timelineItems,
@@ -278,7 +279,10 @@ class TimelinePresenter @AssistedInject constructor(
         if (newEventState.value == NewEventState.FromMe) {
             return@withContext
         }
-        val newMostRecentItem = timelineItems.firstOrNull()
+        val newMostRecentItem = timelineItems.firstOrNull {
+            // Ignore typing item
+            (it as? TimelineItem.Virtual)?.model !is TimelineItemTypingNotificationModel
+        }
         val prevMostRecentItemIdValue = prevMostRecentItemId.value
         val newMostRecentItemId = newMostRecentItem?.identifier()
         val hasNewEvent = prevMostRecentItemIdValue != null &&
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
index 6e677e5984..c64eec9bee 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
@@ -286,11 +286,16 @@ private fun BoxScope.TimelineScrollHelper(
     }
     var jumpToLiveHandled by remember { mutableStateOf(true) }
 
-    fun scrollToBottom() {
+    /**
+     * @param force If true, scroll to the bottom even if the user is already seeing the most recent item.
+     * This fixes the issue where the user is seeing typing notification and so the read receipt is not sent
+     * when a new message comes in.
+     */
+    fun scrollToBottom(force: Boolean) {
         coroutineScope.launch {
             if (lazyListState.firstVisibleItemIndex > 10) {
                 lazyListState.scrollToItem(0)
-            } else if (lazyListState.firstVisibleItemIndex != 0) {
+            } else if (force || lazyListState.firstVisibleItemIndex != 0) {
                 lazyListState.animateScrollToItem(0)
             }
         }
@@ -298,7 +303,7 @@ private fun BoxScope.TimelineScrollHelper(
 
     fun jumpToBottom() {
         if (isLive) {
-            scrollToBottom()
+            scrollToBottom(force = false)
         } else {
             jumpToLiveHandled = false
             onJumpToLive()
@@ -321,9 +326,10 @@ private fun BoxScope.TimelineScrollHelper(
     }
 
     LaunchedEffect(canAutoScroll, newEventState) {
-        val shouldScrollToBottom = isScrollFinished && (canAutoScroll || newEventState == NewEventState.FromMe)
+        val shouldScrollToBottom = isScrollFinished &&
+            (canAutoScroll && newEventState == NewEventState.FromOther || newEventState == NewEventState.FromMe)
         if (shouldScrollToBottom) {
-            scrollToBottom()
+            scrollToBottom(force = true)
         }
     }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
index 648f3254e5..a5c7eb89be 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenter.kt
@@ -15,7 +15,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -24,7 +24,7 @@ import kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject
 
 class ReactionSummaryPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
 ) : Presenter<ReactionSummaryState> {
     @Composable
     override fun present(): ReactionSummaryState {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
index b04ee1f176..00cde0f880 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenter.kt
@@ -13,19 +13,18 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
 import io.element.android.libraries.matrix.api.media.isPreviewEnabled
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import kotlinx.collections.immutable.toImmutableSet
 import javax.inject.Inject
 
 class TimelineProtectionPresenter @Inject constructor(
     private val appPreferencesStore: AppPreferencesStore,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
 ) : Presenter<TimelineProtectionState> {
     private val allowedEvents = mutableStateOf<Set<EventId>>(setOf())
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
index 4dfc02a2a1..7d293055a2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenter.kt
@@ -18,7 +18,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 class TypingNotificationPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val sessionPreferencesStore: SessionPreferencesStore,
 ) : Presenter<TypingNotificationState> {
     @Composable
diff --git a/features/messages/impl/src/main/res/values-cy/translations.xml b/features/messages/impl/src/main/res/values-cy/translations.xml
index 7d35b11de9..9cf82d6522 100644
--- a/features/messages/impl/src/main/res/values-cy/translations.xml
+++ b/features/messages/impl/src/main/res/values-cy/translations.xml
@@ -9,16 +9,58 @@
   <string name="emoji_picker_category_places">"Teithio a Llefydd"</string>
   <string name="emoji_picker_category_symbols">"Symbolau"</string>
   <string name="screen_report_content_block_user">"Rhwystro defnyddiwr"</string>
+  <string name="screen_report_content_block_user_hint">"Gwiriwch a ydych am guddio\'r holl negeseuon presennol ac yn y dyfodol gan y defnyddiwr hwn"</string>
+  <string name="screen_report_content_explanation">"Bydd y neges hon yn cael ei hadrodd i weinyddwr eich gweinyddwr cartref. Fyddan nhw ddim yn gallu darllen unrhyw negeseuon wedi\'u hamgryptio."</string>
+  <string name="screen_report_content_hint">"Rheswm dros adrodd am y cynnwys hwn"</string>
   <string name="screen_room_attachment_source_camera">"Camera"</string>
   <string name="screen_room_attachment_source_camera_photo">"Cymryd llun"</string>
+  <string name="screen_room_attachment_source_camera_video">"Recordio fideo"</string>
   <string name="screen_room_attachment_source_files">"Atodiad"</string>
+  <string name="screen_room_attachment_source_gallery">"Llyfrgell Ffotograffau a Fideo"</string>
   <string name="screen_room_attachment_source_location">"Lleoliad"</string>
   <string name="screen_room_attachment_source_poll">"Pôl"</string>
+  <string name="screen_room_attachment_text_formatting">"Fformatio Testun"</string>
+  <string name="screen_room_encrypted_history_banner">"Nid yw hanes negeseuon ar gael ar hyn o bryd."</string>
+  <string name="screen_room_encrypted_history_banner_unverified">"Nid yw hanes negeseuon ar gael yn yr ystafell hon. Dilyswch y ddyfais hon i weld hanes eich neges."</string>
+  <string name="screen_room_invite_again_alert_message">"Hoffech chi eu gwahodd yn ôl?"</string>
+  <string name="screen_room_invite_again_alert_title">"Rydych chi ar eich pen eich hun yn y sgwrs hon"</string>
   <string name="screen_room_mentions_at_room_subtitle">"Rhowch wybod i\'r ystafell gyfan"</string>
   <string name="screen_room_mentions_at_room_title">"Pawb"</string>
+  <string name="screen_room_retry_send_menu_send_again_action">"Anfon eto"</string>
+  <string name="screen_room_retry_send_menu_title">"Methodd eich neges ag anfon"</string>
+  <string name="screen_room_timeline_add_reaction">"Ychwanegu emoji"</string>
+  <string name="screen_room_timeline_beginning_of_room">"Dyma ddechrau %1$s."</string>
+  <string name="screen_room_timeline_beginning_of_room_no_name">"Dyma ddechrau\'r sgwrs hon."</string>
+  <string name="screen_room_timeline_legacy_call">"Galwad heb ei chefnogi. Gofynnwch a all y galwr ddefnyddio\'r ap Element X newydd."</string>
   <string name="screen_room_timeline_less_reactions">"Dangos llai"</string>
+  <string name="screen_room_timeline_message_copied">"Neges wedi\'i chopïo"</string>
+  <string name="screen_room_timeline_no_permission_to_post">"Does gennych chi ddim caniatâd i bostio i\'r ystafell hon"</string>
   <string name="screen_room_timeline_reactions_show_less">"Dangos llai"</string>
   <string name="screen_room_timeline_reactions_show_more">"Dangos rhagor"</string>
   <string name="screen_room_timeline_read_marker_title">"Newydd"</string>
+  <plurals name="screen_room_timeline_state_changes">
+    <item quantity="zero">"%1$d newid ystafelloedd"</item>
+    <item quantity="one">"%1$d newid ystafell"</item>
+    <item quantity="two">"%1$d newid ystafell"</item>
+    <item quantity="few">"%1$d newid ystafell"</item>
+    <item quantity="many">"%1$d newid ystafell"</item>
+    <item quantity="other">"%1$d newid ystafell"</item>
+  </plurals>
+  <plurals name="screen_room_typing_many_members">
+    <item quantity="zero">"%1$s, %2$s a %3$d arall"</item>
+    <item quantity="one">"%1$s, %2$s a %3$d arall"</item>
+    <item quantity="two">"%1$s, %2$s a %3$d arall"</item>
+    <item quantity="few">"%1$s, %2$s a %3$d arall"</item>
+    <item quantity="many">"%1$s, %2$s a %3$d arall"</item>
+    <item quantity="other">"%1$s, %2$s a %3$d arall"</item>
+  </plurals>
+  <plurals name="screen_room_typing_notification">
+    <item quantity="zero">"Mae %1$s yn teipio"</item>
+    <item quantity="one">"Mae %1$s yn teipio"</item>
+    <item quantity="two">"Mae %1$s yn teipio"</item>
+    <item quantity="few">"Mae %1$s yn teipio"</item>
+    <item quantity="many">"Mae %1$s yn teipio"</item>
+    <item quantity="other">"Mae %1$s yn teipio"</item>
+  </plurals>
   <string name="screen_room_typing_two_members">"%1$s a %2$s"</string>
 </resources>
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
index ea6dfa0607..2a3c34feee 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt
@@ -51,9 +51,8 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
@@ -70,7 +69,8 @@ import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
@@ -128,19 +128,21 @@ class MessagesPresenterTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - check that the room's unread flag is removed`() = runTest {
-        val room = FakeMatrixRoom(
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        assertThat(room.markAsReadCalls).isEmpty()
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        assertThat(room.baseRoom.markAsReadCalls).isEmpty()
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             runCurrent()
-            assertThat(room.setUnreadFlagCalls).isEqualTo(listOf(false))
+            assertThat(room.baseRoom.setUnreadFlagCalls).isEqualTo(listOf(false))
             cancelAndIgnoreRemainingEvents()
         }
     }
@@ -155,16 +157,18 @@ class MessagesPresenterTest {
         val timeline = FakeTimeline().apply {
             this.toggleReactionLambda = toggleReactionSuccess
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             liveTimeline = timeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = room, coroutineDispatchers = coroutineDispatchers)
+        val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers)
         presenter.testWithLifecycleOwner {
             skipItems(1)
             val initialState = awaitItem()
@@ -189,16 +193,18 @@ class MessagesPresenterTest {
         val timeline = FakeTimeline().apply {
             this.toggleReactionLambda = toggleReactionSuccess
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             liveTimeline = timeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = room, coroutineDispatchers = coroutineDispatchers)
+        val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers)
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
             initialState.eventSink(MessagesEvents.ToggleReaction("👍", AN_EVENT_ID.toEventOrTransactionId()))
@@ -245,18 +251,20 @@ class MessagesPresenterTest {
     fun `present - handle action copy link`() = runTest {
         val clipboardHelper = FakeClipboardHelper()
         val event = aMessageEvent()
-        val matrixRoom = FakeMatrixRoom(
-            eventPermalinkResult = { Result.success("a link") },
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+                eventPermalinkResult = { Result.success("a link") },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
         val presenter = createMessagesPresenter(
             clipboardHelper = clipboardHelper,
-            matrixRoom = matrixRoom,
+            joinedRoom = room,
         )
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
@@ -466,20 +474,22 @@ class MessagesPresenterTest {
         val coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
 
         val liveTimeline = FakeTimeline()
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             liveTimeline = liveTimeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
 
         val redactEventLambda = lambdaRecorder { _: EventOrTransactionId, _: String? -> Result.success(Unit) }
         liveTimeline.redactEventLambda = redactEventLambda
         val presenter = createMessagesPresenter(
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             coroutineDispatchers = coroutineDispatchers,
         )
         presenter.testWithLifecycleOwner {
@@ -535,18 +545,19 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - shows prompt to reinvite users in DM`() = runTest {
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ).apply {
+                givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 1, activeMembersCount = 1))
+            },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
-        ).apply {
-            givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 1, activeMembersCount = 1))
-        }
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        )
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
             // Initially the composer doesn't have focus, so we don't show the alert
@@ -567,18 +578,19 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - doesn't show reinvite prompt in non-direct room`() = runTest {
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ).apply {
+                givenRoomInfo(aRoomInfo(isDirect = false, joinedMembersCount = 1, activeMembersCount = 1))
+            },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
-        ).apply {
-            givenRoomInfo(aRoomInfo(isDirect = false, joinedMembersCount = 1, activeMembersCount = 1))
-        }
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        )
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
             assertThat(initialState.showReinvitePrompt).isFalse()
@@ -592,18 +604,19 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - doesn't show reinvite prompt if other party is present`() = runTest {
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ).apply {
+                givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 2, activeMembersCount = 2))
+            },
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
-        ).apply {
-            givenRoomInfo(aRoomInfo(isDirect = true, joinedMembersCount = 2, activeMembersCount = 2))
-        }
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        )
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = awaitItem()
             assertThat(initialState.showReinvitePrompt).isFalse()
@@ -618,25 +631,26 @@ class MessagesPresenterTest {
     @Test
     fun `present - handle reinviting other user when memberlist is ready`() = runTest {
         val inviteUserResult = lambdaRecorder { _: UserId -> Result.success(Unit) }
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            inviteUserResult = inviteUserResult,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
+            inviteUserResult = inviteUserResult,
         )
         room.givenRoomMembersState(
-            MatrixRoomMembersState.Ready(
+            RoomMembersState.Ready(
                 persistentListOf(
                     aRoomMember(userId = A_SESSION_ID, membership = RoomMembershipState.JOIN),
                     aRoomMember(userId = A_SESSION_ID_2, membership = RoomMembershipState.LEAVE),
                 )
             )
         )
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilTimeout().last()
             initialState.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite))
@@ -652,18 +666,19 @@ class MessagesPresenterTest {
     @Test
     fun `present - handle reinviting other user when memberlist is error`() = runTest {
         val inviteUserResult = lambdaRecorder { _: UserId -> Result.success(Unit) }
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            inviteUserResult = inviteUserResult,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
+            inviteUserResult = inviteUserResult,
         )
         room.givenRoomMembersState(
-            MatrixRoomMembersState.Error(
+            RoomMembersState.Error(
                 failure = Throwable(),
                 prevRoomMembers = persistentListOf(
                     aRoomMember(userId = A_SESSION_ID, membership = RoomMembershipState.JOIN),
@@ -671,7 +686,7 @@ class MessagesPresenterTest {
                 )
             )
         )
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilTimeout().last()
             initialState.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite))
@@ -688,17 +703,18 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle reinviting other user when memberlist is not ready`() = runTest {
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        room.givenRoomMembersState(MatrixRoomMembersState.Unknown)
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        room.givenRoomMembersState(RoomMembersState.Unknown)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilTimeout().last()
             initialState.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite))
@@ -712,25 +728,26 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - handle reinviting other user when inviting fails`() = runTest {
-        val room = FakeMatrixRoom(
-            sessionId = A_SESSION_ID,
-            inviteUserResult = { Result.failure(Throwable("Oops!")) },
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
+            inviteUserResult = { Result.failure(Throwable("Oops!")) },
         )
         room.givenRoomMembersState(
-            MatrixRoomMembersState.Ready(
+            RoomMembersState.Ready(
                 persistentListOf(
                     aRoomMember(userId = A_SESSION_ID, membership = RoomMembershipState.JOIN),
                     aRoomMember(userId = A_SESSION_ID_2, membership = RoomMembershipState.LEAVE),
                 )
             )
         )
-        val presenter = createMessagesPresenter(matrixRoom = room)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilTimeout().last()
             initialState.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite))
@@ -749,21 +766,23 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - permission to post`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
-            canUserSendMessageResult = { _, messageEventType ->
-                when (messageEventType) {
-                    MessageEventType.ROOM_MESSAGE -> Result.success(true)
-                    MessageEventType.REACTION -> Result.success(true)
-                    else -> lambdaError()
-                }
-            },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+                canUserSendMessageResult = { _, messageEventType ->
+                    when (messageEventType) {
+                        MessageEventType.ROOM_MESSAGE -> Result.success(true)
+                        MessageEventType.REACTION -> Result.success(true)
+                        else -> lambdaError()
+                    }
+                },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             skipItems(1)
             val state = awaitItem()
@@ -773,21 +792,23 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - no permission to post`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
-            canUserSendMessageResult = { _, messageEventType ->
-                when (messageEventType) {
-                    MessageEventType.ROOM_MESSAGE -> Result.success(false)
-                    MessageEventType.REACTION -> Result.success(false)
-                    else -> lambdaError()
-                }
-            },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+                canUserSendMessageResult = { _, messageEventType ->
+                    when (messageEventType) {
+                        MessageEventType.ROOM_MESSAGE -> Result.success(false)
+                        MessageEventType.REACTION -> Result.success(false)
+                        else -> lambdaError()
+                    }
+                },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
+        val presenter = createMessagesPresenter(joinedRoom = room)
         presenter.testWithLifecycleOwner {
             // Default value
             assertThat(awaitItem().userEventPermissions.canSendMessage).isTrue()
@@ -797,15 +818,17 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - permission to redact own`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
-            canRedactOwnResult = { Result.success(true) },
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOtherResult = { Result.success(false) },
-            canUserJoinCallResult = { Result.success(true) },
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canRedactOwnResult = { Result.success(true) },
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOtherResult = { Result.success(false) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
+        val presenter = createMessagesPresenter(joinedRoom = joinedRoom)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilPredicate { it.userEventPermissions.canRedactOwn }.last()
             assertThat(initialState.userEventPermissions.canRedactOwn).isTrue()
@@ -816,15 +839,17 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - permission to redact other`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOtherResult = { Result.success(true) },
             canUserSendMessageResult = { _, _ -> Result.success(true) },
             canRedactOwnResult = { Result.success(false) },
             canUserJoinCallResult = { Result.success(true) },
-            typingNoticeResult = { Result.success(Unit) },
             canUserPinUnpinResult = { Result.success(true) },
+        ),
+            typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = matrixRoom)
+        val presenter = createMessagesPresenter(joinedRoom = joinedRoom)
         presenter.testWithLifecycleOwner {
             val initialState = consumeItemsUntilPredicate { it.userEventPermissions.canRedactOther }.last()
             assertThat(initialState.userEventPermissions.canRedactOwn).isFalse()
@@ -863,16 +888,18 @@ class MessagesPresenterTest {
         val failurePinEventLambda = lambdaRecorder { _: EventId -> Result.failure<Boolean>(A_THROWABLE) }
         val analyticsService = FakeAnalyticsService()
         val timeline = FakeTimeline()
-        val room = FakeMatrixRoom(
-            liveTimeline = timeline,
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserSendMessageResult = { _, _ -> Result.success(true) },
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
-            typingNoticeResult = { Result.success(Unit) },
             canUserPinUnpinResult = { Result.success(true) },
+        ),
+            liveTimeline = timeline,
+            typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = room, analyticsService = analyticsService)
+        val presenter = createMessagesPresenter(joinedRoom = room, analyticsService = analyticsService)
         presenter.testWithLifecycleOwner {
             val messageEvent = aMessageEvent(
                 content = aTimelineItemTextContent()
@@ -901,16 +928,18 @@ class MessagesPresenterTest {
         val failureUnpinEventLambda = lambdaRecorder { _: EventId -> Result.failure<Boolean>(A_THROWABLE) }
         val timeline = FakeTimeline()
         val analyticsService = FakeAnalyticsService()
-        val room = FakeMatrixRoom(
-            liveTimeline = timeline,
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserSendMessageResult = { _, _ -> Result.success(true) },
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
-            typingNoticeResult = { Result.success(Unit) },
             canUserPinUnpinResult = { Result.success(true) },
+        ),
+            liveTimeline = timeline,
+            typingNoticeResult = { Result.success(Unit) },
         )
-        val presenter = createMessagesPresenter(matrixRoom = room, analyticsService = analyticsService)
+        val presenter = createMessagesPresenter(joinedRoom = room, analyticsService = analyticsService)
         presenter.testWithLifecycleOwner {
             val messageEvent = aMessageEvent(
                 content = aTimelineItemTextContent()
@@ -1058,17 +1087,19 @@ class MessagesPresenterTest {
         val timeline = FakeTimeline().apply {
             this.editCaptionLambda = editCaptionLambda
         }
-        val room = FakeMatrixRoom(
-            liveTimeline = timeline,
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserSendMessageResult = { _, _ -> Result.success(true) },
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
-            typingNoticeResult = { Result.success(Unit) },
             canUserPinUnpinResult = { Result.success(true) },
+        ),
+            liveTimeline = timeline,
+            typingNoticeResult = { Result.success(Unit) },
         )
         val presenter = createMessagesPresenter(
-            matrixRoom = room,
+            joinedRoom = room,
         )
         presenter.testWithLifecycleOwner {
             skipItems(1)
@@ -1094,21 +1125,23 @@ class MessagesPresenterTest {
 
     @Test
     fun `present - when room is encrypted and a DM, the DM user's identity state is fetched onResume`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             sessionId = A_SESSION_ID,
             canUserSendMessageResult = { _, _ -> Result.success(true) },
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
-            typingNoticeResult = { Result.success(Unit) },
             canUserPinUnpinResult = { Result.success(true) },
             initialRoomInfo = aRoomInfo(isDirect = true, isEncrypted = true)
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(aRoomMember(userId = A_SESSION_ID), aRoomMember(userId = A_USER_ID_2))))
-        }
+            givenRoomMembersState(RoomMembersState.Ready(persistentListOf(aRoomMember(userId = A_SESSION_ID), aRoomMember(userId = A_USER_ID_2))))
+        },
+            typingNoticeResult = { Result.success(Unit) },
+        )
         val encryptionService = FakeEncryptionService(getUserIdentityResult = { Result.success(IdentityState.Verified) })
 
-        val presenter = createMessagesPresenter(matrixRoom = room, encryptionService = encryptionService)
+        val presenter = createMessagesPresenter(joinedRoom = room, encryptionService = encryptionService)
         val lifecycleOwner = FakeLifecycleOwner()
         presenter.testWithLifecycleOwner(lifecycleOwner) {
             val initialState = awaitItem()
@@ -1124,16 +1157,19 @@ class MessagesPresenterTest {
 
     private fun TestScope.createMessagesPresenter(
         coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
-        matrixRoom: MatrixRoom = FakeMatrixRoom(
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
-            canRedactOwnResult = { Result.success(true) },
-            canRedactOtherResult = { Result.success(true) },
-            canUserJoinCallResult = { Result.success(true) },
+        joinedRoom: FakeJoinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                canRedactOwnResult = { Result.success(true) },
+                canRedactOtherResult = { Result.success(true) },
+                canUserJoinCallResult = { Result.success(true) },
+                canUserPinUnpinResult = { Result.success(true) },
+            ).apply {
+                givenRoomInfo(aRoomInfo(id = roomId, name = ""))
+            },
+            liveTimeline = FakeTimeline(),
             typingNoticeResult = { Result.success(Unit) },
-            canUserPinUnpinResult = { Result.success(true) },
-        ).apply {
-            givenRoomInfo(aRoomInfo(id = roomId, name = ""))
-        },
+        ),
         navigator: FakeMessagesNavigator = FakeMessagesNavigator(),
         featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
         clipboardHelper: FakeClipboardHelper = FakeClipboardHelper(),
@@ -1150,7 +1186,7 @@ class MessagesPresenterTest {
         actionListEventSink: (ActionListEvents) -> Unit = {},
     ): MessagesPresenter {
         return MessagesPresenter(
-            room = matrixRoom,
+            room = joinedRoom,
             composerPresenter = messageComposerPresenter,
             voiceMessageComposerPresenter = { aVoiceMessageComposerState() },
             timelinePresenter = { aTimelineState(eventSink = timelineEventSink) },
@@ -1171,7 +1207,7 @@ class MessagesPresenterTest {
             buildMeta = aBuildMeta(),
             dispatchers = coroutineDispatchers,
             htmlConverterProvider = FakeHtmlConverterProvider(),
-            timelineController = TimelineController(matrixRoom),
+            timelineController = TimelineController(joinedRoom),
             permalinkParser = permalinkParser,
             encryptionService = encryptionService,
             analyticsService = analyticsService,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
index e5e6ff5ea2..6e9c525214 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt
@@ -29,13 +29,13 @@ import io.element.android.features.poll.api.pollcontent.aPollAnswerItemList
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_CAPTION
 import io.element.android.libraries.matrix.test.A_MESSAGE
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
 import io.element.android.tests.testutils.WarmUpRule
@@ -893,7 +893,7 @@ class ActionListPresenterTest {
 
     @Test
     fun `present - compute message when event is already pinned`() = runTest {
-        val room = FakeMatrixRoom().apply {
+        val room = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
         }
         val presenter = createActionListPresenter(
@@ -1251,7 +1251,7 @@ class ActionListPresenterTest {
 
     @Test
     fun `present - compute for verified user send failure`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeBaseRoom(
             userDisplayNameResult = { Result.success("Alice") }
         )
         val presenter = createActionListPresenter(isDeveloperModeEnabled = false, isPinFeatureEnabled = false, room = room)
@@ -1279,7 +1279,7 @@ class ActionListPresenterTest {
 private fun createActionListPresenter(
     isDeveloperModeEnabled: Boolean,
     isPinFeatureEnabled: Boolean,
-    room: MatrixRoom = FakeMatrixRoom(),
+    room: BaseRoom = FakeBaseRoom(),
     allowCaption: Boolean = true,
 ): ActionListPresenter {
     val preferencesStore = InMemoryAppPreferencesStore(isDeveloperModeEnabled = isDeveloperModeEnabled)
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
index d55ea7c7a0..2124d38b56 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt
@@ -29,12 +29,12 @@ import io.element.android.libraries.matrix.api.media.FileInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
 import io.element.android.libraries.matrix.test.A_CAPTION
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
 import io.element.android.libraries.mediaupload.api.MediaSender
 import io.element.android.libraries.mediaupload.api.MediaUploadInfo
@@ -110,7 +110,7 @@ class AttachmentsPreviewPresenterTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             progressCallbackValues = listOf(
                 Pair(0, 10),
                 Pair(5, 10),
@@ -148,7 +148,7 @@ class AttachmentsPreviewPresenterTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendFileResult = sendFileResult,
         )
         val onDoneListener = lambdaRecorder<Unit> { }
@@ -184,7 +184,7 @@ class AttachmentsPreviewPresenterTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendFileResult = sendFileResult,
         )
         val onDoneListener = lambdaRecorder<Unit> { }
@@ -216,7 +216,7 @@ class AttachmentsPreviewPresenterTest {
 
     @Test
     fun `present - send media with pre-processing failure after user sends media`() = runTest {
-        val room = FakeMatrixRoom()
+        val room = FakeJoinedRoom()
         val onDoneListener = lambdaRecorder<Unit> { }
         val processLatch = CompletableDeferred<Unit>()
         val presenter = createAttachmentsPreviewPresenter(
@@ -242,7 +242,7 @@ class AttachmentsPreviewPresenterTest {
 
     @Test
     fun `present - send media with pre-processing failure before user sends media`() = runTest {
-        val room = FakeMatrixRoom()
+        val room = FakeJoinedRoom()
         val onDoneListener = lambdaRecorder<Unit> { }
         val processLatch = CompletableDeferred<Unit>()
         val presenter = createAttachmentsPreviewPresenter(
@@ -297,7 +297,7 @@ class AttachmentsPreviewPresenterTest {
         val mediaPreProcessor = FakeMediaPreProcessor().apply {
             givenImageResult()
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendImageResult = sendImageResult,
         )
         val onDoneListener = lambdaRecorder<Unit> { }
@@ -339,7 +339,7 @@ class AttachmentsPreviewPresenterTest {
         val mediaPreProcessor = FakeMediaPreProcessor().apply {
             givenVideoResult()
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendVideoResult = sendVideoResult,
         )
         val onDoneListener = lambdaRecorder<Unit> { }
@@ -381,7 +381,7 @@ class AttachmentsPreviewPresenterTest {
         val mediaPreProcessor = FakeMediaPreProcessor().apply {
             givenAudioResult()
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendAudioResult = sendAudioResult,
         )
         val onDoneListener = lambdaRecorder<Unit> { }
@@ -418,7 +418,7 @@ class AttachmentsPreviewPresenterTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.failure(failure)
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendFileResult = sendFileResult,
         )
         val presenter = createAttachmentsPreviewPresenter(room = room, mediaUploadOnSendQueueEnabled = false)
@@ -448,7 +448,7 @@ class AttachmentsPreviewPresenterTest {
             Result.failure(failure)
         }
         val onDoneListenerResult = lambdaRecorder<Unit> {}
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendFileResult = sendFileResult,
         )
         val presenter = createAttachmentsPreviewPresenter(room = room, mediaUploadOnSendQueueEnabled = true, onDoneListener = onDoneListenerResult)
@@ -518,7 +518,7 @@ class AttachmentsPreviewPresenterTest {
         localMedia: LocalMedia = aLocalMedia(
             uri = mockMediaUrl,
         ),
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         permalinkBuilder: PermalinkBuilder = FakePermalinkBuilder(),
         mediaPreProcessor: MediaPreProcessor = FakeMediaPreProcessor(),
         temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
index 2a82db690e..40da23ae29 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStatePresenterTest.kt
@@ -13,12 +13,12 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.tests.testutils.WarmUpRule
@@ -26,6 +26,7 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
 import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -45,14 +46,15 @@ class IdentityChangeStatePresenterTest {
 
     @Test
     fun `present - when the room emits identity change, the presenter emits new state`() = runTest {
-        val room = FakeMatrixRoom().apply {
+        val identityStateChanges = MutableStateFlow(emptyList<IdentityStateChange>())
+        val room = FakeJoinedRoom(identityStateChangesFlow = identityStateChanges).apply {
             givenRoomInfo(aRoomInfo(isEncrypted = true))
         }
         val presenter = createIdentityChangeStatePresenter(room)
         presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.roomMemberIdentityStateChanges).isEmpty()
-            room.emitIdentityStateChanges(
+            identityStateChanges.emit(
                 listOf(
                     IdentityStateChange(
                         userId = A_USER_ID_2,
@@ -70,12 +72,16 @@ class IdentityChangeStatePresenterTest {
 
     @Test
     fun `present - when the clear room emits identity change, the presenter does not emit new state`() = runTest {
-        val room = FakeMatrixRoom(enableEncryptionResult = { Result.success(Unit) })
+        val identityStateChanges = MutableStateFlow(emptyList<IdentityStateChange>())
+        val room = FakeJoinedRoom(
+            identityStateChangesFlow = identityStateChanges,
+            enableEncryptionResult = { Result.success(Unit) }
+        )
         val presenter = createIdentityChangeStatePresenter(room)
         presenter.test {
             val initialState = awaitItem()
             assertThat(initialState.roomMemberIdentityStateChanges).isEmpty()
-            room.emitIdentityStateChanges(
+            identityStateChanges.emit(
                 listOf(
                     IdentityStateChange(
                         userId = A_USER_ID_2,
@@ -100,9 +106,10 @@ class IdentityChangeStatePresenterTest {
     @Test
     fun `present - when the room emits identity change, the presenter emits new state with member details`() =
         runTest {
-            val room = FakeMatrixRoom().apply {
+            val identityStateChanges = MutableStateFlow(emptyList<IdentityStateChange>())
+            val room = FakeJoinedRoom(identityStateChangesFlow = identityStateChanges).apply {
                 givenRoomMembersState(
-                    MatrixRoomMembersState.Ready(
+                    RoomMembersState.Ready(
                         listOf(
                             aRoomMember(
                                 A_USER_ID_2,
@@ -117,7 +124,7 @@ class IdentityChangeStatePresenterTest {
             presenter.test {
                 val initialState = awaitItem()
                 assertThat(initialState.roomMemberIdentityStateChanges).isEmpty()
-                room.emitIdentityStateChanges(
+                identityStateChanges.emit(
                     listOf(
                         IdentityStateChange(
                             userId = A_USER_ID_2,
@@ -166,7 +173,7 @@ class IdentityChangeStatePresenterTest {
         }
 
     private fun createIdentityChangeStatePresenter(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         encryptionService: EncryptionService = FakeEncryptionService(),
     ): IdentityChangeStatePresenter {
         return IdentityChangeStatePresenter(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
index 374eebdc3b..fd2a2fafc2 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailurePresenterTest.kt
@@ -13,13 +13,13 @@ import io.element.android.features.messages.impl.crypto.sendfailure.VerifiedUser
 import io.element.android.features.messages.impl.fixtures.aMessageEvent
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_TRANSACTION_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.test.runTest
@@ -81,11 +81,13 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user unsigned device failure dismiss scenario`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
         )
+        )
         val presenter = createResolveVerifiedUserSendFailurePresenter(room)
         presenter.test {
             val failedMessage = aVerifiedUserHasUnsignedDeviceFailedMessage()
@@ -107,11 +109,13 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user unsigned device failure retry scenario`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
         )
+        )
         val presenter = createResolveVerifiedUserSendFailurePresenter(room)
         presenter.test {
             val failedMessage = aVerifiedUserHasUnsignedDeviceFailedMessage()
@@ -138,10 +142,12 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user unsigned device failure resolve and resend scenario`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
+        ),
             ignoreDeviceTrustAndResendResult = { _, _ ->
                 Result.success(Unit)
             },
@@ -179,10 +185,12 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user unsigned device failure resolve and resend scenario with error`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
+        ),
             ignoreDeviceTrustAndResendResult = { _, _ ->
                 Result.failure(Exception())
             },
@@ -212,11 +220,13 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user changed identity failure retry scenario`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
         )
+        )
         val presenter = createResolveVerifiedUserSendFailurePresenter(room)
         presenter.test {
             val failedMessage = aVerifiedUserChangedIdentityMessage()
@@ -243,10 +253,12 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user changed identity failure resolve and resend scenario`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
+        ),
             withdrawVerificationAndResendResult = { _, _ ->
                 Result.success(Unit)
             },
@@ -284,10 +296,12 @@ class ResolveVerifiedUserSendFailurePresenterTest {
 
     @Test
     fun `present - verified user changed identity failure resolve and resend scenario with error`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             userDisplayNameResult = { userId ->
                 Result.success(userId.value)
             },
+        ),
             withdrawVerificationAndResendResult = { _, _ ->
                 Result.failure(Exception())
             },
@@ -337,7 +351,7 @@ class ResolveVerifiedUserSendFailurePresenterTest {
     }
 
     private fun createResolveVerifiedUserSendFailurePresenter(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: FakeJoinedRoom = FakeJoinedRoom(),
     ): ResolveVerifiedUserSendFailurePresenter {
         return ResolveVerifiedUserSendFailurePresenter(
             room = room,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt
index 1824eeb987..2092d8d815 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.LiveTimelineProvider
@@ -49,8 +49,8 @@ class ForwardMessagesPresenterTest {
         val timeline = FakeTimeline().apply {
             this.forwardEventLambda = forwardEventLambda
         }
-        val room = FakeMatrixRoom(liveTimeline = timeline)
-        val presenter = aForwardMessagesPresenter(fakeMatrixRoom = room)
+        val room = FakeJoinedRoom(liveTimeline = timeline)
+        val presenter = aForwardMessagesPresenter(fakeRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -73,8 +73,8 @@ class ForwardMessagesPresenterTest {
         val timeline = FakeTimeline().apply {
             this.forwardEventLambda = forwardEventLambda
         }
-        val room = FakeMatrixRoom(liveTimeline = timeline)
-        val presenter = aForwardMessagesPresenter(fakeMatrixRoom = room)
+        val room = FakeJoinedRoom(liveTimeline = timeline)
+        val presenter = aForwardMessagesPresenter(fakeRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -93,11 +93,11 @@ class ForwardMessagesPresenterTest {
 
     private fun CoroutineScope.aForwardMessagesPresenter(
         eventId: EventId = AN_EVENT_ID,
-        fakeMatrixRoom: FakeMatrixRoom = FakeMatrixRoom(),
+        fakeRoom: FakeJoinedRoom = FakeJoinedRoom(),
         coroutineScope: CoroutineScope = this,
     ) = ForwardMessagesPresenter(
         eventId = eventId.value,
-        timelineProvider = LiveTimelineProvider(fakeMatrixRoom),
+        timelineProvider = LiveTimelineProvider(fakeRoom),
         appCoroutineScope = coroutineScope,
     )
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
index a82df0f2aa..9528b81bf3 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenterTest.kt
@@ -42,8 +42,8 @@ import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.permalink.PermalinkBuilder
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.room.IntentionalMention
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.draft.ComposerDraftType
@@ -65,7 +65,8 @@ import io.element.android.libraries.matrix.test.A_USER_ID_3
 import io.element.android.libraries.matrix.test.A_USER_ID_4
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkBuilder
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -267,13 +268,13 @@ class MessageComposerPresenterTest {
         val timeline = FakeTimeline().apply {
             this.editCaptionLambda = editCaptionLambda
         }
-        val fakeMatrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) }
         )
         val presenter = createPresenter(
             coroutineScope = this,
-            room = fakeMatrixRoom,
+            room = joinedRoom,
             isRichTextEditorEnabled = false,
         )
         val permalinkBuilder = FakePermalinkBuilder(permalinkForUserLambda = { Result.success("") })
@@ -382,7 +383,7 @@ class MessageComposerPresenterTest {
     fun `present - send message with rich text enabled`() = runTest {
         val presenter = createPresenter(
             coroutineScope = this,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 sendMessageResult = { _, _, _ -> Result.success(Unit) },
                 typingNoticeResult = { Result.success(Unit) }
             ),
@@ -416,7 +417,7 @@ class MessageComposerPresenterTest {
         val presenter = createPresenter(
             coroutineScope = this,
             isRichTextEditorEnabled = false,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 sendMessageResult = { _, _, _ -> Result.success(Unit) },
                 typingNoticeResult = { Result.success(Unit) }
             ),
@@ -454,13 +455,13 @@ class MessageComposerPresenterTest {
         val timeline = FakeTimeline().apply {
             this.editMessageLambda = editMessageLambda
         }
-        val fakeMatrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) }
         )
         val presenter = createPresenter(
             this,
-            fakeMatrixRoom,
+            joinedRoom,
         )
         moleculeFlow(RecompositionMode.Immediate) {
             val state = presenter.present()
@@ -509,14 +510,14 @@ class MessageComposerPresenterTest {
         val roomEditMessageLambda = lambdaRecorder { _: EventId?, _: String, _: String?, _: List<IntentionalMention> ->
             Result.success(Unit)
         }
-        val fakeMatrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
             editMessageLambda = roomEditMessageLambda,
         )
         val presenter = createPresenter(
             this,
-            fakeMatrixRoom,
+            joinedRoom,
         )
         moleculeFlow(RecompositionMode.Immediate) {
             val state = presenter.present()
@@ -566,13 +567,13 @@ class MessageComposerPresenterTest {
         val timeline = FakeTimeline().apply {
             this.editMessageLambda = editMessageLambda
         }
-        val fakeMatrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
         val presenter = createPresenter(
             this,
-            fakeMatrixRoom,
+            joinedRoom,
         )
         moleculeFlow(RecompositionMode.Immediate) {
             val state = presenter.present()
@@ -618,13 +619,13 @@ class MessageComposerPresenterTest {
         val timeline = FakeTimeline().apply {
             this.replyMessageLambda = replyMessageLambda
         }
-        val fakeMatrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) }
         )
         val presenter = createPresenter(
             this,
-            fakeMatrixRoom,
+            joinedRoom,
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -689,7 +690,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Pick image from gallery`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment> -> }
@@ -730,7 +731,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Pick video from gallery`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment> -> }
@@ -788,7 +789,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Pick file from storage will open the preview`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val onPreviewAttachmentLambda = lambdaRecorder { _: ImmutableList<Attachment> -> }
@@ -811,7 +812,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - create poll`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val presenter = createPresenter(this, room = room)
@@ -830,7 +831,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - share location`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val presenter = createPresenter(this, room = room)
@@ -849,7 +850,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Take photo`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val permissionPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }
@@ -874,7 +875,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Take photo with permission request`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val permissionPresenter = FakePermissionsPresenter()
@@ -901,7 +902,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Record video`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val permissionPresenter = FakePermissionsPresenter().apply { setPermissionGranted() }
@@ -926,7 +927,7 @@ class MessageComposerPresenterTest {
 
     @Test
     fun `present - Record video with permission request`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         )
         val permissionPresenter = FakePermissionsPresenter()
@@ -1001,12 +1002,12 @@ class MessageComposerPresenterTest {
         val bob = aRoomMember(userId = A_USER_ID_2, membership = RoomMembershipState.JOIN)
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
         var canUserTriggerRoomNotificationResult = true
-        val room = FakeMatrixRoom(
-            canUserTriggerRoomNotificationResult = { Result.success(canUserTriggerRoomNotificationResult) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(canUserTriggerRoomNotificationResult = { Result.success(canUserTriggerRoomNotificationResult) }),
             typingNoticeResult = { Result.success(Unit) }
         ).apply {
             givenRoomMembersState(
-                MatrixRoomMembersState.Ready(
+                RoomMembersState.Ready(
                     persistentListOf(currentUser, invitedUser, bob, david),
                 )
             )
@@ -1057,12 +1058,12 @@ class MessageComposerPresenterTest {
         val invitedUser = aRoomMember(userId = A_USER_ID_3, membership = RoomMembershipState.INVITE)
         val bob = aRoomMember(userId = A_USER_ID_2, membership = RoomMembershipState.JOIN)
         val david = aRoomMember(userId = A_USER_ID_4, displayName = "Dave", membership = RoomMembershipState.JOIN)
-        val room = FakeMatrixRoom(
-            canUserTriggerRoomNotificationResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(canUserTriggerRoomNotificationResult = { Result.success(true) }),
             typingNoticeResult = { Result.success(Unit) }
         ).apply {
             givenRoomMembersState(
-                MatrixRoomMembersState.Ready(
+                RoomMembersState.Ready(
                     persistentListOf(currentUser, invitedUser, bob, david),
                 )
             )
@@ -1124,7 +1125,7 @@ class MessageComposerPresenterTest {
         val sendMessageResult = lambdaRecorder { _: String, _: String?, _: List<IntentionalMention> ->
             Result.success(Unit)
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = timeline,
             sendMessageResult = sendMessageResult,
             typingNoticeResult = { Result.success(Unit) }
@@ -1206,8 +1207,8 @@ class MessageComposerPresenterTest {
     @Test
     fun `present - handle typing notice event`() = runTest {
         val typingNoticeResult = lambdaRecorder<Boolean, Result<Unit>> { Result.success(Unit) }
-        val room = FakeMatrixRoom(
-            typingNoticeResult = typingNoticeResult
+        val room = FakeJoinedRoom(
+            typingNoticeResult = typingNoticeResult,
         )
         val presenter = createPresenter(room = room, coroutineScope = this)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -1217,6 +1218,7 @@ class MessageComposerPresenterTest {
             typingNoticeResult.assertions().isNeverCalled()
             initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(true))
             initialState.eventSink.invoke(MessageComposerEvents.TypingNotice(false))
+            advanceUntilIdle()
             typingNoticeResult.assertions().isCalledExactly(2)
                 .withSequence(
                     listOf(value(true)),
@@ -1228,7 +1230,7 @@ class MessageComposerPresenterTest {
     @Test
     fun `present - handle typing notice event when sending typing notice is disabled`() = runTest {
         val typingNoticeResult = lambdaRecorder<Boolean, Result<Unit>> { Result.success(Unit) }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             typingNoticeResult = typingNoticeResult
         )
         val store = InMemorySessionPreferencesStore(
@@ -1383,7 +1385,7 @@ class MessageComposerPresenterTest {
         val timeline = FakeTimeline().apply {
             this.loadReplyDetailsLambda = loadReplyDetailsLambda
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = timeline,
             typingNoticeResult = { Result.success(Unit) },
         )
@@ -1524,7 +1526,7 @@ class MessageComposerPresenterTest {
 
     private fun createPresenter(
         coroutineScope: CoroutineScope,
-        room: MatrixRoom = FakeMatrixRoom(
+        room: JoinedRoom = FakeJoinedRoom(
             typingNoticeResult = { Result.success(Unit) }
         ),
         navigator: MessagesNavigator = FakeMessagesNavigator(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
index 66b8aeb152..6d7b4f8c7c 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsProcessorTest.kt
@@ -9,7 +9,7 @@ package io.element.android.features.messages.impl.messagecomposer.suggestions
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_USER_ID
@@ -35,7 +35,7 @@ class SuggestionsProcessorTest {
     fun `processing null suggestion will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = null,
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember())),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember())),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -47,7 +47,7 @@ class SuggestionsProcessorTest {
     fun `processing Command will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = aCommandSuggestion,
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember())),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember())),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -59,7 +59,7 @@ class SuggestionsProcessorTest {
     fun `processing Custom will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = aCustomSuggestion,
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember())),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember())),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -71,7 +71,7 @@ class SuggestionsProcessorTest {
     fun `processing Mention suggestion with not loaded members will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion(""),
-            roomMembersState = MatrixRoomMembersState.Unknown,
+            roomMembersState = RoomMembersState.Unknown,
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -83,7 +83,7 @@ class SuggestionsProcessorTest {
     fun `processing Mention suggestion with no members will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion(""),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -95,7 +95,7 @@ class SuggestionsProcessorTest {
     fun `processing Room suggestion with no aliases will return empty suggestion`() = runTest {
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion(""),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID,
             canSendRoomMention = { true },
@@ -108,7 +108,7 @@ class SuggestionsProcessorTest {
         val aRoomSummary = aRoomSummary(canonicalAlias = A_ROOM_ALIAS)
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("ALI"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = listOf(
                 RoomAliasSuggestion(
                     roomAlias = A_ROOM_ALIAS,
@@ -137,7 +137,7 @@ class SuggestionsProcessorTest {
         val aRoomSummary = aRoomSummary(canonicalAlias = A_ROOM_ALIAS)
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("ali"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = listOf(
                 RoomAliasSuggestion(
                     roomAlias = A_ROOM_ALIAS,
@@ -166,7 +166,7 @@ class SuggestionsProcessorTest {
         val aRoomSummary = aRoomSummary(canonicalAlias = A_ROOM_ALIAS)
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("tot"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = listOf(
                 RoomAliasSuggestion(
                     roomAlias = A_ROOM_ALIAS,
@@ -186,7 +186,7 @@ class SuggestionsProcessorTest {
         val aRoomSummary = aRoomSummary(canonicalAlias = A_ROOM_ALIAS)
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("lement"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = listOf(
                 RoomAliasSuggestion(
                     roomAlias = A_ROOM_ALIAS,
@@ -215,7 +215,7 @@ class SuggestionsProcessorTest {
         val aRoomSummary = aRoomSummary(canonicalAlias = A_ROOM_ALIAS)
         val result = suggestionsProcessor.process(
             suggestion = aRoomSuggestion("lement"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf()),
+            roomMembersState = RoomMembersState.Ready(persistentListOf()),
             roomAliasSuggestions = listOf(
                 RoomAliasSuggestion(
                     roomAlias = A_ROOM_ALIAS,
@@ -235,7 +235,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = null)
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("ali"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
@@ -252,7 +252,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = null)
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("ali"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = UserId("@alice:server.org"),
             canSendRoomMention = { true },
@@ -265,7 +265,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = "alice")
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("bo"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
@@ -278,7 +278,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), membership = RoomMembershipState.INVITE)
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("ali"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
@@ -291,7 +291,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = "bob")
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("bo"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
@@ -308,7 +308,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = "ro")
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("ro"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { true },
@@ -326,7 +326,7 @@ class SuggestionsProcessorTest {
         val aRoomMember = aRoomMember(userId = UserId("@alice:server.org"), displayName = "ro")
         val result = suggestionsProcessor.process(
             suggestion = aMentionSuggestion("ro"),
-            roomMembersState = MatrixRoomMembersState.Ready(persistentListOf(aRoomMember)),
+            roomMembersState = RoomMembersState.Ready(persistentListOf(aRoomMember)),
             roomAliasSuggestions = emptyList(),
             currentUserId = A_USER_ID_2,
             canSendRoomMention = { false },
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
index 5f6fa1b164..ecd069585f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/banner/PinnedMessagesBannerPresenterTest.kt
@@ -12,14 +12,14 @@ import io.element.android.features.messages.impl.pinned.PinnedEventsTimelineProv
 import io.element.android.libraries.eventformatter.test.FakePinnedMessagesBannerFormatter
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID_2
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -54,7 +54,7 @@ class PinnedMessagesBannerPresenterTest {
 
     @Test
     fun `present - loading state`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = { Result.success(FakeTimeline()) }
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
@@ -85,7 +85,7 @@ class PinnedMessagesBannerPresenterTest {
                 )
             )
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = { Result.success(pinnedEventsTimeline) }
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID, AN_EVENT_ID_2)))
@@ -124,7 +124,7 @@ class PinnedMessagesBannerPresenterTest {
                 )
             )
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = { Result.success(pinnedEventsTimeline) }
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID, AN_EVENT_ID_2)))
@@ -159,7 +159,7 @@ class PinnedMessagesBannerPresenterTest {
 
     @Test
     fun `present - timeline failed`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = { Result.failure(Exception()) }
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
@@ -179,7 +179,7 @@ class PinnedMessagesBannerPresenterTest {
     }
 
     private fun TestScope.createPinnedMessagesBannerPresenter(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         itemFactory: PinnedMessagesBannerItemFactory = PinnedMessagesBannerItemFactory(
             coroutineDispatchers = testCoroutineDispatchers(),
             formatter = FakePinnedMessagesBannerFormatter(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
index 1825373624..985e9f055f 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt
@@ -20,14 +20,15 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -51,11 +52,13 @@ import org.junit.Test
 class PinnedMessagesListPresenterTest {
     @Test
     fun `present - initial state feature disabled`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         )
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = false)
         presenter.test {
             val initialState = awaitItem()
@@ -66,13 +69,15 @@ class PinnedMessagesListPresenterTest {
 
     @Test
     fun `present - initial state feature enabled`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
         }
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)
         presenter.test {
             val initialState = awaitItem()
@@ -83,14 +88,16 @@ class PinnedMessagesListPresenterTest {
 
     @Test
     fun `present - timeline failure state`() = runTest {
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.failure(RuntimeException()) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.failure(RuntimeException()) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -102,14 +109,16 @@ class PinnedMessagesListPresenterTest {
 
     @Test
     fun `present - empty state`() = runTest {
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(FakeTimeline()) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf()))
-        }
+        },
+            createTimelineResult = { Result.success(FakeTimeline()) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -122,14 +131,16 @@ class PinnedMessagesListPresenterTest {
     @Test
     fun `present - filled state`() = runTest {
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -149,14 +160,16 @@ class PinnedMessagesListPresenterTest {
         val failureUnpinEventLambda = lambdaRecorder { _: EventId? -> Result.failure<Boolean>(A_THROWABLE) }
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
         val analyticsService = FakeAnalyticsService()
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, isFeatureEnabled = true, analyticsService = analyticsService)
         presenter.test {
             skipItems(3)
@@ -195,14 +208,16 @@ class PinnedMessagesListPresenterTest {
             this.onViewInTimelineClickLambda = onViewInTimelineClickLambda
         }
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -224,14 +239,16 @@ class PinnedMessagesListPresenterTest {
             this.onShowEventDebugInfoClickLambda = onShowEventDebugInfoClickLambda
         }
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -253,14 +270,16 @@ class PinnedMessagesListPresenterTest {
             this.onForwardEventClickLambda = onForwardEventClickLambda
         }
         val pinnedEventsTimeline = createPinnedMessagesTimeline()
-        val room = FakeMatrixRoom(
-            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canRedactOwnResult = { Result.success(true) },
             canRedactOtherResult = { Result.success(true) },
             canUserPinUnpinResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(aRoomInfo(pinnedEventIds = listOf(AN_EVENT_ID)))
-        }
+        },
+            createTimelineResult = { Result.success(pinnedEventsTimeline) },
+        )
         val presenter = createPinnedMessagesListPresenter(room = room, navigator = navigator, isFeatureEnabled = true)
         presenter.test {
             skipItems(3)
@@ -294,7 +313,7 @@ class PinnedMessagesListPresenterTest {
 
     private fun TestScope.createPinnedMessagesListPresenter(
         navigator: PinnedMessagesListNavigator = FakePinnedMessagesListNavigator(),
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         syncService: SyncService = FakeSyncService(),
         isFeatureEnabled: Boolean = true,
         analyticsService: AnalyticsService = FakeAnalyticsService(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
index 6406b1d64d..abaa6a5653 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/report/ReportMessagePresenterTest.kt
@@ -15,10 +15,10 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import kotlinx.coroutines.test.runTest
@@ -78,10 +78,10 @@ class ReportMessagePresenterTest {
         val reportContentResult = lambdaRecorder<EventId, String, UserId?, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             reportContentResult = reportContentResult
         )
-        val presenter = createReportMessagePresenter(matrixRoom = room)
+        val presenter = createReportMessagePresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -100,10 +100,10 @@ class ReportMessagePresenterTest {
         val reportContentResult = lambdaRecorder<EventId, String, UserId?, Result<Unit>> { _, _, _ ->
             Result.success(Unit)
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             reportContentResult = reportContentResult
         )
-        val presenter = createReportMessagePresenter(matrixRoom = room)
+        val presenter = createReportMessagePresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -120,10 +120,10 @@ class ReportMessagePresenterTest {
         val reportContentResult = lambdaRecorder<EventId, String, UserId?, Result<Unit>> { _, _, _ ->
             Result.failure(Exception("Failed to report content"))
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             reportContentResult = reportContentResult
         )
-        val presenter = createReportMessagePresenter(matrixRoom = room)
+        val presenter = createReportMessagePresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -141,11 +141,11 @@ class ReportMessagePresenterTest {
 
     private fun createReportMessagePresenter(
         inputs: ReportMessagePresenter.Inputs = ReportMessagePresenter.Inputs(AN_EVENT_ID, A_USER_ID),
-        matrixRoom: MatrixRoom = FakeMatrixRoom(),
+        joinedRoom: JoinedRoom = FakeJoinedRoom(),
         snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
     ) = ReportMessagePresenter(
         inputs = inputs,
-        room = matrixRoom,
+        room = joinedRoom,
         snackbarDispatcher = snackbarDispatcher,
     )
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
index 83cc05eb52..ab183442f2 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineControllerTest.kt
@@ -14,7 +14,7 @@ import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
 import io.element.android.tests.testutils.lambda.lambdaError
@@ -29,11 +29,11 @@ class TimelineControllerTest {
     fun `test switching between live and detached timeline`() = runTest {
         val liveTimeline = FakeTimeline(name = "live")
         val detachedTimeline = FakeTimeline(name = "detached")
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) }
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
 
         sut.activeTimelineFlow().test {
             awaitItem().also { state ->
@@ -61,7 +61,7 @@ class TimelineControllerTest {
         val detachedTimeline1 = FakeTimeline(name = "detached 1")
         val detachedTimeline2 = FakeTimeline(name = "detached 2")
         var callNumber = 0
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = {
                 callNumber++
@@ -72,7 +72,7 @@ class TimelineControllerTest {
                 }
             }
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
 
         sut.activeTimelineFlow().test {
             awaitItem().also { state ->
@@ -97,10 +97,10 @@ class TimelineControllerTest {
     @Test
     fun `test switching to live when already in live should have no effect`() = runTest {
         val liveTimeline = FakeTimeline(name = "live")
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
         sut.activeTimelineFlow().test {
             awaitItem().also { state ->
                 assertThat(state).isEqualTo(liveTimeline)
@@ -115,11 +115,11 @@ class TimelineControllerTest {
     fun `test closing the TimelineController should close the detached timeline`() = runTest {
         val liveTimeline = FakeTimeline(name = "live")
         val detachedTimeline = FakeTimeline(name = "detached")
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) }
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
         sut.activeTimelineFlow().test {
             awaitItem().also { state ->
                 assertThat(state).isEqualTo(liveTimeline)
@@ -144,10 +144,10 @@ class TimelineControllerTest {
                 )
             )
         )
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
         assertThat(sut.timelineItems().first()).hasSize(1)
     }
 
@@ -165,11 +165,11 @@ class TimelineControllerTest {
         val detachedTimeline = FakeTimeline(name = "detached").apply {
             sendMessageLambda = lambdaForDetached
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) }
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
         sut.activeTimelineFlow().test {
             sut.focusOnEvent(AN_EVENT_ID)
             awaitItem().also { state ->
@@ -190,11 +190,11 @@ class TimelineControllerTest {
     fun `test last forward pagination on a detached timeline should switch to live timeline`() = runTest {
         val liveTimeline = FakeTimeline(name = "live")
         val detachedTimeline = FakeTimeline(name = "detached")
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) }
         )
-        val sut = TimelineController(matrixRoom)
+        val sut = TimelineController(joinedRoom)
 
         sut.activeTimelineFlow().test {
             awaitItem().also { state ->
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
index 6c81745ce4..5e9aa3e214 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
@@ -30,7 +30,7 @@ import io.element.android.features.poll.test.actions.FakeSendPollResponseAction
 import io.element.android.features.roomcall.api.aStandByCallState
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
@@ -43,7 +43,8 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
@@ -128,9 +129,9 @@ import kotlin.time.Duration.Companion.seconds
                 )
             )
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = timeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
+            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) })
         )
         val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = false)
         val presenter = createTimelinePresenter(
@@ -144,7 +145,7 @@ import kotlin.time.Duration.Companion.seconds
             val initialState = awaitFirstItem()
             initialState.eventSink.invoke(TimelineEvents.OnScrollFinished(0))
             runCurrent()
-            assertThat(room.markAsReadCalls).isNotEmpty()
+            assertThat(room.baseRoom.markAsReadCalls).isNotEmpty()
             cancelAndIgnoreRemainingEvents()
         }
     }
@@ -481,10 +482,10 @@ import kotlin.time.Duration.Companion.seconds
         val liveTimeline = FakeTimeline(
             timelineItems = flowOf(emptyList())
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = liveTimeline,
             createTimelineResult = { Result.success(detachedTimeline) },
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
+            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
         )
         val presenter = createTimelinePresenter(
             room = room,
@@ -523,7 +524,7 @@ import kotlin.time.Duration.Companion.seconds
             process(listOf(aMessageEvent(eventId = AN_EVENT_ID)))
         }
         val presenter = createTimelinePresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline(
                     timelineItems = flowOf(
                         listOf(
@@ -534,7 +535,7 @@ import kotlin.time.Duration.Companion.seconds
                         )
                     )
                 ),
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
             ),
             timelineItemIndexer = timelineItemIndexer,
         )
@@ -557,12 +558,12 @@ import kotlin.time.Duration.Companion.seconds
     @Test
     fun `present - focus on event error case`() = runTest {
         val presenter = createTimelinePresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 liveTimeline = FakeTimeline(
                     timelineItems = flowOf(emptyList()),
                 ),
                 createTimelineResult = { Result.failure(Throwable("An error")) },
-                canUserSendMessageResult = { _, _ -> Result.success(true) },
+                baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -628,11 +629,11 @@ import kotlin.time.Duration.Companion.seconds
                 )
             )
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = timeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) },
+            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Unknown)
+            givenRoomMembersState(RoomMembersState.Unknown)
         }
 
         val avatarUrl = "https://domain.com/avatar.jpg"
@@ -647,7 +648,7 @@ import kotlin.time.Duration.Companion.seconds
             assertThat(event.readReceiptState.receipts.first().avatarData.url).isNull()
 
             room.givenRoomMembersState(
-                MatrixRoomMembersState.Ready(
+                RoomMembersState.Ready(
                     persistentListOf(aRoomMember(userId = A_USER_ID, avatarUrl = avatarUrl))
                 )
             )
@@ -663,9 +664,9 @@ import kotlin.time.Duration.Companion.seconds
 
     private fun TestScope.createTimelinePresenter(
         timeline: Timeline = FakeTimeline(),
-        room: FakeMatrixRoom = FakeMatrixRoom(
+        room: FakeJoinedRoom = FakeJoinedRoom(
             liveTimeline = timeline,
-            canUserSendMessageResult = { _, _ -> Result.success(true) }
+            baseRoom = FakeBaseRoom(canUserSendMessageResult = { _, _ -> Result.success(true) }),
         ),
         redactedVoiceMessageManager: RedactedVoiceMessageManager = FakeRedactedVoiceMessageManager(),
         messagesNavigator: FakeMessagesNavigator = FakeMessagesNavigator(),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
index ba9bc0cdd7..115c8a9690 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryPresenterTest.kt
@@ -12,12 +12,12 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.messages.impl.timeline.model.anAggregatedReaction
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.collections.immutable.persistentListOf
@@ -32,8 +32,8 @@ class ReactionSummaryPresenterTest {
     private val aggregatedReaction = anAggregatedReaction(userId = A_USER_ID, key = "👍", isHighlighted = true)
     private val roomMember = aRoomMember(userId = A_USER_ID, avatarUrl = AN_AVATAR_URL, displayName = A_USER_NAME)
     private val summaryEvent = ReactionSummaryEvents.ShowReactionSummary(AN_EVENT_ID, listOf(aggregatedReaction), aggregatedReaction.key)
-    private val room = FakeMatrixRoom().apply {
-        givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(roomMember)))
+    private val room = FakeBaseRoom().apply {
+        givenRoomMembersState(RoomMembersState.Ready(persistentListOf(roomMember)))
     }
     private val presenter = ReactionSummaryPresenter(room)
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
index 6da5b38185..ac8e2a5290 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/protection/TimelineProtectionPresenterTest.kt
@@ -9,10 +9,10 @@ package io.element.android.features.messages.impl.timeline.protection
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.media.MediaPreviewValue
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
 import io.element.android.libraries.preferences.test.InMemoryAppPreferencesStore
@@ -55,7 +55,7 @@ class TimelineProtectionPresenterTest {
     @Test
     fun `present - media preview value private in public room`() = runTest {
         val appPreferencesStore = InMemoryAppPreferencesStore(timelineMediaPreviewValue = MediaPreviewValue.Private)
-        val room = FakeMatrixRoom(initialRoomInfo = aRoomInfo(joinRule = JoinRule.Public))
+        val room = FakeBaseRoom(initialRoomInfo = aRoomInfo(joinRule = JoinRule.Public))
         val presenter = createPresenter(appPreferencesStore, room)
         presenter.test {
             skipItems(1)
@@ -72,7 +72,7 @@ class TimelineProtectionPresenterTest {
     @Test
     fun `present - media preview value private in non public room`() = runTest {
         val appPreferencesStore = InMemoryAppPreferencesStore(timelineMediaPreviewValue = MediaPreviewValue.Private)
-        val room = FakeMatrixRoom(initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite))
+        val room = FakeBaseRoom(initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite))
         val presenter = createPresenter(appPreferencesStore, room)
         presenter.test {
             val initialState = awaitItem()
@@ -85,7 +85,7 @@ class TimelineProtectionPresenterTest {
 
     private fun createPresenter(
         appPreferencesStore: AppPreferencesStore = InMemoryAppPreferencesStore(),
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: BaseRoom = FakeBaseRoom(),
     ) = TimelineProtectionPresenter(
         appPreferencesStore = appPreferencesStore,
         room = room,
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
index 505829772b..5b1f7f8654 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/typing/TypingNotificationPresenterTest.kt
@@ -13,19 +13,20 @@ import app.cash.turbine.Event
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID_3
 import io.element.android.libraries.matrix.test.A_USER_ID_4
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -50,12 +51,13 @@ class TypingNotificationPresenterTest {
 
     @Test
     fun `present - typing notification disabled`() = runTest {
-        val room = FakeMatrixRoom()
+        val typingMembersFlow = MutableStateFlow<List<UserId>>(emptyList())
+        val room = FakeJoinedRoom(roomTypingMembersFlow = typingMembersFlow)
         val sessionPreferencesStore = InMemorySessionPreferencesStore(
-            isRenderTypingNotificationsEnabled = false
+            isRenderTypingNotificationsEnabled = false,
         )
         val presenter = createPresenter(
-            matrixRoom = room,
+            joinedRoom = room,
             sessionPreferencesStore = sessionPreferencesStore,
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -65,7 +67,7 @@ class TypingNotificationPresenterTest {
             val initialState = awaitItem()
             assertThat(initialState.renderTypingNotifications).isFalse()
             assertThat(initialState.typingMembers).isEmpty()
-            room.givenRoomTypingMembers(listOf(A_USER_ID_2))
+            typingMembersFlow.emit(listOf(A_USER_ID_2))
             expectNoEvents()
             // Preferences changes
             sessionPreferencesStore.setRenderTypingNotifications(true)
@@ -89,14 +91,15 @@ class TypingNotificationPresenterTest {
 
     @Test
     fun `present - state is updated when a member is typing, member is not known`() = runTest {
-        val room = FakeMatrixRoom()
-        val presenter = createPresenter(matrixRoom = room)
+        val typingMembersFlow = MutableStateFlow<List<UserId>>(emptyList())
+        val room = FakeJoinedRoom(roomTypingMembersFlow = typingMembersFlow)
+        val presenter = createPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.typingMembers).isEmpty()
-            room.givenRoomTypingMembers(listOf(A_USER_ID_2))
+            typingMembersFlow.emit(listOf(A_USER_ID_2))
             val oneMemberTypingState = awaitItem()
             assertThat(oneMemberTypingState.typingMembers.size).isEqualTo(1)
             assertThat(oneMemberTypingState.typingMembers.first()).isEqualTo(
@@ -105,7 +108,7 @@ class TypingNotificationPresenterTest {
                 )
             )
             // User stops typing
-            room.givenRoomTypingMembers(emptyList())
+            typingMembersFlow.emit(emptyList())
             skipItems(1)
             val finalState = awaitItem()
             assertThat(finalState.typingMembers).isEmpty()
@@ -115,9 +118,10 @@ class TypingNotificationPresenterTest {
     @Test
     fun `present - state is updated when a member is typing, member is known`() = runTest {
         val aKnownRoomMember = createKnownRoomMember(userId = A_USER_ID_2)
-        val room = FakeMatrixRoom().apply {
+        val typingMembersFlow = MutableStateFlow<List<UserId>>(emptyList())
+        val room = FakeJoinedRoom(roomTypingMembersFlow = typingMembersFlow).apply {
             givenRoomMembersState(
-                MatrixRoomMembersState.Ready(
+                RoomMembersState.Ready(
                     listOf(
                         createKnownRoomMember(A_USER_ID),
                         aKnownRoomMember,
@@ -127,13 +131,13 @@ class TypingNotificationPresenterTest {
                 )
             )
         }
-        val presenter = createPresenter(matrixRoom = room)
+        val presenter = createPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.typingMembers).isEmpty()
-            room.givenRoomTypingMembers(listOf(A_USER_ID_2))
+            typingMembersFlow.emit(listOf(A_USER_ID_2))
             val oneMemberTypingState = awaitItem()
             assertThat(oneMemberTypingState.typingMembers.size).isEqualTo(1)
             assertThat(oneMemberTypingState.typingMembers.first()).isEqualTo(
@@ -142,7 +146,7 @@ class TypingNotificationPresenterTest {
                 )
             )
             // User stops typing
-            room.givenRoomTypingMembers(emptyList())
+            typingMembersFlow.emit(emptyList())
             skipItems(1)
             val finalState = awaitItem()
             assertThat(finalState.typingMembers).isEmpty()
@@ -152,14 +156,15 @@ class TypingNotificationPresenterTest {
     @Test
     fun `present - state is updated when a member is typing, member is not known, then known`() = runTest {
         val aKnownRoomMember = createKnownRoomMember(A_USER_ID_2)
-        val room = FakeMatrixRoom()
-        val presenter = createPresenter(matrixRoom = room)
+        val typingMembersFlow = MutableStateFlow<List<UserId>>(emptyList())
+        val room = FakeJoinedRoom(roomTypingMembersFlow = typingMembersFlow)
+        val presenter = createPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.typingMembers).isEmpty()
-            room.givenRoomTypingMembers(listOf(A_USER_ID_2))
+            typingMembersFlow.emit(listOf(A_USER_ID_2))
             val oneMemberTypingState = awaitItem()
             assertThat(oneMemberTypingState.typingMembers.size).isEqualTo(1)
             assertThat(oneMemberTypingState.typingMembers.first()).isEqualTo(
@@ -169,7 +174,7 @@ class TypingNotificationPresenterTest {
             )
             // User is getting known
             room.givenRoomMembersState(
-                MatrixRoomMembersState.Ready(
+                RoomMembersState.Ready(
                     listOf(aKnownRoomMember).toImmutableList()
                 )
             )
@@ -185,19 +190,20 @@ class TypingNotificationPresenterTest {
 
     @Test
     fun `present - reserveSpace becomes true once we get the first typing notification with room members`() = runTest {
-        val room = FakeMatrixRoom()
-        val presenter = createPresenter(matrixRoom = room)
+        val typingMembersFlow = MutableStateFlow<List<UserId>>(emptyList())
+        val room = FakeJoinedRoom(roomTypingMembersFlow = typingMembersFlow)
+        val presenter = createPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
             val initialState = awaitItem()
             assertThat(initialState.typingMembers).isEmpty()
-            room.givenRoomTypingMembers(listOf(A_USER_ID_2))
+            typingMembersFlow.emit(listOf(A_USER_ID_2))
             skipItems(1)
             val updatedTypingState = awaitItem()
             assertThat(updatedTypingState.reserveSpace).isTrue()
             // User stops typing
-            room.givenRoomTypingMembers(emptyList())
+            typingMembersFlow.emit(emptyList())
             // Is still true for all future events
             val futureEvents = cancelAndConsumeRemainingEvents()
             for (event in futureEvents) {
@@ -209,14 +215,14 @@ class TypingNotificationPresenterTest {
     }
 
     private fun createPresenter(
-        matrixRoom: MatrixRoom = FakeMatrixRoom().apply {
+        joinedRoom: JoinedRoom = FakeJoinedRoom().apply {
             givenRoomInfo(aRoomInfo(id = roomId, name = ""))
         },
         sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(
             isRenderTypingNotificationsEnabled = true
         ),
     ) = TypingNotificationPresenter(
-        room = matrixRoom,
+        room = joinedRoom,
         sessionPreferencesStore = sessionPreferencesStore,
     )
 
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
index 5c3e694062..b3938dd229 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessageComposerPresenterTest.kt
@@ -23,7 +23,7 @@ import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.media.AudioInfo
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaplayer.test.FakeMediaPlayer
 import io.element.android.libraries.mediaupload.api.MediaSender
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
@@ -64,11 +64,11 @@ class VoiceMessageComposerPresenterTest {
         lambdaRecorder<File, AudioInfo, List<Float>, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-    private val matrixRoom = FakeMatrixRoom(
+    private val joinedRoom = FakeJoinedRoom(
         sendVoiceMessageResult = sendVoiceMessageResult
     )
     private val mediaPreProcessor = FakeMediaPreProcessor().apply { givenAudioResult() }
-    private val mediaSender = MediaSender(mediaPreProcessor, matrixRoom, InMemorySessionPreferencesStore())
+    private val mediaSender = MediaSender(mediaPreProcessor, joinedRoom, InMemorySessionPreferencesStore())
     private val messageComposerContext = FakeMessageComposerContext()
 
     companion object {
diff --git a/features/onboarding/impl/src/main/res/values-cy/translations.xml b/features/onboarding/impl/src/main/res/values-cy/translations.xml
index f56f8f8a54..070736e5dc 100644
--- a/features/onboarding/impl/src/main/res/values-cy/translations.xml
+++ b/features/onboarding/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_onboarding_sign_in_manually">"Mewngofnodwch â llaw"</string>
+  <string name="screen_onboarding_sign_in_with_qr_code">"Mewngofnodwch gyda chod QR"</string>
   <string name="screen_onboarding_sign_up">"Creu cyfrif"</string>
+  <string name="screen_onboarding_welcome_message">"Croeso i\'r %1$s cyflymaf erioed. Yn nodedig am gyflymder a symlrwydd."</string>
+  <string name="screen_onboarding_welcome_subtitle">"Croeso i %1$s. Yn nodedig ar gyfer cyflymder a symlrwydd."</string>
+  <string name="screen_onboarding_welcome_title">"Byddwch yn eich elfen"</string>
 </resources>
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
index 18bb164778..33c2aa589d 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultEndPollAction.kt
@@ -12,13 +12,13 @@ import im.vector.app.features.analytics.plan.PollEnd
 import io.element.android.features.poll.api.actions.EndPollAction
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import javax.inject.Inject
 
 @ContributesBinding(RoomScope::class)
 class DefaultEndPollAction @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val analyticsService: AnalyticsService,
 ) : EndPollAction {
     override suspend fun execute(pollStartId: EventId): Result<Unit> {
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
index d11be46cdc..cade3e9bef 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/actions/DefaultSendPollResponseAction.kt
@@ -12,13 +12,13 @@ import im.vector.app.features.analytics.plan.PollVote
 import io.element.android.features.poll.api.actions.SendPollResponseAction
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import javax.inject.Inject
 
 @ContributesBinding(RoomScope::class)
 class DefaultSendPollResponseAction @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val analyticsService: AnalyticsService,
 ) : SendPollResponseAction {
     override suspend fun execute(pollStartId: EventId, answerId: String): Result<Unit> {
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
index 77853e378e..f8384279bf 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
@@ -178,8 +178,14 @@ fun CreatePollView(
                         supportingContent = { Text(text = stringResource(id = R.string.screen_create_poll_anonymous_desc)) },
                         trailingContent = ListItemContent.Switch(
                             checked = state.pollKind == PollKind.Undisclosed,
-                            onChange = { state.eventSink(CreatePollEvents.SetPollKind(if (it) PollKind.Undisclosed else PollKind.Disclosed)) },
                         ),
+                        onClick = {
+                            state.eventSink(
+                                CreatePollEvents.SetPollKind(
+                                    if (state.pollKind == PollKind.Disclosed) PollKind.Undisclosed else PollKind.Disclosed
+                                )
+                            )
+                        },
                     )
                     if (state.canDelete) {
                         ListItem(
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
index f258444fc3..cde6c569a9 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/data/PollRepository.kt
@@ -9,7 +9,7 @@ package io.element.android.features.poll.impl.data
 
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 import io.element.android.libraries.matrix.api.timeline.getActiveTimeline
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 
 class PollRepository @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val timelineProvider: TimelineProvider,
 ) {
     suspend fun getPoll(eventId: EventId): Result<PollContent> = runCatching {
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
index d4da6a76b4..cef19ef687 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenter.kt
@@ -23,7 +23,7 @@ import io.element.android.features.poll.impl.history.model.PollHistoryFilter
 import io.element.android.features.poll.impl.history.model.PollHistoryItems
 import io.element.android.features.poll.impl.history.model.PollHistoryItemsFactory
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.map
@@ -35,7 +35,7 @@ class PollHistoryPresenter @Inject constructor(
     private val sendPollResponseAction: SendPollResponseAction,
     private val endPollAction: EndPollAction,
     private val pollHistoryItemFactory: PollHistoryItemsFactory,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
 ) : Presenter<PollHistoryState> {
     @Composable
     override fun present(): PollHistoryState {
diff --git a/features/poll/impl/src/main/res/values-cy/translations.xml b/features/poll/impl/src/main/res/values-cy/translations.xml
index 372fca182f..49cf5f02cf 100644
--- a/features/poll/impl/src/main/res/values-cy/translations.xml
+++ b/features/poll/impl/src/main/res/values-cy/translations.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_create_poll_add_option_btn">"Ychwanegu dewis"</string>
+  <string name="screen_create_poll_anonymous_desc">"Dangos canlyniadau dim ond ar ôl i\'r pleidleisio ddod i ben"</string>
+  <string name="screen_create_poll_anonymous_headline">"Cuddio pleidleisiau"</string>
+  <string name="screen_create_poll_answer_hint">"Dewis %1$d"</string>
   <string name="screen_create_poll_cancel_confirmation_content_android">"Dyw eich newidiadau heb gael eu cadw. Ydych chi\'n siŵr eich bod am fynd nôl?"</string>
-  <string name="screen_create_poll_title">"Creu Pôl"</string>
-  <string name="screen_edit_poll_delete_confirmation_title">"Dileu Pôl"</string>
-  <string name="screen_edit_poll_title">"Golygu pôl"</string>
+  <string name="screen_create_poll_question_desc">"Cwestiwn neu bwnc"</string>
+  <string name="screen_create_poll_question_hint">"Am beth mae\'r bleidlais?"</string>
+  <string name="screen_create_poll_title">"Creu Pleidlais"</string>
+  <string name="screen_edit_poll_delete_confirmation">"Ydych chi\'n siŵr eich bod am ddileu\'r bleidlais hon?"</string>
+  <string name="screen_edit_poll_delete_confirmation_title">"Dileu Pleidlais"</string>
+  <string name="screen_edit_poll_title">"Golygu pleidlais"</string>
+  <string name="screen_polls_history_empty_ongoing">"Methu dod o hyd i unrhyw bleidleisiau cyfredol."</string>
+  <string name="screen_polls_history_empty_past">"Methu dod o hyd i unrhyw bleidleisiau blaenorol."</string>
   <string name="screen_polls_history_filter_ongoing">"Parhaus"</string>
-  <string name="screen_polls_history_title">"Polau"</string>
+  <string name="screen_polls_history_filter_past">"Gorffennol"</string>
+  <string name="screen_polls_history_title">"Pleidleisiau"</string>
 </resources>
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
index 76ccc1ffac..6493fc30a7 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenterTest.kt
@@ -21,12 +21,11 @@ import io.element.android.features.poll.impl.anOngoingPollContent
 import io.element.android.features.poll.impl.data.PollRepository
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.LiveTimelineProvider
 import io.element.android.services.analytics.test.FakeAnalyticsService
@@ -52,7 +51,7 @@ class CreatePollPresenterTest {
     private val timeline = FakeTimeline(
         timelineItems = aPollTimelineItems(mapOf(pollEventId to existingPoll))
     )
-    private val fakeMatrixRoom = FakeMatrixRoom(
+    private val fakeJoinedRoom = FakeJoinedRoom(
         liveTimeline = timeline
     )
     private val fakeAnalyticsService = FakeAnalyticsService()
@@ -81,7 +80,7 @@ class CreatePollPresenterTest {
 
     @Test
     fun `in edit mode, if poll doesn't exist, error is tracked and screen is closed`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             liveTimeline = FakeTimeline()
         )
         val presenter = createCreatePollPresenter(mode = CreatePollMode.EditPoll(AN_EVENT_ID), room = room)
@@ -121,7 +120,7 @@ class CreatePollPresenterTest {
     fun `create poll sends a poll start event`() = runTest {
         val createPollResult = lambdaRecorder<String, List<String>, Int, PollKind, Result<Unit>> { _, _, _, _ -> Result.success(Unit) }
         val presenter = createCreatePollPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createPollResult = createPollResult
             ),
             mode = CreatePollMode.NewPoll,
@@ -169,7 +168,7 @@ class CreatePollPresenterTest {
             Result.failure(error)
         }
         val presenter = createCreatePollPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createPollResult = createPollResult
             ),
             mode = CreatePollMode.NewPoll,
@@ -258,7 +257,7 @@ class CreatePollPresenterTest {
             Result.failure<Unit>(error)
         }
         val presenter = createCreatePollPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 editPollResult = editPollResult,
                 liveTimeline = timeline,
             ),
@@ -551,7 +550,7 @@ class CreatePollPresenterTest {
 
     private fun createCreatePollPresenter(
         mode: CreatePollMode = CreatePollMode.NewPoll,
-        room: MatrixRoom = fakeMatrixRoom,
+        room: FakeJoinedRoom = fakeJoinedRoom,
     ): CreatePollPresenter = CreatePollPresenter(
         repository = PollRepository(room, LiveTimelineProvider(room)),
         analyticsService = fakeAnalyticsService,
diff --git a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
index f4f5147f82..c20d608dff 100644
--- a/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
+++ b/features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/history/PollHistoryPresenterTest.kt
@@ -22,12 +22,11 @@ import io.element.android.features.poll.impl.model.DefaultPollContentStateFactor
 import io.element.android.features.poll.test.actions.FakeEndPollAction
 import io.element.android.features.poll.test.actions.FakeSendPollResponseAction
 import io.element.android.libraries.dateformatter.test.FakeDateFormatter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.assert
@@ -57,7 +56,7 @@ class PollHistoryPresenterTest {
         ),
         backwardPaginationStatus = backwardPaginationStatus
     )
-    private val room = FakeMatrixRoom(
+    private val room = FakeJoinedRoom(
         liveTimeline = timeline
     )
 
@@ -155,7 +154,7 @@ class PollHistoryPresenterTest {
     }
 
     private fun TestScope.createPollHistoryPresenter(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: FakeJoinedRoom = FakeJoinedRoom(),
         appCoroutineScope: CoroutineScope = this,
         endPollAction: EndPollAction = FakeEndPollAction(),
         sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(),
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
index ab97062e4c..18ba93b639 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
@@ -49,8 +49,8 @@ fun AdvancedSettingsView(
             title = stringResource(id = CommonStrings.common_appearance),
             selectedOption = state.theme,
             options = ThemeOption.entries.toPersistentList(),
-            onSelectOption = { logLevel ->
-                state.eventSink(AdvancedSettingsEvents.SetTheme(logLevel))
+            onSelectOption = { themeOption ->
+                state.eventSink(AdvancedSettingsEvents.SetTheme(themeOption))
             }
         )
         ListItem(
diff --git a/features/preferences/impl/src/main/res/values-cy/translations.xml b/features/preferences/impl/src/main/res/values-cy/translations.xml
index d9dbc069d7..da0308b003 100644
--- a/features/preferences/impl/src/main/res/values-cy/translations.xml
+++ b/features/preferences/impl/src/main/res/values-cy/translations.xml
@@ -2,24 +2,68 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="full_screen_intent_banner_message">"Er mwyn sicrhau fyddwch chi ddim yn colli galwad bwysig, newidiwch eich gosodiadau i ganiatáu hysbysiadau sgrin lawn pan fydd eich ffôn wedi\'i gloi."</string>
   <string name="full_screen_intent_banner_title">"Gwella profiad eich galwadau"</string>
+  <string name="screen_advanced_settings_choose_distributor_dialog_title_android">"Dewiswch sut i dderbyn hysbysiadau"</string>
+  <string name="screen_advanced_settings_developer_mode">"Modd datblygwr"</string>
+  <string name="screen_advanced_settings_developer_mode_description">"Galluogi i gael mynediad at nodweddion a swyddogaethau datblygwyr."</string>
   <string name="screen_advanced_settings_element_call_base_url">"URL sylfaen Galwad Element Cyfaddas"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"Gosod URL sylfaen cyfaddas ar gyfer Galwad Element."</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"URL annilys, gwnewch yn siŵr eich bod yn cynnwys y protocol (http/https) a\'r cyfeiriad cywir."</string>
   <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Cuddio afatarau yn y ceisiadau gwahoddiad i ystafell"</string>
   <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Cuddio rhagolygon cyfryngau yn y llinell amser"</string>
+  <string name="screen_advanced_settings_media_compression_description">"Llwythwch i fyny lluniau a fideos yn gynt a lleihau\'r defnydd o ddata"</string>
+  <string name="screen_advanced_settings_media_compression_title">"Optimeiddio ansawdd y cyfryngau"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Cymedroli a Diogelwch"</string>
+  <string name="screen_advanced_settings_push_provider_android">"Darparwr hysbysiad gwthio"</string>
+  <string name="screen_advanced_settings_rich_text_editor_description">"Analluogi\'r golygydd testun cyfoethog i deipio Markdown â llaw."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Derbynebau darllen"</string>
+  <string name="screen_advanced_settings_send_read_receipts_description">"Os wedi\'i ddiffodd, fydd eich derbynebau darllen ddim yn cael eu hanfon at unrhyw un. Byddwch yn dal i dderbyn derbynebau darllen gan ddefnyddwyr eraill."</string>
+  <string name="screen_advanced_settings_share_presence">"Rhannu presenoldeb"</string>
+  <string name="screen_advanced_settings_share_presence_description">"Os wedi\'i ddiffodd, fyddwch chi ddim yn gallu anfon na derbyn derbynebau wedi\'u darllen na hysbysiadau teipio."</string>
   <string name="screen_advanced_settings_show_media_timeline_always_hide">"Cuddio bob tro"</string>
   <string name="screen_advanced_settings_show_media_timeline_always_show">"Dangos bob tro"</string>
   <string name="screen_advanced_settings_show_media_timeline_private_rooms">"Mewn ystafelloedd preifat"</string>
   <string name="screen_advanced_settings_show_media_timeline_subtitle">"Mae modd dangos cyfrwng cudd trwy dapio arno"</string>
   <string name="screen_advanced_settings_show_media_timeline_title">"Dangos cyfryngau mewn llinell amser"</string>
+  <string name="screen_advanced_settings_view_source_description">"Galluogi\'r dewis i weld ffynhonnell y neges yn y llinell amser."</string>
+  <string name="screen_blocked_users_empty">"Does gennych chi ddim defnyddwyr sydd wedi\'u rhwystro"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Dad-rwystro"</string>
+  <string name="screen_blocked_users_unblock_alert_description">"Byddwch yn gallu gweld pob neges oddi wrthyn nhw eto."</string>
+  <string name="screen_blocked_users_unblock_alert_title">"Dadrwystro defnyddiwr"</string>
+  <string name="screen_blocked_users_unblocking">"Wrthi\'n dadrwystro…"</string>
   <string name="screen_edit_profile_display_name">"Enw dangos"</string>
+  <string name="screen_edit_profile_display_name_placeholder">"Eich enw dangos"</string>
+  <string name="screen_edit_profile_error">"Cafwyd gwall anhysbys a doedd dim modd newid y manylion."</string>
+  <string name="screen_edit_profile_error_title">"Methu diweddaru\'r proffil"</string>
   <string name="screen_edit_profile_title">"Golygu proffil"</string>
+  <string name="screen_edit_profile_updating_details">"Yn diweddaru proffil…"</string>
   <string name="screen_notification_settings_additional_settings_section_title">"Gosodiadau ychwanegol"</string>
+  <string name="screen_notification_settings_calls_label">"Galwadau sain a fideo"</string>
+  <string name="screen_notification_settings_configuration_mismatch">"Anghydweddiad y ffurfweddiad"</string>
+  <string name="screen_notification_settings_configuration_mismatch_description">"Rydym wedi symleiddio\'r Gosodiadau Hysbysiadau i\'w gwneud yn haws dod o hyd i ddewisiadau. Nid yw rhai gosodiadau cyfaddas rydych chi wedi\'u dewis yn y gorffennol yn cael eu dangos yma, ond maen nhw\'n dal yn weithredol.
+
+Os ewch ymlaen, efallai y bydd rhai o\'ch gosodiadau\'n newid."</string>
+  <string name="screen_notification_settings_direct_chats">"Sgyrsiau uniongyrchol"</string>
+  <string name="screen_notification_settings_edit_custom_settings_section_title">"Gosodiad cyfaddas fesul sgwrs"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Digwyddodd gwall wrth ddiweddaru\'r gosodiad hysbysu."</string>
+  <string name="screen_notification_settings_edit_mode_all_messages">"Pob neges"</string>
+  <string name="screen_notification_settings_edit_mode_mentions_and_keywords">"Crybwylliadau ac Allweddeiriau\'n unig"</string>
+  <string name="screen_notification_settings_edit_screen_direct_section_header">"Ar sgyrsiau uniongyrchol, rhoi gwybod i mi am"</string>
+  <string name="screen_notification_settings_edit_screen_group_section_header">"Ar sgyrsiau grŵp, rhoi gwybod i mi am"</string>
+  <string name="screen_notification_settings_enable_notifications">"Galluogi hysbysiadau ar y ddyfais hon"</string>
+  <string name="screen_notification_settings_failed_fixing_configuration">"Nid yw\'r ffurfweddiad wedi\'i gywiro, ceisiwch eto."</string>
+  <string name="screen_notification_settings_group_chats">"Sgyrsiau grŵp"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Gwahoddiadau"</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Nid yw eich gweinydd cartref yn cefnogi\'r dewis hwn mewn ystafelloedd sydd wedi\'u hamgryptio, efallai fyddwch chi ddim yn cael gwybod mewn rhai ystafelloedd."</string>
   <string name="screen_notification_settings_mentions_section_title">"Crybwyll"</string>
   <string name="screen_notification_settings_mode_all">"Y Cyfan"</string>
   <string name="screen_notification_settings_mode_mentions">"Crybwyll"</string>
+  <string name="screen_notification_settings_notification_section_title">"Rhoi gwybod i mi am"</string>
+  <string name="screen_notification_settings_room_mention_label">"Rhoi gwybod i mi ar @ystafell"</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"I dderbyn hysbysiadau, newidiwch eich %1$s."</string>
+  <string name="screen_notification_settings_system_notifications_action_required_content_link">"gosodiadau system"</string>
+  <string name="screen_notification_settings_system_notifications_turned_off">"Hysbysiadau system wedi\'u diffodd"</string>
   <string name="screen_notification_settings_title">"Hysbysiadau"</string>
+  <string name="troubleshoot_notifications_entry_point_push_history_title">"Hanes gwthio"</string>
+  <string name="troubleshoot_notifications_entry_point_section">"Datrys Problemau"</string>
+  <string name="troubleshoot_notifications_entry_point_title">"Hysbysiadau datrys problemau"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-el/translations.xml b/features/preferences/impl/src/main/res/values-el/translations.xml
index 7b388644a1..7c6c7982a1 100644
--- a/features/preferences/impl/src/main/res/values-el/translations.xml
+++ b/features/preferences/impl/src/main/res/values-el/translations.xml
@@ -8,14 +8,22 @@
   <string name="screen_advanced_settings_element_call_base_url">"Προσαρμοσμένο URL βάσης κλήσεων Element"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"Όρισε μια προσαρμοσμένη διεύθυνση βάσης URL για κλήση Element."</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Μη έγκυρη διεύθυνση URL, βεβαιώσου ότι έχεις συμπεριλάβει το πρωτόκολλο (http/https) και τη σωστή διεύθυνση."</string>
+  <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Απόκρυψη εικόνων προφίλ σε αιτήματα πρόσκλησης δωματίου"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Απόκρυψη προεπισκοπήσεων πολυμέσων στο timeline"</string>
   <string name="screen_advanced_settings_media_compression_description">"Ανέβασε φωτογραφίες και βίντεο γρηγορότερα και μείωσε τη χρήση δεδομένων"</string>
   <string name="screen_advanced_settings_media_compression_title">"Βελτιστοποίηση ποιότητας των μέσων"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"Συντονισμός και Ασφάλεια"</string>
   <string name="screen_advanced_settings_push_provider_android">"Πάροχος ειδοποιήσεων push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Απενεργοποίησε τον επεξεργαστή εμπλουτισμένου κειμένου για να πληκτρολογήσεις Markdown χειροκίνητα."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Αποδεικτικά ανάγνωσης"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Εάν απενεργοποιηθεί, τα αποδεικτικά ανάγνωσης δεν θα στέλνονται σε κανέναν. Θα εξακολουθείς να λαμβάνεις αποδεικτικά ανάγνωσης από άλλους χρήστες."</string>
   <string name="screen_advanced_settings_share_presence">"Κοινή χρήση παρουσίας"</string>
   <string name="screen_advanced_settings_share_presence_description">"Εάν απενεργοποιηθεί, δεν θα μπορείς να στέλνεις ή να λαμβάνεις αποδεικτικά ανάγνωσης ή ειδοποιήσεις πληκτρολόγησης."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Πάντα απόκρυψη"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Πάντα εμφάνιση"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"Σε ιδιωτικά δωμάτια"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Ένα κρυφό πολυμέσο μπορεί πάντα να εμφανιστεί πατώντας το"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Εμφάνιση πολυμέσων στο timeline"</string>
   <string name="screen_advanced_settings_view_source_description">"Ενεργοποίησε την επιλογή για προβολή πηγής μηνυμάτων στη ροή."</string>
   <string name="screen_blocked_users_empty">"Δεν έχεις αποκλεισμένους χρήστες"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Άρση αποκλεισμού"</string>
@@ -51,10 +59,11 @@
   <string name="screen_notification_settings_mode_mentions">"Αναφορές"</string>
   <string name="screen_notification_settings_notification_section_title">"Ειδοποίησέ με για"</string>
   <string name="screen_notification_settings_room_mention_label">"Ειδοποίηση για @room"</string>
-  <string name="screen_notification_settings_system_notifications_action_required">"Για να λαμβάνεις ειδοποιήσεις, άλλαξε το %1$s ."</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Για να λαμβάνεις ειδοποιήσεις, άλλαξε το %1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"ρυθμίσεις συστήματος"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Ειδοποιήσεις συστήματος ανενεργές"</string>
   <string name="screen_notification_settings_title">"Ειδοποιήσεις"</string>
+  <string name="troubleshoot_notifications_entry_point_push_history_title">"Ιστορικό push"</string>
   <string name="troubleshoot_notifications_entry_point_section">"Αντιμετώπιση προβλημάτων"</string>
   <string name="troubleshoot_notifications_entry_point_title">"Αντιμετώπιση προβλημάτων ειδοποιήσεων"</string>
 </resources>
diff --git a/features/preferences/impl/src/main/res/values-fa/translations.xml b/features/preferences/impl/src/main/res/values-fa/translations.xml
index f0cf54cea0..3e12cdd0cb 100644
--- a/features/preferences/impl/src/main/res/values-fa/translations.xml
+++ b/features/preferences/impl/src/main/res/values-fa/translations.xml
@@ -5,10 +5,17 @@
   <string name="screen_advanced_settings_developer_mode">"حالت توسعه‌دهنده"</string>
   <string name="screen_advanced_settings_element_call_base_url">"نشانی پایهٔ تماس المنتی سفارشی"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"تنظمی نشانی پایه‌‌ای سفارشی برای تماس المنتی."</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"نهفتن رسانه در خط زمانی"</string>
+  <string name="screen_advanced_settings_media_compression_title">"بهینه سازی کیفیت رسانه"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"نظارت و امنیت"</string>
   <string name="screen_advanced_settings_push_provider_android">"فراهم کنندهٔ آگاهی‌های ارسالی"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"از کار انداختن ویرایشگر متن غنی یا نوشتن دستی مارک‌دون."</string>
   <string name="screen_advanced_settings_send_read_receipts">"رسید‌های خواندن"</string>
   <string name="screen_advanced_settings_share_presence">"هم‌رسانی حضور"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"نهفتن همیشگی"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"نمایش همیشگی"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"در اتاق‌های خصوصی"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"نمایش رسانه در خط زمانی"</string>
   <string name="screen_blocked_users_empty">"هیچ کاربر مسدودی ندارید"</string>
   <string name="screen_blocked_users_unblock_alert_action">"رفع انسداد"</string>
   <string name="screen_blocked_users_unblock_alert_description">"قادر خواهید بود دوباره همهٔ پیام‌هایش را ببینید."</string>
diff --git a/features/preferences/impl/src/main/res/values-pl/translations.xml b/features/preferences/impl/src/main/res/values-pl/translations.xml
index 2764270e44..8ae089b170 100644
--- a/features/preferences/impl/src/main/res/values-pl/translations.xml
+++ b/features/preferences/impl/src/main/res/values-pl/translations.xml
@@ -8,14 +8,22 @@
   <string name="screen_advanced_settings_element_call_base_url">"Własny bazowy URL dla połączeń Element"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"Ustaw własny bazowy URL dla połączeń Element"</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"Nieprawidłowy adres URL, upewnij się, że zawiera protokół (http/https) i poprawny adres."</string>
+  <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"Ukryj awatary w prośbach o dołączenie do pokoju"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"Ukryj podglądy multimediów na osi czasu"</string>
   <string name="screen_advanced_settings_media_compression_description">"Przesyłaj zdjęcia i filmy szybciej, zmniejszając zużycie danych"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optymalizuj jakość multimediów"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"Moderacja i bezpieczeństwo"</string>
   <string name="screen_advanced_settings_push_provider_android">"Dostawca powiadomień push"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Wyłącz edytor tekstu bogatego, aby pisać tekst Markdown ręcznie."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Potwierdzenia odczytania"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"Gdy wyłączona, Twoje potwierdzenia odczytania nie zostaną wysłane. Potwierdzenia od innych wciąż będą odbierane."</string>
   <string name="screen_advanced_settings_share_presence">"Udostępnij obecność"</string>
   <string name="screen_advanced_settings_share_presence_description">"Gdy wyłączona, nie będziesz mógł wysyłać lub odbierać potwierdzeń odczytu ani powiadomień pisania."</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"Zawsze ukrywaj"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"Zawsze pokazuj"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"W pokojach prywatnych"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"Ukryte media można zawsze wyświetlić, dotykając ich"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"Pokaż media na osi czasu"</string>
   <string name="screen_advanced_settings_view_source_description">"Włącz opcję, aby wyświetlić źródło wiadomości na osi czasu."</string>
   <string name="screen_blocked_users_empty">"Nie blokujesz żadnych użytkowników"</string>
   <string name="screen_blocked_users_unblock_alert_action">"Odblokuj"</string>
@@ -51,7 +59,7 @@ Niektóre ustawienia mogą ulec zmianie, jeśli kontynuujesz."</string>
   <string name="screen_notification_settings_mode_mentions">"Wzmianki"</string>
   <string name="screen_notification_settings_notification_section_title">"Powiadamiaj mnie przez"</string>
   <string name="screen_notification_settings_room_mention_label">"Powiadom mnie na @pokój"</string>
-  <string name="screen_notification_settings_system_notifications_action_required">"Aby otrzymywać powiadomienia, zmień swoje%1$s ."</string>
+  <string name="screen_notification_settings_system_notifications_action_required">"Aby otrzymywać powiadomienia, zmień swoje%1$s."</string>
   <string name="screen_notification_settings_system_notifications_action_required_content_link">"ustawienia systemowe"</string>
   <string name="screen_notification_settings_system_notifications_turned_off">"Powiadomienia systemowe wyłączone"</string>
   <string name="screen_notification_settings_title">"Powiadomienia"</string>
diff --git a/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml b/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
index b590cd95f8..4e4970c49c 100644
--- a/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/features/preferences/impl/src/main/res/values-zh-rTW/translations.xml
@@ -8,14 +8,22 @@
   <string name="screen_advanced_settings_element_call_base_url">"自訂 Element 通話基礎 URL"</string>
   <string name="screen_advanced_settings_element_call_base_url_description">"設定 Element 通話的自訂基礎 URL。"</string>
   <string name="screen_advanced_settings_element_call_base_url_validation_error">"無效的 URL，請確定包含了協定 (http/https) 與正確的地址。"</string>
+  <string name="screen_advanced_settings_hide_invite_avatars_toggle_title">"在聊天室邀請請求中隱藏大頭貼"</string>
+  <string name="screen_advanced_settings_hide_timeline_media_toggle_title">"在時間軸中隱藏媒體預覽"</string>
   <string name="screen_advanced_settings_media_compression_description">"上傳照片與影片更快且減少資料使用量"</string>
   <string name="screen_advanced_settings_media_compression_title">"最佳化媒體品質"</string>
+  <string name="screen_advanced_settings_moderation_and_safety_section_title">"管理與安全"</string>
   <string name="screen_advanced_settings_push_provider_android">"推播通知提供者"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"手動輸入 Markdown，停用格式化文字編輯器。"</string>
   <string name="screen_advanced_settings_send_read_receipts">"已讀回條"</string>
   <string name="screen_advanced_settings_send_read_receipts_description">"若關閉，您的讀取回條將不會傳送給任何人。您仍然會收到來自其他使用者的讀取回條。"</string>
   <string name="screen_advanced_settings_share_presence">"分享動態"</string>
   <string name="screen_advanced_settings_share_presence_description">"若關閉，您將無法傳送或接收讀取回條或輸入通知。"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_hide">"永遠隱藏"</string>
+  <string name="screen_advanced_settings_show_media_timeline_always_show">"永遠顯示"</string>
+  <string name="screen_advanced_settings_show_media_timeline_private_rooms">"在私人聊天室中"</string>
+  <string name="screen_advanced_settings_show_media_timeline_subtitle">"隨時可以透過點選來顯示隱藏媒體"</string>
+  <string name="screen_advanced_settings_show_media_timeline_title">"在時間軸中顯示媒體"</string>
   <string name="screen_advanced_settings_view_source_description">"啟用選項以在時間軸中檢視訊息來源。"</string>
   <string name="screen_blocked_users_empty">"您並未封鎖使用者"</string>
   <string name="screen_blocked_users_unblock_alert_action">"解除封鎖"</string>
diff --git a/features/rageshake/api/src/main/res/values-cy/translations.xml b/features/rageshake/api/src/main/res/values-cy/translations.xml
index 2081e88ef9..c576aed469 100644
--- a/features/rageshake/api/src/main/res/values-cy/translations.xml
+++ b/features/rageshake/api/src/main/res/values-cy/translations.xml
@@ -2,4 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crash_detection_dialog_content">"Chwalodd %1$s y tro diwethaf iddo gael ei ddefnyddio. Hoffech chi rannu adroddiad gwall gyda ni?"</string>
   <string name="rageshake_detection_dialog_content">"Mae\'n ymddangos eich bod yn ysgwyd y ffôn mewn rhwystredigaeth. Hoffech chi agor y sgrin adrodd gwallau?"</string>
+  <string name="settings_rageshake">"Rageshake"</string>
+  <string name="settings_rageshake_detection_threshold">"Trothwy canfod"</string>
 </resources>
diff --git a/features/rageshake/impl/src/main/res/values-cy/translations.xml b/features/rageshake/impl/src/main/res/values-cy/translations.xml
index a18eb215b5..414733f4a9 100644
--- a/features/rageshake/impl/src/main/res/values-cy/translations.xml
+++ b/features/rageshake/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bug_report_attach_screenshot">"Atodwch lun sgrin"</string>
+  <string name="screen_bug_report_contact_me">"Gallwch gysylltu â mi os oes gennych unrhyw gwestiynau dilynol."</string>
+  <string name="screen_bug_report_contact_me_title">"Cysylltwch â mi"</string>
+  <string name="screen_bug_report_edit_screenshot">"Golygu\'r llun sgrin"</string>
+  <string name="screen_bug_report_editor_description">"Disgrifiwch y broblem. Beth wnaethoch chi? Beth oeddech chi\'n disgwyl i ddigwydd? Beth ddigwyddodd mewn gwirionedd. Ewch i gymaint o fanylion ag y gallwch."</string>
+  <string name="screen_bug_report_editor_placeholder">"Disgrifiwch y broblem…"</string>
+  <string name="screen_bug_report_editor_supporting">"Os yn bosibl, ysgrifennwch y disgrifiad yn Saesneg."</string>
+  <string name="screen_bug_report_error_description_too_short">"Mae\'r disgrifiad yn rhy fyr, rhowch fwy o fanylion am yr hyn ddigwyddodd. Diolch!"</string>
+  <string name="screen_bug_report_include_crash_logs">"Anfonwch logiau chwalu"</string>
+  <string name="screen_bug_report_include_logs">"Caniatáu logiau"</string>
+  <string name="screen_bug_report_include_screenshot">"Anfon luniau sgrin"</string>
+  <string name="screen_bug_report_logs_description">"Bydd cofnodion yn cael eu cynnwys gyda\'ch neges i wneud yn siŵr bod popeth yn gweithio\'n iawn. I anfon eich neges heb logiau, diffoddwch y gosodiad hwn."</string>
   <string name="screen_bug_report_rash_logs_alert_title">"Chwalodd %1$s y tro diwethaf iddo gael ei ddefnyddio. Hoffech chi rannu adroddiad gwall gyda ni?"</string>
+  <string name="screen_bug_report_view_logs">"Gweld logiau"</string>
 </resources>
diff --git a/features/reportroom/api/build.gradle.kts b/features/reportroom/api/build.gradle.kts
new file mode 100644
index 0000000000..f5499b7a74
--- /dev/null
+++ b/features/reportroom/api/build.gradle.kts
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+plugins {
+    id("io.element.android-compose-library")
+}
+
+android {
+    namespace = "io.element.android.features.reportroom.api"
+}
+
+dependencies {
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+}
diff --git a/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt b/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt
new file mode 100644
index 0000000000..7f531fb9e3
--- /dev/null
+++ b/features/reportroom/api/src/main/kotlin/io/element/android/features/reportroom/api/ReportRoomEntryPoint.kt
@@ -0,0 +1,17 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.api
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import io.element.android.libraries.architecture.FeatureEntryPoint
+import io.element.android.libraries.matrix.api.core.RoomId
+
+interface ReportRoomEntryPoint : FeatureEntryPoint {
+    fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node
+}
diff --git a/features/reportroom/impl/build.gradle.kts b/features/reportroom/impl/build.gradle.kts
new file mode 100644
index 0000000000..d60cc76f8d
--- /dev/null
+++ b/features/reportroom/impl/build.gradle.kts
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+import extension.setupAnvil
+
+plugins {
+    id("io.element.android-compose-library")
+    id("kotlin-parcelize")
+}
+
+android {
+    namespace = "io.element.android.features.reportroom.impl"
+    testOptions {
+        unitTests {
+            isIncludeAndroidResources = true
+        }
+    }
+}
+
+setupAnvil()
+
+dependencies {
+    api(projects.features.reportroom.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.uiStrings)
+
+    testImplementation(libs.test.junit)
+    testImplementation(libs.coroutines.test)
+    testImplementation(libs.molecule.runtime)
+    testImplementation(libs.test.truth)
+    testImplementation(libs.test.turbine)
+    testImplementation(projects.libraries.matrix.test)
+    testImplementation(projects.tests.testutils)
+    testImplementation(libs.androidx.compose.ui.test.junit)
+    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
+    testImplementation(libs.test.robolectric)
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt
new file mode 100644
index 0000000000..d3131040d9
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomEntryPoint.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.libraries.architecture.createNode
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.matrix.api.core.RoomId
+import javax.inject.Inject
+
+@ContributesBinding(AppScope::class)
+class DefaultReportRoomEntryPoint @Inject constructor() : ReportRoomEntryPoint {
+    override fun createNode(parentNode: Node, buildContext: BuildContext, roomId: RoomId): Node {
+        return parentNode.createNode<ReportRoomNode>(buildContext, plugins = listOf(ReportRoomNode.Inputs(roomId)))
+    }
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt
new file mode 100644
index 0000000000..55ccb25417
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoom.kt
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
+import javax.inject.Inject
+
+interface ReportRoom {
+    suspend operator fun invoke(
+        roomId: RoomId,
+        shouldReport: Boolean,
+        reason: String,
+        shouldLeave: Boolean,
+    ): Result<Unit>
+
+    sealed class Exception : kotlin.Exception() {
+        data object RoomNotFound : Exception()
+        data object LeftRoomFailed : Exception()
+        data object ReportRoomFailed : Exception()
+    }
+}
+
+@ContributesBinding(SessionScope::class)
+class DefaultReportRoom @Inject constructor(
+    private val client: MatrixClient,
+) : ReportRoom {
+    override suspend operator fun invoke(
+        roomId: RoomId,
+        shouldReport: Boolean,
+        reason: String,
+        shouldLeave: Boolean
+    ): Result<Unit> {
+        val room = client.getRoom(roomId)
+            ?: return Result.failure(ReportRoom.Exception.RoomNotFound)
+
+        if (shouldReport) {
+            room
+                .reportRoom(reason.takeIf { it.isNotBlank() })
+                .onFailure {
+                    return Result.failure(ReportRoom.Exception.ReportRoomFailed)
+                }
+        }
+        if (shouldLeave) {
+            room
+                .leave()
+                .onFailure {
+                    return Result.failure(ReportRoom.Exception.LeftRoomFailed)
+                }
+        }
+        return Result.success(Unit)
+    }
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt
new file mode 100644
index 0000000000..e72f00e2a9
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomEvents.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+sealed interface ReportRoomEvents {
+    data class UpdateReason(val reason: String) : ReportRoomEvents
+    data object ToggleLeaveRoom : ReportRoomEvents
+    data object Report : ReportRoomEvents
+    data object ClearReportAction : ReportRoomEvents
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt
new file mode 100644
index 0000000000..0c24d6db74
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomNode.kt
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+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 dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.anvilannotations.ContributesNode
+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(SessionScope::class)
+class ReportRoomNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    presenterFactory: ReportRoomPresenter.Factory,
+) : Node(buildContext, plugins = plugins) {
+    data class Inputs(val roomId: RoomId) : NodeInputs
+
+    private val roomId = inputs<Inputs>().roomId
+    private val presenter: ReportRoomPresenter = presenterFactory.create(roomId = roomId)
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        val state = presenter.present()
+        ReportRoomView(
+            state = state,
+            modifier = modifier,
+            onBackClick = ::navigateUp,
+        )
+    }
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt
new file mode 100644
index 0000000000..30ccb9e20c
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenter.kt
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.architecture.runUpdatingState
+import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+class ReportRoomPresenter @AssistedInject constructor(
+    @Assisted private val roomId: RoomId,
+    private val reportRoom: ReportRoom,
+) : Presenter<ReportRoomState> {
+    @AssistedFactory
+    interface Factory {
+        fun create(roomId: RoomId): ReportRoomPresenter
+    }
+
+    @Composable
+    override fun present(): ReportRoomState {
+        var reason by rememberSaveable { mutableStateOf("") }
+        var leaveRoom by rememberSaveable { mutableStateOf(false) }
+        var reportAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
+
+        val coroutineScope = rememberCoroutineScope()
+
+        fun handleEvents(event: ReportRoomEvents) {
+            when (event) {
+                ReportRoomEvents.Report -> coroutineScope.reportRoom(reason, leaveRoom, reportAction)
+                ReportRoomEvents.ToggleLeaveRoom -> {
+                    leaveRoom = !leaveRoom
+                }
+                is ReportRoomEvents.UpdateReason -> {
+                    reason = event.reason
+                }
+                ReportRoomEvents.ClearReportAction -> {
+                    reportAction.value = AsyncAction.Uninitialized
+                }
+            }
+        }
+        return ReportRoomState(
+            reason = reason,
+            leaveRoom = leaveRoom,
+            reportAction = reportAction.value,
+            eventSink = ::handleEvents
+        )
+    }
+
+    private fun CoroutineScope.reportRoom(
+        reason: String,
+        shouldLeave: Boolean,
+        action: MutableState<AsyncAction<Unit>>
+    ) = launch {
+        val previousFailure = action.value as? AsyncAction.Failure
+        val shouldReport = previousFailure?.error !is ReportRoom.Exception.LeftRoomFailed
+        runUpdatingState(action) {
+            reportRoom(
+                roomId = roomId,
+                shouldReport = shouldReport,
+                reason = reason,
+                shouldLeave = shouldLeave
+            )
+        }
+    }
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt
new file mode 100644
index 0000000000..a04f24123b
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomState.kt
@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import io.element.android.libraries.architecture.AsyncAction
+
+data class ReportRoomState(
+    val reason: String,
+    val leaveRoom: Boolean,
+    val reportAction: AsyncAction<Unit>,
+    val eventSink: (ReportRoomEvents) -> Unit
+) {
+    val canReport: Boolean = reason.isNotBlank()
+}
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt
new file mode 100644
index 0000000000..1e89a31adb
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomStateProvider.kt
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
+
+open class ReportRoomStateProvider : PreviewParameterProvider<ReportRoomState> {
+    companion object {
+        private const val A_REPORT_ROOM_REASON = "Inappropriate content"
+    }
+
+    override val values: Sequence<ReportRoomState>
+        get() = sequenceOf(
+            aReportRoomState(),
+            aReportRoomState(reason = A_REPORT_ROOM_REASON),
+            aReportRoomState(leaveRoom = true),
+            aReportRoomState(reason = A_REPORT_ROOM_REASON, reportAction = AsyncAction.Loading),
+            aReportRoomState(reason = A_REPORT_ROOM_REASON, reportAction = AsyncAction.Failure(Exception("Failed to report"))),
+        )
+}
+
+fun aReportRoomState(
+    reason: String = "",
+    leaveRoom: Boolean = false,
+    reportAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
+    eventSink: (ReportRoomEvents) -> Unit = {}
+) = ReportRoomState(
+    reason = reason,
+    leaveRoom = leaveRoom,
+    reportAction = reportAction,
+    eventSink = eventSink,
+)
diff --git a/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt
new file mode 100644
index 0000000000..6421b7d576
--- /dev/null
+++ b/features/reportroom/impl/src/main/kotlin/io/element/android/features/reportroom/impl/ReportRoomView.kt
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
+import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.list.ListItemContent
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.aliasScreenTitle
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ListItem
+import io.element.android.libraries.designsystem.theme.components.Scaffold
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextField
+import io.element.android.libraries.designsystem.theme.components.TopAppBar
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ReportRoomView(
+    state: ReportRoomState,
+    onBackClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val focusManager = LocalFocusManager.current
+
+    val isReporting = state.reportAction is AsyncAction.Loading
+    AsyncActionView(
+        async = state.reportAction,
+        onSuccess = { onBackClick() },
+        errorTitle = { failure ->
+            when (failure) {
+                is ReportRoom.Exception.LeftRoomFailed -> stringResource(R.string.screen_report_room_leave_failed_alert_title)
+                else -> stringResource(CommonStrings.dialog_title_error)
+            }
+        },
+        errorMessage = { failure ->
+            when (failure) {
+                is ReportRoom.Exception.LeftRoomFailed -> stringResource(R.string.screen_report_room_leave_failed_alert_message)
+                else -> stringResource(CommonStrings.error_unknown)
+            }
+        },
+        onRetry = {
+            state.eventSink(ReportRoomEvents.Report)
+        },
+        onErrorDismiss = { state.eventSink(ReportRoomEvents.ClearReportAction) }
+    )
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        stringResource(R.string.screen_report_room_title),
+                        style = ElementTheme.typography.aliasScreenTitle,
+                    )
+                },
+                navigationIcon = {
+                    BackButton(onClick = onBackClick)
+                }
+            )
+        },
+        modifier = modifier
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                    .padding(padding)
+                    .consumeWindowInsets(padding)
+                    .imePadding()
+                    .fillMaxSize()
+                    .verticalScroll(rememberScrollState())
+                    .padding(vertical = 16.dp)
+        ) {
+            TextField(
+                value = state.reason,
+                onValueChange = { state.eventSink(ReportRoomEvents.UpdateReason(it)) },
+                placeholder = stringResource(R.string.screen_report_room_reason_placeholder),
+                minLines = 3,
+                enabled = !isReporting,
+                modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp)
+                        .heightIn(min = 90.dp),
+                supportingText = stringResource(R.string.screen_report_room_reason_footer),
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            ListItem(
+                modifier = Modifier.padding(end = 8.dp),
+                headlineContent = {
+                    Text(text = stringResource(CommonStrings.action_leave_room))
+                },
+                onClick = {
+                    state.eventSink(ReportRoomEvents.ToggleLeaveRoom)
+                },
+                trailingContent = ListItemContent.Switch(checked = state.leaveRoom)
+            )
+
+            Spacer(modifier = Modifier.height(24.dp))
+
+            Button(
+                text = stringResource(CommonStrings.action_report),
+                enabled = state.canReport && !isReporting,
+                destructive = true,
+                showProgress = isReporting,
+                onClick = {
+                    focusManager.clearFocus(force = true)
+                    state.eventSink(ReportRoomEvents.Report)
+                },
+                modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp)
+            )
+        }
+    }
+}
+
+@PreviewsDayNight
+@Composable
+internal fun ReportRoomViewPreview(
+    @PreviewParameter(ReportRoomStateProvider::class) state: ReportRoomState
+) = ElementPreview {
+    ReportRoomView(
+        state = state,
+        onBackClick = {},
+    )
+}
diff --git a/features/reportroom/impl/src/main/res/values-cs/translations.xml b/features/reportroom/impl/src/main/res/values-cs/translations.xml
new file mode 100644
index 0000000000..809cfb68a5
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-cs/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Vaše hlášení bylo úspěšně odesláno, ale při pokusu o opuštění místnosti jsme narazili na problém. Zkuste to prosím znovu."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Nelze opustit místnost"</string>
+  <string name="screen_report_room_reason_footer">"Nahlaste tuto místnost svému administrátorovi. Pokud jsou zprávy zašifrované, váš administrátor je nebude moci číst."</string>
+  <string name="screen_report_room_reason_placeholder">"Popište důvod…"</string>
+  <string name="screen_report_room_title">"Nahlásit místnost"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-cy/translations.xml b/features/reportroom/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..89c44c2d0d
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-cy/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Cyflwynwyd eich adroddiad yn llwyddiannus, ond cododd problem wrth geisio gadael yr ystafell. Ceisiwch eto."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Methu Gadael yr Ystafell"</string>
+  <string name="screen_report_room_reason_footer">"Adroddwch yr ystafell hon i\'ch gweinyddwr. Os yw\'r negeseuon wedi\'u hamgryptio, fydd eich gweinyddwr ddim yn gallu eu darllen."</string>
+  <string name="screen_report_room_reason_placeholder">"Disgrifiwch y rheswm…"</string>
+  <string name="screen_report_room_title">"Adrodd ar ystafell"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-de/translations.xml b/features/reportroom/impl/src/main/res/values-de/translations.xml
new file mode 100644
index 0000000000..6d379818d6
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-de/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Ihr Bericht wurde erfolgreich übermittelt, aber beim Versuch, den Raum zu verlassen, ist ein Problem aufgetreten. Bitte versuchen Sie es erneut."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Der Chatroom kann nicht verlassen werden"</string>
+  <string name="screen_report_room_reason_footer">"Melden Sie diesen Chatroom Ihrem Administrator. Wenn die Nachrichten verschlüsselt sind, kann Ihr Administrator sie nicht lesen."</string>
+  <string name="screen_report_room_reason_placeholder">"Beschreiben Sie den Grund…"</string>
+  <string name="screen_report_room_title">"Chatroom melden"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-el/translations.xml b/features/reportroom/impl/src/main/res/values-el/translations.xml
new file mode 100644
index 0000000000..d8789dcd31
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-el/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Η αναφορά σας υποβλήθηκε με επιτυχία, αλλά αντιμετωπίσαμε πρόβλημα κατά την προσπάθεια αποχώρησης από το δωμάτιο. Παρακαλώ προσπαθήστε ξανά."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Δεν είναι δυνατή η αποχώρηση από το δωμάτιο"</string>
+  <string name="screen_report_room_reason_footer">"Αναφέρετε αυτό το δωμάτιο στον διαχειριστή σας. Εάν τα μηνύματα είναι κρυπτογραφημένα, ο διαχειριστής σας δε θα μπορεί να τα διαβάσει."</string>
+  <string name="screen_report_room_reason_placeholder">"Περιγράψτε τον λόγο αναφοράς…"</string>
+  <string name="screen_report_room_title">"Αναφορά δωματίου"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-et/translations.xml b/features/reportroom/impl/src/main/res/values-et/translations.xml
new file mode 100644
index 0000000000..1cc6e6b277
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-et/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Jututoast haldajale teatamine õnnestus, kuid jututost lahkumisel tekkis viga. Palun proovi uuesti lahkuda."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Pole võimalik lahkuda jututoast"</string>
+  <string name="screen_report_room_reason_footer">"Teata sellest jututoast süsteemi haldajale. Kui sõnumid on krüptitud, ei saa haldaja neid lugeda."</string>
+  <string name="screen_report_room_reason_placeholder">"Kirjelda põhjust…"</string>
+  <string name="screen_report_room_title">"Teata jututoast"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-fa/translations.xml b/features/reportroom/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..9930e9ceac
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-fa/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="screen_report_room_leave_failed_alert_title">"ناتوان از ترک اتاق"</string>
+  <string name="screen_report_room_reason_placeholder">"شرح دلیل گزارش…"</string>
+  <string name="screen_report_room_title">"گزارش اتاق"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-fi/translations.xml b/features/reportroom/impl/src/main/res/values-fi/translations.xml
new file mode 100644
index 0000000000..cf23910f8b
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-fi/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Ilmoituksesi lähetettiin onnistuneesti, mutta kohtasimme ongelman yrittäessämme poistua huoneesta. Yritä uudelleen."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Huoneesta poistuminen epäonnistui"</string>
+  <string name="screen_report_room_reason_footer">"Ilmoita tästä huoneesta palvelimesi ylläpitäjälle. Jos viestit on salattu, ylläpitäjäsi ei voi lukea niitä."</string>
+  <string name="screen_report_room_reason_placeholder">"Kuvaile syytä…"</string>
+  <string name="screen_report_room_title">"Ilmoita huoneesta"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-fr/translations.xml b/features/reportroom/impl/src/main/res/values-fr/translations.xml
new file mode 100644
index 0000000000..51376e34ea
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-fr/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Votre rapport a été envoyé avec succès, mais nous avons rencontré un problème en essayant de quitter le salon. Veuillez réessayer."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Impossible de quitter le salon"</string>
+  <string name="screen_report_room_reason_footer">"Signaler ce salon à votre admin. Si les messages sont chiffrés, votre admin ne pourra pas les lire."</string>
+  <string name="screen_report_room_reason_placeholder">"Décrivez la raison…"</string>
+  <string name="screen_report_room_title">"Signaler le salon"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-hu/translations.xml b/features/reportroom/impl/src/main/res/values-hu/translations.xml
new file mode 100644
index 0000000000..dcf563eb8e
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-hu/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"A jelentése sikeresen el lett küldve, de hibát találtunk a szoba elhagyása során. Próbálja újra."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Nem tudja elhagyni a szobát"</string>
+  <string name="screen_report_room_reason_footer">"A szoba jelentése a rendszergazdának. Ha az üzenetek titkosítva vannak, akkor a rendszergazda nem fogja tudni elolvasni őket."</string>
+  <string name="screen_report_room_reason_placeholder">"Írja le az okot…"</string>
+  <string name="screen_report_room_title">"Szoba jelentése"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-nb/translations.xml b/features/reportroom/impl/src/main/res/values-nb/translations.xml
new file mode 100644
index 0000000000..bda1334210
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-nb/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Rapporten din ble sendt inn, men vi oppdaget et problem da vi prøvde å forlate rommet. Prøv igjen."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Kan ikke forlate rommet"</string>
+  <string name="screen_report_room_reason_footer">"Rapporter dette rommet til administratoren din. Hvis meldingene er kryptert, vil administratoren ikke kunne lese dem."</string>
+  <string name="screen_report_room_reason_placeholder">"Beskriv årsaken…"</string>
+  <string name="screen_report_room_title">"Rapporter rom"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-pl/translations.xml b/features/reportroom/impl/src/main/res/values-pl/translations.xml
new file mode 100644
index 0000000000..dd1b928e81
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-pl/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Twoje zgłoszenie zostało wysłane pomyślnie, ale napotkaliśmy problem podczas opuszczania pokoju. Spróbuj ponownie."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Nie można wyjść z pokoju"</string>
+  <string name="screen_report_room_reason_footer">"Zgłoś ten pokój swojemu administratorowi. Jeśli wiadomości są zaszyfrowane, administrator nie będzie mógł ich odczytać."</string>
+  <string name="screen_report_room_reason_placeholder">"Opisz powód…"</string>
+  <string name="screen_report_room_title">"Zgłoś pokój"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-ru/translations.xml b/features/reportroom/impl/src/main/res/values-ru/translations.xml
new file mode 100644
index 0000000000..de5871f29f
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-ru/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="screen_report_room_leave_failed_alert_title">"Невозможно покинуть комнату"</string>
+  <string name="screen_report_room_reason_footer">"Сообщите об этой комнате своему администратору. Если сообщения зашифрованы, ваш администратор не сможет их прочитать."</string>
+  <string name="screen_report_room_reason_placeholder">"Опишите причину…"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-sk/translations.xml b/features/reportroom/impl/src/main/res/values-sk/translations.xml
new file mode 100644
index 0000000000..87abe2f4af
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-sk/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Vaša správa bola úspešne odoslaná, ale pri pokuse o opustenie miestnosti sme narazili na problém. Skúste to prosím znova."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Nie je možné opustiť miestnosť"</string>
+  <string name="screen_report_room_reason_footer">"Nahláste túto miestnosť svojmu správcovi. Ak sú správy zašifrované, váš správca ich nebude môcť prečítať."</string>
+  <string name="screen_report_room_reason_placeholder">"Popíšte dôvod…"</string>
+  <string name="screen_report_room_title">"Nahlásiť miestnosť"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-sv/translations.xml b/features/reportroom/impl/src/main/res/values-sv/translations.xml
new file mode 100644
index 0000000000..174949b87d
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-sv/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Din anmälan skickades in framgångsrikt, men vi stötte på ett problem när vi försökte lämna rummet. Vänligen försök igen."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Kunde inte lämna rummet"</string>
+  <string name="screen_report_room_reason_footer">"Anmäl det här rummet till din administratör. Om meddelandena är krypterade kommer din administratör inte att kunna läsa dem."</string>
+  <string name="screen_report_room_reason_placeholder">"Beskriv anledningen …"</string>
+  <string name="screen_report_room_title">"Rapportera rum"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-uk/translations.xml b/features/reportroom/impl/src/main/res/values-uk/translations.xml
new file mode 100644
index 0000000000..e720852848
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-uk/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Ваша скарга надіслана, але ми зіткнулися з проблемою під час спроби вийти з кімнати. Повторіть спробу."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Не вдалося вийти з кімнати"</string>
+  <string name="screen_report_room_reason_footer">"Поскаржтеся на цю кімнату своєму адміністратору. Якщо повідомлення зашифровані, ваш адміністратор не зможе їх прочитати."</string>
+  <string name="screen_report_room_reason_placeholder">"Опишіть причину…"</string>
+  <string name="screen_report_room_title">"Поскаржитися на кімнату"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values-zh-rTW/translations.xml b/features/reportroom/impl/src/main/res/values-zh-rTW/translations.xml
new file mode 100644
index 0000000000..fa63e0fb1d
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values-zh-rTW/translations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"您的回報已成功遞交，但我們嘗試離開聊天室時遇到了問題。請再試一次。"</string>
+  <string name="screen_report_room_leave_failed_alert_title">"無法離開聊天室"</string>
+  <string name="screen_report_room_reason_footer">"將此聊天室回報給您的管理員。若訊息已加密，您的管理員將無法讀取它們。"</string>
+  <string name="screen_report_room_title">"回報聊天室"</string>
+</resources>
diff --git a/features/reportroom/impl/src/main/res/values/localazy.xml b/features/reportroom/impl/src/main/res/values/localazy.xml
new file mode 100644
index 0000000000..16183e6f1b
--- /dev/null
+++ b/features/reportroom/impl/src/main/res/values/localazy.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_report_room_leave_failed_alert_message">"Your report was submitted successfully, but we encountered an issue while trying to leave the room. Please try again."</string>
+  <string name="screen_report_room_leave_failed_alert_title">"Unable to Leave Room"</string>
+  <string name="screen_report_room_reason_footer">"Report this room to your admin. If the messages are encrypted, your admin will not be able to read them."</string>
+  <string name="screen_report_room_reason_placeholder">"Describe the reason to report…"</string>
+  <string name="screen_report_room_title">"Report room"</string>
+</resources>
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt
new file mode 100644
index 0000000000..fc410ab08f
--- /dev/null
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/DefaultReportRoomTest.kt
@@ -0,0 +1,150 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.FakeMatrixClient
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class DefaultReportRoomTest {
+    private val roomId = A_ROOM_ID
+    private val successLeaveRoomLambda = lambdaRecorder<Result<Unit>> { -> Result.success(Unit) }
+    private val successReportRoomLambda =
+        lambdaRecorder<String?, Result<Unit>> { _ -> Result.success(Unit) }
+
+    private val failureLeaveRoomLambda =
+        lambdaRecorder<Result<Unit>> { -> Result.failure(Exception("Leave room error")) }
+    private val failureReportRoomLambda =
+        lambdaRecorder<String?, Result<Unit>> { _ -> Result.failure(Exception("Report room error")) }
+
+    @Test
+    fun `report room, leave=false, report=false, nothing is called`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = false, reason = "", shouldLeave = false)
+
+        assertThat(result.isSuccess).isTrue()
+        assert(successLeaveRoomLambda).isNeverCalled()
+        assert(successReportRoomLambda).isNeverCalled()
+    }
+
+    @Test
+    fun `report room, leave=false, report=true, report room success`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = true, reason = "Spam", shouldLeave = false)
+
+        assertThat(result.isSuccess).isTrue()
+        assert(successLeaveRoomLambda).isNeverCalled()
+        assert(successReportRoomLambda)
+            .isCalledOnce()
+            .with(value("Spam"))
+    }
+
+    @Test
+    fun `report room, leave=true, report=false, leave room success`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = false, reason = "", shouldLeave = true)
+
+        assertThat(result.isSuccess).isTrue()
+        assert(successLeaveRoomLambda).isCalledOnce()
+        assert(successReportRoomLambda).isNeverCalled()
+    }
+
+    @Test
+    fun `report room, leave=true, report=true, leave room success`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = true, reason = "Spam", shouldLeave = true)
+
+        assertThat(result.isSuccess).isTrue()
+        assert(successLeaveRoomLambda).isCalledOnce()
+        assert(successReportRoomLambda)
+            .isCalledOnce()
+            .with(value("Spam"))
+    }
+
+    @Test
+    fun `report room, leave=true, report=true, leave room failed`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = failureLeaveRoomLambda,
+            reportRoomResult = successReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = true, reason = "Spam", shouldLeave = true)
+
+        assertThat(result.isFailure).isTrue()
+        assertThat(result.exceptionOrNull()).isEqualTo(ReportRoom.Exception.LeftRoomFailed)
+        assert(failureLeaveRoomLambda).isCalledOnce()
+        assert(successReportRoomLambda).isCalledOnce()
+    }
+
+    @Test
+    fun `report room, leave=true, report=true, report room failed`() = runTest {
+        val room = FakeBaseRoom(
+            roomId = roomId,
+            leaveRoomLambda = successLeaveRoomLambda,
+            reportRoomResult = failureReportRoomLambda
+        )
+        val client = FakeMatrixClient().apply {
+            givenGetRoomResult(roomId, room)
+        }
+        val reportRoom = DefaultReportRoom(client = client)
+
+        val result = reportRoom(roomId, shouldReport = true, reason = "Spam", shouldLeave = true)
+
+        assertThat(result.isFailure).isTrue()
+        assertThat(result.exceptionOrNull()).isEqualTo(ReportRoom.Exception.ReportRoomFailed)
+        assert(successLeaveRoomLambda).isNeverCalled()
+        assert(failureReportRoomLambda).isCalledOnce()
+    }
+}
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt
new file mode 100644
index 0000000000..d85f2b86e8
--- /dev/null
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomPresenterTest.kt
@@ -0,0 +1,151 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import com.google.common.truth.Truth.assertThat
+import io.element.android.features.reportroom.impl.fakes.FakeReportRoom
+import io.element.android.libraries.architecture.AsyncAction
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.tests.testutils.lambda.any
+import io.element.android.tests.testutils.lambda.assert
+import io.element.android.tests.testutils.lambda.lambdaRecorder
+import io.element.android.tests.testutils.lambda.value
+import io.element.android.tests.testutils.test
+import kotlinx.coroutines.test.runTest
+import org.junit.Test
+
+class ReportRoomPresenterTest {
+    @Test
+    fun `present - initial state`() = runTest {
+        val presenter = createReportRoomPresenter()
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.reason).isEmpty()
+                assertThat(state.leaveRoom).isFalse()
+                assertThat(state.reportAction).isEqualTo(AsyncAction.Uninitialized)
+                assertThat(state.canReport).isFalse()
+            }
+        }
+    }
+
+    @Test
+    fun `present - update form values`() = runTest {
+        val presenter = createReportRoomPresenter()
+        presenter.test {
+            awaitItem().also { state ->
+                assertThat(state.reason).isEmpty()
+                assertThat(state.canReport).isFalse()
+                assertThat(state.leaveRoom).isFalse()
+                state.eventSink(ReportRoomEvents.UpdateReason("Spam"))
+            }
+            awaitItem().also { state ->
+                assertThat(state.reason).isEqualTo("Spam")
+                assertThat(state.canReport).isTrue()
+                assertThat(state.leaveRoom).isFalse()
+                state.eventSink(ReportRoomEvents.ToggleLeaveRoom)
+            }
+            awaitItem().also { state ->
+                assertThat(state.leaveRoom).isTrue()
+                assertThat(state.canReport).isTrue()
+                assertThat(state.canReport).isTrue()
+            }
+        }
+    }
+
+    @Test
+    fun `present - report room success`() = runTest {
+        val roomId = A_ROOM_ID
+        val reportRoomLambda = lambdaRecorder<RoomId, Boolean, String, Boolean, Result<Unit>> { _, _, _, _ -> Result.success(Unit) }
+        val reportRoom = FakeReportRoom(
+            lambda = reportRoomLambda
+        )
+        val presenter = createReportRoomPresenter(roomId = roomId, reportRoom = reportRoom)
+        presenter.test {
+            awaitItem().eventSink(ReportRoomEvents.ToggleLeaveRoom)
+            awaitItem().eventSink(ReportRoomEvents.Report)
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Loading::class.java)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Success::class.java)
+            }
+            assert(reportRoomLambda)
+                .isCalledOnce()
+                .with(value(roomId), value(true), any(), value(true))
+        }
+    }
+
+    @Test
+    fun `present - report failed`() = runTest {
+        val roomId = A_ROOM_ID
+        val reportRoomLambda = lambdaRecorder<RoomId, Boolean, String, Boolean, Result<Unit>> { _, _, _, _ ->
+            Result.failure(ReportRoom.Exception.ReportRoomFailed)
+        }
+        val reportRoom = FakeReportRoom(
+            lambda = reportRoomLambda
+        )
+        val presenter = createReportRoomPresenter(roomId = roomId, reportRoom = reportRoom)
+        presenter.test {
+            awaitItem().eventSink(ReportRoomEvents.Report)
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Loading::class.java)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Failure::class.java)
+            }
+            assert(reportRoomLambda)
+                .isCalledOnce()
+                .with(value(roomId), value(true), any(), any())
+        }
+    }
+
+    @Test
+    fun `present - leave room failed after report room success`() = runTest {
+        val roomId = A_ROOM_ID
+        val reportRoomLambda = lambdaRecorder<RoomId, Boolean, String, Boolean, Result<Unit>> { _, _, _, _ ->
+            Result.failure(ReportRoom.Exception.LeftRoomFailed)
+        }
+        val reportRoom = FakeReportRoom(
+            lambda = reportRoomLambda
+        )
+        val presenter = createReportRoomPresenter(roomId = roomId, reportRoom = reportRoom)
+        presenter.test {
+            awaitItem().eventSink(ReportRoomEvents.ToggleLeaveRoom)
+            awaitItem().eventSink(ReportRoomEvents.Report)
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Loading::class.java)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Failure::class.java)
+                state.eventSink(ReportRoomEvents.Report)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Loading::class.java)
+            }
+            awaitItem().also { state ->
+                assertThat(state.reportAction).isInstanceOf(AsyncAction.Failure::class.java)
+            }
+            assert(reportRoomLambda)
+                .isCalledExactly(2)
+                .withSequence(
+                    // The first call should report the room and try leaving it
+                    listOf(value(roomId), value(true), any(), value(true)),
+                    // The second call should not report the room again
+                    listOf(value(roomId), value(false), any(), value(true))
+                )
+        }
+    }
+
+    fun createReportRoomPresenter(
+        roomId: RoomId = A_ROOM_ID,
+        reportRoom: ReportRoom = FakeReportRoom()
+    ): ReportRoomPresenter {
+        return ReportRoomPresenter(roomId, reportRoom)
+    }
+}
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt
new file mode 100644
index 0000000000..13dc5eb204
--- /dev/null
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/ReportRoomViewTest.kt
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performTextInput
+import androidx.test.ext.junit.runners.AndroidJUnit4
+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 ReportRoomViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on back invoke the expected callback`() {
+        val eventsRecorder = EventsRecorder<ReportRoomEvents>(expectEvents = false)
+        ensureCalledOnce {
+            rule.setReportRoomView(
+                aReportRoomState(
+                    eventSink = eventsRecorder,
+                ),
+                onBackClick = it
+            )
+            rule.pressBack()
+        }
+    }
+
+    @Test
+    fun `clicking on report when enabled emits the expected event`() {
+        val eventsRecorder = EventsRecorder<ReportRoomEvents>()
+        rule.setReportRoomView(
+            aReportRoomState(
+                reason = "Spam",
+                eventSink = eventsRecorder,
+            ),
+        )
+        rule.clickOn(CommonStrings.action_report)
+        eventsRecorder.assertSingle(ReportRoomEvents.Report)
+    }
+
+    @Test
+    fun `clicking on decline when disabled does not emit event`() {
+        val eventsRecorder = EventsRecorder<ReportRoomEvents>(expectEvents = false)
+        rule.setReportRoomView(
+            aReportRoomState(eventSink = eventsRecorder),
+        )
+        rule.clickOn(CommonStrings.action_report)
+    }
+
+    @Test
+    fun `clicking on leave room option emits the expected event`() {
+        val eventsRecorder = EventsRecorder<ReportRoomEvents>()
+        rule.setReportRoomView(
+            aReportRoomState(eventSink = eventsRecorder),
+        )
+        rule.clickOn(CommonStrings.action_leave_room)
+        eventsRecorder.assertSingle(ReportRoomEvents.ToggleLeaveRoom)
+    }
+
+    @Test
+    fun `typing text in the reason field emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<ReportRoomEvents>()
+        rule.setReportRoomView(
+            aReportRoomState(
+                eventSink = eventsRecorder,
+                reason = ""
+            ),
+        )
+        rule.onNodeWithText("").performTextInput("Spam!")
+        eventsRecorder.assertSingle(ReportRoomEvents.UpdateReason("Spam!"))
+    }
+}
+
+private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setReportRoomView(
+    state: ReportRoomState,
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+) {
+    setContent {
+        ReportRoomView(
+            state = state,
+            onBackClick = onBackClick,
+        )
+    }
+}
diff --git a/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt
new file mode 100644
index 0000000000..35d2db3ad8
--- /dev/null
+++ b/features/reportroom/impl/src/test/kotlin/io/element/android/features/reportroom/impl/fakes/FakeReportRoom.kt
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+package io.element.android.features.reportroom.impl.fakes
+
+import io.element.android.features.reportroom.impl.ReportRoom
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+
+class FakeReportRoom(
+    var lambda: (RoomId, Boolean, String, Boolean) -> Result<Unit> = { _, _, _, _ -> lambdaError() }
+) : ReportRoom {
+    override suspend fun invoke(
+        roomId: RoomId,
+        shouldReport: Boolean,
+        reason: String,
+        shouldLeave: Boolean
+    ): Result<Unit> = simulateLongTask {
+        lambda(roomId, shouldReport, reason, shouldLeave)
+    }
+}
diff --git a/features/roomaliasresolver/impl/src/main/res/values-cy/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-cy/translations.xml
index f634d8444a..8e87e3a91d 100644
--- a/features/roomaliasresolver/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomaliasresolver/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_join_room_loading_alert_title">"Doedd dim modd dangos rhagolwg yr ystafell hon"</string>
+  <string name="screen_room_alias_resolver_resolve_alias_failure">"Wedi methu â datrys arallenw ystafell."</string>
 </resources>
diff --git a/features/roomaliasresolver/impl/src/main/res/values-el/translations.xml b/features/roomaliasresolver/impl/src/main/res/values-el/translations.xml
index 8b1725d64a..b5e577d89e 100644
--- a/features/roomaliasresolver/impl/src/main/res/values-el/translations.xml
+++ b/features/roomaliasresolver/impl/src/main/res/values-el/translations.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_join_room_loading_alert_title">"Δεν μπορέσαμε να εμφανίσουμε αυτήν την προεπισκόπηση δωματίου"</string>
   <string name="screen_room_alias_resolver_resolve_alias_failure">"Αποτυχία επίλυσης ψευδωνύμου δωματίου."</string>
 </resources>
diff --git a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
index d04d40b4ef..6df9f8103b 100644
--- a/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
+++ b/features/roomcall/impl/src/main/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenter.kt
@@ -16,12 +16,12 @@ import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.api.CurrentCallService
 import io.element.android.features.roomcall.api.RoomCallState
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.ui.room.canCall
 import javax.inject.Inject
 
 class RoomCallStatePresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val currentCallService: CurrentCallService,
 ) : Presenter<RoomCallState> {
     @Composable
diff --git a/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt b/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
index 23791eb444..9f99b9b1af 100644
--- a/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
+++ b/features/roomcall/impl/src/test/kotlin/io/element/android/features/roomcall/impl/RoomCallStatePresenterTest.kt
@@ -12,8 +12,9 @@ import io.element.android.features.call.api.CurrentCall
 import io.element.android.features.call.api.CurrentCallService
 import io.element.android.features.call.test.FakeCurrentCallService
 import io.element.android.features.roomcall.api.RoomCallState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.test
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -23,10 +24,12 @@ import org.junit.Test
 class RoomCallStatePresenterTest {
     @Test
     fun `present - initial state`() = runTest {
-        val room = FakeMatrixRoom(
-            canUserJoinCallResult = { Result.success(false) },
+        val room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                canUserJoinCallResult = { Result.success(false) },
+            )
         )
-        val presenter = createRoomCallStatePresenter(matrixRoom = room)
+        val presenter = createRoomCallStatePresenter(joinedRoom = room)
         presenter.test {
             val initialState = awaitItem()
             assertThat(initialState).isEqualTo(
@@ -39,10 +42,12 @@ class RoomCallStatePresenterTest {
 
     @Test
     fun `present - initial state - user can join call`() = runTest {
-        val room = FakeMatrixRoom(
-            canUserJoinCallResult = { Result.success(true) },
+        val room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                canUserJoinCallResult = { Result.success(true) },
+            )
         )
-        val presenter = createRoomCallStatePresenter(matrixRoom = room)
+        val presenter = createRoomCallStatePresenter(joinedRoom = room)
         presenter.test {
             skipItems(1)
             val initialState = awaitItem()
@@ -56,11 +61,13 @@ class RoomCallStatePresenterTest {
 
     @Test
     fun `present - call is disabled if user cannot join it even if there is an ongoing call`() = runTest {
-        val room = FakeMatrixRoom(
-            canUserJoinCallResult = { Result.success(false) },
-            initialRoomInfo = aRoomInfo(hasRoomCall = true),
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canUserJoinCallResult = { Result.success(false) },
+                initialRoomInfo = aRoomInfo(hasRoomCall = true),
+            )
         )
-        val presenter = createRoomCallStatePresenter(matrixRoom = room)
+        val presenter = createRoomCallStatePresenter(joinedRoom = room)
         presenter.test {
             assertThat(awaitItem()).isEqualTo(
                 RoomCallState.OnGoing(
@@ -74,7 +81,8 @@ class RoomCallStatePresenterTest {
 
     @Test
     fun `present - user has joined the call on another session`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserJoinCallResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(
@@ -84,7 +92,8 @@ class RoomCallStatePresenterTest {
                 )
             )
         }
-        val presenter = createRoomCallStatePresenter(matrixRoom = room)
+        )
+        val presenter = createRoomCallStatePresenter(joinedRoom = room)
         presenter.test {
             skipItems(1)
             assertThat(awaitItem()).isEqualTo(
@@ -99,7 +108,8 @@ class RoomCallStatePresenterTest {
 
     @Test
     fun `present - user has joined the call locally`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserJoinCallResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(
@@ -109,8 +119,9 @@ class RoomCallStatePresenterTest {
                 )
             )
         }
+        )
         val presenter = createRoomCallStatePresenter(
-            matrixRoom = room,
+            joinedRoom = room,
             currentCallService = FakeCurrentCallService(MutableStateFlow(CurrentCall.RoomCall(room.roomId))),
         )
         presenter.test {
@@ -127,7 +138,8 @@ class RoomCallStatePresenterTest {
 
     @Test
     fun `present - user leaves the call`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canUserJoinCallResult = { Result.success(true) },
         ).apply {
             givenRoomInfo(
@@ -137,10 +149,11 @@ class RoomCallStatePresenterTest {
                 )
             )
         }
+        )
         val currentCall = MutableStateFlow<CurrentCall>(CurrentCall.RoomCall(room.roomId))
         val currentCallService = FakeCurrentCallService(currentCall = currentCall)
         val presenter = createRoomCallStatePresenter(
-            matrixRoom = room,
+            joinedRoom = room,
             currentCallService = currentCallService
         )
         presenter.test {
@@ -188,11 +201,11 @@ class RoomCallStatePresenterTest {
     }
 
     private fun createRoomCallStatePresenter(
-        matrixRoom: MatrixRoom,
+        joinedRoom: JoinedRoom,
         currentCallService: CurrentCallService = FakeCurrentCallService(),
     ): RoomCallStatePresenter {
         return RoomCallStatePresenter(
-            room = matrixRoom,
+            room = joinedRoom,
             currentCallService = currentCallService,
         )
     }
diff --git a/features/roomdetails/impl/build.gradle.kts b/features/roomdetails/impl/build.gradle.kts
index 315b00b153..87ca1afe4d 100644
--- a/features/roomdetails/impl/build.gradle.kts
+++ b/features/roomdetails/impl/build.gradle.kts
@@ -53,6 +53,7 @@ dependencies {
     implementation(projects.features.roomcall.api)
     implementation(projects.features.knockrequests.api)
     implementation(projects.features.verifysession.api)
+    implementation(projects.features.reportroom.api)
 
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
index b7cc8685e4..e0ecd4ebba 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsFlowNode.kt
@@ -28,6 +28,7 @@ import io.element.android.features.call.api.ElementCallEntryPoint
 import io.element.android.features.knockrequests.api.list.KnockRequestsListEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.poll.api.history.PollHistoryEntryPoint
+import io.element.android.features.reportroom.api.ReportRoomEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.features.roomdetails.impl.edit.RoomDetailsEditNode
 import io.element.android.features.roomdetails.impl.invite.RoomInviteMembersNode
@@ -50,7 +51,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 import io.element.android.libraries.mediaviewer.api.MediaGalleryEntryPoint
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
@@ -64,13 +65,14 @@ class RoomDetailsFlowNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val pollHistoryEntryPoint: PollHistoryEntryPoint,
     private val elementCallEntryPoint: ElementCallEntryPoint,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val analyticsService: AnalyticsService,
     private val messagesEntryPoint: MessagesEntryPoint,
     private val knockRequestsListEntryPoint: KnockRequestsListEntryPoint,
     private val mediaViewerEntryPoint: MediaViewerEntryPoint,
     private val mediaGalleryEntryPoint: MediaGalleryEntryPoint,
     private val verifySessionEntryPoint: VerifySessionEntryPoint,
+    private val reportRoomEntryPoint: ReportRoomEntryPoint,
 ) : BaseFlowNode<RoomDetailsFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = plugins.filterIsInstance<RoomDetailsEntryPoint.Params>().first().initialElement.toNavTarget(),
@@ -127,6 +129,9 @@ class RoomDetailsFlowNode @AssistedInject constructor(
 
         @Parcelize
         data class VerifyUser(val userId: UserId) : NavTarget
+
+        @Parcelize
+        data object ReportRoom : NavTarget
     }
 
     override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
@@ -189,6 +194,10 @@ class RoomDetailsFlowNode @AssistedInject constructor(
                         analyticsService.captureInteraction(Interaction.Name.MobileRoomCallButton)
                         elementCallEntryPoint.startCall(inputs)
                     }
+
+                    override fun openReportRoom() {
+                        backstack.push(NavTarget.ReportRoom)
+                    }
                 }
                 createNode<RoomDetailsNode>(buildContext, listOf(roomDetailsCallback))
             }
@@ -340,6 +349,9 @@ class RoomDetailsFlowNode @AssistedInject constructor(
                     })
                     .build()
             }
+            is NavTarget.ReportRoom -> {
+                reportRoomEntryPoint.createNode(this, buildContext, room.roomId)
+            }
         }
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
index c3a0a3d519..1c76f561e2 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
@@ -24,7 +24,7 @@ import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.androidutils.system.startSharePlainTextIntent
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -36,7 +36,7 @@ class RoomDetailsNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: RoomDetailsPresenter,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val analyticsService: AnalyticsService,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
@@ -53,6 +53,7 @@ class RoomDetailsNode @AssistedInject constructor(
         fun openSecurityAndPrivacy()
         fun openDmUserProfile(userId: UserId)
         fun onJoinCall()
+        fun openReportRoom()
     }
 
     private val callbacks = plugins<Callback>()
@@ -132,6 +133,10 @@ class RoomDetailsNode @AssistedInject constructor(
         callbacks.forEach { it.openDmUserProfile(userId) }
     }
 
+    private fun onReportRoomClick() {
+        callbacks.forEach { it.openReportRoom() }
+    }
+
     @Composable
     override fun View(modifier: Modifier) {
         val context = LocalContext.current
@@ -166,6 +171,7 @@ class RoomDetailsNode @AssistedInject constructor(
             onKnockRequestsClick = ::openKnockRequestsLists,
             onSecurityAndPrivacyClick = ::openSecurityAndPrivacy,
             onProfileClick = ::onProfileClick,
+            onReportRoomClick = ::onReportRoomClick,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
index 5c6333a290..e70430c8bf 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt
@@ -16,8 +16,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.appconfig.MatrixConfiguration
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.messages.api.pinned.IsPinnedMessagesFeatureEnabled
@@ -35,9 +35,9 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.powerlevels.canInvite
@@ -61,7 +61,7 @@ import javax.inject.Inject
 
 class RoomDetailsPresenter @Inject constructor(
     private val client: MatrixClient,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val featureFlagService: FeatureFlagService,
     private val notificationSettingsService: NotificationSettingsService,
     private val roomMembersDetailsPresenterFactory: RoomMemberDetailsPresenter.Factory,
@@ -88,12 +88,12 @@ class RoomDetailsPresenter @Inject constructor(
         val joinRule by remember { derivedStateOf { roomInfo.joinRule } }
 
         val canShowPinnedMessages = isPinnedMessagesFeatureEnabled()
-        var canShowMediaGallery by remember { mutableStateOf(false) }
-        LaunchedEffect(Unit) {
-            canShowMediaGallery = featureFlagService.isFeatureEnabled(FeatureFlags.MediaGallery)
-        }
         val pinnedMessagesCount by remember { derivedStateOf { roomInfo.pinnedEventIds.size } }
 
+        val canShowMediaGallery by remember {
+            featureFlagService.isFeatureEnabledFlow(FeatureFlags.MediaGallery)
+        }.collectAsState(false)
+
         LaunchedEffect(Unit) {
             canShowNotificationSettings.value = featureFlagService.isFeatureEnabled(FeatureFlags.NotificationSettings)
             if (canShowNotificationSettings.value) {
@@ -208,6 +208,7 @@ class RoomDetailsPresenter @Inject constructor(
             knockRequestsCount = knockRequestsCount,
             canShowSecurityAndPrivacy = canShowSecurityAndPrivacy,
             hasMemberVerificationViolations = hasMemberVerificationViolations,
+            canReportRoom = MatrixConfiguration.CAN_REPORT_ROOM,
             eventSink = ::handleEvents,
         )
     }
@@ -235,12 +236,12 @@ class RoomDetailsPresenter @Inject constructor(
     }
 
     @Composable
-    private fun getCanInvite(membersState: MatrixRoomMembersState) = produceState(false, membersState) {
+    private fun getCanInvite(membersState: RoomMembersState) = produceState(false, membersState) {
         value = room.canInvite().getOrElse { false }
     }
 
     @Composable
-    private fun getCanSendState(membersState: MatrixRoomMembersState, type: StateEventType) = produceState(false, membersState) {
+    private fun getCanSendState(membersState: RoomMembersState, type: StateEventType) = produceState(false, membersState) {
         value = room.canSendState(type).getOrElse { false }
     }
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
index 8a0439b15d..5addbf3db8 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsState.kt
@@ -48,6 +48,7 @@ data class RoomDetailsState(
     val knockRequestsCount: Int?,
     val canShowSecurityAndPrivacy: Boolean,
     val hasMemberVerificationViolations: Boolean,
+    val canReportRoom: Boolean,
     val eventSink: (RoomDetailsEvent) -> Unit
 ) {
     val roomBadges = buildList {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
index 4304f151a3..d2cb4c5944 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt
@@ -117,6 +117,7 @@ fun aRoomDetailsState(
     knockRequestsCount: Int? = null,
     canShowSecurityAndPrivacy: Boolean = true,
     hasMemberVerificationViolations: Boolean = false,
+    canReportRoom: Boolean = true,
     eventSink: (RoomDetailsEvent) -> Unit = {},
 ) = RoomDetailsState(
     roomId = roomId,
@@ -146,6 +147,7 @@ fun aRoomDetailsState(
     knockRequestsCount = knockRequestsCount,
     canShowSecurityAndPrivacy = canShowSecurityAndPrivacy,
     hasMemberVerificationViolations = hasMemberVerificationViolations,
+    canReportRoom = canReportRoom,
     eventSink = eventSink,
 )
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 381f94ad26..8f7502dee5 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -107,6 +107,7 @@ fun RoomDetailsView(
     onKnockRequestsClick: () -> Unit,
     onSecurityAndPrivacyClick: () -> Unit,
     onProfileClick: (UserId) -> Unit,
+    onReportRoomClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
@@ -255,8 +256,9 @@ fun RoomDetailsView(
             }
 
             OtherActionsSection(
-                isDm = state.roomType is RoomDetailsType.Dm,
-                onLeaveRoom = { state.eventSink(RoomDetailsEvent.LeaveRoom) }
+                canReportRoom = state.canReportRoom,
+                onReportRoomClick = onReportRoomClick,
+                onLeaveRoomClick = { state.eventSink(RoomDetailsEvent.LeaveRoom) }
             )
         }
     }
@@ -669,22 +671,29 @@ private fun MediaGalleryItem(
 }
 
 @Composable
-private fun OtherActionsSection(isDm: Boolean, onLeaveRoom: () -> Unit) {
+private fun OtherActionsSection(
+    canReportRoom: Boolean,
+    onReportRoomClick: () -> Unit,
+    onLeaveRoomClick: () -> Unit,
+) {
     PreferenceCategory(showTopDivider = true) {
+        if (canReportRoom) {
+            ListItem(
+                headlineContent = {
+                    Text(stringResource(CommonStrings.action_report_room))
+                },
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.ChatProblem())),
+                style = ListItemStyle.Destructive,
+                onClick = onReportRoomClick,
+            )
+        }
         ListItem(
             headlineContent = {
-                val leaveText = stringResource(
-                    id = if (isDm) {
-                        R.string.screen_room_details_leave_conversation_title
-                    } else {
-                        R.string.screen_room_details_leave_room_title
-                    }
-                )
-                Text(leaveText)
+                Text(stringResource(CommonStrings.action_leave_room))
             },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Leave())),
             style = ListItemStyle.Destructive,
-            onClick = onLeaveRoom,
+            onClick = onLeaveRoomClick,
         )
     }
 }
@@ -719,5 +728,6 @@ private fun ContentToPreview(state: RoomDetailsState) {
         onKnockRequestsClick = {},
         onSecurityAndPrivacyClick = {},
         onProfileClick = {},
+        onReportRoomClick = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt
index 75d193aef4..48c13b80a6 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt
@@ -9,7 +9,7 @@ package io.element.android.features.roomdetails.impl.analytics
 
 import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.services.analytics.api.AnalyticsService
 
 internal fun RoomMember.Role.toAnalyticsMemberRole(): RoomModeration.Role = when (this) {
@@ -22,7 +22,7 @@ internal fun analyticsMemberRoleForPowerLevel(powerLevel: Long): RoomModeration.
     return RoomMember.Role.forPowerLevel(powerLevel).toAnalyticsMemberRole()
 }
 
-internal fun AnalyticsService.trackPermissionChangeAnalytics(initial: MatrixRoomPowerLevels?, updated: MatrixRoomPowerLevels) {
+internal fun AnalyticsService.trackPermissionChangeAnalytics(initial: RoomPowerLevels?, updated: RoomPowerLevels) {
     if (updated.ban != initial?.ban) {
         capture(RoomModeration(RoomModeration.Action.ChangePermissionsBanMembers, analyticsMemberRoleForPowerLevel(updated.ban)))
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
index e5f63332aa..15afcbc99f 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/di/RoomMemberModule.kt
@@ -16,14 +16,14 @@ import io.element.android.libraries.androidutils.clipboard.ClipboardHelper
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 
 @Module
 @ContributesTo(RoomScope::class)
 object RoomMemberModule {
     @Provides
     fun provideRoomMemberDetailsPresenterFactory(
-        room: MatrixRoom,
+        room: JoinedRoom,
         userProfilePresenterFactory: UserProfilePresenterFactory,
         encryptionService: EncryptionService,
         clipboardHelper: ClipboardHelper,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
index 30e05101c8..fb77530b6d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
@@ -25,7 +25,7 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.mimetype.MimeTypes
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
 import io.element.android.libraries.matrix.ui.media.AvatarAction
@@ -43,7 +43,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 class RoomDetailsEditPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val mediaPickerProvider: PickerProvider,
     private val mediaPreProcessor: MediaPreProcessor,
     private val temporaryUriDeleter: TemporaryUriDeleter,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
index 1564f53084..ebfa3dcab8 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
@@ -20,7 +20,7 @@ import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.apperror.api.AppErrorStateService
@@ -33,7 +33,7 @@ class RoomInviteMembersNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     coroutineDispatchers: CoroutineDispatchers,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val presenter: RoomInviteMembersPresenter,
     private val appErrorStateService: AppErrorStateService,
     private val analyticsService: AnalyticsService,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
index e7df374917..ef627a4992 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListDataSource.kt
@@ -9,14 +9,14 @@ package io.element.android.features.roomdetails.impl.members
 
 import io.element.android.libraries.core.bool.orFalse
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 class RoomMemberListDataSource @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val coroutineDispatchers: CoroutineDispatchers,
 ) {
     suspend fun search(query: String): List<RoomMember> = withContext(coroutineDispatchers.io) {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
index e154c7ea15..e2527444aa 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenter.kt
@@ -28,9 +28,9 @@ import io.element.android.libraries.designsystem.theme.components.SearchBarResul
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.ui.room.canInviteAsState
@@ -45,7 +45,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 
 class RoomMemberListPresenter @AssistedInject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val roomMemberListDataSource: RoomMemberListDataSource,
     private val coroutineDispatchers: CoroutineDispatchers,
     private val roomMembersModerationPresenter: Presenter<RoomMembersModerationState>,
@@ -86,11 +86,11 @@ class RoomMemberListPresenter @AssistedInject constructor(
         }
 
         LaunchedEffect(membersState, roomMemberIdentityStates) {
-            if (membersState is MatrixRoomMembersState.Unknown) {
+            if (membersState is RoomMembersState.Unknown) {
                 return@LaunchedEffect
             }
             val finalMembersState = membersState
-            if (finalMembersState is MatrixRoomMembersState.Error && finalMembersState.roomMembers().orEmpty().isEmpty()) {
+            if (finalMembersState is RoomMembersState.Error && finalMembersState.roomMembers().orEmpty().isEmpty()) {
                 // Cannot fetch members and no cached members, display the error
                 roomMembers = AsyncData.Failure(finalMembersState.failure)
                 return@LaunchedEffect
@@ -116,7 +116,7 @@ class RoomMemberListPresenter @AssistedInject constructor(
                         .map { it.withIdentityState(roomMemberIdentityStates) }
                         .toImmutableList(),
                 )
-                roomMembers = if (membersState is MatrixRoomMembersState.Pending) {
+                roomMembers = if (membersState is RoomMembersState.Pending) {
                     AsyncData.Loading(result)
                 } else {
                     AsyncData.Success(result)
@@ -147,7 +147,7 @@ class RoomMemberListPresenter @AssistedInject constructor(
                                 .toImmutableList(),
                         )
                         SearchBarResultState.Results(
-                            if (membersState is MatrixRoomMembersState.Pending) {
+                            if (membersState is RoomMembersState.Pending) {
                                 AsyncData.Loading(result)
                             } else {
                                 AsyncData.Success(result)
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
index c5de24c603..9afe43daf2 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenter.kt
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.EncryptionService
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.ui.room.getRoomMemberAsState
 import io.element.android.libraries.matrix.ui.room.roomMemberIdentityStateChange
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -45,7 +45,7 @@ import kotlinx.coroutines.launch
  */
 class RoomMemberDetailsPresenter @AssistedInject constructor(
     @Assisted private val roomMemberId: UserId,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val encryptionService: EncryptionService,
     private val clipboardHelper: ClipboardHelper,
     userProfilePresenterFactory: UserProfilePresenterFactory,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenter.kt
index 1fea6a8146..af71e21dff 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenter.kt
@@ -22,7 +22,7 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.ui.room.canBanAsState
@@ -38,7 +38,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class RoomMembersModerationPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val dispatchers: CoroutineDispatchers,
     private val analyticsService: AnalyticsService,
 ) : Presenter<RoomMembersModerationState> {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
index 7dae51a1a2..fb7a3b03da 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenter.kt
@@ -26,7 +26,7 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.core.coroutine.suspendWithMinimumDuration
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
 import kotlinx.coroutines.CoroutineScope
@@ -38,7 +38,7 @@ import kotlinx.coroutines.launch
 import kotlin.time.Duration.Companion.seconds
 
 class RoomNotificationSettingsPresenter @AssistedInject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val notificationSettingsService: NotificationSettingsService,
     @Assisted private val showUserDefinedSettingStyle: Boolean,
 ) : Presenter<RoomNotificationSettingsState> {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
index cf6b6cb522..f0fa5e5c8d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
@@ -19,7 +19,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.di.RoomScope
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
@@ -32,7 +32,7 @@ class RolesAndPermissionsNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     private val presenter: RolesAndPermissionsPresenter,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
 ) : Node(buildContext, plugins = plugins), RolesAndPermissionsNavigator {
     interface Callback : Plugin, RolesAndPermissionsNavigator {
         override fun openAdminList()
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt
index 37e72d158f..2f2f14a157 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt
@@ -21,8 +21,8 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
@@ -32,7 +32,7 @@ import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 class RolesAndPermissionsPresenter @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val dispatchers: CoroutineDispatchers,
     private val analyticsService: AnalyticsService,
 ) : Presenter<RolesAndPermissionsState> {
@@ -109,7 +109,7 @@ class RolesAndPermissionsPresenter @Inject constructor(
         }
     }
 
-    private fun MatrixRoomInfo.userCountWithRole(userIds: List<UserId>, role: RoomMember.Role): Int {
+    private fun RoomInfo.userCountWithRole(userIds: List<UserId>, role: RoomMember.Role): Int {
         return this.userPowerLevels.count { (userId, level) ->
             RoomMember.Role.forPowerLevel(level) == role && userId in userIds
         }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenter.kt
index 8878dc8876..36fc5a336a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenter.kt
@@ -30,7 +30,7 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.room.powerlevels.usersWithRole
@@ -50,7 +50,7 @@ import kotlinx.coroutines.launch
 
 class ChangeRolesPresenter @AssistedInject constructor(
     @Assisted private val role: RoomMember.Role,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val dispatchers: CoroutineDispatchers,
     private val analyticsService: AnalyticsService,
 ) : Presenter<ChangeRolesState> {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt
index 0a059b2638..905a71a623 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenter.kt
@@ -21,8 +21,8 @@ import dagger.assisted.AssistedInject
 import io.element.android.features.roomdetails.impl.analytics.trackPermissionChangeAnalytics
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
@@ -31,7 +31,7 @@ import kotlinx.coroutines.launch
 
 class ChangeRoomPermissionsPresenter @AssistedInject constructor(
     @Assisted private val section: ChangeRoomPermissionsSection,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val analyticsService: AnalyticsService,
 ) : Presenter<ChangeRoomPermissionsState> {
     companion object {
@@ -59,8 +59,8 @@ class ChangeRoomPermissionsPresenter @AssistedInject constructor(
 
     private val items: ImmutableList<RoomPermissionType> = itemsForSection(section)
 
-    private var initialPermissions by mutableStateOf<MatrixRoomPowerLevels?>(null)
-    private var currentPermissions by mutableStateOf<MatrixRoomPowerLevels?>(null)
+    private var initialPermissions by mutableStateOf<RoomPowerLevels?>(null)
+    private var currentPermissions by mutableStateOf<RoomPowerLevels?>(null)
     private var saveAction by mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
     private var confirmExitAction by mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized)
 
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt
index 69f62e17d9..6248df0885 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsState.kt
@@ -8,12 +8,12 @@
 package io.element.android.features.roomdetails.impl.rolesandpermissions.permissions
 
 import io.element.android.libraries.architecture.AsyncAction
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import kotlinx.collections.immutable.ImmutableList
 
 data class ChangeRoomPermissionsState(
     val section: ChangeRoomPermissionsSection,
-    val currentPermissions: MatrixRoomPowerLevels?,
+    val currentPermissions: RoomPowerLevels?,
     val items: ImmutableList<RoomPermissionType>,
     val hasChanges: Boolean,
     val saveAction: AsyncAction<Unit>,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt
index 54f07bd637..c068b69716 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsStateProvider.kt
@@ -10,7 +10,7 @@ package io.element.android.features.roomdetails.impl.rolesandpermissions.permiss
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import kotlinx.collections.immutable.toPersistentList
 
 class ChangeRoomPermissionsStateProvider : PreviewParameterProvider<ChangeRoomPermissionsState> {
@@ -36,7 +36,7 @@ class ChangeRoomPermissionsStateProvider : PreviewParameterProvider<ChangeRoomPe
 
 internal fun aChangeRoomPermissionsState(
     section: ChangeRoomPermissionsSection,
-    currentPermissions: MatrixRoomPowerLevels = previewPermissions(),
+    currentPermissions: RoomPowerLevels = previewPermissions(),
     items: List<RoomPermissionType> = ChangeRoomPermissionsPresenter.itemsForSection(section),
     hasChanges: Boolean = false,
     saveAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
@@ -52,8 +52,8 @@ internal fun aChangeRoomPermissionsState(
     eventSink = eventSink,
 )
 
-private fun previewPermissions(): MatrixRoomPowerLevels {
-    return MatrixRoomPowerLevels(
+private fun previewPermissions(): RoomPowerLevels {
+    return RoomPowerLevels(
         // MembershipModeration section
         invite = RoomMember.Role.ADMIN.powerLevel,
         kick = RoomMember.Role.MODERATOR.powerLevel,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
index d2e9c3f290..527eca483f 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
@@ -36,7 +36,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.ui.strings.CommonStrings
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -133,7 +133,7 @@ fun ChangeRoomPermissionsView(
 private fun SelectRoleItem(
     permissionsItem: RoomPermissionType,
     role: RoomMember.Role,
-    currentPermissions: MatrixRoomPowerLevels?,
+    currentPermissions: RoomPowerLevels?,
     onClick: (RoomPermissionType, RoomMember.Role) -> Unit
 ) {
     val title = when (role) {
@@ -153,7 +153,7 @@ private fun SelectRoleItem(
     )
 }
 
-private fun MatrixRoomPowerLevels.isSelected(item: RoomPermissionType, role: RoomMember.Role): Boolean {
+private fun RoomPowerLevels.isSelected(item: RoomPermissionType, role: RoomMember.Role): Boolean {
     return when (item) {
         RoomPermissionType.BAN -> RoomMember.Role.forPowerLevel(ban) == role
         RoomPermissionType.INVITE -> RoomMember.Role.forPowerLevel(invite) == role
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
index d6f27a9a5b..35ecbc0d51 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenter.kt
@@ -29,8 +29,8 @@ import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.architecture.runUpdatingState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
@@ -43,7 +43,7 @@ import kotlinx.coroutines.launch
 class SecurityAndPrivacyPresenter @AssistedInject constructor(
     @Assisted private val navigator: SecurityAndPrivacyNavigator,
     private val matrixClient: MatrixClient,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
 ) : Presenter<SecurityAndPrivacyState> {
     @AssistedFactory
     interface Factory {
@@ -279,6 +279,6 @@ private fun SecurityAndPrivacyHistoryVisibility.map(): RoomHistoryVisibility {
     }
 }
 
-private fun MatrixRoomInfo.firstDisplayableAlias(serverName: String): RoomAlias? {
+private fun RoomInfo.firstDisplayableAlias(serverName: String): RoomAlias? {
     return aliases.firstOrNull { it.matchesServer(serverName) } ?: aliases.firstOrNull()
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
index 59dfeeaca0..9caff45ada 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyView.kt
@@ -267,8 +267,7 @@ private fun RoomAddressSection(
                 Text(text = stringResource(R.string.screen_security_and_privacy_room_directory_visibility_section_footer, homeserverName))
             },
             onClick = if (isVisibleInRoomDirectory.isSuccess()) onVisibilityChange else null,
-            trailingContent =
-            when (isVisibleInRoomDirectory) {
+            trailingContent = when (isVisibleInRoomDirectory) {
                 is AsyncData.Uninitialized, is AsyncData.Loading -> {
                     ListItemContent.Custom {
                         CircularProgressIndicator(
@@ -288,7 +287,6 @@ private fun RoomAddressSection(
                 is AsyncData.Success -> {
                     ListItemContent.Switch(
                         checked = isVisibleInRoomDirectory.data,
-                        onChange = { onVisibilityChange() },
                     )
                 }
             }
@@ -316,7 +314,6 @@ private fun EncryptionSection(
             trailingContent = ListItemContent.Switch(
                 checked = isRoomEncrypted,
                 enabled = canToggleEncryption,
-                onChange = { onToggleEncryption() },
             ),
             onClick = if (canToggleEncryption) onToggleEncryption else null
         )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
index 2c581e4584..32af99dc1d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenter.kt
@@ -25,8 +25,8 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 import io.element.android.libraries.matrix.api.roomAliasFromName
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
@@ -37,7 +37,7 @@ import kotlinx.coroutines.launch
 class EditRoomAddressPresenter @AssistedInject constructor(
     @Assisted private val navigator: SecurityAndPrivacyNavigator,
     private val client: MatrixClient,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val roomAliasHelper: RoomAliasHelper,
 ) : Presenter<EditRoomAddressState> {
     @AssistedFactory
@@ -139,7 +139,7 @@ class EditRoomAddressPresenter @AssistedInject constructor(
 /**
  * Returns the first alias that matches the given server name, or null if none match.
  */
-private fun MatrixRoomInfo.firstAliasMatching(serverName: String): RoomAlias? {
+private fun RoomInfo.firstAliasMatching(serverName: String): RoomAlias? {
     // Check if the canonical alias matches the homeserver
     if (canonicalAlias?.matchesServer(serverName) == true) {
         return canonicalAlias
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
index 50a676da1e..cc052b19b1 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/permissions/SecurityAndPrivacyPermissions.kt
@@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.State
 import androidx.compose.runtime.produceState
 import io.element.android.features.roomdetails.impl.securityandprivacy.permissions.SecurityAndPrivacyPermissions.Companion.DEFAULT
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendState
 
@@ -37,7 +37,7 @@ data class SecurityAndPrivacyPermissions(
 }
 
 @Composable
-fun MatrixRoom.securityAndPrivacyPermissionsAsState(updateKey: Long): State<SecurityAndPrivacyPermissions> {
+fun BaseRoom.securityAndPrivacyPermissionsAsState(updateKey: Long): State<SecurityAndPrivacyPermissions> {
     return produceState(DEFAULT, key1 = updateKey) {
         value = SecurityAndPrivacyPermissions(
             canChangeRoomAccess = canSendState(type = StateEventType.ROOM_JOIN_RULES).getOrElse { false },
diff --git a/features/roomdetails/impl/src/main/res/values-be/translations.xml b/features/roomdetails/impl/src/main/res/values-be/translations.xml
index da7ae7bcfb..d50b3c5f6e 100644
--- a/features/roomdetails/impl/src/main/res/values-be/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-be/translations.xml
@@ -7,11 +7,11 @@
   <string name="screen_room_change_permissions_ban_people">"Заблакіраваць людзей"</string>
   <string name="screen_room_change_permissions_delete_messages">"Выдаліць паведамленні"</string>
   <string name="screen_room_change_permissions_everyone">"Усе"</string>
-  <string name="screen_room_change_permissions_invite_people">"Запрасіць людзей"</string>
+  <string name="screen_room_change_permissions_invite_people">"Запрашайце людзей і прымайце запыты на далучэнне"</string>
   <string name="screen_room_change_permissions_member_moderation">"Мадэрацыя ўдзельнікаў"</string>
   <string name="screen_room_change_permissions_messages_and_content">"Паведамленні і змест"</string>
   <string name="screen_room_change_permissions_moderators">"Адміністратары і мадэратары"</string>
-  <string name="screen_room_change_permissions_remove_people">"Выдаліць людзей"</string>
+  <string name="screen_room_change_permissions_remove_people">"Выдаляйце людзей і адхіляйце запыты на далучэнне"</string>
   <string name="screen_room_change_permissions_room_avatar">"Змяніць аватар пакоя"</string>
   <string name="screen_room_change_permissions_room_details">"Дэталі пакоя"</string>
   <string name="screen_room_change_permissions_room_name">"Змяніць назву пакоя"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-cy/translations.xml b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
index 2dae23ed42..ab0a8fa95d 100644
--- a/features/roomdetails/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-cy/translations.xml
@@ -2,42 +2,125 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_edit_room_address_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch i\'w wneud yn weladwy yn y cyfeiriadur."</string>
   <string name="screen_edit_room_address_title">"Cyfeiriad yr ystafell"</string>
-  <string name="screen_polls_history_title">"Polau"</string>
+  <string name="screen_notification_settings_edit_failed_updating_default_mode">"Digwyddodd gwall wrth ddiweddaru\'r gosodiad hysbysu."</string>
+  <string name="screen_notification_settings_mentions_only_disclaimer">"Nid yw eich gweinydd cartref yn cefnogi\'r dewis hwn mewn ystafelloedd sydd wedi\'u hamgryptio, efallai fyddwch chi ddim yn cael gwybod mewn rhai ystafelloedd."</string>
+  <string name="screen_polls_history_title">"Pleidleisiau"</string>
+  <string name="screen_room_change_permissions_administrators">"Gweinyddwyr yn unig"</string>
+  <string name="screen_room_change_permissions_ban_people">"Gwahardd pobl"</string>
+  <string name="screen_room_change_permissions_delete_messages">"Dileu negeseuon"</string>
   <string name="screen_room_change_permissions_everyone">"Pawb"</string>
+  <string name="screen_room_change_permissions_invite_people">"Gwahodd pobl a derbyn ceisiadau i ymuno"</string>
+  <string name="screen_room_change_permissions_member_moderation">"Cymedroli aelodau"</string>
+  <string name="screen_room_change_permissions_messages_and_content">"Negeseuon a chynnwys"</string>
+  <string name="screen_room_change_permissions_moderators">"Gweinyddwyr a chymedrolwyr"</string>
+  <string name="screen_room_change_permissions_remove_people">"Dileu pobl a gwrthod ceisiadau i ymuno"</string>
+  <string name="screen_room_change_permissions_room_avatar">"Newid afatar ystafell"</string>
+  <string name="screen_room_change_permissions_room_details">"Manylion yr ystafell"</string>
+  <string name="screen_room_change_permissions_room_name">"Newid enw\'r ystafell"</string>
+  <string name="screen_room_change_permissions_room_topic">"Newid pwnc yr ystafell"</string>
+  <string name="screen_room_change_permissions_send_messages">"Anfon negeseuon"</string>
+  <string name="screen_room_change_role_administrators_title">"Golygu Gweinyddwyr"</string>
+  <string name="screen_room_change_role_confirm_add_admin_description">"Fyddwch chi ddim yn gallu dadwneud y weithred hon. Rydych chi\'n hyrwyddo\'r defnyddiwr i gael yr un lefel pŵer â chi."</string>
+  <string name="screen_room_change_role_confirm_add_admin_title">"Ychwanegu Gweinyddwr?"</string>
   <string name="screen_room_change_role_confirm_demote_self_action">"Gostwng"</string>
   <string name="screen_room_change_role_confirm_demote_self_description">"Fyddwch chi ddim yn gallu dadwneud y newid hwn gan eich bod yn israddio eich hun, os mai chi yw\'r defnyddiwr breintiedig olaf yn yr ystafell bydd yn amhosibl adennill breintiau."</string>
+  <string name="screen_room_change_role_confirm_demote_self_title">"Israddio eich hun?"</string>
+  <string name="screen_room_change_role_invited_member_name">"%1$s (Yn aros)"</string>
+  <string name="screen_room_change_role_invited_member_name_android">"Yn aros"</string>
+  <string name="screen_room_change_role_moderators_admin_section_footer">"Mae gan weinyddwyr freintiau cymedrolwr yn awtomatig"</string>
+  <string name="screen_room_change_role_moderators_title">"Golygu Cymedrolwyr"</string>
+  <string name="screen_room_change_role_section_administrators">"Gweinyddwyr"</string>
+  <string name="screen_room_change_role_section_moderators">"Cymedrolwyr"</string>
   <string name="screen_room_change_role_section_users">"Aelodau"</string>
+  <string name="screen_room_change_role_unsaved_changes_description">"Mae gennych newidiadau heb eu cadw."</string>
   <string name="screen_room_change_role_unsaved_changes_title">"Cadw\'r newidiadau?"</string>
+  <string name="screen_room_details_add_topic_title">"Ychwanegu pwnc"</string>
   <string name="screen_room_details_already_a_member">"Eisoes yn aelod"</string>
+  <string name="screen_room_details_already_invited">"Wedi gwahodd yn barod"</string>
+  <string name="screen_room_details_badge_encrypted">"Wedi\'i amgryptio"</string>
+  <string name="screen_room_details_badge_not_encrypted">"Heb ei amgryptio"</string>
+  <string name="screen_room_details_badge_public">"Ystafell gyhoeddus"</string>
+  <string name="screen_room_details_edit_room_title">"Ystafell Golygu"</string>
+  <string name="screen_room_details_edition_error">"Roedd gwall anhysbys ac nid oedd modd newid y manylion."</string>
+  <string name="screen_room_details_edition_error_title">"Methu diweddaru\'r ystafell"</string>
+  <string name="screen_room_details_encryption_enabled_subtitle">"Negeseuon yn cael eu diogelu gyda chloeon. Dim ond chi a\'r derbynwyr sydd â\'r allweddi unigryw i\'w datgloi."</string>
+  <string name="screen_room_details_encryption_enabled_title">"Galluogwyd amgryptio neges"</string>
+  <string name="screen_room_details_error_loading_notification_settings">"Digwyddodd gwall wrth lwytho gosodiadau hysbysu."</string>
+  <string name="screen_room_details_error_muting">"Wedi methu tewi\'r ystafell hon, ceisiwch eto."</string>
+  <string name="screen_room_details_error_unmuting">"Wedi methu dad-dewi\'r ystafell hon, ceisiwch eto."</string>
   <string name="screen_room_details_invite_people_title">"Gwahodd pobl"</string>
   <string name="screen_room_details_leave_conversation_title">"Gadael y sgwrs"</string>
   <string name="screen_room_details_leave_room_title">"Gadael yr ystafell"</string>
+  <string name="screen_room_details_media_gallery_title">"Cyfryngau a ffeiliau"</string>
   <string name="screen_room_details_notification_mode_custom">"Cyfaddas"</string>
   <string name="screen_room_details_notification_mode_default">"Rhagosodiad"</string>
   <string name="screen_room_details_notification_title">"Hysbysiadau"</string>
   <string name="screen_room_details_pinned_events_row_title">"Negeseuon wedi\'u pinio"</string>
   <string name="screen_room_details_profile_row_title">"Proffil"</string>
   <string name="screen_room_details_requests_to_join_title">"Ceisiadau i ymuno"</string>
+  <string name="screen_room_details_roles_and_permissions">"Rolau a chaniatâd"</string>
   <string name="screen_room_details_room_name_label">"Enw\'r ystafell"</string>
+  <string name="screen_room_details_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
   <string name="screen_room_details_security_title">"Diogelwch"</string>
+  <string name="screen_room_details_share_room_title">"Rhannu ystafell"</string>
   <string name="screen_room_details_title">"Manylion ystafell"</string>
   <string name="screen_room_details_topic_title">"Pwnc"</string>
+  <string name="screen_room_details_updating_room">"Wrthi\'n diweddaru ystafell…"</string>
+  <string name="screen_room_member_list_banned_empty">"Nid oes unrhyw ddefnyddwyr gwaharddedig yn yr ystafell hon."</string>
+  <plurals name="screen_room_member_list_header_title">
+    <item quantity="zero">"%1$d personau"</item>
+    <item quantity="one">"%1$d person"</item>
+    <item quantity="two">"%1$d berson"</item>
+    <item quantity="few">"%1$d person"</item>
+    <item quantity="many">"%1$d pherson"</item>
+    <item quantity="other">"%1$d person"</item>
+  </plurals>
   <string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Gwahardd o ystafell"</string>
+  <string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Dileu aelod yn unig"</string>
   <string name="screen_room_member_list_manage_member_unban_action">"Adfer"</string>
+  <string name="screen_room_member_list_manage_member_unban_message">"Fyddan nhw yn gallu ymuno â\'r ystafell hon eto os cân nhw wahoddiad."</string>
+  <string name="screen_room_member_list_manage_member_unban_title">"Gwahardd defnyddiwr"</string>
   <string name="screen_room_member_list_mode_banned">"Wedi\'i wahardd"</string>
   <string name="screen_room_member_list_mode_members">"Aelodau"</string>
   <string name="screen_room_member_list_pending_header_title">"Dan ystyriaeth"</string>
   <string name="screen_room_member_list_role_administrator">"Gweinyddwr"</string>
+  <string name="screen_room_member_list_role_moderator">"Cymedrolwr"</string>
   <string name="screen_room_member_list_room_members_header_title">"Aelodau\'r ystafell"</string>
+  <string name="screen_room_member_list_unbanning_user">"Dad-wahardd %1$s"</string>
+  <string name="screen_room_notification_settings_allow_custom">"Caniatáu gosodiad personol"</string>
+  <string name="screen_room_notification_settings_allow_custom_footnote">"Bydd troi hwn ymlaen yn diystyru eich gosodiad rhagosodedig"</string>
+  <string name="screen_room_notification_settings_custom_settings_title">"Rhowch wybod i mi yn y sgwrs hon am"</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Gallwch ei newid yn eich %1$s."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote_content_link">"gosodiadau cyffredinol"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Gosodiad rhagosodedig"</string>
+  <string name="screen_room_notification_settings_edit_remove_setting">"Dileu gosodiad personol"</string>
+  <string name="screen_room_notification_settings_error_loading_settings">"Digwyddodd gwall wrth lwytho gosodiadau hysbysu."</string>
+  <string name="screen_room_notification_settings_error_restoring_default">"Wedi methu ag adfer y modd rhagosodedig, ceisiwch eto."</string>
+  <string name="screen_room_notification_settings_error_setting_mode">"Wedi methu gosod y modd, ceisiwch eto."</string>
+  <string name="screen_room_notification_settings_mentions_only_disclaimer">"Nid yw eich gweinydd cartref yn cefnogi\'r dewis hwn mewn ystafelloedd sydd wedi\'u hamgryptio, chewch chi ddim eich hysbysu yn yr ystafell hon."</string>
+  <string name="screen_room_notification_settings_mode_all_messages">"Pob neges"</string>
+  <string name="screen_room_notification_settings_mode_mentions_and_keywords">"Crybwylliadau ac Allweddeiriau\'n unig"</string>
+  <string name="screen_room_notification_settings_room_custom_settings_title">"Yn yr ystafell hon, rhowch wybod i mi am"</string>
+  <string name="screen_room_roles_and_permissions_admins">"Gweinyddwyr"</string>
+  <string name="screen_room_roles_and_permissions_change_my_role">"Newid fy rôl"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_member">"Israddio aelod"</string>
+  <string name="screen_room_roles_and_permissions_change_role_demote_to_moderator">"Israddio cymedrolwr"</string>
+  <string name="screen_room_roles_and_permissions_member_moderation">"Cymedroli aelodau"</string>
+  <string name="screen_room_roles_and_permissions_messages_and_content">"Negeseuon a chynnwys"</string>
+  <string name="screen_room_roles_and_permissions_moderators">"Cymedrolwyr"</string>
   <string name="screen_room_roles_and_permissions_permissions_header">"Caniatâd"</string>
+  <string name="screen_room_roles_and_permissions_reset">"Ailosod caniatâd"</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_description">"Ar ôl i chi ailosod caniatâd, byddwch yn colli\'r gosodiadau cyfredol."</string>
+  <string name="screen_room_roles_and_permissions_reset_confirm_title">"Ailosod caniatâd?"</string>
   <string name="screen_room_roles_and_permissions_roles_header">"Rolau"</string>
+  <string name="screen_room_roles_and_permissions_room_details">"Manylion yr ystafell"</string>
+  <string name="screen_room_roles_and_permissions_title">"Rolau a chaniatâd"</string>
   <string name="screen_security_and_privacy_add_room_address_action">"Ychwanegu cyfeiriad ystafell"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Gall unrhyw un ofyn am gael ymuno â\'r ystafell ond bydd rhaid i weinyddwr neu gymedrolwr dderbyn y cais."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Gofyn i gael ymuno"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Iawn, galluogi amgryptio"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_description">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio ar gyfer ystafell, dim ond ar gyfer aelodau\'r ystafell y bydd hanes neges yn weladwy ers iddyn nhw gael eu gwahodd neu ers iddyn nhw ymuno â\'r ystafell.
-Fydd neb arwahân i aelodau\'r ystafell yn gallu darllen negeseuon. Gall hyn atal botiau a phontydd i weithio\'n gywir.
+Fydd neb ar wahân i aelodau\'r ystafell yn gallu darllen negeseuon. Gall hyn atal botiau a phontydd i weithio\'n gywir.
 Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un ddod o hyd iddynt ac ymuno â nhw."</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_title">"Galluogi amgryptio?"</string>
   <string name="screen_security_and_privacy_encryption_section_footer">"Unwaith y bydd wedi\'i alluogi, does dim modd analluogi amgryptio."</string>
@@ -52,6 +135,17 @@ Nid ydym yn argymell galluogi amgryptio ar gyfer ystafelloedd y gall unrhyw un d
   <string name="screen_security_and_privacy_room_access_space_members_option_title">"Aelodau gofod"</string>
   <string name="screen_security_and_privacy_room_address_section_footer">"Bydd angen cyfeiriad ystafell arnoch er mwyn ei wneud yn weladwy yn y cyfeiriadur ystafelloedd."</string>
   <string name="screen_security_and_privacy_room_address_section_header">"Cyfeiriad yr ystafell"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Caniatáu i\'r ystafell hon gael ei chanfod trwy chwilio cyfeiriadur ystafelloedd cyhoeddus %1$s"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Gweladwy yn y cyfeiriadur ystafelloedd cyhoeddus"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Unrhyw un"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Pwy all ddarllen hanes"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Yn aelodau ond dim ond ers cael eu gwahodd"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Yn aelodau dim ond ers dewis y dewis hwn"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
+Gallwch ddewis cyhoeddi eich ystafell yng ngweinydd cartref eich cyfeiriadur ystafelloedd cyhoeddus."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Cyhoeddi ystafell"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Mae cyfeiriadau ystafelloedd yn ffyrdd o ddod o hyd i ystafelloedd a chael mynediad iddyn nhw. Mae hyn hefyd yn sicrhau y gallwch chi rannu\'ch ystafell yn hawdd ag eraill.
+Mae angen y cyfeiriad hefyd i wneud yr ystafell yn weladwy yng nghyfeiriadur ystafell gyhoeddus %1$s."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Gwelededd yr ystafell"</string>
+  <string name="screen_security_and_privacy_title">"Diogelwch a phreifatrwydd"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-el/translations.xml b/features/roomdetails/impl/src/main/res/values-el/translations.xml
index 33624d1779..3c5b8c7a76 100644
--- a/features/roomdetails/impl/src/main/res/values-el/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-el/translations.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση δωματίου για να γίνει ορατό στον κατάλογο."</string>
+  <string name="screen_edit_room_address_title">"Διεύθυνση δωματίου"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"Παρουσιάστηκε σφάλμα κατά την ενημέρωση της ρύθμισης ειδοποίησης."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Ο οικιακός διακομιστής σου δεν υποστηρίζει αυτήν την επιλογή σε κρυπτογραφημένα δωμάτια, ενδέχεται να μην λάβεις ειδοποίηση σε ορισμένα δωμάτια."</string>
   <string name="screen_polls_history_title">"Δημοσκοπήσεις"</string>
@@ -54,6 +56,7 @@
   <string name="screen_room_details_notification_mode_default">"Προεπιλογή"</string>
   <string name="screen_room_details_notification_title">"Ειδοποιήσεις"</string>
   <string name="screen_room_details_pinned_events_row_title">"Καρφιτσωμένα μηνύματα"</string>
+  <string name="screen_room_details_profile_row_title">"Προφίλ"</string>
   <string name="screen_room_details_requests_to_join_title">"Αιτήματα συμμετοχής"</string>
   <string name="screen_room_details_roles_and_permissions">"Ρόλοι και δικαιώματα"</string>
   <string name="screen_room_details_room_name_label">"Όνομα δωματίου"</string>
@@ -108,6 +111,7 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Ρόλοι"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Λεπτομέρειες δωματίου"</string>
   <string name="screen_room_roles_and_permissions_title">"Ρόλοι και δικαιώματα"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Προσθήκη διεύθυνσης δωματίου"</string>
   <string name="screen_security_and_privacy_ask_to_join_option_description">"Οποιοσδήποτε μπορεί να ζητήσει να συμμετάσχει στο δωμάτιο, αλλά κάποιος διαχειριστής ή συντονιστής θα πρέπει να αποδεχθεί το αίτημα."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Αίτημα συμμετοχής"</string>
   <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ναι, ενεργοποιήστε την κρυπτογράφηση"</string>
@@ -123,7 +127,21 @@
   <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Τα άτομα μπορούν να συμμετάσχουν μόνο εάν έχουν προσκληθεί"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Μόνο πρόσκληση"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Πρόσβαση δωματίου"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Οι χώροι δεν υποστηρίζονται προς το παρόν"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Μέλη χώρου"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Θα χρειαστείτε μια διεύθυνση δωματίου για να το κάνετε ορατό στον κατάλογο δωματίων."</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"Διεύθυνση δωματίου"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Επιτρέψτε την εύρεση αυτού του δωματίου αναζητώντας %1$s τον κατάλογο δημόσιων δωματίων"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Ορατό στον κατάλογο δημόσιων δωματίων"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Οποιοσδήποτε"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Ποιος μπορεί να διαβάσει το ιστορικό"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Μόνο μέλη από τη στιγμή που προσκλήθηκαν"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Μόνο για μέλη μετά από αυτήν την επιλογή"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Οι διευθύνσεις δωματίων είναι τρόποι εύρεσης και πρόσβασης σε δωμάτια. Αυτό διασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε το δωμάτιό σας με άλλους.
+Μπορείτε να επιλέξετε να δημοσιεύσετε το δωμάτιό σας στον κατάλογο δημόσιων δωματίων του διακομιστή σας."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Δημοσίευση δωματίου"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Οι διευθύνσεις δωματίων είναι τρόποι εύρεσης και πρόσβασης σε δωμάτια. Αυτό διασφαλίζει επίσης ότι μπορείτε εύκολα να μοιραστείτε το δωμάτιό σας με άλλους.
+Η διεύθυνση απαιτείται επίσης για να γίνει ορατό το δωμάτιο στον κατάλογο %1$s δημόσιων δωματίων."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Ορατότητα δωματίου"</string>
   <string name="screen_security_and_privacy_title">"Ασφάλεια &amp; απόρρητο"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-fa/translations.xml b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
index 062ce0949c..9a2227d3cf 100644
--- a/features/roomdetails/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-fa/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_edit_room_address_title">"نشانی اتاق"</string>
   <string name="screen_notification_settings_edit_failed_updating_default_mode">"هنگام به‌روز کردن تنظیمات آگاهی خطایی رخ داد."</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"کارساز خانگیتان از این گزینه در اتاق‌های رمز شده پشتیبانی نمی‌کند. ممکن است در برخی اتاق‌ها آگاه نشوید."</string>
   <string name="screen_polls_history_title">"نظرسنجی‌ها"</string>
@@ -7,11 +8,11 @@
   <string name="screen_room_change_permissions_ban_people">"تحریم افراد"</string>
   <string name="screen_room_change_permissions_delete_messages">"برداشتن پیام‌ها"</string>
   <string name="screen_room_change_permissions_everyone">"هرکسی"</string>
-  <string name="screen_room_change_permissions_invite_people">"دعوت افراد"</string>
+  <string name="screen_room_change_permissions_invite_people">"دعوت افراد و پذیرش درخواست‌های پیوستن"</string>
   <string name="screen_room_change_permissions_member_moderation">"نظارت اعضا"</string>
   <string name="screen_room_change_permissions_messages_and_content">"پیام‌ها و محتوا"</string>
   <string name="screen_room_change_permissions_moderators">"مدیرن و ناظران"</string>
-  <string name="screen_room_change_permissions_remove_people">"برداشتن افراد"</string>
+  <string name="screen_room_change_permissions_remove_people">"برداشتن افراد و رد درخواست‌های پیوستن"</string>
   <string name="screen_room_change_permissions_room_avatar">"تغییر چهرک اتاق"</string>
   <string name="screen_room_change_permissions_room_details">"جزییات اتاق"</string>
   <string name="screen_room_change_permissions_room_name">"تغییر نام اتاق"</string>
@@ -49,8 +50,11 @@
   <string name="screen_room_details_notification_mode_default">"پیش‌گزیده"</string>
   <string name="screen_room_details_notification_title">"آگاهی‌ها"</string>
   <string name="screen_room_details_pinned_events_row_title">"پیام‌های سنجاق شده"</string>
+  <string name="screen_room_details_profile_row_title">"نمایه"</string>
+  <string name="screen_room_details_requests_to_join_title">"درخواست‌های پیوستن"</string>
   <string name="screen_room_details_roles_and_permissions">"نقش‌ها و اجازه‌ها"</string>
   <string name="screen_room_details_room_name_label">"نام اتاق"</string>
+  <string name="screen_room_details_security_and_privacy_title">"امنیت و محرمانگی"</string>
   <string name="screen_room_details_security_title">"امنیت"</string>
   <string name="screen_room_details_share_room_title">"هم‌رسانی اتاق"</string>
   <string name="screen_room_details_title">"اطّلاعات اتاق"</string>
@@ -59,6 +63,7 @@
   <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>
+  <string name="screen_room_member_list_manage_member_unban_message">"در صورت دعوت می‌تواند دوباره به اتاق بپیوندد."</string>
   <string name="screen_room_member_list_manage_member_unban_title">"تحریم نکردن کاربر"</string>
   <string name="screen_room_member_list_mode_banned">"محروم"</string>
   <string name="screen_room_member_list_mode_members">"اعضا"</string>
@@ -89,4 +94,22 @@
   <string name="screen_room_roles_and_permissions_roles_header">"نقش‌ها"</string>
   <string name="screen_room_roles_and_permissions_room_details">"جزییات اتاق"</string>
   <string name="screen_room_roles_and_permissions_title">"نقش‌ها و اجازه‌ها"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"افزودن نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_title">"درخواست دعوت"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"بله. به کار انداختن رمزنگاری"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"رمزگذاری فعال شود؟"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"پس از به کار افتادن، رمزنگاری قابل از کار انداختن نیست."</string>
+  <string name="screen_security_and_privacy_encryption_section_header">"رمزنگاری"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"هرکسی می تواند یافته و بپیوندد"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"افراد فقط در صورت دعوت می‌توانند بپیوندند"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_title">"فقط دعوتی"</string>
+  <string name="screen_security_and_privacy_room_access_section_header">"دسترسی اتاق"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"در حال حاضر فضاها پشتیبانی نمی‌شوند"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"اعضای فضا"</string>
+  <string name="screen_security_and_privacy_room_address_section_header">"نشانی اتاق"</string>
+  <string name="screen_security_and_privacy_room_history_anyone_option_title">"هرکسی"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"انتشار اتاق"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_header">"نمایانی اتاق"</string>
+  <string name="screen_security_and_privacy_title">"امنیت و محرمانگی"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-in/translations.xml b/features/roomdetails/impl/src/main/res/values-in/translations.xml
index 23ca7b6c6c..072efc2127 100644
--- a/features/roomdetails/impl/src/main/res/values-in/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-in/translations.xml
@@ -107,12 +107,35 @@
   <string name="screen_room_roles_and_permissions_roles_header">"Peran"</string>
   <string name="screen_room_roles_and_permissions_room_details">"Detail ruangan"</string>
   <string name="screen_room_roles_and_permissions_title">"Peran dan perizinan"</string>
+  <string name="screen_security_and_privacy_add_room_address_action">"Tambahkan alamat ruangan"</string>
+  <string name="screen_security_and_privacy_ask_to_join_option_description">"Siapa pun dapat meminta untuk bergabung dengan ruangan tetapi administrator atau moderator harus menerima permintaan tersebut."</string>
   <string name="screen_security_and_privacy_ask_to_join_option_title">"Minta untuk bergabung"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_confirm_button_title">"Ya, aktifkan enkripsi"</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_description">"Setelah diaktifkan, encryption untuk sebuah ruangan tidak dapat dinonaktifkan, Riwayat pesan hanya akan terlihat oleh anggota ruangan sejak mereka diundang atau sejak mereka bergabung dengan ruangan tersebut.
+Tidak ada orang lain selain anggota ruangan yang dapat membaca pesan. Hal ini dapat mencegah bot dan jembatan bekerja dengan benar.
+Kami tidak menyarankan untuk mengaktifkan enkripsi untuk ruangan yang dapat ditemukan dan diikuti oleh siapa pun."</string>
+  <string name="screen_security_and_privacy_enable_encryption_alert_title">"Aktifkan enkripsi?"</string>
+  <string name="screen_security_and_privacy_encryption_section_footer">"Setelah diaktifkan, enkripsi tidak dapat dinonaktifkan."</string>
   <string name="screen_security_and_privacy_encryption_section_header">"Enkripsi"</string>
+  <string name="screen_security_and_privacy_encryption_toggle_title">"Aktifkan enkripsi ujung ke ujung"</string>
+  <string name="screen_security_and_privacy_room_access_anyone_option_description">"Siapa pun dapat menemukan dan bergabung"</string>
   <string name="screen_security_and_privacy_room_access_anyone_option_title">"Siapa pun"</string>
+  <string name="screen_security_and_privacy_room_access_invite_only_option_description">"Orang hanya dapat bergabung jika mereka diundang"</string>
   <string name="screen_security_and_privacy_room_access_invite_only_option_title">"Hanya undangan"</string>
   <string name="screen_security_and_privacy_room_access_section_header">"Akses ruangan"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_description">"Space saat ini tidak didukung"</string>
+  <string name="screen_security_and_privacy_room_access_space_members_option_title">"Anggota space"</string>
+  <string name="screen_security_and_privacy_room_address_section_footer">"Anda memerlukan alamat ruangan agar dapat membuatnya terlihat di direktori ruangan."</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_section_footer">"Izinkan ruangan ini ditemukan dengan mencari direktori ruangan %1$s publik"</string>
+  <string name="screen_security_and_privacy_room_directory_visibility_toggle_title">"Terlihat di direktori ruangan publik"</string>
   <string name="screen_security_and_privacy_room_history_anyone_option_title">"Siapa pun"</string>
+  <string name="screen_security_and_privacy_room_history_section_header">"Siapa yang bisa membaca riwayat"</string>
+  <string name="screen_security_and_privacy_room_history_since_invite_option_title">"Hanya anggota sejak mereka diundang"</string>
+  <string name="screen_security_and_privacy_room_history_since_selecting_option_title">"Hanya anggota sejak memilih opsi ini"</string>
+  <string name="screen_security_and_privacy_room_publishing_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain. Anda dapat memilih untuk menerbitkan ruangan Anda di direktori ruangan publik homeserver Anda."</string>
+  <string name="screen_security_and_privacy_room_publishing_section_header">"Penerbitan ruangan"</string>
+  <string name="screen_security_and_privacy_room_visibility_section_footer">"Alamat ruangan adalah cara untuk menemukan dan mengakses ruangan. Hal ini juga memastikan Anda dapat dengan mudah berbagi ruangan dengan orang lain.
+Alamat ini juga diperlukan untuk membuat ruangan terlihat di %1$s direktori ruangan publik."</string>
   <string name="screen_security_and_privacy_room_visibility_section_header">"Keterlihatan ruangan"</string>
   <string name="screen_security_and_privacy_title">"Keamanan &amp; privasi"</string>
 </resources>
diff --git a/features/roomdetails/impl/src/main/res/values-ka/translations.xml b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
index a3a3954148..6a68985d87 100644
--- a/features/roomdetails/impl/src/main/res/values-ka/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-ka/translations.xml
@@ -75,7 +75,7 @@
   <string name="screen_room_notification_settings_allow_custom">"მორგებული პარამეტრის დაშვება"</string>
   <string name="screen_room_notification_settings_allow_custom_footnote">"ამის ჩართვა უგულებელყოფს თქვენს ნაგულისხმევ პარამეტრს"</string>
   <string name="screen_room_notification_settings_custom_settings_title">"ამ ჩატში ჩემი შეტყობინება:"</string>
-  <string name="screen_room_notification_settings_default_setting_footnote">"თქვენ შეგიძლიათ შეცვალოთ იგი თქვენს %1$s ."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"თქვენ შეგიძლიათ შეცვალოთ იგი თქვენს %1$s."</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"გლობალური პარამეტრები"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Სტანდარტული პარამეტრები"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"მორგებული პარამეტრის წაშლა"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-nb/translations.xml b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
index 924f7a2eff..a8f5d8d123 100644
--- a/features/roomdetails/impl/src/main/res/values-nb/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-nb/translations.xml
@@ -86,7 +86,7 @@
   <string name="screen_room_notification_settings_allow_custom">"Tillat egendefinert innstilling"</string>
   <string name="screen_room_notification_settings_allow_custom_footnote">"Hvis du slår på dette, overstyrer du standardinnstillingen"</string>
   <string name="screen_room_notification_settings_custom_settings_title">"Varsle meg i denne chatten om"</string>
-  <string name="screen_room_notification_settings_default_setting_footnote">"Du kan endre det i din %1$s ."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Du kan endre det i din %1$s."</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"globale innstillinger"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Standard innstilling"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"Fjern egendefinert innstilling"</string>
diff --git a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
index c9e5c53c23..47702d4a80 100644
--- a/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-pt-rBR/translations.xml
@@ -52,6 +52,7 @@
   <string name="screen_room_details_share_room_title">"Compartilhar sala"</string>
   <string name="screen_room_details_topic_title">"Tópico"</string>
   <string name="screen_room_details_updating_room">"Atualizando a sala…"</string>
+  <string name="screen_room_member_list_banned_empty">"Não há usuários banidos nesta sala."</string>
   <plurals name="screen_room_member_list_header_title">
     <item quantity="one">"%1$d pessoa"</item>
     <item quantity="other">"%1$d pessoas"</item>
diff --git a/features/roomdetails/impl/src/main/res/values-sv/translations.xml b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
index a576036c45..12cec6d6ee 100644
--- a/features/roomdetails/impl/src/main/res/values-sv/translations.xml
+++ b/features/roomdetails/impl/src/main/res/values-sv/translations.xml
@@ -86,7 +86,7 @@
   <string name="screen_room_notification_settings_allow_custom">"Tillåt anpassad inställning"</string>
   <string name="screen_room_notification_settings_allow_custom_footnote">"Om du aktiverar detta åsidosätts din standardinställning"</string>
   <string name="screen_room_notification_settings_custom_settings_title">"Meddela mig i den här chatten för"</string>
-  <string name="screen_room_notification_settings_default_setting_footnote">"Du kan ändra det i dina %1$s ."</string>
+  <string name="screen_room_notification_settings_default_setting_footnote">"Du kan ändra det i dina %1$s."</string>
   <string name="screen_room_notification_settings_default_setting_footnote_content_link">"globala inställningar"</string>
   <string name="screen_room_notification_settings_default_setting_title">"Standardinställning"</string>
   <string name="screen_room_notification_settings_edit_remove_setting">"Ta bort anpassad inställning"</string>
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
index 3cf5c02e47..1de627fd51 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/MatrixRoomFixture.kt
@@ -21,11 +21,66 @@ import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.lambda.lambdaError
 
-fun aMatrixRoom(
+fun aRoom(
+    sessionId: SessionId = A_SESSION_ID,
+    roomId: RoomId = A_ROOM_ID,
+    displayName: String = A_ROOM_NAME,
+    rawName: String? = displayName,
+    topic: String? = A_ROOM_TOPIC,
+    avatarUrl: String? = AN_AVATAR_URL,
+    canonicalAlias: RoomAlias? = A_ROOM_ALIAS,
+    isEncrypted: Boolean = true,
+    isPublic: Boolean = true,
+    isDirect: Boolean = false,
+    joinRule: JoinRule? = null,
+    activeMemberCount: Long = 1,
+    joinedMemberCount: Long = 1,
+    invitedMemberCount: Long = 0,
+    canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
+    userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
+    userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
+    canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
+    userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
+    setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
+) = FakeBaseRoom(
+    sessionId = sessionId,
+    roomId = roomId,
+    canInviteResult = canInviteResult,
+    canBanResult = canBanResult,
+    canKickResult = canKickResult,
+    canSendStateResult = canSendStateResult,
+    userDisplayNameResult = userDisplayNameResult,
+    userAvatarUrlResult = userAvatarUrlResult,
+    canUserJoinCallResult = canUserJoinCallResult,
+    getUpdatedMemberResult = getUpdatedMemberResult,
+    userRoleResult = userRoleResult,
+    setIsFavoriteResult = setIsFavoriteResult,
+    initialRoomInfo = aRoomInfo(
+        name = displayName,
+        rawName = rawName,
+        topic = topic,
+        avatarUrl = avatarUrl,
+        canonicalAlias = canonicalAlias,
+        isDirect = isDirect,
+        isPublic = isPublic,
+        isEncrypted = isEncrypted,
+        joinRule = joinRule,
+        joinedMembersCount = joinedMemberCount,
+        activeMembersCount = activeMemberCount,
+        invitedMembersCount = invitedMemberCount,
+    )
+)
+
+fun aJoinedRoom(
     sessionId: SessionId = A_SESSION_ID,
     roomId: RoomId = A_ROOM_ID,
     displayName: String = A_ROOM_NAME,
@@ -60,31 +115,33 @@ fun aMatrixRoom(
     updateCanonicalAliasResult: (RoomAlias?, List<RoomAlias>) -> Result<Unit> = { _, _ -> lambdaError() },
     publishRoomAliasInRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
     removeRoomAliasFromRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
-) = FakeMatrixRoom(
-    sessionId = sessionId,
-    roomId = roomId,
-    notificationSettingsService = notificationSettingsService,
-    canInviteResult = canInviteResult,
-    canBanResult = canBanResult,
-    canKickResult = canKickResult,
-    canSendStateResult = canSendStateResult,
-    userDisplayNameResult = userDisplayNameResult,
-    userAvatarUrlResult = userAvatarUrlResult,
+    setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
+) = FakeJoinedRoom(
+    roomNotificationSettingsService = notificationSettingsService,
     setNameResult = setNameResult,
     setTopicResult = setTopicResult,
     updateAvatarResult = updateAvatarResult,
     removeAvatarResult = removeAvatarResult,
-    canUserJoinCallResult = canUserJoinCallResult,
-    getUpdatedMemberResult = getUpdatedMemberResult,
-    userRoleResult = userRoleResult,
     kickUserResult = kickUserResult,
     banUserResult = banUserResult,
     unBanUserResult = unBanUserResult,
     updateCanonicalAliasResult = updateCanonicalAliasResult,
     publishRoomAliasInRoomDirectoryResult = publishRoomAliasInRoomDirectoryResult,
     removeRoomAliasFromRoomDirectoryResult = removeRoomAliasFromRoomDirectoryResult,
-    initialRoomInfo = aRoomInfo(
-        name = displayName,
+    baseRoom = aRoom(
+        sessionId = sessionId,
+        roomId = roomId,
+        canInviteResult = canInviteResult,
+        canBanResult = canBanResult,
+        canKickResult = canKickResult,
+        canSendStateResult = canSendStateResult,
+        userDisplayNameResult = userDisplayNameResult,
+        userAvatarUrlResult = userAvatarUrlResult,
+        canUserJoinCallResult = canUserJoinCallResult,
+        getUpdatedMemberResult = getUpdatedMemberResult,
+        userRoleResult = userRoleResult,
+        setIsFavoriteResult = setIsFavoriteResult,
+        displayName = displayName,
         rawName = rawName,
         topic = topic,
         avatarUrl = avatarUrl,
@@ -93,8 +150,8 @@ fun aMatrixRoom(
         isPublic = isPublic,
         isEncrypted = isEncrypted,
         joinRule = joinRule,
-        joinedMembersCount = joinedMemberCount,
-        activeMembersCount = activeMemberCount,
-        invitedMembersCount = invitedMemberCount,
+        joinedMemberCount = joinedMemberCount,
+        activeMemberCount = activeMemberCount,
+        invitedMemberCount = invitedMemberCount,
     )
 )
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
index 6c88ce8c2b..c08aa93692 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenterTest.kt
@@ -25,8 +25,8 @@ import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.join.JoinRule
@@ -39,7 +39,6 @@ import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
@@ -70,7 +69,7 @@ class RoomDetailsPresenterTest {
     }
 
     private fun TestScope.createRoomDetailsPresenter(
-        room: MatrixRoom = aMatrixRoom(),
+        room: JoinedRoom = aJoinedRoom(),
         leaveRoomState: LeaveRoomState = aLeaveRoomState(),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
@@ -116,7 +115,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state is created from initial room info`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -145,7 +144,7 @@ class RoomDetailsPresenterTest {
             avatarUrl = AN_AVATAR_URL,
             pinnedEventIds = listOf(AN_EVENT_ID),
         )
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -166,7 +165,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state with no room name`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             displayName = "",
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
@@ -185,7 +184,7 @@ class RoomDetailsPresenterTest {
     fun `present - initial state with DM member sets custom DM roomType`() = runTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -198,7 +197,7 @@ class RoomDetailsPresenterTest {
             },
         ).apply {
             val roomMembers = persistentListOf(myRoomMember, otherRoomMember)
-            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+            givenRoomMembersState(RoomMembersState.Ready(roomMembers))
 
             givenRoomInfo(
                 aRoomInfo(
@@ -222,7 +221,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when user can invite others to room`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -240,7 +239,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when user can not invite others to room`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(false) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -255,7 +254,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when canInvite errors`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.failure(Throwable("Whoops")) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -270,7 +269,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when user can edit one attribute`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
                     StateEventType.ROOM_TOPIC -> Result.success(true)
@@ -296,7 +295,7 @@ class RoomDetailsPresenterTest {
     fun `present - initial state when user can edit attributes in a DM`() = runTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
                     StateEventType.ROOM_TOPIC,
@@ -316,7 +315,7 @@ class RoomDetailsPresenterTest {
             },
         ).apply {
             val roomMembers = persistentListOf(myRoomMember, otherRoomMember)
-            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+            givenRoomMembersState(RoomMembersState.Ready(roomMembers))
 
             givenRoomInfo(
                 aRoomInfo(
@@ -343,7 +342,7 @@ class RoomDetailsPresenterTest {
     fun `present - initial state when in a DM with no topic`() = runTest {
         val myRoomMember = aRoomMember(A_SESSION_ID)
         val otherRoomMember = aRoomMember(A_USER_ID_2)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             isDirect = true,
             topic = null,
             canSendStateResult = { _, stateEventType ->
@@ -365,7 +364,7 @@ class RoomDetailsPresenterTest {
             },
         ).apply {
             val roomMembers = persistentListOf(myRoomMember, otherRoomMember)
-            givenRoomMembersState(MatrixRoomMembersState.Ready(roomMembers))
+            givenRoomMembersState(RoomMembersState.Ready(roomMembers))
 
             givenRoomInfo(
                 aRoomInfo(
@@ -378,7 +377,7 @@ class RoomDetailsPresenterTest {
 
         val presenter = createRoomDetailsPresenter(room)
         presenter.testWithLifecycleOwner(lifecycleOwner = fakeLifecycleOwner) {
-            skipItems(1)
+            skipItems(2)
 
             // There's no topic, so we hide the entire UI for DMs
             assertThat(awaitItem().roomTopic).isEqualTo(RoomTopicState.Hidden)
@@ -389,7 +388,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when user can edit all attributes`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
                     StateEventType.ROOM_TOPIC,
@@ -416,7 +415,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - initial state when user can edit no attributes`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
                     StateEventType.ROOM_TOPIC,
@@ -441,7 +440,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - topic state is hidden when no topic and user has no permission`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = null,
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
@@ -467,7 +466,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - topic state is 'can add topic' when no topic and user has permission`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = null,
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
@@ -499,7 +498,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - leave room event is passed on to leave room presenter`() = runTest {
         val leaveRoomEventRecorder = EventsRecorder<LeaveRoomEvent>()
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -519,7 +518,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - notification mode changes`() = runTest {
         val notificationSettingsService = FakeNotificationSettingsService()
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
@@ -548,7 +547,7 @@ class RoomDetailsPresenterTest {
     fun `present - mute room notifications`() = runTest {
         val notificationSettingsService =
             FakeNotificationSettingsService(initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
@@ -576,7 +575,7 @@ class RoomDetailsPresenterTest {
             initialRoomMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
             initialEncryptedGroupDefaultMode = RoomNotificationMode.ALL_MESSAGES
         )
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             notificationSettingsService = notificationSettingsService,
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
@@ -601,7 +600,7 @@ class RoomDetailsPresenterTest {
     @Test
     fun `present - when set is favorite event is emitted, then the action is called`() = runTest {
         val setIsFavoriteResult = lambdaRecorder<Boolean, Result<Unit>> { _ -> Result.success(Unit) }
-        val room = FakeMatrixRoom(
+        val room = aJoinedRoom(
             setIsFavoriteResult = setIsFavoriteResult,
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
@@ -630,7 +629,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - changes in room info updates the is favorite flag`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -651,7 +650,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - show knock requests`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
@@ -677,7 +676,7 @@ class RoomDetailsPresenterTest {
 
     @Test
     fun `present - show security and privacy`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canInviteResult = { Result.success(true) },
             canUserJoinCallResult = { Result.success(true) },
             canSendStateResult = { _, _ -> Result.success(true) },
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
index da7f92aed5..2f4eebcad1 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
@@ -283,6 +283,20 @@ class RoomDetailsViewTest {
         eventsRecorder.assertSingle(RoomDetailsEvent.LeaveRoom)
     }
 
+    @Config(qualifiers = "h1500dp")
+    @Test
+    fun `click on report room  invokes expected callback`() {
+        ensureCalledOnce { callback ->
+            rule.setRoomDetailView(
+                state = aRoomDetailsState(
+                    eventSink = EventsRecorder(expectEvents = false),
+                ),
+                onReportRoomClick = callback,
+            )
+            rule.clickOn(CommonStrings.action_report_room)
+        }
+    }
+
     @Config(qualifiers = "h1024dp")
     @Test
     fun `click on knock requests invokes expected callback`() {
@@ -333,6 +347,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
     onKnockRequestsClick: () -> Unit = EnsureNeverCalled(),
     onSecurityAndPrivacyClick: () -> Unit = EnsureNeverCalled(),
     onProfileClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),
+    onReportRoomClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomDetailsView(
@@ -352,6 +367,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
             onKnockRequestsClick = onKnockRequestsClick,
             onSecurityAndPrivacyClick = onSecurityAndPrivacyClick,
             onProfileClick = onProfileClick,
+            onReportRoomClick = onReportRoomClick,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt
index 763f94c310..7a2ff4ee06 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenterTest.kt
@@ -10,11 +10,11 @@ package io.element.android.features.roomdetails.impl.edit
 import android.net.Uri
 import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.libraries.androidutils.file.TemporaryUriDeleter
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.mimetype.MimeTypes
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
@@ -74,7 +74,7 @@ class RoomDetailsEditPresenterTest {
     }
 
     private fun createRoomDetailsEditPresenter(
-        room: MatrixRoom,
+        room: JoinedRoom,
         permissionsPresenter: PermissionsPresenter = FakePermissionsPresenter(),
         temporaryUriDeleter: TemporaryUriDeleter = FakeTemporaryUriDeleter(),
     ): RoomDetailsEditPresenter {
@@ -89,7 +89,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - initial state is created from room info`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
             displayName = A_ROOM_NAME,
             rawName = A_ROOM_RAW_NAME,
@@ -118,7 +118,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets canChangeName if user has permission`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
@@ -151,7 +151,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets canChangeAvatar if user has permission`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
@@ -183,7 +183,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets canChangeTopic if user has permission`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             avatarUrl = AN_AVATAR_URL,
             canSendStateResult = { _, stateEventType ->
                 when (stateEventType) {
@@ -215,7 +215,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates state in response to changes`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -260,7 +260,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - obtains avatar uris from gallery`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -284,7 +284,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - obtains avatar uris from camera`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -325,7 +325,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates save button state`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -375,7 +375,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - updates save button state when initial values are null`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = null,
             displayName = "fallback",
             avatarUrl = null,
@@ -428,7 +428,7 @@ class RoomDetailsEditPresenterTest {
         val setNameResult = lambdaRecorder { _: String -> Result.success(Unit) }
         val setTopicResult = lambdaRecorder { _: String -> Result.success(Unit) }
         val removeAvatarResult = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -457,7 +457,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change room details if they're the same trimmed`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -479,7 +479,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change topic if it was unset and is now blank`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = null,
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -501,7 +501,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save doesn't change name if it's now empty`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -524,7 +524,7 @@ class RoomDetailsEditPresenterTest {
     @Test
     fun `present - save processes and sets avatar when processor returns successfully`() = runTest {
         val updateAvatarResult = lambdaRecorder { _: String, _: ByteArray -> Result.success(Unit) }
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -552,7 +552,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - save does not set avatar data if processor fails`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -576,7 +576,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if name update fails`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -588,7 +588,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if topic update fails`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -600,7 +600,7 @@ class RoomDetailsEditPresenterTest {
 
     @Test
     fun `present - sets save action to failure if removing avatar fails`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -613,7 +613,7 @@ class RoomDetailsEditPresenterTest {
     @Test
     fun `present - sets save action to failure if setting avatar fails`() = runTest {
         givenPickerReturnsFile()
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -626,7 +626,7 @@ class RoomDetailsEditPresenterTest {
     @Test
     fun `present - CancelSaveChanges resets save action state`() = runTest {
         givenPickerReturnsFile()
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             topic = "My topic",
             displayName = "Name",
             avatarUrl = AN_AVATAR_URL,
@@ -650,7 +650,7 @@ class RoomDetailsEditPresenterTest {
     }
 
     private suspend fun saveAndAssertFailure(
-        room: MatrixRoom,
+        room: JoinedRoom,
         event: RoomDetailsEditEvents,
         deleteCallbackNumberOfInvocation: Int = 2,
     ) {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersPresenterTest.kt
index cd14a8b513..5aae0f5d3b 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersPresenterTest.kt
@@ -11,19 +11,19 @@ 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.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aRoom
 import io.element.android.features.roomdetails.impl.members.RoomMemberListDataSource
 import io.element.android.features.roomdetails.impl.members.aRoomMember
 import io.element.android.features.roomdetails.impl.members.aRoomMemberList
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.usersearch.api.UserSearchResult
@@ -47,7 +47,7 @@ internal class RoomInviteMembersPresenterTest {
     fun `present - initial state has no results and no search`() = runTest {
         val presenter = RoomInviteMembersPresenter(
             userRepository = FakeUserRepository(),
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers()
         )
 
@@ -69,7 +69,7 @@ internal class RoomInviteMembersPresenterTest {
     fun `present - updates search active state`() = runTest {
         val presenter = RoomInviteMembersPresenter(
             userRepository = FakeUserRepository(),
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers()
         )
 
@@ -91,7 +91,7 @@ internal class RoomInviteMembersPresenterTest {
         val repository = FakeUserRepository()
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -118,7 +118,7 @@ internal class RoomInviteMembersPresenterTest {
         val repository = FakeUserRepository()
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -159,9 +159,9 @@ internal class RoomInviteMembersPresenterTest {
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
             roomMemberListDataSource = createDataSource(
-                matrixRoom = FakeMatrixRoom().apply {
+                room = FakeBaseRoom().apply {
                     givenRoomMembersState(
-                        MatrixRoomMembersState.Ready(
+                        RoomMembersState.Ready(
                             persistentListOf(
                                 aRoomMember(userId = joinedUser.userId, membership = RoomMembershipState.JOIN),
                                 aRoomMember(userId = invitedUser.userId, membership = RoomMembershipState.INVITE),
@@ -219,9 +219,9 @@ internal class RoomInviteMembersPresenterTest {
         val repository = FakeUserRepository()
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom().apply {
+            roomMemberListDataSource = createDataSource(FakeBaseRoom().apply {
                 givenRoomMembersState(
-                    MatrixRoomMembersState.Ready(
+                    RoomMembersState.Ready(
                         persistentListOf(
                             aRoomMember(userId = joinedUser.userId, membership = RoomMembershipState.JOIN),
                             aRoomMember(userId = invitedUser.userId, membership = RoomMembershipState.INVITE),
@@ -295,7 +295,7 @@ internal class RoomInviteMembersPresenterTest {
         val repository = FakeUserRepository()
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -336,7 +336,7 @@ internal class RoomInviteMembersPresenterTest {
         val repository = FakeUserRepository()
         val presenter = RoomInviteMembersPresenter(
             userRepository = repository,
-            roomMemberListDataSource = createDataSource(FakeMatrixRoom()),
+            roomMemberListDataSource = createDataSource(FakeBaseRoom()),
             coroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -397,11 +397,11 @@ internal class RoomInviteMembersPresenterTest {
     }
 
     private fun TestScope.createDataSource(
-        matrixRoom: MatrixRoom = aMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        room: BaseRoom = aRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         },
         coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers()
-    ) = RoomMemberListDataSource(matrixRoom, coroutineDispatchers)
+    ) = RoomMemberListDataSource(room, coroutineDispatchers)
 
     private fun SearchBarResultState<ImmutableList<InvitableUser>>.users() =
         (this as? SearchBarResultState.Results<ImmutableList<InvitableUser>>)?.results.orEmpty()
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparatorTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt
similarity index 98%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparatorTest.kt
rename to features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt
index 496cfb3136..80ada2e7b6 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelRoomMemberComparatorTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/PowerLevelBaseRoomMemberComparatorTest.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID_4
 import io.element.android.libraries.matrix.test.A_USER_ID_5
 import org.junit.Test
 
-class PowerLevelRoomMemberComparatorTest {
+class PowerLevelBaseRoomMemberComparatorTest {
     @Test
     fun `order is Admin, then Moderator, then User`() {
         val memberList = listOf(
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
index 91a6ba6683..82e5a910dc 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListPresenterTest.kt
@@ -17,10 +17,12 @@ import io.element.android.features.roomdetails.impl.members.moderation.aRoomMemb
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.EventsRecorder
 import io.element.android.tests.testutils.WarmUpRule
@@ -38,14 +40,16 @@ class RoomMemberListPresenterTest {
 
     @Test
     fun `member loading is done automatically on start, but is async`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             updateMembersResult = { Result.success(Unit) },
             canInviteResult = { Result.success(true) }
         ).apply {
             // Needed to avoid discarding the loaded members as a partial and invalid result
             givenRoomInfo(aRoomInfo(joinedMembersCount = 2))
         }
-        val presenter = createPresenter(matrixRoom = room)
+        )
+        val presenter = createPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -55,7 +59,7 @@ class RoomMemberListPresenterTest {
             assertThat(initialState.searchQuery).isEmpty()
             assertThat(initialState.searchResults).isInstanceOf(SearchBarResultState.Initial::class.java)
             assertThat(initialState.isSearchActive).isFalse()
-            room.givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             // Skip item while the new members state is processed
             skipItems(1)
             val loadedMembersState = awaitItem()
@@ -69,9 +73,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `open search`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    updateMembersResult = { Result.success(Unit) },
+                    canInviteResult = { Result.success(true) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -89,10 +95,12 @@ class RoomMemberListPresenterTest {
     @Test
     fun `search for something which is not found`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 updateMembersResult = { Result.success(Unit) },
                 canInviteResult = { Result.success(true) }
             )
+            )
         )
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -113,9 +121,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `search for something which is found`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    updateMembersResult = { Result.success(Unit) },
+                    canInviteResult = { Result.success(true) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -139,9 +149,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when user has correct power level`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
-                canInviteResult = { Result.success(true) },
-                updateMembersResult = { Result.success(Unit) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    canInviteResult = { Result.success(true) },
+                    updateMembersResult = { Result.success(Unit) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -156,9 +168,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when user does not have correct power level`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
-                canInviteResult = { Result.success(false) },
-                updateMembersResult = { Result.success(Unit) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    canInviteResult = { Result.success(false) },
+                    updateMembersResult = { Result.success(Unit) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -173,9 +187,11 @@ class RoomMemberListPresenterTest {
     @Test
     fun `present - asynchronously sets canInvite when power level check fails`() = runTest {
         val presenter = createPresenter(
-            matrixRoom = FakeMatrixRoom(
-                canInviteResult = { Result.failure(Throwable("Eek")) },
-                updateMembersResult = { Result.success(Unit) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    canInviteResult = { Result.failure(Throwable("Eek")) },
+                    updateMembersResult = { Result.success(Unit) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -194,9 +210,11 @@ class RoomMemberListPresenterTest {
         val presenter = createPresenter(
             roomMembersModerationStateLambda = roomMembersModerationStateLambda,
             navigator = navigator,
-            matrixRoom = FakeMatrixRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    updateMembersResult = { Result.success(Unit) },
+                    canInviteResult = { Result.success(true) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -221,9 +239,11 @@ class RoomMemberListPresenterTest {
         val presenter = createPresenter(
             roomMembersModerationStateLambda = roomMembersModerationStateLambda,
             navigator = navigator,
-            matrixRoom = FakeMatrixRoom(
-                updateMembersResult = { Result.success(Unit) },
-                canInviteResult = { Result.success(true) }
+            joinedRoom = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
+                    updateMembersResult = { Result.success(Unit) },
+                    canInviteResult = { Result.success(true) }
+                )
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -247,24 +267,26 @@ private class FakeRoomMemberListNavigator : RoomMemberListNavigator {
 
 @ExperimentalCoroutinesApi
 private fun TestScope.createDataSource(
-    matrixRoom: MatrixRoom = FakeMatrixRoom().apply {
-        givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+    room: BaseRoom = FakeBaseRoom().apply {
+        givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
     },
     coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers()
-) = RoomMemberListDataSource(matrixRoom, coroutineDispatchers)
+) = RoomMemberListDataSource(room, coroutineDispatchers)
 
 @ExperimentalCoroutinesApi
 private fun TestScope.createPresenter(
     coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(useUnconfinedTestDispatcher = true),
-    matrixRoom: MatrixRoom = FakeMatrixRoom(
-        updateMembersResult = { Result.success(Unit) }
+    joinedRoom: JoinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+            updateMembersResult = { Result.success(Unit) }
+        )
     ),
     roomMemberListDataSource: RoomMemberListDataSource = createDataSource(coroutineDispatchers = coroutineDispatchers),
     roomMembersModerationStateLambda: () -> RoomMembersModerationState = { aRoomMembersModerationState() },
     encryptedService: FakeEncryptionService = FakeEncryptionService(),
     navigator: RoomMemberListNavigator = object : RoomMemberListNavigator {}
 ) = RoomMemberListPresenter(
-    room = matrixRoom,
+    room = joinedRoom,
     roomMemberListDataSource = roomMemberListDataSource,
     coroutineDispatchers = coroutineDispatchers,
     roomMembersModerationPresenter = { roomMembersModerationStateLambda() },
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
index 41ff8706ae..17d49cfab9 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsPresenterTest.kt
@@ -11,7 +11,7 @@ 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.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.features.roomdetails.impl.members.aRoomMember
 import io.element.android.features.userprofile.api.UserProfileEvents
 import io.element.android.features.userprofile.api.UserProfilePresenterFactory
@@ -23,12 +23,13 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -36,6 +37,7 @@ import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.test
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule
 import org.junit.Test
@@ -48,12 +50,12 @@ class RoomMemberDetailsPresenterTest {
     @Test
     fun `present - returns the room member's data, then updates it if needed`() = runTest {
         val roomMember = aRoomMember(displayName = "Alice")
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             getUpdatedMemberResult = { Result.success(roomMember) },
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(roomMember)))
+            givenRoomMembersState(RoomMembersState.Ready(persistentListOf(roomMember)))
         }
         val presenter = createRoomMemberDetailsPresenter(
             room = room,
@@ -75,12 +77,12 @@ class RoomMemberDetailsPresenterTest {
             displayName = "Alice",
             avatarUrl = "Alice Avatar url",
         )
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             userDisplayNameResult = { Result.failure(Throwable()) },
             userAvatarUrlResult = { Result.failure(Throwable()) },
             getUpdatedMemberResult = { Result.failure(AN_EXCEPTION) },
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(roomMember)))
+            givenRoomMembersState(RoomMembersState.Ready(persistentListOf(roomMember)))
         }
 
         val presenter = createRoomMemberDetailsPresenter(
@@ -98,12 +100,12 @@ class RoomMemberDetailsPresenterTest {
     @Test
     fun `present - will fallback to original data if the updated data is null`() = runTest {
         val roomMember = aRoomMember(displayName = "Alice")
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             userDisplayNameResult = { Result.success(null) },
             userAvatarUrlResult = { Result.success(null) },
             getUpdatedMemberResult = { Result.success(roomMember) }
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(roomMember)))
+            givenRoomMembersState(RoomMembersState.Ready(persistentListOf(roomMember)))
         }
         val presenter = createRoomMemberDetailsPresenter(
             room = room,
@@ -119,7 +121,7 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - will fallback to user profile if user is not a member of the room`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             userDisplayNameResult = { Result.failure(Exception("Not a member!")) },
             userAvatarUrlResult = { Result.failure(Exception("Not a member!")) },
             getUpdatedMemberResult = { Result.failure(AN_EXCEPTION) },
@@ -142,7 +144,7 @@ class RoomMemberDetailsPresenterTest {
             displayName = null,
             avatarUrl = null,
         )
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             userDisplayNameResult = { Result.success(null) },
             userAvatarUrlResult = { Result.success(null) },
             getUpdatedMemberResult = { Result.success(roomMember) },
@@ -169,12 +171,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - when user's identity is verified, the value in the state is VERIFIED`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(IdentityState.Verified) },
         )
@@ -188,12 +192,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - when user's identity is unknown, the value in the state is UNKNOWN`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(null) },
         )
@@ -207,12 +213,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - when user's identity is pinned, the value in the state is UNVERIFIED`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(IdentityState.Pinned) },
         )
@@ -226,12 +234,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - when user's identity is pin violation, the value in the state is UNVERIFIED`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(IdentityState.PinViolation) },
         )
@@ -245,12 +255,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - when user's identity has a verification violation, the value in the state is VERIFICATION_VIOLATION`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(IdentityState.VerificationViolation) },
         )
@@ -264,11 +276,15 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - user identity updates in real time if the room is encrypted`() = runTest {
-        val room = FakeMatrixRoom(
+        val identityStateChanges = MutableStateFlow(emptyList<IdentityStateChange>())
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
+        ),
+            identityStateChangesFlow = identityStateChanges,
         )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(null) },
@@ -280,24 +296,28 @@ class RoomMemberDetailsPresenterTest {
 
             room.emitSyncUpdate()
 
-            room.emitIdentityStateChanges(listOf(IdentityStateChange(A_USER_ID, IdentityState.Pinned)))
+            identityStateChanges.emit(listOf(IdentityStateChange(A_USER_ID, IdentityState.Pinned)))
             consumeItemsUntilPredicate { it.verificationState == UserProfileVerificationState.UNVERIFIED }
 
-            room.emitIdentityStateChanges(listOf(IdentityStateChange(A_USER_ID, IdentityState.Verified)))
+            identityStateChanges.emit(listOf(IdentityStateChange(A_USER_ID, IdentityState.Verified)))
             consumeItemsUntilPredicate { it.verificationState == UserProfileVerificationState.VERIFIED }
 
-            room.emitIdentityStateChanges(listOf(IdentityStateChange(A_USER_ID, IdentityState.VerificationViolation)))
+            identityStateChanges.emit(listOf(IdentityStateChange(A_USER_ID, IdentityState.VerificationViolation)))
             consumeItemsUntilPredicate { it.verificationState == UserProfileVerificationState.VERIFICATION_VIOLATION }
         }
     }
 
     @Test
     fun `present - user identity can't update in real time if the room is not encrypted`() = runTest {
-        val room = FakeMatrixRoom(
+        val identityStateChanges = MutableStateFlow(emptyList<IdentityStateChange>())
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = false),
+        ),
+            identityStateChangesFlow = identityStateChanges,
         )
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(null) },
@@ -308,7 +328,7 @@ class RoomMemberDetailsPresenterTest {
             assertThat(awaitItem().verificationState).isEqualTo(UserProfileVerificationState.UNKNOWN)
 
             room.emitSyncUpdate()
-            room.emitIdentityStateChanges(listOf(IdentityStateChange(A_USER_ID, IdentityState.Pinned)))
+            identityStateChanges.emit(listOf(IdentityStateChange(A_USER_ID, IdentityState.Pinned)))
 
             // No new events emitted
             ensureAllEventsConsumed()
@@ -317,12 +337,14 @@ class RoomMemberDetailsPresenterTest {
 
     @Test
     fun `present - handles WithdrawVerification action`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             getUpdatedMemberResult = { Result.success(aRoomMember(A_USER_ID)) },
             userDisplayNameResult = { Result.success("A custom name") },
             userAvatarUrlResult = { Result.success("A custom avatar") },
             initialRoomInfo = aRoomInfo(isEncrypted = true),
         )
+        )
         val withdrawVerificationResult = lambdaRecorder<UserId, Result<Unit>> { Result.success(Unit) }
         val encryptionService = FakeEncryptionService(
             getUserIdentityResult = { Result.success(IdentityState.VerificationViolation) },
@@ -342,7 +364,7 @@ class RoomMemberDetailsPresenterTest {
     }
 
     private fun createRoomMemberDetailsPresenter(
-        room: MatrixRoom,
+        room: JoinedRoom,
         userProfilePresenterFactory: UserProfilePresenterFactory = UserProfilePresenterFactory {
             Presenter {
                 aUserProfileState(
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenterTest.kt
index 66e7f6bd90..00239fdf82 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationPresenterTest.kt
@@ -12,19 +12,19 @@ import app.cash.molecule.moleculeFlow
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.RoomModeration
-import io.element.android.features.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.features.roomdetails.impl.members.aRoomMember
 import io.element.android.features.roomdetails.impl.members.aVictor
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.test.A_REASON
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -39,7 +39,7 @@ import org.junit.Test
 class RoomMembersModerationPresenterTest {
     @Test
     fun `canDisplayModerationActions - when room is DM is false`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             isPublic = true,
             activeMemberCount = 2,
             canKickResult = { Result.success(true) },
@@ -48,7 +48,7 @@ class RoomMembersModerationPresenterTest {
         ).apply {
             givenRoomInfo(aRoomInfo(isDirect = true, activeMembersCount = 2))
         }
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         presenter.test {
             assertThat(awaitItem().canDisplayModerationActions).isFalse()
         }
@@ -56,13 +56,13 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `canDisplayModerationActions - when user can kick other users, FF is enabled and room is not a DM returns true`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             activeMemberCount = 10,
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
         )
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         presenter.test {
             skipItems(1)
             assertThat(awaitItem().canDisplayModerationActions).isTrue()
@@ -71,13 +71,13 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `canDisplayModerationActions - when user can ban other users, FF is enabled and room is not a DM returns true`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             activeMemberCount = 10,
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
         )
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         presenter.test {
             skipItems(1)
             assertThat(awaitItem().canDisplayModerationActions).isTrue()
@@ -86,13 +86,13 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `present - SelectRoomMember when the current user has permissions displays member actions`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
         )
         val selectedMember = aVictor()
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -112,14 +112,14 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `present - SelectRoomMember displays only view profile if selected member has same power level as the current user`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             sessionId = A_USER_ID,
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
         )
         val selectedMember = aRoomMember(A_USER_ID_2, powerLevel = 100L)
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -138,12 +138,12 @@ class RoomMembersModerationPresenterTest {
     @Test
     fun `present - SelectRoomMember displays an unban confirmation dialog when the member is banned`() = runTest {
         val selectedMember = aRoomMember(A_USER_ID_2, membership = RoomMembershipState.BAN)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
         )
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -160,14 +160,14 @@ class RoomMembersModerationPresenterTest {
     fun `present - Kick requires confirmation and then kicks the user`() = runTest {
         val analyticsService = FakeAnalyticsService()
         val kickUserResult = lambdaRecorder<UserId, String?, Result<Unit>> { _, _ -> Result.success(Unit) }
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
             kickUserResult = kickUserResult,
         )
         val selectedMember = aVictor()
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room, analyticsService = analyticsService)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room, analyticsService = analyticsService)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -198,14 +198,14 @@ class RoomMembersModerationPresenterTest {
     fun `present - BanUser requires confirmation and then bans the user`() = runTest {
         val analyticsService = FakeAnalyticsService()
         val banUserResult = lambdaRecorder<UserId, String?, Result<Unit>> { _, _ -> Result.success(Unit) }
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
             banUserResult = banUserResult,
         )
         val selectedMember = aVictor()
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room, analyticsService = analyticsService)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room, analyticsService = analyticsService)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -237,15 +237,15 @@ class RoomMembersModerationPresenterTest {
     fun `present - UnbanUser requires confirmation and then unbans the user`() = runTest {
         val analyticsService = FakeAnalyticsService()
         val selectedMember = aRoomMember(A_USER_ID_2, membership = RoomMembershipState.BAN)
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.ADMIN) },
             unBanUserResult = { _, _ -> Result.success(Unit) },
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(persistentListOf(selectedMember)))
+            givenRoomMembersState(RoomMembersState.Ready(persistentListOf(selectedMember)))
         }
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room, analyticsService = analyticsService)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room, analyticsService = analyticsService)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -269,12 +269,12 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `present - Reset removes the selected user and actions`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             userRoleResult = { Result.success(RoomMember.Role.USER) },
         )
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -291,7 +291,7 @@ class RoomMembersModerationPresenterTest {
 
     @Test
     fun `present - Reset resets any async actions`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canKickResult = { Result.success(true) },
             canBanResult = { Result.success(true) },
             kickUserResult = { _, _ -> Result.failure(Throwable("Eek")) },
@@ -299,7 +299,7 @@ class RoomMembersModerationPresenterTest {
             unBanUserResult = { _, _ -> Result.failure(Throwable("Eek")) },
             userRoleResult = { Result.success(RoomMember.Role.USER) },
         )
-        val presenter = createRoomMembersModerationPresenter(matrixRoom = room)
+        val presenter = createRoomMembersModerationPresenter(joinedRoom = room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
@@ -338,12 +338,12 @@ class RoomMembersModerationPresenterTest {
     }
 
     private fun TestScope.createRoomMembersModerationPresenter(
-        matrixRoom: FakeMatrixRoom = aMatrixRoom(),
+        joinedRoom: FakeJoinedRoom = aJoinedRoom(),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ): RoomMembersModerationPresenter {
         return RoomMembersModerationPresenter(
-            room = matrixRoom,
+            room = joinedRoom,
             dispatchers = dispatchers,
             analyticsService = analyticsService,
         )
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
index 748c4a26e2..3cfc359792 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsPresenterTest.kt
@@ -11,12 +11,12 @@ 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.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
 import kotlinx.coroutines.test.runTest
@@ -158,7 +158,7 @@ class RoomNotificationSettingsPresenterTest {
         val notificationService = FakeNotificationSettingsService().apply {
             givenCanHomeServerPushEncryptedEventsToDeviceResult(Result.success(false))
         }
-        val room = aMatrixRoom(notificationSettingsService = notificationService, isEncrypted = true)
+        val room = aJoinedRoom(notificationSettingsService = notificationService, isEncrypted = true)
         val presenter = createRoomNotificationSettingsPresenter(notificationService, room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -172,7 +172,7 @@ class RoomNotificationSettingsPresenterTest {
         val notificationService = FakeNotificationSettingsService().apply {
             givenCanHomeServerPushEncryptedEventsToDeviceResult(Result.success(false))
         }
-        val room = aMatrixRoom(notificationSettingsService = notificationService, isEncrypted = false)
+        val room = aJoinedRoom(notificationSettingsService = notificationService, isEncrypted = false)
         val presenter = createRoomNotificationSettingsPresenter(notificationService, room)
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
@@ -183,7 +183,7 @@ class RoomNotificationSettingsPresenterTest {
 
     private fun createRoomNotificationSettingsPresenter(
         notificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
-        room: FakeMatrixRoom = aMatrixRoom(notificationSettingsService = notificationSettingsService),
+        room: FakeJoinedRoom = aJoinedRoom(notificationSettingsService = notificationSettingsService),
     ): RoomNotificationSettingsPresenter {
         return RoomNotificationSettingsPresenter(
             room = room,
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt
index 2ae6dae3aa..9ecbbe69c5 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionPresenterTest.kt
@@ -15,7 +15,7 @@ import im.vector.app.features.analytics.plan.RoomModeration
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevels
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.testCoroutineDispatchers
@@ -59,7 +59,7 @@ class RolesAndPermissionPresenterTest {
     fun `present - DemoteSelfTo changes own role to the specified one`() = runTest(StandardTestDispatcher()) {
         val presenter = createRolesAndPermissionsPresenter(
             dispatchers = testCoroutineDispatchers(),
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 updateUserRoleResult = { Result.success(Unit) }
             ),
         )
@@ -80,7 +80,7 @@ class RolesAndPermissionPresenterTest {
     @OptIn(ExperimentalCoroutinesApi::class)
     @Test
     fun `present - DemoteSelfTo can handle failures and clean them`() = runTest(StandardTestDispatcher()) {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.failure(Exception("Failed to update role")) }
         )
         val presenter = createRolesAndPermissionsPresenter(room = room, dispatchers = testCoroutineDispatchers())
@@ -120,7 +120,7 @@ class RolesAndPermissionPresenterTest {
         val analyticsService = FakeAnalyticsService()
         val presenter = createRolesAndPermissionsPresenter(
             analyticsService = analyticsService,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 resetPowerLevelsResult = { Result.success(defaultRoomPowerLevels()) }
             )
         )
@@ -153,7 +153,7 @@ class RolesAndPermissionPresenterTest {
     }
 
     private fun TestScope.createRolesAndPermissionsPresenter(
-        room: FakeMatrixRoom = FakeMatrixRoom(),
+        room: FakeJoinedRoom = FakeJoinedRoom(),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService()
     ): RolesAndPermissionsPresenter {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenterTest.kt
index 035aecb40a..4c56ae3cee 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesPresenterTest.kt
@@ -16,12 +16,13 @@ import io.element.android.features.roomdetails.impl.members.aRoomMemberList
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.designsystem.theme.components.SearchBarResultState
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.testCoroutineDispatchers
@@ -54,8 +55,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - initial results are loaded automatically`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -68,8 +69,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - ToggleSearchActive changes the value`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -87,8 +88,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - QueryChanged produces new results`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -113,8 +114,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - changes in the room members produce new results`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
         }
         val presenter = createChangeRolesPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -126,7 +127,7 @@ class ChangeRolesPresenterTest {
             assertThat(initialResults?.moderators).hasSize(1)
             assertThat(initialResults?.admins).hasSize(1)
 
-            room.givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList().take(1).toPersistentList()))
+            room.givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList().take(1).toPersistentList()))
             skipItems(1)
 
             val searchResults = (awaitItem().searchResults as? SearchBarResultState.Results)?.results
@@ -139,8 +140,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - UserSelectionToggle adds and removes users from the selected user list`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(room = room)
@@ -161,8 +162,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - hasPendingChanges is true when the initial selected users don't match the new ones`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(room = room)
@@ -190,8 +191,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - Exit will display success if no pending changes`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(room = room)
@@ -210,8 +211,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - CancelExit will remove exit confirmation`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(room = room)
@@ -236,8 +237,8 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - Exit will display a confirmation dialog if there are pending changes, calling it again will actually exit`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(room = room)
@@ -264,11 +265,11 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - Save will display a confirmation when adding admins`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.success(Unit) },
-            updateMembersResult = { Result.success(Unit) },
+            baseRoom = FakeBaseRoom(updateMembersResult = { Result.success(Unit) }),
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.ADMIN, room = room)
@@ -285,14 +286,19 @@ class ChangeRolesPresenterTest {
             assertThat(confirmingState.savingState).isEqualTo(AsyncAction.ConfirmingNoParams)
 
             confirmingState.eventSink(ChangeRolesEvent.Save)
+
+            val loadingState = awaitItem()
+            assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
+            skipItems(1)
+
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
         }
     }
 
     @Test
     fun `present - CancelSave will remove the confirmation dialog`() = runTest {
-        val room = FakeMatrixRoom().apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+        val room = FakeJoinedRoom().apply {
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 100)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.ADMIN, room = room)
@@ -317,11 +323,11 @@ class ChangeRolesPresenterTest {
     @Test
     fun `present - Save will just save the data for moderators`() = runTest {
         val analyticsService = FakeAnalyticsService()
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.success(Unit) },
-            updateMembersResult = { Result.success(Unit) },
+            baseRoom = FakeBaseRoom(updateMembersResult = { Result.success(Unit) }),
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 50)))
         }
         val presenter = createChangeRolesPresenter(
@@ -339,6 +345,11 @@ class ChangeRolesPresenterTest {
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
 
             awaitItem().eventSink(ChangeRolesEvent.Save)
+
+            val loadingState = awaitItem()
+            assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
+            skipItems(1)
+
             assertThat(awaitItem().savingState).isEqualTo(AsyncAction.Success(Unit))
             assertThat(analyticsService.capturedEvents.last()).isEqualTo(RoomModeration(RoomModeration.Action.ChangeMemberRole, RoomModeration.Role.Moderator))
         }
@@ -346,10 +357,10 @@ class ChangeRolesPresenterTest {
 
     @Test
     fun `present - Save can handle failures and ClearError clears them`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             updateUserRoleResult = { Result.failure(IllegalStateException("Failed")) }
         ).apply {
-            givenRoomMembersState(MatrixRoomMembersState.Ready(aRoomMemberList()))
+            givenRoomMembersState(RoomMembersState.Ready(aRoomMemberList()))
             givenRoomInfo(aRoomInfo(userPowerLevels = persistentMapOf(A_USER_ID to 50)))
         }
         val presenter = createChangeRolesPresenter(role = RoomMember.Role.MODERATOR, room = room)
@@ -363,6 +374,9 @@ class ChangeRolesPresenterTest {
             initialState.eventSink(ChangeRolesEvent.UserSelectionToggled(MatrixUser(A_USER_ID_2)))
 
             awaitItem().eventSink(ChangeRolesEvent.Save)
+            val loadingState = awaitItem()
+            assertThat(loadingState.savingState).isInstanceOf(AsyncAction.Loading::class.java)
+            skipItems(1)
             val failedState = awaitItem()
             assertThat(failedState.savingState).isInstanceOf(AsyncAction.Failure::class.java)
 
@@ -373,7 +387,7 @@ class ChangeRolesPresenterTest {
 
     private fun TestScope.createChangeRolesPresenter(
         role: RoomMember.Role = RoomMember.Role.ADMIN,
-        room: FakeMatrixRoom = FakeMatrixRoom(),
+        room: FakeJoinedRoom = FakeJoinedRoom(),
         dispatchers: CoroutineDispatchers = testCoroutineDispatchers(),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ): ChangeRolesPresenter {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt
similarity index 94%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenterTest.kt
rename to features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt
index d9458c3149..8021d09c8d 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsPresenterTest.kt
@@ -18,14 +18,15 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.room.RoomMember.Role.ADMIN
 import io.element.android.libraries.matrix.api.room.RoomMember.Role.MODERATOR
 import io.element.android.libraries.matrix.api.room.RoomMember.Role.USER
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.defaultRoomPowerLevels
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class ChangeRoomPermissionsPresenterTest {
+class ChangeBaseRoomPermissionsPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val section = ChangeRoomPermissionsSection.RoomDetails
@@ -132,7 +133,7 @@ class ChangeRoomPermissionsPresenterTest {
 
             (items.last() as? Event.Item<ChangeRoomPermissionsState>)?.value?.run {
                 assertThat(currentPermissions).isEqualTo(
-                    MatrixRoomPowerLevels(
+                    RoomPowerLevels(
                         invite = MODERATOR.powerLevel,
                         kick = MODERATOR.powerLevel,
                         ban = MODERATOR.powerLevel,
@@ -152,9 +153,9 @@ class ChangeRoomPermissionsPresenterTest {
         val analyticsService = FakeAnalyticsService()
         val presenter = createChangeRoomPermissionsPresenter(
             analyticsService = analyticsService,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 updatePowerLevelsResult = { Result.success(Unit) },
-                powerLevelsResult = { Result.success(defaultPermissions()) }
+                baseRoom = FakeBaseRoom(powerLevelsResult = { Result.success(defaultPermissions()) }),
             ),
         )
         moleculeFlow(RecompositionMode.Immediate) {
@@ -200,8 +201,8 @@ class ChangeRoomPermissionsPresenterTest {
 
     @Test
     fun `present - Save will fail if there are not current permissions`() = runTest {
-        val room = FakeMatrixRoom(
-            powerLevelsResult = { Result.failure(IllegalStateException("Failed to load power levels")) }
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(powerLevelsResult = { Result.failure(IllegalStateException("Failed to load power levels")) }),
         )
         val presenter = createChangeRoomPermissionsPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -217,9 +218,9 @@ class ChangeRoomPermissionsPresenterTest {
 
     @Test
     fun `present - Save can handle failures and they can be cleared`() = runTest {
-        val room = FakeMatrixRoom(
-            powerLevelsResult = { Result.success(defaultPermissions()) },
+        val room = FakeJoinedRoom(
             updatePowerLevelsResult = { Result.failure(IllegalStateException("Failed to update power levels")) },
+            baseRoom = FakeBaseRoom(powerLevelsResult = { Result.success(defaultPermissions()) }),
         )
         val presenter = createChangeRoomPermissionsPresenter(room = room)
         moleculeFlow(RecompositionMode.Immediate) {
@@ -285,8 +286,8 @@ class ChangeRoomPermissionsPresenterTest {
 
     private fun createChangeRoomPermissionsPresenter(
         section: ChangeRoomPermissionsSection = ChangeRoomPermissionsSection.RoomDetails,
-        room: FakeMatrixRoom = FakeMatrixRoom(
-            powerLevelsResult = { Result.success(defaultPermissions()) }
+        room: FakeJoinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(powerLevelsResult = { Result.success(defaultPermissions()) }),
         ),
         analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
     ) = ChangeRoomPermissionsPresenter(
@@ -296,7 +297,7 @@ class ChangeRoomPermissionsPresenterTest {
     )
 
     private fun defaultPermissions() = defaultRoomPowerLevels().run {
-        MatrixRoomPowerLevels(
+        RoomPowerLevels(
             invite = invite,
             kick = kick,
             ban = ban,
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt
similarity index 99%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsViewTest.kt
rename to features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt
index 7615b89d00..8ed659d31c 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeBaseRoomPermissionsViewTest.kt
@@ -31,7 +31,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class ChangeRoomPermissionsViewTest {
+class ChangeBaseRoomPermissionsViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
index 1c419c9d1f..bc2a3f62f7 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/SecurityAndPrivacyPresenterTest.kt
@@ -10,13 +10,13 @@ package io.element.android.features.roomdetails.impl.securityandprivacy
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
 import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.tests.testutils.lambda.assert
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -54,7 +54,8 @@ class SecurityAndPrivacyPresenterTest {
 
     @Test
     fun `present - room info change updates saved and edited settings`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canSendStateResult = { _, _ -> Result.success(true) },
             initialRoomInfo = aRoomInfo(
                 joinRule = JoinRule.Public,
@@ -62,6 +63,7 @@ class SecurityAndPrivacyPresenterTest {
                 canonicalAlias = A_ROOM_ALIAS,
             )
         )
+        )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
             skipItems(1)
@@ -159,11 +161,13 @@ class SecurityAndPrivacyPresenterTest {
 
     @Test
     fun `present - room visibility loading and change`() = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canSendStateResult = { _, _ -> Result.success(true) },
-            roomVisibilityResult = { Result.success(RoomVisibility.Private) },
+            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
             initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared)
         )
+        )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
             skipItems(1)
@@ -206,14 +210,16 @@ class SecurityAndPrivacyPresenterTest {
         val updateJoinRuleLambda = lambdaRecorder<JoinRule, Result<Unit>> { Result.success(Unit) }
         val updateRoomVisibilityLambda = lambdaRecorder<RoomVisibility, Result<Unit>> { Result.success(Unit) }
         val updateRoomHistoryVisibilityLambda = lambdaRecorder<RoomHistoryVisibility, Result<Unit>> { Result.success(Unit) }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canSendStateResult = { _, _ -> Result.success(true) },
+            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+            initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite, historyVisibility = RoomHistoryVisibility.Shared)
+        ),
             enableEncryptionResult = enableEncryptionLambda,
             updateJoinRuleResult = updateJoinRuleLambda,
             updateRoomVisibilityResult = updateRoomVisibilityLambda,
             updateRoomHistoryVisibilityResult = updateRoomHistoryVisibilityLambda,
-            roomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(joinRule = JoinRule.Invite, historyVisibility = RoomHistoryVisibility.Shared)
         )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
@@ -271,14 +277,16 @@ class SecurityAndPrivacyPresenterTest {
             Result.failure(Exception("Failed to update room visibility"))
         }
         val updateRoomHistoryVisibilityLambda = lambdaRecorder<RoomHistoryVisibility, Result<Unit>> { Result.success(Unit) }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
             canSendStateResult = { _, _ -> Result.success(true) },
+            getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+            initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
+        ),
             enableEncryptionResult = enableEncryptionLambda,
             updateJoinRuleResult = updateJoinRuleLambda,
             updateRoomVisibilityResult = updateRoomVisibilityLambda,
             updateRoomHistoryVisibilityResult = updateRoomHistoryVisibilityLambda,
-            roomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
         )
         val presenter = createSecurityAndPrivacyPresenter(room = room)
         presenter.test {
@@ -329,10 +337,12 @@ class SecurityAndPrivacyPresenterTest {
 
     private fun createSecurityAndPrivacyPresenter(
         serverName: String = "matrix.org",
-        room: MatrixRoom = FakeMatrixRoom(
-            canSendStateResult = { _, _ -> Result.success(true) },
-            roomVisibilityResult = { Result.success(RoomVisibility.Private) },
-            initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
+        room: FakeJoinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(
+                canSendStateResult = { _, _ -> Result.success(true) },
+                getRoomVisibilityResult = { Result.success(RoomVisibility.Private) },
+                initialRoomInfo = aRoomInfo(historyVisibility = RoomHistoryVisibility.Shared, joinRule = JoinRule.Private)
+            ),
         ),
         navigator: SecurityAndPrivacyNavigator = FakeSecurityAndPrivacyNavigator(),
     ): SecurityAndPrivacyPresenter {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenterTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
similarity index 96%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenterTest.kt
rename to features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
index 845e2c0272..7dfc3d464e 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressPresenterTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressPresenterTest.kt
@@ -8,17 +8,17 @@
 package io.element.android.features.roomdetails.impl.securityandprivacy.editroomaddress
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.features.roomdetails.impl.aMatrixRoom
+import io.element.android.features.roomdetails.impl.aJoinedRoom
 import io.element.android.features.roomdetails.impl.securityandprivacy.FakeSecurityAndPrivacyNavigator
 import io.element.android.features.roomdetails.impl.securityandprivacy.SecurityAndPrivacyNavigator
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomAlias
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.alias.FakeRoomAliasHelper
 import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidity
 import io.element.android.tests.testutils.lambda.assert
@@ -29,11 +29,11 @@ import kotlinx.coroutines.test.runTest
 import org.junit.Test
 import java.util.Optional
 
-class EditRoomAddressPresenterTest {
+class EditBaseRoomAddressPresenterTest {
     @Test
     fun `present - initial state no address`() = runTest {
         val presenter = createEditRoomAddressPresenter(
-            room = aMatrixRoom(displayName = "")
+            room = aJoinedRoom(displayName = "")
         )
         presenter.test {
             with(awaitItem()) {
@@ -48,7 +48,7 @@ class EditRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address matching own homeserver`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canonicalAlias = RoomAlias("#canonical:matrix.org"),
         )
         val presenter = createEditRoomAddressPresenter(room = room)
@@ -65,7 +65,7 @@ class EditRoomAddressPresenterTest {
 
     @Test
     fun `present - initial state address not matching own homeserver`() = runTest {
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             displayName = "",
             canonicalAlias = RoomAlias("#canonical:notmatrix.org"),
         )
@@ -148,7 +148,7 @@ class EditRoomAddressPresenterTest {
         val navigator = FakeSecurityAndPrivacyNavigator(
             closeEditRoomAddressLambda = closeEditAddressLambda
         )
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult
         )
@@ -194,7 +194,7 @@ class EditRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:matrix.org")
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canonicalAlias = canonicalAlias,
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
@@ -244,7 +244,7 @@ class EditRoomAddressPresenterTest {
 
         val navigator = FakeSecurityAndPrivacyNavigator(closeEditRoomAddressLambda = closeEditAddressLambda)
         val canonicalAlias = RoomAlias("#canonical:notmatrix.org")
-        val room = aMatrixRoom(
+        val room = aJoinedRoom(
             canonicalAlias = canonicalAlias,
             updateCanonicalAliasResult = updateCanonicalAliasResult,
             publishRoomAliasInRoomDirectoryResult = publishAliasInRoomDirectoryResult,
@@ -343,7 +343,7 @@ class EditRoomAddressPresenterTest {
 
     private fun createEditRoomAddressPresenter(
         client: FakeMatrixClient = createMatrixClient(),
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         navigator: SecurityAndPrivacyNavigator = FakeSecurityAndPrivacyNavigator(),
         roomAliasHelper: RoomAliasHelper = FakeRoomAliasHelper()
     ): EditRoomAddressPresenter {
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
similarity index 99%
rename from features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressViewTest.kt
rename to features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
index 03260510a4..1d2c716710 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditRoomAddressViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/securityandprivacy/editroomaddress/EditBaseRoomAddressViewTest.kt
@@ -28,7 +28,7 @@ import org.junit.rules.TestRule
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class EditRoomAddressViewTest {
+class EditBaseRoomAddressViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
diff --git a/features/roomdirectory/impl/src/main/res/values-cy/translations.xml b/features/roomdirectory/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..7e5572c943
--- /dev/null
+++ b/features/roomdirectory/impl/src/main/res/values-cy/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="screen_room_directory_search_loading_error">"Wedi methu llwytho"</string>
+  <string name="screen_room_directory_search_title">"Cyfeiriadur ystafelloedd"</string>
+</resources>
diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
index 3165d1f928..d6ebb6cd95 100644
--- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
+++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryPresenterTest.kt
@@ -26,7 +26,8 @@ import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-@OptIn(ExperimentalCoroutinesApi::class) class RoomDirectoryPresenterTest {
+@OptIn(ExperimentalCoroutinesApi::class)
+class RoomDirectoryPresenterTest {
     @Test
     fun `present - initial state`() = runTest {
         val presenter = createRoomDirectoryPresenter()
diff --git a/features/roomlist/impl/build.gradle.kts b/features/roomlist/impl/build.gradle.kts
index a6f09ff4ed..847787d774 100644
--- a/features/roomlist/impl/build.gradle.kts
+++ b/features/roomlist/impl/build.gradle.kts
@@ -51,6 +51,7 @@ dependencies {
     implementation(projects.features.rageshake.api)
     implementation(projects.services.analytics.api)
     implementation(libs.androidx.datastore.preferences)
+    implementation(projects.features.reportroom.api)
     api(projects.features.roomlist.api)
 
     testImplementation(libs.androidx.compose.ui.test.junit)
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt
index 727a404602..cb97dda171 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/DefaultRoomListEntryPoint.kt
@@ -28,7 +28,7 @@ class DefaultRoomListEntryPoint @Inject constructor() : RoomListEntryPoint {
             }
 
             override fun build(): Node {
-                return parentNode.createNode<RoomListNode>(buildContext, plugins)
+                return parentNode.createNode<RoomListFlowNode>(buildContext, plugins)
             }
         }
     }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
index 661beb6418..d95064708b 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
@@ -34,14 +34,17 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun RoomListContextMenu(
     contextMenu: RoomListState.ContextMenu.Shown,
+    canReportRoom: Boolean,
     eventSink: (RoomListEvents.ContextMenuEvents) -> Unit,
     onRoomSettingsClick: (roomId: RoomId) -> Unit,
+    onReportRoomClick: (roomId: RoomId) -> Unit
 ) {
     ModalBottomSheet(
         onDismissRequest = { eventSink(RoomListEvents.HideContextMenu) },
     ) {
         RoomListModalBottomSheetContent(
             contextMenu = contextMenu,
+            canReportRoom = canReportRoom,
             onRoomMarkReadClick = {
                 eventSink(RoomListEvents.HideContextMenu)
                 eventSink(RoomListEvents.MarkAsRead(contextMenu.roomId))
@@ -65,6 +68,10 @@ fun RoomListContextMenu(
                 eventSink(RoomListEvents.HideContextMenu)
                 eventSink(RoomListEvents.ClearCacheOfRoom(contextMenu.roomId))
             },
+            onReportRoomClick = {
+                eventSink(RoomListEvents.HideContextMenu)
+                onReportRoomClick(contextMenu.roomId)
+            },
         )
     }
 }
@@ -72,12 +79,14 @@ fun RoomListContextMenu(
 @Composable
 private fun RoomListModalBottomSheetContent(
     contextMenu: RoomListState.ContextMenu.Shown,
+    canReportRoom: Boolean,
     onRoomSettingsClick: () -> Unit,
     onLeaveRoomClick: () -> Unit,
     onFavoriteChange: (isFavorite: Boolean) -> Unit,
     onRoomMarkReadClick: () -> Unit,
     onRoomMarkUnreadClick: () -> Unit,
     onClearCacheRoomClick: () -> Unit,
+    onReportRoomClick: () -> Unit,
 ) {
     Column(
         modifier = Modifier.fillMaxWidth()
@@ -132,14 +141,10 @@ private fun RoomListModalBottomSheetContent(
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
                     CompoundIcons.Favourite(),
-                    contentDescription = stringResource(id = CommonStrings.common_favourite),
                 )
             ),
             trailingContent = ListItemContent.Switch(
                 checked = contextMenu.isFavorite,
-                onChange = { isFavorite ->
-                    onFavoriteChange(isFavorite)
-                },
             ),
             onClick = {
                 onFavoriteChange(!contextMenu.isFavorite)
@@ -157,27 +162,33 @@ private fun RoomListModalBottomSheetContent(
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
                     CompoundIcons.Settings(),
-                    contentDescription = stringResource(id = CommonStrings.common_settings)
                 )
             ),
             style = ListItemStyle.Primary,
         )
+        if (canReportRoom) {
+            ListItem(
+                headlineContent = {
+                    Text(text = stringResource(CommonStrings.action_report_room))
+                },
+                modifier = Modifier.clickable { onReportRoomClick() },
+                leadingContent = ListItemContent.Icon(
+                    iconSource = IconSource.Vector(
+                        CompoundIcons.ChatProblem(),
+                        contentDescription = stringResource(CommonStrings.action_report_room),
+                    )
+                ),
+                style = ListItemStyle.Destructive,
+            )
+        }
         ListItem(
             headlineContent = {
-                val leaveText = stringResource(
-                    id = if (contextMenu.isDm) {
-                        CommonStrings.action_leave_conversation
-                    } else {
-                        CommonStrings.action_leave_room
-                    }
-                )
-                Text(text = leaveText)
+                Text(text = stringResource(CommonStrings.action_leave_room))
             },
             modifier = Modifier.clickable { onLeaveRoomClick() },
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
                     CompoundIcons.Leave(),
-                    contentDescription = stringResource(id = CommonStrings.action_leave_room)
                 )
             ),
             style = ListItemStyle.Destructive,
@@ -207,11 +218,13 @@ internal fun RoomListModalBottomSheetContentPreview(
 ) = ElementPreview {
     RoomListModalBottomSheetContent(
         contextMenu = contextMenu,
+        canReportRoom = true,
         onRoomMarkReadClick = {},
         onRoomMarkUnreadClick = {},
         onRoomSettingsClick = {},
         onLeaveRoomClick = {},
         onFavoriteChange = {},
         onClearCacheRoomClick = {},
+        onReportRoomClick = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt
new file mode 100644
index 0000000000..0f986999f8
--- /dev/null
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenu.kt
@@ -0,0 +1,125 @@
+/*
+ * 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.roomlist.impl
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.designsystem.theme.components.Button
+import io.element.android.libraries.designsystem.theme.components.ModalBottomSheet
+import io.element.android.libraries.designsystem.theme.components.OutlinedButton
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.theme.components.TextButton
+import io.element.android.libraries.ui.strings.CommonStrings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun RoomListDeclineInviteMenu(
+    menu: RoomListState.DeclineInviteMenu.Shown,
+    canReportRoom: Boolean,
+    onDeclineAndBlockClick: (RoomListRoomSummary) -> Unit,
+    eventSink: (RoomListEvents) -> Unit,
+) {
+    ModalBottomSheet(
+        onDismissRequest = { eventSink(RoomListEvents.HideDeclineInviteMenu) },
+    ) {
+        RoomListDeclineInviteMenuContent(
+            roomName = menu.roomSummary.name ?: menu.roomSummary.roomId.value,
+            onDeclineClick = {
+                eventSink(RoomListEvents.HideDeclineInviteMenu)
+                eventSink(RoomListEvents.DeclineInvite(menu.roomSummary, false))
+            },
+            onDeclineAndBlockClick = {
+                eventSink(RoomListEvents.HideDeclineInviteMenu)
+                if (canReportRoom) {
+                    onDeclineAndBlockClick(menu.roomSummary)
+                } else {
+                    eventSink(RoomListEvents.DeclineInvite(menu.roomSummary, true))
+                }
+            },
+            onCancelClick = {
+                eventSink(RoomListEvents.HideDeclineInviteMenu)
+            }
+        )
+    }
+}
+
+@Composable
+private fun RoomListDeclineInviteMenuContent(
+    roomName: String,
+    onDeclineClick: () -> Unit,
+    onDeclineAndBlockClick: () -> Unit,
+    onCancelClick: () -> Unit,
+) {
+    Column(
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(all = 16.dp),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        Text(
+            text = stringResource(R.string.screen_invites_decline_chat_title),
+            style = ElementTheme.typography.fontHeadingSmMedium,
+            color = ElementTheme.colors.textPrimary,
+        )
+        Spacer(Modifier.height(8.dp))
+        Text(
+            text = stringResource(R.string.screen_invites_decline_chat_message, roomName),
+            style = ElementTheme.typography.fontBodyMdRegular,
+            color = ElementTheme.colors.textSecondary,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.padding(horizontal = 16.dp),
+        )
+        Spacer(Modifier.height(22.dp))
+        Button(
+            text = stringResource(CommonStrings.action_decline),
+            modifier = Modifier.fillMaxWidth(),
+            onClick = onDeclineClick,
+        )
+        Spacer(Modifier.height(16.dp))
+        OutlinedButton(
+            text = stringResource(CommonStrings.action_decline_and_block),
+            modifier = Modifier.fillMaxWidth(),
+            destructive = true,
+            onClick = onDeclineAndBlockClick
+        )
+        Spacer(Modifier.height(16.dp))
+        TextButton(
+            text = stringResource(CommonStrings.action_cancel),
+            modifier = Modifier.fillMaxWidth(),
+            onClick = onCancelClick
+        )
+    }
+}
+
+// TODO This component should be seen in [RoomListView] @Preview but it doesn't show up.
+// see: https://issuetracker.google.com/issues/283843380
+// Remove this preview when the issue is fixed.
+@PreviewsDayNight
+@Composable
+internal fun RoomListDeclineInviteMenuContentPreview() = ElementPreview {
+    RoomListDeclineInviteMenuContent(
+        roomName = "Room name",
+        onCancelClick = {},
+        onDeclineClick = {},
+        onDeclineAndBlockClick = {},
+    )
+}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt
index 9e9f701380..b17b45b86b 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt
@@ -15,9 +15,12 @@ sealed interface RoomListEvents {
     data object DismissRequestVerificationPrompt : RoomListEvents
     data object DismissBanner : RoomListEvents
     data object ToggleSearchResults : RoomListEvents
-    data class AcceptInvite(val roomListRoomSummary: RoomListRoomSummary) : RoomListEvents
-    data class DeclineInvite(val roomListRoomSummary: RoomListRoomSummary) : RoomListEvents
-    data class ShowContextMenu(val roomListRoomSummary: RoomListRoomSummary) : RoomListEvents
+    data class ShowContextMenu(val roomSummary: RoomListRoomSummary) : RoomListEvents
+
+    data class AcceptInvite(val roomSummary: RoomListRoomSummary) : RoomListEvents
+    data class DeclineInvite(val roomSummary: RoomListRoomSummary, val blockUser: Boolean) : RoomListEvents
+    data class ShowDeclineInviteMenu(val roomSummary: RoomListRoomSummary) : RoomListEvents
+    data object HideDeclineInviteMenu : RoomListEvents
 
     sealed interface ContextMenuEvents : RoomListEvents
     data object HideContextMenu : ContextMenuEvents
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt
new file mode 100644
index 0000000000..208a90e606
--- /dev/null
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListFlowNode.kt
@@ -0,0 +1,166 @@
+/*
+ * 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.roomlist.impl
+
+import android.app.Activity
+import android.os.Parcelable
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import com.bumble.appyx.core.lifecycle.subscribe
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+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 im.vector.app.features.analytics.plan.MobileScreen
+import io.element.android.anvilannotations.ContributesNode
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteView
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.features.logout.api.direct.DirectLogoutView
+import io.element.android.features.reportroom.api.ReportRoomEntryPoint
+import io.element.android.features.roomlist.api.RoomListEntryPoint
+import io.element.android.features.roomlist.impl.components.RoomListMenuAction
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
+import io.element.android.libraries.architecture.BackstackView
+import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.deeplink.usecase.InviteFriendsUseCase
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.services.analytics.api.AnalyticsService
+import kotlinx.parcelize.Parcelize
+
+@ContributesNode(SessionScope::class)
+class RoomListFlowNode @AssistedInject constructor(
+    @Assisted buildContext: BuildContext,
+    @Assisted plugins: List<Plugin>,
+    private val presenter: RoomListPresenter,
+    private val inviteFriendsUseCase: InviteFriendsUseCase,
+    private val analyticsService: AnalyticsService,
+    private val acceptDeclineInviteView: AcceptDeclineInviteView,
+    private val directLogoutView: DirectLogoutView,
+    private val reportRoomEntryPoint: ReportRoomEntryPoint,
+    private val declineInviteAndBlockUserEntryPoint: DeclineInviteAndBlockEntryPoint,
+) : BaseFlowNode<RoomListFlowNode.NavTarget>(
+    backstack = BackStack(
+        initialElement = NavTarget.Root,
+        savedStateMap = buildContext.savedStateMap,
+    ),
+    buildContext = buildContext,
+    plugins = plugins
+) {
+    init {
+        lifecycle.subscribe(
+            onResume = {
+                analyticsService.screen(MobileScreen(screenName = MobileScreen.ScreenName.Home))
+            }
+        )
+    }
+
+    sealed interface NavTarget : Parcelable {
+        @Parcelize
+        data object Root : NavTarget
+
+        @Parcelize
+        data class ReportRoom(val roomId: RoomId) : NavTarget
+
+        @Parcelize
+        data class DeclineInviteAndBlockUser(val inviteData: InviteData) : NavTarget
+    }
+
+    private fun onRoomClick(roomId: RoomId) {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
+    }
+
+    private fun onOpenSettings() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClick() }
+    }
+
+    private fun onCreateRoomClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClick() }
+    }
+
+    private fun onSetUpRecoveryClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onSetUpRecoveryClick() }
+    }
+
+    private fun onSessionConfirmRecoveryKeyClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
+    }
+
+    private fun onRoomSettingsClick(roomId: RoomId) {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
+    }
+
+    private fun onReportRoomClick(roomId: RoomId) {
+        backstack.push(NavTarget.ReportRoom(roomId))
+    }
+
+    private fun onDeclineInviteAndBlockUserClick(roomSummary: RoomListRoomSummary) {
+        backstack.push(NavTarget.DeclineInviteAndBlockUser(roomSummary.toInviteData()))
+    }
+
+    private fun onMenuActionClick(activity: Activity, roomListMenuAction: RoomListMenuAction) {
+        when (roomListMenuAction) {
+            RoomListMenuAction.InviteFriends -> {
+                inviteFriendsUseCase.execute(activity)
+            }
+            RoomListMenuAction.ReportBug -> {
+                plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClick() }
+            }
+        }
+    }
+
+    fun rootNode(buildContext: BuildContext): Node {
+        return node(buildContext) { modifier ->
+            val state = presenter.present()
+            val activity = requireNotNull(LocalActivity.current)
+
+            RoomListView(
+                state = state,
+                onRoomClick = this::onRoomClick,
+                onSettingsClick = this::onOpenSettings,
+                onCreateRoomClick = this::onCreateRoomClick,
+                onSetUpRecoveryClick = this::onSetUpRecoveryClick,
+                onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
+                onRoomSettingsClick = this::onRoomSettingsClick,
+                onMenuActionClick = { onMenuActionClick(activity, it) },
+                onReportRoomClick = this::onReportRoomClick,
+                onDeclineInviteAndBlockUser = this::onDeclineInviteAndBlockUserClick,
+                modifier = modifier,
+            ) {
+                acceptDeclineInviteView.Render(
+                    state = state.acceptDeclineInviteState,
+                    onAcceptInviteSuccess = this::onRoomClick,
+                    onDeclineInviteSuccess = { },
+                    modifier = Modifier
+                )
+            }
+
+            directLogoutView.Render(state.directLogoutState)
+        }
+    }
+
+    @Composable
+    override fun View(modifier: Modifier) {
+        BackstackView()
+    }
+
+    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
+        return when (navTarget) {
+            is NavTarget.ReportRoom -> reportRoomEntryPoint.createNode(this, buildContext, navTarget.roomId)
+            is NavTarget.DeclineInviteAndBlockUser -> declineInviteAndBlockUserEntryPoint.createNode(this, buildContext, navTarget.inviteData)
+            NavTarget.Root -> rootNode(buildContext)
+        }
+    }
+}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
deleted file mode 100644
index 9228e847b4..0000000000
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
+++ /dev/null
@@ -1,111 +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.roomlist.impl
-
-import android.app.Activity
-import androidx.activity.compose.LocalActivity
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.bumble.appyx.core.lifecycle.subscribe
-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 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.invite.api.response.AcceptDeclineInviteView
-import io.element.android.features.logout.api.direct.DirectLogoutView
-import io.element.android.features.roomlist.api.RoomListEntryPoint
-import io.element.android.features.roomlist.impl.components.RoomListMenuAction
-import io.element.android.libraries.deeplink.usecase.InviteFriendsUseCase
-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(SessionScope::class)
-class RoomListNode @AssistedInject constructor(
-    @Assisted buildContext: BuildContext,
-    @Assisted plugins: List<Plugin>,
-    private val presenter: RoomListPresenter,
-    private val inviteFriendsUseCase: InviteFriendsUseCase,
-    private val analyticsService: AnalyticsService,
-    private val acceptDeclineInviteView: AcceptDeclineInviteView,
-    private val directLogoutView: DirectLogoutView,
-) : Node(buildContext, plugins = plugins) {
-    init {
-        lifecycle.subscribe(
-            onResume = {
-                analyticsService.screen(MobileScreen(screenName = MobileScreen.ScreenName.Home))
-            }
-        )
-    }
-
-    private fun onRoomClick(roomId: RoomId) {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
-    }
-
-    private fun onOpenSettings() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClick() }
-    }
-
-    private fun onCreateRoomClick() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClick() }
-    }
-
-    private fun onSetUpRecoveryClick() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onSetUpRecoveryClick() }
-    }
-
-    private fun onSessionConfirmRecoveryKeyClick() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
-    }
-
-    private fun onRoomSettingsClick(roomId: RoomId) {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
-    }
-
-    private fun onMenuActionClick(activity: Activity, roomListMenuAction: RoomListMenuAction) {
-        when (roomListMenuAction) {
-            RoomListMenuAction.InviteFriends -> {
-                inviteFriendsUseCase.execute(activity)
-            }
-            RoomListMenuAction.ReportBug -> {
-                plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClick() }
-            }
-        }
-    }
-
-    @Composable
-    override fun View(modifier: Modifier) {
-        val state = presenter.present()
-        val activity = requireNotNull(LocalActivity.current)
-
-        RoomListView(
-            state = state,
-            onRoomClick = this::onRoomClick,
-            onSettingsClick = this::onOpenSettings,
-            onCreateRoomClick = this::onCreateRoomClick,
-            onSetUpRecoveryClick = this::onSetUpRecoveryClick,
-            onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
-            onRoomSettingsClick = this::onRoomSettingsClick,
-            onMenuActionClick = { onMenuActionClick(activity, it) },
-            modifier = modifier,
-        ) {
-            acceptDeclineInviteView.Render(
-                state = state.acceptDeclineInviteState,
-                onAcceptInvite = this::onRoomClick,
-                onDeclineInvite = { },
-                modifier = Modifier
-            )
-        }
-
-        directLogoutView.Render(state.directLogoutState)
-    }
-}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
index 082a662c30..07029b7026 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
@@ -7,7 +7,6 @@
 
 package io.element.android.features.roomlist.impl
 
-import androidx.annotation.VisibleForTesting
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
@@ -24,17 +23,17 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.snapshotFlow
 import im.vector.app.features.analytics.plan.Interaction
+import io.element.android.appconfig.MatrixConfiguration
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.InviteData
-import io.element.android.features.leaveroom.api.LeaveRoomEvent
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.AcceptInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents.DeclineInvite
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.leaveroom.api.LeaveRoomEvent.ShowConfirmation
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.rageshake.api.RageshakeFeatureAvailability
 import io.element.android.features.roomlist.impl.datasource.RoomListDataSource
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
-import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.search.RoomListSearchEvents
 import io.element.android.features.roomlist.impl.search.RoomListSearchState
 import io.element.android.libraries.architecture.AsyncData
@@ -124,6 +123,7 @@ class RoomListPresenter @Inject constructor(
         }.collectAsState(initial = false)
 
         val contextMenu = remember { mutableStateOf<RoomListState.ContextMenu>(RoomListState.ContextMenu.Hidden) }
+        val declineInviteMenu = remember { mutableStateOf<RoomListState.DeclineInviteMenu>(RoomListState.DeclineInviteMenu.Hidden) }
 
         val directLogoutState = logoutPresenter.present()
 
@@ -141,20 +141,22 @@ class RoomListPresenter @Inject constructor(
                 is RoomListEvents.HideContextMenu -> {
                     contextMenu.value = RoomListState.ContextMenu.Hidden
                 }
-                is RoomListEvents.LeaveRoom -> leaveRoomState.eventSink(LeaveRoomEvent.ShowConfirmation(event.roomId))
+                is RoomListEvents.LeaveRoom -> leaveRoomState.eventSink(ShowConfirmation(event.roomId))
                 is RoomListEvents.SetRoomIsFavorite -> coroutineScope.setRoomIsFavorite(event.roomId, event.isFavorite)
                 is RoomListEvents.MarkAsRead -> coroutineScope.markAsRead(event.roomId)
                 is RoomListEvents.MarkAsUnread -> coroutineScope.markAsUnread(event.roomId)
                 is RoomListEvents.AcceptInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.AcceptInvite(event.roomListRoomSummary.toInviteData())
+                        AcceptInvite(event.roomSummary.toInviteData())
                     )
                 }
                 is RoomListEvents.DeclineInvite -> {
                     acceptDeclineInviteState.eventSink(
-                        AcceptDeclineInviteEvents.DeclineInvite(event.roomListRoomSummary.toInviteData())
+                        DeclineInvite(event.roomSummary.toInviteData(), blockUser = event.blockUser, shouldConfirm = false)
                     )
                 }
+                is RoomListEvents.ShowDeclineInviteMenu -> declineInviteMenu.value = RoomListState.DeclineInviteMenu.Shown(event.roomSummary)
+                RoomListEvents.HideDeclineInviteMenu -> declineInviteMenu.value = RoomListState.DeclineInviteMenu.Hidden
                 is RoomListEvents.ClearCacheOfRoom -> coroutineScope.clearCacheOfRoom(event.roomId)
             }
         }
@@ -169,6 +171,7 @@ class RoomListPresenter @Inject constructor(
             snackbarMessage = snackbarMessage,
             hasNetworkConnection = isOnline,
             contextMenu = contextMenu.value,
+            declineInviteMenu = declineInviteMenu.value,
             leaveRoomState = leaveRoomState,
             filtersState = filtersState,
             canReportBug = canReportBug,
@@ -177,6 +180,7 @@ class RoomListPresenter @Inject constructor(
             acceptDeclineInviteState = acceptDeclineInviteState,
             directLogoutState = directLogoutState,
             hideInvitesAvatars = hideInvitesAvatar,
+            canReportRoom = MatrixConfiguration.CAN_REPORT_ROOM,
             eventSink = ::handleEvents,
         )
     }
@@ -253,18 +257,18 @@ class RoomListPresenter @Inject constructor(
     @OptIn(ExperimentalCoroutinesApi::class)
     private fun CoroutineScope.showContextMenu(event: RoomListEvents.ShowContextMenu, contextMenuState: MutableState<RoomListState.ContextMenu>) = launch {
         val initialState = RoomListState.ContextMenu.Shown(
-            roomId = event.roomListRoomSummary.roomId,
-            roomName = event.roomListRoomSummary.name,
-            isDm = event.roomListRoomSummary.isDm,
-            isFavorite = event.roomListRoomSummary.isFavorite,
+            roomId = event.roomSummary.roomId,
+            roomName = event.roomSummary.name,
+            isDm = event.roomSummary.isDm,
+            isFavorite = event.roomSummary.isFavorite,
             markAsUnreadFeatureFlagEnabled = featureFlagService.isFeatureEnabled(FeatureFlags.MarkAsUnread),
-            hasNewContent = event.roomListRoomSummary.hasNewContent,
+            hasNewContent = event.roomSummary.hasNewContent,
             eventCacheFeatureFlagEnabled = appPreferencesStore.isDeveloperModeEnabledFlow().first() &&
                 featureFlagService.isFeatureEnabled(FeatureFlags.EventCache),
         )
         contextMenuState.value = initialState
 
-        client.getRoom(event.roomListRoomSummary.roomId)?.use { room ->
+        client.getRoom(event.roomSummary.roomId)?.use { room ->
 
             val isShowingContextMenuFlow = snapshotFlow { contextMenuState.value is RoomListState.ContextMenu.Shown }
                 .distinctUntilChanged()
@@ -319,8 +323,6 @@ class RoomListPresenter @Inject constructor(
 
     private fun CoroutineScope.clearCacheOfRoom(roomId: RoomId) = launch {
         client.getRoom(roomId)?.use { room ->
-            // Ideally we wouldn't have a live timeline at this point, but right now we instantiate one when retrieving the room
-            room.liveTimeline.close()
             room.clearEventCacheStorage()
         }
     }
@@ -344,14 +346,3 @@ class RoomListPresenter @Inject constructor(
         }
     }
 }
-
-@VisibleForTesting
-internal fun RoomListRoomSummary.toInviteData(): InviteData? {
-    if (inviteSender == null) return null
-    return InviteData(
-        roomId = roomId,
-        roomName = name ?: roomId.value,
-        isDm = isDm,
-        senderId = inviteSender.userId,
-    )
-}
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
index 307a2d1313..8d203498cb 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
@@ -8,7 +8,7 @@
 package io.element.android.features.roomlist.impl
 
 import androidx.compose.runtime.Immutable
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.logout.api.direct.DirectLogoutState
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
@@ -28,6 +28,7 @@ data class RoomListState(
     val hasNetworkConnection: Boolean,
     val snackbarMessage: SnackbarMessage?,
     val contextMenu: ContextMenu,
+    val declineInviteMenu: DeclineInviteMenu,
     val leaveRoomState: LeaveRoomState,
     val filtersState: RoomListFiltersState,
     val canReportBug: Boolean,
@@ -36,6 +37,7 @@ data class RoomListState(
     val acceptDeclineInviteState: AcceptDeclineInviteState,
     val directLogoutState: DirectLogoutState,
     val hideInvitesAvatars: Boolean,
+    val canReportRoom: Boolean,
     val eventSink: (RoomListEvents) -> Unit,
 ) {
     val displayFilters = contentState is RoomListContentState.Rooms
@@ -53,6 +55,11 @@ data class RoomListState(
             val hasNewContent: Boolean,
         ) : ContextMenu
     }
+
+    sealed interface DeclineInviteMenu {
+        data object Hidden : DeclineInviteMenu
+        data class Shown(val roomSummary: RoomListRoomSummary) : DeclineInviteMenu
+    }
 }
 
 enum class SecurityBannerState {
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
index 1f93e81d67..4a221d3c97 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt
@@ -8,8 +8,8 @@
 package io.element.android.features.roomlist.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.leaveroom.api.aLeaveRoomState
 import io.element.android.features.logout.api.direct.DirectLogoutState
@@ -54,6 +54,7 @@ internal fun aRoomListState(
     hasNetworkConnection: Boolean = true,
     snackbarMessage: SnackbarMessage? = null,
     contextMenu: RoomListState.ContextMenu = RoomListState.ContextMenu.Hidden,
+    declineInviteMenu: RoomListState.DeclineInviteMenu = RoomListState.DeclineInviteMenu.Hidden,
     leaveRoomState: LeaveRoomState = aLeaveRoomState(),
     searchState: RoomListSearchState = aRoomListSearchState(),
     filtersState: RoomListFiltersState = aRoomListFiltersState(),
@@ -62,6 +63,7 @@ internal fun aRoomListState(
     acceptDeclineInviteState: AcceptDeclineInviteState = anAcceptDeclineInviteState(),
     directLogoutState: DirectLogoutState = aDirectLogoutState(),
     hideInvitesAvatars: Boolean = false,
+    canReportRoom: Boolean = true,
     eventSink: (RoomListEvents) -> Unit = {}
 ) = RoomListState(
     matrixUser = matrixUser,
@@ -69,6 +71,7 @@ internal fun aRoomListState(
     hasNetworkConnection = hasNetworkConnection,
     snackbarMessage = snackbarMessage,
     contextMenu = contextMenu,
+    declineInviteMenu = declineInviteMenu,
     leaveRoomState = leaveRoomState,
     filtersState = filtersState,
     canReportBug = canReportBug,
@@ -77,6 +80,7 @@ internal fun aRoomListState(
     acceptDeclineInviteState = acceptDeclineInviteState,
     directLogoutState = directLogoutState,
     hideInvitesAvatars = hideInvitesAvatars,
+    canReportRoom = canReportRoom,
     eventSink = eventSink,
 )
 
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
index 090180a7b8..016cc4d116 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@@ -49,6 +49,8 @@ fun RoomListView(
     onCreateRoomClick: () -> Unit,
     onRoomSettingsClick: (roomId: RoomId) -> Unit,
     onMenuActionClick: (RoomListMenuAction) -> Unit,
+    onReportRoomClick: (roomId: RoomId) -> Unit,
+    onDeclineInviteAndBlockUser: (roomSummary: RoomListRoomSummary) -> Unit,
     modifier: Modifier = Modifier,
     acceptDeclineInviteView: @Composable () -> Unit,
 ) {
@@ -60,8 +62,18 @@ fun RoomListView(
             if (state.contextMenu is RoomListState.ContextMenu.Shown) {
                 RoomListContextMenu(
                     contextMenu = state.contextMenu,
+                    canReportRoom = state.canReportRoom,
                     eventSink = state.eventSink,
                     onRoomSettingsClick = onRoomSettingsClick,
+                    onReportRoomClick = onReportRoomClick,
+                )
+            }
+            if (state.declineInviteMenu is RoomListState.DeclineInviteMenu.Shown) {
+                RoomListDeclineInviteMenu(
+                    menu = state.declineInviteMenu,
+                    canReportRoom = state.canReportRoom,
+                    eventSink = state.eventSink,
+                    onDeclineAndBlockClick = onDeclineInviteAndBlockUser,
                 )
             }
 
@@ -177,7 +189,9 @@ internal fun RoomListViewPreview(@PreviewParameter(RoomListStateProvider::class)
         onConfirmRecoveryKeyClick = {},
         onCreateRoomClick = {},
         onRoomSettingsClick = {},
+        onReportRoomClick = {},
         onMenuActionClick = {},
+        onDeclineInviteAndBlockUser = {},
         acceptDeclineInviteView = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
index 9f7a67bd00..7e5265c965 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
@@ -104,7 +104,7 @@ internal fun RoomSummaryRow(
                             eventSink(RoomListEvents.AcceptInvite(room))
                         },
                         onDeclineClick = {
-                            eventSink(RoomListEvents.DeclineInvite(room))
+                            eventSink(RoomListEvents.ShowDeclineInviteMenu(room))
                         }
                     )
                 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt
index cb4c48d3f7..a1c1156c2a 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummary.kt
@@ -8,6 +8,7 @@
 package io.element.android.features.roomlist.impl.model
 
 import androidx.compose.runtime.Immutable
+import io.element.android.features.invite.api.InviteData
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -45,4 +46,10 @@ data class RoomListRoomSummary(
         numberOfUnreadMentions > 0 ||
         numberOfUnreadNotifications > 0 ||
         isMarkedUnread
+
+    fun toInviteData() = InviteData(
+        roomId = roomId,
+        roomName = name ?: roomId.value,
+        isDm = isDm,
+    )
 }
diff --git a/features/roomlist/impl/src/main/res/values-be/translations.xml b/features/roomlist/impl/src/main/res/values-be/translations.xml
index 2f2f943249..b34671ed86 100644
--- a/features/roomlist/impl/src/main/res/values-be/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-be/translations.xml
@@ -3,8 +3,8 @@
   <string name="banner_set_up_recovery_content">"Стварыце новы ключ аднаўлення, які можна выкарыстоўваць для аднаўлення зашыфраванай гісторыі паведамленняў у выпадку страты доступу да вашых прылад."</string>
   <string name="banner_set_up_recovery_submit">"Наладзьце аднаўленне"</string>
   <string name="banner_set_up_recovery_title">"Наладзіць аднаўленне"</string>
-  <string name="confirm_recovery_key_banner_message">"Ваша рэзервовая копія чата зараз не сінхранізавана. Вам трэба пацвердзіць ключ аднаўлення, каб захаваць доступ да рэзервовай копіі чата."</string>
-  <string name="confirm_recovery_key_banner_title">"Увядзіце ключ аднаўлення"</string>
+  <string name="confirm_recovery_key_banner_message">"Пацвердзіце свой ключ аднаўлення, каб захаваць доступ да сховішча ключоў і гісторыі паведамленняў."</string>
+  <string name="confirm_recovery_key_banner_title">"Ваша сховішча ключоў не сінхранізавана"</string>
   <string name="full_screen_intent_banner_message">"Каб не прапусціць важны званок, зменіце налады, каб дазволіць поўнаэкранныя апавяшчэнні, калі тэлефон заблакіраваны."</string>
   <string name="full_screen_intent_banner_title">"Палепшыце якасць званкоў"</string>
   <string name="screen_invites_decline_chat_message">"Вы ўпэўненыя, што хочаце адхіліць запрашэнне ў %1$s?"</string>
diff --git a/features/roomlist/impl/src/main/res/values-cy/translations.xml b/features/roomlist/impl/src/main/res/values-cy/translations.xml
index a3ae4d7bd1..de6fe0cf0f 100644
--- a/features/roomlist/impl/src/main/res/values-cy/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-cy/translations.xml
@@ -9,11 +9,37 @@
   <string name="confirm_recovery_key_banner_title">"Dyw eich allwedd storfa heb ei gydweddu"</string>
   <string name="full_screen_intent_banner_message">"Er mwyn sicrhau fyddwch chi ddim yn colli galwad bwysig, newidiwch eich gosodiadau i ganiatáu hysbysiadau sgrin lawn pan fydd eich ffôn wedi\'i gloi."</string>
   <string name="full_screen_intent_banner_title">"Gwella profiad eich galwadau"</string>
+  <string name="screen_invites_decline_chat_message">"Ydych chi\'n siŵr eich bod am wrthod y gwahoddiad i ymuno â %1$s?"</string>
+  <string name="screen_invites_decline_chat_title">"Gwrthod y gwahoddiad"</string>
+  <string name="screen_invites_decline_direct_chat_message">"Ydych chi\'n siŵr eich bod am wrthod y sgwrs breifat hon gyda %1$s?"</string>
+  <string name="screen_invites_decline_direct_chat_title">"Gwrthod sgwrs"</string>
+  <string name="screen_invites_empty_list">"Dim Gwahoddiadau"</string>
+  <string name="screen_invites_invited_you">"Mae %1$s (%2$s) wedi eich gwahodd"</string>
   <string name="screen_join_room_knock_sent_title">"Anfonwyd y cais i ymuno"</string>
+  <string name="screen_migration_message">"Mae hon yn broses un tro, diolch am aros."</string>
+  <string name="screen_migration_title">"Creu eich cyfrif."</string>
+  <string name="screen_roomlist_a11y_create_message">"Crëwch sgwrs neu ystafell newydd"</string>
+  <string name="screen_roomlist_empty_message">"Cychwynnwch arni trwy anfon neges at rywun."</string>
+  <string name="screen_roomlist_empty_title">"Dim sgyrsiau eto."</string>
+  <string name="screen_roomlist_filter_favourites">"Ffefrynnau"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_subtitle">"Gallwch ychwanegu sgwrs at eich ffefrynnau yn y gosodiadau sgwrsio.
+Am y tro, gallwch ddad-ddewis hidlwyr er mwyn gweld eich sgyrsiau eraill"</string>
+  <string name="screen_roomlist_filter_favourites_empty_state_title">"Does gennych chi ddim hoff sgyrsiau eto"</string>
   <string name="screen_roomlist_filter_invites">"Gwahoddiadau"</string>
+  <string name="screen_roomlist_filter_invites_empty_state_title">"Does gennych chi ddim gwahoddiadau yn aros."</string>
+  <string name="screen_roomlist_filter_low_priority">"Blaenoriaeth Isel"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_subtitle">"Gallwch ddad-ddewis hidlwyr er mwyn gweld eich sgyrsiau eraill"</string>
+  <string name="screen_roomlist_filter_mixed_empty_state_title">"Does gennych chi ddim sgyrsiau ar gyfer y dewis hwn"</string>
   <string name="screen_roomlist_filter_people">"Pobl"</string>
+  <string name="screen_roomlist_filter_people_empty_state_title">"Does gennych chi ddim unrhyw DMs eto"</string>
   <string name="screen_roomlist_filter_rooms">"Ystafelloedd"</string>
+  <string name="screen_roomlist_filter_rooms_empty_state_title">"Dydych chi ddim mewn unrhyw ystafell eto"</string>
+  <string name="screen_roomlist_filter_unreads">"Heb ei ddarllen"</string>
+  <string name="screen_roomlist_filter_unreads_empty_state_title">"Llongyfarchiadau!
+Does gennych chi ddim negeseuon heb eu darllen!"</string>
   <string name="screen_roomlist_main_space_title">"Sgyrsiau"</string>
   <string name="screen_roomlist_mark_as_read">"Marcio fel wedi\'i ddarllen"</string>
   <string name="screen_roomlist_mark_as_unread">"Marcio fel heb ei ddarllen"</string>
+  <string name="session_verification_banner_message">"Mae\'n debyg eich bod chi\'n defnyddio dyfais newydd. Dilyswch gyda dyfais arall i gael mynediad at eich negeseuon wedi\'u hamgryptio."</string>
+  <string name="session_verification_banner_title">"Gwiriwch mai chi sydd yna"</string>
 </resources>
diff --git a/features/roomlist/impl/src/main/res/values-fa/translations.xml b/features/roomlist/impl/src/main/res/values-fa/translations.xml
index 6ef6977b8a..b5a277bb3a 100644
--- a/features/roomlist/impl/src/main/res/values-fa/translations.xml
+++ b/features/roomlist/impl/src/main/res/values-fa/translations.xml
@@ -2,7 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="banner_set_up_recovery_submit">"برپایی بازیابی"</string>
   <string name="banner_set_up_recovery_title">"برپایی بازیابی"</string>
-  <string name="confirm_recovery_key_banner_title">"ورود کلید بازیابیتان"</string>
+  <string name="confirm_recovery_key_banner_primary_button_title">"ورود کلید بازیابیتان"</string>
+  <string name="confirm_recovery_key_banner_title">"ذخیره‌ساز کلیدتان از هم‌گام بودن در آمده"</string>
   <string name="full_screen_intent_banner_title">"بهبود تجریهٔ تماستان"</string>
   <string name="screen_invites_decline_chat_message">"مطمئنید که می‌خواهید دعوت پیوستن به %1$s را رد کنید؟"</string>
   <string name="screen_invites_decline_chat_title">"رد دعوت"</string>
@@ -10,6 +11,7 @@
   <string name="screen_invites_decline_direct_chat_title">"رد گپ"</string>
   <string name="screen_invites_empty_list">"بدون دعوت"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) دعوتتان کرد"</string>
+  <string name="screen_join_room_knock_sent_title">"درخواست پیوستن فرستاده شد"</string>
   <string name="screen_migration_message">"فرایندی یک باره است. ممنون از شکیباییتان."</string>
   <string name="screen_migration_title">"برپایی حسابتان."</string>
   <string name="screen_roomlist_a11y_create_message">"ایجاد اتاق یا گفت‌وگویی جدید"</string>
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
index 25d57dab7a..80b5a87c10 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
@@ -31,8 +31,10 @@ class RoomListContextMenuTest {
         rule.setContent {
             RoomListContextMenu(
                 contextMenu = contextMenu,
+                canReportRoom = false,
                 eventSink = eventsRecorder,
                 onRoomSettingsClick = EnsureNeverCalledWithParam(),
+                onReportRoomClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(R.string.screen_roomlist_mark_as_read)
@@ -51,8 +53,10 @@ class RoomListContextMenuTest {
         rule.setContent {
             RoomListContextMenu(
                 contextMenu = contextMenu,
+                canReportRoom = false,
                 eventSink = eventsRecorder,
                 onRoomSettingsClick = EnsureNeverCalledWithParam(),
+                onReportRoomClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(R.string.screen_roomlist_mark_as_unread)
@@ -64,26 +68,6 @@ class RoomListContextMenuTest {
         )
     }
 
-    @Test
-    fun `clicking on Leave dm generates expected Events`() {
-        val eventsRecorder = EventsRecorder<RoomListEvents>()
-        val contextMenu = aContextMenuShown(isDm = true)
-        rule.setContent {
-            RoomListContextMenu(
-                contextMenu = contextMenu,
-                eventSink = eventsRecorder,
-                onRoomSettingsClick = EnsureNeverCalledWithParam(),
-            )
-        }
-        rule.clickOn(CommonStrings.action_leave_conversation)
-        eventsRecorder.assertList(
-            listOf(
-                RoomListEvents.HideContextMenu,
-                RoomListEvents.LeaveRoom(contextMenu.roomId),
-            )
-        )
-    }
-
     @Test
     fun `clicking on Leave room generates expected Events`() {
         val eventsRecorder = EventsRecorder<RoomListEvents>()
@@ -91,8 +75,10 @@ class RoomListContextMenuTest {
         rule.setContent {
             RoomListContextMenu(
                 contextMenu = contextMenu,
+                canReportRoom = false,
                 eventSink = eventsRecorder,
                 onRoomSettingsClick = EnsureNeverCalledWithParam(),
+                onReportRoomClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(CommonStrings.action_leave_room)
@@ -104,6 +90,25 @@ class RoomListContextMenuTest {
         )
     }
 
+    @Test
+    fun `clicking on Report room invokes the expected callback and generates expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomListEvents>()
+        val contextMenu = aContextMenuShown()
+        val callback = EnsureCalledOnceWithParam(contextMenu.roomId, Unit)
+        rule.setContent {
+            RoomListContextMenu(
+                contextMenu = contextMenu,
+                canReportRoom = true,
+                eventSink = eventsRecorder,
+                onRoomSettingsClick = EnsureNeverCalledWithParam(),
+                onReportRoomClick = callback,
+            )
+        }
+        rule.clickOn(CommonStrings.action_report_room)
+        eventsRecorder.assertSingle(RoomListEvents.HideContextMenu)
+        callback.assertSuccess()
+    }
+
     @Test
     fun `clicking on Settings invokes the expected callback and generates expected Event`() {
         val eventsRecorder = EventsRecorder<RoomListEvents>()
@@ -112,8 +117,10 @@ class RoomListContextMenuTest {
         rule.setContent {
             RoomListContextMenu(
                 contextMenu = contextMenu,
+                canReportRoom = false,
                 eventSink = eventsRecorder,
                 onRoomSettingsClick = callback,
+                onReportRoomClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(CommonStrings.common_settings)
@@ -129,8 +136,10 @@ class RoomListContextMenuTest {
         rule.setContent {
             RoomListContextMenu(
                 contextMenu = contextMenu,
+                canReportRoom = false,
                 eventSink = eventsRecorder,
                 onRoomSettingsClick = callback,
+                onReportRoomClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(CommonStrings.common_favourite)
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt
new file mode 100644
index 0000000000..0fdb5d7639
--- /dev/null
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListDeclineInviteMenuTest.kt
@@ -0,0 +1,100 @@
+/*
+ * 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.roomlist.impl
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EnsureCalledOnceWithParam
+import io.element.android.tests.testutils.EnsureNeverCalledWithParam
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class RoomListDeclineInviteMenuTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `clicking on decline emits the expected Events`() {
+        val eventsRecorder = EventsRecorder<RoomListEvents>()
+        val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
+        rule.setContent {
+            RoomListDeclineInviteMenu(
+                menu = menu,
+                canReportRoom = false,
+                onDeclineAndBlockClick = EnsureNeverCalledWithParam(),
+                eventSink = eventsRecorder,
+            )
+        }
+        rule.clickOn(CommonStrings.action_decline)
+        eventsRecorder.assertList(
+            listOf(
+                RoomListEvents.HideDeclineInviteMenu,
+                RoomListEvents.DeclineInvite(menu.roomSummary, blockUser = false),
+            )
+        )
+    }
+
+    @Test
+    fun `clicking on decline and block when canReportRoom=true, it emits the expected Events and callback`() {
+        val eventsRecorder = EventsRecorder<RoomListEvents>()
+        val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
+        rule.setContent {
+            RoomListDeclineInviteMenu(
+                menu = menu,
+                canReportRoom = true,
+                onDeclineAndBlockClick = EnsureCalledOnceWithParam(menu.roomSummary, Unit),
+                eventSink = eventsRecorder,
+            )
+        }
+        rule.clickOn(CommonStrings.action_decline_and_block)
+        val expectedEvents = listOf(RoomListEvents.HideDeclineInviteMenu)
+        eventsRecorder.assertList(expectedEvents)
+    }
+
+    @Test
+    fun `clicking on decline and block when canReportRoom=false, it emits the expected Events`() {
+        val eventsRecorder = EventsRecorder<RoomListEvents>()
+        val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
+        rule.setContent {
+            RoomListDeclineInviteMenu(
+                menu = menu,
+                canReportRoom = false,
+                onDeclineAndBlockClick = EnsureNeverCalledWithParam(),
+                eventSink = eventsRecorder,
+            )
+        }
+        rule.clickOn(CommonStrings.action_decline_and_block)
+        val expectedEvents = listOf(
+            RoomListEvents.HideDeclineInviteMenu,
+            RoomListEvents.DeclineInvite(menu.roomSummary, blockUser = true),
+        )
+        eventsRecorder.assertList(expectedEvents)
+    }
+
+    @Test
+    fun `clicking on cancel emits the expected Event`() {
+        val eventsRecorder = EventsRecorder<RoomListEvents>()
+        val menu = RoomListState.DeclineInviteMenu.Shown(roomSummary = aRoomListRoomSummary())
+        rule.setContent {
+            RoomListDeclineInviteMenu(
+                menu = menu,
+                canReportRoom = false,
+                onDeclineAndBlockClick = EnsureNeverCalledWithParam(),
+                eventSink = eventsRecorder,
+            )
+        }
+        rule.clickOn(CommonStrings.action_cancel)
+        eventsRecorder.assertList(listOf(RoomListEvents.HideDeclineInviteMenu))
+    }
+}
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
index 50e7628d09..073e163c16 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@@ -13,9 +13,9 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Interaction
 import io.element.android.features.invite.api.SeenInvitesStore
-import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
-import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
+import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.invite.test.InMemorySeenInvitesStore
 import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomState
@@ -64,8 +64,9 @@ import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
+import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
@@ -275,7 +276,7 @@ class RoomListPresenterTest {
 
     @Test
     fun `present - show context menu`() = runTest {
-        val room = FakeMatrixRoom()
+        val room = FakeBaseRoom()
         val client = FakeMatrixClient().apply {
             givenGetRoomResult(A_ROOM_ID, room)
         }
@@ -353,7 +354,7 @@ class RoomListPresenterTest {
 
     @Test
     fun `present - hide context menu`() = runTest {
-        val room = FakeMatrixRoom()
+        val room = FakeBaseRoom()
         val client = FakeMatrixClient().apply {
             givenGetRoomResult(A_ROOM_ID, room)
         }
@@ -463,7 +464,7 @@ class RoomListPresenterTest {
     @Test
     fun `present - when set is favorite event is emitted, then the action is called`() = runTest {
         val setIsFavoriteResult = lambdaRecorder { _: Boolean -> Result.success(Unit) }
-        val room = FakeMatrixRoom(
+        val room = FakeBaseRoom(
             setIsFavoriteResult = setIsFavoriteResult
         )
         val analyticsService = FakeAnalyticsService()
@@ -510,9 +511,9 @@ class RoomListPresenterTest {
 
     @Test
     fun `present - check that the room is marked as read with correct RR and as unread`() = runTest {
-        val room = FakeMatrixRoom()
-        val room2 = FakeMatrixRoom(roomId = A_ROOM_ID_2)
-        val room3 = FakeMatrixRoom(roomId = A_ROOM_ID_3)
+        val room = FakeBaseRoom()
+        val room2 = FakeBaseRoom(roomId = A_ROOM_ID_2)
+        val room3 = FakeBaseRoom(roomId = A_ROOM_ID_3)
         val allRooms = setOf(room, room2, room3)
         val sessionPreferencesStore = InMemorySessionPreferencesStore()
         val matrixClient = FakeMatrixClient().apply {
@@ -577,7 +578,8 @@ class RoomListPresenterTest {
             roomListService = roomListService,
         )
         val roomSummary = aRoomSummary(
-            currentUserMembership = CurrentUserMembership.INVITED
+            currentUserMembership = CurrentUserMembership.INVITED,
+            inviter = aRoomMember(),
         )
         roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
         roomListService.postAllRooms(listOf(roomSummary))
@@ -593,16 +595,16 @@ class RoomListPresenterTest {
             val roomListRoomSummary = state.contentAsRooms().summaries.first {
                 it.id == roomSummary.roomId.value
             }
+
             state.eventSink(RoomListEvents.AcceptInvite(roomListRoomSummary))
-            state.eventSink(RoomListEvents.DeclineInvite(roomListRoomSummary))
+            state.eventSink(RoomListEvents.DeclineInvite(roomListRoomSummary, blockUser = false))
 
             val inviteData = roomListRoomSummary.toInviteData()
-
             assert(eventSinkRecorder)
                 .isCalledExactly(2)
                 .withSequence(
                     listOf(value(AcceptDeclineInviteEvents.AcceptInvite(inviteData))),
-                    listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData))),
+                    listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData, blockUser = false, shouldConfirm = false))),
                 )
         }
     }
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
index 780af7c98c..ee4cc0b564 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
@@ -17,6 +17,7 @@ import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTouchInput
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.features.roomlist.impl.components.RoomListMenuAction
+import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -226,7 +227,10 @@ class RoomListViewTest {
         rule.clickOn(CommonStrings.action_accept)
         rule.clickOn(CommonStrings.action_decline)
         eventsRecorder.assertList(
-            listOf(RoomListEvents.AcceptInvite(invitedRoom), RoomListEvents.DeclineInvite(invitedRoom)),
+            listOf(
+                RoomListEvents.AcceptInvite(invitedRoom),
+                RoomListEvents.ShowDeclineInviteMenu(invitedRoom),
+            )
         )
     }
 }
@@ -240,6 +244,8 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomL
     onCreateRoomClick: () -> Unit = EnsureNeverCalled(),
     onRoomSettingsClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
     onMenuActionClick: (RoomListMenuAction) -> Unit = EnsureNeverCalledWithParam(),
+    onReportRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+    onDeclineInviteAndBlockUser: (RoomListRoomSummary) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         RoomListView(
@@ -251,6 +257,8 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomL
             onCreateRoomClick = onCreateRoomClick,
             onRoomSettingsClick = onRoomSettingsClick,
             onMenuActionClick = onMenuActionClick,
+            onDeclineInviteAndBlockUser = onDeclineInviteAndBlockUser,
+            onReportRoomClick = onReportRoomClick,
             acceptDeclineInviteView = { },
         )
     }
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt
similarity index 99%
rename from features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt
rename to features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt
index a7940a203b..4d5ef13d0b 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/model/RoomListBaseRoomSummaryTest.kt
@@ -16,7 +16,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import kotlinx.collections.immutable.toPersistentList
 import org.junit.Test
 
-class RoomListRoomSummaryTest {
+class RoomListBaseRoomSummaryTest {
     @Test
     fun `test default value`() {
         val sut = createRoomListRoomSummary(
diff --git a/features/securebackup/impl/src/main/res/values-be/translations.xml b/features/securebackup/impl/src/main/res/values-be/translations.xml
index 3a57f36ded..781ca5af96 100644
--- a/features/securebackup/impl/src/main/res/values-be/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-be/translations.xml
@@ -2,11 +2,11 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Выключыць рэзервовае капіраванне"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Уключыце рэзервовае капіраванне"</string>
-  <string name="screen_chat_backup_key_backup_description">"Рэзервовае капіраванне гарантуе, што вы не страціце сваю гісторыю паведамленняў. %1$s."</string>
-  <string name="screen_chat_backup_key_backup_title">"Рэзервовая копія"</string>
+  <string name="screen_chat_backup_key_backup_description">"Надзейна захоўвайце вашу крыптаграфічную ідэнтыфікацыю і ключы паведамленняў на серверы. Гэта дазволіць вам праглядаць гісторыю паведамленняў на любых новых прыладах.%1$s ."</string>
+  <string name="screen_chat_backup_key_backup_title">"Сховішча ключоў"</string>
   <string name="screen_chat_backup_recovery_action_change">"Змяніць ключ аднаўлення"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Увядзіце ключ аднаўлення"</string>
-  <string name="screen_chat_backup_recovery_action_confirm_description">"Ваша рэзервовая копія чата зараз не сінхранізавана."</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"Ваша сховішча ключоў зараз не сінхранізавана."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Наладзьце аднаўленне"</string>
   <string name="screen_chat_backup_recovery_action_setup_description">"Атрымайце доступ да зашыфраваных паведамленняў, калі вы страціце ўсе свае прылады або выйдзеце з сістэмы %1$s усюды."</string>
   <string name="screen_create_new_recovery_key_list_item_1">"Адкрыйце %1$s на настольнай прыладзе"</string>
@@ -31,12 +31,12 @@
   <string name="screen_key_backup_disable_title">"Вы ўпэўнены, што хочаце адключыць рэзервовае капіраванне?"</string>
   <string name="screen_recovery_key_change_description">"Атрымайце новы ключ аднаўлення, калі вы страцілі існуючы. Пасля змены ключа аднаўлення ваш стары больш не будзе працаваць."</string>
   <string name="screen_recovery_key_change_generate_key">"Стварыць новы ключ аднаўлення"</string>
-  <string name="screen_recovery_key_change_generate_key_description">"Пераканайцеся, што вы можаце захаваць ключ аднаўлення ў бяспечным месцы"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"Ні з кім не дзяліцеся гэтым!"</string>
   <string name="screen_recovery_key_change_success">"Ключ аднаўлення зменены"</string>
   <string name="screen_recovery_key_change_title">"Змяніць ключ аднаўлення?"</string>
   <string name="screen_recovery_key_confirm_create_new_recovery_key">"Стварыць новы ключ аднаўлення"</string>
   <string name="screen_recovery_key_confirm_description">"Пераканайцеся, што ніхто не бачыць гэты экран!"</string>
-  <string name="screen_recovery_key_confirm_error_content">"Паўтарыце спробу, каб пацвердзіць доступ да рэзервовай копіі чата."</string>
+  <string name="screen_recovery_key_confirm_error_content">"Паўтарыце спробу, каб пацвердзіць доступ да сховішча ключоў."</string>
   <string name="screen_recovery_key_confirm_error_title">"Няправільны ключ аднаўлення"</string>
   <string name="screen_recovery_key_confirm_key_description">"Калі ў вас ёсць ключ аднаўлення або парольная фраза, гэта таксама будзе працаваць."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"Увесці…"</string>
@@ -45,14 +45,14 @@
   <string name="screen_recovery_key_copied_to_clipboard">"Ключ аднаўлення скапіраваны"</string>
   <string name="screen_recovery_key_generating_key">"Стварэнне…"</string>
   <string name="screen_recovery_key_save_action">"Захаваць ключ аднаўлення"</string>
-  <string name="screen_recovery_key_save_description">"Запішыце ключ аднаўлення ў бяспечным месцы або захавайце яго ў менеджары пароляў."</string>
+  <string name="screen_recovery_key_save_description">"Запішыце гэты ключ аднаўлення ў бяспечным месцы, напрыклад, у менеджэры пароляў, у зашыфраванай нататцы або ў фізічным сейфе."</string>
   <string name="screen_recovery_key_save_key_description">"Націсніце, каб скапіяваць ключ аднаўлення"</string>
   <string name="screen_recovery_key_save_title">"Захавайце ключ аднаўлення"</string>
   <string name="screen_recovery_key_setup_confirmation_description">"Пасля гэтага кроку вы не зможаце атрымаць доступ да новага ключа аднаўлення."</string>
   <string name="screen_recovery_key_setup_confirmation_title">"Вы захавалі свой ключ аднаўлення?"</string>
   <string name="screen_recovery_key_setup_description">"Рэзервовая копія чата абаронена ключом аднаўлення. Калі пасля настройкі вам спатрэбіцца новы ключ аднаўлення, вы можаце стварыць яго нанова, выбраўшы \"Змяніць ключ аднаўлення\"."</string>
   <string name="screen_recovery_key_setup_generate_key">"Стварыце ключ аднаўлення"</string>
-  <string name="screen_recovery_key_setup_generate_key_description">"Пераканайцеся, што вы можаце захаваць ключ аднаўлення ў бяспечным месцы"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"Ні з кім не дзяліцеся гэтым!"</string>
   <string name="screen_recovery_key_setup_success">"Наладка аднаўлення прайшла паспяхова"</string>
   <string name="screen_recovery_key_setup_title">"Наладзьце аднаўленне"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"Так, скінуць зараз"</string>
diff --git a/features/securebackup/impl/src/main/res/values-cy/translations.xml b/features/securebackup/impl/src/main/res/values-cy/translations.xml
index 09449fbaff..fdff84c0b9 100644
--- a/features/securebackup/impl/src/main/res/values-cy/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-cy/translations.xml
@@ -1,10 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_chat_backup_key_backup_action_disable">"Dileu storfa allweddi"</string>
+  <string name="screen_chat_backup_key_backup_action_enable">"Trowch y copi wrth gefn ymlaen"</string>
+  <string name="screen_chat_backup_key_backup_description">"Cadwch eich hunaniaeth cryptograffig a\'ch allweddi neges yn ddiogel ar y gweinydd. Bydd hyn yn caniatáu ichi weld hanes eich neges ar unrhyw ddyfeisiau newydd. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_title">"Storio allweddi"</string>
+  <string name="screen_chat_backup_key_storage_disabled_error">"Rhaid troi storio allweddi ymlaen i osod adferiad."</string>
+  <string name="screen_chat_backup_key_storage_toggle_description">"Llwythwch allweddi i fyny o\'r ddyfais hon"</string>
+  <string name="screen_chat_backup_key_storage_toggle_title">"Caniatáu storio allweddi"</string>
+  <string name="screen_chat_backup_recovery_action_change">"Newid yr allwedd adfer"</string>
+  <string name="screen_chat_backup_recovery_action_change_description">"Adferwch eich hunaniaeth cryptograffig a hanes negeseuon gydag allwedd adfer os ydych chi wedi colli\'ch holl ddyfeisiau presennol."</string>
+  <string name="screen_chat_backup_recovery_action_confirm">"Rhowch eich allwedd adfer"</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"Nid yw eich storfa allweddi wedi\'i chydweddu ar hyn o bryd."</string>
   <string name="screen_chat_backup_recovery_action_setup">"Gosod adfer"</string>
+  <string name="screen_chat_backup_recovery_action_setup_description">"Cael mynediad i\'ch negeseuon wedi\'u hamgryptio os byddwch yn colli\'ch holl ddyfeisiau neu\'n cael eich allgofnodi o %1$s ym mhobman."</string>
+  <string name="screen_create_new_recovery_key_list_item_1">"Agor %1$s mewn dyfais bwrdd gwaith"</string>
+  <string name="screen_create_new_recovery_key_list_item_2">"Mewngofnodwch i\'ch cyfrif eto"</string>
+  <string name="screen_create_new_recovery_key_list_item_3">"Pan fydd gofyn i chi ddilysu\'ch dyfais, dewiswch %1$s"</string>
+  <string name="screen_create_new_recovery_key_list_item_3_reset_all">"“Ailosod y cyfan“"</string>
+  <string name="screen_create_new_recovery_key_list_item_4">"Dilynwch y cyfarwyddiadau i greu allwedd adfer newydd"</string>
+  <string name="screen_create_new_recovery_key_list_item_5">"Cadwch eich allwedd adfer newydd mewn rheolwr cyfrinair neu mewn nodyn wedi\'i amgryptio"</string>
+  <string name="screen_create_new_recovery_key_title">"Ailosodwch yr amgryptio ar gyfer eich cyfrif gan ddefnyddio dyfais arall"</string>
+  <string name="screen_encryption_reset_action_continue_reset">"Parhau i ailosod"</string>
+  <string name="screen_encryption_reset_bullet_1">"Bydd manylion eich cyfrif, eich cysylltiadau, eich dewisiadau a\'ch rhestr sgwrsio yn cael eu cadw"</string>
+  <string name="screen_encryption_reset_bullet_2">"Byddwch yn colli unrhyw hanes neges sydd wedi\'i gadw dim ond ar y gweinydd"</string>
+  <string name="screen_encryption_reset_bullet_3">"Bydd angen i chi wirio\'ch holl ddyfeisiau a chysylltiadau presennol eto"</string>
+  <string name="screen_encryption_reset_footer">"Ailosodwch eich hunaniaeth dim ond os nad oes gennych fynediad i ddyfais arall sydd wedi\'i mewngofnodi a\'ch bod wedi colli\'ch allwedd adfer."</string>
+  <string name="screen_encryption_reset_title">"Methu cadarnhau? Bydd angen i chi ailosod eich hunaniaeth."</string>
+  <string name="screen_key_backup_disable_confirmation_action_turn_off">"Diffodd"</string>
+  <string name="screen_key_backup_disable_confirmation_description">"Byddwch yn colli eich negeseuon wedi\'u hamgryptio os ydych wedi\'ch allgofnodi o bob dyfais."</string>
+  <string name="screen_key_backup_disable_confirmation_title">"Ydych chi\'n siŵr eich bod am ddiffodd copi wrth gefn?"</string>
   <string name="screen_key_backup_disable_description">"Bydd dileu storfa allweddi\'n tynnu eich hunaniaeth cryptograffig a\'ch allweddi neges o\'r gweinydd ac yn diffodd y nodweddion diogelwch canlynol:"</string>
+  <string name="screen_key_backup_disable_description_point_1">"Bydd gennych chi ddim hanes negeseuon wedi\'i amgryptio ar ddyfeisiau newydd"</string>
+  <string name="screen_key_backup_disable_description_point_2">"Byddwch yn colli mynediad i\'ch negeseuon wedi\'u hamgryptio os ydych wedi\'ch allgofnodi o %1$s ym mhobman"</string>
+  <string name="screen_key_backup_disable_title">"Ydych chi\'n siŵr eich bod am ddiffodd storfa allweddi a\'i dileu?"</string>
+  <string name="screen_recovery_key_change_description">"Cael allwedd adfer newydd os ydych chi wedi colli\'ch un presennol. Ar ôl newid eich allwedd adfer, fydd eich hen un ddim yn gweithio mwyach."</string>
+  <string name="screen_recovery_key_change_generate_key">"Cynhyrchu allwedd adfer newydd"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"Peidiwch â rhannu hwn gyda neb!"</string>
+  <string name="screen_recovery_key_change_success">"Newidwyd yr allwedd adfer"</string>
+  <string name="screen_recovery_key_change_title">"Newid yr allwedd adfer?"</string>
+  <string name="screen_recovery_key_confirm_create_new_recovery_key">"Creu allwedd adfer newydd"</string>
+  <string name="screen_recovery_key_confirm_description">"Gwnewch yn siŵr nad oes neb yn gallu gweld y sgrin hon!"</string>
+  <string name="screen_recovery_key_confirm_error_content">"Ceisiwch eto i gadarnhau mynediad i\'ch storfa allweddi."</string>
+  <string name="screen_recovery_key_confirm_error_title">"Allwedd adfer anghywir"</string>
+  <string name="screen_recovery_key_confirm_key_description">"Os oes gennych allwedd ddiogelwch neu ymadrodd diogelwch, bydd hyn yn gweithio hefyd."</string>
+  <string name="screen_recovery_key_confirm_key_placeholder">"Rhowch…"</string>
+  <string name="screen_recovery_key_confirm_lost_recovery_key">"Wedi colli eich allwedd adfer?"</string>
+  <string name="screen_recovery_key_confirm_success">"Wedi cadarnhau\'r allwedd adfer"</string>
   <string name="screen_recovery_key_confirm_title">"Rhowch eich allwedd adfer"</string>
+  <string name="screen_recovery_key_copied_to_clipboard">"Allwedd adfer wedi\'i chopïo"</string>
+  <string name="screen_recovery_key_generating_key">"Yn cynhyrchu…"</string>
+  <string name="screen_recovery_key_save_action">"Cadw allwedd adfer"</string>
   <string name="screen_recovery_key_save_description">"Ysgrifennwch yr allwedd adfer hon yn rhywle diogel, fel rheolwr cyfrinair, nodyn wedi\'i amgryptio, neu mewn man dan glo."</string>
+  <string name="screen_recovery_key_save_key_description">"Tapiwch i gopïo\'r allwedd adfer"</string>
   <string name="screen_recovery_key_save_title">"Cadwch eich allwedd adfer yn rhywle diogel"</string>
+  <string name="screen_recovery_key_setup_confirmation_description">"Fyddwch chi ddim yn gallu cyrchu\'ch allwedd adfer newydd ar ôl y cam hwn."</string>
+  <string name="screen_recovery_key_setup_confirmation_title">"Ydych chi wedi cadw\'ch allwedd adfer?"</string>
+  <string name="screen_recovery_key_setup_description">"Mae eich storfa allweddi wedi\'i diogelu gan allwedd adfer. Os oes angen allwedd adfer newydd arnoch ar ôl gosod, gallwch ei hail-greu trwy ddewis \'Newid allwedd adfer\'."</string>
+  <string name="screen_recovery_key_setup_generate_key">"Cynhyrchwch eich allwedd adfer"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"Peidiwch â rhannu hwn gyda neb!"</string>
+  <string name="screen_recovery_key_setup_success">"Llwyddiant wrth osod adferiad"</string>
   <string name="screen_recovery_key_setup_title">"Gosod adfer"</string>
+  <string name="screen_reset_encryption_confirmation_alert_action">"Iawn, ailosod nawr"</string>
+  <string name="screen_reset_encryption_confirmation_alert_subtitle">"Does dim posib dadwneud y broses hon."</string>
+  <string name="screen_reset_encryption_confirmation_alert_title">"Ydych chi\'n siŵr eich bod am ailosod eich hunaniaeth?"</string>
   <string name="screen_reset_encryption_password_error">"Digwyddodd gwall anhysbys. Gwiriwch fod cyfrinair eich cyfrif yn gywir a cheisio eto."</string>
+  <string name="screen_reset_encryption_password_placeholder">"Rhowch…"</string>
+  <string name="screen_reset_encryption_password_subtitle">"Cadarnhewch eich bod am ailosod eich hunaniaeth."</string>
+  <string name="screen_reset_encryption_password_title">"Rhowch eich cyfrinair cyfrif i barhau"</string>
 </resources>
diff --git a/features/securebackup/impl/src/main/res/values-de/translations.xml b/features/securebackup/impl/src/main/res/values-de/translations.xml
index 29e43e2e2f..97422cc9cf 100644
--- a/features/securebackup/impl/src/main/res/values-de/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-de/translations.xml
@@ -43,7 +43,7 @@
   <string name="screen_key_backup_disable_confirmation_description">"Du verlierst deine verschlüsselten Nachrichten, wenn du auf allen Geräten abgemeldet bist."</string>
   <string name="screen_key_backup_disable_confirmation_title">"Bist du sicher, dass du das Backup deaktivieren willst?"</string>
   <string name="screen_key_backup_disable_description">"Wenn du das Backup deaktivierst, wird dein aktuelles Schlüssel Backup für die Verschlüsselung entfernt und andere Sicherheitsfunktionen werden deaktiviert. Das bedeutet:"</string>
-  <string name="screen_key_backup_disable_description_point_1">"Keinen Nachrichtenverlauf für verschlüsselte Nachrichten auf neuen Geräten ."</string>
+  <string name="screen_key_backup_disable_description_point_1">"Keinen Nachrichtenverlauf für verschlüsselte Nachrichten auf neuen Geräten."</string>
   <string name="screen_key_backup_disable_description_point_2">"Verlust des Zugriffs auf Deine verschlüsselten Nachrichten, wenn Du Dich überall von %1$s abmeldest"</string>
   <string name="screen_key_backup_disable_title">"Bist du sicher, dass du das Backup deaktivieren willst?"</string>
   <string name="screen_recovery_key_change_description">"Hier kannst Du einen neuen Wiederherstellungsschlüssel erstellen. Nachdem Du einen neuen Wiederherstellungsschlüssel erstellt hast, funktioniert dein alter Schlüssel nicht mehr."</string>
diff --git a/features/securebackup/impl/src/main/res/values-fa/translations.xml b/features/securebackup/impl/src/main/res/values-fa/translations.xml
index a0d71400c8..85b7aa883f 100644
--- a/features/securebackup/impl/src/main/res/values-fa/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-fa/translations.xml
@@ -2,11 +2,12 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"خاموش کردن پشتیبان"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"روشن کردن پشتیبان"</string>
-  <string name="screen_chat_backup_key_backup_description">"پشتیبان‌ها اطمینان می‌دهند که تاریخچهٔ پیام‌هایتان را از دست نمی‌دهید. %1$s."</string>
-  <string name="screen_chat_backup_key_backup_title">"پشتیبان گیری"</string>
+  <string name="screen_chat_backup_key_backup_description">"ذخیرهٔ کلیدهای پیام‌ها و هویت رمزنگاریتان به صورت امن روی کارساز. این کار می‌گذارد تاریخچهٔ پیام‌هایتان را روی هر افزارهٔ جدیدی ببینید. %1$s."</string>
+  <string name="screen_chat_backup_key_backup_title">"ذخیره‌ساز کلید"</string>
+  <string name="screen_chat_backup_key_storage_toggle_description">"بارگذاری کلیدها از ین افزاره"</string>
   <string name="screen_chat_backup_recovery_action_change">"تغییر کلید بازیابی"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"ورود کلید بازیابی"</string>
-  <string name="screen_chat_backup_recovery_action_confirm_description">"پشتیبان گپتان از هم‌گام بودن در آمده."</string>
+  <string name="screen_chat_backup_recovery_action_confirm_description">"ذخیره‌ساز کلیدتان از هم‌گام بودن در آمده."</string>
   <string name="screen_chat_backup_recovery_action_setup">"برپایی بازیابی"</string>
   <string name="screen_create_new_recovery_key_list_item_1">"گشودن %1$s در افزارهٔ میزکار"</string>
   <string name="screen_create_new_recovery_key_list_item_2">"ورود دوباره به حسابتان"</string>
@@ -24,28 +25,29 @@
   <string name="screen_key_backup_disable_confirmation_action_turn_off">"خاموش کردن"</string>
   <string name="screen_recovery_key_change_description">"گرفتن کلید بازیابی جدید در صورت فراموشی کلید کنونی. پس از تغییر دادن کلید بازیابیتان، کلید پیشین دیگر کار نخواهد کرد."</string>
   <string name="screen_recovery_key_change_generate_key">"تولید کلید بازیابی جدید"</string>
-  <string name="screen_recovery_key_change_generate_key_description">"اطمینان از امکان نگه داری کلید بازیابیتان در جایی امن"</string>
+  <string name="screen_recovery_key_change_generate_key_description">"با کسی هم‌رسانیش نکنید!"</string>
   <string name="screen_recovery_key_change_success">"کلید بازیابی تغییر کرد"</string>
   <string name="screen_recovery_key_change_title">"تغییر کلید بازیابی؟"</string>
   <string name="screen_recovery_key_confirm_create_new_recovery_key">"ایجاد کلید بازیابی جدید"</string>
   <string name="screen_recovery_key_confirm_description">"اطمینان از این که کسی نمی‌تواند این صفحه را ببیند!"</string>
-  <string name="screen_recovery_key_confirm_error_content">"لطفاً برای تأیید دسترسی به پشتیبان گپتان دوباره تلاش کنید."</string>
+  <string name="screen_recovery_key_confirm_error_content">"لطفاً برای دسترسی به ذخیره‌ساز کلیدتان دوباره تلاش کنید."</string>
   <string name="screen_recovery_key_confirm_error_title">"کلید بازیابی اشتباه"</string>
   <string name="screen_recovery_key_confirm_key_description">"کلید امنیتی یا عبارت امنیتی نیز باید کار کنند."</string>
   <string name="screen_recovery_key_confirm_key_placeholder">"ورود…"</string>
   <string name="screen_recovery_key_confirm_lost_recovery_key">"گم کردن کلید بازیابیتان؟"</string>
   <string name="screen_recovery_key_confirm_success">"کلید بازیابی تأیید شد"</string>
+  <string name="screen_recovery_key_confirm_title">"ورود کلید بازیابیتان"</string>
   <string name="screen_recovery_key_copied_to_clipboard">"کلید بازیابی رونوشت شد"</string>
   <string name="screen_recovery_key_generating_key">"تولید کردن…"</string>
   <string name="screen_recovery_key_save_action">"ذخیرهٔ کلید بازیابی"</string>
-  <string name="screen_recovery_key_save_description">"نوشتن کلید بازیابیتان در جایی امن یا ذخیره‌اش در مدیر گذرواژه."</string>
+  <string name="screen_recovery_key_save_description">"این کلید بازیابی را در جایی امن چون مدیر گذرواژه، یادداشت رمز شده یا گاوصندوق فیزیکی بنویسید."</string>
   <string name="screen_recovery_key_save_key_description">"زدن برای رونوشت از کلید بازیابی"</string>
   <string name="screen_recovery_key_save_title">"ذخیرهٔ کلید بازیابیتان"</string>
   <string name="screen_recovery_key_setup_confirmation_description">"پس از این برپایی قادر به دسترسی به کلید بازیابی جدیدتان نخواهید بود."</string>
   <string name="screen_recovery_key_setup_confirmation_title">"کلید بازیابیتان را ذخیره کرده‌اید؟"</string>
   <string name="screen_recovery_key_setup_description">"پشتیبان گپتان با کلید بازیابی محافظت می‌شود. اگر پس از برپایی نیاز به کلید بازیابی جدیدی داشتید می‌توانید با گزینش «دگرگونی کلید بازیابی» دوباره ایجادش کنید."</string>
   <string name="screen_recovery_key_setup_generate_key">"تولید کلید بازیابیتان"</string>
-  <string name="screen_recovery_key_setup_generate_key_description">"اطمینان از امکان نگه داری کلید بازیابیتان در جایی امن"</string>
+  <string name="screen_recovery_key_setup_generate_key_description">"با کسی هم‌رسانیش نکنید!"</string>
   <string name="screen_recovery_key_setup_success">"برپایی بازیابی موفّق بود"</string>
   <string name="screen_recovery_key_setup_title">"برپایی بازیابی"</string>
   <string name="screen_reset_encryption_confirmation_alert_action">"بله. اکنون بازنشانی شود"</string>
diff --git a/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml b/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
index 0f378ca615..9946b453f6 100644
--- a/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-pt-rBR/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Desativar o backup"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Ativar o backup"</string>
-  <string name="screen_chat_backup_key_backup_description">"Armazene sua identidade criptográfica e chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em quaisquer novos dispositivos.%1$s ."</string>
+  <string name="screen_chat_backup_key_backup_description">"Armazene sua identidade criptográfica e chaves de mensagem com segurança no servidor. Isso permitirá que você visualize seu histórico de mensagens em quaisquer novos dispositivos.%1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Armazenamento de chaves"</string>
   <string name="screen_chat_backup_recovery_action_change">"Alterar chave de recuperação"</string>
   <string name="screen_chat_backup_recovery_action_confirm">"Insira a chave de recuperação"</string>
diff --git a/features/securebackup/impl/src/main/res/values-ru/translations.xml b/features/securebackup/impl/src/main/res/values-ru/translations.xml
index 9b209c5ec6..1f3161d34a 100644
--- a/features/securebackup/impl/src/main/res/values-ru/translations.xml
+++ b/features/securebackup/impl/src/main/res/values-ru/translations.xml
@@ -2,7 +2,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_chat_backup_key_backup_action_disable">"Удалить хранилище ключей"</string>
   <string name="screen_chat_backup_key_backup_action_enable">"Включить резервное копирование"</string>
-  <string name="screen_chat_backup_key_backup_description">"Сохраните вашу криптографическую идентификацию и ключи сообщений в безопасности на сервере. Это позволит вам просматривать историю сообщений на любых новых устройствах.%1$s ."</string>
+  <string name="screen_chat_backup_key_backup_description">"Сохраните вашу криптографическую идентификацию и ключи сообщений в безопасности на сервере. Это позволит вам просматривать историю сообщений на любых новых устройствах.%1$s."</string>
   <string name="screen_chat_backup_key_backup_title">"Хранилище ключей"</string>
   <string name="screen_chat_backup_key_storage_disabled_error">"Для настройки восстановления необходимо включить хранилище ключей."</string>
   <string name="screen_chat_backup_key_storage_toggle_description">"Загрузить ключи с этого устройства"</string>
diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
index 1642578863..d46fb22ef4 100644
--- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
+++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
@@ -72,7 +72,7 @@ class SharePresenter @AssistedInject constructor(
                     } else {
                         roomIds
                             .map { roomId ->
-                                val room = matrixClient.getRoom(roomId) ?: return@map false
+                                val room = matrixClient.getJoinedRoom(roomId) ?: return@map false
                                 val mediaSender = MediaSender(
                                     preProcessor = mediaPreProcessor,
                                     room = room,
@@ -86,6 +86,7 @@ class SharePresenter @AssistedInject constructor(
                                         ).isSuccess
                                     }
                                     .all { it }
+                                    .also { room.destroy() }
                             }
                             .all { it }
                     }
@@ -93,7 +94,7 @@ class SharePresenter @AssistedInject constructor(
                 onPlainText = { text ->
                     roomIds
                         .map { roomId ->
-                            matrixClient.getRoom(roomId)?.sendMessage(
+                            matrixClient.getJoinedRoom(roomId)?.sendMessage(
                                 body = text,
                                 htmlBody = null,
                                 intentionalMentions = emptyList(),
diff --git a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
index 66cb147158..7a49982e2b 100644
--- a/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
+++ b/features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
@@ -23,7 +23,7 @@ import io.element.android.libraries.matrix.test.A_MESSAGE
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaupload.api.MediaPreProcessor
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
@@ -90,11 +90,11 @@ class SharePresenterTest {
 
     @Test
     fun `present - send text ok`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             sendMessageResult = { _, _, _ -> Result.success(Unit) },
         )
         val matrixClient = FakeMatrixClient().apply {
-            givenGetRoomResult(A_ROOM_ID, matrixRoom)
+            givenGetRoomResult(A_ROOM_ID, joinedRoom)
         }
         val presenter = createSharePresenter(
             matrixClient = matrixClient,
@@ -121,11 +121,11 @@ class SharePresenterTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             sendFileResult = sendFileResult,
         )
         val matrixClient = FakeMatrixClient().apply {
-            givenGetRoomResult(A_ROOM_ID, matrixRoom)
+            givenGetRoomResult(A_ROOM_ID, joinedRoom)
         }
         val presenter = createSharePresenter(
             matrixClient = matrixClient,
diff --git a/features/signedout/impl/src/main/res/values-cy/translations.xml b/features/signedout/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..520a22d8fc
--- /dev/null
+++ b/features/signedout/impl/src/main/res/values-cy/translations.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_signed_out_reason_1">"Rydych chi wedi newid eich cyfrinair yn ystod sesiwn arall"</string>
+  <string name="screen_signed_out_reason_2">"Rydych chi wedi dileu\'r sesiwn o sesiwn arall"</string>
+  <string name="screen_signed_out_reason_3">"Mae gweinyddwr eich gweinydd wedi annilysu eich mynediad"</string>
+  <string name="screen_signed_out_subtitle">"Efallai eich bod wedi cael eich allgofnodi am un o\'r rhesymau sy\'n cael eu rhestru isod. Mewngofnodwch eto i barhau i ddefnyddio %s."</string>
+  <string name="screen_signed_out_title">"Rydych wedi\'ch allgofnodi"</string>
+</resources>
diff --git a/features/signedout/impl/src/main/res/values-es/translations.xml b/features/signedout/impl/src/main/res/values-es/translations.xml
index b4ec370c95..2044f70efe 100644
--- a/features/signedout/impl/src/main/res/values-es/translations.xml
+++ b/features/signedout/impl/src/main/res/values-es/translations.xml
@@ -3,6 +3,6 @@
   <string name="screen_signed_out_reason_1">"Has cambiado tu contraseña en otra sesión"</string>
   <string name="screen_signed_out_reason_2">"Has eliminado la sesión desde otra sesión"</string>
   <string name="screen_signed_out_reason_3">"El administrador de tu servidor ha invalidado su acceso"</string>
-  <string name="screen_signed_out_subtitle">"Es posible que haya cerrado sesión por uno de los motivos que se enumeran a continuación. Por favor inicia sesión nuevamente para continuar usando %s ."</string>
+  <string name="screen_signed_out_subtitle">"Es posible que haya cerrado sesión por uno de los motivos que se enumeran a continuación. Por favor inicia sesión nuevamente para continuar usando %s."</string>
   <string name="screen_signed_out_title">"Has cerrado sesión"</string>
 </resources>
diff --git a/features/signedout/impl/src/main/res/values-uz/translations.xml b/features/signedout/impl/src/main/res/values-uz/translations.xml
index bb386ee54f..3d25b05179 100644
--- a/features/signedout/impl/src/main/res/values-uz/translations.xml
+++ b/features/signedout/impl/src/main/res/values-uz/translations.xml
@@ -3,6 +3,6 @@
   <string name="screen_signed_out_reason_1">"Siz boshqa seansda parolingizni o\'zgartirdingiz"</string>
   <string name="screen_signed_out_reason_2">"Siz seansni boshqa seansdan o\'chirib tashladingiz"</string>
   <string name="screen_signed_out_reason_3">"Serveringiz administratori ruxsatingizni bekor qildi"</string>
-  <string name="screen_signed_out_subtitle">"Siz quyida sanab o‘tilgan sabablardan biri tufayli tizimdan chiqqan bo‘lishingiz mumkin. Foydalanishni davom ettirish uchun qayta kiring%s ."</string>
+  <string name="screen_signed_out_subtitle">"Siz quyida sanab o‘tilgan sabablardan biri tufayli tizimdan chiqqan bo‘lishingiz mumkin. Foydalanishni davom ettirish uchun qayta kiring%s."</string>
   <string name="screen_signed_out_title">"Hisobingizdan chiqdingiz"</string>
 </resources>
diff --git a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
index 5a843bad81..76464b973c 100644
--- a/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
+++ b/features/userprofile/impl/src/test/kotlin/io/element/android/features/userprofile/impl/UserProfilePresenterTest.kt
@@ -34,7 +34,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.ui.components.aMatrixUser
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.awaitLastSequentialItem
@@ -122,7 +122,7 @@ class UserProfilePresenterTest {
         canFindRoom: Boolean = true,
         expectedResult: Boolean,
     ) = runTest {
-        val room = FakeMatrixRoom(
+        val room = FakeBaseRoom(
             canUserJoinCallResult = { canUserJoinCallResult },
         )
         val client = createFakeMatrixClient().apply {
diff --git a/features/userprofile/shared/src/main/res/values-cy/translations.xml b/features/userprofile/shared/src/main/res/values-cy/translations.xml
index 3e936f7a76..5fe1fa7cc7 100644
--- a/features/userprofile/shared/src/main/res/values-cy/translations.xml
+++ b/features/userprofile/shared/src/main/res/values-cy/translations.xml
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_dm_details_block_alert_action">"Rhwystro"</string>
+  <string name="screen_dm_details_block_alert_description">"Fydd defnyddwyr sydd wedi\'u rhwystro ddim yn gallu anfon negeseuon atoch a bydd eu holl negeseuon yn cael eu cuddio. Gallwch eu dadrwystro unrhyw bryd."</string>
   <string name="screen_dm_details_block_user">"Rhwystro defnyddiwr"</string>
   <string name="screen_dm_details_unblock_alert_action">"Dad-rwystro"</string>
+  <string name="screen_dm_details_unblock_alert_description">"Byddwch yn gallu gweld pob neges oddi wrthyn nhw eto."</string>
+  <string name="screen_dm_details_unblock_user">"Dadrwystro defnyddiwr"</string>
   <string name="screen_room_member_details_block_alert_action">"Rhwystro"</string>
+  <string name="screen_room_member_details_block_alert_description">"Fydd defnyddwyr sydd wedi\'u rhwystro ddim yn gallu anfon negeseuon atoch a bydd eu holl negeseuon yn cael eu cuddio. Gallwch eu dadrwystro unrhyw bryd."</string>
   <string name="screen_room_member_details_block_user">"Rhwystro defnyddiwr"</string>
   <string name="screen_room_member_details_title">"Proffil"</string>
   <string name="screen_room_member_details_unblock_alert_action">"Dad-rwystro"</string>
+  <string name="screen_room_member_details_unblock_alert_description">"Byddwch yn gallu gweld pob neges oddi wrthyn nhw eto."</string>
+  <string name="screen_room_member_details_unblock_user">"Dadrwystro defnyddiwr"</string>
+  <string name="screen_room_member_details_verify_button_subtitle">"Defnyddiwch yr ap gwe i ddilysu\'r defnyddiwr hwn."</string>
+  <string name="screen_room_member_details_verify_button_title">"Dilysu %1$s"</string>
+  <string name="screen_start_chat_error_starting_chat">"Digwyddodd gwall wrth geisio cychwyn sgwrs"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-cy/translations.xml b/features/verifysession/impl/src/main/res/values-cy/translations.xml
index 2e7e3a1024..eff8ac87d9 100644
--- a/features/verifysession/impl/src/main/res/values-cy/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-cy/translations.xml
@@ -1,5 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_identity_confirmation_cannot_confirm">"Methu cadarnhau?"</string>
+  <string name="screen_identity_confirmation_create_new_recovery_key">"Crëwch allwedd adfer newydd"</string>
+  <string name="screen_identity_confirmation_subtitle">"Dilyswch y ddyfais hon er mwyn gosod negeseuon diogel."</string>
+  <string name="screen_identity_confirmation_title">"Cadarnhewch eich hunaniaeth"</string>
+  <string name="screen_identity_confirmation_use_another_device">"Defnyddiwch ddyfais arall"</string>
+  <string name="screen_identity_confirmation_use_recovery_key">"Defnyddiwch allwedd adfer"</string>
+  <string name="screen_identity_confirmed_subtitle">"Nawr gallwch chi ddarllen neu anfon negeseuon yn ddiogel, a gall unrhyw un rydych chi\'n sgwrsio â nhw ymddiried yn y ddyfais hon hefyd."</string>
+  <string name="screen_identity_confirmed_title">"Dyfais wedi\'i dilysu"</string>
+  <string name="screen_identity_use_another_device">"Defnyddiwch ddyfais arall"</string>
+  <string name="screen_identity_waiting_on_other_device">"Yn aros ar ddyfais arall…"</string>
+  <string name="screen_session_verification_cancelled_subtitle">"Mae rhywbeth i weld o\'i le. Naill ai daeth y cais i ben neu cafodd y cais ei wrthod."</string>
+  <string name="screen_session_verification_compare_emojis_subtitle">"Cadarnhewch fod yr emojis isod yn cyd-fynd â\'r rhai sy\'n cael eu dangos ar eich sesiwn arall."</string>
+  <string name="screen_session_verification_compare_emojis_title">"Cymharwch emojis"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Cadarnhewch fod yr emojis isod yn cyd-fynd â\'r rhai sy\'n cael eu dangos ar ddyfais y defnyddiwr arall."</string>
+  <string name="screen_session_verification_compare_numbers_subtitle">"Cadarnhewch fod y rhifau isod yn cyfateb i\'r rhai sy\'n cael eu dangos ar eich sesiwn arall."</string>
+  <string name="screen_session_verification_compare_numbers_title">"Cymharwch rifau"</string>
+  <string name="screen_session_verification_complete_subtitle">"Mae eich sesiwn newydd bellach wedi\'i dilysu. Mae ganddo fynediad i\'ch negeseuon wedi\'u hamgryptio, a bydd defnyddwyr eraill yn ei ystyried yn rhai y mae modd ymddiried ynddyn nhw."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Nawr gallwch ymddiried yn hunaniaeth y defnyddiwr hwn wrth anfon neu dderbyn negeseuon."</string>
+  <string name="screen_session_verification_enter_recovery_key">"Rhowch eich allwedd adfer"</string>
+  <string name="screen_session_verification_failed_subtitle">"Naill ai daeth y cais i ben, gwrthodwyd y cais, neu roedd diffyg cyfatebiaeth dilysu."</string>
+  <string name="screen_session_verification_open_existing_session_subtitle">"Profwch mai chi sydd yno i gael mynediad at eich hanes negeseuon wedi\'u hamgryptio."</string>
+  <string name="screen_session_verification_open_existing_session_title">"Agor sesiwn sy\'n bodoli eisoes"</string>
+  <string name="screen_session_verification_positive_button_canceled">"Rhowch gynnig arall ar ddilysu"</string>
+  <string name="screen_session_verification_positive_button_initial">"Rwy\'n barod"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"Aros i gyfateb…"</string>
+  <string name="screen_session_verification_ready_subtitle">"Cymharwch set unigryw o emojis."</string>
+  <string name="screen_session_verification_request_accepted_subtitle">"Cymharwch yr emoji unigryw, gan sicrhau eu bod yn ymddangos yn yr un drefn."</string>
   <string name="screen_session_verification_request_details_timestamp">"Mewngofnodwyd"</string>
+  <string name="screen_session_verification_request_failure_subtitle">"Naill ai daeth y cais i ben, gwrthodwyd y cais, neu roedd diffyg cyfatebiaeth dilysu."</string>
   <string name="screen_session_verification_request_failure_title">"Methodd y gwirio"</string>
+  <string name="screen_session_verification_request_footer">"Parhewch dim ond os taw chi gychwynodd y dilysiad hwn."</string>
+  <string name="screen_session_verification_request_subtitle">"Dilyswch y ddyfais arall i gadw hanes eich neges yn ddiogel."</string>
+  <string name="screen_session_verification_request_success_subtitle">"Nawr gallwch chi ddarllen neu anfon negeseuon yn ddiogel ar eich dyfais arall."</string>
+  <string name="screen_session_verification_request_success_title">"Dyfais wedi\'i dilysu"</string>
+  <string name="screen_session_verification_request_title">"Gofynnwyd am ddilysiad"</string>
+  <string name="screen_session_verification_they_dont_match">"Dy\'n nhw ddim yn cyfateb"</string>
+  <string name="screen_session_verification_they_match">"Maen nhw\'n cyfateb"</string>
+  <string name="screen_session_verification_use_another_device_subtitle">"Gwnewch yn siŵr fod gennych yr ap ar agor yn y ddyfais arall cyn dechrau dilysu o\'r fan hon."</string>
+  <string name="screen_session_verification_use_another_device_title">"Agorwch yr ap ar ddyfais arall sydd wedi\'i gwirio"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Er mwyn sicrhau diogelwch ychwanegol, gwiriwch y defnyddiwr hwn trwy gymharu set o emojis ar eich dyfeisiau. Gwnewch hyn trwy ddefnyddio ffordd ddibynadwy o gyfathrebu."</string>
+  <string name="screen_session_verification_user_initiator_title">"Dilysu\'r defnyddiwr hwn?"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Er mwyn diogelwch ychwanegol, mae defnyddiwr arall eisiau gwirio pwy ydych chi. Bydd set o emojis yn cael eu dangos i chi eu cymharu."</string>
+  <string name="screen_session_verification_waiting_another_device_subtitle">"Dylech weld llamlen ar y ddyfais arall. Dechreuwch y dilysiad o\'r fan honno nawr."</string>
+  <string name="screen_session_verification_waiting_another_device_title">"Cychwyn dilysu ar y ddyfais arall"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Yn aros am eich dyfais arall"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Yn aros am y defnyddiwr arall"</string>
+  <string name="screen_session_verification_waiting_subtitle">"Unwaith y byddwch wedi\'ch derbyn, byddwch yn gallu parhau â\'r dilysu."</string>
+  <string name="screen_session_verification_waiting_to_accept_subtitle">"Derbyniwch y cais i gychwyn y broses ddilysu yn eich sesiwn arall i barhau."</string>
+  <string name="screen_session_verification_waiting_to_accept_title">"Yn aros i dderbyn cais"</string>
+  <string name="screen_signout_in_progress_dialog_content">"Yn allgofnodi…"</string>
 </resources>
diff --git a/features/verifysession/impl/src/main/res/values-el/translations.xml b/features/verifysession/impl/src/main/res/values-el/translations.xml
index 06f3b25489..74e926f73d 100644
--- a/features/verifysession/impl/src/main/res/values-el/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-el/translations.xml
@@ -13,9 +13,11 @@
   <string name="screen_session_verification_cancelled_subtitle">"Κάτι δεν πάει καλά. Είτε το αίτημα έληξε είτε απορρίφθηκε."</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"Επιβεβαίωσε ότι τα παρακάτω emoji ταιριάζουν με αυτά που εμφανίζονται στην άλλη συνεδρία σου."</string>
   <string name="screen_session_verification_compare_emojis_title">"Σύγκριση emoji"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"Επιβεβαιώστε ότι τα παρακάτω emoji ταιριάζουν με αυτά που εμφανίζονται στη συσκευή του άλλου χρήστη."</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"Επιβεβαίωσε ότι οι παρακάτω αριθμοί ταιριάζουν με αυτούς που εμφανίζονται στην άλλη συνεδρία σου."</string>
   <string name="screen_session_verification_compare_numbers_title">"Σύγκριση αριθμών"</string>
   <string name="screen_session_verification_complete_subtitle">"Η νέα σου συνεδρία έχει πλέον επαληθευτεί. Έχει πρόσβαση στα κρυπτογραφημένα μηνύματά σας και άλλοι χρήστες θα το βλέπουν ως αξιόπιστο."</string>
+  <string name="screen_session_verification_complete_user_subtitle">"Τώρα μπορείτε να εμπιστευτείτε την ταυτότητα αυτού του χρήστη κατά την αποστολή ή τη λήψη μηνυμάτων."</string>
   <string name="screen_session_verification_enter_recovery_key">"Εισαγωγή κλειδιού ανάκτησης"</string>
   <string name="screen_session_verification_failed_subtitle">"Είτε το αίτημα έληξε είτε απορρίφθηκε είτε υπήρξε αναντιστοιχία επαλήθευσης."</string>
   <string name="screen_session_verification_open_existing_session_subtitle">"Απέδειξε ότι είσαι εσύ για να αποκτήσεις πρόσβαση στο κρυπτογραφημένο ιστορικό μηνυμάτων σου."</string>
@@ -37,8 +39,14 @@
   <string name="screen_session_verification_they_match">"Ταιριάζουν"</string>
   <string name="screen_session_verification_use_another_device_subtitle">"Βεβαιώσου ότι έχεις ανοιχτή την εφαρμογή στην άλλη συσκευή πριν ξεκινήσεις την επαλήθευση από εδώ."</string>
   <string name="screen_session_verification_use_another_device_title">"Άνοιξε την εφαρμογή σε άλλη επαληθευμένη συσκευή"</string>
+  <string name="screen_session_verification_user_initiator_subtitle">"Για επιπλέον ασφάλεια, επαληθεύστε αυτόν το χρήστη συγκρίνοντας ένα σύνολο emoji στις συσκευές σας. Κάντε το αυτό χρησιμοποιώντας έναν αξιόπιστο τρόπο επικοινωνίας."</string>
+  <string name="screen_session_verification_user_initiator_title">"Επαλήθευση αυτού του χρήστη;"</string>
+  <string name="screen_session_verification_user_responder_subtitle">"Για επιπλέον ασφάλεια, ένας άλλος χρήστης θέλει να επαληθεύσει την ταυτότητά σας. Θα σας εμφανιστεί μια σειρά από emojis για να τα συγκρίνετε."</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"Πρόκειται να δεις ένα αναδυόμενο παράθυρο στην άλλη συσκευή. Ξεκίνα την επαλήθευση από εκεί τώρα."</string>
   <string name="screen_session_verification_waiting_another_device_title">"Έναρξη επαλήθευσης στην άλλη συσκευή"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"Αναμονή για την άλλη συσκευή"</string>
+  <string name="screen_session_verification_waiting_other_user_title">"Αναμονή για τον άλλο χρήστη"</string>
+  <string name="screen_session_verification_waiting_subtitle">"Μόλις γίνει αποδεκτό, θα μπορείτε να συνεχίσετε με την επαλήθευση."</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"Αποδέξου το αίτημα για να ξεκινήσεις τη διαδικασία επαλήθευσης στην άλλη συνεδρία σου για να συνεχίσεις."</string>
   <string name="screen_session_verification_waiting_to_accept_title">"Αναμονή για αποδοχή αιτήματος"</string>
   <string name="screen_signout_in_progress_dialog_content">"Αποσύνδεση…"</string>
diff --git a/features/verifysession/impl/src/main/res/values-fa/translations.xml b/features/verifysession/impl/src/main/res/values-fa/translations.xml
index 14936c41a9..1df9148763 100644
--- a/features/verifysession/impl/src/main/res/values-fa/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-fa/translations.xml
@@ -17,9 +17,10 @@
   <string name="screen_session_verification_open_existing_session_title">"گشودن نشستی موجود"</string>
   <string name="screen_session_verification_positive_button_canceled">"تلاش برای تأیید دوباره"</string>
   <string name="screen_session_verification_positive_button_initial">"آماده‌ام"</string>
-  <string name="screen_session_verification_positive_button_verifying_ongoing">"منتظر تطابق"</string>
+  <string name="screen_session_verification_positive_button_verifying_ongoing">"منتظر تطابق…"</string>
   <string name="screen_session_verification_ready_subtitle">"مقایسهٔ مجموعه‌ای یکتا از شکلک‌ها."</string>
   <string name="screen_session_verification_request_accepted_subtitle">"شکلک‌ها را مقایسه کنید، از ترتیب نمایش آنان نیز مطمئن شوید."</string>
+  <string name="screen_session_verification_request_failure_title">"صحت‌سنجی شکست خورد"</string>
   <string name="screen_session_verification_request_success_title">"افزاره تأیید شده"</string>
   <string name="screen_session_verification_they_dont_match">"مطابق نیستند"</string>
   <string name="screen_session_verification_they_match">"مطابقند"</string>
diff --git a/features/verifysession/impl/src/main/res/values-zh/translations.xml b/features/verifysession/impl/src/main/res/values-zh/translations.xml
index 8a606a38f5..fceaef0572 100644
--- a/features/verifysession/impl/src/main/res/values-zh/translations.xml
+++ b/features/verifysession/impl/src/main/res/values-zh/translations.xml
@@ -13,9 +13,11 @@
   <string name="screen_session_verification_cancelled_subtitle">"发生了一些错误。网络请求超时，或者被服务器拒绝。"</string>
   <string name="screen_session_verification_compare_emojis_subtitle">"确认下方的表情符号与另一设备上显示的相同。"</string>
   <string name="screen_session_verification_compare_emojis_title">"比较表情符号"</string>
+  <string name="screen_session_verification_compare_emojis_user_subtitle">"请验证下方表情是否与对方设备显示一致"</string>
   <string name="screen_session_verification_compare_numbers_subtitle">"确认以下数字与其他会话中显示的一致。"</string>
   <string name="screen_session_verification_compare_numbers_title">"比较数字"</string>
   <string name="screen_session_verification_complete_subtitle">"新设备已经成功验证。现在新设备可以访问加密信息，其他用户也会信任这个设备。"</string>
+  <string name="screen_session_verification_complete_user_subtitle">"现在您可以在发送或接收消息时信任该用户的身份。"</string>
   <string name="screen_session_verification_enter_recovery_key">"输入恢复密钥"</string>
   <string name="screen_session_verification_failed_subtitle">"要么请求超时，要么请求被拒绝，要么验证不匹配。"</string>
   <string name="screen_session_verification_open_existing_session_subtitle">"证明自己的身份以访问加密历史消息。"</string>
@@ -39,6 +41,7 @@
   <string name="screen_session_verification_use_another_device_title">"在另一台验证的设备上打开应用"</string>
   <string name="screen_session_verification_waiting_another_device_subtitle">"您应该会在另一台设备上看到一个弹出窗口。现在从那里开始验证。"</string>
   <string name="screen_session_verification_waiting_another_device_title">"在另一台设备上开始验证"</string>
+  <string name="screen_session_verification_waiting_other_device_title">"正在等待其他设备"</string>
   <string name="screen_session_verification_waiting_to_accept_subtitle">"请在其他会话中接受验证请求。"</string>
   <string name="screen_session_verification_waiting_to_accept_title">"等待接受请求"</string>
   <string name="screen_signout_in_progress_dialog_content">"正在登出…"</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d95511c4be..1a94aa4ec1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@
 android_gradle_plugin = "8.9.2"
 kotlin = "2.1.20"
 kotlinpoet = "2.1.0"
-ksp = "2.1.20-2.0.0"
+ksp = "2.1.20-2.0.1"
 firebaseAppDistribution = "5.1.1"
 
 # AndroidX
@@ -27,7 +27,7 @@ composecompiler = "1.5.15"
 coroutines = "1.10.2"
 
 # Accompanist
-accompanist = "0.37.2"
+accompanist = "0.37.3"
 
 # Test
 test_core = "1.6.1"
@@ -45,7 +45,7 @@ wysiwyg = "2.38.3"
 telephoto = "0.15.1"
 
 # Dependency analysis
-dependencyAnalysis = "2.16.0"
+dependencyAnalysis = "2.17.0"
 
 # DI
 dagger = "2.56.2"
@@ -72,7 +72,7 @@ kover_gradle_plugin = { module = "org.jetbrains.kotlinx:kover-gradle-plugin", ve
 ksp_gradle_plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 gms_google_services = "com.google.gms:google-services:4.4.2"
 # https://firebase.google.com/docs/android/setup#available-libraries
-google_firebase_bom = "com.google.firebase:firebase-bom:33.12.0"
+google_firebase_bom = "com.google.firebase:firebase-bom:33.13.0"
 firebase_appdistribution_gradle = { module = "com.google.firebase:firebase-appdistribution-gradle", version.ref = "firebaseAppDistribution" }
 autonomousapps_dependencyanalysis_plugin = { module = "com.autonomousapps:dependency-analysis-gradle-plugin", version.ref = "dependencyAnalysis" }
 ksp_plugin = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
@@ -84,7 +84,7 @@ androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" }
 androidx_annotationjvm = "androidx.annotation:annotation-jvm:1.9.1"
 androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 androidx_datastore_datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
-androidx_exifinterface = "androidx.exifinterface:exifinterface:1.4.0"
+androidx_exifinterface = "androidx.exifinterface:exifinterface:1.4.1"
 androidx_constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
 androidx_constraintlayout_compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayout_compose" }
 androidx_camera_lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
@@ -144,14 +144,14 @@ test_corektx = { module = "androidx.test:core-ktx", version.ref = "test_core" }
 test_arch_core = "androidx.arch.core:core-testing:2.2.0"
 test_junit = "junit:junit:4.13.2"
 test_runner = "androidx.test:runner:1.6.2"
-test_mockk = "io.mockk:mockk:1.14.0"
+test_mockk = "io.mockk:mockk:1.14.2"
 test_konsist = "com.lemonappdev:konsist:0.17.3"
 test_turbine = "app.cash.turbine:turbine:1.2.0"
 test_truth = "com.google.truth:truth:1.4.4"
 test_parameter_injector = "com.google.testparameterinjector:test-parameter-injector:1.18"
 test_robolectric = "org.robolectric:robolectric:4.14.1"
 test_appyx_junit = { module = "com.bumble.appyx:testing-junit4", version.ref = "appyx" }
-test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.5.1"
+test_composable_preview_scanner = "io.github.sergio-sastre.ComposablePreviewScanner:android:0.6.1"
 
 # Others
 coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }
@@ -165,11 +165,11 @@ serialization_json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-jso
 kotlinx_collections_immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8"
 showkase = { module = "com.airbnb.android:showkase", version.ref = "showkase" }
 showkase_processor = { module = "com.airbnb.android:showkase-processor", version.ref = "showkase" }
-jsoup = "org.jsoup:jsoup:1.19.1"
+jsoup = "org.jsoup:jsoup:1.20.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.4.22"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.5.6"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
@@ -183,15 +183,15 @@ vanniktech_blurhash = "com.vanniktech:blurhash:0.3.0"
 telephoto_zoomableimage = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }
 telephoto_flick = { module = "me.saket.telephoto:flick-android", version.ref = "telephoto" }
 statemachine = "com.freeletics.flowredux:compose:1.2.2"
-maplibre = "org.maplibre.gl:android-sdk:11.8.6"
+maplibre = "org.maplibre.gl:android-sdk:11.8.7"
 maplibre_ktx = "org.maplibre.gl:android-sdk-ktx-v7:3.0.2"
 maplibre_annotation = "org.maplibre.gl:android-plugin-annotation-v9:3.0.2"
 opusencoder = "io.element.android:opusencoder:1.1.0"
 zxing_cpp = "io.github.zxing-cpp:android:2.3.0"
 
 # Analytics
-posthog = "com.posthog:posthog-android:3.14.0"
-sentry = "io.sentry:sentry-android:8.8.0"
+posthog = "com.posthog:posthog-android:3.14.1"
+sentry = "io.sentry:sentry-android:8.11.1"
 # main branch can be tested replacing the version with main-SNAPSHOT
 matrix_analytics_events = "com.github.matrix-org:matrix-analytics-events:0.28.0"
 
@@ -207,7 +207,7 @@ anvil_compiler_api = { module = "dev.zacsweers.anvil:compiler-api", version.ref
 anvil_compiler_utils = { module = "dev.zacsweers.anvil:compiler-utils", version.ref = "anvil" }
 
 # Element Call
-element_call_embedded = "io.element.android:element-call-embedded:0.9.0"
+element_call_embedded = "io.element.android:element-call-embedded:0.10.0"
 
 # Auto services
 google_autoservice = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
diff --git a/libraries/dateformatter/impl/src/main/res/values-fa/translations.xml b/libraries/dateformatter/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..da6566ef3a
--- /dev/null
+++ b/libraries/dateformatter/impl/src/main/res/values-fa/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="common_date_date_at_time">"%1$s در %2$s"</string>
+  <string name="common_date_this_month">"این ماه"</string>
+</resources>
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
index 8127fc43ac..5eb099bcd4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/atoms/ElementLogoAtom.kt
@@ -10,7 +10,6 @@ package io.element.android.libraries.designsystem.atomic.atoms
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
@@ -38,7 +37,7 @@ fun ElementLogoAtom(
     size: ElementLogoAtomSize,
     modifier: Modifier = Modifier,
     useBlurredShadow: Boolean = canUseBlurMaskFilter(),
-    darkTheme: Boolean = isSystemInDarkTheme(),
+    darkTheme: Boolean = ElementTheme.isLightTheme.not(),
 ) {
     val blur = if (darkTheme) 160.dp else 24.dp
     val shadowColor = if (darkTheme) size.shadowColorDark else size.shadowColorLight
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt
index 2eb2f133e1..0b3ca7fd8b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/InfoListItemMolecule.kt
@@ -8,7 +8,6 @@
 package io.element.android.libraries.designsystem.atomic.molecules
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -20,6 +19,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
@@ -62,7 +62,7 @@ fun InfoListItemMolecule(
 @Composable
 internal fun InfoListItemMoleculePreview() {
     ElementPreview {
-        val color = if (isSystemInDarkTheme()) Color.DarkGray else Color.LightGray
+        val color = ElementTheme.colors.bgSubtleSecondary
         Column(
             modifier = Modifier.padding(10.dp),
             verticalArrangement = Arrangement.spacedBy(8.dp),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt
index 28a4457961..aeb8b5ba65 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/organisms/InfoListOrganism.kt
@@ -111,7 +111,6 @@ internal fun InfoListOrganismPreview() = ElementPreview {
         InfoListItem(message = "A bottom item"),
     )
     InfoListOrganism(
-        items,
-        backgroundColor = ElementTheme.materialColors.surfaceVariant,
+        items = items,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
index 8ea58deb40..b4830e0904 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/background/OnboardingBackground.kt
@@ -8,6 +8,7 @@
 package io.element.android.libraries.designsystem.background
 
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -32,13 +33,17 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 @Suppress("ModifierMissing")
 @Composable
 fun OnboardingBackground() {
-    Box(modifier = Modifier.fillMaxSize()) {
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(ElementTheme.colors.bgCanvasDefault)
+    ) {
         val isLightTheme = ElementTheme.isLightTheme
         Canvas(
             modifier = Modifier
-            .fillMaxWidth()
-            .height(220.dp)
-            .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .height(220.dp)
+                .align(Alignment.BottomCenter)
         ) {
             val gradientBrush = ShaderBrush(
                 LinearGradientShader(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
index 490fdfd9d6..41cef050ff 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/CheckboxListItem.kt
@@ -29,7 +29,11 @@ fun CheckboxListItem(
         modifier = modifier,
         headlineContent = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
-        leadingContent = ListItemContent.Checkbox(checked, null, enabled, compact = compactLayout),
+        leadingContent = ListItemContent.Checkbox(
+            checked = checked,
+            enabled = enabled,
+            compact = compactLayout,
+        ),
         trailingContent = trailingContent,
         style = style,
         enabled = enabled,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
index 54d1ea738e..5b9efc51c8 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/ListItemContent.kt
@@ -37,26 +37,22 @@ sealed interface ListItemContent {
     /**
      * Default Switch content for [ListItem].
      * @param checked The current state of the switch.
-     * @param onChange Callback when the switch is toggled: it should only be set to override the default click behaviour in the [ListItem].
      * @param enabled Whether the switch is enabled or not.
      */
     data class Switch(
         val checked: Boolean,
-        val onChange: ((Boolean) -> Unit)? = null,
         val enabled: Boolean = true
     ) : ListItemContent
 
     /**
      * Default Checkbox content for [ListItem].
      * @param checked The current state of the checkbox.
-     * @param onChange Callback when the checkbox is toggled: it should only be set to override the default click behaviour in the [ListItem].
      * @param enabled Whether the checkbox is enabled or not.
      * @param compact Reduces the size of the component to make the wrapping [ListItem] smaller.
      * This is especially useful when the [ListItem] is used inside a Dialog. `false` by default.
      */
     data class Checkbox(
         val checked: Boolean,
-        val onChange: ((Boolean) -> Unit)? = null,
         val enabled: Boolean = true,
         val compact: Boolean = false
     ) : ListItemContent
@@ -64,14 +60,12 @@ sealed interface ListItemContent {
     /**
      * Default RadioButton content for [ListItem].
      * @param selected The current state of the radio button.
-     * @param onClick Callback when the radio button is toggled: it should only be set to override the default click behaviour in the [ListItem].
      * @param enabled Whether the radio button is enabled or not.
      * @param compact Reduces the size of the component to make the wrapping [ListItem] smaller.
      * This is especially useful when the [ListItem] is used inside a Dialog. `false` by default.
      */
     data class RadioButton(
         val selected: Boolean,
-        val onClick: (() -> Unit)? = null,
         val enabled: Boolean = true,
         val compact: Boolean = false
     ) : ListItemContent
@@ -99,24 +93,24 @@ sealed interface ListItemContent {
     data class Counter(val count: Int) : ListItemContent
 
     @Composable
-    fun View() {
+    fun View(isItemEnabled: Boolean) {
         when (this) {
             is Switch -> SwitchComponent(
                 checked = checked,
-                onCheckedChange = onChange,
-                enabled = enabled
+                onCheckedChange = null,
+                enabled = enabled && isItemEnabled,
             )
             is Checkbox -> CheckboxComponent(
                 modifier = if (compact) Modifier.size(maxCompactSize) else Modifier,
                 checked = checked,
-                onCheckedChange = onChange,
-                enabled = enabled
+                onCheckedChange = null,
+                enabled = enabled && isItemEnabled,
             )
             is RadioButton -> RadioButtonComponent(
                 modifier = if (compact) Modifier.size(maxCompactSize) else Modifier,
                 selected = selected,
-                onClick = onClick,
-                enabled = enabled
+                onClick = null,
+                enabled = enabled && isItemEnabled,
             )
             is Icon -> {
                 IconComponent(
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
index d711fd54d4..9cbfe2edda 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
@@ -29,7 +29,11 @@ fun RadioButtonListItem(
         modifier = modifier,
         headlineContent = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
-        leadingContent = ListItemContent.RadioButton(selected, null, enabled, compact = compactLayout),
+        leadingContent = ListItemContent.RadioButton(
+            selected = selected,
+            enabled = enabled,
+            compact = compactLayout,
+        ),
         trailingContent = trailingContent,
         style = style,
         enabled = enabled,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
index 3db9d8e7f7..070e112736 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SwitchListItem.kt
@@ -29,7 +29,10 @@ fun SwitchListItem(
         headlineContent = { Text(headline) },
         supportingContent = supportingText?.let { @Composable { Text(it) } },
         leadingContent = leadingContent,
-        trailingContent = ListItemContent.Switch(value, null, enabled),
+        trailingContent = ListItemContent.Switch(
+            checked = value,
+            enabled = enabled,
+        ),
         style = style,
         enabled = enabled,
         onClick = { onChange(!value) },
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
index 8ba3c9ca59..f70b87e812 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceCheckbox.kt
@@ -65,6 +65,7 @@ fun PreferenceCheckbox(
             checked = isChecked,
             enabled = enabled,
         ),
+        enabled = enabled,
     )
 }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
index d43c312066..426bd975a4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
@@ -9,6 +9,8 @@ package io.element.android.libraries.designsystem.theme.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.selection.toggleable
 import androidx.compose.material3.ListItemColors
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.LocalContentColor
@@ -16,12 +18,9 @@ import androidx.compose.material3.LocalTextStyle
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -135,7 +134,7 @@ fun ListItem(
             CompositionLocalProvider(
                 LocalContentColor provides leadingContentColor,
             ) {
-                content.View()
+                content.View(isItemEnabled = enabled)
             }
         }
     }
@@ -145,7 +144,7 @@ fun ListItem(
                 LocalTextStyle provides ElementTheme.typography.fontBodyMdRegular,
                 LocalContentColor provides trailingContentColor,
             ) {
-                content.View()
+                content.View(isItemEnabled = enabled)
             }
         }
     }
@@ -158,7 +157,12 @@ fun ListItem(
                 .then(modifier)
         } else {
             modifier
-        },
+        }
+            .withAccessibilityModifier(
+                content = trailingContent ?: leadingContent,
+                enabled = enabled || alwaysClickable,
+                onClick = onClick,
+            ),
         overlineContent = null,
         supportingContent = decoratedSupportingContent,
         leadingContent = decoratedLeadingContent,
@@ -169,6 +173,45 @@ fun ListItem(
     )
 }
 
+private fun Modifier.withAccessibilityModifier(
+    content: ListItemContent?,
+    enabled: Boolean,
+    onClick: (() -> Unit)?,
+): Modifier = then(
+    when (content) {
+        is ListItemContent.Checkbox -> {
+            Modifier.toggleable(
+                value = content.checked,
+                role = Role.Checkbox,
+                enabled = content.enabled && enabled,
+                onValueChange = { onClick?.invoke() }
+            )
+        }
+        is ListItemContent.Switch -> {
+            Modifier.toggleable(
+                value = content.checked,
+                role = Role.Switch,
+                enabled = content.enabled && enabled,
+                onValueChange = { onClick?.invoke() }
+            )
+        }
+        is ListItemContent.RadioButton -> {
+            Modifier.selectable(
+                selected = content.selected,
+                role = Role.RadioButton,
+                enabled = content.enabled && enabled,
+                onClick = { onClick?.invoke() }
+            )
+        }
+        ListItemContent.Badge,
+        is ListItemContent.Custom,
+        is ListItemContent.Icon,
+        is ListItemContent.Text,
+        is ListItemContent.Counter,
+        null -> Modifier
+    }
+)
+
 /**
  * The style to use for a [ListItem].
  */
@@ -546,20 +589,17 @@ private object PreviewItems {
 
     @Composable
     fun checkbox(): ListItemContent {
-        var checked by remember { mutableStateOf(false) }
-        return ListItemContent.Checkbox(checked = checked, onChange = { checked = !checked })
+        return ListItemContent.Checkbox(checked = false)
     }
 
     @Composable
     fun radioButton(): ListItemContent {
-        var checked by remember { mutableStateOf(false) }
-        return ListItemContent.RadioButton(selected = checked, onClick = { checked = !checked })
+        return ListItemContent.RadioButton(selected = false)
     }
 
     @Composable
     fun switch(): ListItemContent {
-        var checked by remember { mutableStateOf(false) }
-        return ListItemContent.Switch(checked = checked, onChange = { checked = !checked })
+        return ListItemContent.Switch(checked = false)
     }
 
     @Composable
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
index 6a7d9b0d73..558cbea653 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListSupportingText.kt
@@ -164,7 +164,7 @@ internal fun ListSupportingTextSmallPaddingPreview() {
 internal fun ListSupportingTextLargePaddingPreview() {
     ElementThemedPreview {
         Column {
-            ListItem(headlineContent = { Text("A title") }, leadingContent = ListItemContent.Switch(checked = true, onChange = {}))
+            ListItem(headlineContent = { Text("A title") }, leadingContent = ListItemContent.Switch(checked = true))
             ListSupportingText(
                 text = "Supporting line text lorem ipsum dolor sit amet, consectetur. Read more",
                 contentPadding = ListSupportingTextDefaults.Padding.LargeLeadingContent,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
index 45de16d984..64d5672b38 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Scaffold.kt
@@ -10,12 +10,12 @@ package io.element.android.libraries.designsystem.theme.components
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.material3.FabPosition
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ScaffoldDefaults
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import io.element.android.compound.theme.ElementTheme
 
 @Composable
 fun Scaffold(
@@ -25,7 +25,7 @@ fun Scaffold(
     snackbarHost: @Composable () -> Unit = {},
     floatingActionButton: @Composable () -> Unit = {},
     floatingActionButtonPosition: FabPosition = FabPosition.End,
-    containerColor: Color = MaterialTheme.colorScheme.background,
+    containerColor: Color = ElementTheme.colors.bgCanvasDefault,
     contentColor: Color = contentColorFor(containerColor),
     contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
     content: @Composable (PaddingValues) -> Unit
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
index 4e920ea265..5d6e695b7c 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
@@ -26,6 +26,7 @@ class RoomMembershipContentFormatter @Inject constructor(
         val userId = membershipContent.userId
         val memberIsYou = matrixClient.isMe(userId)
         val userDisplayNameOrId = membershipContent.userDisplayName ?: userId.value
+        val reason = membershipContent.reason?.takeIf { it.isNotBlank() }
         return when (membershipContent.change) {
             MembershipChange.JOINED -> if (memberIsYou) {
                 sp.getString(R.string.state_event_room_join_by_you)
@@ -38,9 +39,17 @@ class RoomMembershipContentFormatter @Inject constructor(
                 sp.getString(R.string.state_event_room_leave, senderDisambiguatedDisplayName)
             }
             MembershipChange.BANNED, MembershipChange.KICKED_AND_BANNED -> if (senderIsYou) {
-                sp.getString(R.string.state_event_room_ban_by_you, userDisplayNameOrId)
+                if (reason != null) {
+                    sp.getString(R.string.state_event_room_ban_by_you_with_reason, userDisplayNameOrId, reason)
+                } else {
+                    sp.getString(R.string.state_event_room_ban_by_you, userDisplayNameOrId)
+                }
             } else {
-                sp.getString(R.string.state_event_room_ban, senderDisambiguatedDisplayName, userDisplayNameOrId)
+                if (reason != null) {
+                    sp.getString(R.string.state_event_room_ban_with_reason, senderDisambiguatedDisplayName, userDisplayNameOrId, reason)
+                } else {
+                    sp.getString(R.string.state_event_room_ban, senderDisambiguatedDisplayName, userDisplayNameOrId)
+                }
             }
             MembershipChange.UNBANNED -> if (senderIsYou) {
                 sp.getString(R.string.state_event_room_unban_by_you, userDisplayNameOrId)
@@ -48,9 +57,17 @@ class RoomMembershipContentFormatter @Inject constructor(
                 sp.getString(R.string.state_event_room_unban, senderDisambiguatedDisplayName, userDisplayNameOrId)
             }
             MembershipChange.KICKED -> if (senderIsYou) {
-                sp.getString(R.string.state_event_room_remove_by_you, userDisplayNameOrId)
+                if (reason != null) {
+                    sp.getString(R.string.state_event_room_remove_by_you_with_reason, userDisplayNameOrId, reason)
+                } else {
+                    sp.getString(R.string.state_event_room_remove_by_you, userDisplayNameOrId)
+                }
             } else {
-                sp.getString(R.string.state_event_room_remove, senderDisambiguatedDisplayName, userDisplayNameOrId)
+                if (reason != null) {
+                    sp.getString(R.string.state_event_room_remove_with_reason, senderDisambiguatedDisplayName, userDisplayNameOrId, reason)
+                } else {
+                    sp.getString(R.string.state_event_room_remove, senderDisambiguatedDisplayName, userDisplayNameOrId)
+                }
             }
             MembershipChange.INVITED -> if (senderIsYou) {
                 sp.getString(R.string.state_event_room_invite_by_you, userDisplayNameOrId)
diff --git a/libraries/eventformatter/impl/src/main/res/values-be/translations.xml b/libraries/eventformatter/impl/src/main/res/values-be/translations.xml
index 5f1722ad1a..78ca6d5b15 100644
--- a/libraries/eventformatter/impl/src/main/res/values-be/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-be/translations.xml
@@ -28,7 +28,7 @@
   <string name="state_event_room_invite_you">"%1$s запрасіў(-ла) вас"</string>
   <string name="state_event_room_join">"%1$s далучыўся(-лась) да пакоя"</string>
   <string name="state_event_room_join_by_you">"Вы далучыліся да пакоя"</string>
-  <string name="state_event_room_knock">"%1$s прасіў(-ла) далучыцца"</string>
+  <string name="state_event_room_knock">"%1$sпросіць далучыцца"</string>
   <string name="state_event_room_knock_accepted">"%1$s дазволіў(-ла) %2$s далучыцца"</string>
   <string name="state_event_room_knock_accepted_by_you">"Вы дазволілі %1$s далучыцца"</string>
   <string name="state_event_room_knock_by_you">"Вы прасілі далучыцца"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-cs/translations.xml b/libraries/eventformatter/impl/src/main/res/values-cs/translations.xml
index d526b96815..98a5bd2b20 100644
--- a/libraries/eventformatter/impl/src/main/res/values-cs/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-cs/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Odstranili jste obrázek místnosti"</string>
   <string name="state_event_room_ban">"%1$s vykázal(a) %2$s"</string>
   <string name="state_event_room_ban_by_you">"Vykázali jste %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Vykázali jste %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s vykázal(a) %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s založil(a) místnost"</string>
   <string name="state_event_room_created_by_you">"Založili jste místnost"</string>
   <string name="state_event_room_invite">"%1$s pozval(a) %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Odmítli jste pozvání"</string>
   <string name="state_event_room_remove">"%1$s odebral(a) %2$s"</string>
   <string name="state_event_room_remove_by_you">"Odebrali jste %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Odstranili jste %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s odstranil(a) %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s do této místnosti pozval(a) %2$s"</string>
   <string name="state_event_room_third_party_invite_by_you">"Poslali jste %1$s pozvání do místnosti"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s zrušil(a) pozvánku do místnosti pro %2$s"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-cy/translations.xml b/libraries/eventformatter/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..e4aec60ffa
--- /dev/null
+++ b/libraries/eventformatter/impl/src/main/res/values-cy/translations.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="state_event_avatar_changed_too">"(newidiwyd yr afatar hefyd)"</string>
+  <string name="state_event_avatar_url_changed">"Mae %1$s wedi newid eu afatar"</string>
+  <string name="state_event_avatar_url_changed_by_you">"Rydych chi wedi newid eich afatar"</string>
+  <string name="state_event_demoted_to_member">"Cafodd %1$s ei israddio i aelod"</string>
+  <string name="state_event_demoted_to_moderator">"Cafodd %1$s ei israddio i gymedrolwr"</string>
+  <string name="state_event_display_name_changed_from">"Newidiodd %1$s ei enw dangos o %2$s i %3$s"</string>
+  <string name="state_event_display_name_changed_from_by_you">"Rydych chi wedi newid eich enw dangos o %1$s i %2$s"</string>
+  <string name="state_event_display_name_removed">"Mae %1$s wedi tynnu ei enw dangos (%2$s ydoedd)"</string>
+  <string name="state_event_display_name_removed_by_you">"Rydych wedi dileu eich enw dangos (%1$s ydoedd)"</string>
+  <string name="state_event_display_name_set">"Mae %1$s wedi gosod ei enw dangos i %2$s"</string>
+  <string name="state_event_display_name_set_by_you">"Rydych chi wedi gosod eich enw dangos i %1$s"</string>
+  <string name="state_event_promoted_to_administrator">"Cafodd %1$s ei godi i fod yn weinyddol"</string>
+  <string name="state_event_promoted_to_moderator">"Cafodd %1$s ei godi i fod yn gymedrolwr"</string>
+  <string name="state_event_room_avatar_changed">"Mae %1$s wedi newid afatar yr ystafell"</string>
+  <string name="state_event_room_avatar_changed_by_you">"Rydych chi wedi newid afatar yr ystafell"</string>
+  <string name="state_event_room_avatar_removed">"Mae %1$s wedi tynnu afatar yr ystafell"</string>
+  <string name="state_event_room_avatar_removed_by_you">"Rydych chi wedi tynnu afatar yr ystafell"</string>
+  <string name="state_event_room_ban">"Mae %1$s wedi gwahardd %2$s"</string>
+  <string name="state_event_room_ban_by_you">"Rydych wedi gwahardd %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Rydych wedi gwahardd %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"Mae %1$s wedi gwahardd %2$s: %3$s"</string>
+  <string name="state_event_room_created">"%1$s greodd yr ystafell"</string>
+  <string name="state_event_room_created_by_you">"Chi greodd yr ystafell"</string>
+  <string name="state_event_room_invite">"Mae %1$s wedi gwahodd %2$s"</string>
+  <string name="state_event_room_invite_accepted">"Derbyniodd %1$s y gwahoddiad"</string>
+  <string name="state_event_room_invite_accepted_by_you">"Rydych chi wedi derbyn y gwahoddiad"</string>
+  <string name="state_event_room_invite_by_you">"Rydych wedi gwahodd %1$s"</string>
+  <string name="state_event_room_invite_you">"Mae %1$s wedi eich gwahodd"</string>
+  <string name="state_event_room_join">"Ymunodd %1$s â\'r ystafell"</string>
+  <string name="state_event_room_join_by_you">"Rydych chi wedi ymuno â\'r ystafell"</string>
+  <string name="state_event_room_knock">"Mae %1$s yn gofyn i gael ymuno"</string>
+  <string name="state_event_room_knock_accepted">"Mae %1$s wedi rhoi mynediad i %2$s"</string>
+  <string name="state_event_room_knock_accepted_by_you">"Rydych chi wedi caniatáu i %1$s ymuno"</string>
+  <string name="state_event_room_knock_by_you">"Rydych chi wedi gwneud cais i ymuno"</string>
+  <string name="state_event_room_knock_denied">"Mae %1$s wedi gwrthod cais %2$s i ymuno"</string>
+  <string name="state_event_room_knock_denied_by_you">"Rydych wedi gwrthod cais %1$s i ymuno"</string>
+  <string name="state_event_room_knock_denied_you">"Mae %1$s wedi gwrthod eich cais i ymuno"</string>
+  <string name="state_event_room_knock_retracted">"Does gan %1$s ddim diddordeb mewn ymuno bellach"</string>
+  <string name="state_event_room_knock_retracted_by_you">"Rydych wedi diddymu\'ch cais i ymuno"</string>
+  <string name="state_event_room_leave">"Mae %1$s wedi gadael yr ystafell"</string>
+  <string name="state_event_room_leave_by_you">"Rydych wedi gadael yr ystafell"</string>
+  <string name="state_event_room_name_changed">"Mae %1$s wedi newid enw\'r ystafell i: %2$s"</string>
+  <string name="state_event_room_name_changed_by_you">"Rydych chi wedi newid enw\'r ystafell i: %1$s"</string>
+  <string name="state_event_room_name_removed">"Mae %1$s wedi tynnu enw\'r ystafell"</string>
+  <string name="state_event_room_name_removed_by_you">"Rydych wedi dileu enw\'r ystafell"</string>
+  <string name="state_event_room_none">"Gwnaeth %1$s dim newidiadau"</string>
+  <string name="state_event_room_none_by_you">"Rydych heb wneud unrhyw newidiadau"</string>
+  <string name="state_event_room_pinned_events_changed">"Mae %1$s wedi newid y negeseuon sydd wedi\'u pinio"</string>
+  <string name="state_event_room_pinned_events_changed_by_you">"Rydych wedi newid y negeseuon sydd wedi\'u pinio"</string>
+  <string name="state_event_room_pinned_events_pinned">"Mae %1$s wedi pinio neges"</string>
+  <string name="state_event_room_pinned_events_pinned_by_you">"Rydych chi wedi pinio neges"</string>
+  <string name="state_event_room_pinned_events_unpinned">"Mae %1$s wedi\'i dad-binio neges"</string>
+  <string name="state_event_room_pinned_events_unpinned_by_you">"Rydych chi wedi dad-binio neges"</string>
+  <string name="state_event_room_reject">"Mae %1$s wedi gwrthod y gwahoddiad"</string>
+  <string name="state_event_room_reject_by_you">"Rydych chi wedi gwrthod y gwahoddiad"</string>
+  <string name="state_event_room_remove">"Mae %1$s wedi tynnu %2$s"</string>
+  <string name="state_event_room_remove_by_you">"Rydych wedi dileu %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Rydych wedi dileu %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"Mae %1$s wedi tynnu %2$s: %3$s"</string>
+  <string name="state_event_room_third_party_invite">"Anfonodd %1$s wahoddiad at %2$s i ymuno â\'r ystafell"</string>
+  <string name="state_event_room_third_party_invite_by_you">"Rydych wedi anfon gwahoddiad i %1$s i ymuno â\'r ystafell"</string>
+  <string name="state_event_room_third_party_revoked_invite">"Dirymodd %1$s y gwahoddiad i %2$s ymuno â\'r ystafell"</string>
+  <string name="state_event_room_third_party_revoked_invite_by_you">"Rydych wedi dirymu\'r gwahoddiad i %1$s ymuno â\'r ystafell"</string>
+  <string name="state_event_room_topic_changed">"Newidiodd %1$s y pwnc i: %2$s"</string>
+  <string name="state_event_room_topic_changed_by_you">"Rydych wedi newid y pwnc i: %1$s"</string>
+  <string name="state_event_room_topic_removed">"Mae %1$s wedi dileu pwnc yr ystafell"</string>
+  <string name="state_event_room_topic_removed_by_you">"Rydych wedi dileu pwnc yr ystafell"</string>
+  <string name="state_event_room_unban">"Mae %1$s wedi dad-wahardd %2$s"</string>
+  <string name="state_event_room_unban_by_you">"Rydych wedi dad-wahardd %1$s"</string>
+  <string name="state_event_room_unknown_membership_change">"Mae %1$s wedi gwneud newid anhysbys i\'w aelodaeth"</string>
+</resources>
diff --git a/libraries/eventformatter/impl/src/main/res/values-de/translations.xml b/libraries/eventformatter/impl/src/main/res/values-de/translations.xml
index 8c99ba44de..2c8bb82c89 100644
--- a/libraries/eventformatter/impl/src/main/res/values-de/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-de/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Du hast den Raum-Avatar entfernt"</string>
   <string name="state_event_room_ban">"%1$s hat %2$s gesperrt"</string>
   <string name="state_event_room_ban_by_you">"Du hast %1$s gesperrt"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Sie haben gesperrt %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$sverboten%2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s hat den Raum erstellt"</string>
   <string name="state_event_room_created_by_you">"Du hast den Raum erstellt"</string>
   <string name="state_event_room_invite">"%1$s hat %2$s eingeladen"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Du hast die Einladung abgelehnt"</string>
   <string name="state_event_room_remove">"%1$s hat %2$s entfernt"</string>
   <string name="state_event_room_remove_by_you">"Du hast %1$s entfernt"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Sie haben %1$s entfernt: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$sentfernt%2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s hat eine Einladung an %2$s gesendet, dem Raum beizutreten"</string>
   <string name="state_event_room_third_party_invite_by_you">"Du hast eine Einladung an %1$s gesendet, dem Raum beizutreten"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s hat die Einladung an %2$s zum Betreten des Raums zurückgezogen"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-et/translations.xml b/libraries/eventformatter/impl/src/main/res/values-et/translations.xml
index 3f5baafb0b..497d41307e 100644
--- a/libraries/eventformatter/impl/src/main/res/values-et/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-et/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Sina eemaldasid jututoa tunnuspildi"</string>
   <string name="state_event_room_ban">"%1$s keelas %2$s ligipääsu"</string>
   <string name="state_event_room_ban_by_you">"Sina keelasid %1$s ligipääsu"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Sina seadsid ligipääsukeelu kasutajale %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s seadis ligipääsukeelu kasutajale %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s lõi jututoa"</string>
   <string name="state_event_room_created_by_you">"Sina lõid jututoa"</string>
   <string name="state_event_room_invite">"%1$s saatis kutse kasutajale %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Sina lükkasid kutse tagasi"</string>
   <string name="state_event_room_remove">"%1$s eemaldas jututoast kasutaja %2$s"</string>
   <string name="state_event_room_remove_by_you">"Sina eemaldasid jututoast kasutaja %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Sina eemaldasid kasutaja %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s eemaldas kasutaja %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s saatis jututoaga liitumiseks kutse kasutajale %2$s"</string>
   <string name="state_event_room_third_party_invite_by_you">"Sina saatsid kasutajale %1$s kutse jututoaga liitumiseks"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s võttis tagasi jututoaga liitumise kutse kasutajalt %2$s"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-fi/translations.xml b/libraries/eventformatter/impl/src/main/res/values-fi/translations.xml
index d3e2e6cc3b..408935c7e8 100644
--- a/libraries/eventformatter/impl/src/main/res/values-fi/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-fi/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Poistit huoneen avatarin"</string>
   <string name="state_event_room_ban">"%1$s antoi porttikiellon käyttäjälle %2$s"</string>
   <string name="state_event_room_ban_by_you">"Annoit porttikiellon käyttäjälle %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Annoit porttikiellon käyttäjälle %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s antoi porttikiellon käyttäjälle %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s loi huoneen"</string>
   <string name="state_event_room_created_by_you">"Loit huoneen"</string>
   <string name="state_event_room_invite">"%1$s kutsui käyttäjän %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Hylkäsit kutsun"</string>
   <string name="state_event_room_remove">"%1$s poisti käyttäjän %2$s"</string>
   <string name="state_event_room_remove_by_you">"Poistit käyttäjän %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Poistit käyttäjän %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s poisti käyttäjän %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s kutsui käyttäjän %2$s huoneeseen"</string>
   <string name="state_event_room_third_party_invite_by_you">"Kutsuit käyttäjän %1$s huoneeseen"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s peruutti käyttäjän %2$s kutsun huoneeseen"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml b/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml
index dda1e4787d..f8189ea040 100644
--- a/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-fr/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Vous avez supprimé l’avatar du salon"</string>
   <string name="state_event_room_ban">"%1$s a banni %2$s"</string>
   <string name="state_event_room_ban_by_you">"Vous avez banni %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Vous avez banni %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s a banni %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s a créé le salon"</string>
   <string name="state_event_room_created_by_you">"Vous avez créé le salon"</string>
   <string name="state_event_room_invite">"%1$s a invité %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Vous avez refusé l’invitation"</string>
   <string name="state_event_room_remove">"%1$s a supprimé %2$s"</string>
   <string name="state_event_room_remove_by_you">"Vous avez supprimé %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Vous avez supprimé %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s a supprimé %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s a envoyé une invitation à %2$s à rejoindre le salon"</string>
   <string name="state_event_room_third_party_invite_by_you">"Vous avez envoyé une invitation à %1$s pour rejoindre le salon"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s a révoqué l’invitation de %2$s à rejoindre le salon"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml b/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
index bfa63c86c3..311bf88df2 100644
--- a/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-hu/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Eltávolította a szoba profilképét"</string>
   <string name="state_event_room_ban">"%1$s kitiltotta: %2$s"</string>
   <string name="state_event_room_ban_by_you">"Kitiltotta: %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Kitiltotta %1$s felhasználót: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s kitiltotta %2$s felhasználót: %3$s"</string>
   <string name="state_event_room_created">"%1$s létrehozta a szobát"</string>
   <string name="state_event_room_created_by_you">"Létrehozta a szobát"</string>
   <string name="state_event_room_invite">"%1$s meghívta: %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Elutasította a meghívást"</string>
   <string name="state_event_room_remove">"%1$s eltávolította: %2$s"</string>
   <string name="state_event_room_remove_by_you">"Eltávolította: %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Eltávolította %1$s felhasználót: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s eltávolította %2$s felhasználót: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s meghívót küldött %2$s számára, hogy csatlakozzon a szobához"</string>
   <string name="state_event_room_third_party_invite_by_you">"Meghívót küldött %1$s számára, hogy csatlakozzon a szobához"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s visszavonta %2$s meghívását, hogy csatlakozzon a szobához"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-nb/translations.xml b/libraries/eventformatter/impl/src/main/res/values-nb/translations.xml
index dfe9ada932..6faa6145eb 100644
--- a/libraries/eventformatter/impl/src/main/res/values-nb/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-nb/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Du fjernet romavataren"</string>
   <string name="state_event_room_ban">"%1$s utestengte %2$s"</string>
   <string name="state_event_room_ban_by_you">"Du utestengte %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Du utestengte %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s utestengte %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s opprettet rommet"</string>
   <string name="state_event_room_created_by_you">"Du opprettet rommet"</string>
   <string name="state_event_room_invite">"%1$s inviterte %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Du avviste invitasjonen"</string>
   <string name="state_event_room_remove">"%1$s fjernet %2$s"</string>
   <string name="state_event_room_remove_by_you">"Du fjernet %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Du fjernet %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s fjernet %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s sendte en invitasjon til %2$s om å bli med i rommet"</string>
   <string name="state_event_room_third_party_invite_by_you">"Du sendte en invitasjon til %1$s om å bli med i rommet"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s trakk tilbake invitasjonen til %2$s om å delta i rommet"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml b/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
index 60f442bb75..e45227ad62 100644
--- a/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-pl/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Usunąłeś zdjęcie profilowe pokoju"</string>
   <string name="state_event_room_ban">"%1$s zbanował %2$s"</string>
   <string name="state_event_room_ban_by_you">"Zbanowałeś %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Zbanowałeś %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s zbanował %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s stworzył pokój"</string>
   <string name="state_event_room_created_by_you">"Stworzyłeś pokój"</string>
   <string name="state_event_room_invite">"%1$s zaprosił %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Odrzuciłeś zaproszenie"</string>
   <string name="state_event_room_remove">"%1$s usunął %2$s"</string>
   <string name="state_event_room_remove_by_you">"Usunąłeś %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Usunąłeś %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s usunął %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s wysłał zaproszenie do %2$s, aby dołączył do pokoju"</string>
   <string name="state_event_room_third_party_invite_by_you">"Wysłano zaproszenie do %1$s, aby dołączył do pokoju"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s cofnął zaproszenie dla %2$s do tego pokoju"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-sk/translations.xml b/libraries/eventformatter/impl/src/main/res/values-sk/translations.xml
index 3eee3541b1..c13ce85286 100644
--- a/libraries/eventformatter/impl/src/main/res/values-sk/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-sk/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Odstránili ste obrázok miestnosti"</string>
   <string name="state_event_room_ban">"%1$s zakázal/a používateľa %2$s"</string>
   <string name="state_event_room_ban_by_you">"Zakázali ste používateľa %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Zakázali ste %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s zakázal/a %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s vytvoril/a miestnosť"</string>
   <string name="state_event_room_created_by_you">"Vytvorili ste miestnosť"</string>
   <string name="state_event_room_invite">"%1$s pozval/a používateľa %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Odmietli ste pozvánku"</string>
   <string name="state_event_room_remove">"%1$s odstránil/a %2$s"</string>
   <string name="state_event_room_remove_by_you">"Odstránili ste %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Odstránili ste %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s odstránil/a %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s poslal/a pozvánku používateľovi %2$s, aby sa pripojil k miestnosti"</string>
   <string name="state_event_room_third_party_invite_by_you">"Poslali ste pozvánku používateľovi %1$s, aby sa pripojil do miestnosti"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s zrušil/a pozvánku pre používateľa %2$s na vstup do miestnosti"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-sv/translations.xml b/libraries/eventformatter/impl/src/main/res/values-sv/translations.xml
index 6b31a6f47d..473c73cb6d 100644
--- a/libraries/eventformatter/impl/src/main/res/values-sv/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-sv/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Du tog bort rummets avatar"</string>
   <string name="state_event_room_ban">"%1$s bannade %2$s"</string>
   <string name="state_event_room_ban_by_you">"Du bannade %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Du bannade %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s bannade %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s skapade rummet"</string>
   <string name="state_event_room_created_by_you">"Du skapade rummet"</string>
   <string name="state_event_room_invite">"%1$s bjöd in %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Du avvisade inbjudan"</string>
   <string name="state_event_room_remove">"%1$s tog bort %2$s"</string>
   <string name="state_event_room_remove_by_you">"Du tog bort %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Du tog bort %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s tog bort %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s skickade en inbjudan till %2$s att gå med i rummet"</string>
   <string name="state_event_room_third_party_invite_by_you">"Du skickade en inbjudan till %1$s att gå med i rummet"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s återkallade inbjudan för %2$s att gå med i rummet"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values-uk/translations.xml b/libraries/eventformatter/impl/src/main/res/values-uk/translations.xml
index 7e96bc81f5..82c41a55b2 100644
--- a/libraries/eventformatter/impl/src/main/res/values-uk/translations.xml
+++ b/libraries/eventformatter/impl/src/main/res/values-uk/translations.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"Ви видалили аватар кімнати"</string>
   <string name="state_event_room_ban">"%1$s блокує %2$s"</string>
   <string name="state_event_room_ban_by_you">"Ви заблокували %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"Ви заблокували %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s блокує %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s створює кімнату"</string>
   <string name="state_event_room_created_by_you">"Ви створили кімнату"</string>
   <string name="state_event_room_invite">"%1$s запрошує %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"Ви відхилили запрошення"</string>
   <string name="state_event_room_remove">"%1$s вилучає %2$s"</string>
   <string name="state_event_room_remove_by_you">"Ви видалили %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"Ви вилучили %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s вилучає %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s запрошує %2$s приєднатися до кімнати"</string>
   <string name="state_event_room_third_party_invite_by_you">"Ви запросили %1$s приєднатися до кімнати"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s відкликає запрошення приєднатися до кімнати для %2$s"</string>
diff --git a/libraries/eventformatter/impl/src/main/res/values/localazy.xml b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
index 2579c98207..dfa8a3b40b 100644
--- a/libraries/eventformatter/impl/src/main/res/values/localazy.xml
+++ b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
@@ -19,6 +19,8 @@
   <string name="state_event_room_avatar_removed_by_you">"You removed the room avatar"</string>
   <string name="state_event_room_ban">"%1$s banned %2$s"</string>
   <string name="state_event_room_ban_by_you">"You banned %1$s"</string>
+  <string name="state_event_room_ban_by_you_with_reason">"You banned %1$s: %2$s"</string>
+  <string name="state_event_room_ban_with_reason">"%1$s banned %2$s: %3$s"</string>
   <string name="state_event_room_created">"%1$s created the room"</string>
   <string name="state_event_room_created_by_you">"You created the room"</string>
   <string name="state_event_room_invite">"%1$s invited %2$s"</string>
@@ -55,6 +57,8 @@
   <string name="state_event_room_reject_by_you">"You rejected the invitation"</string>
   <string name="state_event_room_remove">"%1$s removed %2$s"</string>
   <string name="state_event_room_remove_by_you">"You removed %1$s"</string>
+  <string name="state_event_room_remove_by_you_with_reason">"You removed %1$s: %2$s"</string>
+  <string name="state_event_room_remove_with_reason">"%1$s removed %2$s: %3$s"</string>
   <string name="state_event_room_third_party_invite">"%1$s sent an invitation to %2$s to join the room"</string>
   <string name="state_event_room_third_party_invite_by_you">"You sent an invitation to %1$s to join the room"</string>
   <string name="state_event_room_third_party_revoked_invite">"%1$s revoked the invitation for %2$s to join the room"</string>
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
similarity index 87%
rename from libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
rename to libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
index 11b809258e..6d0ad1aa49 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultBaseRoomLastMessageFormatterTest.kt
@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessage
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
@@ -38,6 +37,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecry
 import io.element.android.libraries.matrix.api.timeline.item.event.UnknownContent
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VoiceMessageType
+import io.element.android.libraries.matrix.test.A_REASON
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.media.aMediaSource
@@ -47,6 +47,7 @@ import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageCo
 import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import org.junit.Before
 import org.junit.Test
@@ -57,7 +58,7 @@ import org.robolectric.annotation.Config
 
 @Suppress("LargeClass")
 @RunWith(RobolectricTestRunner::class)
-class DefaultRoomLastMessageFormatterTest {
+class DefaultBaseRoomLastMessageFormatterTest {
     private lateinit var context: Context
     private lateinit var fakeMatrixClient: FakeMatrixClient
     private lateinit var formatter: DefaultRoomLastMessageFormatter
@@ -289,8 +290,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - joined`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
 
         val youJoinedRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youJoinedRoom = formatter.format(youJoinedRoomEvent, false)
@@ -305,8 +306,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - left`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
 
         val youLeftRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youLeftRoom = formatter.format(youLeftRoomEvent, false)
@@ -322,10 +323,10 @@ class DefaultRoomLastMessageFormatterTest {
     fun `Membership change - banned`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
-        val youKickedContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
-        val someoneKickedContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
+        val youKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
+        val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
 
         val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent, false)
@@ -344,13 +345,40 @@ class DefaultRoomLastMessageFormatterTest {
         assertThat(someoneKickBanned).isEqualTo("$otherName banned $third")
     }
 
+    @Test
+    @Config(qualifiers = "en")
+    fun `Membership change - banned with reason`() {
+        val otherName = "Other"
+        val third = "Someone"
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED, A_REASON)
+        val youKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED, A_REASON)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED, A_REASON)
+        val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED, A_REASON)
+
+        val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youBanned = formatter.format(youBannedEvent, false)
+        assertThat(youBanned).isEqualTo("You banned $third: $A_REASON")
+
+        val youKickBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youKickedContent)
+        val youKickedBanned = formatter.format(youKickBannedEvent, false)
+        assertThat(youKickedBanned).isEqualTo("You banned $third: $A_REASON")
+
+        val someoneBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneBanned = formatter.format(someoneBannedEvent, false)
+        assertThat(someoneBanned).isEqualTo("$otherName banned $third: $A_REASON")
+
+        val someoneKickBannedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneKickedContent)
+        val someoneKickBanned = formatter.format(someoneKickBannedEvent, false)
+        assertThat(someoneKickBanned).isEqualTo("$otherName banned $third: $A_REASON")
+    }
+
     @Test
     @Config(qualifiers = "en")
     fun `Membership change - unban`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
 
         val youUnbannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youUnbanned = formatter.format(youUnbannedEvent, false)
@@ -366,8 +394,8 @@ class DefaultRoomLastMessageFormatterTest {
     fun `Membership change - kicked`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
 
         val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent, false)
@@ -378,13 +406,30 @@ class DefaultRoomLastMessageFormatterTest {
         assertThat(someoneKicked).isEqualTo("$otherName removed $third")
     }
 
+    @Test
+    @Config(qualifiers = "en")
+    fun `Membership change - kicked with reason`() {
+        val otherName = "Other"
+        val third = "Someone"
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED, A_REASON)
+
+        val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
+        val youKicked = formatter.format(youKickedEvent, false)
+        assertThat(youKicked).isEqualTo("You removed $third: $A_REASON")
+
+        val someoneKickedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
+        val someoneKicked = formatter.format(someoneKickedEvent, false)
+        assertThat(someoneKicked).isEqualTo("$otherName removed $third: $A_REASON")
+    }
+
     @Test
     @Config(qualifiers = "en")
     fun `Membership change - invited`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
 
         val youWereInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val youWereInvited = formatter.format(youWereInvitedEvent, false)
@@ -403,8 +448,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - invitation accepted`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
 
         val youAcceptedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youAcceptedInvite = formatter.format(youAcceptedInviteEvent, false)
@@ -419,8 +464,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - invitation rejected`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
 
         val youRejectedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRejectedInvite = formatter.format(youRejectedInviteEvent, false)
@@ -436,7 +481,7 @@ class DefaultRoomLastMessageFormatterTest {
     fun `Membership change - invitation revoked`() {
         val otherName = "Other"
         val third = "Someone"
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
 
         val youRevokedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youRevokedInvite = formatter.format(youRevokedInviteEvent, false)
@@ -451,8 +496,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - knocked`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
 
         val youKnockedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKnocked = formatter.format(youKnockedEvent, false)
@@ -468,7 +513,7 @@ class DefaultRoomLastMessageFormatterTest {
     fun `Membership change - knock accepted`() {
         val otherName = "Other"
         val third = "Someone"
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
 
         val youAcceptedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youAcceptedKnock = formatter.format(youAcceptedKnockEvent, false)
@@ -483,8 +528,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - knock retracted`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
 
         val youRetractedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRetractedKnock = formatter.format(youRetractedKnockEvent, false)
@@ -500,8 +545,8 @@ class DefaultRoomLastMessageFormatterTest {
     fun `Membership change - knock denied`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
+        val youContent = aRoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
 
         val youDeniedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youDeniedKnock = formatter.format(youDeniedKnockEvent, false)
@@ -520,8 +565,8 @@ class DefaultRoomLastMessageFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - None`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
 
         val youNoneRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youNoneRoom = formatter.format(youNoneRoomEvent, false)
@@ -538,7 +583,7 @@ class DefaultRoomLastMessageFormatterTest {
         val otherChanges = arrayOf(MembershipChange.ERROR, MembershipChange.NOT_IMPLEMENTED, null)
 
         val results = otherChanges.map { change ->
-            val content = RoomMembershipContent(A_USER_ID, null, change)
+            val content = aRoomMembershipContent(A_USER_ID, null, change)
             val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event, false)
             change to result
diff --git a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
index ee4b827098..4ff71608f8 100644
--- a/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
+++ b/libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultPinnedMessagesBannerFormatterTest.kt
@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessage
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
@@ -47,6 +46,7 @@ import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageCo
 import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.services.toolbox.impl.strings.AndroidStringProvider
 import org.junit.Before
@@ -198,8 +198,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - joined`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.JOINED)
 
         val youJoinedRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youJoinedRoom = formatter.format(youJoinedRoomEvent)
@@ -214,8 +214,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - left`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.LEFT)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.LEFT)
 
         val youLeftRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youLeftRoom = formatter.format(youLeftRoomEvent)
@@ -231,10 +231,10 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - banned`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
-        val youKickedContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
-        val someoneKickedContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
+        val youKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.BANNED)
+        val someoneKickedContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED_AND_BANNED)
 
         val youBannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youBanned = formatter.format(youBannedEvent)
@@ -258,8 +258,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - unban`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.UNBANNED)
 
         val youUnbannedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youUnbanned = formatter.format(youUnbannedEvent)
@@ -275,8 +275,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - kicked`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
+        val youContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KICKED)
 
         val youKickedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKicked = formatter.format(youKickedEvent)
@@ -292,8 +292,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - invited`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITED)
 
         val youWereInvitedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = youContent)
         val youWereInvited = formatter.format(youWereInvitedEvent)
@@ -312,8 +312,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - invitation accepted`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_ACCEPTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_ACCEPTED)
 
         val youAcceptedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youAcceptedInvite = formatter.format(youAcceptedInviteEvent)
@@ -328,8 +328,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - invitation rejected`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.INVITATION_REJECTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.INVITATION_REJECTED)
 
         val youRejectedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRejectedInvite = formatter.format(youRejectedInviteEvent)
@@ -345,7 +345,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - invitation revoked`() {
         val otherName = "Other"
         val third = "Someone"
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.INVITATION_REVOKED)
 
         val youRevokedInviteEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youRevokedInvite = formatter.format(youRevokedInviteEvent)
@@ -360,8 +360,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - knocked`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCKED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.KNOCKED)
 
         val youKnockedEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youKnocked = formatter.format(youKnockedEvent)
@@ -377,7 +377,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - knock accepted`() {
         val otherName = "Other"
         val third = "Someone"
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_ACCEPTED)
 
         val youAcceptedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youAcceptedKnock = formatter.format(youAcceptedKnockEvent)
@@ -392,8 +392,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - knock retracted`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.KNOCK_RETRACTED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), null, MembershipChange.KNOCK_RETRACTED)
 
         val youRetractedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youRetractedKnock = formatter.format(youRetractedKnockEvent)
@@ -409,8 +409,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     fun `Membership change - knock denied`() {
         val otherName = "Other"
         val third = "Someone"
-        val youContent = RoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
+        val youContent = aRoomMembershipContent(A_USER_ID, third, MembershipChange.KNOCK_DENIED)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), third, MembershipChange.KNOCK_DENIED)
 
         val youDeniedKnockEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = someoneContent)
         val youDeniedKnock = formatter.format(youDeniedKnockEvent)
@@ -429,8 +429,8 @@ class DefaultPinnedMessagesBannerFormatterTest {
     @Config(qualifiers = "en")
     fun `Membership change - None`() {
         val otherName = "Other"
-        val youContent = RoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
-        val someoneContent = RoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
+        val youContent = aRoomMembershipContent(A_USER_ID, null, MembershipChange.NONE)
+        val someoneContent = aRoomMembershipContent(UserId("@someone_else:domain"), otherName, MembershipChange.NONE)
 
         val youNoneRoomEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = youContent)
         val youNoneRoom = formatter.format(youNoneRoomEvent)
@@ -447,7 +447,7 @@ class DefaultPinnedMessagesBannerFormatterTest {
         val otherChanges = arrayOf(MembershipChange.ERROR, MembershipChange.NOT_IMPLEMENTED, null)
 
         val results = otherChanges.map { change ->
-            val content = RoomMembershipContent(A_USER_ID, null, change)
+            val content = aRoomMembershipContent(A_USER_ID, null, change)
             val event = createRoomEvent(sentByYou = false, senderDisplayName = "Someone", content = content)
             val result = formatter.format(event)
             change to result
diff --git a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
index 6e8fba8bd1..2a167ad774 100644
--- a/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
+++ b/libraries/featureflag/api/src/main/kotlin/io/element/android/libraries/featureflag/api/FeatureFlags.kt
@@ -163,5 +163,5 @@ enum class FeatureFlags(
         defaultValue = { buildMeta -> buildMeta.buildType != BuildType.RELEASE },
         // False so it's displayed in the developer options screen
         isFinished = false,
-    )
+    ),
 }
diff --git a/libraries/matrix/api/build.gradle.kts b/libraries/matrix/api/build.gradle.kts
index d96613b1e7..9cd7e6ac7f 100644
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@@ -1,3 +1,5 @@
+import config.BuildTimeConfig
+import extension.buildConfigFieldStr
 import extension.setupAnvil
 
 /*
@@ -19,6 +21,25 @@ android {
     buildFeatures {
         buildConfig = true
     }
+
+    defaultConfig {
+        buildConfigFieldStr(
+            name = "CLIENT_URI",
+            value = BuildTimeConfig.URL_WEBSITE ?: "https://element.io"
+        )
+        buildConfigFieldStr(
+            name = "LOGO_URI",
+            value = BuildTimeConfig.URL_LOGO ?: "https://element.io/mobile-icon.png"
+        )
+        buildConfigFieldStr(
+            name = "TOS_URI",
+            value = BuildTimeConfig.URL_ACCEPTABLE_USE ?: "https://element.io/acceptable-use-policy-terms"
+        )
+        buildConfigFieldStr(
+            name = "POLICY_URI",
+            value = BuildTimeConfig.URL_POLICY ?: "https://element.io/privacy"
+        )
+    }
 }
 
 setupAnvil()
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
index 6a85cf45f5..a1b2079809 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt
@@ -23,10 +23,11 @@ import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.NotJoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
@@ -52,8 +53,8 @@ interface MatrixClient {
     val mediaLoader: MatrixMediaLoader
     val sessionCoroutineScope: CoroutineScope
     val ignoredUsersFlow: StateFlow<ImmutableList<UserId>>
-    suspend fun getRoom(roomId: RoomId): MatrixRoom?
-    suspend fun getPendingRoom(roomId: RoomId): RoomPreview?
+    suspend fun getJoinedRoom(roomId: RoomId): JoinedRoom?
+    suspend fun getRoom(roomId: RoomId): BaseRoom?
     suspend fun findDM(userId: UserId): RoomId?
     suspend fun ignoreUser(userId: UserId): Result<Unit>
     suspend fun unignoreUser(userId: UserId): Result<Unit>
@@ -147,7 +148,7 @@ interface MatrixClient {
     /**
      * Get a room preview for a given room ID or alias. This is especially useful for rooms that the user is not a member of, or hasn't joined yet.
      */
-    suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomPreview>
+    suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<NotJoinedRoom>
 
     /**
      * Returns the currently used sliding sync version.
@@ -168,7 +169,7 @@ interface MatrixClient {
  * The flow will emit a new value whenever the room info is updated.
  * The flow will emit Optional.empty item if the room is not found.
  */
-fun MatrixClient.getRoomInfoFlow(roomIdOrAlias: RoomIdOrAlias): Flow<Optional<MatrixRoomInfo>> {
+fun MatrixClient.getRoomInfoFlow(roomIdOrAlias: RoomIdOrAlias): Flow<Optional<RoomInfo>> {
     return getRoomSummaryFlow(roomIdOrAlias)
         .map { roomSummary -> roomSummary.map { it.info } }
         .distinctUntilChanged()
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
index c221b2881e..3ea1bddf40 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/analytics/ViewRoomExt.kt
@@ -8,11 +8,11 @@
 package io.element.android.libraries.matrix.api.analytics
 
 import im.vector.app.features.analytics.plan.ViewRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 
-fun MatrixRoom.toAnalyticsViewRoom(
+fun BaseRoom.toAnalyticsViewRoom(
     trigger: ViewRoom.Trigger? = null,
-    selectedSpace: MatrixRoom? = null,
+    selectedSpace: BaseRoom? = null,
     viaKeyboard: Boolean? = null,
 ): ViewRoom {
     val activeSpace = selectedSpace?.toActiveSpace() ?: ViewRoom.ActiveSpace.Home
@@ -26,6 +26,6 @@ fun MatrixRoom.toAnalyticsViewRoom(
     )
 }
 
-private fun MatrixRoom.toActiveSpace(): ViewRoom.ActiveSpace {
+private fun BaseRoom.toActiveSpace(): ViewRoom.ActiveSpace {
     return if (info().isPublic) ViewRoom.ActiveSpace.Public else ViewRoom.ActiveSpace.Private
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
index e3153cbbb8..ef73edfaf5 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/AuthenticationException.kt
@@ -10,5 +10,6 @@ package io.element.android.libraries.matrix.api.auth
 sealed class AuthenticationException(message: String) : Exception(message) {
     class InvalidServerName(message: String) : AuthenticationException(message)
     class SlidingSyncVersion(message: String) : AuthenticationException(message)
+    class Oidc(message: String) : AuthenticationException(message)
     class Generic(message: String) : AuthenticationException(message)
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
index 23d55b74ea..f8434a9d4a 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcConfig.kt
@@ -7,6 +7,22 @@
 
 package io.element.android.libraries.matrix.api.auth
 
+import io.element.android.libraries.matrix.api.BuildConfig
+
 object OidcConfig {
-    const val REDIRECT_URI = "io.element:/callback"
+    const val CLIENT_URI = BuildConfig.CLIENT_URI
+
+    // Note: host must match with the host of CLIENT_URI
+    const val LOGO_URI = BuildConfig.LOGO_URI
+
+    // Note: host must match with the host of CLIENT_URI
+    const val TOS_URI = BuildConfig.TOS_URI
+
+    // Note: host must match with the host of CLIENT_URI
+    const val POLICY_URI = BuildConfig.POLICY_URI
+
+    // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
+    val STATIC_REGISTRATIONS = mapOf(
+        "https://id.thirdroom.io/realms/thirdroom" to "elementx",
+    )
 }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InvalidDataException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt
similarity index 61%
rename from features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InvalidDataException.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt
index dff7b904db..1dba996ea9 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InvalidDataException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/OidcRedirectUrlProvider.kt
@@ -5,6 +5,8 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.features.invite.impl.response
+package io.element.android.libraries.matrix.api.auth
 
-class InvalidDataException : Exception()
+interface OidcRedirectUrlProvider {
+    fun provide(): String
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
index 3e7266c444..703ec1205e 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notificationsettings/NotificationSettingsService.kt
@@ -8,14 +8,14 @@
 package io.element.android.libraries.matrix.api.notificationsettings
 
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.MatrixRoomNotificationSettingsState
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.RoomNotificationSettings
+import io.element.android.libraries.matrix.api.room.RoomNotificationSettingsState
 import kotlinx.coroutines.flow.SharedFlow
 
 interface NotificationSettingsService {
     /**
-     * State of the current room notification settings flow ([MatrixRoomNotificationSettingsState.Unknown] if not started).
+     * State of the current room notification settings flow ([RoomNotificationSettingsState.Unknown] if not started).
      */
     val notificationSettingsChangeFlow: SharedFlow<Unit>
     suspend fun getRoomNotificationSettings(roomId: RoomId, isEncrypted: Boolean, isOneToOne: Boolean): Result<RoomNotificationSettings>
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt
new file mode 100644
index 0000000000..8df4cb5671
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt
@@ -0,0 +1,238 @@
+/*
+ * 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.libraries.matrix.api.room
+
+import io.element.android.libraries.matrix.api.core.EventId
+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.UserId
+import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import java.io.Closeable
+
+/**
+ * This interface represents the common functionality for a local room, whether it's joined, invited, knocked, or left.
+ */
+interface BaseRoom : Closeable {
+    /**
+     * The session id of the current user.
+     */
+    val sessionId: SessionId
+
+    /**
+     * The id of the room.
+     */
+    val roomId: RoomId
+
+    /**
+     * The coroutine scope that will handle all jobs related to this room.
+     */
+    val roomCoroutineScope: CoroutineScope
+
+    /**
+     * The current loaded members as a StateFlow.
+     * Initial value is [RoomMembersState.Unknown].
+     * To update them you should call [updateMembers].
+     */
+    val membersStateFlow: StateFlow<RoomMembersState>
+
+    /**
+     * A flow that emits the current [RoomInfo] state.
+     */
+    val roomInfoFlow: StateFlow<RoomInfo>
+
+    /**
+     * Get the latest room info we have received from the SDK stream.
+     */
+    fun info(): RoomInfo = roomInfoFlow.value
+
+    /**
+     * Try to load the room members and update the membersFlow.
+     */
+    suspend fun updateMembers()
+
+    /**
+     * Get the members of the room. Note: generally this should not be used, please use
+     * [membersStateFlow] and [updateMembers] instead.
+     */
+    suspend fun getMembers(limit: Int = 5): Result<List<RoomMember>>
+
+    /**
+     * Will return an updated member or an error.
+     */
+    suspend fun getUpdatedMember(userId: UserId): Result<RoomMember>
+
+    /**
+     * Adds the room to the sync subscription list.
+     */
+    suspend fun subscribeToSync()
+
+    /**
+     * Gets the power levels of the room.
+     */
+    suspend fun powerLevels(): Result<RoomPowerLevels>
+
+    /**
+     * Gets the role of the user with the provided [userId] in the room.
+     */
+    suspend fun userRole(userId: UserId): Result<RoomMember.Role>
+
+    /**
+     * Gets the display name of the user with the provided [userId] in the room.
+     */
+    suspend fun userDisplayName(userId: UserId): Result<String?>
+
+    /**
+     * Gets the avatar of the user with the provided [userId] in the room.
+     */
+    suspend fun userAvatarUrl(userId: UserId): Result<String?>
+
+    /**
+     * Leaves and forgets the room. Only joined, invited or knocked rooms can be left.
+     */
+    suspend fun leave(): Result<Unit>
+
+    /**
+     * Joins the room. Only invited rooms can be joined.
+     */
+    suspend fun join(): Result<Unit>
+
+    /**
+     * Forgets about the room, removing it from the server and the local cache. Only left and banned rooms can be forgotten.
+     */
+    suspend fun forget(): Result<Unit>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can invite other users to the room.
+     */
+    suspend fun canUserInvite(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can kick other users from the room.
+     */
+    suspend fun canUserKick(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can ban other users from the room.
+     */
+    suspend fun canUserBan(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can redact their own messages.
+     */
+    suspend fun canUserRedactOwn(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can redact messages from other users.
+     */
+    suspend fun canUserRedactOther(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can send state events.
+     */
+    suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can send messages.
+     */
+    suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can trigger an `@room` notification.
+     */
+    suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can pin or unpin messages.
+     */
+    suspend fun canUserPinUnpin(userId: UserId): Result<Boolean>
+
+    /**
+     * Returns `true` if the user with the provided [userId] can join or starts calls.
+     */
+    suspend fun canUserJoinCall(userId: UserId): Result<Boolean> =
+        canUserSendState(userId, StateEventType.CALL_MEMBER)
+
+    /**
+     * Sets the room as favorite or not, based on the [isFavorite] parameter.
+     */
+    suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit>
+
+    /**
+     * Mark the room as read by trying to attach an unthreaded read receipt to the latest room event.
+     * @param receiptType The type of receipt to send.
+     */
+    suspend fun markAsRead(receiptType: ReceiptType): Result<Unit>
+
+    /**
+     * Sets a flag on the room to indicate that the user has explicitly marked it as unread, or reverts the flag.
+     * @param isUnread true to mark the room as unread, false to remove the flag.
+     */
+    suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit>
+
+    /**
+     * Clear the event cache storage for the current room.
+     */
+    suspend fun clearEventCacheStorage(): Result<Unit>
+
+    /**
+     * Get the permalink for the room.
+     */
+    suspend fun getPermalink(): Result<String>
+
+    /**
+     * Get the permalink for the provided [eventId].
+     * @param eventId The event id to get the permalink for.
+     * @return The permalink, or a failure.
+     */
+    suspend fun getPermalinkFor(eventId: EventId): Result<String>
+
+    /**
+     * Returns the visibility for this room in the room directory.
+     * If the room is not published, the result will be [RoomVisibility.Private].
+     */
+    suspend fun getRoomVisibility(): Result<RoomVisibility>
+
+    /**
+     * Returns the visibility for this room in the room directory, fetching it from the homeserver if needed.
+     */
+    suspend fun getUpdatedIsEncrypted(): Result<Boolean>
+
+    /**
+     * Store the given `ComposerDraft` in the state store of this room.
+     */
+    suspend fun saveComposerDraft(composerDraft: ComposerDraft): Result<Unit>
+
+    /**
+     * Retrieve the `ComposerDraft` stored in the state store for this room.
+     */
+    suspend fun loadComposerDraft(): Result<ComposerDraft?>
+
+    /**
+     * Clear the `ComposerDraft` stored in the state store for this room.
+     */
+    suspend fun clearComposerDraft(): Result<Unit>
+
+    /**
+     * Reports a room as inappropriate to the server.
+     * The caller is not required to be joined to the room to report it.
+     * @param reason - The reason the room is being reported.
+     */
+    suspend fun reportRoom(reason: String?): Result<Unit>
+
+    /**
+     * Destroy the room and release all resources associated to it.
+     */
+    fun destroy()
+
+    override fun close() = destroy()
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt
similarity index 72%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.kt
index a2a737a019..cbc5220678 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/JoinedRoom.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,7 +13,6 @@ import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SendHandle
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
@@ -23,35 +22,28 @@ import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.poll.PollKind
-import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
-import java.io.Closeable
 import java.io.File
 
-interface MatrixRoom : Closeable {
-    val sessionId: SessionId
-    val roomId: RoomId
+interface JoinedRoom : BaseRoom {
+    val syncUpdateFlow: StateFlow<Long>
 
-    val roomCoroutineScope: CoroutineScope
-
-    val roomInfoFlow: StateFlow<MatrixRoomInfo>
     val roomTypingMembersFlow: Flow<List<UserId>>
     val identityStateChangesFlow: Flow<List<IdentityStateChange>>
+    val roomNotificationSettingsStateFlow: StateFlow<RoomNotificationSettingsState>
 
     /**
      * The current knock requests in the room as a Flow.
@@ -64,40 +56,6 @@ interface MatrixRoom : Closeable {
      */
     val isOneToOne: Boolean get() = info().activeMembersCount == 2L
 
-    /**
-     * The current loaded members as a StateFlow.
-     * Initial value is [MatrixRoomMembersState.Unknown].
-     * To update them you should call [updateMembers].
-     */
-    val membersStateFlow: StateFlow<MatrixRoomMembersState>
-
-    val roomNotificationSettingsStateFlow: StateFlow<MatrixRoomNotificationSettingsState>
-
-    /**
-     * Get the latest room info we have received from the SDK stream.
-     */
-    fun info(): MatrixRoomInfo = roomInfoFlow.value
-
-    /**
-     * Try to load the room members and update the membersFlow.
-     */
-    suspend fun updateMembers()
-
-    /**
-     * Get the members of the room. Note: generally this should not be used, please use
-     * [membersStateFlow] and [updateMembers] instead.
-     */
-    suspend fun getMembers(limit: Int = 5): Result<List<RoomMember>>
-
-    /**
-     * Will return an updated member or an error.
-     */
-    suspend fun getUpdatedMember(userId: UserId): Result<RoomMember>
-
-    suspend fun updateRoomNotificationSettings(): Result<Unit>
-
-    val syncUpdateFlow: StateFlow<Long>
-
     /**
      * The live timeline of the room. Must be used to send Event to a room.
      */
@@ -111,24 +69,6 @@ interface MatrixRoom : Closeable {
         createTimelineParams: CreateTimelineParams,
     ): Result<Timeline>
 
-    fun destroy()
-
-    suspend fun subscribeToSync()
-
-    suspend fun powerLevels(): Result<MatrixRoomPowerLevels>
-
-    suspend fun updatePowerLevels(matrixRoomPowerLevels: MatrixRoomPowerLevels): Result<Unit>
-
-    suspend fun resetPowerLevels(): Result<MatrixRoomPowerLevels>
-
-    suspend fun userRole(userId: UserId): Result<RoomMember.Role>
-
-    suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit>
-
-    suspend fun userDisplayName(userId: UserId): Result<String?>
-
-    suspend fun userAvatarUrl(userId: UserId): Result<String?>
-
     suspend fun sendMessage(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): Result<Unit>
 
     suspend fun editMessage(eventId: EventId, body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): Result<Unit>
@@ -198,75 +138,6 @@ interface MatrixRoom : Closeable {
         assetType: AssetType? = null,
     ): Result<Unit>
 
-    suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit>
-
-    suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit>
-
-    suspend fun cancelSend(transactionId: TransactionId): Result<Unit>
-
-    suspend fun leave(): Result<Unit>
-
-    suspend fun join(): Result<Unit>
-
-    suspend fun inviteUserById(id: UserId): Result<Unit>
-
-    suspend fun canUserInvite(userId: UserId): Result<Boolean>
-
-    suspend fun canUserKick(userId: UserId): Result<Boolean>
-
-    suspend fun canUserBan(userId: UserId): Result<Boolean>
-
-    suspend fun canUserRedactOwn(userId: UserId): Result<Boolean>
-
-    suspend fun canUserRedactOther(userId: UserId): Result<Boolean>
-
-    suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean>
-
-    suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean>
-
-    suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean>
-
-    suspend fun canUserPinUnpin(userId: UserId): Result<Boolean>
-
-    suspend fun canUserJoinCall(userId: UserId): Result<Boolean> =
-        canUserSendState(userId, StateEventType.CALL_MEMBER)
-
-    suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit>
-
-    suspend fun removeAvatar(): Result<Unit>
-
-    suspend fun setName(name: String): Result<Unit>
-
-    suspend fun setTopic(topic: String): Result<Unit>
-
-    suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit>
-
-    suspend fun kickUser(userId: UserId, reason: String? = null): Result<Unit>
-
-    suspend fun banUser(userId: UserId, reason: String? = null): Result<Unit>
-
-    suspend fun unbanUser(userId: UserId, reason: String? = null): Result<Unit>
-
-    suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit>
-
-    /**
-     * Mark the room as read by trying to attach an unthreaded read receipt to the latest room event.
-     * @param receiptType The type of receipt to send.
-     */
-    suspend fun markAsRead(receiptType: ReceiptType): Result<Unit>
-
-    /**
-     * Sets a flag on the room to indicate that the user has explicitly marked it as unread, or reverts the flag.
-     * @param isUnread true to mark the room as unread, false to remove the flag.
-     *
-     */
-    suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit>
-
-    /**
-     * Clear the event cache storage for the current room.
-     */
-    suspend fun clearEventCacheStorage(): Result<Unit>
-
     /**
      * Create a poll in the room.
      *
@@ -321,82 +192,19 @@ interface MatrixRoom : Closeable {
      */
     suspend fun typingNotice(isTyping: Boolean): Result<Unit>
 
-    /**
-     * Generates a Widget url to display in a [android.webkit.WebView] given the provided parameters.
-     * @param widgetSettings The widget settings to use.
-     * @param clientId The client id to use. It should be unique per app install.
-     * @param languageTag The language tag to use. If null, the default language will be used.
-     * @param theme The theme to use. If null, the default theme will be used.
-     * @return The resulting url, or a failure.
-     */
-    suspend fun generateWidgetWebViewUrl(
-        widgetSettings: MatrixWidgetSettings,
-        clientId: String,
-        languageTag: String?,
-        theme: String?,
-    ): Result<String>
+    suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit>
 
-    /**
-     * Get a [MatrixWidgetDriver] for the provided [widgetSettings].
-     * @param widgetSettings The widget settings to use.
-     * @return The resulting [MatrixWidgetDriver], or a failure.
-     */
-    fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver>
+    suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit>
 
-    /**
-     * Get the permalink for the room.
-     */
-    suspend fun getPermalink(): Result<String>
+    suspend fun cancelSend(transactionId: TransactionId): Result<Unit>
 
-    /**
-     * Get the permalink for the provided [eventId].
-     * @param eventId The event id to get the permalink for.
-     * @return The permalink, or a failure.
-     */
-    suspend fun getPermalinkFor(eventId: EventId): Result<String>
+    suspend fun inviteUserById(id: UserId): Result<Unit>
 
-    /**
-     * Send an Element Call started notification if needed.
-     */
-    suspend fun sendCallNotificationIfNeeded(): Result<Unit>
+    suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit>
 
-    suspend fun setSendQueueEnabled(enabled: Boolean)
+    suspend fun removeAvatar(): Result<Unit>
 
-    /**
-     * Store the given `ComposerDraft` in the state store of this room.
-     */
-    suspend fun saveComposerDraft(composerDraft: ComposerDraft): Result<Unit>
-
-    /**
-     * Retrieve the `ComposerDraft` stored in the state store for this room.
-     */
-    suspend fun loadComposerDraft(): Result<ComposerDraft?>
-
-    /**
-     * Clear the `ComposerDraft` stored in the state store for this room.
-     */
-    suspend fun clearComposerDraft(): Result<Unit>
-
-    /**
-     * Ignore the local trust for the given devices and resend messages that failed to send because said devices are unverified.
-     *
-     * @param devices The map of users identifiers to device identifiers received in the error
-     * @param sendHandle The send queue handle of the local echo the send error applies to. It can be used to retry the upload.
-     *
-     */
-    suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle): Result<Unit>
-
-    /**
-     * Remove verification requirements for the given users and
-     * resend messages that failed to send because their identities were no longer verified.
-     *
-     * @param userIds The list of users identifiers received in the error.
-     * @param sendHandle The send queue handle of the local echo the send error applies to. It can be used to retry the upload.
-     *
-     */
-    suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle): Result<Unit>
-
-    override fun close() = destroy()
+    suspend fun updateRoomNotificationSettings(): Result<Unit>
 
     /**
      * Update the canonical alias of the room.
@@ -418,12 +226,6 @@ interface MatrixRoom : Closeable {
      */
     suspend fun updateHistoryVisibility(historyVisibility: RoomHistoryVisibility): Result<Unit>
 
-    /**
-     * Returns the visibility for this room in the room directory.
-     * If the room is not published, the result will be [RoomVisibility.Private].
-     */
-    suspend fun getRoomVisibility(): Result<RoomVisibility>
-
     /**
      * Publish a new room alias for this room in the room directory.
      *
@@ -454,5 +256,69 @@ interface MatrixRoom : Closeable {
      */
     suspend fun updateJoinRule(joinRule: JoinRule): Result<Unit>
 
-    suspend fun getUpdatedIsEncrypted(): Result<Boolean>
+    suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit>
+
+    suspend fun updatePowerLevels(roomPowerLevels: RoomPowerLevels): Result<Unit>
+
+    suspend fun resetPowerLevels(): Result<RoomPowerLevels>
+
+    suspend fun setName(name: String): Result<Unit>
+
+    suspend fun setTopic(topic: String): Result<Unit>
+
+    suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit>
+
+    suspend fun kickUser(userId: UserId, reason: String? = null): Result<Unit>
+
+    suspend fun banUser(userId: UserId, reason: String? = null): Result<Unit>
+
+    suspend fun unbanUser(userId: UserId, reason: String? = null): Result<Unit>
+
+    /**
+     * Generates a Widget url to display in a [android.webkit.WebView] given the provided parameters.
+     * @param widgetSettings The widget settings to use.
+     * @param clientId The client id to use. It should be unique per app install.
+     * @param languageTag The language tag to use. If null, the default language will be used.
+     * @param theme The theme to use. If null, the default theme will be used.
+     * @return The resulting url, or a failure.
+     */
+    suspend fun generateWidgetWebViewUrl(
+        widgetSettings: MatrixWidgetSettings,
+        clientId: String,
+        languageTag: String?,
+        theme: String?,
+    ): Result<String>
+
+    /**
+     * Get a [MatrixWidgetDriver] for the provided [widgetSettings].
+     * @param widgetSettings The widget settings to use.
+     * @return The resulting [MatrixWidgetDriver], or a failure.
+     */
+    fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver>
+
+    /**
+     * Send an Element Call started notification if needed.
+     */
+    suspend fun sendCallNotificationIfNeeded(): Result<Unit>
+
+    suspend fun setSendQueueEnabled(enabled: Boolean)
+
+    /**
+     * Ignore the local trust for the given devices and resend messages that failed to send because said devices are unverified.
+     *
+     * @param devices The map of users identifiers to device identifiers received in the error
+     * @param sendHandle The send queue handle of the local echo the send error applies to. It can be used to retry the upload.
+     *
+     */
+    suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle): Result<Unit>
+
+    /**
+     * Remove verification requirements for the given users and
+     * resend messages that failed to send because their identities were no longer verified.
+     *
+     * @param userIds The list of users identifiers received in the error.
+     * @param sendHandle The send queue handle of the local echo the send error applies to. It can be used to retry the upload.
+     *
+     */
+    suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle): Result<Unit>
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomNotificationSettingsState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomNotificationSettingsState.kt
deleted file mode 100644
index 05d9abb30b..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomNotificationSettingsState.kt
+++ /dev/null
@@ -1,24 +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.libraries.matrix.api.room
-
-sealed interface MatrixRoomNotificationSettingsState {
-    data object Unknown : MatrixRoomNotificationSettingsState
-    data class Pending(val prevRoomNotificationSettings: RoomNotificationSettings? = null) : MatrixRoomNotificationSettingsState
-    data class Error(val failure: Throwable, val prevRoomNotificationSettings: RoomNotificationSettings? = null) : MatrixRoomNotificationSettingsState
-    data class Ready(val roomNotificationSettings: RoomNotificationSettings) : MatrixRoomNotificationSettingsState
-}
-
-fun MatrixRoomNotificationSettingsState.roomNotificationSettings(): RoomNotificationSettings? {
-    return when (this) {
-        is MatrixRoomNotificationSettingsState.Ready -> roomNotificationSettings
-        is MatrixRoomNotificationSettingsState.Pending -> prevRoomNotificationSettings
-        is MatrixRoomNotificationSettingsState.Error -> prevRoomNotificationSettings
-        else -> null
-    }
-}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomPreview.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
similarity index 60%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomPreview.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
index 6dd8ac0992..b83292e0f2 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomPreview.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/NotJoinedRoom.kt
@@ -7,21 +7,12 @@
 
 package io.element.android.libraries.matrix.api.room
 
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
 
 /** A reference to a room either invited, knocked or banned. */
-interface RoomPreview : AutoCloseable {
-    val sessionId: SessionId
-    val info: RoomPreviewInfo
-
-    /** Leave the room ie.decline invite or cancel knock. */
-    suspend fun leave(): Result<Unit>
-
-    /**
-     * Forget the room if we had access to it, and it was left or banned.
-     */
-    suspend fun forget(): Result<Unit>
+interface NotJoinedRoom : AutoCloseable {
+    val previewInfo: RoomPreviewInfo
+    val localRoom: BaseRoom?
 
     /**
      * Get the membership details of the user in the room, as well as from the user who sent the `m.room.member` event.
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
similarity index 99%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
index ad526c6b40..1c4957fd74 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomInfo.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt
@@ -19,7 +19,7 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 
 @Immutable
-data class MatrixRoomInfo(
+data class RoomInfo(
     val id: RoomId,
     /** The room's name from the room state event if received from sync, or one that's been computed otherwise. */
     val name: String?,
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt
index 3dd54db9b1..4f0bf2dcae 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomIsDmCheck.kt
@@ -21,11 +21,11 @@ fun isDm(isDirect: Boolean, activeMembersCount: Int): Boolean {
 }
 
 /**
- * Returns whether the [MatrixRoom] is a DM, with an updated state from the latest [MatrixRoomInfo].
+ * Returns whether the [BaseRoom] is a DM, with an updated state from the latest [RoomInfo].
  */
-suspend fun MatrixRoom.isDm() = roomInfoFlow.first().isDm
+suspend fun BaseRoom.isDm() = roomInfoFlow.first().isDm
 
 /**
- * Returns whether the [MatrixRoomInfo] is from a DM.
+ * Returns whether the [RoomInfo] is from a DM.
  */
-val MatrixRoomInfo.isDm get() = isDm(isDirect, activeMembersCount.toInt())
+val RoomInfo.isDm get() = isDm(isDirect, activeMembersCount.toInt())
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomMembersState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
similarity index 56%
rename from libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomMembersState.kt
rename to libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
index 860367b202..ab857e5d63 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoomMembersState.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMembersState.kt
@@ -11,26 +11,26 @@ import androidx.compose.runtime.Immutable
 import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
-sealed interface MatrixRoomMembersState {
-    data object Unknown : MatrixRoomMembersState
-    data class Pending(val prevRoomMembers: ImmutableList<RoomMember>? = null) : MatrixRoomMembersState
-    data class Error(val failure: Throwable, val prevRoomMembers: ImmutableList<RoomMember>? = null) : MatrixRoomMembersState
-    data class Ready(val roomMembers: ImmutableList<RoomMember>) : MatrixRoomMembersState
+sealed interface RoomMembersState {
+    data object Unknown : RoomMembersState
+    data class Pending(val prevRoomMembers: ImmutableList<RoomMember>? = null) : RoomMembersState
+    data class Error(val failure: Throwable, val prevRoomMembers: ImmutableList<RoomMember>? = null) : RoomMembersState
+    data class Ready(val roomMembers: ImmutableList<RoomMember>) : RoomMembersState
 }
 
-fun MatrixRoomMembersState.roomMembers(): List<RoomMember>? {
+fun RoomMembersState.roomMembers(): List<RoomMember>? {
     return when (this) {
-        is MatrixRoomMembersState.Ready -> roomMembers
-        is MatrixRoomMembersState.Pending -> prevRoomMembers
-        is MatrixRoomMembersState.Error -> prevRoomMembers
+        is RoomMembersState.Ready -> roomMembers
+        is RoomMembersState.Pending -> prevRoomMembers
+        is RoomMembersState.Error -> prevRoomMembers
         else -> null
     }
 }
 
-fun MatrixRoomMembersState.joinedRoomMembers(): List<RoomMember> {
+fun RoomMembersState.joinedRoomMembers(): List<RoomMember> {
     return roomMembers().orEmpty().filter { it.membership == RoomMembershipState.JOIN }
 }
 
-fun MatrixRoomMembersState.activeRoomMembers(): List<RoomMember> {
+fun RoomMembersState.activeRoomMembers(): List<RoomMember> {
     return roomMembers().orEmpty().filter { it.membership.isActive() }
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt
new file mode 100644
index 0000000000..15c1003317
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomNotificationSettingsState.kt
@@ -0,0 +1,24 @@
+/*
+ * 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.libraries.matrix.api.room
+
+sealed interface RoomNotificationSettingsState {
+    data object Unknown : RoomNotificationSettingsState
+    data class Pending(val prevRoomNotificationSettings: RoomNotificationSettings? = null) : RoomNotificationSettingsState
+    data class Error(val failure: Throwable, val prevRoomNotificationSettings: RoomNotificationSettings? = null) : RoomNotificationSettingsState
+    data class Ready(val roomNotificationSettings: RoomNotificationSettings) : RoomNotificationSettingsState
+}
+
+fun RoomNotificationSettingsState.roomNotificationSettings(): RoomNotificationSettings? {
+    return when (this) {
+        is RoomNotificationSettingsState.Ready -> roomNotificationSettings
+        is RoomNotificationSettingsState.Pending -> prevRoomNotificationSettings
+        is RoomNotificationSettingsState.Error -> prevRoomNotificationSettings
+        else -> null
+    }
+}
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
index 25adbdf3be..0b3bcdbc1c 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
@@ -8,12 +8,12 @@
 package io.element.android.libraries.matrix.api.room.alias
 
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 
 /**
  * Return true if the given roomIdOrAlias is the same room as this room.
  */
-fun MatrixRoom.matches(roomIdOrAlias: RoomIdOrAlias): Boolean {
+fun BaseRoom.matches(roomIdOrAlias: RoomIdOrAlias): Boolean {
     return when (roomIdOrAlias) {
         is RoomIdOrAlias.Id -> {
             roomIdOrAlias.roomId == roomId
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt
index 3206657f12..49bc4afcd6 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomMembersWithRole.kt
@@ -7,7 +7,7 @@
 
 package io.element.android.libraries.matrix.api.room.powerlevels
 
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import kotlinx.collections.immutable.ImmutableList
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.map
 /**
  * Return a flow of the list of active room members who have the given role.
  */
-fun MatrixRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember>> {
+fun BaseRoom.usersWithRole(role: RoomMember.Role): Flow<ImmutableList<RoomMember>> {
     return roomInfoFlow
         .map { it.userPowerLevels.filter { (_, powerLevel) -> RoomMember.Role.forPowerLevel(powerLevel) == role } }
         .combine(membersStateFlow) { powerLevels, membersState ->
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomPowerLevels.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomPowerLevels.kt
deleted file mode 100644
index a17d4ad610..0000000000
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/MatrixRoomPowerLevels.kt
+++ /dev/null
@@ -1,70 +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.libraries.matrix.api.room.powerlevels
-
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.api.room.StateEventType
-
-data class MatrixRoomPowerLevels(
-    val ban: Long,
-    val invite: Long,
-    val kick: Long,
-    val sendEvents: Long,
-    val redactEvents: Long,
-    val roomName: Long,
-    val roomAvatar: Long,
-    val roomTopic: Long,
-)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserInvite] with our own user.
- */
-suspend fun MatrixRoom.canInvite(): Result<Boolean> = canUserInvite(sessionId)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserKick] with our own user.
- */
-suspend fun MatrixRoom.canKick(): Result<Boolean> = canUserKick(sessionId)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserBan] with our own user.
- */
-suspend fun MatrixRoom.canBan(): Result<Boolean> = canUserBan(sessionId)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserSendState] with our own user.
- */
-suspend fun MatrixRoom.canSendState(type: StateEventType): Result<Boolean> = canUserSendState(sessionId, type)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserSendMessage] with our own user.
- */
-suspend fun MatrixRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type)
-
-/**
- * Shortcut for calling [MatrixRoom.canUserRedactOwn] with our own user.
- */
-suspend fun MatrixRoom.canRedactOwn(): Result<Boolean> = canUserRedactOwn(sessionId)
-
-/**
- * Shortcut for calling [MatrixRoom.canRedactOther] with our own user.
- */
-suspend fun MatrixRoom.canRedactOther(): Result<Boolean> = canUserRedactOther(sessionId)
-
-/**
- * Shortcut for checking if current user can handle knock requests.
- */
-suspend fun MatrixRoom.canHandleKnockRequests(): Result<Boolean> = runCatching {
-    canInvite().getOrThrow() || canBan().getOrThrow() || canKick().getOrThrow()
-}
-
-/**
- * Shortcut for calling [MatrixRoom.canUserPinUnpin] with our own user.
- */
-suspend fun MatrixRoom.canPinUnpin(): Result<Boolean> = canUserPinUnpin(sessionId)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt
new file mode 100644
index 0000000000..95cbf58e17
--- /dev/null
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/powerlevels/RoomPowerLevels.kt
@@ -0,0 +1,70 @@
+/*
+ * 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.libraries.matrix.api.room.powerlevels
+
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.StateEventType
+
+data class RoomPowerLevels(
+    val ban: Long,
+    val invite: Long,
+    val kick: Long,
+    val sendEvents: Long,
+    val redactEvents: Long,
+    val roomName: Long,
+    val roomAvatar: Long,
+    val roomTopic: Long,
+)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserInvite] with our own user.
+ */
+suspend fun BaseRoom.canInvite(): Result<Boolean> = canUserInvite(sessionId)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserKick] with our own user.
+ */
+suspend fun BaseRoom.canKick(): Result<Boolean> = canUserKick(sessionId)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserBan] with our own user.
+ */
+suspend fun BaseRoom.canBan(): Result<Boolean> = canUserBan(sessionId)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserSendState] with our own user.
+ */
+suspend fun BaseRoom.canSendState(type: StateEventType): Result<Boolean> = canUserSendState(sessionId, type)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserSendMessage] with our own user.
+ */
+suspend fun BaseRoom.canSendMessage(type: MessageEventType): Result<Boolean> = canUserSendMessage(sessionId, type)
+
+/**
+ * Shortcut for calling [BaseRoom.canUserRedactOwn] with our own user.
+ */
+suspend fun BaseRoom.canRedactOwn(): Result<Boolean> = canUserRedactOwn(sessionId)
+
+/**
+ * Shortcut for calling [BaseRoom.canRedactOther] with our own user.
+ */
+suspend fun BaseRoom.canRedactOther(): Result<Boolean> = canUserRedactOther(sessionId)
+
+/**
+ * Shortcut for checking if current user can handle knock requests.
+ */
+suspend fun BaseRoom.canHandleKnockRequests(): Result<Boolean> = runCatching {
+    canInvite().getOrThrow() || canBan().getOrThrow() || canKick().getOrThrow()
+}
+
+/**
+ * Shortcut for calling [BaseRoom.canUserPinUnpin] with our own user.
+ */
+suspend fun BaseRoom.canPinUnpin(): Result<Boolean> = canUserPinUnpin(sessionId)
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
index 973b5cca0d..e0a51ef005 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/recent/RecentDirectRoom.kt
@@ -10,8 +10,8 @@ package io.element.android.libraries.matrix.api.room.recent
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.api.user.MatrixUser
@@ -52,6 +52,6 @@ suspend fun MatrixClient.getRecentDirectRooms(
     return result
 }
 
-suspend fun MatrixRoom.isJoined(): Boolean {
+suspend fun BaseRoom.isJoined(): Boolean {
     return roomInfoFlow.first().currentUserMembership == CurrentUserMembership.JOINED
 }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
index 099f2d865c..c4f1851089 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomSummary.kt
@@ -7,11 +7,11 @@
 
 package io.element.android.libraries.matrix.api.roomlist
 
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
 
 data class RoomSummary(
-    val info: MatrixRoomInfo,
+    val info: RoomInfo,
     val lastMessage: RoomMessage?,
 ) {
     val roomId = info.id
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
index c0f191a85b..bf062b76e0 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventContent.kt
@@ -70,7 +70,8 @@ data class UnableToDecryptContent(
 data class RoomMembershipContent(
     val userId: UserId,
     val userDisplayName: String?,
-    val change: MembershipChange?
+    val change: MembershipChange?,
+    val reason: String?,
 ) : EventContent
 
 data class ProfileChangeContent(
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index 0606318f16..9dba6fc589 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -30,11 +30,12 @@ import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
@@ -55,13 +56,15 @@ import io.element.android.libraries.matrix.impl.notification.RustNotificationSer
 import io.element.android.libraries.matrix.impl.notificationsettings.RustNotificationSettingsService
 import io.element.android.libraries.matrix.impl.oidc.toRustAction
 import io.element.android.libraries.matrix.impl.pushers.RustPushersService
+import io.element.android.libraries.matrix.impl.room.GetRoomResult
+import io.element.android.libraries.matrix.impl.room.NotJoinedRustRoom
 import io.element.android.libraries.matrix.impl.room.RoomContentForwarder
 import io.element.android.libraries.matrix.impl.room.RoomSyncSubscriber
 import io.element.android.libraries.matrix.impl.room.RustRoomFactory
-import io.element.android.libraries.matrix.impl.room.RustRoomPreview
 import io.element.android.libraries.matrix.impl.room.TimelineEventTypeFilterFactory
 import io.element.android.libraries.matrix.impl.room.history.map
 import io.element.android.libraries.matrix.impl.room.join.map
+import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
 import io.element.android.libraries.matrix.impl.roomdirectory.RustRoomDirectoryService
 import io.element.android.libraries.matrix.impl.roomdirectory.map
 import io.element.android.libraries.matrix.impl.roomlist.RoomListFactory
@@ -186,6 +189,7 @@ class RustMatrixClient(
 
     private val roomMembershipObserver = RoomMembershipObserver()
     private val roomFactory = RustRoomFactory(
+        innerClient = innerClient,
         roomListService = roomListService,
         innerRoomListService = innerRoomListService,
         sessionId = sessionId,
@@ -263,12 +267,12 @@ class RustMatrixClient(
         }
     }
 
-    override suspend fun getRoom(roomId: RoomId): MatrixRoom? {
-        return roomFactory.create(roomId)
+    override suspend fun getRoom(roomId: RoomId): BaseRoom? = withContext(sessionDispatcher) {
+        roomFactory.getBaseRoom(roomId)
     }
 
-    override suspend fun getPendingRoom(roomId: RoomId): RoomPreview? {
-        return roomFactory.createRoomPreview(roomId)
+    override suspend fun getJoinedRoom(roomId: RoomId): JoinedRoom? = withContext(sessionDispatcher) {
+        (roomFactory.getJoinedRoomOrPreview(roomId) as? GetRoomResult.Joined)?.joinedRoom
     }
 
     /**
@@ -455,13 +459,29 @@ class RustMatrixClient(
         }
     }
 
-    override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomPreview> = withContext(sessionDispatcher) {
+    override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<NotJoinedRoom> = withContext(sessionDispatcher) {
         runCatching {
-            val roomPreview = when (roomIdOrAlias) {
-                is RoomIdOrAlias.Alias -> innerClient.getRoomPreviewFromRoomAlias(roomIdOrAlias.roomAlias.value)
-                is RoomIdOrAlias.Id -> innerClient.getRoomPreviewFromRoomId(roomIdOrAlias.roomId.value, serverNames)
+            when (roomIdOrAlias) {
+                is RoomIdOrAlias.Alias -> {
+                    val roomId = innerClient.resolveRoomAlias(roomIdOrAlias.roomAlias.value)?.roomId?.let { RoomId(it) }
+
+                    var room = (roomId?.let { roomFactory.getJoinedRoomOrPreview(it) } as? GetRoomResult.NotJoined)?.notJoinedRoom
+                    if (room == null) {
+                        val preview = innerClient.getRoomPreviewFromRoomAlias(roomIdOrAlias.roomAlias.value)
+                        room = NotJoinedRustRoom(sessionId, null, RoomPreviewInfoMapper.map(preview.info()))
+                    }
+                    room
+                }
+                is RoomIdOrAlias.Id -> {
+                    var room = (roomFactory.getJoinedRoomOrPreview(roomIdOrAlias.roomId) as? GetRoomResult.NotJoined)?.notJoinedRoom
+
+                    if (room == null) {
+                        val preview = innerClient.getRoomPreviewFromRoomId(roomIdOrAlias.roomId.value, serverNames)
+                        room = NotJoinedRustRoom(sessionId, null, RoomPreviewInfoMapper.map(preview.info()))
+                    }
+                    room
+                }
             }
-            RustRoomPreview(sessionId, roomPreview, roomMembershipObserver)
         }.mapFailure { it.mapClientException() }
     }
 
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
index 1e76e69fa4..2770dc1250 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExt.kt
@@ -8,7 +8,7 @@
 package io.element.android.libraries.matrix.impl.analytics
 
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.isDm
 import kotlinx.coroutines.flow.first
 
@@ -24,7 +24,7 @@ private fun Long.toAnalyticsRoomSize(): JoinedRoom.RoomSize {
     }
 }
 
-suspend fun MatrixRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
+suspend fun BaseRoom.toAnalyticsJoinedRoom(trigger: JoinedRoom.Trigger?): JoinedRoom {
     val roomInfo = roomInfoFlow.first()
     return JoinedRoom(
         isDM = roomInfo.isDm,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
index c7fa9598ff..7175913dad 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationException.kt
@@ -9,6 +9,7 @@ package io.element.android.libraries.matrix.impl.auth
 
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.matrix.rustcomponents.sdk.ClientBuildException
+import org.matrix.rustcomponents.sdk.OidcException
 
 fun Throwable.mapAuthenticationException(): AuthenticationException {
     val message = this.message ?: "Unknown error"
@@ -24,6 +25,13 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
             is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
             is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
         }
+        is OidcException -> when (this) {
+            is OidcException.Generic -> AuthenticationException.Oidc(message)
+            is OidcException.CallbackUrlInvalid -> AuthenticationException.Oidc(message)
+            is OidcException.Cancelled -> AuthenticationException.Oidc(message)
+            is OidcException.MetadataInvalid -> AuthenticationException.Oidc(message)
+            is OidcException.NotSupported -> AuthenticationException.Oidc(message)
+        }
         else -> AuthenticationException.Generic(message)
     }
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
index ec220112de..ea398f935d 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProvider.kt
@@ -7,24 +7,23 @@
 
 package io.element.android.libraries.matrix.impl.auth
 
+import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.auth.OidcConfig
+import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
 import org.matrix.rustcomponents.sdk.OidcConfiguration
 import javax.inject.Inject
 
-class OidcConfigurationProvider @Inject constructor() {
+class OidcConfigurationProvider @Inject constructor(
+    private val buildMeta: BuildMeta,
+    private val oidcRedirectUrlProvider: OidcRedirectUrlProvider,
+) {
     fun get(): OidcConfiguration = OidcConfiguration(
-        clientName = "Element",
-        redirectUri = OidcConfig.REDIRECT_URI,
-        clientUri = "https://element.io",
-        logoUri = "https://element.io/mobile-icon.png",
-        tosUri = "https://element.io/acceptable-use-policy-terms",
-        policyUri = "https://element.io/privacy",
-        contacts = listOf(
-            "support@element.io",
-        ),
-        // Some homeservers/auth issuers don't support dynamic client registration, and have to be registered manually
-        staticRegistrations = mapOf(
-            "https://id.thirdroom.io/realms/thirdroom" to "elementx",
-        ),
+        clientName = buildMeta.applicationName,
+        redirectUri = oidcRedirectUrlProvider.provide(),
+        clientUri = OidcConfig.CLIENT_URI,
+        logoUri = OidcConfig.LOGO_URI,
+        tosUri = OidcConfig.TOS_URI,
+        policyUri = OidcConfig.POLICY_URI,
+        staticRegistrations = OidcConfig.STATIC_REGISTRATIONS,
     )
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
index 33af371569..b03e0c9af4 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationService.kt
@@ -137,6 +137,7 @@ class RustMatrixAuthenticationService @Inject constructor(
             }.onFailure {
                 clear()
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to set homeserver to $homeserver")
                 failure.mapAuthenticationException()
             }
         }
@@ -162,6 +163,7 @@ class RustMatrixAuthenticationService @Inject constructor(
 
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to login")
                 failure.mapAuthenticationException()
             }
         }
@@ -197,6 +199,7 @@ class RustMatrixAuthenticationService @Inject constructor(
                 pendingOAuthAuthorizationData = oAuthAuthorizationData
                 OidcDetails(url)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to get OIDC URL")
                 failure.mapAuthenticationException()
             }
         }
@@ -210,6 +213,7 @@ class RustMatrixAuthenticationService @Inject constructor(
                 }
                 pendingOAuthAuthorizationData = null
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to cancel OIDC login")
                 failure.mapAuthenticationException()
             }
         }
@@ -243,6 +247,7 @@ class RustMatrixAuthenticationService @Inject constructor(
 
                 SessionId(sessionData.userId)
             }.mapFailure { failure ->
+                Timber.e(failure, "Failed to login with OIDC")
                 failure.mapAuthenticationException()
             }
         }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
similarity index 68%
rename from libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
rename to libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt
index 7ed2ad5eb6..da5ad50bc9 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.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.
@@ -17,7 +17,6 @@ import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SendHandle
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
@@ -28,55 +27,43 @@ import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.poll.PollKind
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.IntentionalMention
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
-import io.element.android.libraries.matrix.api.room.MatrixRoomNotificationSettingsState
-import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.StateEventType
-import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomNotificationSettingsState
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.room.roomNotificationSettings
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
 import io.element.android.libraries.matrix.impl.core.RustSendHandle
 import io.element.android.libraries.matrix.impl.mapper.map
-import io.element.android.libraries.matrix.impl.room.draft.into
 import io.element.android.libraries.matrix.impl.room.history.map
 import io.element.android.libraries.matrix.impl.room.join.map
 import io.element.android.libraries.matrix.impl.room.knock.RustKnockRequest
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
-import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.room.powerlevels.RoomPowerLevelsMapper
 import io.element.android.libraries.matrix.impl.roomdirectory.map
 import io.element.android.libraries.matrix.impl.timeline.RustTimeline
-import io.element.android.libraries.matrix.impl.timeline.toRustReceiptType
 import io.element.android.libraries.matrix.impl.util.MessageEventContent
 import io.element.android.libraries.matrix.impl.util.mxCallbackFlow
 import io.element.android.libraries.matrix.impl.widget.RustWidgetDriver
 import io.element.android.libraries.matrix.impl.widget.generateWidgetWebViewUrl
 import io.element.android.services.toolbox.api.systemclock.SystemClock
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.drop
@@ -89,7 +76,6 @@ import kotlinx.coroutines.withContext
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
 import org.matrix.rustcomponents.sdk.KnockRequestsListener
-import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomInfoListener
 import org.matrix.rustcomponents.sdk.RoomMessageEventMessageType
 import org.matrix.rustcomponents.sdk.TimelineConfiguration
@@ -103,40 +89,36 @@ import org.matrix.rustcomponents.sdk.getElementCallRequiredPermissions
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPowerLevelChanges
-import uniffi.matrix_sdk_base.EncryptionState
 import java.io.File
 import kotlin.coroutines.cancellation.CancellationException
 import org.matrix.rustcomponents.sdk.IdentityStatusChange as RustIdentityStateChange
 import org.matrix.rustcomponents.sdk.KnockRequest as InnerKnockRequest
-import org.matrix.rustcomponents.sdk.Room as InnerRoom
+import org.matrix.rustcomponents.sdk.RoomInfo as InnerRoomInfo
 import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline
 
-@Suppress("LargeClass")
-class RustMatrixRoom(
-    override val sessionId: SessionId,
-    private val deviceId: DeviceId,
-    private val innerRoom: InnerRoom,
-    innerTimeline: InnerTimeline,
+class JoinedRustRoom(
+    private val baseRoom: RustBaseRoom,
+    private val liveInnerTimeline: InnerTimeline,
     private val notificationSettingsService: NotificationSettingsService,
-    sessionCoroutineScope: CoroutineScope,
     private val coroutineDispatchers: CoroutineDispatchers,
+    private val roomInfoMapper: RoomInfoMapper,
     private val systemClock: SystemClock,
     private val roomContentForwarder: RoomContentForwarder,
-    private val roomSyncSubscriber: RoomSyncSubscriber,
-    private val matrixRoomInfoMapper: MatrixRoomInfoMapper,
     private val featureFlagService: FeatureFlagService,
-    private val roomMembershipObserver: RoomMembershipObserver,
-    initialRoomInfo: MatrixRoomInfo,
-) : MatrixRoom {
-    override val roomId = RoomId(innerRoom.id())
+) : JoinedRoom, BaseRoom by baseRoom {
+    // Create a dispatcher for all room methods...
+    private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
+    private val innerRoom = baseRoom.innerRoom
 
-    override val roomInfoFlow: StateFlow<MatrixRoomInfo> = mxCallbackFlow {
+    override val syncUpdateFlow = MutableStateFlow(0L)
+
+    override val roomInfoFlow: StateFlow<io.element.android.libraries.matrix.api.room.RoomInfo> = mxCallbackFlow {
         innerRoom.subscribeToRoomInfoUpdates(object : RoomInfoListener {
-            override fun call(roomInfo: RoomInfo) {
-                channel.trySend(matrixRoomInfoMapper.map(roomInfo))
+            override fun call(roomInfo: InnerRoomInfo) {
+                channel.trySend(roomInfoMapper.map(roomInfo))
             }
         })
-    }.stateIn(sessionCoroutineScope, started = SharingStarted.Lazily, initialValue = initialRoomInfo)
+    }.stateIn(roomCoroutineScope, started = SharingStarted.Lazily, initialValue = baseRoom.info())
 
     override val roomTypingMembersFlow: Flow<List<UserId>> = mxCallbackFlow {
         val initial = emptyList<UserId>()
@@ -178,27 +160,12 @@ class RustMatrixRoom(
         })
     }
 
-    // Create a dispatcher for all room methods...
-    private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
+    override val roomNotificationSettingsStateFlow = MutableStateFlow<RoomNotificationSettingsState>(RoomNotificationSettingsState.Unknown)
 
-    // ...except getMember methods as it could quickly fill the roomDispatcher...
-    private val roomMembersDispatcher = coroutineDispatchers.io.limitedParallelism(8)
-
-    override val roomCoroutineScope = sessionCoroutineScope.childScope(coroutineDispatchers.main, "RoomScope-$roomId")
-    private val _syncUpdateFlow = MutableStateFlow(0L)
-    private val roomMemberListFetcher = RoomMemberListFetcher(innerRoom, roomMembersDispatcher)
-
-    private val _roomNotificationSettingsStateFlow = MutableStateFlow<MatrixRoomNotificationSettingsState>(MatrixRoomNotificationSettingsState.Unknown)
-    override val roomNotificationSettingsStateFlow: StateFlow<MatrixRoomNotificationSettingsState> = _roomNotificationSettingsStateFlow
-
-    override val liveTimeline = createTimeline(innerTimeline, mode = Timeline.Mode.LIVE) {
-        _syncUpdateFlow.value = systemClock.epochMillis()
+    override val liveTimeline = liveInnerTimeline.map(mode = Timeline.Mode.LIVE) {
+        syncUpdateFlow.value = systemClock.epochMillis()
     }
 
-    override val membersStateFlow: StateFlow<MatrixRoomMembersState> = roomMemberListFetcher.membersFlow
-
-    override val syncUpdateFlow: StateFlow<Long> = _syncUpdateFlow.asStateFlow()
-
     init {
         val powerLevelChanges = roomInfoFlow.map { it.userPowerLevels }.distinctUntilChanged()
         val membershipChanges = liveTimeline.membershipChangeEventReceived.onStart { emit(Unit) }
@@ -206,12 +173,13 @@ class RustMatrixRoom(
             // Skip initial one
             .drop(1)
             // The new events should already be in the SDK cache, no need to fetch them from the server
-            .onEach { roomMemberListFetcher.fetchRoomMembers(source = RoomMemberListFetcher.Source.CACHE) }
+            .onEach { baseRoom.roomMemberListFetcher.fetchRoomMembers(source = RoomMemberListFetcher.Source.CACHE) }
             .launchIn(roomCoroutineScope)
+            .invokeOnCompletion {
+                Timber.d("Observing membership changes for room $roomId stopped, reason: $it")
+            }
     }
 
-    override suspend fun subscribeToSync() = roomSyncSubscriber.subscribe(roomId)
-
     override suspend fun createTimeline(
         createTimelineParams: CreateTimelineParams,
     ): Result<Timeline> = withContext(roomDispatcher) {
@@ -273,17 +241,14 @@ class RustMatrixRoom(
                     dateDividerMode = dateDividerMode,
                     trackReadReceipts = trackReadReceipts,
                 )
-            ).let { inner ->
+            ).let { innerTimeline ->
                 val mode = when (createTimelineParams) {
                     is CreateTimelineParams.Focused -> Timeline.Mode.FOCUSED_ON_EVENT
                     is CreateTimelineParams.MediaOnly -> Timeline.Mode.MEDIA
                     is CreateTimelineParams.MediaOnlyFocused -> Timeline.Mode.FOCUSED_ON_EVENT
                     CreateTimelineParams.PinnedOnly -> Timeline.Mode.PINNED_EVENTS
                 }
-                createTimeline(
-                    timeline = inner,
-                    mode = mode,
-                )
+                innerTimeline.map(mode = mode)
             }
         }.mapFailure {
             when (createTimelineParams) {
@@ -299,105 +264,8 @@ class RustMatrixRoom(
         }
     }
 
-    override fun destroy() {
-        roomCoroutineScope.cancel()
-        liveTimeline.close()
-    }
-
-    override suspend fun updateMembers() {
-        val useCache = membersStateFlow.value is MatrixRoomMembersState.Unknown
-        val source = if (useCache) {
-            RoomMemberListFetcher.Source.CACHE_AND_SERVER
-        } else {
-            RoomMemberListFetcher.Source.SERVER
-        }
-        roomMemberListFetcher.fetchRoomMembers(source = source)
-    }
-
-    override suspend fun getMembers(limit: Int) = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.members().use {
-                it.nextChunk(limit.toUInt()).orEmpty().map { roomMember ->
-                    RoomMemberMapper.map(roomMember)
-                }
-            }
-        }
-    }
-
-    override suspend fun getUpdatedMember(userId: UserId): Result<RoomMember> = withContext(roomDispatcher) {
-        runCatching {
-            RoomMemberMapper.map(innerRoom.member(userId.value))
-        }
-    }
-
-    override suspend fun userDisplayName(userId: UserId): Result<String?> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.memberDisplayName(userId.value)
-        }
-    }
-
-    override suspend fun updateRoomNotificationSettings(): Result<Unit> = withContext(roomDispatcher) {
-        val currentState = _roomNotificationSettingsStateFlow.value
-        val currentRoomNotificationSettings = currentState.roomNotificationSettings()
-        _roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Pending(prevRoomNotificationSettings = currentRoomNotificationSettings)
-        runCatching {
-            val isEncrypted = roomInfoFlow.value.isEncrypted ?: getUpdatedIsEncrypted().getOrThrow()
-            notificationSettingsService.getRoomNotificationSettings(roomId, isEncrypted, isOneToOne).getOrThrow()
-        }.map {
-            _roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Ready(it)
-        }.onFailure {
-            _roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Error(
-                prevRoomNotificationSettings = currentRoomNotificationSettings,
-                failure = it
-            )
-        }
-    }
-
-    override suspend fun userRole(userId: UserId): Result<RoomMember.Role> = withContext(roomDispatcher) {
-        runCatching {
-            RoomMemberMapper.mapRole(innerRoom.suggestedRoleForUser(userId.value))
-        }
-    }
-
-    override suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit> {
-        return runCatching {
-            val powerLevelChanges = changes.map { UserPowerLevelUpdate(it.userId.value, it.powerLevel) }
-            innerRoom.updatePowerLevelsForUsers(powerLevelChanges)
-        }
-    }
-
-    override suspend fun powerLevels(): Result<MatrixRoomPowerLevels> = withContext(roomDispatcher) {
-        runCatching {
-            RoomPowerLevelsMapper.map(innerRoom.getPowerLevels())
-        }
-    }
-
-    override suspend fun updatePowerLevels(matrixRoomPowerLevels: MatrixRoomPowerLevels): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            val changes = RoomPowerLevelChanges(
-                ban = matrixRoomPowerLevels.ban,
-                invite = matrixRoomPowerLevels.invite,
-                kick = matrixRoomPowerLevels.kick,
-                redact = matrixRoomPowerLevels.redactEvents,
-                eventsDefault = matrixRoomPowerLevels.sendEvents,
-                roomName = matrixRoomPowerLevels.roomName,
-                roomAvatar = matrixRoomPowerLevels.roomAvatar,
-                roomTopic = matrixRoomPowerLevels.roomTopic,
-            )
-            innerRoom.applyPowerLevelChanges(changes)
-        }
-    }
-
-    override suspend fun resetPowerLevels(): Result<MatrixRoomPowerLevels> = withContext(roomDispatcher) {
-        runCatching {
-            RoomPowerLevelsMapper.map(innerRoom.resetPowerLevels())
-        }
-    }
-
-    override suspend fun userAvatarUrl(userId: UserId): Result<String?> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.memberAvatarUrl(userId.value)
-        }
+    override suspend fun sendMessage(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): Result<Unit> {
+        return liveTimeline.sendMessage(body, htmlBody, intentionalMentions)
     }
 
     override suspend fun editMessage(
@@ -413,84 +281,6 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun sendMessage(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): Result<Unit> {
-        return liveTimeline.sendMessage(body, htmlBody, intentionalMentions)
-    }
-
-    override suspend fun leave(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.leave()
-        }.onSuccess {
-            roomMembershipObserver.notifyUserLeftRoom(roomId)
-        }
-    }
-
-    override suspend fun join(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.join()
-        }
-    }
-
-    override suspend fun inviteUserById(id: UserId): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.inviteUserById(id.value)
-        }
-    }
-
-    override suspend fun canUserInvite(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserInvite(userId.value)
-        }
-    }
-
-    override suspend fun canUserKick(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserKick(userId.value)
-        }
-    }
-
-    override suspend fun canUserBan(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserBan(userId.value)
-        }
-    }
-
-    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserRedactOwn(userId.value)
-        }
-    }
-
-    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserRedactOther(userId.value)
-        }
-    }
-
-    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserSendState(userId.value, type.map())
-        }
-    }
-
-    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserSendMessage(userId.value, type.map())
-        }
-    }
-
-    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserTriggerRoomNotification(userId.value)
-        }
-    }
-
-    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.canUserPinUnpin(userId.value)
-        }
-    }
-
     override suspend fun sendImage(
         file: File,
         thumbnailFile: File?,
@@ -593,93 +383,6 @@ class RustMatrixRoom(
         return liveTimeline.sendLocation(body, geoUri, description, zoomLevel, assetType)
     }
 
-    override suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit> {
-        return liveTimeline.toggleReaction(emoji, eventOrTransactionId)
-    }
-
-    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> {
-        return liveTimeline.forwardEvent(eventId, roomIds)
-    }
-
-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
-        return liveTimeline.cancelSend(transactionId)
-    }
-
-    override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.uploadAvatar(mimeType, data, null)
-        }
-    }
-
-    override suspend fun removeAvatar(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.removeAvatar()
-        }
-    }
-
-    override suspend fun setName(name: String): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.setName(name)
-        }
-    }
-
-    override suspend fun setTopic(topic: String): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.setTopic(topic)
-        }
-    }
-
-    override suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.reportContent(eventId = eventId.value, score = null, reason = reason)
-            if (blockUserId != null) {
-                innerRoom.ignoreUser(blockUserId.value)
-            }
-        }
-    }
-
-    override suspend fun clearEventCacheStorage(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.clearEventCacheStorage()
-        }
-    }
-
-    override suspend fun kickUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.kickUser(userId.value, reason)
-        }
-    }
-
-    override suspend fun banUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.banUser(userId.value, reason)
-        }
-    }
-
-    override suspend fun unbanUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.unbanUser(userId.value, reason)
-        }
-    }
-
-    override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.setIsFavourite(isFavorite, null)
-        }
-    }
-
-    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.markAsRead(receiptType.toRustReceiptType())
-        }
-    }
-
-    override suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.setUnreadFlag(isUnread)
-        }
-    }
-
     override suspend fun createPoll(
         question: String,
         answers: List<String>,
@@ -719,95 +422,70 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun generateWidgetWebViewUrl(
-        widgetSettings: MatrixWidgetSettings,
-        clientId: String,
-        languageTag: String?,
-        theme: String?,
-    ) = withContext(roomDispatcher) {
+    override suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit> {
+        return liveTimeline.toggleReaction(emoji, eventOrTransactionId)
+    }
+
+    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> {
+        return liveTimeline.forwardEvent(eventId, roomIds)
+    }
+
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
+        return liveTimeline.cancelSend(transactionId)
+    }
+
+    override suspend fun inviteUserById(id: UserId): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            widgetSettings.generateWidgetWebViewUrl(innerRoom, clientId, languageTag, theme)
+            innerRoom.inviteUserById(id.value)
         }
     }
 
-    override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> {
-        return runCatching {
-            RustWidgetDriver(
-                widgetSettings = widgetSettings,
-                room = innerRoom,
-                widgetCapabilitiesProvider = object : WidgetCapabilitiesProvider {
-                    override fun acquireCapabilities(capabilities: WidgetCapabilities): WidgetCapabilities {
-                        return getElementCallRequiredPermissions(sessionId.value, deviceId.value)
-                    }
-                },
-            )
-        }
-    }
-
-    override suspend fun getPermalink(): Result<String> = withContext(roomDispatcher) {
+    override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.matrixToPermalink()
+            innerRoom.uploadAvatar(mimeType, data, null)
         }
     }
 
-    override suspend fun getPermalinkFor(eventId: EventId): Result<String> = withContext(roomDispatcher) {
+    override suspend fun removeAvatar(): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.matrixToEventPermalink(eventId.value)
+            innerRoom.removeAvatar()
         }
     }
 
-    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun setName(name: String): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.sendCallNotificationIfNeeded()
+            innerRoom.setName(name)
         }
     }
 
-    override suspend fun setSendQueueEnabled(enabled: Boolean) {
-        withContext(roomDispatcher) {
-            Timber.d("setSendQueuesEnabled: $enabled")
-            runCatching {
-                innerRoom.enableSendQueue(enabled)
+    override suspend fun setTopic(topic: String): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.setTopic(topic)
+        }
+    }
+
+    override suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.reportContent(eventId = eventId.value, score = null, reason = reason)
+            if (blockUserId != null) {
+                innerRoom.ignoreUser(blockUserId.value)
             }
         }
     }
 
-    override suspend fun saveComposerDraft(composerDraft: ComposerDraft): Result<Unit> = withContext(roomDispatcher) {
+    override suspend fun updateRoomNotificationSettings(): Result<Unit> = withContext(roomDispatcher) {
+        val currentState = roomNotificationSettingsStateFlow.value
+        val currentRoomNotificationSettings = currentState.roomNotificationSettings()
+        roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Pending(prevRoomNotificationSettings = currentRoomNotificationSettings)
         runCatching {
-            Timber.d("saveComposerDraft: $composerDraft into $roomId")
-            innerRoom.saveComposerDraft(composerDraft.into())
-        }
-    }
-
-    override suspend fun loadComposerDraft(): Result<ComposerDraft?> = withContext(roomDispatcher) {
-        runCatching {
-            Timber.d("loadComposerDraft for $roomId")
-            innerRoom.loadComposerDraft()?.into()
-        }
-    }
-
-    override suspend fun clearComposerDraft(): Result<Unit> = withContext(roomDispatcher) {
-        runCatching {
-            Timber.d("clearComposerDraft for $roomId")
-            innerRoom.clearComposerDraft()
-        }
-    }
-
-    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle) = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.ignoreDeviceTrustAndResend(
-                devices = devices.entries.associate { entry ->
-                    entry.key.value to entry.value.map { it.value }
-                },
-                sendHandle = (sendHandle as RustSendHandle).inner,
-            )
-        }
-    }
-
-    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle) = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.withdrawVerificationAndResend(
-                userIds = userIds.map { it.value },
-                sendHandle = (sendHandle as RustSendHandle).inner,
+            val isEncrypted = roomInfoFlow.value.isEncrypted ?: getUpdatedIsEncrypted().getOrThrow()
+            notificationSettingsService.getRoomNotificationSettings(roomId, isEncrypted, isOneToOne).getOrThrow()
+        }.map {
+            roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Ready(it)
+        }.onFailure {
+            roomNotificationSettingsStateFlow.value = RoomNotificationSettingsState.Error(
+                prevRoomNotificationSettings = currentRoomNotificationSettings,
+                failure = it
             )
         }
     }
@@ -842,12 +520,6 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun getRoomVisibility(): Result<RoomVisibility> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.getRoomVisibility().map()
-        }
-    }
-
     override suspend fun enableEncryption(): Result<Unit> = withContext(roomDispatcher) {
         runCatching {
             innerRoom.enableEncryption()
@@ -860,22 +532,130 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun getUpdatedIsEncrypted(): Result<Boolean> = withContext(roomDispatcher) {
-        runCatching {
-            innerRoom.latestEncryptionState() == EncryptionState.ENCRYPTED
+    override suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit> {
+        return runCatching {
+            val powerLevelChanges = changes.map { UserPowerLevelUpdate(it.userId.value, it.powerLevel) }
+            innerRoom.updatePowerLevelsForUsers(powerLevelChanges)
         }
     }
 
-    private fun createTimeline(
-        timeline: InnerTimeline,
+    override suspend fun updatePowerLevels(roomPowerLevels: RoomPowerLevels): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            val changes = RoomPowerLevelChanges(
+                ban = roomPowerLevels.ban,
+                invite = roomPowerLevels.invite,
+                kick = roomPowerLevels.kick,
+                redact = roomPowerLevels.redactEvents,
+                eventsDefault = roomPowerLevels.sendEvents,
+                roomName = roomPowerLevels.roomName,
+                roomAvatar = roomPowerLevels.roomAvatar,
+                roomTopic = roomPowerLevels.roomTopic,
+            )
+            innerRoom.applyPowerLevelChanges(changes)
+        }
+    }
+
+    override suspend fun resetPowerLevels(): Result<RoomPowerLevels> = withContext(roomDispatcher) {
+        runCatching {
+            RoomPowerLevelsMapper.map(innerRoom.resetPowerLevels())
+        }
+    }
+
+    override suspend fun kickUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.kickUser(userId.value, reason)
+        }
+    }
+
+    override suspend fun banUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.banUser(userId.value, reason)
+        }
+    }
+
+    override suspend fun unbanUser(userId: UserId, reason: String?): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.unbanUser(userId.value, reason)
+        }
+    }
+
+    override suspend fun generateWidgetWebViewUrl(
+        widgetSettings: MatrixWidgetSettings,
+        clientId: String,
+        languageTag: String?,
+        theme: String?,
+    ) = withContext(roomDispatcher) {
+        runCatching {
+            widgetSettings.generateWidgetWebViewUrl(innerRoom, clientId, languageTag, theme)
+        }
+    }
+
+    override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> {
+        return runCatching {
+            RustWidgetDriver(
+                widgetSettings = widgetSettings,
+                room = innerRoom,
+                widgetCapabilitiesProvider = object : WidgetCapabilitiesProvider {
+                    override fun acquireCapabilities(capabilities: WidgetCapabilities): WidgetCapabilities {
+                        return getElementCallRequiredPermissions(sessionId.value, baseRoom.deviceId.value)
+                    }
+                },
+            )
+        }
+    }
+
+    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.sendCallNotificationIfNeeded()
+        }
+    }
+
+    override suspend fun setSendQueueEnabled(enabled: Boolean) {
+        withContext(roomDispatcher) {
+            Timber.d("setSendQueuesEnabled: $enabled")
+            runCatching {
+                innerRoom.enableSendQueue(enabled)
+            }
+        }
+    }
+
+    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle) = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.ignoreDeviceTrustAndResend(
+                devices = devices.entries.associate { entry ->
+                    entry.key.value to entry.value.map { it.value }
+                },
+                sendHandle = (sendHandle as RustSendHandle).inner,
+            )
+        }
+    }
+
+    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle) = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.withdrawVerificationAndResend(
+                userIds = userIds.map { it.value },
+                sendHandle = (sendHandle as RustSendHandle).inner,
+            )
+        }
+    }
+
+    override fun close() = destroy()
+
+    override fun destroy() {
+        baseRoom.destroy()
+        liveInnerTimeline.destroy()
+        roomCoroutineScope.cancel()
+    }
+
+    private fun InnerTimeline.map(
         mode: Timeline.Mode,
         onNewSyncedEvent: () -> Unit = {},
     ): Timeline {
-        val timelineCoroutineScope = roomCoroutineScope.childScope(coroutineDispatchers.main, "TimelineScope-$roomId-$timeline")
+        val timelineCoroutineScope = roomCoroutineScope.childScope(coroutineDispatchers.main, "TimelineScope-$roomId-$this")
         return RustTimeline(
             mode = mode,
-            matrixRoom = this,
-            inner = timeline,
+            joinedRoom = this@JoinedRustRoom,
+            inner = this@map,
             systemClock = systemClock,
             coroutineScope = timelineCoroutineScope,
             dispatcher = roomDispatcher,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt
new file mode 100644
index 0000000000..3f3cb4f6cd
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/NotJoinedRustRoom.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.libraries.matrix.impl.room
+
+import androidx.compose.runtime.Immutable
+import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.room.NotJoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
+import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
+import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
+
+@Immutable
+class NotJoinedRustRoom(
+    private val sessionId: SessionId,
+    override val localRoom: RustBaseRoom?,
+    override val previewInfo: RoomPreviewInfo,
+) : NotJoinedRoom {
+    override suspend fun membershipDetails(): Result<RoomMembershipDetails?> = runCatching {
+        val room = localRoom?.innerRoom ?: return@runCatching null
+        val (ownMember, senderInfo) = room.memberWithSenderInfo(sessionId.value)
+        RoomMembershipDetails(
+            currentUserMember = RoomMemberMapper.map(ownMember),
+            senderMember = senderInfo?.let { RoomMemberMapper.map(it) },
+        )
+    }
+
+    override fun close() {
+        localRoom?.close()
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
similarity index 70%
rename from libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
rename to libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
index de72a54469..9ee61da9fe 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import io.element.android.libraries.matrix.impl.room.history.map
@@ -28,9 +28,9 @@ import org.matrix.rustcomponents.sdk.Membership as RustMembership
 import org.matrix.rustcomponents.sdk.RoomInfo as RustRoomInfo
 import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode
 
-class MatrixRoomInfoMapper {
-    fun map(rustRoomInfo: RustRoomInfo): MatrixRoomInfo = rustRoomInfo.let {
-        return MatrixRoomInfo(
+class RoomInfoMapper {
+    fun map(rustRoomInfo: RustRoomInfo): RoomInfo = rustRoomInfo.let {
+        return RoomInfo(
             id = RoomId(it.id),
             creator = it.creator?.let(::UserId),
             name = it.displayName,
@@ -70,44 +70,6 @@ class MatrixRoomInfoMapper {
             historyVisibility = it.historyVisibility.map(),
         )
     }
-
-//    fun map(rustRoom: Room): MatrixRoomInfo = with(rustRoom) {
-//        return MatrixRoomInfo(
-//            id = RoomId(id()),
-//            name = rawName(),
-//            rawName = displayName(),
-//            topic = topic(),
-//            avatarUrl = avatarUrl(),
-//            isPublic = isPublic(),
-//            isDirect = null,
-//            isEncrypted = encryptionState() == EncryptionState.ENCRYPTED,
-//            joinRule = null,
-//            isSpace = isSpace(),
-//            isTombstoned = isTombstoned(),
-//            isFavorite = null,
-//            canonicalAlias = canonicalAlias()?.let(::RoomAlias),
-//            alternativeAliases = alternativeAliases().map(::RoomAlias).toImmutableList(),
-//            currentUserMembership = membership().map(),
-//            inviter = null,
-//            activeMembersCount = activeMembersCount().toLong(),
-//            invitedMembersCount = invitedMembersCount().toLong(),
-//            joinedMembersCount = joinedMembersCount().toLong(),
-//            userPowerLevels = persistentMapOf(),
-//            highlightCount = 0,
-//            notificationCount = 0,
-//            userDefinedNotificationMode = null,
-//            hasRoomCall = hasActiveRoomCall(),
-//            activeRoomCallParticipants = activeRoomCallParticipants().map(::UserId).toImmutableList(),
-//            isMarkedUnread = false,
-//            numUnreadMessages = 0,
-//            numUnreadNotifications = 0,
-//            numUnreadMentions = 0,
-//            heroes = heroes().map(RoomHero::map).toImmutableList(),
-//            pinnedEventIds = persistentListOf(),
-//            creator = null,
-//            historyVisibility = null,
-//        )
-//    }
 }
 
 fun RustMembership.map(): CurrentUserMembership = when (this) {
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
new file mode 100644
index 0000000000..c9a1629e7b
--- /dev/null
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustBaseRoom.kt
@@ -0,0 +1,276 @@
+/*
+ * 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.libraries.matrix.impl.room
+
+import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.coroutine.childScope
+import io.element.android.libraries.matrix.api.core.DeviceId
+import io.element.android.libraries.matrix.api.core.EventId
+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.UserId
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
+import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.matrix.impl.room.draft.into
+import io.element.android.libraries.matrix.impl.room.member.RoomMemberListFetcher
+import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
+import io.element.android.libraries.matrix.impl.room.powerlevels.RoomPowerLevelsMapper
+import io.element.android.libraries.matrix.impl.roomdirectory.map
+import io.element.android.libraries.matrix.impl.timeline.toRustReceiptType
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.use
+import timber.log.Timber
+import uniffi.matrix_sdk_base.EncryptionState
+import org.matrix.rustcomponents.sdk.Room as InnerRoom
+
+class RustBaseRoom(
+    override val sessionId: SessionId,
+    internal val deviceId: DeviceId,
+    internal val innerRoom: InnerRoom,
+    coroutineDispatchers: CoroutineDispatchers,
+    private val roomSyncSubscriber: RoomSyncSubscriber,
+    private val roomMembershipObserver: RoomMembershipObserver,
+    sessionCoroutineScope: CoroutineScope,
+    initialRoomInfo: RoomInfo,
+) : BaseRoom {
+    override val roomId = RoomId(innerRoom.id())
+
+    // Create a dispatcher for all room methods...
+    private val roomDispatcher = coroutineDispatchers.io.limitedParallelism(32)
+
+    // ...except getMember methods as it could quickly fill the roomDispatcher...
+    private val roomMembersDispatcher = coroutineDispatchers.io.limitedParallelism(8)
+
+    internal val roomMemberListFetcher = RoomMemberListFetcher(innerRoom, roomMembersDispatcher)
+
+    override val membersStateFlow: StateFlow<RoomMembersState> = roomMemberListFetcher.membersFlow
+
+    override val roomInfoFlow: StateFlow<RoomInfo> = MutableStateFlow(initialRoomInfo)
+
+    override val roomCoroutineScope = sessionCoroutineScope.childScope(coroutineDispatchers.main, "RoomScope-$roomId")
+
+    override suspend fun subscribeToSync() = roomSyncSubscriber.subscribe(roomId)
+
+    override suspend fun updateMembers() {
+        val useCache = membersStateFlow.value is RoomMembersState.Unknown
+        val source = if (useCache) {
+            RoomMemberListFetcher.Source.CACHE_AND_SERVER
+        } else {
+            RoomMemberListFetcher.Source.SERVER
+        }
+        roomMemberListFetcher.fetchRoomMembers(source = source)
+    }
+
+    override suspend fun getMembers(limit: Int) = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.members().use {
+                it.nextChunk(limit.toUInt()).orEmpty().map { roomMember ->
+                    RoomMemberMapper.map(roomMember)
+                }
+            }
+        }
+    }
+
+    override suspend fun getUpdatedMember(userId: UserId): Result<RoomMember> = withContext(roomDispatcher) {
+        runCatching {
+            RoomMemberMapper.map(innerRoom.member(userId.value))
+        }
+    }
+
+    override fun close() = destroy()
+
+    override fun destroy() {
+        innerRoom.destroy()
+    }
+
+    override suspend fun userDisplayName(userId: UserId): Result<String?> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.memberDisplayName(userId.value)
+        }
+    }
+
+    override suspend fun userRole(userId: UserId): Result<RoomMember.Role> = withContext(roomDispatcher) {
+        runCatching {
+            RoomMemberMapper.mapRole(innerRoom.suggestedRoleForUser(userId.value))
+        }
+    }
+
+    override suspend fun powerLevels(): Result<RoomPowerLevels> = withContext(roomDispatcher) {
+        runCatching {
+            RoomPowerLevelsMapper.map(innerRoom.getPowerLevels())
+        }
+    }
+
+    override suspend fun userAvatarUrl(userId: UserId): Result<String?> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.memberAvatarUrl(userId.value)
+        }
+    }
+
+    override suspend fun leave(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.leave()
+        }.onSuccess {
+            roomMembershipObserver.notifyUserLeftRoom(roomId)
+        }
+    }
+
+    override suspend fun join(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.join()
+        }
+    }
+
+    override suspend fun forget(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.forget()
+        }
+    }
+
+    override suspend fun canUserInvite(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserInvite(userId.value)
+        }
+    }
+
+    override suspend fun canUserKick(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserKick(userId.value)
+        }
+    }
+
+    override suspend fun canUserBan(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserBan(userId.value)
+        }
+    }
+
+    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserRedactOwn(userId.value)
+        }
+    }
+
+    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserRedactOther(userId.value)
+        }
+    }
+
+    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserSendState(userId.value, type.map())
+        }
+    }
+
+    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserSendMessage(userId.value, type.map())
+        }
+    }
+
+    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserTriggerRoomNotification(userId.value)
+        }
+    }
+
+    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.canUserPinUnpin(userId.value)
+        }
+    }
+
+    override suspend fun clearEventCacheStorage(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.clearEventCacheStorage()
+        }
+    }
+
+    override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.setIsFavourite(isFavorite, null)
+        }
+    }
+
+    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.markAsRead(receiptType.toRustReceiptType())
+        }
+    }
+
+    override suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.setUnreadFlag(isUnread)
+        }
+    }
+
+    override suspend fun getPermalink(): Result<String> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.matrixToPermalink()
+        }
+    }
+
+    override suspend fun getPermalinkFor(eventId: EventId): Result<String> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.matrixToEventPermalink(eventId.value)
+        }
+    }
+
+    override suspend fun getRoomVisibility(): Result<RoomVisibility> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.getRoomVisibility().map()
+        }
+    }
+
+    override suspend fun getUpdatedIsEncrypted(): Result<Boolean> = withContext(roomDispatcher) {
+        runCatching {
+            innerRoom.latestEncryptionState() == EncryptionState.ENCRYPTED
+        }
+    }
+
+    override suspend fun saveComposerDraft(composerDraft: ComposerDraft): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            Timber.d("saveComposerDraft: $composerDraft into $roomId")
+            innerRoom.saveComposerDraft(composerDraft.into())
+        }
+    }
+
+    override suspend fun loadComposerDraft(): Result<ComposerDraft?> = withContext(roomDispatcher) {
+        runCatching {
+            Timber.d("loadComposerDraft for $roomId")
+            innerRoom.loadComposerDraft()?.into()
+        }
+    }
+
+    override suspend fun clearComposerDraft(): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            Timber.d("clearComposerDraft for $roomId")
+            innerRoom.clearComposerDraft()
+        }
+    }
+
+    override suspend fun reportRoom(reason: String?): Result<Unit> = withContext(roomDispatcher) {
+        runCatching {
+            Timber.d("reportRoom $roomId")
+            innerRoom.reportRoom(reason)
+        }
+    }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
index a65112fca9..ee9592f155 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomFactory.kt
@@ -7,20 +7,20 @@
 
 package io.element.android.libraries.matrix.impl.room
 
-import androidx.collection.lruCache
 import io.element.android.appconfig.TimelineConfig
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
+import io.element.android.libraries.core.data.tryOrNull
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.core.DeviceId
 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.notificationsettings.NotificationSettingsService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.awaitLoaded
-import io.element.android.libraries.matrix.impl.roomlist.fullRoomWithTimeline
+import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
 import io.element.android.libraries.matrix.impl.roomlist.roomOrNull
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
@@ -28,17 +28,18 @@ import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import org.matrix.rustcomponents.sdk.Room
-import org.matrix.rustcomponents.sdk.RoomListException
+import org.matrix.rustcomponents.sdk.Client
+import org.matrix.rustcomponents.sdk.Membership
 import org.matrix.rustcomponents.sdk.RoomListItem
 import timber.log.Timber
+import java.util.concurrent.atomic.AtomicBoolean
+import org.matrix.rustcomponents.sdk.Room as SdkRoom
 import org.matrix.rustcomponents.sdk.RoomListService as InnerRoomListService
 
-private const val CACHE_SIZE = 16
-
 class RustRoomFactory(
     private val sessionId: SessionId,
     private val deviceId: DeviceId,
+    private val innerClient: Client,
     private val notificationSettingsService: NotificationSettingsService,
     private val sessionCoroutineScope: CoroutineScope,
     private val dispatchers: CoroutineDispatchers,
@@ -53,23 +54,14 @@ class RustRoomFactory(
 ) {
     private val dispatcher = dispatchers.io.limitedParallelism(1)
     private val mutex = Mutex()
-    private var isDestroyed: Boolean = false
+    private val isDestroyed: AtomicBoolean = AtomicBoolean(false)
 
     private data class RustRoomReferences(
         val roomListItem: RoomListItem,
-        val fullRoom: Room,
+        val room: SdkRoom,
     )
 
-    private val cache = lruCache<RoomId, RustRoomReferences>(
-        maxSize = CACHE_SIZE,
-        onEntryRemoved = { evicted, roomId, oldRoom, _ ->
-            Timber.d("On room removed from cache: $roomId, evicted: $evicted")
-            oldRoom.roomListItem.close()
-            oldRoom.fullRoom.close()
-        }
-    )
-
-    private val matrixRoomInfoMapper = MatrixRoomInfoMapper()
+    private val roomInfoMapper = RoomInfoMapper()
 
     private val eventFilters = TimelineConfig.excludedEvents
         .takeIf { it.isNotEmpty() }
@@ -81,102 +73,123 @@ class RustRoomFactory(
         withContext(NonCancellable + dispatcher) {
             mutex.withLock {
                 Timber.d("Destroying room factory")
-                cache.snapshot().values.forEach { (listItem, innerRoom) ->
-                    innerRoom.destroy()
-                    listItem.destroy()
-                }
-                cache.evictAll()
-                isDestroyed = true
+                isDestroyed.set(true)
             }
         }
     }
 
-    suspend fun create(roomId: RoomId): MatrixRoom? = withContext(dispatcher) {
+    suspend fun getBaseRoom(roomId: RoomId): RustBaseRoom? = withContext(dispatcher) {
         mutex.withLock {
-            if (isDestroyed) {
+            if (isDestroyed.get()) {
                 Timber.d("Room factory is destroyed, returning null for $roomId")
                 return@withContext null
             }
-            var roomReferences: RustRoomReferences? = getRoomReferences(roomId)
-            if (roomReferences == null) {
-                // ... otherwise, lets wait for the SS to load all rooms and check again.
-                roomListService.allRooms.awaitLoaded()
-                roomReferences = getRoomReferences(roomId)
-            }
-            if (roomReferences == null) {
-                Timber.d("No room found for $roomId, returning null")
-                return@withContext null
-            }
-            val liveTimeline = roomReferences.fullRoom.timeline()
-            val initialRoomInfo = roomReferences.fullRoom.roomInfo()
-            RustMatrixRoom(
-                sessionId = sessionId,
-                deviceId = deviceId,
-                innerRoom = roomReferences.fullRoom,
-                innerTimeline = liveTimeline,
-                sessionCoroutineScope = sessionCoroutineScope,
-                notificationSettingsService = notificationSettingsService,
-                coroutineDispatchers = dispatchers,
-                systemClock = systemClock,
-                roomContentForwarder = roomContentForwarder,
-                roomSyncSubscriber = roomSyncSubscriber,
-                matrixRoomInfoMapper = matrixRoomInfoMapper,
-                featureFlagService = featureFlagService,
-                roomMembershipObserver = roomMembershipObserver,
-                initialRoomInfo = matrixRoomInfoMapper.map(initialRoomInfo),
-            )
+            val roomReferences = awaitRoomReferences(roomId) ?: return@withContext null
+            getBaseRoom(roomReferences)
         }
     }
 
-    suspend fun createRoomPreview(roomId: RoomId): RoomPreview? = withContext(dispatcher) {
-        if (isDestroyed) {
-            Timber.d("Room factory is destroyed, returning null for $roomId")
-            return@withContext null
-        }
-        val roomListItem = innerRoomListService.roomOrNull(roomId.value)
-        if (roomListItem == null) {
-            Timber.d("Room not found for $roomId")
-            return@withContext null
-        }
-        if (roomListItem.membership() !in RustRoomPreview.ALLOWED_MEMBERSHIPS) {
-            Timber.d("Room $roomId is not in allowed membership")
-            return@withContext null
-        }
-        val innerRoom = try {
-            roomListItem.previewRoom(via = emptyList())
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get room preview for $roomId")
-            return@withContext null
-        }
-        RustRoomPreview(
+    private suspend fun getBaseRoom(roomReferences: RustRoomReferences): RustBaseRoom? {
+        val initialRoomInfo = roomReferences.room.roomInfo()
+        return RustBaseRoom(
             sessionId = sessionId,
-            inner = innerRoom,
+            deviceId = deviceId,
+            innerRoom = roomReferences.room,
+            coroutineDispatchers = dispatchers,
+            roomSyncSubscriber = roomSyncSubscriber,
             roomMembershipObserver = roomMembershipObserver,
+            initialRoomInfo = roomInfoMapper.map(initialRoomInfo),
+            sessionCoroutineScope = sessionCoroutineScope,
         )
     }
 
-    private suspend fun getRoomReferences(roomId: RoomId): RustRoomReferences? {
-        cache[roomId]?.let {
-            Timber.d("Room found in cache for $roomId")
-            return it
+    suspend fun getJoinedRoomOrPreview(roomId: RoomId): GetRoomResult? = withContext(dispatcher) {
+        mutex.withLock {
+            if (isDestroyed.get()) {
+                Timber.d("Room factory is destroyed, returning null for $roomId")
+                return@withContext null
+            }
+            val roomReferences = awaitRoomReferences(roomId) ?: return@withContext null
+
+            if (roomReferences.room.membership() == Membership.JOINED) {
+                val baseRoom = getBaseRoom(roomReferences) ?: return@withContext null
+
+                // Init the live timeline in the SDK from the RoomListItem
+                if (!roomReferences.roomListItem.isTimelineInitialized()) {
+                    roomReferences.roomListItem.initTimeline(eventFilters, "LIVE")
+                }
+
+                GetRoomResult.Joined(
+                    JoinedRustRoom(
+                        baseRoom = baseRoom,
+                        notificationSettingsService = notificationSettingsService,
+                        roomContentForwarder = roomContentForwarder,
+                        liveInnerTimeline = roomReferences.room.timeline(),
+                        coroutineDispatchers = dispatchers,
+                        systemClock = systemClock,
+                        roomInfoMapper = roomInfoMapper,
+                        featureFlagService = featureFlagService,
+                    )
+                )
+            } else {
+                val preview = try {
+                    roomReferences.roomListItem.previewRoom(via = emptyList())
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to get room preview for $roomId")
+                    return@withContext null
+                }
+
+                GetRoomResult.NotJoined(
+                    NotJoinedRustRoom(
+                        sessionId = sessionId,
+                        localRoom = getBaseRoom(roomReferences),
+                        previewInfo = RoomPreviewInfoMapper.map(preview.info()),
+                    )
+                )
+            }
         }
+    }
+
+    private fun getRoomReferences(roomId: RoomId): RustRoomReferences? {
         val roomListItem = innerRoomListService.roomOrNull(roomId.value)
         if (roomListItem == null) {
             Timber.d("Room not found for $roomId")
             return null
         }
-        val fullRoom = try {
-            roomListItem.fullRoomWithTimeline(filter = eventFilters)
-        } catch (e: RoomListException) {
-            Timber.e(e, "Failed to get full room with timeline for $roomId")
-            return null
-        }
-        Timber.d("Got full room with timeline for $roomId")
+        val room = tryOrNull {
+            innerClient.getRoom(roomId.value)
+        } ?: error("Failed to get room for room id: $roomId")
+
+        Timber.d("Got room for $roomId")
         return RustRoomReferences(
             roomListItem = roomListItem,
-            fullRoom = fullRoom,
-        ).also {
-            cache.put(roomId, it)
+            room = room,
+        )
+    }
+
+    /**
+     * Get the Rust room references for a room, retrying after the room list is loaded if necessary.
+     */
+    private suspend fun awaitRoomReferences(roomId: RoomId): RustRoomReferences? {
+        var roomReferences = getRoomReferences(roomId)
+
+        if (roomReferences == null) {
+            // ... otherwise, lets wait for the SS to load all rooms and check again.
+            roomListService.allRooms.awaitLoaded()
+            roomReferences = getRoomReferences(roomId)
         }
+
+        return roomReferences
     }
 }
+
+sealed interface GetRoomResult {
+    data class Joined(val joinedRoom: JoinedRoom) : GetRoomResult
+    data class NotJoined(val notJoinedRoom: NotJoinedRustRoom) : GetRoomResult
+
+    val room: BaseRoom?
+        get() = when (this) {
+            is Joined -> joinedRoom
+            is NotJoined -> notJoinedRoom.localRoom
+        }
+}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomPreview.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomPreview.kt
deleted file mode 100644
index 44c294a707..0000000000
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustRoomPreview.kt
+++ /dev/null
@@ -1,59 +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.libraries.matrix.impl.room
-
-import androidx.compose.runtime.Immutable
-import io.element.android.libraries.matrix.api.core.SessionId
-import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
-import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.RoomPreview
-import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
-import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
-import io.element.android.libraries.matrix.impl.room.preview.RoomPreviewInfoMapper
-import org.matrix.rustcomponents.sdk.Membership
-import org.matrix.rustcomponents.sdk.RoomPreview as InnerRoomPreview
-
-@Immutable
-class RustRoomPreview(
-    override val sessionId: SessionId,
-    private val inner: InnerRoomPreview,
-    private val roomMembershipObserver: RoomMembershipObserver?,
-) : RoomPreview {
-    companion object {
-        val ALLOWED_MEMBERSHIPS = setOf(Membership.INVITED, Membership.KNOCKED, Membership.BANNED)
-    }
-
-    override val info: RoomPreviewInfo = RoomPreviewInfoMapper.map(inner.info())
-
-    override suspend fun leave(): Result<Unit> = runCatching {
-        inner.leave()
-    }.onSuccess {
-        when (info.membership) {
-            CurrentUserMembership.INVITED -> roomMembershipObserver?.notifyUserDeclinedInvite(info.roomId)
-            CurrentUserMembership.KNOCKED -> roomMembershipObserver?.notifyUserCanceledKnock(info.roomId)
-            else -> Unit
-        }
-    }
-
-    override suspend fun forget(): Result<Unit> = runCatching {
-        inner.forget()
-    }
-
-    override suspend fun membershipDetails(): Result<RoomMembershipDetails?> = runCatching {
-        val details = inner.ownMembershipDetails() ?: return@runCatching null
-        RoomMembershipDetails(
-            currentUserMember = RoomMemberMapper.map(details.roomMember),
-            senderMember = details.senderInfo?.let { RoomMemberMapper.map(it) },
-        )
-    }
-
-    override fun close() {
-        inner.destroy()
-    }
-}
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
index b349d05e3a..187bead11e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcher.kt
@@ -7,8 +7,8 @@
 
 package io.element.android.libraries.matrix.impl.room.member
 
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
@@ -42,8 +42,8 @@ internal class RoomMemberListFetcher(
     private val updatedRoomMemberMutex = Mutex()
     private val roomId = room.id()
 
-    private val _membersFlow = MutableStateFlow<MatrixRoomMembersState>(MatrixRoomMembersState.Unknown)
-    val membersFlow: StateFlow<MatrixRoomMembersState> = _membersFlow
+    private val _membersFlow = MutableStateFlow<RoomMembersState>(RoomMembersState.Unknown)
+    val membersFlow: StateFlow<RoomMembersState> = _membersFlow
 
     /**
      * Fetches the room members for the given room.
@@ -75,16 +75,16 @@ internal class RoomMemberListFetcher(
         }
     }
 
-    private suspend fun MutableStateFlow<MatrixRoomMembersState>.fetchCachedRoomMembers(asPendingState: Boolean = true) {
+    private suspend fun MutableStateFlow<RoomMembersState>.fetchCachedRoomMembers(asPendingState: Boolean = true) {
         Timber.i("Loading cached members for room $roomId")
         try {
             // Send current member list with pending state to notify the UI that we are loading new members
             emit(pendingWithCurrentMembers())
             val members = parseAndEmitMembers(room.membersNoSync())
             val newState = if (asPendingState) {
-                MatrixRoomMembersState.Pending(prevRoomMembers = members)
+                RoomMembersState.Pending(prevRoomMembers = members)
             } else {
-                MatrixRoomMembersState.Ready(members)
+                RoomMembersState.Ready(members)
             }
             emit(newState)
         } catch (exception: CancellationException) {
@@ -92,22 +92,22 @@ internal class RoomMemberListFetcher(
             throw exception
         } catch (exception: Exception) {
             Timber.e(exception, "Failed to load cached members for room $roomId")
-            emit(MatrixRoomMembersState.Error(exception, _membersFlow.value.roomMembers()?.toImmutableList()))
+            emit(RoomMembersState.Error(exception, _membersFlow.value.roomMembers()?.toImmutableList()))
         }
     }
 
-    private suspend fun MutableStateFlow<MatrixRoomMembersState>.fetchRemoteRoomMembers() {
+    private suspend fun MutableStateFlow<RoomMembersState>.fetchRemoteRoomMembers() {
         try {
             // Send current member list with pending state to notify the UI that we are loading new members
             emit(pendingWithCurrentMembers())
             // Start loading new members
-            emit(MatrixRoomMembersState.Ready(parseAndEmitMembers(room.members())))
+            emit(RoomMembersState.Ready(parseAndEmitMembers(room.members())))
         } catch (exception: CancellationException) {
             Timber.d("Cancelled loading updated members for room $roomId")
             throw exception
         } catch (exception: Exception) {
             Timber.e(exception, "Failed to load updated members for room $roomId")
-            emit(MatrixRoomMembersState.Error(exception, _membersFlow.value.roomMembers()?.toImmutableList()))
+            emit(RoomMembersState.Error(exception, _membersFlow.value.roomMembers()?.toImmutableList()))
         }
     }
 
@@ -129,5 +129,5 @@ internal class RoomMemberListFetcher(
         }
     }
 
-    private fun pendingWithCurrentMembers() = MatrixRoomMembersState.Pending(_membersFlow.value.roomMembers().orEmpty().toImmutableList())
+    private fun pendingWithCurrentMembers() = RoomMembersState.Pending(_membersFlow.value.roomMembers().orEmpty().toImmutableList())
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapper.kt
index d7babcfd2b..55a09030b3 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapper.kt
@@ -7,12 +7,12 @@
 
 package io.element.android.libraries.matrix.impl.room.powerlevels
 
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import org.matrix.rustcomponents.sdk.RoomPowerLevels as RustRoomPowerLevels
 
 object RoomPowerLevelsMapper {
-    fun map(roomPowerLevels: RustRoomPowerLevels): MatrixRoomPowerLevels {
-        return MatrixRoomPowerLevels(
+    fun map(roomPowerLevels: RustRoomPowerLevels): RoomPowerLevels {
+        return RoomPowerLevels(
                 ban = roomPowerLevels.ban,
                 invite = roomPowerLevels.invite,
                 kick = roomPowerLevels.kick,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
index 8dd58878c3..6eac11ce30 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomSummaryFactory.kt
@@ -8,14 +8,14 @@
 package io.element.android.libraries.matrix.impl.roomlist
 
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.impl.room.MatrixRoomInfoMapper
+import io.element.android.libraries.matrix.impl.room.RoomInfoMapper
 import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
 import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.use
 
 class RoomSummaryFactory(
     private val roomMessageFactory: RoomMessageFactory = RoomMessageFactory(),
-    private val roomInfoMapper: MatrixRoomInfoMapper = MatrixRoomInfoMapper(),
+    private val roomInfoMapper: RoomInfoMapper = RoomInfoMapper(),
 ) {
     suspend fun create(roomListItem: RoomListItem): RoomSummary {
         val roomInfo = roomListItem.roomInfo().let(roomInfoMapper::map)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
index f13b5465fb..b17f234326 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt
@@ -19,7 +19,7 @@ import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
 import io.element.android.libraries.matrix.api.poll.PollKind
 import io.element.android.libraries.matrix.api.room.IntentionalMention
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
@@ -73,6 +73,7 @@ import org.matrix.rustcomponents.sdk.MessageFormat
 import org.matrix.rustcomponents.sdk.PollData
 import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
 import org.matrix.rustcomponents.sdk.UploadParameters
+import org.matrix.rustcomponents.sdk.UploadSource
 import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk.RoomPaginationStatus
@@ -86,7 +87,7 @@ class RustTimeline(
     private val inner: InnerTimeline,
     mode: Timeline.Mode,
     systemClock: SystemClock,
-    private val matrixRoom: MatrixRoom,
+    private val joinedRoom: JoinedRoom,
     private val coroutineScope: CoroutineScope,
     private val dispatcher: CoroutineDispatcher,
     private val roomContentForwarder: RoomContentForwarder,
@@ -137,7 +138,10 @@ class RustTimeline(
     )
 
     init {
-        coroutineScope.fetchMembers()
+        if (mode != Timeline.Mode.PINNED_EVENTS) {
+            coroutineScope.fetchMembers()
+        }
+
         if (mode == Timeline.Mode.LIVE) {
             // When timeline is live, we need to listen to the back pagination status as
             // sdk can automatically paginate backwards.
@@ -186,10 +190,10 @@ class RustTimeline(
                 }
             }.onFailure { error ->
                 if (error is TimelineException.CannotPaginate) {
-                    Timber.d("Can't paginate $direction on room ${matrixRoom.roomId} with paginationStatus: ${backwardPaginationStatus.value}")
+                    Timber.d("Can't paginate $direction on room ${joinedRoom.roomId} with paginationStatus: ${backwardPaginationStatus.value}")
                 } else {
                     updatePaginationStatus(direction) { it.copy(isPaginating = false) }
-                    Timber.e(error, "Error paginating $direction on room ${matrixRoom.roomId}")
+                    Timber.e(error, "Error paginating $direction on room ${joinedRoom.roomId}")
                 }
             }.onSuccess { hasReachedEnd ->
                 updatePaginationStatus(direction) { it.copy(isPaginating = false, hasMoreToLoad = !hasReachedEnd) }
@@ -209,7 +213,7 @@ class RustTimeline(
         _timelineItems,
         backwardPaginationStatus,
         forwardPaginationStatus,
-        matrixRoom.roomInfoFlow.map { it.creator to it.isDm }.distinctUntilChanged(),
+        joinedRoom.roomInfoFlow.map { it.creator to it.isDm }.distinctUntilChanged(),
         isTimelineInitialized,
     ) { timelineItems,
         backwardPaginationStatus,
@@ -261,7 +265,7 @@ class RustTimeline(
         try {
             inner.fetchMembers()
         } catch (exception: Exception) {
-            Timber.e(exception, "Error fetching members for room ${matrixRoom.roomId}")
+            Timber.e(exception, "Error fetching members for room ${joinedRoom.roomId}")
         }
     }
 
@@ -358,7 +362,7 @@ class RustTimeline(
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendImage(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -387,7 +391,7 @@ class RustTimeline(
         return sendAttachment(listOfNotNull(file, thumbnailFile)) {
             inner.sendVideo(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -415,7 +419,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendAudio(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -442,7 +446,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendFile(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     caption = caption,
                     formattedCaption = formattedCaption?.let {
                         FormattedBody(body = it, format = MessageFormat.Html)
@@ -503,7 +507,7 @@ class RustTimeline(
         return sendAttachment(listOf(file)) {
             inner.sendVoiceMessage(
                 params = UploadParameters(
-                    filename = file.path,
+                    source = UploadSource.File(file.path),
                     // Maybe allow a caption in the future?
                     caption = null,
                     formattedCaption = null,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
index f383df5ccf..a62f18ddd1 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
@@ -105,7 +105,8 @@ class TimelineEventContentMapper(
                     RoomMembershipContent(
                         userId = UserId(it.userId),
                         userDisplayName = it.userDisplayName,
-                        change = it.change?.map()
+                        change = it.change?.map(),
+                        reason = it.reason,
                     )
                 }
                 is TimelineItemContent.State -> {
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
similarity index 81%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
index 1ecfb672b8..8bf86c5978 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedRoomExtKtTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/JoinedExtKtTest.kt
@@ -9,12 +9,12 @@ package io.element.android.libraries.matrix.impl.analytics
 
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class JoinedRoomExtKtTest {
+class JoinedExtKtTest {
     @Test
     fun `test room size mapping`() = runTest {
         mapOf(
@@ -26,7 +26,7 @@ class JoinedRoomExtKtTest {
             listOf(1001L, 2000L) to JoinedRoom.RoomSize.MoreThanAThousand
         ).forEach { (joinedMemberCounts, expectedRoomSize) ->
             joinedMemberCounts.forEach { joinedMemberCount ->
-                assertThat(aMatrixRoom(joinedMemberCount = joinedMemberCount).toAnalyticsJoinedRoom(null))
+                assertThat(aRoom(joinedMemberCount = joinedMemberCount).toAnalyticsJoinedRoom(null))
                     .isEqualTo(
                         JoinedRoom(
                             isDM = false,
@@ -41,7 +41,7 @@ class JoinedRoomExtKtTest {
 
     @Test
     fun `test isDirect parameter mapping`() = runTest {
-        assertThat(aMatrixRoom(isDirect = true).toAnalyticsJoinedRoom(null))
+        assertThat(aRoom(isDirect = true).toAnalyticsJoinedRoom(null))
             .isEqualTo(
                 JoinedRoom(
                     isDM = true,
@@ -54,7 +54,7 @@ class JoinedRoomExtKtTest {
 
     @Test
     fun `test isSpace parameter mapping`() = runTest {
-        assertThat(aMatrixRoom(isSpace = true).toAnalyticsJoinedRoom(null))
+        assertThat(aRoom(isSpace = true).toAnalyticsJoinedRoom(null))
             .isEqualTo(
                 JoinedRoom(
                     isDM = false,
@@ -67,7 +67,7 @@ class JoinedRoomExtKtTest {
 
     @Test
     fun `test trigger parameter mapping`() = runTest {
-        assertThat(aMatrixRoom(isDirect = false, isSpace = false, joinedMemberCount = 1).toAnalyticsJoinedRoom(JoinedRoom.Trigger.Invite))
+        assertThat(aRoom(isDirect = false, isSpace = false, joinedMemberCount = 1).toAnalyticsJoinedRoom(JoinedRoom.Trigger.Invite))
             .isEqualTo(
                 JoinedRoom(
                     isDM = false,
@@ -78,12 +78,12 @@ class JoinedRoomExtKtTest {
             )
     }
 
-    private fun aMatrixRoom(
+    private fun aRoom(
         isDirect: Boolean = false,
         isSpace: Boolean = false,
         joinedMemberCount: Long = 0
-    ): FakeMatrixRoom {
-        return FakeMatrixRoom().apply {
+    ): FakeBaseRoom {
+        return FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo(isDirect = isDirect, isSpace = isSpace, joinedMembersCount = joinedMemberCount))
         }
     }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
index d6666afdc0..c73ba1424b 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/AuthenticationExceptionMappingTest.kt
@@ -12,6 +12,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.auth.AuthenticationException
 import org.junit.Test
 import org.matrix.rustcomponents.sdk.ClientBuildException
+import org.matrix.rustcomponents.sdk.OidcException
 
 class AuthenticationExceptionMappingTest {
     @Test
@@ -56,6 +57,20 @@ class AuthenticationExceptionMappingTest {
             .isException<AuthenticationException.Generic>("EventCache error")
     }
 
+    @Test
+    fun `mapping Oidc exceptions map to the Oidc Kotlin`() {
+        assertThat(OidcException.Generic("Generic").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("Generic")
+        assertThat(OidcException.CallbackUrlInvalid("CallbackUrlInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("CallbackUrlInvalid")
+        assertThat(OidcException.Cancelled("Cancelled").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("Cancelled")
+        assertThat(OidcException.MetadataInvalid("MetadataInvalid").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("MetadataInvalid")
+        assertThat(OidcException.NotSupported("NotSupported").mapAuthenticationException())
+            .isException<AuthenticationException.Oidc>("NotSupported")
+    }
+
     private inline fun <reified T> ThrowableSubject.isException(message: String) {
         isInstanceOf(T::class.java)
         hasMessageThat().isEqualTo(message)
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
index 01321fcdf6..96d1b46f93 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/OidcConfigurationProviderTest.kt
@@ -8,13 +8,21 @@
 package io.element.android.libraries.matrix.impl.auth
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.auth.OidcConfig
+import io.element.android.libraries.matrix.test.auth.FAKE_REDIRECT_URL
+import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 import org.junit.Test
 
 class OidcConfigurationProviderTest {
     @Test
     fun get() {
-        val result = OidcConfigurationProvider().get()
-        assertThat(result.redirectUri).isEqualTo(OidcConfig.REDIRECT_URI)
+        val result = OidcConfigurationProvider(
+            buildMeta = aBuildMeta(
+                applicationName = "myName",
+            ),
+            oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+        ).get()
+        assertThat(result.clientName).isEqualTo("myName")
+        assertThat(result.redirectUri).isEqualTo(FAKE_REDIRECT_URL)
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
index e2a9d883ee..31453a7ca5 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/auth/RustMatrixAuthenticationServiceTest.kt
@@ -11,6 +11,8 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.impl.createRustMatrixClientFactory
 import io.element.android.libraries.matrix.impl.paths.SessionPathsFactory
+import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
+import io.element.android.libraries.matrix.test.core.aBuildMeta
 import io.element.android.libraries.sessionstorage.api.SessionStore
 import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
 import io.element.android.libraries.sessionstorage.test.aSessionData
@@ -48,7 +50,10 @@ class RustMatrixAuthenticationServiceTest {
             sessionStore = sessionStore,
             rustMatrixClientFactory = rustMatrixClientFactory,
             passphraseGenerator = FakePassphraseGenerator(),
-            oidcConfigurationProvider = OidcConfigurationProvider(),
+            oidcConfigurationProvider = OidcConfigurationProvider(
+                buildMeta = aBuildMeta(),
+                oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+            ),
         )
     }
 }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
similarity index 97%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
index 33ce5c8c33..c6adaa46d1 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
@@ -38,11 +38,11 @@ import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
 import org.matrix.rustcomponents.sdk.RoomHistoryVisibility as RustRoomHistoryVisibility
 import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode
 
-class MatrixRoomInfoMapperTest {
+class RoomInfoMapperTest {
     @Test
     fun `mapping of RustRoomInfo should map all the fields`() {
         assertThat(
-            MatrixRoomInfoMapper().map(
+            RoomInfoMapper().map(
                 aRustRoomInfo(
                     id = A_ROOM_ID.value,
                     displayName = "displayName",
@@ -80,7 +80,7 @@ class MatrixRoomInfoMapperTest {
                 )
             )
         ).isEqualTo(
-            MatrixRoomInfo(
+            RoomInfo(
                 id = A_ROOM_ID,
                 name = "displayName",
                 rawName = "rawName",
@@ -127,7 +127,7 @@ class MatrixRoomInfoMapperTest {
     @Test
     fun `mapping of RustRoomInfo with null members should map all the fields`() {
         assertThat(
-            MatrixRoomInfoMapper().map(
+            RoomInfoMapper().map(
                 aRustRoomInfo(
                     id = A_ROOM_ID.value,
                     displayName = null,
@@ -164,7 +164,7 @@ class MatrixRoomInfoMapperTest {
                 )
             )
         ).isEqualTo(
-            MatrixRoomInfo(
+            RoomInfo(
                 id = A_ROOM_ID,
                 name = null,
                 rawName = null,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
index 9806cbb1cb..6193d229c8 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/join/DefaultJoinRoomTest.kt
@@ -18,7 +18,7 @@ import io.element.android.libraries.matrix.test.A_ROOM_ALIAS
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SERVER_LIST
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.services.analytics.test.FakeAnalyticsService
@@ -33,7 +33,7 @@ class DefaultJoinRoomTest {
         val roomSummary = aRoomSummary()
         val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
         val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
-        val roomResult = FakeMatrixRoom().apply {
+        val roomResult = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo())
         }
         val aTrigger = JoinedRoom.Trigger.MobilePermalink
@@ -70,7 +70,7 @@ class DefaultJoinRoomTest {
         val roomSummary = aRoomSummary()
         val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
         val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
-        val roomResult = FakeMatrixRoom().apply {
+        val roomResult = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo())
         }
         val aTrigger = JoinedRoom.Trigger.MobilePermalink
@@ -108,7 +108,7 @@ class DefaultJoinRoomTest {
         val roomSummary = aRoomSummary()
         val joinRoomLambda = lambdaRecorder { _: RoomId -> Result.success(roomSummary) }
         val joinRoomByIdOrAliasLambda = lambdaRecorder { _: RoomIdOrAlias, _: List<String> -> Result.success(roomSummary) }
-        val roomResult = FakeMatrixRoom().apply {
+        val roomResult = FakeBaseRoom().apply {
             givenRoomInfo(aRoomInfo())
         }
         val aTrigger = JoinedRoom.Trigger.MobilePermalink
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
index 19a310c4be..94f786b581 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberListFetcherTest.kt
@@ -9,7 +9,7 @@ package io.element.android.libraries.matrix.impl.room.member
 
 import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomMember
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustRoom
@@ -40,16 +40,16 @@ class RoomMemberListFetcherTest {
 
         val fetcher = RoomMemberListFetcher(room, Dispatchers.Default)
         fetcher.membersFlow.test {
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
 
             fetcher.fetchRoomMembers(source = CACHE)
 
             // Loading state
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
 
             val cachedItemsState = awaitItem()
-            assertThat(cachedItemsState).isInstanceOf(MatrixRoomMembersState.Ready::class.java)
-            assertThat((cachedItemsState as? MatrixRoomMembersState.Ready)?.roomMembers).hasSize(3)
+            assertThat(cachedItemsState).isInstanceOf(RoomMembersState.Ready::class.java)
+            assertThat((cachedItemsState as? RoomMembersState.Ready)?.roomMembers).hasSize(3)
         }
     }
 
@@ -62,9 +62,9 @@ class RoomMemberListFetcherTest {
         val fetcher = RoomMemberListFetcher(room, Dispatchers.Default)
         fetcher.membersFlow.test {
             fetcher.fetchRoomMembers(source = CACHE)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
-            assertThat((awaitItem() as? MatrixRoomMembersState.Ready)?.roomMembers).isEmpty()
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
+            assertThat((awaitItem() as? RoomMembersState.Ready)?.roomMembers).isEmpty()
         }
     }
 
@@ -77,9 +77,9 @@ class RoomMemberListFetcherTest {
         val fetcher = RoomMemberListFetcher(room, Dispatchers.Default)
         fetcher.membersFlow.test {
             fetcher.fetchRoomMembers(source = CACHE)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Error::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Error::class.java)
         }
     }
 
@@ -100,11 +100,11 @@ class RoomMemberListFetcherTest {
             fetcher.fetchRoomMembers(source = CACHE)
 
             // Initial state
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
             // Started loading cached members
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
             // Finished loading cached members
-            assertThat((awaitItem() as? MatrixRoomMembersState.Ready)?.roomMembers).hasSize(3)
+            assertThat((awaitItem() as? RoomMembersState.Ready)?.roomMembers).hasSize(3)
 
             ensureAllEventsConsumed()
         }
@@ -126,9 +126,9 @@ class RoomMemberListFetcherTest {
         fetcher.membersFlow.test {
             fetcher.fetchRoomMembers(source = SERVER)
 
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
-            assertThat((awaitItem() as? MatrixRoomMembersState.Ready)?.roomMembers?.size).isEqualTo(3)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
+            assertThat((awaitItem() as? RoomMembersState.Ready)?.roomMembers?.size).isEqualTo(3)
         }
     }
 
@@ -140,9 +140,9 @@ class RoomMemberListFetcherTest {
         fetcher.membersFlow.test {
             fetcher.fetchRoomMembers(source = SERVER)
 
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Error::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Pending::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Error::class.java)
         }
     }
 
@@ -167,20 +167,20 @@ class RoomMemberListFetcherTest {
         fetcher.membersFlow.test {
             fetcher.fetchRoomMembers(source = CACHE_AND_SERVER)
             // Initial
-            assertThat(awaitItem()).isInstanceOf(MatrixRoomMembersState.Unknown::class.java)
+            assertThat(awaitItem()).isInstanceOf(RoomMembersState.Unknown::class.java)
             // Loading cached
             awaitItem().let { pending ->
-                assertThat(pending).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
+                assertThat(pending).isInstanceOf(RoomMembersState.Pending::class.java)
                 assertThat(pending.roomMembers()).isEmpty()
             }
             // Loaded cached
             awaitItem().let { cached ->
-                assertThat(cached).isInstanceOf(MatrixRoomMembersState.Pending::class.java)
+                assertThat(cached).isInstanceOf(RoomMembersState.Pending::class.java)
                 assertThat(cached.roomMembers()).hasSize(1)
             }
             // Start loading new
             awaitItem().let { ready ->
-                assertThat(ready).isInstanceOf(MatrixRoomMembersState.Ready::class.java)
+                assertThat(ready).isInstanceOf(RoomMembersState.Ready::class.java)
                 assertThat(ready.roomMembers()).hasSize(3)
             }
         }
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapperTest.kt
index 2a8f733bb8..aac02350e1 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapperTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/powerlevels/RoomPowerLevelsMapperTest.kt
@@ -8,7 +8,7 @@
 package io.element.android.libraries.matrix.impl.room.powerlevels
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.impl.fixtures.factories.aRustRoomPowerLevels
 import org.junit.Test
 
@@ -31,7 +31,7 @@ class RoomPowerLevelsMapperTest {
                 )
             )
         ).isEqualTo(
-            MatrixRoomPowerLevels(
+            RoomPowerLevels(
                 ban = 1,
                 invite = 2,
                 kick = 3,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
similarity index 98%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
index b2931ce49e..ba3ee850c1 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryListTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryListTest.kt
@@ -24,7 +24,7 @@ import org.matrix.rustcomponents.sdk.RoomDirectorySearch
 import org.matrix.rustcomponents.sdk.RoomDirectorySearchEntryUpdate
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class RustRoomDirectoryListTest {
+class RustBaseRoomDirectoryListTest {
     @Test
     fun `check that the state emits the expected values`() = runTest {
         val roomDirectorySearch = FakeRustRoomDirectorySearch()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
similarity index 94%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryServiceTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
index 76a0fac4a9..36ff2efbfc 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustRoomDirectoryServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomdirectory/RustBaseRoomDirectoryServiceTest.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class RustRoomDirectoryServiceTest {
+class RustBaseRoomDirectoryServiceTest {
     @Test
     fun test() = runTest {
         val client = FakeRustClient()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListServiceTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
similarity index 98%
rename from libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListServiceTest.kt
rename to libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
index 8279f86483..0957a06700 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustRoomListServiceTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RustBaseRoomListServiceTest.kt
@@ -23,7 +23,7 @@ import org.matrix.rustcomponents.sdk.RoomListServiceSyncIndicator
 import org.matrix.rustcomponents.sdk.RoomListService as RustRoomListService
 
 @OptIn(ExperimentalCoroutinesApi::class)
-class RustRoomListServiceTest {
+class RustBaseRoomListServiceTest {
     @Test
     fun `syncIndicator should emit the expected values`() = runTest {
         val roomListService = FakeRustRoomListService()
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
index 0dd2ba3b86..1498b70468 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimelineTest.kt
@@ -12,7 +12,7 @@ import app.cash.turbine.test
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
@@ -20,7 +20,7 @@ import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustRoomListS
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustTimeline
 import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeRustTimelineDiff
 import io.element.android.libraries.matrix.impl.room.RoomContentForwarder
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import io.element.android.services.toolbox.test.systemclock.A_FAKE_TIMESTAMP
@@ -103,7 +103,7 @@ private fun TestScope.createRustTimeline(
     inner: InnerTimeline,
     mode: Timeline.Mode = Timeline.Mode.LIVE,
     systemClock: SystemClock = FakeSystemClock(),
-    matrixRoom: MatrixRoom = FakeMatrixRoom().apply { givenRoomInfo(aRoomInfo()) },
+    joinedRoom: JoinedRoom = FakeJoinedRoom().apply { givenRoomInfo(aRoomInfo()) },
     coroutineScope: CoroutineScope = backgroundScope,
     dispatcher: CoroutineDispatcher = testCoroutineDispatchers().io,
     roomContentForwarder: RoomContentForwarder = RoomContentForwarder(FakeRustRoomListService()),
@@ -114,7 +114,7 @@ private fun TestScope.createRustTimeline(
         inner = inner,
         mode = mode,
         systemClock = systemClock,
-        matrixRoom = matrixRoom,
+        joinedRoom = joinedRoom,
         coroutineScope = coroutineScope,
         dispatcher = dispatcher,
         roomContentForwarder = roomContentForwarder,
diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
index 34cb1ac9e1..63deb34530 100644
--- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
+++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/Fixtures.kt
@@ -11,13 +11,13 @@ import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 
 internal val timelineStartEvent = MatrixTimelineItem.Virtual(
     uniqueId = UniqueId("timeline_start"),
@@ -29,11 +29,11 @@ internal val roomCreateEvent = MatrixTimelineItem.Event(
 )
 internal val roomCreatorJoinEvent = MatrixTimelineItem.Event(
     uniqueId = UniqueId("m.room.member"),
-    event = anEventTimelineItem(content = RoomMembershipContent(A_USER_ID, null, MembershipChange.JOINED))
+    event = anEventTimelineItem(content = aRoomMembershipContent(userId = A_USER_ID, change = MembershipChange.JOINED))
 )
 internal val otherMemberJoinEvent = MatrixTimelineItem.Event(
     uniqueId = UniqueId("m.room.member_other"),
-    event = anEventTimelineItem(content = RoomMembershipContent(A_USER_ID_2, null, MembershipChange.JOINED))
+    event = anEventTimelineItem(content = aRoomMembershipContent(userId = A_USER_ID_2, change = MembershipChange.JOINED))
 )
 internal val messageEvent = MatrixTimelineItem.Event(
     uniqueId = UniqueId("m.room.message"),
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
index 446a039bd9..6ef4eec136 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt
@@ -22,9 +22,10 @@ import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
-import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDirectoryService
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
@@ -77,7 +78,7 @@ class FakeMatrixClient(
             Optional.of(ResolvedRoomAlias(A_ROOM_ID, emptyList()))
         )
     },
-    private val getRoomPreviewResult: (RoomIdOrAlias, List<String>) -> Result<RoomPreview> = { _, _ -> Result.failure(AN_EXCEPTION) },
+    private val getNotJoinedRoomResult: (RoomIdOrAlias, List<String>) -> Result<NotJoinedRoom> = { _, _ -> lambdaError() },
     private val clearCacheLambda: () -> Unit = { lambdaError() },
     private val userIdServerNameLambda: () -> String = { lambdaError() },
     private val getUrlLambda: (String) -> Result<String> = { lambdaError() },
@@ -102,7 +103,7 @@ class FakeMatrixClient(
     private var createRoomResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var findDmResult: RoomId? = A_ROOM_ID
-    private val getRoomResults = mutableMapOf<RoomId, MatrixRoom>()
+    private val getRoomResults = mutableMapOf<RoomId, BaseRoom>()
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
     private val getProfileResults = mutableMapOf<UserId, Result<MatrixUser>>()
     private var uploadMediaResult: Result<String> = Result.success(AN_AVATAR_URL)
@@ -123,12 +124,12 @@ class FakeMatrixClient(
     }
     var logoutLambda: (Boolean, Boolean) -> Unit = { _, _ -> }
 
-    override suspend fun getRoom(roomId: RoomId): MatrixRoom? {
+    override suspend fun getRoom(roomId: RoomId): BaseRoom? {
         return getRoomResults[roomId]
     }
 
-    override suspend fun getPendingRoom(roomId: RoomId): RoomPreview? = simulateLongTask {
-        getRoomPreviewResult(RoomIdOrAlias.Id(roomId), emptyList()).getOrNull()
+    override suspend fun getJoinedRoom(roomId: RoomId): JoinedRoom? {
+        return getRoomResults[roomId] as? JoinedRoom
     }
 
     override suspend fun findDM(userId: UserId): RoomId? {
@@ -250,7 +251,7 @@ class FakeMatrixClient(
         findDmResult = result
     }
 
-    fun givenGetRoomResult(roomId: RoomId, result: MatrixRoom?) {
+    fun givenGetRoomResult(roomId: RoomId, result: BaseRoom?) {
         if (result == null) {
             getRoomResults.remove(roomId)
         } else {
@@ -294,8 +295,8 @@ class FakeMatrixClient(
         resolveRoomAliasResult(roomAlias)
     }
 
-    override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomPreview> = simulateLongTask {
-        getRoomPreviewResult(roomIdOrAlias, serverNames)
+    override suspend fun getRoomPreview(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<NotJoinedRoom> = simulateLongTask {
+        getNotJoinedRoomResult(roomIdOrAlias, serverNames)
     }
 
     override suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>> {
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt
new file mode 100644
index 0000000000..e8226009d4
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/auth/FakeOidcRedirectUrlProvider.kt
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+package io.element.android.libraries.matrix.test.auth
+
+import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
+
+const val FAKE_REDIRECT_URL = "io.element.android:/"
+
+class FakeOidcRedirectUrlProvider(
+    private val provideResult: String = FAKE_REDIRECT_URL,
+) : OidcRedirectUrlProvider {
+    override fun provide() = provideResult
+}
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
index dfc3163da8..73fd83889b 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/core/BuildMeta.kt
@@ -39,5 +39,5 @@ fun aBuildMeta(
     gitRevision = gitRevision,
     gitBranchName = gitBranchName,
     flavorDescription = flavorDescription,
-    flavorShortDescription = flavorShortDescription
+    flavorShortDescription = flavorShortDescription,
 )
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
new file mode 100644
index 0000000000..76e5403133
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeBaseRoom.kt
@@ -0,0 +1,223 @@
+/*
+ * 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.libraries.matrix.test.room
+
+import io.element.android.libraries.core.bool.orFalse
+import io.element.android.libraries.matrix.api.core.EventId
+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.UserId
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.MessageEventType
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
+import io.element.android.libraries.matrix.api.room.StateEventType
+import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
+import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.test.TestScope
+
+class FakeBaseRoom(
+    override val sessionId: SessionId = A_SESSION_ID,
+    override val roomId: RoomId = A_ROOM_ID,
+    initialRoomInfo: RoomInfo = aRoomInfo(),
+    override val roomCoroutineScope: CoroutineScope = TestScope(),
+    private var roomPermalinkResult: () -> Result<String> = { lambdaError() },
+    private var eventPermalinkResult: (EventId) -> Result<String> = { lambdaError() },
+    private val userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
+    private val userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
+    private val userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
+    private val getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
+    private val joinRoomResult: () -> Result<Unit> = { lambdaError() },
+    private val canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canRedactOwnResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canRedactOtherResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
+    private val canUserSendMessageResult: (UserId, MessageEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
+    private val canUserTriggerRoomNotificationResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val canUserPinUnpinResult: (UserId) -> Result<Boolean> = { lambdaError() },
+    private val setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
+    private val powerLevelsResult: () -> Result<RoomPowerLevels> = { lambdaError() },
+    private val leaveRoomLambda: () -> Result<Unit> = { lambdaError() },
+    private val updateMembersResult: () -> Unit = { lambdaError() },
+    private val getMembersResult: (Int) -> Result<List<RoomMember>> = { lambdaError() },
+    private val saveComposerDraftLambda: (ComposerDraft) -> Result<Unit> = { _: ComposerDraft -> Result.success(Unit) },
+    private val loadComposerDraftLambda: () -> Result<ComposerDraft?> = { Result.success<ComposerDraft?>(null) },
+    private val clearComposerDraftLambda: () -> Result<Unit> = { Result.success(Unit) },
+    private val subscribeToSyncLambda: () -> Unit = { lambdaError() },
+    private val getRoomVisibilityResult: () -> Result<RoomVisibility> = { lambdaError() },
+    private val forgetResult: () -> Result<Unit> = { lambdaError() },
+    private val reportRoomResult: (String?) -> Result<Unit> = { lambdaError() },
+) : BaseRoom {
+    private val _roomInfoFlow: MutableStateFlow<RoomInfo> = MutableStateFlow(initialRoomInfo)
+    override val roomInfoFlow: StateFlow<RoomInfo> = _roomInfoFlow
+
+    fun givenRoomInfo(roomInfo: RoomInfo) {
+        _roomInfoFlow.tryEmit(roomInfo)
+    }
+
+    override val membersStateFlow: MutableStateFlow<RoomMembersState> = MutableStateFlow(RoomMembersState.Unknown)
+
+    override suspend fun updateMembers() = updateMembersResult()
+
+    override suspend fun getUpdatedMember(userId: UserId): Result<RoomMember> {
+        return getUpdatedMemberResult(userId)
+    }
+
+    override suspend fun getMembers(limit: Int): Result<List<RoomMember>> {
+        return getMembersResult(limit)
+    }
+
+    override suspend fun subscribeToSync() {
+        subscribeToSyncLambda()
+    }
+
+    override suspend fun powerLevels(): Result<RoomPowerLevels> {
+        return powerLevelsResult()
+    }
+
+    override fun destroy() = Unit
+
+    override suspend fun userDisplayName(userId: UserId): Result<String?> = simulateLongTask {
+        userDisplayNameResult(userId)
+    }
+
+    override suspend fun userAvatarUrl(userId: UserId): Result<String?> = simulateLongTask {
+        userAvatarUrlResult()
+    }
+
+    override suspend fun userRole(userId: UserId): Result<RoomMember.Role> {
+        return userRoleResult()
+    }
+
+    override suspend fun getPermalink(): Result<String> {
+        return roomPermalinkResult()
+    }
+
+    override suspend fun getPermalinkFor(eventId: EventId): Result<String> {
+        return eventPermalinkResult(eventId)
+    }
+
+    override suspend fun getRoomVisibility(): Result<RoomVisibility> = simulateLongTask {
+        getRoomVisibilityResult()
+    }
+
+    override suspend fun leave(): Result<Unit> = simulateLongTask {
+        return leaveRoomLambda()
+    }
+
+    override suspend fun join(): Result<Unit> {
+        return joinRoomResult()
+    }
+
+    override suspend fun forget(): Result<Unit> {
+        return forgetResult()
+    }
+
+    override suspend fun canUserBan(userId: UserId): Result<Boolean> {
+        return canBanResult(userId)
+    }
+
+    override suspend fun canUserKick(userId: UserId): Result<Boolean> {
+        return canKickResult(userId)
+    }
+
+    override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
+        return canInviteResult(userId)
+    }
+
+    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> {
+        return canRedactOwnResult(userId)
+    }
+
+    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> {
+        return canRedactOtherResult(userId)
+    }
+
+    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
+        return canSendStateResult(userId, type)
+    }
+
+    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
+        return canUserSendMessageResult(userId, type)
+    }
+
+    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> {
+        return canUserTriggerRoomNotificationResult(userId)
+    }
+
+    override suspend fun canUserJoinCall(userId: UserId): Result<Boolean> {
+        return canUserJoinCallResult(userId)
+    }
+
+    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> {
+        return canUserPinUnpinResult(userId)
+    }
+
+    override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> {
+        return setIsFavoriteResult(isFavorite)
+    }
+
+    val markAsReadCalls = mutableListOf<ReceiptType>()
+
+    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> {
+        markAsReadCalls.add(receiptType)
+        return Result.success(Unit)
+    }
+
+    var setUnreadFlagCalls = mutableListOf<Boolean>()
+        private set
+
+    override suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit> {
+        setUnreadFlagCalls.add(isUnread)
+        return Result.success(Unit)
+    }
+
+    override suspend fun saveComposerDraft(composerDraft: ComposerDraft) = saveComposerDraftLambda(composerDraft)
+
+    override suspend fun loadComposerDraft() = loadComposerDraftLambda()
+
+    override suspend fun clearComposerDraft() = clearComposerDraftLambda()
+
+    override suspend fun getUpdatedIsEncrypted(): Result<Boolean> = simulateLongTask {
+        Result.success(info().isEncrypted.orFalse())
+    }
+
+    fun givenRoomMembersState(state: RoomMembersState) {
+        membersStateFlow.value = state
+    }
+
+    override suspend fun clearEventCacheStorage(): Result<Unit> {
+        return Result.success(Unit)
+    }
+
+    override suspend fun reportRoom(reason: String?) = reportRoomResult(reason)
+}
+
+fun defaultRoomPowerLevels() = RoomPowerLevels(
+    ban = 50,
+    invite = 0,
+    kick = 50,
+    sendEvents = 0,
+    redactEvents = 50,
+    roomName = 100,
+    roomAvatar = 100,
+    roomTopic = 100
+)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt
similarity index 54%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.kt
index b7d226d499..2cae27b291 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeJoinedRoom.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.
@@ -14,7 +14,6 @@ import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SendHandle
-import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.TransactionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityStateChange
@@ -23,33 +22,26 @@ import io.element.android.libraries.matrix.api.media.FileInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
 import io.element.android.libraries.matrix.api.media.VideoInfo
-import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.poll.PollKind
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
 import io.element.android.libraries.matrix.api.room.IntentionalMention
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
-import io.element.android.libraries.matrix.api.room.MatrixRoomNotificationSettingsState
-import io.element.android.libraries.matrix.api.room.MessageEventType
-import io.element.android.libraries.matrix.api.room.RoomMember
-import io.element.android.libraries.matrix.api.room.StateEventType
-import io.element.android.libraries.matrix.api.room.draft.ComposerDraft
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+import io.element.android.libraries.matrix.api.room.RoomInfo
+import io.element.android.libraries.matrix.api.room.RoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomNotificationSettingsState
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
 import io.element.android.libraries.matrix.api.room.join.JoinRule
 import io.element.android.libraries.matrix.api.room.knock.KnockRequest
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
-import io.element.android.libraries.matrix.api.room.powerlevels.MatrixRoomPowerLevels
+import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevels
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
 import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility
-import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
-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.media.FakeMediaUploadHandler
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -58,36 +50,25 @@ import io.element.android.tests.testutils.simulateLongTask
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.test.TestScope
 import java.io.File
 
-class FakeMatrixRoom(
-    override val sessionId: SessionId = A_SESSION_ID,
-    override val roomId: RoomId = A_ROOM_ID,
-    val notificationSettingsService: NotificationSettingsService = FakeNotificationSettingsService(),
+class FakeJoinedRoom(
+    val baseRoom: FakeBaseRoom = FakeBaseRoom(),
     override val liveTimeline: Timeline = FakeTimeline(),
-    initialRoomInfo: MatrixRoomInfo = aRoomInfo(),
     override val roomCoroutineScope: CoroutineScope = TestScope(),
-    private var roomPermalinkResult: () -> Result<String> = { lambdaError() },
-    private var eventPermalinkResult: (EventId) -> Result<String> = { lambdaError() },
-    private val sendCallNotificationIfNeededResult: () -> Result<Unit> = { lambdaError() },
-    private val userDisplayNameResult: (UserId) -> Result<String?> = { lambdaError() },
-    private val userAvatarUrlResult: () -> Result<String?> = { lambdaError() },
-    private val userRoleResult: () -> Result<RoomMember.Role> = { lambdaError() },
-    private val getUpdatedMemberResult: (UserId) -> Result<RoomMember> = { lambdaError() },
-    private val joinRoomResult: () -> Result<Unit> = { lambdaError() },
-    private val inviteUserResult: (UserId) -> Result<Unit> = { lambdaError() },
-    private val canInviteResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canKickResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canBanResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canRedactOwnResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canRedactOtherResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canSendStateResult: (UserId, StateEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
-    private val canUserSendMessageResult: (UserId, MessageEventType) -> Result<Boolean> = { _, _ -> lambdaError() },
+    override val syncUpdateFlow: StateFlow<Long> = MutableStateFlow(0),
+    override val roomTypingMembersFlow: Flow<List<UserId>> = MutableStateFlow(emptyList()),
+    override val identityStateChangesFlow: Flow<List<IdentityStateChange>> = MutableStateFlow(emptyList()),
+    override val roomNotificationSettingsStateFlow: StateFlow<RoomNotificationSettingsState> =
+    MutableStateFlow(RoomNotificationSettingsState.Unknown),
+    override val knockRequestsFlow: Flow<List<KnockRequest>> = MutableStateFlow(emptyList()),
+    private val roomNotificationSettingsService: FakeNotificationSettingsService = FakeNotificationSettingsService(),
+    private var createTimelineResult: (CreateTimelineParams) -> Result<Timeline> = { lambdaError() },
+    private val sendMessageResult: (String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _ -> lambdaError() },
+    private val editMessageLambda: (EventId, String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _, _ -> lambdaError() },
     private val sendImageResult: (File, File?, ImageInfo, String?, String?, ProgressCallback?, ReplyParameters?) -> Result<FakeMediaUploadHandler> =
         { _, _, _, _, _, _, _ -> lambdaError() },
     private val sendVideoResult: (File, File?, VideoInfo, String?, String?, ProgressCallback?, ReplyParameters?) -> Result<FakeMediaUploadHandler> =
@@ -98,233 +79,65 @@ class FakeMatrixRoom(
         { _, _, _, _, _, _ -> lambdaError() },
     private val sendVoiceMessageResult: (File, AudioInfo, List<Float>, ProgressCallback?, ReplyParameters?) -> Result<FakeMediaUploadHandler> =
         { _, _, _, _, _ -> lambdaError() },
-    private val setNameResult: (String) -> Result<Unit> = { lambdaError() },
-    private val setTopicResult: (String) -> Result<Unit> = { lambdaError() },
-    private val updateAvatarResult: (String, ByteArray) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val removeAvatarResult: () -> Result<Unit> = { lambdaError() },
-    private val editMessageLambda: (EventId, String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _, _ -> lambdaError() },
-    private val sendMessageResult: (String, String?, List<IntentionalMention>) -> Result<Unit> = { _, _, _ -> lambdaError() },
-    private val updateUserRoleResult: () -> Result<Unit> = { lambdaError() },
-    private val toggleReactionResult: (String, EventOrTransactionId) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val cancelSendResult: (TransactionId) -> Result<Unit> = { lambdaError() },
-    private val forwardEventResult: (EventId, List<RoomId>) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val reportContentResult: (EventId, String, UserId?) -> Result<Unit> = { _, _, _ -> lambdaError() },
-    private val kickUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val banUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val unBanUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
     private val sendLocationResult: (String, String, String?, Int?, AssetType?) -> Result<Unit> = { _, _, _, _, _ -> lambdaError() },
+    private val sendCallNotificationIfNeededResult: () -> Result<Unit> = { lambdaError() },
+    private val progressCallbackValues: List<Pair<Long, Long>> = emptyList(),
     private val createPollResult: (String, List<String>, Int, PollKind) -> Result<Unit> = { _, _, _, _ -> lambdaError() },
     private val editPollResult: (EventId, String, List<String>, Int, PollKind) -> Result<Unit> = { _, _, _, _, _ -> lambdaError() },
     private val sendPollResponseResult: (EventId, List<String>) -> Result<Unit> = { _, _ -> lambdaError() },
     private val endPollResult: (EventId, String) -> Result<Unit> = { _, _ -> lambdaError() },
-    private val progressCallbackValues: List<Pair<Long, Long>> = emptyList(),
     private val generateWidgetWebViewUrlResult: (MatrixWidgetSettings, String, String?, String?) -> Result<String> = { _, _, _, _ -> lambdaError() },
     private val getWidgetDriverResult: (MatrixWidgetSettings) -> Result<MatrixWidgetDriver> = { lambdaError() },
-    private val canUserTriggerRoomNotificationResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canUserJoinCallResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val canUserPinUnpinResult: (UserId) -> Result<Boolean> = { lambdaError() },
-    private val setIsFavoriteResult: (Boolean) -> Result<Unit> = { lambdaError() },
-    private val powerLevelsResult: () -> Result<MatrixRoomPowerLevels> = { lambdaError() },
-    private val updatePowerLevelsResult: () -> Result<Unit> = { lambdaError() },
-    private val resetPowerLevelsResult: () -> Result<MatrixRoomPowerLevels> = { lambdaError() },
     private val typingNoticeResult: (Boolean) -> Result<Unit> = { lambdaError() },
-    private val leaveRoomLambda: () -> Result<Unit> = { lambdaError() },
-    private val updateMembersResult: () -> Unit = { lambdaError() },
-    private val getMembersResult: (Int) -> Result<List<RoomMember>> = { lambdaError() },
-    private val createTimelineResult: (CreateTimelineParams) -> Result<Timeline> = { lambdaError() },
-    private val setSendQueueEnabledLambda: (Boolean) -> Unit = { _: Boolean -> },
-    private val saveComposerDraftLambda: (ComposerDraft) -> Result<Unit> = { _: ComposerDraft -> Result.success(Unit) },
-    private val loadComposerDraftLambda: () -> Result<ComposerDraft?> = { Result.success<ComposerDraft?>(null) },
-    private val clearComposerDraftLambda: () -> Result<Unit> = { Result.success(Unit) },
-    private val subscribeToSyncLambda: () -> Unit = { lambdaError() },
+    private val toggleReactionResult: (String, EventOrTransactionId) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val forwardEventResult: (EventId, List<RoomId>) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val cancelSendResult: (TransactionId) -> Result<Unit> = { lambdaError() },
+    private val inviteUserResult: (UserId) -> Result<Unit> = { lambdaError() },
+    private val setNameResult: (String) -> Result<Unit> = { lambdaError() },
+    private val setTopicResult: (String) -> Result<Unit> = { lambdaError() },
+    private val updateAvatarResult: (String, ByteArray) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val removeAvatarResult: () -> Result<Unit> = { lambdaError() },
+    private val updateUserRoleResult: (List<UserRoleChange>) -> Result<Unit> = { lambdaError() },
+    private val updatePowerLevelsResult: (RoomPowerLevels) -> Result<Unit> = { lambdaError() },
+    private val resetPowerLevelsResult: () -> Result<RoomPowerLevels> = { lambdaError() },
+    private val reportContentResult: (EventId, String, UserId?) -> Result<Unit> = { _, _, _ -> lambdaError() },
+    private val kickUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val banUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
+    private val unBanUserResult: (UserId, String?) -> Result<Unit> = { _, _ -> lambdaError() },
     private val ignoreDeviceTrustAndResendResult: (Map<UserId, List<DeviceId>>, SendHandle) -> Result<Unit> = { _, _ -> lambdaError() },
     private val withdrawVerificationAndResendResult: (List<UserId>, SendHandle) -> Result<Unit> = { _, _ -> lambdaError() },
     private val updateCanonicalAliasResult: (RoomAlias?, List<RoomAlias>) -> Result<Unit> = { _, _ -> lambdaError() },
     private val updateRoomVisibilityResult: (RoomVisibility) -> Result<Unit> = { lambdaError() },
     private val updateRoomHistoryVisibilityResult: (RoomHistoryVisibility) -> Result<Unit> = { lambdaError() },
-    private val roomVisibilityResult: () -> Result<RoomVisibility> = { lambdaError() },
     private val publishRoomAliasInRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
     private val removeRoomAliasFromRoomDirectoryResult: (RoomAlias) -> Result<Boolean> = { lambdaError() },
     private val enableEncryptionResult: () -> Result<Unit> = { lambdaError() },
     private val updateJoinRuleResult: (JoinRule) -> Result<Unit> = { lambdaError() },
-) : MatrixRoom {
-    private val _roomInfoFlow: MutableStateFlow<MatrixRoomInfo> = MutableStateFlow(initialRoomInfo)
-    override val roomInfoFlow: StateFlow<MatrixRoomInfo> = _roomInfoFlow
-
-    fun givenRoomInfo(roomInfo: MatrixRoomInfo) {
-        _roomInfoFlow.tryEmit(roomInfo)
+    private val setSendQueueEnabledResult: (Boolean) -> Unit = { _: Boolean -> },
+) : JoinedRoom, BaseRoom by baseRoom {
+    fun givenRoomMembersState(state: RoomMembersState) {
+        baseRoom.givenRoomMembersState(state)
     }
 
-    private val _roomTypingMembersFlow: MutableSharedFlow<List<UserId>> = MutableSharedFlow(replay = 1)
-    override val roomTypingMembersFlow: Flow<List<UserId>> = _roomTypingMembersFlow
-
-    fun givenRoomTypingMembers(typingMembers: List<UserId>) {
-        _roomTypingMembersFlow.tryEmit(typingMembers)
+    fun givenRoomInfo(roomInfo: RoomInfo) {
+        baseRoom.givenRoomInfo(roomInfo)
     }
 
-    private val _identityStateChangesFlow: MutableSharedFlow<List<IdentityStateChange>> = MutableSharedFlow(replay = 1)
-    override val identityStateChangesFlow: Flow<List<IdentityStateChange>> = _identityStateChangesFlow
-
-    fun emitIdentityStateChanges(identityStateChanges: List<IdentityStateChange>) {
-        _identityStateChangesFlow.tryEmit(identityStateChanges)
-    }
-
-    private val _knockRequestsFlow: MutableSharedFlow<List<KnockRequest>> = MutableSharedFlow(replay = 1)
-    override val knockRequestsFlow: Flow<List<KnockRequest>> = _knockRequestsFlow
-
-    fun emitKnockRequests(knockRequests: List<KnockRequest>) {
-        _knockRequestsFlow.tryEmit(knockRequests)
-    }
-
-    override val membersStateFlow: MutableStateFlow<MatrixRoomMembersState> = MutableStateFlow(MatrixRoomMembersState.Unknown)
-
-    override val roomNotificationSettingsStateFlow: MutableStateFlow<MatrixRoomNotificationSettingsState> =
-        MutableStateFlow(MatrixRoomNotificationSettingsState.Unknown)
-
-    override suspend fun updateMembers() = updateMembersResult()
-
-    override suspend fun getUpdatedMember(userId: UserId): Result<RoomMember> {
-        return getUpdatedMemberResult(userId)
-    }
-
-    override suspend fun getMembers(limit: Int): Result<List<RoomMember>> {
-        return getMembersResult(limit)
-    }
-
-    override suspend fun updateRoomNotificationSettings(): Result<Unit> = simulateLongTask {
-        val notificationSettings = notificationSettingsService.getRoomNotificationSettings(roomId, info().isEncrypted.orFalse(), isOneToOne).getOrThrow()
-        roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Ready(notificationSettings)
-        return Result.success(Unit)
-    }
-
-    override suspend fun enableEncryption(): Result<Unit> = simulateLongTask {
-        enableEncryptionResult().onSuccess {
-            givenRoomInfo(info().copy(isEncrypted = true))
-            emitSyncUpdate()
-        }
-    }
-
-    private val _syncUpdateFlow = MutableStateFlow(0L)
-    override val syncUpdateFlow: StateFlow<Long> = _syncUpdateFlow.asStateFlow()
-
-    fun emitSyncUpdate() {
-        _syncUpdateFlow.tryEmit(_syncUpdateFlow.value + 1)
-    }
-
-    override suspend fun createTimeline(
-        createTimelineParams: CreateTimelineParams,
-    ): Result<Timeline> = simulateLongTask {
+    override suspend fun createTimeline(createTimelineParams: CreateTimelineParams): Result<Timeline> = simulateLongTask {
         createTimelineResult(createTimelineParams)
     }
 
-    override suspend fun subscribeToSync() {
-        subscribeToSyncLambda()
-    }
-
-    override suspend fun powerLevels(): Result<MatrixRoomPowerLevels> {
-        return powerLevelsResult()
-    }
-
-    override suspend fun updatePowerLevels(matrixRoomPowerLevels: MatrixRoomPowerLevels): Result<Unit> = simulateLongTask {
-        updatePowerLevelsResult()
-    }
-
-    override suspend fun resetPowerLevels(): Result<MatrixRoomPowerLevels> = simulateLongTask {
-        resetPowerLevelsResult()
-    }
-
-    override fun destroy() = Unit
-
-    override suspend fun userDisplayName(userId: UserId): Result<String?> = simulateLongTask {
-        userDisplayNameResult(userId)
-    }
-
-    override suspend fun userAvatarUrl(userId: UserId): Result<String?> = simulateLongTask {
-        userAvatarUrlResult()
-    }
-
-    override suspend fun userRole(userId: UserId): Result<RoomMember.Role> {
-        return userRoleResult()
-    }
-
-    override suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit> {
-        return updateUserRoleResult()
-    }
-
-    override suspend fun editMessage(eventId: EventId, body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>) = simulateLongTask {
-        editMessageLambda(eventId, body, htmlBody, intentionalMentions)
-    }
-
-    override suspend fun sendMessage(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>) = simulateLongTask {
+    override suspend fun sendMessage(body: String, htmlBody: String?, intentionalMentions: List<IntentionalMention>): Result<Unit> = simulateLongTask {
         sendMessageResult(body, htmlBody, intentionalMentions)
     }
 
-    override suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit> {
-        return toggleReactionResult(emoji, eventOrTransactionId)
-    }
-
-    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> {
-        return cancelSendResult(transactionId)
-    }
-
-    override suspend fun getPermalink(): Result<String> {
-        return roomPermalinkResult()
-    }
-
-    override suspend fun getPermalinkFor(eventId: EventId): Result<String> {
-        return eventPermalinkResult(eventId)
-    }
-
-    override suspend fun leave(): Result<Unit> {
-        return leaveRoomLambda()
-    }
-
-    override suspend fun join(): Result<Unit> {
-        return joinRoomResult()
-    }
-
-    override suspend fun inviteUserById(id: UserId): Result<Unit> = simulateLongTask {
-        inviteUserResult(id)
-    }
-
-    override suspend fun canUserBan(userId: UserId): Result<Boolean> {
-        return canBanResult(userId)
-    }
-
-    override suspend fun canUserKick(userId: UserId): Result<Boolean> {
-        return canKickResult(userId)
-    }
-
-    override suspend fun canUserInvite(userId: UserId): Result<Boolean> {
-        return canInviteResult(userId)
-    }
-
-    override suspend fun canUserRedactOwn(userId: UserId): Result<Boolean> {
-        return canRedactOwnResult(userId)
-    }
-
-    override suspend fun canUserRedactOther(userId: UserId): Result<Boolean> {
-        return canRedactOtherResult(userId)
-    }
-
-    override suspend fun canUserSendState(userId: UserId, type: StateEventType): Result<Boolean> {
-        return canSendStateResult(userId, type)
-    }
-
-    override suspend fun canUserSendMessage(userId: UserId, type: MessageEventType): Result<Boolean> {
-        return canUserSendMessageResult(userId, type)
-    }
-
-    override suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean> {
-        return canUserTriggerRoomNotificationResult(userId)
-    }
-
-    override suspend fun canUserJoinCall(userId: UserId): Result<Boolean> {
-        return canUserJoinCallResult(userId)
-    }
-
-    override suspend fun canUserPinUnpin(userId: UserId): Result<Boolean> {
-        return canUserPinUnpinResult(userId)
+    override suspend fun editMessage(
+        eventId: EventId,
+        body: String,
+        htmlBody: String?,
+        intentionalMentions: List<IntentionalMention>
+    ): Result<Unit> = simulateLongTask {
+        editMessageLambda(eventId, body, htmlBody, intentionalMentions)
     }
 
     override suspend fun sendImage(
@@ -440,78 +253,7 @@ class FakeMatrixRoom(
         )
     }
 
-    private suspend fun simulateSendMediaProgress(progressCallback: ProgressCallback?) {
-        progressCallbackValues.forEach { (current, total) ->
-            progressCallback?.onProgress(current, total)
-            delay(1)
-        }
-    }
-
-    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> = simulateLongTask {
-        forwardEventResult(eventId, roomIds)
-    }
-
-    override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> = simulateLongTask {
-        updateAvatarResult(mimeType, data)
-    }
-
-    override suspend fun removeAvatar(): Result<Unit> = simulateLongTask {
-        removeAvatarResult()
-    }
-
-    override suspend fun setName(name: String): Result<Unit> = simulateLongTask {
-        setNameResult(name)
-    }
-
-    override suspend fun setTopic(topic: String): Result<Unit> = simulateLongTask {
-        setTopicResult(topic)
-    }
-
-    override suspend fun reportContent(
-        eventId: EventId,
-        reason: String,
-        blockUserId: UserId?
-    ): Result<Unit> = simulateLongTask {
-        return reportContentResult(eventId, reason, blockUserId)
-    }
-
-    override suspend fun kickUser(userId: UserId, reason: String?): Result<Unit> {
-        return kickUserResult(userId, reason)
-    }
-
-    override suspend fun banUser(userId: UserId, reason: String?): Result<Unit> {
-        return banUserResult(userId, reason)
-    }
-
-    override suspend fun unbanUser(userId: UserId, reason: String?): Result<Unit> {
-        return unBanUserResult(userId, reason)
-    }
-
-    override suspend fun setIsFavorite(isFavorite: Boolean): Result<Unit> {
-        return setIsFavoriteResult(isFavorite)
-    }
-
-    val markAsReadCalls = mutableListOf<ReceiptType>()
-
-    override suspend fun markAsRead(receiptType: ReceiptType): Result<Unit> {
-        markAsReadCalls.add(receiptType)
-        return Result.success(Unit)
-    }
-
-    var setUnreadFlagCalls = mutableListOf<Boolean>()
-        private set
-
-    override suspend fun setUnreadFlag(isUnread: Boolean): Result<Unit> {
-        setUnreadFlagCalls.add(isUnread)
-        return Result.success(Unit)
-    }
-
-    override suspend fun createPoll(
-        question: String,
-        answers: List<String>,
-        maxSelections: Int,
-        pollKind: PollKind
-    ): Result<Unit> = simulateLongTask {
+    override suspend fun createPoll(question: String, answers: List<String>, maxSelections: Int, pollKind: PollKind): Result<Unit> = simulateLongTask {
         return createPollResult(
             question,
             answers,
@@ -536,58 +278,53 @@ class FakeMatrixRoom(
         )
     }
 
-    override suspend fun sendPollResponse(
-        pollStartId: EventId,
-        answers: List<String>
-    ): Result<Unit> = simulateLongTask {
-        return sendPollResponseResult(pollStartId, answers)
+    override suspend fun sendPollResponse(pollStartId: EventId, answers: List<String>): Result<Unit> = simulateLongTask {
+        return sendPollResponseResult(
+            pollStartId,
+            answers,
+        )
     }
 
-    override suspend fun endPoll(
-        pollStartId: EventId,
-        text: String
-    ): Result<Unit> = simulateLongTask {
-        return endPollResult(pollStartId, text)
+    override suspend fun endPoll(pollStartId: EventId, text: String): Result<Unit> = simulateLongTask {
+        endPollResult(
+            pollStartId,
+            text,
+        )
     }
 
-    override suspend fun typingNotice(isTyping: Boolean): Result<Unit> {
-        return typingNoticeResult(isTyping)
+    override suspend fun typingNotice(isTyping: Boolean): Result<Unit> = simulateLongTask {
+        typingNoticeResult(isTyping)
     }
 
-    override suspend fun generateWidgetWebViewUrl(
-        widgetSettings: MatrixWidgetSettings,
-        clientId: String,
-        languageTag: String?,
-        theme: String?,
-    ): Result<String> = generateWidgetWebViewUrlResult(
-        widgetSettings,
-        clientId,
-        languageTag,
-        theme,
-    )
-
-    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> {
-        return sendCallNotificationIfNeededResult()
+    override suspend fun toggleReaction(emoji: String, eventOrTransactionId: EventOrTransactionId): Result<Unit> = simulateLongTask {
+        toggleReactionResult(emoji, eventOrTransactionId)
     }
 
-    override suspend fun setSendQueueEnabled(enabled: Boolean) = setSendQueueEnabledLambda(enabled)
-
-    override suspend fun saveComposerDraft(composerDraft: ComposerDraft) = saveComposerDraftLambda(composerDraft)
-
-    override suspend fun loadComposerDraft() = loadComposerDraftLambda()
-
-    override suspend fun clearComposerDraft() = clearComposerDraftLambda()
-
-    override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> {
-        return getWidgetDriverResult(widgetSettings)
+    override suspend fun forwardEvent(eventId: EventId, roomIds: List<RoomId>): Result<Unit> = simulateLongTask {
+        forwardEventResult(eventId, roomIds)
     }
 
-    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle): Result<Unit> = simulateLongTask {
-        return ignoreDeviceTrustAndResendResult(devices, sendHandle)
+    override suspend fun cancelSend(transactionId: TransactionId): Result<Unit> = simulateLongTask {
+        cancelSendResult(transactionId)
     }
 
-    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle): Result<Unit> = simulateLongTask {
-        return withdrawVerificationAndResendResult(userIds, sendHandle)
+    override suspend fun inviteUserById(id: UserId): Result<Unit> = simulateLongTask {
+        inviteUserResult(id)
+    }
+
+    override suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit> = simulateLongTask {
+        simulateSendMediaProgress(null)
+        updateAvatarResult(mimeType, data)
+    }
+
+    override suspend fun removeAvatar(): Result<Unit> = simulateLongTask {
+        removeAvatarResult()
+    }
+
+    override suspend fun updateRoomNotificationSettings(): Result<Unit> = simulateLongTask {
+        val notificationSettings = roomNotificationSettingsService.getRoomNotificationSettings(roomId, info().isEncrypted.orFalse(), isOneToOne).getOrThrow()
+        (roomNotificationSettingsStateFlow as MutableStateFlow).value = RoomNotificationSettingsState.Ready(notificationSettings)
+        return Result.success(Unit)
     }
 
     override suspend fun updateCanonicalAlias(canonicalAlias: RoomAlias?, alternativeAliases: List<RoomAlias>): Result<Unit> = simulateLongTask {
@@ -602,10 +339,6 @@ class FakeMatrixRoom(
         updateRoomHistoryVisibilityResult(historyVisibility)
     }
 
-    override suspend fun getRoomVisibility(): Result<RoomVisibility> = simulateLongTask {
-        roomVisibilityResult()
-    }
-
     override suspend fun publishRoomAliasInRoomDirectory(roomAlias: RoomAlias): Result<Boolean> = simulateLongTask {
         publishRoomAliasInRoomDirectoryResult(roomAlias)
     }
@@ -614,30 +347,90 @@ class FakeMatrixRoom(
         removeRoomAliasFromRoomDirectoryResult(roomAlias)
     }
 
+    override suspend fun enableEncryption(): Result<Unit> = simulateLongTask {
+        enableEncryptionResult().onSuccess {
+            baseRoom.givenRoomInfo(info().copy(isEncrypted = true))
+            emitSyncUpdate()
+        }
+    }
+
     override suspend fun updateJoinRule(joinRule: JoinRule): Result<Unit> = simulateLongTask {
         updateJoinRuleResult(joinRule)
     }
 
-    override suspend fun getUpdatedIsEncrypted(): Result<Boolean> = simulateLongTask {
-        Result.success(info().isEncrypted.orFalse())
+    override suspend fun updateUsersRoles(changes: List<UserRoleChange>): Result<Unit> = simulateLongTask {
+        updateUserRoleResult(changes)
     }
 
-    fun givenRoomMembersState(state: MatrixRoomMembersState) {
-        membersStateFlow.value = state
+    override suspend fun updatePowerLevels(roomPowerLevels: RoomPowerLevels): Result<Unit> = simulateLongTask {
+        updatePowerLevelsResult(roomPowerLevels)
     }
 
-    override suspend fun clearEventCacheStorage(): Result<Unit> {
-        return Result.success(Unit)
+    override suspend fun resetPowerLevels(): Result<RoomPowerLevels> = simulateLongTask {
+        resetPowerLevelsResult()
+    }
+
+    override suspend fun setName(name: String): Result<Unit> = simulateLongTask {
+        setNameResult(name)
+    }
+
+    override suspend fun setTopic(topic: String): Result<Unit> = simulateLongTask {
+        setTopicResult(topic)
+    }
+
+    override suspend fun reportContent(eventId: EventId, reason: String, blockUserId: UserId?): Result<Unit> = simulateLongTask {
+        reportContentResult(eventId, reason, blockUserId)
+    }
+
+    override suspend fun kickUser(userId: UserId, reason: String?): Result<Unit> = simulateLongTask {
+        kickUserResult(userId, reason)
+    }
+
+    override suspend fun banUser(userId: UserId, reason: String?): Result<Unit> = simulateLongTask {
+        banUserResult(userId, reason)
+    }
+
+    override suspend fun unbanUser(userId: UserId, reason: String?): Result<Unit> = simulateLongTask {
+        unBanUserResult(userId, reason)
+    }
+
+    override suspend fun generateWidgetWebViewUrl(
+        widgetSettings: MatrixWidgetSettings,
+        clientId: String,
+        languageTag: String?,
+        theme: String?
+    ): Result<String> = simulateLongTask {
+        generateWidgetWebViewUrlResult(widgetSettings, clientId, languageTag, theme)
+    }
+
+    override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> {
+        return getWidgetDriverResult(widgetSettings)
+    }
+
+    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> = simulateLongTask {
+        sendCallNotificationIfNeededResult()
+    }
+
+    override suspend fun setSendQueueEnabled(enabled: Boolean) = simulateLongTask {
+        setSendQueueEnabledResult(enabled)
+    }
+
+    override suspend fun ignoreDeviceTrustAndResend(devices: Map<UserId, List<DeviceId>>, sendHandle: SendHandle): Result<Unit> = simulateLongTask {
+        ignoreDeviceTrustAndResendResult(devices, sendHandle)
+    }
+
+    override suspend fun withdrawVerificationAndResend(userIds: List<UserId>, sendHandle: SendHandle): Result<Unit> = simulateLongTask {
+        withdrawVerificationAndResendResult(userIds, sendHandle)
+    }
+
+    private suspend fun simulateSendMediaProgress(progressCallback: ProgressCallback?) {
+        progressCallbackValues.forEach { (current, total) ->
+            progressCallback?.onProgress(current, total)
+            delay(1)
+        }
+    }
+
+    fun emitSyncUpdate() {
+        (syncUpdateFlow as MutableStateFlow).value = syncUpdateFlow.value + 1
     }
 }
-
-fun defaultRoomPowerLevels() = MatrixRoomPowerLevels(
-    ban = 50,
-    invite = 0,
-    kick = 50,
-    sendEvents = 0,
-    redactEvents = 50,
-    roomName = 100,
-    roomAvatar = 100,
-    roomTopic = 100
-)
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomPreview.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
similarity index 54%
rename from libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomPreview.kt
rename to libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
index 80908c5228..7691aa58c6 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeRoomPreview.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeNotJoinedRoom.kt
@@ -8,30 +8,19 @@
 package io.element.android.libraries.matrix.test.room
 
 import androidx.compose.runtime.Immutable
-import io.element.android.libraries.matrix.api.core.SessionId
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.NotJoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
-import io.element.android.libraries.matrix.api.room.RoomPreview
 import io.element.android.libraries.matrix.api.room.preview.RoomPreviewInfo
-import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.tests.testutils.lambda.lambdaError
 import io.element.android.tests.testutils.simulateLongTask
 
 @Immutable
-class FakeRoomPreview(
-    override val sessionId: SessionId = A_SESSION_ID,
-    override val info: RoomPreviewInfo = aRoomPreviewInfo(),
-    private val declineInviteResult: () -> Result<Unit> = { lambdaError() },
-    private val forgetRoomResult: () -> Result<Unit> = { lambdaError() },
+class FakeNotJoinedRoom(
+    override val localRoom: BaseRoom? = null,
+    override val previewInfo: RoomPreviewInfo = aRoomPreviewInfo(),
     private val roomMembershipDetails: () -> Result<RoomMembershipDetails?> = { lambdaError() },
-) : RoomPreview {
-    override suspend fun leave(): Result<Unit> = simulateLongTask {
-        declineInviteResult()
-    }
-
-    override suspend fun forget(): Result<Unit> = simulateLongTask {
-        forgetRoomResult()
-    }
-
+) : NotJoinedRoom {
     override suspend fun membershipDetails(): Result<RoomMembershipDetails?> = simulateLongTask {
         roomMembershipDetails()
     }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
index cc56c2d32f..130d00ab24 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
@@ -61,7 +61,7 @@ fun aRoomInfo(
     numUnreadNotifications: Long = 0,
     numUnreadMentions: Long = 0,
     historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
-) = MatrixRoomInfo(
+) = RoomInfo(
     id = id,
     name = name,
     rawName = rawName,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
index ab52880ef7..74a58354a5 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomPreviewInfoFixture.kt
@@ -9,7 +9,6 @@ package io.element.android.libraries.matrix.test.room
 
 import io.element.android.libraries.matrix.api.core.RoomAlias
 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.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMembershipDetails
 import io.element.android.libraries.matrix.api.room.RoomType
@@ -19,20 +18,15 @@ import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_ROOM_TOPIC
-import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.tests.testutils.lambda.lambdaError
 
 fun aRoomPreview(
-    sessionId: SessionId = A_SESSION_ID,
+    localRoom: FakeBaseRoom? = null,
     info: RoomPreviewInfo = aRoomPreviewInfo(),
-    declineInviteResult: () -> Result<Unit> = { lambdaError() },
-    forgetRoomResult: () -> Result<Unit> = { lambdaError() },
     roomMembershipDetails: () -> Result<RoomMembershipDetails?> = { lambdaError() },
-) = FakeRoomPreview(
-    sessionId = sessionId,
-    info = info,
-    declineInviteResult = declineInviteResult,
-    forgetRoomResult = forgetRoomResult,
+) = FakeNotJoinedRoom(
+    localRoom = localRoom,
+    previewInfo = info,
     roomMembershipDetails = roomMembershipDetails,
 )
 
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
index ac561c57d2..26e0e3afaf 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.history.RoomHistoryVisibility
@@ -33,7 +33,7 @@ import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.collections.immutable.toPersistentList
 
 fun aRoomSummary(
-    info: MatrixRoomInfo = aRoomInfo(),
+    info: RoomInfo = aRoomInfo(),
     lastMessage: RoomMessage? = aRoomMessage(),
 ) = RoomSummary(
     info = info,
@@ -76,7 +76,7 @@ fun aRoomSummary(
     historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
     lastMessage: RoomMessage? = aRoomMessage(),
 ) = RoomSummary(
-    info = MatrixRoomInfo(
+    info = RoomInfo(
         id = roomId,
         name = name,
         rawName = rawName,
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
index 327cec3b08..1723b56490 100644
--- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/LiveTimelineProvider.kt
@@ -7,14 +7,14 @@
 
 package io.element.android.libraries.matrix.test.timeline
 
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
 class LiveTimelineProvider(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
 ) : TimelineProvider {
     override fun activeTimelineFlow(): StateFlow<Timeline> = MutableStateFlow(room.liveTimeline)
 }
diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt
new file mode 100644
index 0000000000..c9e7c304d5
--- /dev/null
+++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/item/event/Fixture.kt
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+package io.element.android.libraries.matrix.test.timeline.item.event
+
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
+import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
+import io.element.android.libraries.matrix.test.A_USER_ID
+
+fun aRoomMembershipContent(
+    userId: UserId = A_USER_ID,
+    userDisplayName: String? = null,
+    change: MembershipChange? = null,
+    reason: String? = null,
+) = RoomMembershipContent(
+    userId = userId,
+    userDisplayName = userDisplayName,
+    change = change,
+    reason = reason,
+)
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
index 413a043f79..14e64c3557 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/model/RoomInfoExtension.kt
@@ -9,9 +9,9 @@ package io.element.android.libraries.matrix.ui.model
 
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
-import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
+import io.element.android.libraries.matrix.api.room.RoomInfo
 
-fun MatrixRoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
+fun RoomInfo.getAvatarData(size: AvatarSize) = AvatarData(
     id = id.value,
     name = name,
     url = avatarUrl,
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
similarity index 78%
rename from appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomState.kt
rename to libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
index adba822ff7..7fc95035c6 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomState.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/LoadingRoomState.kt
@@ -5,15 +5,13 @@
  * Please see LICENSE files in the repository root for full details.
  */
 
-package io.element.android.appnav.room.joined
+package io.element.android.libraries.matrix.ui.room
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
@@ -27,7 +25,7 @@ import javax.inject.Inject
 sealed interface LoadingRoomState {
     data object Loading : LoadingRoomState
     data object Error : LoadingRoomState
-    data class Loaded(val room: MatrixRoom) : LoadingRoomState
+    data class Loaded(val room: JoinedRoom) : LoadingRoomState
 }
 
 open class LoadingRoomStateProvider : PreviewParameterProvider<LoadingRoomState> {
@@ -38,10 +36,9 @@ open class LoadingRoomStateProvider : PreviewParameterProvider<LoadingRoomState>
         )
 }
 
-@SingleIn(SessionScope::class)
 class LoadingRoomStateFlowFactory @Inject constructor(private val matrixClient: MatrixClient) {
     fun create(lifecycleScope: CoroutineScope, roomId: RoomId): StateFlow<LoadingRoomState> =
-        getRoomFlow(roomId)
+        getJoinedRoomFlow(roomId)
             .map { room ->
                 if (room != null) {
                     LoadingRoomState.Loaded(room)
@@ -51,8 +48,8 @@ class LoadingRoomStateFlowFactory @Inject constructor(private val matrixClient:
             }
             .stateIn(lifecycleScope, SharingStarted.Eagerly, LoadingRoomState.Loading)
 
-    private fun getRoomFlow(roomId: RoomId): Flow<MatrixRoom?> = suspend {
-        matrixClient.getRoom(roomId = roomId)
+    private fun getJoinedRoomFlow(roomId: RoomId): Flow<JoinedRoom?> = suspend {
+        matrixClient.getJoinedRoom(roomId = roomId)
     }
         .asFlow()
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
index eb281f09d6..8631066482 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
@@ -14,19 +14,19 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.roomMembers
 
 @Composable
-fun MatrixRoom.getRoomMemberAsState(userId: UserId): State<RoomMember?> {
+fun BaseRoom.getRoomMemberAsState(userId: UserId): State<RoomMember?> {
     val roomMembersState by membersStateFlow.collectAsState()
     return getRoomMemberAsState(roomMembersState = roomMembersState, userId = userId)
 }
 
 @Composable
-fun getRoomMemberAsState(roomMembersState: MatrixRoomMembersState, userId: UserId): State<RoomMember?> {
+fun getRoomMemberAsState(roomMembersState: RoomMembersState, userId: UserId): State<RoomMember?> {
     val roomMembers = roomMembersState.roomMembers()
     return remember(roomMembers) {
         derivedStateOf {
@@ -38,7 +38,7 @@ fun getRoomMemberAsState(roomMembersState: MatrixRoomMembersState, userId: UserI
 }
 
 @Composable
-fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): State<RoomMember?> {
+fun BaseRoom.getDirectRoomMember(roomMembersState: RoomMembersState): State<RoomMember?> {
     val roomMembers = roomMembersState.roomMembers()
     val roomInfo by roomInfoFlow.collectAsState()
     return remember(roomMembersState, roomInfo.isDirect) {
@@ -52,6 +52,6 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
 }
 
 @Composable
-fun MatrixRoom.getCurrentRoomMember(roomMembersState: MatrixRoomMembersState): State<RoomMember?> {
+fun BaseRoom.getCurrentRoomMember(roomMembersState: RoomMembersState): State<RoomMember?> {
     return getRoomMemberAsState(roomMembersState = roomMembersState, userId = sessionId)
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
index e820004b83..ba32d01e8a 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomState.kt
@@ -12,7 +12,7 @@ import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.produceState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.MessageEventType
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.isDm
@@ -25,77 +25,77 @@ import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
 import io.element.android.libraries.matrix.api.room.powerlevels.canSendMessage
 
 @Composable
-fun MatrixRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): State<Boolean> {
+fun BaseRoom.canSendMessageAsState(type: MessageEventType, updateKey: Long): State<Boolean> {
     return produceState(initialValue = true, key1 = updateKey) {
         value = canSendMessage(type).getOrElse { true }
     }
 }
 
 @Composable
-fun MatrixRoom.canInviteAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canInviteAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canInvite().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canRedactOwnAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canRedactOwnAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canRedactOwn().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canRedactOtherAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canRedactOtherAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canRedactOther().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canCall(updateKey: Long): State<Boolean> {
+fun BaseRoom.canCall(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canUserJoinCall(sessionId).getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canPinUnpin(updateKey: Long): State<Boolean> {
+fun BaseRoom.canPinUnpin(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canUserPinUnpin(sessionId).getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.isDmAsState(): State<Boolean> {
+fun BaseRoom.isDmAsState(): State<Boolean> {
     return produceState(initialValue = false) {
         roomInfoFlow.collect { value = it.isDm }
     }
 }
 
 @Composable
-fun MatrixRoom.canKickAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canKickAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canKick().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canBanAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canBanAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canBan().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.canHandleKnockRequestsAsState(updateKey: Long): State<Boolean> {
+fun BaseRoom.canHandleKnockRequestsAsState(updateKey: Long): State<Boolean> {
     return produceState(initialValue = false, key1 = updateKey) {
         value = canHandleKnockRequests().getOrElse { false }
     }
 }
 
 @Composable
-fun MatrixRoom.userPowerLevelAsState(updateKey: Long): State<Long> {
+fun BaseRoom.userPowerLevelAsState(updateKey: Long): State<Long> {
     return produceState(initialValue = 0, key1 = updateKey) {
         value = userRole(sessionId)
             .getOrDefault(RoomMember.Role.USER)
@@ -104,26 +104,26 @@ fun MatrixRoom.userPowerLevelAsState(updateKey: Long): State<Long> {
 }
 
 @Composable
-fun MatrixRoom.isOwnUserAdmin(): Boolean {
+fun BaseRoom.isOwnUserAdmin(): Boolean {
     val roomInfo by roomInfoFlow.collectAsState()
     val powerLevel = roomInfo.userPowerLevels[sessionId] ?: 0L
     return RoomMember.Role.forPowerLevel(powerLevel) == RoomMember.Role.ADMIN
 }
 
 @Composable
-fun MatrixRoom.rawName(): String? {
+fun BaseRoom.rawName(): String? {
     val roomInfo by roomInfoFlow.collectAsState()
     return roomInfo.rawName
 }
 
 @Composable
-fun MatrixRoom.topic(): String? {
+fun BaseRoom.topic(): String? {
     val roomInfo by roomInfoFlow.collectAsState()
     return roomInfo.topic
 }
 
 @Composable
-fun MatrixRoom.avatarUrl(): String? {
+fun BaseRoom.avatarUrl(): String? {
     val roomInfo by roomInfoFlow.collectAsState()
     return roomInfo.avatarUrl
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
index 7610b55b20..303fae4d48 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/ObserveRoomMemberIdentityStateChange.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.roomMembers
 import io.element.android.libraries.matrix.ui.model.getAvatarData
@@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @OptIn(ExperimentalCoroutinesApi::class)
-fun MatrixRoom.roomMemberIdentityStateChange(): Flow<ImmutableList<RoomMemberIdentityStateChange>> {
+fun JoinedRoom.roomMemberIdentityStateChange(): Flow<ImmutableList<RoomMemberIdentityStateChange>> {
     return roomInfoFlow
         .filter {
             // Room cannot become unencrypted, so we can just apply a filter here.
@@ -52,7 +52,7 @@ fun MatrixRoom.roomMemberIdentityStateChange(): Flow<ImmutableList<RoomMemberIde
         }
 }
 
-fun ProduceStateScope<PersistentList<RoomMemberIdentityStateChange>>.observeRoomMemberIdentityStateChange(room: MatrixRoom) {
+fun ProduceStateScope<PersistentList<RoomMemberIdentityStateChange>>.observeRoomMemberIdentityStateChange(room: JoinedRoom) {
     room.roomMemberIdentityStateChange()
         .onEach { roomMemberIdentityStateChanges ->
             value = roomMemberIdentityStateChanges.toPersistentList()
diff --git a/libraries/matrixui/src/main/res/values-cy/translations.xml b/libraries/matrixui/src/main/res/values-cy/translations.xml
index 2233590a87..0131131fd7 100644
--- a/libraries/matrixui/src/main/res/values-cy/translations.xml
+++ b/libraries/matrixui/src/main/res/values-cy/translations.xml
@@ -3,4 +3,5 @@
   <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Anfon gwahoddiad"</string>
   <string name="screen_bottom_sheet_create_dm_message">"Hoffech chi ddechrau sgwrs gyda %1$s?"</string>
   <string name="screen_bottom_sheet_create_dm_title">"Anfon gwahoddiad?"</string>
+  <string name="screen_invites_invited_you">"Mae %1$s (%2$s) wedi eich gwahodd"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-el/translations.xml b/libraries/matrixui/src/main/res/values-el/translations.xml
index 089c4d49c3..9e9f195464 100644
--- a/libraries/matrixui/src/main/res/values-el/translations.xml
+++ b/libraries/matrixui/src/main/res/values-el/translations.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"Αποστολή πρόσκλησης"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"Θα θέλατε να ξεκινήσετε μια συνομιλία με τον χρήστη %1$s;"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"Αποστολή πρόσκλησης;"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) σέ προσκάλεσε"</string>
 </resources>
diff --git a/libraries/matrixui/src/main/res/values-fa/translations.xml b/libraries/matrixui/src/main/res/values-fa/translations.xml
index a38fe738f0..3f5d32f974 100644
--- a/libraries/matrixui/src/main/res/values-fa/translations.xml
+++ b/libraries/matrixui/src/main/res/values-fa/translations.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_bottom_sheet_create_dm_confirmation_button_title">"فرستادن دعوت"</string>
+  <string name="screen_bottom_sheet_create_dm_message">"می‌خواهید گپی را با %1$s بیاغازید؟"</string>
+  <string name="screen_bottom_sheet_create_dm_title">"فرستادن دعوت؟"</string>
   <string name="screen_invites_invited_you">"%1$s (%2$s) دعوتتان کرد"</string>
 </resources>
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
index 20e26cd125..6fdff3ad1c 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
@@ -13,12 +13,12 @@ import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageFormat
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.permalink.FakePermalinkParser
 import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import org.junit.Test
 
 class InReplyToDetailTest {
@@ -47,9 +47,8 @@ class InReplyToDetailTest {
             eventId = AN_EVENT_ID,
             senderId = A_USER_ID,
             senderProfile = aProfileTimelineDetails(),
-            content = RoomMembershipContent(
+            content = aRoomMembershipContent(
                 userId = A_USER_ID,
-                userDisplayName = null,
                 change = MembershipChange.INVITED,
             )
         )
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
index 288d0b3d9c..c96e55c6fa 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToMetadataKtTest.kt
@@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
 import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
 import io.element.android.libraries.matrix.api.timeline.item.event.UnableToDecryptContent
@@ -43,6 +42,7 @@ import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileTimelineDetails
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
@@ -496,7 +496,7 @@ class InReplyToMetadataKtTest {
     fun `room membership content`() = runTest {
         moleculeFlow(RecompositionMode.Immediate) {
             anInReplyToDetailsReady(
-                eventContent = RoomMembershipContent(A_USER_ID, null, null)
+                eventContent = aRoomMembershipContent(userId = A_USER_ID)
             ).metadata(hideImage = false)
         }.test {
             awaitItem().let {
diff --git a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
similarity index 75%
rename from libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt
rename to libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
index c54795486f..87deb9c323 100644
--- a/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembersTest.kt
+++ b/libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/room/RoomMembersTest.kt
@@ -11,26 +11,26 @@ 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.libraries.matrix.api.room.MatrixRoomMembersState
+import io.element.android.libraries.matrix.api.room.RoomMembersState
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID_3
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
-class MatrixRoomMembersTest {
+class RoomMembersTest {
     private val roomMember1 = aRoomMember(A_USER_ID)
     private val roomMember2 = aRoomMember(A_USER_ID_2)
     private val roomMember3 = aRoomMember(A_USER_ID_3)
 
     @Test
     fun `getDirectRoomMember emits other member for encrypted DM with 2 joined members`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(
                 isDirect = true,
@@ -38,8 +38,8 @@ class MatrixRoomMembersTest {
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
             )
         }.test {
             assertThat(awaitItem().value).isEqualTo(roomMember2)
@@ -48,13 +48,13 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emit null if the room is not a dm`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(isDirect = false)
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
             )
         }.test {
             assertThat(awaitItem().value).isNull()
@@ -63,7 +63,7 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emits other member even if the room is not encrypted`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(
                 isDirect = true,
@@ -71,8 +71,8 @@ class MatrixRoomMembersTest {
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2))
             )
         }.test {
             assertThat(awaitItem().value).isEqualTo(roomMember2)
@@ -81,13 +81,13 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emit null if the room has only 1 member`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(isDirect = true)
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(persistentListOf(roomMember1))
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(persistentListOf(roomMember1))
             )
         }.test {
             assertThat(awaitItem().value).isNull()
@@ -96,14 +96,14 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emit null if the room has only 3 members`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
         ).apply {
             givenRoomInfo(aRoomInfo(isDirect = true))
         }
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(persistentListOf(roomMember1, roomMember2, roomMember3))
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(persistentListOf(roomMember1, roomMember2, roomMember3))
             )
         }.test {
             assertThat(awaitItem().value).isNull()
@@ -112,13 +112,13 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emit null if the other member is not active`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(isDirect = true),
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(
                     persistentListOf(
                         roomMember1,
                         roomMember2.copy(membership = RoomMembershipState.BAN),
@@ -132,7 +132,7 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getDirectRoomMember emit the other member if there are 2 active members`() = runTest {
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeBaseRoom(
             sessionId = A_USER_ID,
             initialRoomInfo = aRoomInfo(
                 isDirect = true,
@@ -140,8 +140,8 @@ class MatrixRoomMembersTest {
             )
         )
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getDirectRoomMember(
-                MatrixRoomMembersState.Ready(
+            joinedRoom.getDirectRoomMember(
+                RoomMembersState.Ready(
                     persistentListOf(
                         roomMember1,
                         roomMember2,
@@ -156,10 +156,10 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getCurrentRoomMember returns the current user`() = runTest {
-        val matrixRoom = FakeMatrixRoom(sessionId = A_USER_ID)
+        val joinedRoom = FakeBaseRoom(sessionId = A_USER_ID)
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getCurrentRoomMember(
-                MatrixRoomMembersState.Ready(
+            joinedRoom.getCurrentRoomMember(
+                RoomMembersState.Ready(
                     persistentListOf(
                         roomMember1,
                         roomMember2,
@@ -174,10 +174,10 @@ class MatrixRoomMembersTest {
 
     @Test
     fun `getCurrentRoomMember returns null if the member is not found`() = runTest {
-        val matrixRoom = FakeMatrixRoom(sessionId = A_USER_ID)
+        val joinedRoom = FakeBaseRoom(sessionId = A_USER_ID)
         moleculeFlow(RecompositionMode.Immediate) {
-            matrixRoom.getCurrentRoomMember(
-                MatrixRoomMembersState.Ready(
+            joinedRoom.getCurrentRoomMember(
+                RoomMembersState.Ready(
                     persistentListOf(
                         roomMember2,
                         roomMember3,
diff --git a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
index b68f077df9..b9508bcfe7 100644
--- a/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
+++ b/libraries/mediaupload/api/src/main/kotlin/io/element/android/libraries/mediaupload/api/MediaSender.kt
@@ -11,7 +11,7 @@ import android.net.Uri
 import io.element.android.libraries.core.extensions.flatMapCatching
 import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.media.MediaUploadHandler
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import kotlinx.coroutines.CancellationException
@@ -22,7 +22,7 @@ import javax.inject.Inject
 
 class MediaSender @Inject constructor(
     private val preProcessor: MediaPreProcessor,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val sessionPreferencesStore: SessionPreferencesStore,
 ) {
     private val ongoingUploadJobs = ConcurrentHashMap<Job.Key, MediaUploadHandler>()
@@ -130,7 +130,7 @@ class MediaSender @Inject constructor(
             ongoingUploadJobs.remove(Job)
         }
 
-    private suspend fun MatrixRoom.sendMedia(
+    private suspend fun JoinedRoom.sendMedia(
         uploadInfo: MediaUploadInfo,
         progressCallback: ProgressCallback?,
         caption: String?,
diff --git a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt b/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt
index bd5795af51..80530c69ab 100644
--- a/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt
+++ b/libraries/mediaupload/api/src/test/kotlin/io/element/android/libraries/mediaupload/api/MediaSenderTest.kt
@@ -13,10 +13,10 @@ import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.matrix.api.core.ProgressCallback
 import io.element.android.libraries.matrix.api.media.FileInfo
 import io.element.android.libraries.matrix.api.media.ImageInfo
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.message.ReplyParameters
 import io.element.android.libraries.matrix.test.media.FakeMediaUploadHandler
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaupload.test.FakeMediaPreProcessor
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
@@ -45,12 +45,12 @@ class MediaSenderTest {
     }
 
     @Test
-    fun `given an attachment when sending it the MatrixRoom will call sendMedia`() = runTest {
+    fun `given an attachment when sending it the Room will call sendMedia`() = runTest {
         val sendImageResult =
             lambdaRecorder { _: File, _: File?, _: ImageInfo, _: String?, _: String?, _: ProgressCallback?, _: ReplyParameters? ->
                 Result.success(FakeMediaUploadHandler())
             }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendImageResult = sendImageResult
         )
         val sender = createMediaSender(room = room)
@@ -78,7 +78,7 @@ class MediaSenderTest {
             lambdaRecorder { _: File, _: File?, _: ImageInfo, _: String?, _: String?, _: ProgressCallback?, _: ReplyParameters? ->
                 Result.failure<FakeMediaUploadHandler>(Exception())
             }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendImageResult = sendImageResult
         )
         val sender = createMediaSender(room = room)
@@ -96,7 +96,7 @@ class MediaSenderTest {
             lambdaRecorder<File, FileInfo, String?, String?, ProgressCallback?, ReplyParameters?, Result<FakeMediaUploadHandler>> { _, _, _, _, _, _ ->
             Result.success(FakeMediaUploadHandler())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             sendFileResult = sendFileResult
         )
         val sender = createMediaSender(room = room)
@@ -123,7 +123,7 @@ class MediaSenderTest {
 
     private fun createMediaSender(
         preProcessor: MediaPreProcessor = FakeMediaPreProcessor(),
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         sessionPreferencesStore: SessionPreferencesStore = InMemorySessionPreferencesStore(),
     ) = MediaSender(
         preProcessor = preProcessor,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
index f776b35016..bdbffbfd1a 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedTimelineMediaGalleryDataSourceFactory.kt
@@ -10,7 +10,7 @@ package io.element.android.libraries.mediaviewer.impl.datasource
 import com.squareup.anvil.annotations.ContributesBinding
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import javax.inject.Inject
 
@@ -24,7 +24,7 @@ interface FocusedTimelineMediaGalleryDataSourceFactory {
 
 @ContributesBinding(RoomScope::class)
 class DefaultFocusedTimelineMediaGalleryDataSourceFactory @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val timelineMediaItemsFactory: TimelineMediaItemsFactory,
     private val mediaItemsPostProcessor: MediaItemsPostProcessor,
 ) : FocusedTimelineMediaGalleryDataSourceFactory {
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
index 1dc81a11e3..a7ee01aa57 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaGalleryDataSource.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
@@ -40,7 +40,7 @@ interface MediaGalleryDataSource {
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
 class TimelineMediaGalleryDataSource @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val mediaTimeline: MediaTimeline,
     private val timelineMediaItemsFactory: TimelineMediaItemsFactory,
     private val mediaItemsPostProcessor: MediaItemsPostProcessor,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
index 2d7739cc32..c014689003 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/MediaTimeline.kt
@@ -13,7 +13,7 @@ import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UniqueId
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
@@ -37,7 +37,7 @@ interface MediaTimeline {
 @SingleIn(RoomScope::class)
 @ContributesBinding(RoomScope::class)
 class LiveMediaTimeline @Inject constructor(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
 ) : MediaTimeline {
     private var timeline: Timeline? = null
     private val mutex = Mutex()
@@ -62,7 +62,7 @@ class LiveMediaTimeline @Inject constructor(
  * Optionally, the timeline will only contain the pinned events.
  */
 class FocusedMediaTimeline(
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val eventId: EventId,
     private val onlyPinnedEvents: Boolean,
     initialMediaItem: MediaItem.Event,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
index f79157e858..f4764e2d6b 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenter.kt
@@ -27,7 +27,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
 import io.element.android.libraries.mediaviewer.api.local.LocalMedia
@@ -45,7 +45,7 @@ import kotlinx.coroutines.launch
 
 class MediaGalleryPresenter @AssistedInject constructor(
     @Assisted private val navigator: MediaGalleryNavigator,
-    private val room: MatrixRoom,
+    private val room: BaseRoom,
     private val mediaGalleryDataSource: MediaGalleryDataSource,
     private val localMediaFactory: LocalMediaFactory,
     private val mediaLoader: MatrixMediaLoader,
diff --git a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
index 858e3e7916..f900510321 100644
--- a/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
+++ b/libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenter.kt
@@ -30,7 +30,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOther
 import io.element.android.libraries.matrix.api.room.powerlevels.canRedactOwn
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
@@ -53,7 +53,7 @@ class MediaViewerPresenter @AssistedInject constructor(
     @Assisted private val inputs: MediaViewerEntryPoint.Params,
     @Assisted private val navigator: MediaViewerNavigator,
     @Assisted private val dataSource: MediaViewerDataSource,
-    private val room: MatrixRoom,
+    private val room: JoinedRoom,
     private val localMediaActions: LocalMediaActions,
 ) : Presenter<MediaViewerState> {
     @AssistedFactory
diff --git a/libraries/mediaviewer/impl/src/main/res/values-cy/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-cy/translations.xml
index f0ba179270..6e08baa563 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-cy/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-cy/translations.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_browser_delete_confirmation_subtitle">"Bydd y ffeil hon yn cael ei thynnu o\'r ystafell a bydd gan aelodau ddim mynediad iddi."</string>
+  <string name="screen_media_browser_delete_confirmation_title">"Dileu ffeil?"</string>
+  <string name="screen_media_browser_download_error_message">"Gwiriwch eich cysylltiad rhyngrwyd a rhowch gynnig arall arni."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Bydd dogfennau, ffeiliau sain, a negeseuon llais llwythwyd i\'r ystafell hon yn cael eu dangos yma."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Dim ffeiliau wedi\'u llwytho eto"</string>
+  <string name="screen_media_browser_list_loading_files">"Wrthi\'n llwytho ffeiliau…"</string>
+  <string name="screen_media_browser_list_loading_media">"Wrthi\'n llwytho cyfryngau…"</string>
   <string name="screen_media_browser_list_mode_files">"Ffeiliau"</string>
   <string name="screen_media_browser_list_mode_media">"Cyfryngau"</string>
+  <string name="screen_media_browser_media_empty_state_subtitle">"Bydd delweddau a fideos llwythwyd i\'r ystafell hon yn cael eu dangos yma."</string>
+  <string name="screen_media_browser_media_empty_state_title">"Dim cyfrwng wedi\'i llwytho eto"</string>
+  <string name="screen_media_browser_title">"Cyfryngau a ffeiliau"</string>
   <string name="screen_media_details_file_format">"Fformat ffeil"</string>
   <string name="screen_media_details_filename">"Enw\'r ffeil"</string>
   <string name="screen_media_details_no_more_files_to_show">"Dim mwy o ffeiliau i\'w dangos"</string>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-el/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-el/translations.xml
index 3427270aae..93571105ca 100644
--- a/libraries/mediaviewer/impl/src/main/res/values-el/translations.xml
+++ b/libraries/mediaviewer/impl/src/main/res/values-el/translations.xml
@@ -2,6 +2,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_media_browser_delete_confirmation_subtitle">"Αυτό το αρχείο θα αφαιρεθεί από την αίθουσα και τα μέλη δεν θα έχουν πρόσβαση σε αυτό."</string>
   <string name="screen_media_browser_delete_confirmation_title">"Διαγραφή αρχείου;"</string>
+  <string name="screen_media_browser_download_error_message">"Ελέγξτε τη σύνδεσή σας στο διαδίκτυο και δοκιμάστε ξανά."</string>
+  <string name="screen_media_browser_files_empty_state_subtitle">"Έγγραφα, αρχεία ήχου και φωνητικά μηνύματα που έχουν μεταφορτωθεί σε αυτό το δωμάτιο θα εμφανίζονται εδώ."</string>
+  <string name="screen_media_browser_files_empty_state_title">"Δεν έχουν μεταφορτωθεί ακόμα αρχεία"</string>
   <string name="screen_media_browser_list_loading_files">"Φόρτωση αρχείων…"</string>
   <string name="screen_media_browser_list_loading_media">"Φόρτωση πολυμέσων…"</string>
   <string name="screen_media_browser_list_mode_files">"Αρχεία"</string>
@@ -11,6 +14,8 @@
   <string name="screen_media_browser_title">"Πολυμέσα και αρχεία"</string>
   <string name="screen_media_details_file_format">"Μορφή αρχείου"</string>
   <string name="screen_media_details_filename">"Όνομα αρχείου"</string>
+  <string name="screen_media_details_no_more_files_to_show">"Δεν υπάρχουν άλλα αρχεία για εμφάνιση"</string>
+  <string name="screen_media_details_no_more_media_to_show">"Δεν υπάρχουν άλλα μέσα για εμφάνιση"</string>
   <string name="screen_media_details_uploaded_by">"Μεταφορτώθηκε από"</string>
   <string name="screen_media_details_uploaded_on">"Μεταφορτώθηκε στις"</string>
 </resources>
diff --git a/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml b/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml
new file mode 100644
index 0000000000..cbf9f63758
--- /dev/null
+++ b/libraries/mediaviewer/impl/src/main/res/values-fa/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_media_browser_list_mode_files">"پرونده‌ها"</string>
+  <string name="screen_media_browser_list_mode_media">"رسانه"</string>
+  <string name="screen_media_details_file_format">"قالب پرونده"</string>
+  <string name="screen_media_details_filename">"نام پرونده"</string>
+  <string name="screen_media_details_uploaded_by">"بارگذاشته به دست"</string>
+  <string name="screen_media_details_uploaded_on">"بارگذاشته در"</string>
+</resources>
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt
index 40e6721c10..16e6057df6 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultEventItemFactoryTest.kt
@@ -31,7 +31,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessage
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.RedactedContent
-import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
@@ -47,6 +46,7 @@ import io.element.android.libraries.matrix.test.timeline.aPollContent
 import io.element.android.libraries.matrix.test.timeline.aProfileChangeMessageContent
 import io.element.android.libraries.matrix.test.timeline.aStickerContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
+import io.element.android.libraries.matrix.test.timeline.item.event.aRoomMembershipContent
 import io.element.android.libraries.mediaviewer.api.MediaInfo
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
 import io.element.android.libraries.mediaviewer.test.util.FileExtensionExtractorWithoutValidation
@@ -67,10 +67,8 @@ class DefaultEventItemFactoryTest {
             aPollContent(),
             aProfileChangeMessageContent(),
             RedactedContent,
-            RoomMembershipContent(
+            aRoomMembershipContent(
                 userId = A_USER_ID,
-                userDisplayName = null,
-                change = null,
             ),
             StateContent("", OtherState.RoomCreate),
             aStickerContent(
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
index 7496b01324..9edc2d0a75 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest.kt
@@ -9,7 +9,7 @@ package io.element.android.libraries.mediaviewer.impl.datasource
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -18,7 +18,7 @@ class DefaultFocusedTimelineMediaGalleryDataSourceFactoryTest {
     @Test
     fun `createFor should create a TimelineMediaGalleryDataSource`() = runTest {
         val sut = DefaultFocusedTimelineMediaGalleryDataSourceFactory(
-            room = FakeMatrixRoom(),
+            room = FakeJoinedRoom(),
             timelineMediaItemsFactory = createTimelineMediaItemsFactory(),
             mediaItemsPostProcessor = MediaItemsPostProcessor(),
         )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
index 5c46ffd910..1f2ab92dfc 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/FocusedMediaTimelineTest.kt
@@ -10,10 +10,10 @@ package io.element.android.libraries.mediaviewer.impl.datasource
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.libraries.mediaviewer.impl.model.MediaItem
@@ -79,7 +79,7 @@ class FocusedMediaTimelineTest {
         val createTimelineResult = lambdaRecorder<CreateTimelineParams, Result<Timeline>> {
             Result.success(FakeTimeline())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = createTimelineResult,
         )
         val sut = createFocusedMediaTimeline(
@@ -96,7 +96,7 @@ class FocusedMediaTimelineTest {
         val createTimelineResult = lambdaRecorder<CreateTimelineParams, Result<Timeline>> {
             Result.success(FakeTimeline())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = createTimelineResult,
         )
         val sut = createFocusedMediaTimeline(
@@ -110,7 +110,7 @@ class FocusedMediaTimelineTest {
     }
 
     private fun createFocusedMediaTimeline(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
         eventId: EventId = AN_EVENT_ID,
         initialMediaItem: MediaItem.Event = aMediaItemImage(),
         onlyPinnedEvent: Boolean = false,
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
index 839f8798d2..4d59b88c09 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/LiveMediaTimelineTest.kt
@@ -9,9 +9,9 @@ package io.element.android.libraries.mediaviewer.impl.datasource
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.room.CreateTimelineParams
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaviewer.impl.model.GroupedMediaItems
 import io.element.android.tests.testutils.lambda.lambdaRecorder
@@ -31,7 +31,7 @@ class LiveMediaTimelineTest {
         val createTimelineResult = lambdaRecorder<CreateTimelineParams, Result<Timeline>> {
             Result.success(FakeTimeline())
         }
-        val room = FakeMatrixRoom(
+        val room = FakeJoinedRoom(
             createTimelineResult = createTimelineResult,
         )
         val sut = createLiveMediaTimeline(
@@ -47,7 +47,7 @@ class LiveMediaTimelineTest {
     }
 
     private fun createLiveMediaTimeline(
-        room: MatrixRoom = FakeMatrixRoom(),
+        room: JoinedRoom = FakeJoinedRoom(),
     ) = LiveMediaTimeline(
         room = room,
     )
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
index 8e673ce7aa..20208a55dc 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/datasource/TimelineMediaGalleryDataSourceTest.kt
@@ -16,7 +16,7 @@ import io.element.android.libraries.dateformatter.test.FakeDateFormatter
 import io.element.android.libraries.matrix.api.media.ImageInfo
 import io.element.android.libraries.matrix.api.media.MediaSource
 import io.element.android.libraries.matrix.api.media.ThumbnailInfo
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
@@ -28,7 +28,7 @@ import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EXCEPTION
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
 import io.element.android.libraries.matrix.test.A_USER_ID
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
@@ -56,7 +56,7 @@ class TimelineMediaGalleryDataSourceTest {
     fun `test - not started TimelineMediaGalleryDataSource emits no events`() = runTest {
         val fakeTimeline = FakeTimeline()
         val sut = createTimelineMediaGalleryDataSource(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(fakeTimeline) },
                 roomCoroutineScope = backgroundScope,
             )
@@ -74,7 +74,7 @@ class TimelineMediaGalleryDataSourceTest {
         val fakeTimeline = FakeTimeline()
         runTest {
             val sut = createTimelineMediaGalleryDataSource(
-                room = FakeMatrixRoom(
+                room = FakeJoinedRoom(
                     createTimelineResult = { Result.success(fakeTimeline) },
                     roomCoroutineScope = backgroundScope,
                 )
@@ -111,7 +111,7 @@ class TimelineMediaGalleryDataSourceTest {
             paginateLambda = paginateLambdaRecorder
         }
         val sut = createTimelineMediaGalleryDataSource(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(fakeTimeline) },
                 roomCoroutineScope = backgroundScope,
             )
@@ -134,7 +134,7 @@ class TimelineMediaGalleryDataSourceTest {
             redactEventLambda = redactEventLambdaRecorder
         }
         val sut = createTimelineMediaGalleryDataSource(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(fakeTimeline) },
                 roomCoroutineScope = backgroundScope,
             )
@@ -153,7 +153,7 @@ class TimelineMediaGalleryDataSourceTest {
     @Test
     fun `test - failing to load timeline should emit an error`() = runTest {
         val sut = createTimelineMediaGalleryDataSource(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.failure(AN_EXCEPTION) },
                 roomCoroutineScope = backgroundScope,
             )
@@ -175,7 +175,7 @@ class TimelineMediaGalleryDataSourceTest {
             timelineItems = timelineItems,
         )
         val sut = createTimelineMediaGalleryDataSource(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(fakeTimeline) },
                 roomCoroutineScope = backgroundScope,
             )
@@ -256,7 +256,7 @@ class TimelineMediaGalleryDataSourceTest {
     }
 
     private fun TestScope.createTimelineMediaGalleryDataSource(
-        room: MatrixRoom = FakeMatrixRoom(
+        room: JoinedRoom = FakeJoinedRoom(
             liveTimeline = FakeTimeline(),
         ),
     ): TimelineMediaGalleryDataSource {
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
index 56396ca2a6..80005facd4 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt
@@ -12,14 +12,15 @@ import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaviewer.impl.datasource.FakeMediaGalleryDataSource
@@ -51,8 +52,8 @@ class MediaGalleryPresenterTest {
             mediaGalleryDataSource = FakeMediaGalleryDataSource(
                 startLambda = startLambda,
             ),
-            room = FakeMatrixRoom(
-                initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(initialRoomInfo = aRoomInfo(name = A_ROOM_NAME)),
                 createTimelineResult = { Result.success(FakeTimeline()) },
             )
         )
@@ -70,8 +71,8 @@ class MediaGalleryPresenterTest {
     @Test
     fun `present - change mode`() = runTest {
         val presenter = createMediaGalleryPresenter(
-            room = FakeMatrixRoom(
-                initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(initialRoomInfo = aRoomInfo(name = A_ROOM_NAME)),
                 createTimelineResult = { Result.success(FakeTimeline()) },
             )
         )
@@ -99,11 +100,13 @@ class MediaGalleryPresenterTest {
 
     private suspend fun `present - bottom sheet state - own message`(canDeleteOwn: Boolean) {
         val presenter = createMediaGalleryPresenter(
-            room = FakeMatrixRoom(
-                sessionId = A_USER_ID,
-                initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(FakeTimeline()) },
-                canRedactOwnResult = { Result.success(canDeleteOwn) }
+                baseRoom = FakeBaseRoom(
+                    sessionId = A_USER_ID,
+                    initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+                    canRedactOwnResult = { Result.success(canDeleteOwn) }
+                ),
             )
         )
         presenter.test {
@@ -142,11 +145,13 @@ class MediaGalleryPresenterTest {
 
     private suspend fun `present - bottom sheet state - other message`(canDeleteOther: Boolean) {
         val presenter = createMediaGalleryPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 sessionId = A_USER_ID,
                 initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
-                createTimelineResult = { Result.success(FakeTimeline()) },
-                canRedactOtherResult = { Result.success(canDeleteOther) }
+                    canRedactOtherResult = { Result.success(canDeleteOther) },
+                ),
+                createTimelineResult = { Result.success(FakeTimeline()) }
             )
         )
         presenter.test {
@@ -176,8 +181,8 @@ class MediaGalleryPresenterTest {
     @Test
     fun `present - delete bottom sheet`() = runTest {
         val presenter = createMediaGalleryPresenter(
-            room = FakeMatrixRoom(
-                initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(initialRoomInfo = aRoomInfo(name = A_ROOM_NAME)),
                 createTimelineResult = { Result.success(FakeTimeline()) },
             )
         )
@@ -244,7 +249,7 @@ class MediaGalleryPresenterTest {
             onViewInTimelineClickLambda = onViewInTimelineClickLambda,
         )
         val presenter = createMediaGalleryPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 createTimelineResult = { Result.success(FakeTimeline()) },
             ),
             navigator = navigator,
@@ -284,7 +289,7 @@ class MediaGalleryPresenterTest {
         localMediaActions: FakeLocalMediaActions = FakeLocalMediaActions(),
         snackbarDispatcher: SnackbarDispatcher = SnackbarDispatcher(),
         navigator: MediaGalleryNavigator = FakeMediaGalleryNavigator(),
-        room: MatrixRoom = FakeMatrixRoom(
+        room: JoinedRoom = FakeJoinedRoom(
             liveTimeline = FakeTimeline(),
         ),
     ): MediaGalleryPresenter {
diff --git a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
index 06418da15e..a4f72aa474 100644
--- a/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
+++ b/libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/viewer/MediaViewerPresenterTest.kt
@@ -15,7 +15,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.media.MediaSource
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
 import io.element.android.libraries.matrix.api.timeline.item.event.EventOrTransactionId
 import io.element.android.libraries.matrix.api.timeline.item.event.toEventOrTransactionId
@@ -24,7 +24,8 @@ import io.element.android.libraries.matrix.test.A_SESSION_ID_2
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.media.FakeMatrixMediaLoader
 import io.element.android.libraries.matrix.test.media.aMediaSource
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.mediaviewer.api.MediaViewerEntryPoint
 import io.element.android.libraries.mediaviewer.api.anApkMediaInfo
@@ -77,10 +78,12 @@ class MediaViewerPresenterTest {
     @Test
     fun `present - initial state null Event`() = runTest {
         val presenter = createMediaViewerPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 canRedactOwnResult = { Result.success(true) },
             )
         )
+        )
         presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.listData).isEmpty()
@@ -95,10 +98,12 @@ class MediaViewerPresenterTest {
     fun `present - initial state cannot show info`() = runTest {
         val presenter = createMediaViewerPresenter(
             canShowInfo = false,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 canRedactOwnResult = { Result.success(true) },
             )
         )
+        )
         presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.listData).isEmpty()
@@ -113,10 +118,12 @@ class MediaViewerPresenterTest {
     fun `present - initial state Event`() = runTest {
         val presenter = createMediaViewerPresenter(
             eventId = AN_EVENT_ID,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 canRedactOwnResult = { Result.success(true) },
             )
         )
+        )
         presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.listData).isEmpty()
@@ -131,11 +138,13 @@ class MediaViewerPresenterTest {
     fun `present - initial state Event from other`() = runTest {
         val presenter = createMediaViewerPresenter(
             eventId = AN_EVENT_ID,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(
                 sessionId = A_SESSION_ID_2,
                 canRedactOtherResult = { Result.success(false) },
             )
         )
+        )
         presenter.test {
             val initialState = awaitFirstItem()
             assertThat(initialState.listData).isEmpty()
@@ -216,9 +225,9 @@ class MediaViewerPresenterTest {
         )
         val presenter = createMediaViewerPresenter(
             mediaGalleryDataSource = mediaGalleryDataSource,
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(baseRoom = FakeBaseRoom(
                 canRedactOwnResult = { Result.success(true) },
-            )
+            ))
         )
         val anImage = aMediaItemImage(
             mediaSourceUrl = aUrl,
@@ -432,9 +441,9 @@ class MediaViewerPresenterTest {
             startLambda = { },
         )
         val presenter = createMediaViewerPresenter(
-            room = FakeMatrixRoom(
+            room = FakeJoinedRoom(
                 liveTimeline = timeline,
-                canRedactOwnResult = { Result.success(true) },
+                baseRoom = FakeBaseRoom(canRedactOwnResult = { Result.success(true) }),
             ),
             mediaGalleryDataSource = mediaGalleryDataSource,
             mediaViewerNavigator = FakeMediaViewerNavigator(
@@ -736,8 +745,8 @@ class MediaViewerPresenterTest {
         )
         val presenter = createMediaViewerPresenter(
             mediaViewerNavigator = navigator,
-            room = FakeMatrixRoom(
-                canRedactOwnResult = { Result.success(true) },
+            room = FakeJoinedRoom(
+                baseRoom = FakeBaseRoom(canRedactOwnResult = { Result.success(true) }),
             )
         )
         presenter.test {
@@ -766,7 +775,7 @@ class MediaViewerPresenterTest {
         ),
         canShowInfo: Boolean = true,
         mediaViewerNavigator: MediaViewerNavigator = FakeMediaViewerNavigator(),
-        room: MatrixRoom = FakeMatrixRoom(
+        room: JoinedRoom = FakeJoinedRoom(
             liveTimeline = FakeTimeline(),
         ),
     ): MediaViewerPresenter {
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt
index 80e784264d..1a41492df6 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt
+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParser.kt
@@ -7,25 +7,34 @@
 
 package io.element.android.libraries.oidc.impl
 
-import io.element.android.libraries.matrix.api.auth.OidcConfig
+import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.libraries.di.AppScope
+import io.element.android.libraries.matrix.api.auth.OidcRedirectUrlProvider
 import io.element.android.libraries.oidc.api.OidcAction
 import javax.inject.Inject
 
+fun interface OidcUrlParser {
+    fun parse(url: String): OidcAction?
+}
+
 /**
  * Simple parser for oidc url interception.
  * TODO Find documentation about the format.
  */
-class OidcUrlParser @Inject constructor() {
+@ContributesBinding(AppScope::class)
+class DefaultOidcUrlParser @Inject constructor(
+    private val oidcRedirectUrlProvider: OidcRedirectUrlProvider,
+) : OidcUrlParser {
     /**
      * Return a OidcAction, or null if the url is not a OidcUrl.
      * Note:
      * When user press button "Cancel", we get the url:
-     * `io.element:/callback?error=access_denied&state=IFF1UETGye2ZA8pO`
+     * `io.element.android:/?error=access_denied&state=IFF1UETGye2ZA8pO`
      * On success, we get:
-     * `io.element:/callback?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB`
+     * `io.element.android:/?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB`
      */
-    fun parse(url: String): OidcAction? {
-        if (url.startsWith(OidcConfig.REDIRECT_URI).not()) return null
+    override fun parse(url: String): OidcAction? {
+        if (url.startsWith(oidcRedirectUrlProvider.provide()).not()) return null
         if (url.contains("error=access_denied")) return OidcAction.GoBack
         if (url.contains("code=")) return OidcAction.Success(url)
 
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt
index 91c6bec28b..a9141dc333 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt
+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcNode.kt
@@ -19,12 +19,14 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.api.auth.OidcDetails
+import io.element.android.libraries.oidc.impl.OidcUrlParser
 
 @ContributesNode(AppScope::class)
 class OidcNode @AssistedInject constructor(
     @Assisted buildContext: BuildContext,
     @Assisted plugins: List<Plugin>,
     presenterFactory: OidcPresenter.Factory,
+    private val oidcUrlParser: OidcUrlParser,
 ) : Node(buildContext, plugins = plugins) {
     data class Inputs(
         val oidcDetails: OidcDetails,
@@ -38,6 +40,7 @@ class OidcNode @AssistedInject constructor(
         val state = presenter.present()
         OidcView(
             state = state,
+            oidcUrlParser = oidcUrlParser,
             modifier = modifier,
             onNavigateBack = ::navigateUp,
         )
diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
index 6d429ca088..13b80dd600 100644
--- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
+++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt
@@ -34,11 +34,11 @@ import io.element.android.libraries.oidc.impl.OidcUrlParser
 @Composable
 fun OidcView(
     state: OidcState,
+    oidcUrlParser: OidcUrlParser,
     onNavigateBack: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val isPreview = LocalInspectionMode.current
-    val oidcUrlParser = remember { OidcUrlParser() }
     var webView by remember { mutableStateOf<WebView?>(null) }
     fun shouldOverrideUrl(url: String): Boolean {
         val action = oidcUrlParser.parse(url)
@@ -111,6 +111,7 @@ fun OidcView(
 internal fun OidcViewPreview(@PreviewParameter(OidcStateProvider::class) state: OidcState) = ElementPreview {
     OidcView(
         state = state,
+        oidcUrlParser = { null },
         onNavigateBack = {},
     )
 }
diff --git a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt
similarity index 52%
rename from libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt
rename to libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt
index 7c467162f9..e40424ca0e 100644
--- a/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/OidcUrlParserTest.kt
+++ b/libraries/oidc/impl/src/test/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcUrlParserTest.kt
@@ -8,44 +8,51 @@
 package io.element.android.libraries.oidc.impl
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.auth.OidcConfig
+import io.element.android.libraries.matrix.test.auth.FAKE_REDIRECT_URL
+import io.element.android.libraries.matrix.test.auth.FakeOidcRedirectUrlProvider
 import io.element.android.libraries.oidc.api.OidcAction
 import org.junit.Assert
 import org.junit.Test
 
-class OidcUrlParserTest {
+class DefaultOidcUrlParserTest {
     @Test
     fun `test empty url`() {
-        val sut = OidcUrlParser()
+        val sut = createDefaultOidcUrlParser()
         assertThat(sut.parse("")).isNull()
     }
 
     @Test
     fun `test regular url`() {
-        val sut = OidcUrlParser()
+        val sut = createDefaultOidcUrlParser()
         assertThat(sut.parse("https://matrix.org")).isNull()
     }
 
     @Test
     fun `test cancel url`() {
-        val sut = OidcUrlParser()
-        val aCancelUrl = OidcConfig.REDIRECT_URI + "?error=access_denied&state=IFF1UETGye2ZA8pO"
+        val sut = createDefaultOidcUrlParser()
+        val aCancelUrl = "$FAKE_REDIRECT_URL?error=access_denied&state=IFF1UETGye2ZA8pO"
         assertThat(sut.parse(aCancelUrl)).isEqualTo(OidcAction.GoBack)
     }
 
     @Test
     fun `test success url`() {
-        val sut = OidcUrlParser()
-        val aSuccessUrl = OidcConfig.REDIRECT_URI + "?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+        val sut = createDefaultOidcUrlParser()
+        val aSuccessUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
         assertThat(sut.parse(aSuccessUrl)).isEqualTo(OidcAction.Success(aSuccessUrl))
     }
 
     @Test
     fun `test unknown url`() {
-        val sut = OidcUrlParser()
-        val anUnknownUrl = OidcConfig.REDIRECT_URI + "?state=IFF1UETGye2ZA8pO&goat=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+        val sut = createDefaultOidcUrlParser()
+        val anUnknownUrl = "$FAKE_REDIRECT_URL?state=IFF1UETGye2ZA8pO&goat=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
         Assert.assertThrows(IllegalStateException::class.java) {
             assertThat(sut.parse(anUnknownUrl))
         }
     }
+
+    private fun createDefaultOidcUrlParser(): DefaultOidcUrlParser {
+        return DefaultOidcUrlParser(
+            oidcRedirectUrlProvider = FakeOidcRedirectUrlProvider(),
+        )
+    }
 }
diff --git a/libraries/permissions/impl/src/main/res/values-cy/translations.xml b/libraries/permissions/impl/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..72a037351d
--- /dev/null
+++ b/libraries/permissions/impl/src/main/res/values-cy/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="troubleshoot_notifications_test_check_permission_description">"Gwiriwch y gall y rhaglen ddangos hysbysiadau."</string>
+  <string name="troubleshoot_notifications_test_check_permission_title">"Gwirio caniatâd"</string>
+</resources>
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
index 90ed3a3d05..9c899c9dfd 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandler.kt
@@ -14,7 +14,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 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.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.room.isDm
 import io.element.android.libraries.matrix.api.room.message.replyInThread
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
@@ -117,7 +117,7 @@ class NotificationBroadcastReceiverHandler @Inject constructor(
             return@launch
         }
         val client = matrixClientProvider.getOrRestore(sessionId).getOrNull() ?: return@launch
-        client.getRoom(roomId)?.let { room ->
+        client.getJoinedRoom(roomId)?.let { room ->
             sendMatrixEvent(
                 sessionId = sessionId,
                 roomId = roomId,
@@ -134,7 +134,7 @@ class NotificationBroadcastReceiverHandler @Inject constructor(
         roomId: RoomId,
         threadId: ThreadId?,
         replyToEventId: EventId?,
-        room: MatrixRoom,
+        room: JoinedRoom,
         message: String,
     ) {
         // Create a new event to be displayed in the notification drawer, right now
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt
index 8d1d866edd..4c5eee260b 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEvent.kt
@@ -12,7 +12,8 @@ import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.EventId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
 import io.element.android.libraries.push.impl.notifications.model.NotifiableRingingCallEvent
@@ -37,7 +38,7 @@ class SyncOnNotifiableEvent @Inject constructor(
         }
         val client = matrixClientProvider.getOrRestore(notifiableEvent.sessionId).getOrNull() ?: return@withContext
 
-        client.getRoom(notifiableEvent.roomId)?.use { room ->
+        client.getJoinedRoom(notifiableEvent.roomId)?.use { room ->
             room.subscribeToSync()
 
             // If the app is in foreground, sync is already running, so we just add the subscription above.
@@ -60,7 +61,7 @@ class SyncOnNotifiableEvent @Inject constructor(
      * User can be in the call if they answer using another session.
      * If the user does not join the call, the timeout will be reached.
      */
-    private suspend fun MatrixRoom.waitsUntilUserIsInTheCall(timeout: Duration) {
+    private suspend fun BaseRoom.waitsUntilUserIsInTheCall(timeout: Duration) {
         withTimeoutOrNull(timeout) {
             roomInfoFlow.first {
                 sessionId in it.activeRoomCallParticipants
@@ -68,7 +69,7 @@ class SyncOnNotifiableEvent @Inject constructor(
         }
     }
 
-    private suspend fun MatrixRoom.waitsUntilEventIsKnown(eventId: EventId, timeout: Duration) {
+    private suspend fun JoinedRoom.waitsUntilEventIsKnown(eventId: EventId, timeout: Duration) {
         withTimeoutOrNull(timeout) {
             liveTimeline.timelineItems.first { timelineItems ->
                 timelineItems.any { timelineItem ->
diff --git a/libraries/push/impl/src/main/res/values-be/translations.xml b/libraries/push/impl/src/main/res/values-be/translations.xml
index 0dc2611e58..176986d759 100644
--- a/libraries/push/impl/src/main/res/values-be/translations.xml
+++ b/libraries/push/impl/src/main/res/values-be/translations.xml
@@ -16,7 +16,7 @@
     <item quantity="many">"%d апавяшчэнняў"</item>
   </plurals>
   <string name="notification_fallback_content">"Апавяшчэнне"</string>
-  <string name="notification_incoming_call">"Уваходны званок"</string>
+  <string name="notification_incoming_call">"📹 Уваходны выклік"</string>
   <string name="notification_inline_reply_failed">"** Не атрымалася даслаць - калі ласка, адкрыйце пакой"</string>
   <string name="notification_invitation_action_join">"Далучыцца"</string>
   <string name="notification_invitation_action_reject">"Адхіліць"</string>
@@ -40,6 +40,7 @@
   <string name="notification_room_invite_body">"Запрасіў(-ла) вас далучыцца да пакоя"</string>
   <string name="notification_room_invite_body_with_sender">"%1$s запрасіў(-ла) вас далучыцца да пакоя"</string>
   <string name="notification_sender_me">"Я"</string>
+  <string name="notification_sender_mention_reply">"%1$s згадаў ці адказаў"</string>
   <string name="notification_test_push_notification_content">"Вы праглядаеце апавяшчэнне! Націсніце мяне!"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s: %2$s %3$s"</string>
diff --git a/libraries/push/impl/src/main/res/values-cy/translations.xml b/libraries/push/impl/src/main/res/values-cy/translations.xml
index 0e6557db58..c6500f40b4 100644
--- a/libraries/push/impl/src/main/res/values-cy/translations.xml
+++ b/libraries/push/impl/src/main/res/values-cy/translations.xml
@@ -5,18 +5,50 @@
   <string name="notification_channel_noisy">"Hysbysiadau swnllyd"</string>
   <string name="notification_channel_ringing_calls">"Galwadau\'n canu"</string>
   <string name="notification_channel_silent">"Hysbysiadau tawel"</string>
+  <plurals name="notification_compat_summary_line_for_room">
+    <item quantity="zero">"%1$s: %2$d negeseuon"</item>
+    <item quantity="one">"%1$s: %2$d neges"</item>
+    <item quantity="two">"%1$s: %2$d neges"</item>
+    <item quantity="few">"%1$s: %2$d neges"</item>
+    <item quantity="many">"%1$s: %2$d neges"</item>
+    <item quantity="other">"%1$s: %2$d neges"</item>
+  </plurals>
+  <plurals name="notification_compat_summary_title">
+    <item quantity="zero">"%d hysbysiadau"</item>
+    <item quantity="one">"%d hysbysiad"</item>
+    <item quantity="two">"%d hysbysiad"</item>
+    <item quantity="few">"%d hysbysiad"</item>
+    <item quantity="many">"%d hysbysiad"</item>
+    <item quantity="other">"%d hysbysiad"</item>
+  </plurals>
   <string name="notification_fallback_content">"Hysbysiad"</string>
   <string name="notification_incoming_call">"📹 Galwad i mewn"</string>
   <string name="notification_inline_reply_failed">"** Wedi methu anfon - agorwch yr ystafell"</string>
   <string name="notification_invitation_action_join">"Ymuno"</string>
   <string name="notification_invitation_action_reject">"Gwrthod"</string>
+  <plurals name="notification_invitations">
+    <item quantity="zero">"%d gwahoddiadau"</item>
+    <item quantity="one">"%d gwahoddiadau"</item>
+    <item quantity="two">"%d gwahoddiadau"</item>
+    <item quantity="few">"%d gwahoddiadau"</item>
+    <item quantity="many">"%d gwahoddiadau"</item>
+    <item quantity="other">"%d gwahoddiadau"</item>
+  </plurals>
   <string name="notification_invite_body">"Wedi eich gwahodd i sgwrsio"</string>
   <string name="notification_invite_body_with_sender">"Mae %1$s wedi eich gwahodd i sgwrsio"</string>
   <string name="notification_mentioned_you_body">"Wedi eich crybwyll: %1$s"</string>
   <string name="notification_new_messages">"Negeseuon Newydd"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="zero">"%d negeseuon newydd"</item>
+    <item quantity="one">"%d neges newydd"</item>
+    <item quantity="two">"%d neges newydd"</item>
+    <item quantity="few">"%d neges newydd"</item>
+    <item quantity="many">"%d neges newydd"</item>
+    <item quantity="other">"%d neges newydd"</item>
+  </plurals>
   <string name="notification_reaction_body">"Wedi ymateb gyda %1$s"</string>
   <string name="notification_room_action_mark_as_read">"Marcio fel wedi\'i ddarllen"</string>
-  <string name="notification_room_action_quick_reply">"Ateb cyflym"</string>
+  <string name="notification_room_action_quick_reply">"Ymateb cyflym"</string>
   <string name="notification_room_invite_body">"Wedi\'ch gwahodd i ymuno â\'r ystafell"</string>
   <string name="notification_room_invite_body_with_sender">"Mae %1$s wedi eich gwahodd i ymuno â\'r ystafell"</string>
   <string name="notification_sender_me">"Fi"</string>
@@ -24,10 +56,55 @@
   <string name="notification_test_push_notification_content">"Rydych chi\'n edrych ar yr hysbysiad! Cliciwch fi!"</string>
   <string name="notification_ticker_text_dm">"%1$s: %2$s"</string>
   <string name="notification_ticker_text_group">"%1$s : %2$s %3$s"</string>
+  <plurals name="notification_unread_notified_messages">
+    <item quantity="zero">"%d negeseuon hysbyswyd heb eu darllen"</item>
+    <item quantity="one">"%d neges hysbyswyd heb ei ddarllen"</item>
+    <item quantity="two">"%d neges hysbyswyd heb eu darllen"</item>
+    <item quantity="few">"%d neges hysbyswyd heb eu darllen"</item>
+    <item quantity="many">"%d neges hysbyswyd heb eu darllen"</item>
+    <item quantity="other">"%d neges hysbyswyd heb eu darllen"</item>
+  </plurals>
   <string name="notification_unread_notified_messages_and_invitation">"%1$s a %2$s"</string>
   <string name="notification_unread_notified_messages_in_room">"%1$s yn %2$s"</string>
   <string name="notification_unread_notified_messages_in_room_and_invitation">"%1$s yn %2$s a %3$s"</string>
+  <plurals name="notification_unread_notified_messages_in_room_rooms">
+    <item quantity="zero">"%d ystafelloedd"</item>
+    <item quantity="one">"%d ystafell"</item>
+    <item quantity="two">"%d ystafell"</item>
+    <item quantity="few">"%d ystafell"</item>
+    <item quantity="many">"%d ystafell"</item>
+    <item quantity="other">"%d ystafell"</item>
+  </plurals>
   <string name="push_distributor_background_sync_android">"Cydweddu\'n y cefndir"</string>
   <string name="push_distributor_firebase_android">"Gwasanaethau Google"</string>
   <string name="push_no_valid_google_play_services_apk_android">"Heb ganfod Google Play Services dilys. Efallai fydd hysbysiadau ddim yn gweithio\'n iawn."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_description">"Cael enw\'r darparwr presennol."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_failure">"Dim darparwyr gwthio wedi\'u dewis."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_success">"Darparwr gwthio presennol: %1$s."</string>
+  <string name="troubleshoot_notifications_test_current_push_provider_title">"Darparwr gwthio presennol"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_description">"Gwnewch yn siŵr fod y cais yn cefnogi o leiaf un darparwr gwthio."</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_failure">"Heb ganfod cefnogaeth darparwr gwthio."</string>
+  <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
+    <item quantity="zero">"Wedi canfod %1$d darparwyr gwthio: %2$s"</item>
+    <item quantity="one">"Wedi canfod %1$d darparwr gwthio: %2$s"</item>
+    <item quantity="two">"Wedi canfod %1$d darparwr gwthio: %2$s"</item>
+    <item quantity="few">"Wedi canfod %1$d darparwr gwthio: %2$s"</item>
+    <item quantity="many">"Wedi canfod %1$d darparwr gwthio: %2$s"</item>
+    <item quantity="other">"Wedi canfod %1$d darparwr gwthio: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Adeiladwyd y rhaglen gyda chefnogaeth ar gyfer: %1$s"</string>
+  <string name="troubleshoot_notifications_test_detect_push_provider_title">"Cefnogaeth darparwr gwthio"</string>
+  <string name="troubleshoot_notifications_test_display_notification_description">"Gwiriwch y gall y cais ddangos hysbysiad."</string>
+  <string name="troubleshoot_notifications_test_display_notification_failure">"Nid yw\'r hysbysiad wedi\'i glicio."</string>
+  <string name="troubleshoot_notifications_test_display_notification_permission_failure">"Methu dangos yr hysbysiad."</string>
+  <string name="troubleshoot_notifications_test_display_notification_success">"Mae\'r hysbysiad wedi\'i glicio!"</string>
+  <string name="troubleshoot_notifications_test_display_notification_title">"Hysbysiad dangos"</string>
+  <string name="troubleshoot_notifications_test_display_notification_waiting">"Cliciwch ar yr hysbysiad i barhau â\'r prawf."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_description">"Gwnewch yn siŵr fod y cais yn cael ei wthio."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_1">"Gwall: mae\'r gwthiwr wedi gwrthod y cais."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_2">"Gwall: %1$s."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_3">"Gwall, methu profi\'r gwthio."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_failure_4">"Gwall, terfyn amser wrth aros am y gwthio."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_success">"Cymerodd dolen gwthio nôl %1$d ms."</string>
+  <string name="troubleshoot_notifications_test_push_loop_back_title">"Prawf dolen gwthio\'n ôl"</string>
 </resources>
diff --git a/libraries/push/impl/src/main/res/values-el/translations.xml b/libraries/push/impl/src/main/res/values-el/translations.xml
index c45f487d25..bb7241ffe3 100644
--- a/libraries/push/impl/src/main/res/values-el/translations.xml
+++ b/libraries/push/impl/src/main/res/values-el/translations.xml
@@ -64,6 +64,7 @@
     <item quantity="one">"Βρέθηκε %1$d πάροχος push: %2$s"</item>
     <item quantity="other">"Βρέθηκαν %1$d πάροχοι push: %2$s"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Η εφαρμογή δημιουργήθηκε με υποστήριξη για: %1$s"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_title">"Εντοπισμός παρόχων push"</string>
   <string name="troubleshoot_notifications_test_display_notification_description">"Έλεγξε ότι η εφαρμογή μπορεί να εμφανίσει ειδοποίηση."</string>
   <string name="troubleshoot_notifications_test_display_notification_failure">"Δεν έχει γίνει κλικ στην ειδοποίηση."</string>
diff --git a/libraries/push/impl/src/main/res/values-fa/translations.xml b/libraries/push/impl/src/main/res/values-fa/translations.xml
index a4bd043071..302624861d 100644
--- a/libraries/push/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/push/impl/src/main/res/values-fa/translations.xml
@@ -6,7 +6,7 @@
   <string name="notification_channel_ringing_calls">"زنگ خوردن تماس"</string>
   <string name="notification_channel_silent">"اعلان‌های صامت"</string>
   <string name="notification_fallback_content">"آگاهی"</string>
-  <string name="notification_incoming_call">"تماس ورودی"</string>
+  <string name="notification_incoming_call">"📹 تماس ورودی"</string>
   <string name="notification_inline_reply_failed">"**‌شکست در فرستادن - لطفاً اتاق را بگشایید"</string>
   <string name="notification_invitation_action_join">"پیوستن"</string>
   <string name="notification_invitation_action_reject">"رد کردن"</string>
@@ -14,6 +14,10 @@
   <string name="notification_invite_body_with_sender">"%1$s به گپ دعوتتان کرد"</string>
   <string name="notification_mentioned_you_body">"به شما اشاره کرد: %1$s"</string>
   <string name="notification_new_messages">"پیام جدید"</string>
+  <plurals name="notification_new_messages_for_room">
+    <item quantity="one">"%d پیام جدید"</item>
+    <item quantity="other">"%d پیام جدید"</item>
+  </plurals>
   <string name="notification_reaction_body">"با %1$s واکنش داد"</string>
   <string name="notification_room_action_mark_as_read">"علامت‌گذاری به عنوان خوانده شده"</string>
   <string name="notification_room_action_quick_reply">"پاسخ سریع"</string>
diff --git a/libraries/push/impl/src/main/res/values-lt/translations.xml b/libraries/push/impl/src/main/res/values-lt/translations.xml
index f2bbba6cf1..d3ba403c1a 100644
--- a/libraries/push/impl/src/main/res/values-lt/translations.xml
+++ b/libraries/push/impl/src/main/res/values-lt/translations.xml
@@ -21,6 +21,7 @@
     <item quantity="few">"%d kvietimai"</item>
     <item quantity="other">"%d kvietimų"</item>
   </plurals>
+  <string name="notification_invite_body">"Pakvietė jus bendrauti"</string>
   <string name="notification_new_messages">"Naujos žinutės"</string>
   <plurals name="notification_new_messages_for_room">
     <item quantity="one">"%d nauja žinutė"</item>
diff --git a/libraries/push/impl/src/main/res/values-pl/translations.xml b/libraries/push/impl/src/main/res/values-pl/translations.xml
index ee79042700..cce31b3f99 100644
--- a/libraries/push/impl/src/main/res/values-pl/translations.xml
+++ b/libraries/push/impl/src/main/res/values-pl/translations.xml
@@ -71,6 +71,7 @@
     <item quantity="few">"Znaleziono %1$d dostawców push: %2$s"</item>
     <item quantity="many">"Znaleziono %1$d dostawców push: %2$s"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"Aplikacja została zbudowana ze wsparciem dla: %1$s"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_title">"Wykryj dostawców powiadomień push"</string>
   <string name="troubleshoot_notifications_test_display_notification_description">"Sprawdź, czy aplikacja może wyświetlać powiadomienie."</string>
   <string name="troubleshoot_notifications_test_display_notification_failure">"Powiadomienie nie zostało kliknięte."</string>
diff --git a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
index e02f393f9a..1b25c81d7e 100644
--- a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml
@@ -57,6 +57,7 @@
   <plurals name="troubleshoot_notifications_test_detect_push_provider_success">
     <item quantity="other">"找到 %1$d 個推播提供者：%2$s"</item>
   </plurals>
+  <string name="troubleshoot_notifications_test_detect_push_provider_success_2">"該應用程式支援以下功能：%1$s"</string>
   <string name="troubleshoot_notifications_test_detect_push_provider_title">"偵測推播提供者"</string>
   <string name="troubleshoot_notifications_test_display_notification_description">"檢查應用程式是否可以顯示通知。"</string>
   <string name="troubleshoot_notifications_test_display_notification_failure">"尚未點選通知。"</string>
diff --git a/libraries/push/impl/src/main/res/values-zh/translations.xml b/libraries/push/impl/src/main/res/values-zh/translations.xml
index d4e904ca67..be2a8dbde1 100644
--- a/libraries/push/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/push/impl/src/main/res/values-zh/translations.xml
@@ -12,7 +12,7 @@
     <item quantity="other">"%d 条通知"</item>
   </plurals>
   <string name="notification_fallback_content">"通知"</string>
-  <string name="notification_incoming_call">"来电"</string>
+  <string name="notification_incoming_call">"📹 来电"</string>
   <string name="notification_inline_reply_failed">"** 无法发送——请打开聊天室"</string>
   <string name="notification_invitation_action_join">"加入"</string>
   <string name="notification_invitation_action_reject">"拒绝"</string>
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
similarity index 99%
rename from libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt
rename to libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
index ca675c8f8b..ba4e1657a7 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultRoomGroupMessageCreatorTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultBaseRoomGroupMessageCreatorTest.kt
@@ -37,7 +37,7 @@ private const val A_USER_AVATAR_1 = "mxc://userAvatar1"
 private const val A_USER_AVATAR_2 = "mxc://userAvatar2"
 
 @RunWith(RobolectricTestRunner::class)
-class DefaultRoomGroupMessageCreatorTest {
+class DefaultBaseRoomGroupMessageCreatorTest {
     @Test
     fun `test createRoomMessage with one Event`() = runTest {
         val sut = createRoomGroupMessageCreator()
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
index 9405e19464..dfa440bcf0 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiverHandlerTest.kt
@@ -27,7 +27,8 @@ import io.element.android.libraries.matrix.test.A_THREAD_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
 import io.element.android.libraries.matrix.test.core.aBuildMeta
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -50,6 +51,7 @@ import io.element.android.tests.testutils.lambda.value
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.test.TestScope
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runCurrent
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -221,13 +223,13 @@ class NotificationBroadcastReceiverHandlerTest {
             getLambda = getLambda
         )
         val clearMessagesForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> }
-        val matrixRoom = FakeMatrixRoom()
+        val joinedRoom = FakeJoinedRoom()
         val fakeNotificationCleaner = FakeNotificationCleaner(
             clearMessagesForRoomLambda = clearMessagesForRoomLambda,
         )
         val sut = createNotificationBroadcastReceiverHandler(
             sessionPreferencesStore = sessionPreferencesStore,
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             notificationCleaner = fakeNotificationCleaner
         )
         sut.onReceive(
@@ -240,7 +242,7 @@ class NotificationBroadcastReceiverHandlerTest {
         clearMessagesForRoomLambda.assertions()
             .isCalledOnce()
             .with(value(A_SESSION_ID), value(A_ROOM_ID))
-        assertThat(matrixRoom.markAsReadCalls).isEqualTo(listOf(expectedReceiptType))
+        assertThat(joinedRoom.baseRoom.markAsReadCalls).isEqualTo(listOf(expectedReceiptType))
     }
 
     @Test
@@ -292,15 +294,15 @@ class NotificationBroadcastReceiverHandlerTest {
     @Test
     fun `Test reject room`() = runTest {
         val leaveRoom = lambdaRecorder<Result<Unit>> { Result.success(Unit) }
-        val matrixRoom = FakeMatrixRoom(
-            leaveRoomLambda = leaveRoom
+        val joinedRoom = FakeJoinedRoom(
+            baseRoom = FakeBaseRoom(leaveRoomLambda = leaveRoom),
         )
         val clearMembershipNotificationForRoomLambda = lambdaRecorder<SessionId, RoomId, Unit> { _, _ -> }
         val fakeNotificationCleaner = FakeNotificationCleaner(
             clearMembershipNotificationForRoomLambda = clearMembershipNotificationForRoomLambda,
         )
         val sut = createNotificationBroadcastReceiverHandler(
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             notificationCleaner = fakeNotificationCleaner
         )
         sut.onReceive(
@@ -313,6 +315,9 @@ class NotificationBroadcastReceiverHandlerTest {
         clearMembershipNotificationForRoomLambda.assertions()
             .isCalledOnce()
             .with(value(A_SESSION_ID), value(A_ROOM_ID))
+
+        advanceUntilIdle()
+
         leaveRoom.assertions()
             .isCalledOnce()
             .with()
@@ -337,9 +342,9 @@ class NotificationBroadcastReceiverHandlerTest {
             sendMessageLambda = sendMessage
             replyMessageLambda = replyMessage
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
-            getUpdatedMemberResult = { Result.success(aRoomMember()) },
+            baseRoom = FakeBaseRoom(getUpdatedMemberResult = { Result.success(aRoomMember()) }),
         ).apply {
             givenRoomInfo(
                 aRoomInfo(
@@ -351,7 +356,7 @@ class NotificationBroadcastReceiverHandlerTest {
         val onNotifiableEventReceivedResult = lambdaRecorder<NotifiableEvent, Unit> { _ -> }
         val onNotifiableEventReceived = FakeOnNotifiableEventReceived(onNotifiableEventReceivedResult = onNotifiableEventReceivedResult)
         val sut = createNotificationBroadcastReceiverHandler(
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             onNotifiableEventReceived = onNotifiableEventReceived,
             replyMessageExtractor = FakeReplyMessageExtractor(A_MESSAGE)
         )
@@ -377,11 +382,11 @@ class NotificationBroadcastReceiverHandlerTest {
         val liveTimeline = FakeTimeline().apply {
             sendMessageLambda = sendMessage
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline
         )
         val sut = createNotificationBroadcastReceiverHandler(
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             replyMessageExtractor = FakeReplyMessageExtractor("   "),
         )
         sut.onReceive(
@@ -404,9 +409,9 @@ class NotificationBroadcastReceiverHandlerTest {
             sendMessageLambda = sendMessage
             replyMessageLambda = replyMessage
         }
-        val matrixRoom = FakeMatrixRoom(
+        val joinedRoom = FakeJoinedRoom(
             liveTimeline = liveTimeline,
-            getUpdatedMemberResult = { Result.success(aRoomMember()) },
+            baseRoom = FakeBaseRoom(getUpdatedMemberResult = { Result.success(aRoomMember()) }),
         ).apply {
             givenRoomInfo(
                 aRoomInfo(
@@ -418,7 +423,7 @@ class NotificationBroadcastReceiverHandlerTest {
         val onNotifiableEventReceivedResult = lambdaRecorder<NotifiableEvent, Unit> { _ -> }
         val onNotifiableEventReceived = FakeOnNotifiableEventReceived(onNotifiableEventReceivedResult = onNotifiableEventReceivedResult)
         val sut = createNotificationBroadcastReceiverHandler(
-            matrixRoom = matrixRoom,
+            joinedRoom = joinedRoom,
             onNotifiableEventReceived = onNotifiableEventReceived,
             replyMessageExtractor = FakeReplyMessageExtractor(A_MESSAGE)
         )
@@ -460,10 +465,10 @@ class NotificationBroadcastReceiverHandlerTest {
     }
 
     private fun TestScope.createNotificationBroadcastReceiverHandler(
-        matrixRoom: FakeMatrixRoom? = FakeMatrixRoom(),
+        joinedRoom: FakeJoinedRoom? = FakeJoinedRoom(),
         joinRoom: (RoomId) -> Result<RoomSummary?> = { lambdaError() },
         matrixClient: MatrixClient? = FakeMatrixClient().apply {
-            givenGetRoomResult(A_ROOM_ID, matrixRoom)
+            givenGetRoomResult(A_ROOM_ID, joinedRoom)
             joinRoomLambda = joinRoom
         },
         sessionPreferencesStore: SessionPreferencesStoreFactory = FakeSessionPreferencesStoreFactory(),
diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
index 35dddbce6f..8b3907be0b 100644
--- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
+++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/SyncOnNotifiableEventTest.kt
@@ -18,7 +18,8 @@ import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.FakeMatrixClientProvider
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
+import io.element.android.libraries.matrix.test.room.FakeBaseRoom
+import io.element.android.libraries.matrix.test.room.FakeJoinedRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
@@ -49,10 +50,12 @@ class SyncOnNotifiableEventTest {
     private val liveTimeline = FakeTimeline(
         timelineItems = timelineItems,
     )
-    private val room = FakeMatrixRoom(
-        roomId = A_ROOM_ID,
+    private val room = FakeJoinedRoom(
         liveTimeline = liveTimeline,
-        subscribeToSyncLambda = subscribeToSyncLambda
+        baseRoom = FakeBaseRoom(
+            roomId = A_ROOM_ID,
+            subscribeToSyncLambda = subscribeToSyncLambda,
+        ),
     )
     private val syncService = FakeSyncService(SyncState.Idle).also {
         it.startSyncLambda = startSyncLambda
diff --git a/libraries/pushproviders/firebase/src/main/res/values-cy/translations.xml b/libraries/pushproviders/firebase/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..337a477365
--- /dev/null
+++ b/libraries/pushproviders/firebase/src/main/res/values-cy/translations.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="troubleshoot_notifications_test_firebase_availability_description">"Gwnewch yn siwr fod Firebase ar gael."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_failure">"Nid yw Firebase ar gael."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_success">"Mae Firebase ar gael."</string>
+  <string name="troubleshoot_notifications_test_firebase_availability_title">"Gwiriwch Firebase"</string>
+  <string name="troubleshoot_notifications_test_firebase_token_description">"Gwnewch yn siŵr fod tocyn Firebase ar gael."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_failure">"Nid yw tocyn Firebase yn hysbys."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_success">"Tocyn Firebase: %1$s."</string>
+  <string name="troubleshoot_notifications_test_firebase_token_title">"Gwiriwch tocyn Firebase"</string>
+</resources>
diff --git a/libraries/pushproviders/unifiedpush/src/main/res/values-cy/translations.xml b/libraries/pushproviders/unifiedpush/src/main/res/values-cy/translations.xml
new file mode 100644
index 0000000000..1a46d85451
--- /dev/null
+++ b/libraries/pushproviders/unifiedpush/src/main/res/values-cy/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="troubleshoot_notifications_test_unified_push_description">"Sicrhewch fod dosbarthwyr UnifiedPush ar gael."</string>
+  <string name="troubleshoot_notifications_test_unified_push_failure">"Heb ganfod dosbarthwyr gwthio."</string>
+  <plurals name="troubleshoot_notifications_test_unified_push_success">
+    <item quantity="zero">"Wedi canfod %1$d dosbarthwyr: %2$s"</item>
+    <item quantity="one">"Wedi canfod %1$d dosbarthwr: %2$s"</item>
+    <item quantity="two">"Wedi canfod %1$d dosbarthwr: %2$s"</item>
+    <item quantity="few">"Wedi canfod %1$d dosbarthwr: %2$s"</item>
+    <item quantity="many">"Wedi canfod %1$d dosbarthwr: %2$s"</item>
+    <item quantity="other">"Wedi canfod %1$d dosbarthwr: %2$s"</item>
+  </plurals>
+  <string name="troubleshoot_notifications_test_unified_push_title">"Gwiriwch UnifiedPush"</string>
+</resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-cy/translations.xml b/libraries/textcomposer/impl/src/main/res/values-cy/translations.xml
index 8fc6c899b9..5090069bc3 100644
--- a/libraries/textcomposer/impl/src/main/res/values-cy/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-cy/translations.xml
@@ -24,4 +24,5 @@
   <string name="rich_text_editor_remove_link">"Dileu dolen"</string>
   <string name="rich_text_editor_unindent">"Dadmewnoli"</string>
   <string name="rich_text_editor_url_placeholder">"Dolen"</string>
+  <string name="screen_room_voice_message_tooltip">"Daliwch i recordio"</string>
 </resources>
diff --git a/libraries/textcomposer/impl/src/main/res/values-el/translations.xml b/libraries/textcomposer/impl/src/main/res/values-el/translations.xml
index 3e5c5065c7..200b1f660d 100644
--- a/libraries/textcomposer/impl/src/main/res/values-el/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-el/translations.xml
@@ -5,7 +5,9 @@
   <string name="rich_text_editor_close_formatting_options">"Κλείσε τις επιλογές μορφοποίησης"</string>
   <string name="rich_text_editor_code_block">"Διακόπτης μπλοκ κώδικα"</string>
   <string name="rich_text_editor_composer_caption_placeholder">"Προαιρετική λεζάντα…"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"Κρυπτογραφημένο μήνυμα…"</string>
   <string name="rich_text_editor_composer_placeholder">"Μήνυμα…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"Μη κρυπτογραφημένο μήνυμα…"</string>
   <string name="rich_text_editor_create_link">"Δημιούργησε έναν σύνδεσμο"</string>
   <string name="rich_text_editor_edit_link">"Επεξεργασία συνδέσμου"</string>
   <string name="rich_text_editor_format_bold">"Εφαρμογή έντονης μορφής"</string>
diff --git a/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml b/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
index 2a20aecd21..d50983d733 100644
--- a/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-fa/translations.xml
@@ -4,7 +4,10 @@
   <string name="rich_text_editor_bullet_list">"تغییر وضعیت سیاههٔ گلوله‌ای"</string>
   <string name="rich_text_editor_close_formatting_options">"بستن گزینه‌های قالب‌بندی"</string>
   <string name="rich_text_editor_code_block">"تغییر حالت بلوک کد"</string>
+  <string name="rich_text_editor_composer_caption_placeholder">"افزودن عنوان"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"پیام رمزنگاری شده…"</string>
   <string name="rich_text_editor_composer_placeholder">"پیام…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"پیام رمزنگاری نشده…"</string>
   <string name="rich_text_editor_create_link">"ایجاد پیوند"</string>
   <string name="rich_text_editor_edit_link">"ویرایش پیوند"</string>
   <string name="rich_text_editor_format_bold">"اعمال قالب توپر"</string>
diff --git a/libraries/textcomposer/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/textcomposer/impl/src/main/res/values-zh-rTW/translations.xml
index 6ff65e94f6..f9cdfe25d7 100644
--- a/libraries/textcomposer/impl/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-zh-rTW/translations.xml
@@ -5,7 +5,9 @@
   <string name="rich_text_editor_close_formatting_options">"關閉格式化選項"</string>
   <string name="rich_text_editor_code_block">"切換程式碼區塊"</string>
   <string name="rich_text_editor_composer_caption_placeholder">"新增標題"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"已加密的訊息……"</string>
   <string name="rich_text_editor_composer_placeholder">"訊息"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"未加密的訊息……"</string>
   <string name="rich_text_editor_create_link">"建立連結"</string>
   <string name="rich_text_editor_edit_link">"編輯連結"</string>
   <string name="rich_text_editor_format_bold">"套用粗體"</string>
diff --git a/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml b/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
index 4040ca511d..d1fe69e539 100644
--- a/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
+++ b/libraries/textcomposer/impl/src/main/res/values-zh/translations.xml
@@ -5,7 +5,9 @@
   <string name="rich_text_editor_close_formatting_options">"关闭格式化选项"</string>
   <string name="rich_text_editor_code_block">"切换代码块"</string>
   <string name="rich_text_editor_composer_caption_placeholder">"可选的标题……"</string>
+  <string name="rich_text_editor_composer_encrypted_placeholder">"加密信息…"</string>
   <string name="rich_text_editor_composer_placeholder">"消息…"</string>
+  <string name="rich_text_editor_composer_unencrypted_placeholder">"未加密的消息…"</string>
   <string name="rich_text_editor_create_link">"创建链接"</string>
   <string name="rich_text_editor_edit_link">"编辑链接"</string>
   <string name="rich_text_editor_format_bold">"应用粗体格式"</string>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-cy/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-cy/translations.xml
index e20f3ed39d..8ea2bd11e3 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-cy/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-cy/translations.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="screen_push_history_title">"Hanes gwthio"</string>
+  <string name="troubleshoot_notifications_screen_action">"Rhedeg profion"</string>
+  <string name="troubleshoot_notifications_screen_action_again">"Rhedeg profion eto"</string>
+  <string name="troubleshoot_notifications_screen_failure">"Methodd rhai profion. Gwiriwch y manylion."</string>
+  <string name="troubleshoot_notifications_screen_notice">"Rhedwch y profion i ganfod unrhyw broblem yn eich ffurfweddiad a allai wneud i hysbysiadau beidio ag ymddwyn yn ôl y disgwyl."</string>
+  <string name="troubleshoot_notifications_screen_quick_fix_action">"Ceisio trwsio"</string>
+  <string name="troubleshoot_notifications_screen_success">"Pasiwyd pob prawf yn llwyddiannus."</string>
+  <string name="troubleshoot_notifications_screen_title">"Hysbysiadau datrys problemau"</string>
+  <string name="troubleshoot_notifications_screen_waiting">"Mae rhai profion angen eich sylw. Gwiriwch y manylion."</string>
 </resources>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-el/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-el/translations.xml
index 115d526e2d..fcac4c0e50 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-el/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-el/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_push_history_title">"Ιστορικό push"</string>
   <string name="troubleshoot_notifications_screen_action">"Εκτέλεση δοκιμών"</string>
   <string name="troubleshoot_notifications_screen_action_again">"Επανεκτέλεση δοκιμών"</string>
   <string name="troubleshoot_notifications_screen_failure">"Ορισμένες δοκιμές απέτυχαν. Παρακαλώ έλεγξε τις λεπτομέρειες."</string>
diff --git a/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml b/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
index 6df27f96f2..b25450d420 100644
--- a/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
+++ b/libraries/troubleshoot/impl/src/main/res/values-fa/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="screen_push_history_title">"تاریخچهٔ فرستادن"</string>
   <string name="troubleshoot_notifications_screen_action">"اجرای آزمون‌ها"</string>
   <string name="troubleshoot_notifications_screen_action_again">"اجرای دوبارهٔ آزمون‌ها"</string>
   <string name="troubleshoot_notifications_screen_failure">"برخی آزمون‌ها شکست خوردند. بررسی جزییات."</string>
diff --git a/libraries/ui-strings/src/main/res/values-be/translations.xml b/libraries/ui-strings/src/main/res/values-be/translations.xml
index edc85b724e..980d6e14c5 100644
--- a/libraries/ui-strings/src/main/res/values-be/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-be/translations.xml
@@ -293,7 +293,7 @@
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Прагляд профілю"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Выдаліць удзельніка з пакоя"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Выдаліць удзельніка і забараніць далучацца ў будучыні?"</string>
-  <string name="screen_bottom_sheet_manage_room_member_removing_user">"Выдаленне %1$s …"</string>
+  <string name="screen_bottom_sheet_manage_room_member_removing_user">"Выдаленне %1$s…"</string>
   <string name="screen_media_picker_error_failed_selection">"Не ўдалося выбраць носьбіт, паўтарыце спробу."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не атрымалася апрацаваць медыяфайл для загрузкі, паспрабуйце яшчэ раз."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Не атрымалася загрузіць медыяфайлы, паспрабуйце яшчэ раз."</string>
@@ -307,6 +307,8 @@
   <string name="screen_pinned_timeline_screen_title_empty">"Замацаваныя паведамленні"</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Адклікаць праверку і адправіць"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Усё роўна адправіць паведамленне"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$sвыкарыстоўвае адну або некалькі неправераных прылад. Вы можаце адправіць паведамленне ў любым выпадку, або вы можаце адмяніць зараз і паўтарыць спробу пазней, калі %2$s праверыць усе свае прылады."</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"Ваша паведамленне не было адпраўлена, таму што%1$s не праверыў усе прылады"</string>
   <string name="screen_room_error_failed_processing_media">"Не атрымалася апрацаваць медыяфайл для загрузкі, паспрабуйце яшчэ раз."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Не ўдалося атрымаць інфармацыю пра карыстальніка"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s з %2$s"</string>
@@ -320,6 +322,7 @@
   <string name="screen_share_open_google_maps">"Адкрыць у Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Адкрыць у OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Падзяліцеся гэтым месцазнаходжаннем"</string>
+  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Паведамленне не адпраўлена таму што%1$s не праверыў усе прылады."</string>
   <string name="screen_view_location_title">"Месцазнаходжанне"</string>
   <string name="settings_version_number">"Версія: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"be"</string>
diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml
index b2df63d37c..4d7409e7c1 100644
--- a/libraries/ui-strings/src/main/res/values-cs/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml
@@ -111,6 +111,7 @@
   <string name="action_report">"Nahlásit"</string>
   <string name="action_report_bug">"Nahlásit chybu"</string>
   <string name="action_report_content">"Nahlásit obsah"</string>
+  <string name="action_report_dm">"Nahlásit konverzaci"</string>
   <string name="action_report_room">"Nahlásit místnost"</string>
   <string name="action_reset">"Obnovit"</string>
   <string name="action_reset_identity">"Obnovit identitu"</string>
@@ -264,6 +265,7 @@ Důvod: %1$s."</string>
   <string name="common_shared_location">"Sdílená poloha"</string>
   <string name="common_signing_out">"Odhlašování"</string>
   <string name="common_something_went_wrong">"Něco se nepovedlo"</string>
+  <string name="common_something_went_wrong_message">"Narazili jsme na problém. Zkuste to prosím znovu."</string>
   <string name="common_starting_chat">"Zahajování chatu…"</string>
   <string name="common_sticker">"Nálepka"</string>
   <string name="common_success">"Úspěch"</string>
@@ -353,11 +355,6 @@ Opravdu chcete pokračovat?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Odebrat z místnosti"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Odebrat člena a zakázat mu připojení v budoucnu?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Odstraňování %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Od tohoto uživatele neuvidíte žádné zprávy ani pozvánky do místnosti"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Zablokovat uživatele"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Nahlaste tuto místnost svému poskytovateli účtu."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Popište důvod nahlášení…"</string>
-  <string name="screen_decline_and_block_title">"Odmítnout a zablokovat"</string>
   <string name="screen_media_picker_error_failed_selection">"Výběr média se nezdařil, zkuste to prosím znovu."</string>
   <string name="screen_media_upload_preview_caption_warning">"Titulky nemusí být viditelné pro lidi, kteří používají starší aplikace."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nahrání média se nezdařilo, zkuste to prosím znovu."</string>
@@ -370,11 +367,6 @@ Opravdu chcete pokračovat?"</string>
     <item quantity="other">"%1$d Připnutých zpráv"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Připnuté zprávy"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Vaše hlášení bylo úspěšně odesláno, ale při pokusu o opuštění místnosti jsme narazili na problém. Zkuste to prosím znovu."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Nelze opustit místnost"</string>
-  <string name="screen_report_room_reason_footer">"Nahlaste tuto místnost svému administrátorovi. Pokud jsou zprávy zašifrované, váš administrátor je nebude moci číst."</string>
-  <string name="screen_report_room_reason_placeholder">"Popište důvod…"</string>
-  <string name="screen_report_room_title">"Nahlásit místnost"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Chystáte se přejít na svůj %1$s účet a obnovit svou identitu. Poté budete přesměrováni zpět do aplikace."</string>
   <string name="screen_reset_identity_confirmation_title">"Nemůžete to potvrdit? Přejděte na svůj účet a resetujte svou identitu."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Zrušit ověření a odeslat"</string>
diff --git a/libraries/ui-strings/src/main/res/values-cy/translations.xml b/libraries/ui-strings/src/main/res/values-cy/translations.xml
index 7c33bf85cb..262e145296 100644
--- a/libraries/ui-strings/src/main/res/values-cy/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-cy/translations.xml
@@ -2,6 +2,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_avatar">"Afatar"</string>
   <string name="a11y_delete">"Dileu"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="zero">"%1$d nodau wedi eu cynnig"</item>
+    <item quantity="one">"%1$d nod wedi ei gynnig"</item>
+    <item quantity="two">"%1$d nod wedi eu cynnig"</item>
+    <item quantity="few">"%1$d nod wedi eu cynnig"</item>
+    <item quantity="many">"%1$d nod wedi eu cynnig"</item>
+    <item quantity="other">"%1$d nod wedi eu cynnig"</item>
+  </plurals>
   <string name="a11y_hide_password">"Cuddio cyfrinair"</string>
   <string name="a11y_join_call">"Ymuno â galwad"</string>
   <string name="a11y_jump_to_bottom">"Symud i\'r gwaelod"</string>
@@ -13,10 +21,18 @@
   <string name="a11y_pin_field">"Maes PIN"</string>
   <string name="a11y_play">"Chwarae"</string>
   <string name="a11y_poll">"Pôl"</string>
-  <string name="a11y_poll_end">"Mae\'r pôl wedi gorffen"</string>
+  <string name="a11y_poll_end">"Mae\'r bleidlais wedi gorffen"</string>
   <string name="a11y_react_with">"Ymateb gyda %1$s"</string>
   <string name="a11y_react_with_other_emojis">"Ymateb gydag emojis eraill"</string>
   <string name="a11y_read_receipts_multiple">"Wedi\'i ddarllen gan %1$s a %2$s"</string>
+  <plurals name="a11y_read_receipts_multiple_with_others">
+    <item quantity="zero">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+    <item quantity="one">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+    <item quantity="two">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+    <item quantity="few">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+    <item quantity="many">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+    <item quantity="other">"Wedi\'i ddarllen gan %1$s a %2$d arall"</item>
+  </plurals>
   <string name="a11y_read_receipts_single">"Wedi\'i ddarllen gan %1$s"</string>
   <string name="a11y_read_receipts_tap_to_show_all">"Tapio i ddangos y cyfan"</string>
   <string name="a11y_remove_reaction_with">"Wedi dileu adwaith gyda %1$s"</string>
@@ -53,16 +69,16 @@
   <string name="action_deactivate_account">"Cau cyfrif"</string>
   <string name="action_decline">"Gwrthod"</string>
   <string name="action_decline_and_block">"Gwrthod a rhwystro"</string>
-  <string name="action_delete_poll">"Dileu Pôl"</string>
+  <string name="action_delete_poll">"Dileu Pleidlais"</string>
   <string name="action_disable">"Analluogi"</string>
   <string name="action_discard">"Dileu"</string>
   <string name="action_dismiss">"Cau"</string>
   <string name="action_done">"Gorffen"</string>
   <string name="action_edit">"Golygu"</string>
   <string name="action_edit_caption">"Golygu capsiwn"</string>
-  <string name="action_edit_poll">"Golygu pôl"</string>
+  <string name="action_edit_poll">"Golygu pleidlais"</string>
   <string name="action_enable">"Galluogi"</string>
-  <string name="action_end_poll">"Gorffen pôl"</string>
+  <string name="action_end_poll">"Gorffen pleidlais"</string>
   <string name="action_enter_pin">"Rhoi\'r PIN"</string>
   <string name="action_forgot_password">"Wedi anghofio\'ch cyfrinair?"</string>
   <string name="action_forward">"Ymlaen"</string>
@@ -89,7 +105,7 @@
   <string name="action_open_settings">"Gosodiadau"</string>
   <string name="action_open_with">"Agor gyda"</string>
   <string name="action_pin">"Pinio"</string>
-  <string name="action_quick_reply">"Ateb cyflym"</string>
+  <string name="action_quick_reply">"Ymateb cyflym"</string>
   <string name="action_quote">"Dyfyniad"</string>
   <string name="action_react">"Ymateb"</string>
   <string name="action_reject">"Gwrthod"</string>
@@ -130,7 +146,7 @@
   <string name="action_view_source">"Gweld ffynhonnell"</string>
   <string name="action_yes">"Iawn"</string>
   <string name="action_yes_try_again">"Iawn, ceisiwch eto"</string>
-  <string name="banner_migrate_to_native_sliding_sync_description">"Mae eich gweinydd nawr yn cefnogi protocol newydd, cyflymach. Allgofnodwch a mewngofnodi\'n ôl i uwchraddio nawr. Bydd gwneud hyn nawr yn eich helpu i osgoi allgofnodi gorfodol pan fydd yr hen brotocol yn cael ei ddileu cyn hir."</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"Mae eich gweinydd nawr yn cefnogi protocol newydd, cynt. Allgofnodwch a mewngofnodi\'n ôl i uwchraddio nawr. Bydd gwneud hyn nawr yn eich helpu i osgoi allgofnodi gorfodol pan fydd yr hen brotocol yn cael ei ddileu cyn hir."</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"Uwchraddiad ar gael"</string>
   <string name="common_about">"Ynghylch"</string>
   <string name="common_acceptable_use_policy">"Polisi defnydd derbyniol"</string>
@@ -190,6 +206,14 @@ Rheswm: %1$s."</string>
   <string name="common_link_copied_to_clipboard">"Dolen wedi\'i chopïo i\'r clipfwrdd"</string>
   <string name="common_loading">"Yn Llwytho…"</string>
   <string name="common_loading_more">"Wrthi\'n llwytho mwy…"</string>
+  <plurals name="common_member_count">
+    <item quantity="zero">"%1$d aelodau"</item>
+    <item quantity="one">"%1$d aelod"</item>
+    <item quantity="two">"%1$d aelod"</item>
+    <item quantity="few">"%1$d aelod"</item>
+    <item quantity="many">"%1$d aelod"</item>
+    <item quantity="other">"%1$d aelod"</item>
+  </plurals>
   <string name="common_message">"Neges"</string>
   <string name="common_message_actions">"Gweithredoedd neges"</string>
   <string name="common_message_layout">"Cynllun y neges"</string>
@@ -211,9 +235,17 @@ Rheswm: %1$s."</string>
   <string name="common_please_check_internet_connection">"Gwiriwch eich cysylltiad rhyngrwyd"</string>
   <string name="common_please_wait">"Arhoswch…"</string>
   <string name="common_poll_end_confirmation">"Ydych chi\'n siŵr eich bod am ddod â\'r pôl hwn i ben?"</string>
-  <string name="common_poll_summary">"Pôl: %1$s"</string>
+  <string name="common_poll_summary">"Pleidlais: %1$s"</string>
   <string name="common_poll_total_votes">"Cyfanswm y pleidleisiau: %1$s"</string>
   <string name="common_poll_undisclosed_text">"Bydd y canlyniadau\'n dangos ar ôl i\'r bleidlais ddod i ben"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="zero">"%d pleidleisiau"</item>
+    <item quantity="one">"%d pleidlais"</item>
+    <item quantity="two">"%d pleidlais"</item>
+    <item quantity="few">"%d pleidlais"</item>
+    <item quantity="many">"%d pleidlais"</item>
+    <item quantity="other">"%d pleidlais"</item>
+  </plurals>
   <string name="common_privacy_policy">"Polisi preifatrwydd"</string>
   <string name="common_reaction">"Adwaith"</string>
   <string name="common_reactions">"Adweithiau"</string>
@@ -245,6 +277,7 @@ Rheswm: %1$s."</string>
   <string name="common_shared_location">"Lleoliad yn cael ei rannu"</string>
   <string name="common_signing_out">"Allgofnodi"</string>
   <string name="common_something_went_wrong">"Aeth rhywbeth o\'i le"</string>
+  <string name="common_something_went_wrong_message">"Wedi canfod mater. Ceisiwch eto."</string>
   <string name="common_starting_chat">"Dechrau sgwrs…"</string>
   <string name="common_sticker">"Sticer"</string>
   <string name="common_success">"Llwyddiant"</string>
@@ -334,31 +367,33 @@ Ydych chi\'n siŵr eich bod am barhau?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Tynnu o\'r ystafell"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Dileu aelod a\'u gwahardd rhag ymuno yn y dyfodol?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Wrthi\'n dileu %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Fyddwch chi ddim yn gweld unrhyw negeseuon neu wahoddiadau ystafell gan y defnyddiwr hwn"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Rhwystro defnyddiwr"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Adrodd am yr ystafell hon i ddarparwr eich cyfrif."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Disgrifiwch y rheswm dros adrodd…"</string>
-  <string name="screen_decline_and_block_title">"Gwrthod a rhwystro"</string>
+  <string name="screen_media_picker_error_failed_selection">"Wedi methu dewis cyfrwng, ceisiwch eto."</string>
   <string name="screen_media_upload_preview_caption_warning">"Efallai na fydd capsiynau yn weladwy i bobl sy\'n defnyddio apiau hŷn."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Wedi methu â phrosesu cyfryngau i\'w llwytho, ceisiwch eto."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Wedi methu llwytho cyfryngau, ceisiwch eto."</string>
   <string name="screen_pinned_timeline_empty_state_description">"Pwyswch ar neges a dewis “%1$s” i\'w cynnwys yma."</string>
   <string name="screen_pinned_timeline_empty_state_headline">"Pinio negeseuon pwysig fel y mae modd eu darganfod yn hawdd"</string>
+  <plurals name="screen_pinned_timeline_screen_title">
+    <item quantity="zero">"%1$d Negeseuon wedi\'u pinio"</item>
+    <item quantity="one">"%1$d Neges wedi\'i phinio"</item>
+    <item quantity="two">"%1$d Neges wedi\'i phinio"</item>
+    <item quantity="few">"%1$d Neges wedi\'i phinio"</item>
+    <item quantity="many">"%1$d Neges wedi\'i phinio"</item>
+    <item quantity="other">"%1$d Neges wedi\'i phinio"</item>
+  </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Negeseuon wedi\'u pinio"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Cyflwynwyd eich adroddiad yn llwyddiannus, ond cododd problem wrth geisio gadael yr ystafell. Ceisiwch eto."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Methu Gadael yr Ystafell"</string>
-  <string name="screen_report_room_reason_footer">"Adroddwch yr ystafell hon i\'ch gweinyddwr. Os yw\'r negeseuon wedi\'u hamgryptio, fydd eich gweinyddwr ddim yn gallu eu darllen."</string>
-  <string name="screen_report_room_reason_placeholder">"Disgrifiwch y rheswm…"</string>
-  <string name="screen_report_room_title">"Adrodd ar ystafell"</string>
+  <string name="screen_reset_identity_confirmation_subtitle">"Rydych chi ar fin mynd i\'ch cyfrif %1$s i ailosod eich hunaniaeth. Wedi hynny byddwch yn cael eich tywys yn ôl i\'r ap."</string>
+  <string name="screen_reset_identity_confirmation_title">"Methu cadarnhau? Ewch i\'ch cyfrif i ailosod eich hunaniaeth."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Tynnu\'r dilysiad yn ôl a\'i anfon"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Gallwch dynnu\'ch dilysiad yn ôl ac anfon y neges hon beth bynnag, neu gallwch ei diddymu am y tro a rhoi cynnig arall arni yn nes ymlaen ar ôl dilysu %1$s."</string>
   <string name="screen_resolve_send_failure_changed_identity_title">"Nid yw eich neges wedi\'i hanfon oherwydd ailosodwyd hunaniaeth ddilys %1$s"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Anfonwch neges beth bynnag"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"Mae %1$s yn defnyddio un neu fwy o ddyfeisiau heb eu gwirio. Gallwch anfon y neges beth bynnag, neu gallwch ei diddymu am y tro a cheisio eto yn nes ymlaen ar ôl i %2$s ddilysu ei holl ddyfeisiau."</string>
-  <string name="screen_resolve_send_failure_unsigned_device_title">"Nid yw eich neges wedi\'i hanfon oherwydd nid yw %1$s wedi gwirio pob dyfais"</string>
+  <string name="screen_resolve_send_failure_unsigned_device_title">"Dyw eich neges heb ei hanfon oherwydd nid yw %1$s wedi gwirio pob dyfais"</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_subtitle">"Mae un neu fwy o\'ch dyfeisiau heb eu gwirio. Gallwch anfon y neges beth bynnag, neu gallwch ei diddymu am y tro a cheisio eto yn nes ymlaen ar ôl i chi ddilysu eich holl ddyfeisiau."</string>
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Nid yw eich neges wedi\'i hanfon oherwydd nad ydych wedi gwirio un neu fwy o\'ch dyfeisiau"</string>
   <string name="screen_room_error_failed_processing_media">"Wedi methu â phrosesu cyfryngau i\'w llwytho, ceisiwch eto."</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"Methu â nôl manylion defnyddiwr"</string>
   <string name="screen_room_event_pill">"Neges yn %1$s"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s o %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Neges wedi\'u pinio"</string>
@@ -366,5 +401,22 @@ Ydych chi\'n siŵr eich bod am barhau?"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"Dangos y Cyfan"</string>
   <string name="screen_room_title">"Sgwrs"</string>
   <string name="screen_roomlist_knock_event_sent_description">"Anfonwyd y cais i ymuno"</string>
+  <string name="screen_share_location_title">"Rhannu lleoliad"</string>
+  <string name="screen_share_my_location_action">"Rhannu fy lleoliad"</string>
+  <string name="screen_share_open_apple_maps">"Agor yn Apple Maps"</string>
+  <string name="screen_share_open_google_maps">"Agor yn Google Maps"</string>
+  <string name="screen_share_open_osm_maps">"Agor yn OpenStreetMap"</string>
+  <string name="screen_share_this_location_action">"Rhannu\'r lleoliad hwn"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Heb anfon y neges oherwydd bod hunaniaeth wedi \'i ddilysu %1$s wedi\'i ailosod."</string>
+  <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Heb anfon y neges oherwydd nid yw %1$s wedi gwirio pob dyfais."</string>
+  <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Heb anfon y neges oherwydd nad ydych wedi gwirio un neu fwy o\'ch dyfeisiau."</string>
   <string name="screen_view_location_title">"Lleoliad"</string>
+  <string name="settings_version_number">"Fersiwn: %1$s (%2$s)"</string>
+  <string name="test_language_identifier">"cy"</string>
+  <string name="test_untranslated_default_language_identifier">"cy"</string>
+  <string name="timeline_decryption_failure_historical_event_no_key_backup">"Nid yw negeseuon hanesyddol ar gael ar y ddyfais hon"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Mae angen i chi wirio\'r ddyfais hon ar gyfer mynediad i negeseuon hanesyddol"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"Does gennych chi ddim mynediad i\'r neges hon"</string>
+  <string name="timeline_decryption_failure_unable_to_decrypt">"Methu dadgryptio\'r neges"</string>
+  <string name="timeline_decryption_failure_withheld_unverified">"Cafodd y neges hon ei rhwystro naill ai oherwydd nad ydych wedi ddilysu\'ch dyfais neu oherwydd bod angen i\'r anfonwr ddilysu\'ch hunaniaeth chi."</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml
index 5744d232b3..8945b8cd6b 100644
--- a/libraries/ui-strings/src/main/res/values-de/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-de/translations.xml
@@ -86,7 +86,7 @@
   <string name="action_leave">"Verlassen"</string>
   <string name="action_leave_conversation">"Unterhaltung verlassen"</string>
   <string name="action_leave_room">"Verlassen"</string>
-  <string name="action_load_more">"Mehr laden …"</string>
+  <string name="action_load_more">"Mehr laden…"</string>
   <string name="action_manage_account">"Konto verwalten"</string>
   <string name="action_manage_devices">"Geräte verwalten"</string>
   <string name="action_message">"Nachricht"</string>
@@ -109,6 +109,7 @@
   <string name="action_report">"Bericht"</string>
   <string name="action_report_bug">"Fehler melden"</string>
   <string name="action_report_content">"Inhalt melden"</string>
+  <string name="action_report_dm">"Konversation melden"</string>
   <string name="action_report_room">"Chatroom melden"</string>
   <string name="action_reset">"Zurücksetzen"</string>
   <string name="action_reset_identity">"Identität zurücksetzen"</string>
@@ -220,7 +221,7 @@ Grund: %1$s."</string>
   <string name="common_permission">"Erlaubnis"</string>
   <string name="common_pinned">"Fixiert"</string>
   <string name="common_please_check_internet_connection">"Bitte überprüfen Sie Ihre Internetverbindung"</string>
-  <string name="common_please_wait">"Bitte warten …"</string>
+  <string name="common_please_wait">"Bitte warten…"</string>
   <string name="common_poll_end_confirmation">"Bist du sicher, dass du diese Umfrage beenden möchtest?"</string>
   <string name="common_poll_summary">"Umfrage: %1$s"</string>
   <string name="common_poll_total_votes">"Stimmen insgesamt: %1$s"</string>
@@ -260,6 +261,7 @@ Grund: %1$s."</string>
   <string name="common_shared_location">"Geteilter Standort"</string>
   <string name="common_signing_out">"Abmelden"</string>
   <string name="common_something_went_wrong">"Es ist ein Fehler aufgetreten."</string>
+  <string name="common_something_went_wrong_message">"Wir sind auf ein Problem gestoßen. Bitte versuchen Sie es erneut."</string>
   <string name="common_starting_chat">"Chat wird gestartet…"</string>
   <string name="common_sticker">"Sticker"</string>
   <string name="common_success">"Erfolg"</string>
@@ -349,11 +351,6 @@ Möchten Sie wirklich fortfahren?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Mitglied entfernen"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Mitglied entfernen und den erneuten Beitritt sperren?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"%1$s wird entfernt."</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Sie werden keine Nachrichten oder Chatroomeinladungen von diesem Benutzer sehen."</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Benutzer blockieren"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Melden Sie diesen Raum Ihrem Kontoanbieter."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beschreiben Sie den Grund für die Meldung…"</string>
-  <string name="screen_decline_and_block_title">"Ablehnen und blockieren"</string>
   <string name="screen_media_picker_error_failed_selection">"Medienauswahl fehlgeschlagen, bitte versuche es erneut."</string>
   <string name="screen_media_upload_preview_caption_warning">"Bildunterschriften sind für Nutzer älterer Apps möglicherweise nicht sichtbar."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Fehler beim Verarbeiten des hochgeladenen Mediums. Bitte versuche es erneut."</string>
@@ -365,11 +362,6 @@ Möchten Sie wirklich fortfahren?"</string>
     <item quantity="other">"%1$d fixierte Nachrichten"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Fixierte Nachrichten"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Ihr Bericht wurde erfolgreich übermittelt, aber beim Versuch, den Raum zu verlassen, ist ein Problem aufgetreten. Bitte versuchen Sie es erneut."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Der Chatroom kann nicht verlassen werden"</string>
-  <string name="screen_report_room_reason_footer">"Melden Sie diesen Chatroom Ihrem Administrator. Wenn die Nachrichten verschlüsselt sind, kann Ihr Administrator sie nicht lesen."</string>
-  <string name="screen_report_room_reason_placeholder">"Beschreiben Sie den Grund…"</string>
-  <string name="screen_report_room_title">"Chatroom melden"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Du wirst jetzt zu deinem %1$s Konto geleitet, um deine Identität zurückzusetzen. Danach wirst du zur App zurückgebracht."</string>
   <string name="screen_reset_identity_confirmation_title">"Kannst du das nicht bestätigen? Gehe zu deinem Konto, um deine Identität zurückzusetzen."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Verifizierung zurückziehen und senden"</string>
diff --git a/libraries/ui-strings/src/main/res/values-el/translations.xml b/libraries/ui-strings/src/main/res/values-el/translations.xml
index 2e22e58fa6..24a92cad85 100644
--- a/libraries/ui-strings/src/main/res/values-el/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-el/translations.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_avatar">"Εικόνα Προφίλ"</string>
   <string name="a11y_delete">"Διαγραφή"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d ψηφίο εισήχθη"</item>
     <item quantity="other">"%1$d ψηφία εισήχθησαν"</item>
   </plurals>
   <string name="a11y_hide_password">"Απόκρυψη κωδικού πρόσβασης"</string>
+  <string name="a11y_join_call">"Συμμετοχή στην κλήση"</string>
   <string name="a11y_jump_to_bottom">"Άλμα προς τα κάτω"</string>
   <string name="a11y_notifications_mentions_only">"Αναφορές μόνο"</string>
   <string name="a11y_notifications_muted">"Σε σίγαση"</string>
   <string name="a11y_page_n">"Σελίδα %1$d"</string>
   <string name="a11y_pause">"Παύση"</string>
+  <string name="a11y_paused_voice_message">"Φωνητικό μήνυμα, διάρκεια:%1$s, τρέχουσα θέση: %2$s"</string>
   <string name="a11y_pin_field">"Πεδίο PIN"</string>
   <string name="a11y_play">"Αναπαραγωγή"</string>
   <string name="a11y_poll">"Δημοσκόπηση"</string>
@@ -29,6 +32,8 @@
   <string name="a11y_show_password">"Εμφάνιση κωδικού πρόσβασης"</string>
   <string name="a11y_start_call">"Ξεκίνησε μια κλήση"</string>
   <string name="a11y_user_menu">"Μενού χρήστη"</string>
+  <string name="a11y_view_details">"Προβολή λεπτομερειών"</string>
+  <string name="a11y_voice_message">"Φωνητικό μήνυμα, διάρκεια: %1$s"</string>
   <string name="a11y_voice_message_record">"Εγγραφή φωνητικού μηνύματος."</string>
   <string name="a11y_voice_message_stop_recording">"Διακοπή καταγραφής"</string>
   <string name="action_accept">"Αποδοχή"</string>
@@ -55,9 +60,11 @@
   <string name="action_deactivate">"Απενεργοποίηση"</string>
   <string name="action_deactivate_account">"Απενεργοποίηση λογαριασμού"</string>
   <string name="action_decline">"Απόρριψη"</string>
+  <string name="action_decline_and_block">"Απόρριψη και αποκλεισμός"</string>
   <string name="action_delete_poll">"Διαγραφή Δημοσκόπησης"</string>
   <string name="action_disable">"Απενεργοποίηση"</string>
   <string name="action_discard">"Απόρριψη"</string>
+  <string name="action_dismiss">"Παράβλεψη"</string>
   <string name="action_done">"Έγινε"</string>
   <string name="action_edit">"Επεξεργασία"</string>
   <string name="action_edit_caption">"Επεξεργασία λεζάντας"</string>
@@ -72,7 +79,7 @@
   <string name="action_invite">"Πρόσκληση"</string>
   <string name="action_invite_friends">"Πρόσκληση ατόμων"</string>
   <string name="action_invite_friends_to_app">"Πρόσκληση ατόμων στο %1$s"</string>
-  <string name="action_invite_people_to_app">"Προσκάλεσε χρήστες στο %1$s"</string>
+  <string name="action_invite_people_to_app">"Πρόσκληση ατόμων στο %1$s"</string>
   <string name="action_invites_list">"Προσκλήσεις"</string>
   <string name="action_join">"Συμμετοχή"</string>
   <string name="action_learn_more">"Μάθε περισσότερα"</string>
@@ -99,8 +106,11 @@
   <string name="action_remove_message">"Αφαίρεση μηνύματος"</string>
   <string name="action_reply">"Απάντηση"</string>
   <string name="action_reply_in_thread">"Απάντηση στο θέμα"</string>
+  <string name="action_report">"Αναφορά"</string>
   <string name="action_report_bug">"Αναφορά σφάλματος"</string>
   <string name="action_report_content">"Αναφορά περιεχομένου"</string>
+  <string name="action_report_dm">"Αναφορά συνομιλίας"</string>
+  <string name="action_report_room">"Αναφορά δωματίου"</string>
   <string name="action_reset">"Επαναφορά"</string>
   <string name="action_reset_identity">"Επαναφορά ταυτότητας"</string>
   <string name="action_retry">"Επανάληψη"</string>
@@ -144,18 +154,22 @@
   <string name="common_copied_to_clipboard">"Αντιγράφηκε στο πρόχειρο"</string>
   <string name="common_copyright">"Πνευματικά δικαιώματα"</string>
   <string name="common_creating_room">"Δημιουργία δωματίου…"</string>
+  <string name="common_current_user_canceled_knock">"Το αίτημα ακυρώθηκε"</string>
   <string name="common_current_user_left_room">"Αποχώρησε από το δωμάτιο"</string>
+  <string name="common_current_user_rejected_invite">"Η πρόσκληση απορρίφθηκε"</string>
   <string name="common_dark">"Σκοτεινό"</string>
   <string name="common_decryption_error">"Σφάλμα αποκρυπτογράφησης"</string>
   <string name="common_developer_options">"Επιλογές προγραμματιστή"</string>
   <string name="common_device_id">"ID συσκευής"</string>
   <string name="common_direct_chat">"Άμεση συνομιλία"</string>
   <string name="common_do_not_show_this_again">"Να μην εμφανιστεί ξανά"</string>
+  <string name="common_download_failed">"Η λήψη απέτυχε"</string>
   <string name="common_downloading">"Γίνεται λήψη"</string>
   <string name="common_edited_suffix">"(επεξεργάστηκε)"</string>
   <string name="common_editing">"Επεξεργάζεται"</string>
   <string name="common_editing_caption">"Η λεζάντα επεξεργάζεται"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"Κενό αρχείο"</string>
   <string name="common_encryption">"Κρυπτογράφηση"</string>
   <string name="common_encryption_enabled">"Η κρυπτογράφηση ενεργοποιήθηκε"</string>
   <string name="common_enter_your_pin">"Εισήγαγε το PIN σου"</string>
@@ -168,6 +182,8 @@
   <string name="common_favourite">"Αγαπημένο"</string>
   <string name="common_favourited">"Είναι αγαπημένο"</string>
   <string name="common_file">"Αρχείο"</string>
+  <string name="common_file_deleted">"Το αρχείο διαγράφηκε"</string>
+  <string name="common_file_saved">"Το αρχείο αποθηκεύτηκε"</string>
   <string name="common_file_saved_on_disk_android">"Αρχείο αποθηκευμένο σε Λήψεις"</string>
   <string name="common_forward_message">"Προώθηση μηνύματος"</string>
   <string name="common_frequently_used">"Χρησιμοποιείται συχνά"</string>
@@ -178,8 +194,10 @@
   <string name="common_invite_unknown_profile">"Αυτό το Matrix ID δεν μπορεί να βρεθεί, επομένως η πρόσκληση ενδέχεται να μην ληφθεί."</string>
   <string name="common_leaving_room">"Αποχώρηση από το δωμάτιο"</string>
   <string name="common_light">"Φωτεινό"</string>
+  <string name="common_line_copied_to_clipboard">"Η γραμμή αντιγράφηκε στο πρόχειρο"</string>
   <string name="common_link_copied_to_clipboard">"Ο σύνδεσμος αντιγράφηκε στο πρόχειρο"</string>
   <string name="common_loading">"Φόρτωση…"</string>
+  <string name="common_loading_more">"Φόρτωση περισσότερων…"</string>
   <plurals name="common_member_count">
     <item quantity="one">"%1$d μέλος"</item>
     <item quantity="other">"%1$d μέλη"</item>
@@ -190,8 +208,10 @@
   <string name="common_message_removed">"Το μήνυμα αφαιρέθηκε"</string>
   <string name="common_modern">"Σύγχρονη"</string>
   <string name="common_mute">"Σίγαση"</string>
+  <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Κανένα αποτέλεσμα"</string>
   <string name="common_no_room_name">"Χωρίς όνομα δωματίου"</string>
+  <string name="common_not_encrypted">"Χωρίς κρυπτογράφηση"</string>
   <string name="common_offline">"Εκτός σύνδεσης"</string>
   <string name="common_open_source_licenses">"Άδειες ανοιχτού κώδικα"</string>
   <string name="common_or">"ή"</string>
@@ -200,6 +220,7 @@
   <string name="common_permalink">"Μόνιμος σύνδεσμος"</string>
   <string name="common_permission">"Αδεια"</string>
   <string name="common_pinned">"Καρφιτσωμένο"</string>
+  <string name="common_please_check_internet_connection">"Παρακαλώ ελέγξτε τη σύνδεσή σας στο διαδίκτυο"</string>
   <string name="common_please_wait">"Παρακαλώ περίμενε…"</string>
   <string name="common_poll_end_confirmation">"Θες σίγουρα να τερματίσεις αυτή τη δημοσκόπηση;"</string>
   <string name="common_poll_summary">"Δημοσκόπηση: %1$s"</string>
@@ -212,6 +233,7 @@
   <string name="common_privacy_policy">"Πολιτική απορρήτου"</string>
   <string name="common_reaction">"Αντίδραση"</string>
   <string name="common_reactions">"Αντιδράσεις"</string>
+  <string name="common_reason">"Αιτιολογία"</string>
   <string name="common_recovery_key">"Κλειδί ανάκτησης"</string>
   <string name="common_refreshing">"Ανανέωση…"</string>
   <string name="common_replying_to">"Απάντηση σε %1$s"</string>
@@ -219,7 +241,7 @@
   <string name="common_report_a_problem">"Αναφορά προβλήματος"</string>
   <string name="common_report_submitted">"Η αναφορά υποβλήθηκε"</string>
   <string name="common_rich_text_editor">"Επεξεργαστής εμπλουτισμένου κειμένου"</string>
-  <string name="common_room">"Δωμάτιο"</string>
+  <string name="common_room">"Αίθουσα"</string>
   <string name="common_room_name">"Όνομα δωματίου"</string>
   <string name="common_room_name_placeholder">"πχ. το όνομα του έργου σου"</string>
   <string name="common_saved_changes">"Αποθηκευμένες αλλαγές"</string>
@@ -239,6 +261,7 @@
   <string name="common_shared_location">"Κοινόχρηστη τοποθεσία"</string>
   <string name="common_signing_out">"Αποσύνδεση"</string>
   <string name="common_something_went_wrong">"Κάτι πήγε στραβά"</string>
+  <string name="common_something_went_wrong_message">"Αντιμετωπίσαμε ένα πρόβλημα. Παρακαλώ προσπαθήστε ξανά."</string>
   <string name="common_starting_chat">"Έναρξη συνομιλίας…"</string>
   <string name="common_sticker">"Αυτοκόλλητο"</string>
   <string name="common_success">"Επιτυχία"</string>
@@ -267,6 +290,7 @@
   <string name="common_verified">"Επαληθεύτηκε"</string>
   <string name="common_verify_device">"Επαλήθευση συσκευής"</string>
   <string name="common_verify_identity">"Επαλήθευση ταυτότητας"</string>
+  <string name="common_verify_user">"Επαλήθευση χρήστη"</string>
   <string name="common_video">"Βίντεο"</string>
   <string name="common_voice_message">"Φωνητικό μήνυμα"</string>
   <string name="common_waiting">"Αναμονή…"</string>
@@ -275,6 +299,15 @@
   <string name="crypto_identity_change_pin_violation">"Η ταυτότητα του χρήστη %1$s επαναφέρθηκε. %2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"Η ταυτότητα του %1$s %2$s επαναφέρθηκε. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Η ταυτότητα του χρήστη %1$s επαναφέρθηκε."</string>
+  <string name="crypto_identity_change_verification_violation_new">"Η ταυτότητα του χρήστη %1$s %2$s επαναφέρθηκε. %3$s"</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"Ανάκληση επαλήθευσης"</string>
+  <string name="dialog_confirm_link_message">"Ο σύνδεσμος %1$s σας μεταφέρει σε άλλο ιστότοπο %2$s 
+
+Είστε βέβαιοι ότι θέλετε να συνεχίσετε;"</string>
+  <string name="dialog_confirm_link_title">"Ελέγξτε ξανά αυτόν τον σύνδεσμο"</string>
+  <string name="dialog_room_reported">"Το δωμάτιο αναφέρθηκε"</string>
+  <string name="dialog_room_reported_and_left">"Αναφέρθηκε και αποχωρήσατε από το δωμάτιο"</string>
   <string name="dialog_title_confirmation">"Επιβεβαίωση"</string>
   <string name="dialog_title_error">"Σφάλμα"</string>
   <string name="dialog_title_success">"Επιτυχία"</string>
@@ -291,6 +324,7 @@
   <string name="error_missing_location_auth_android">"Το %1$s δεν έχει άδεια πρόσβασης στην τοποθεσία σου. Μπορείς να ενεργοποιήσεις την πρόσβαση στις Ρυθμίσεις."</string>
   <string name="error_missing_location_rationale_android">"Ο χρήστης %1$s δεν έχει άδεια πρόσβασης στην τοποθεσία σου. Ενεργοποίησε την πρόσβαση παρακάτω."</string>
   <string name="error_missing_microphone_voice_rationale_android">"Το %1$s δεν έχει άδεια πρόσβασης στο μικρόφωνό σου. Ενεργοποίησε την πρόσβαση για εγγραφή φωνητικού μηνύματος."</string>
+  <string name="error_network_or_server_issue">"Αυτό μπορεί να οφείλεται σε προβλήματα δικτύου ή διακομιστή."</string>
   <string name="error_room_address_already_exists">"Αυτή η διεύθυνση δωματίου υπάρχει ήδη, δοκίμασε να επεξεργαστείς το πεδίο διεύθυνσης δωματίου ή να αλλάξεις το όνομα δωματίου"</string>
   <string name="error_room_address_invalid_symbols">"Ορισμένοι χαρακτήρες δεν επιτρέπονται. Υποστηρίζονται μόνο γράμματα, ψηφία και τα ακόλουθα σύμβολα ! $ &amp; \'() * +/; = ? @ [] - . _"</string>
   <string name="error_some_messages_have_not_been_sent">"Ορισμένα μηνύματα δεν έχουν σταλεί"</string>
@@ -310,6 +344,9 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Δεν θα μπορεί να συμμετέχει ξανά σε αυτό το δωμάτιο εάν προσκληθεί."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Θες σίγουρα να αποκλείσεις αυτό το μέλος;"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Αποκλεισμός %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Αφαίρεση"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Θα μπορούν να συμμετάσχουν ξανά σε αυτό το δωμάτιο εάν προσκληθούν."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Είστε βέβαιοι ότι θέλετε να αφαιρέσετε αυτό το μέλος;"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Προβολή προφίλ"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Αφαίρεση από το δωμάτιο"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Αφαίρεση μέλους και απαγόρευση συμμετοχής στο μέλλον;"</string>
@@ -337,6 +374,7 @@
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"Το μήνυμά σου δεν στάλθηκε επειδή δεν έχεις επαληθεύσει τουλάχιστον μία από τις συσκευές σου"</string>
   <string name="screen_room_error_failed_processing_media">"Αποτυχία μεταφόρτωσης μέσου, δοκίμασε ξανά."</string>
   <string name="screen_room_error_failed_retrieving_user_details">"Δεν ήταν δυνατή η ανάκτηση στοιχείων χρήστη"</string>
+  <string name="screen_room_event_pill">"Μήνυμα στο %1$s"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s από %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s Καρφιτσωμένα μηνύματα"</string>
   <string name="screen_room_pinned_banner_loading_description">"Φόρτωση μηνύματος…"</string>
@@ -356,6 +394,7 @@
   <string name="settings_version_number">"Έκδοση: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"el"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Τα ιστορικά μηνύματα δεν είναι διαθέσιμα σε αυτήν τη συσκευή"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Πρέπει να επαληθεύσετε αυτήν τη συσκευή για πρόσβαση σε μηνύματα ιστορικού"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Δεν έχεις πρόσβαση σε αυτό το μήνυμα"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Δεν είναι δυνατή η αποκρυπτογράφηση μηνύματος"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Αυτό το μήνυμα αποκλείστηκε είτε επειδή δεν επαλήθευσες τη συσκευή σου είτε επειδή ο αποστολέας πρέπει να επαληθεύσει την ταυτότητά σου."</string>
diff --git a/libraries/ui-strings/src/main/res/values-et/translations.xml b/libraries/ui-strings/src/main/res/values-et/translations.xml
index 5caf236e22..4d0bc5c422 100644
--- a/libraries/ui-strings/src/main/res/values-et/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-et/translations.xml
@@ -138,7 +138,7 @@
   <string name="action_view_source">"Vaata lähtekoodi"</string>
   <string name="action_yes">"Jah"</string>
   <string name="action_yes_try_again">"Jah, proovi uuesti"</string>
-  <string name="banner_migrate_to_native_sliding_sync_description">"Sinu koduserver toetab uut ja kiiremat protokolli. Uuendamiseks logi korraks rakendusest välja ja siis tagasi. Mingil hetkel tulevikus vana protokoll eemaldatakse kasutusest ja tehes uuenduse nüüd väldid hilisemat sundkorras uuendust."</string>
+  <string name="banner_migrate_to_native_sliding_sync_description">"Sinu koduserver toetab uut ja kiiremat protokolli. Uuendamiseks logi korraks rakendusest välja ja siis tagasi. Mingil hetkel tulevikus vana protokoll eemaldatakse kasutusest ja tehes uuenduse nüüd, väldid hilisemat sundkorras uuendust."</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"Saadaval on uuendus"</string>
   <string name="common_about">"Rakenduse teave"</string>
   <string name="common_acceptable_use_policy">"Vastuvõetava kasutamise põhimõtted"</string>
@@ -351,11 +351,6 @@ Kas sa oled kindel, et soovid jätkata?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Eemalda kasutaja jututoast"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Kas eemaldama kasutaja ja seame talle tulevikuks suhtluskeelu?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Eemaldame kasutajat %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Sa ei näe enam selle kasutaja saadetud sõnumeid ja jututubade kutseid"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Blokeeri kasutaja"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Teata sellest jututoast oma teenusepakkujale."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Kirjelda teatamise põhjust…"</string>
-  <string name="screen_decline_and_block_title">"Keeldu ja blokeeri"</string>
   <string name="screen_media_picker_error_failed_selection">"Meediafaili valimine ei õnnestunud. Palun proovi uuesti."</string>
   <string name="screen_media_upload_preview_caption_warning">"Selgitused ja alapealkirjad ei pruugi olla nähtavad vanemate rakenduste kasutajatele."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Meediafaili töötlemine enne üleslaadimist ei õnnestunud. Palun proovi uuesti."</string>
@@ -367,11 +362,6 @@ Kas sa oled kindel, et soovid jätkata?"</string>
     <item quantity="other">"%1$d esiletõstetud sõnumit"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Esiletõstetud sõnumid"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Jututoast haldajale teatamine õnnestus, kuid jututost lahkumisel tekkis viga. Palun proovi uuesti lahkuda."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Pole võimalik lahkuda jututoast"</string>
-  <string name="screen_report_room_reason_footer">"Teata sellest jututoast süsteemi haldajale. Kui sõnumid on krüptitud, ei saa haldaja neid lugeda."</string>
-  <string name="screen_report_room_reason_placeholder">"Kirjelda põhjust…"</string>
-  <string name="screen_report_room_title">"Teata jututoast"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Oma võrguidentiteedi lähtestamiseks suuname sind %1$s kasutajakonto halduse lehele. Hiljem suunatakse sind tagasi sama rakenduse juurde."</string>
   <string name="screen_reset_identity_confirmation_title">"Sa ei saa seda kinnitada? Ava oma kasutajakonto haldus ja lähtesta oma võrguidentiteet."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Unusta verifitseerimine ja saada ikkagi"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fa/translations.xml b/libraries/ui-strings/src/main/res/values-fa/translations.xml
index 51b0ecdad1..50f98c1a19 100644
--- a/libraries/ui-strings/src/main/res/values-fa/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fa/translations.xml
@@ -2,6 +2,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="a11y_avatar">"چهرک"</string>
   <string name="a11y_delete">"حذف"</string>
+  <plurals name="a11y_digits_entered">
+    <item quantity="one">"%1$d رقم وارد شده"</item>
+    <item quantity="other">"%1$d رقم وارد شده"</item>
+  </plurals>
   <string name="a11y_hide_password">"نهفتن گذرواژه"</string>
   <string name="a11y_join_call">"پیوستن به تماس"</string>
   <string name="a11y_jump_to_bottom">"به پایین بروید"</string>
@@ -23,9 +27,11 @@
   <string name="a11y_show_password">"نمایش گذرواژه"</string>
   <string name="a11y_start_call">"آغاز یک تماس"</string>
   <string name="a11y_user_menu">"فهرست کاربر"</string>
+  <string name="a11y_view_details">"دیدن جزییات"</string>
   <string name="a11y_voice_message_record">"ضبط پیام صوتی."</string>
   <string name="a11y_voice_message_stop_recording">"توقّف ضبط"</string>
   <string name="action_accept">"پذیرش"</string>
+  <string name="action_add_caption">"افزودن عنوان"</string>
   <string name="action_add_to_timeline">"افزودن به خط زمانی"</string>
   <string name="action_back">"بازگشت"</string>
   <string name="action_call">"تماس"</string>
@@ -39,18 +45,23 @@
   <string name="action_confirm_password">"تأیید گذرواژه"</string>
   <string name="action_continue">"ادامه"</string>
   <string name="action_copy">"رونوشت"</string>
+  <string name="action_copy_caption">"رونوشت از عنوان7"</string>
   <string name="action_copy_link">"رونوشت از پیوند"</string>
   <string name="action_copy_link_to_message">"رونوشت از پیوند پیام"</string>
+  <string name="action_copy_text">"رونوشت از متن"</string>
   <string name="action_create">"ایجاد"</string>
   <string name="action_create_a_room">"ایجاد اتاق"</string>
   <string name="action_deactivate">"غیرفعّال"</string>
   <string name="action_deactivate_account">"غیرفعّال‌سازی حساب"</string>
   <string name="action_decline">"رد"</string>
+  <string name="action_decline_and_block">"رد و انسداد"</string>
   <string name="action_delete_poll">"حذف نظرسنجی"</string>
   <string name="action_disable">"از کار انداختن"</string>
   <string name="action_discard">"دور ریختن"</string>
+  <string name="action_dismiss">"دورانداختن"</string>
   <string name="action_done">"انجام شد"</string>
   <string name="action_edit">"ویرایش"</string>
+  <string name="action_edit_caption">"ویرایش عنوان"</string>
   <string name="action_edit_poll">"ویرایش نظرسنجی"</string>
   <string name="action_enable">"به کار انداختن"</string>
   <string name="action_end_poll">"پایان نظرسنجی"</string>
@@ -58,6 +69,7 @@
   <string name="action_forgot_password">"گذرواژه را فراموش کردید؟"</string>
   <string name="action_forward">"پیشروی"</string>
   <string name="action_go_back">"پس‌روی"</string>
+  <string name="action_ignore">"نادیده‌گرفتن"</string>
   <string name="action_invite">"دعوت"</string>
   <string name="action_invite_friends">"دعوت افراد"</string>
   <string name="action_invite_friends_to_app">"دعوت به %1$s"</string>
@@ -84,10 +96,15 @@
   <string name="action_react">"واکنش"</string>
   <string name="action_reject">"رد کردن"</string>
   <string name="action_remove">"برداشتن"</string>
+  <string name="action_remove_caption">"برداشتن عنوان"</string>
+  <string name="action_remove_message">"برداشتن پیام‌ها"</string>
   <string name="action_reply">"پاسخ"</string>
   <string name="action_reply_in_thread">"پاسخ در رشته"</string>
+  <string name="action_report">"گزارش"</string>
   <string name="action_report_bug">"گزارش اشکال"</string>
   <string name="action_report_content">"گزارش محتوا"</string>
+  <string name="action_report_dm">"گزارش گفت‌وگو"</string>
+  <string name="action_report_room">"گزارش اتاق"</string>
   <string name="action_reset">"بازنشانی"</string>
   <string name="action_reset_identity">"بازنشانی هویت"</string>
   <string name="action_retry">"تلاش دوباره"</string>
@@ -114,9 +131,11 @@
   <string name="action_view_in_timeline">"دیدن در خط زمانی"</string>
   <string name="action_view_source">"دیدن منبع"</string>
   <string name="action_yes">"بله"</string>
+  <string name="action_yes_try_again">"بله. تلاش دوباره"</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"ارتقا موجود است"</string>
   <string name="common_about">"درباره"</string>
   <string name="common_acceptable_use_policy">"سیاست استفادهٔ پذیرفتنی"</string>
+  <string name="common_adding_caption">"افزودن عنوان"</string>
   <string name="common_advanced_settings">"تنظیمات پیش‌رفته"</string>
   <string name="common_analytics">"تجزیه و تحلیل"</string>
   <string name="common_appearance">"ظاهر"</string>
@@ -128,15 +147,23 @@
   <string name="common_copied_to_clipboard">"در تخته‌گیره رونوشت شد"</string>
   <string name="common_copyright">"حق رونوشت"</string>
   <string name="common_creating_room">"ایجاد کردن اتاق…"</string>
+  <string name="common_current_user_canceled_knock">"درخواست لغو شد"</string>
   <string name="common_current_user_left_room">"اتاق را ترک کرد"</string>
+  <string name="common_current_user_rejected_invite">"دعوت لغو شد"</string>
   <string name="common_dark">"تیره"</string>
   <string name="common_decryption_error">"خطای رمزگشایی"</string>
   <string name="common_developer_options">"گزینه‌های توسعه دهنده"</string>
+  <string name="common_device_id">"شناسه دستگاه"</string>
   <string name="common_direct_chat">"گپ مستقیم"</string>
   <string name="common_do_not_show_this_again">"این مورد را دوباره نشان نده"</string>
+  <string name="common_download_failed">"بارگیری شکست خورد"</string>
+  <string name="common_downloading">"بار گرفتن"</string>
   <string name="common_edited_suffix">"(ویراسته)"</string>
   <string name="common_editing">"ویرایش"</string>
+  <string name="common_editing_caption">"ویراستن عنوان"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"پروندهٔ خالی"</string>
+  <string name="common_encryption">"رمزنگاری"</string>
   <string name="common_encryption_enabled">"رمزنگاری به کار افتاده"</string>
   <string name="common_enter_your_pin">"پینتان را وارد کنید"</string>
   <string name="common_error">"خطا"</string>
@@ -145,8 +172,11 @@
   <string name="common_favourite">"برگزیده"</string>
   <string name="common_favourited">"برگزیده"</string>
   <string name="common_file">"پرونده"</string>
+  <string name="common_file_deleted">"پرونده حذف شد"</string>
+  <string name="common_file_saved">"پرونده ذخیره شد"</string>
   <string name="common_file_saved_on_disk_android">"پرونده در بارگیری‌ها ذخیره شد"</string>
   <string name="common_forward_message">"هدایت پیام"</string>
+  <string name="common_frequently_used">"پراستفاده"</string>
   <string name="common_gif">"جیف"</string>
   <string name="common_image">"تصویر"</string>
   <string name="common_in_reply_to">"در پاسخ به %1$s"</string>
@@ -154,8 +184,10 @@
   <string name="common_invite_unknown_profile">"شناسهٔ ماتریکس نتوانست پیدا شود. ممکن است دعوت نرسیده باشد."</string>
   <string name="common_leaving_room">"ترک کردن اتاق"</string>
   <string name="common_light">"روشن"</string>
+  <string name="common_line_copied_to_clipboard">"خط در تخته‌گیره رونوشت شد"</string>
   <string name="common_link_copied_to_clipboard">"پیوند در تخته‌گیره رونوشت شد"</string>
   <string name="common_loading">"بار کردن…"</string>
+  <string name="common_loading_more">"بار کردن بیش‌تر…"</string>
   <plurals name="common_member_count">
     <item quantity="one">"%1$d عضو"</item>
     <item quantity="other">"%1$d عضو"</item>
@@ -166,8 +198,10 @@
   <string name="common_message_removed">"پیام برداشته شد"</string>
   <string name="common_modern">"نوین"</string>
   <string name="common_mute">"بی‌صدا"</string>
+  <string name="common_name_and_id">"%1$s ‏(%2$s)"</string>
   <string name="common_no_results">"بدون نتیجه"</string>
   <string name="common_no_room_name">"بدون نام اتاق"</string>
+  <string name="common_not_encrypted">"رمزنگارش نشده"</string>
   <string name="common_offline">"برون‌خط"</string>
   <string name="common_open_source_licenses">"پروانه‌های نرم‌افزاری آزاد"</string>
   <string name="common_or">"یا"</string>
@@ -176,14 +210,20 @@
   <string name="common_permalink">"پایاپیوند"</string>
   <string name="common_permission">"اجازه"</string>
   <string name="common_pinned">"سنجاق شده"</string>
+  <string name="common_please_check_internet_connection">"لطفاً اتّصال اینترنتیتان را بررسی کنید"</string>
   <string name="common_please_wait">"لطفا صبر کنید…"</string>
   <string name="common_poll_end_confirmation">"مطئنید که می‌خواهید این نظرسنجی را پایان دهید؟"</string>
   <string name="common_poll_summary">"نظرسنجی: %1$s"</string>
   <string name="common_poll_total_votes">"مجموع آرا: %1$s"</string>
   <string name="common_poll_undisclosed_text">"نتیجه‌ها پس از پایان نظرسنجی نشان داده خواهند شد"</string>
+  <plurals name="common_poll_votes_count">
+    <item quantity="one">"%d رأی"</item>
+    <item quantity="other">"%d رأی"</item>
+  </plurals>
   <string name="common_privacy_policy">"سیاست محرمانگی"</string>
   <string name="common_reaction">"واکنش"</string>
   <string name="common_reactions">"واکنش‌ها"</string>
+  <string name="common_reason">"دلیل"</string>
   <string name="common_recovery_key">"کلید بازیابی"</string>
   <string name="common_refreshing">"تازه سازی…"</string>
   <string name="common_replying_to">"پاسخ دادن به %1$s"</string>
@@ -228,17 +268,27 @@
   <string name="common_unable_to_invite_title">"ناتوان در فرستادن دعوت(ها)"</string>
   <string name="common_unlock">"قفل‌گشایی"</string>
   <string name="common_unmute">"باصدا"</string>
+  <string name="common_unsupported_call">"تماس پشتیبانی نشده"</string>
   <string name="common_unsupported_event">"رویداد پشتیبانی نشده"</string>
   <string name="common_username">"نام کاربری"</string>
   <string name="common_verification_cancelled">"تأیید لغو شد"</string>
   <string name="common_verification_complete">"تأیید کامل شد"</string>
+  <string name="common_verification_failed">"صحت‌سنجی شکست خورد"</string>
+  <string name="common_verified">"تأیید‌شده"</string>
   <string name="common_verify_device">"تأیید افزاره"</string>
+  <string name="common_verify_identity">"تأیید هویت"</string>
+  <string name="common_verify_user">"تأیید کاربر"</string>
   <string name="common_video">"ویدیو"</string>
   <string name="common_voice_message">"پیام صوتی"</string>
   <string name="common_waiting">"در انتظار…"</string>
   <string name="common_waiting_for_decryption_key">"در انتظار این پیام"</string>
   <string name="common_you">"شما"</string>
-  <string name="crypto_identity_change_pin_violation">"به نظر می‌رسد هویت %1$s تغییر کرده. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation">"هویت %1$s بازنشانی شد. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
+  <string name="crypto_identity_change_withdraw_verification_action">"انصراف از تأیید"</string>
+  <string name="dialog_confirm_link_title">"این پیوند را دوباره بررسی کنید"</string>
+  <string name="dialog_room_reported">"اتاق گزارش شد"</string>
+  <string name="dialog_room_reported_and_left">"گزارش و از اتاق خارج شد"</string>
   <string name="dialog_title_confirmation">"تایید"</string>
   <string name="dialog_title_error">"خطا"</string>
   <string name="dialog_title_success">"موفّقیت"</string>
@@ -262,9 +312,15 @@
   <string name="login_initial_device_name_android">"%1$s اندروید"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban">"برداشت و تحریم عضو"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"تحریم"</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"در صورت دعوت نمی‌تواند دوباره به اتاق بپیوندد."</string>
+  <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"مطمئنید می‌خواهید این عضو را تحریم کنید؟"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"تحریم کردن %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"برداشتن"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"در صورت دعوت می‌تواند دوباره به اتاق بپیوندد."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"مطمئنید می‌خواهید این عضو را بردارید؟"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"دیدن نمایه"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"برداشتن از اتاق"</string>
+  <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"برداشتن عضو و تحریم پیوستن در آینده؟"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"برداشتن %1$s…"</string>
   <string name="screen_media_picker_error_failed_selection">"گزینش رسانه شکست خورد. لطفاً دوباره تلاش کنید."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"پردازش رسانه برای بارگذاری شکست خورد. لطفاً دوباره تلاش کنید."</string>
@@ -273,11 +329,13 @@
   <string name="screen_reset_identity_confirmation_subtitle">"داردید برای بازنشانی هویتتان به حساب %1$s می‌روید. پس از آن به کاره برگردانده خواهید شد."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"فرستادن پیام به هر روی"</string>
   <string name="screen_room_error_failed_processing_media">"پردازش رسانه برای بارگذاری شکست خورد. لطفاً دوباره تلاش کنید."</string>
+  <string name="screen_room_event_pill">"پیام در %1$s"</string>
   <string name="screen_room_pinned_banner_indicator">"%1$s از %2$s"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s پیام‌های سنجاق شده"</string>
   <string name="screen_room_pinned_banner_loading_description">"بار کردن پشام‌ها…"</string>
   <string name="screen_room_pinned_banner_view_all_button_title">"نمایش همه"</string>
   <string name="screen_room_title">"گپ"</string>
+  <string name="screen_roomlist_knock_event_sent_description">"درخواست پیوستن فرستاده شد"</string>
   <string name="screen_share_location_title">"هم‌رسانی موقعیت"</string>
   <string name="screen_share_my_location_action">"هم‌رسانی مکانم"</string>
   <string name="screen_share_open_apple_maps">"گشودن در نقشه‌های اپل"</string>
@@ -288,4 +346,5 @@
   <string name="settings_version_number">"نگارش : %1$s (%2$s)"</string>
   <string name="test_language_identifier">"fa"</string>
   <string name="test_untranslated_default_language_identifier">"en"</string>
+  <string name="timeline_decryption_failure_historical_event_user_not_joined">"به این پیام دسترسی ندارید"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-fi/translations.xml b/libraries/ui-strings/src/main/res/values-fi/translations.xml
index 737f4af98e..293b3a49e2 100644
--- a/libraries/ui-strings/src/main/res/values-fi/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fi/translations.xml
@@ -261,6 +261,7 @@ Syy: %1$s."</string>
   <string name="common_shared_location">"Jaettu sijainti"</string>
   <string name="common_signing_out">"Kirjaudutaan ulos"</string>
   <string name="common_something_went_wrong">"Jokin meni pieleen"</string>
+  <string name="common_something_went_wrong_message">"Kohtasimme ongelman. Yritä uudelleen."</string>
   <string name="common_starting_chat">"Aloitetaan keskustelua…"</string>
   <string name="common_sticker">"Tarra"</string>
   <string name="common_success">"Onnistui"</string>
@@ -350,11 +351,6 @@ Haluatko varmasti jatkaa?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Poista huoneesta"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Poistetaanko jäsen huoneesta ja kielletäänkö heitä liittymästä tulevaisuudessa?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Poistetaan käyttäjää %1$s huoneesta…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Et tule näkemään viestejä tai kutsuja tältä käyttäjältä"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Estä käyttäjä"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Ilmoita tästä huoneesta palveluntarjoajallesi."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Kerro syy ilmoittamiseen…"</string>
-  <string name="screen_decline_and_block_title">"Hylkää ja estä"</string>
   <string name="screen_media_picker_error_failed_selection">"Median valinta epäonnistui, yritä uudelleen."</string>
   <string name="screen_media_upload_preview_caption_warning">"Kuvatekstit eivät välttämättä näy ihmisille, jotka käyttävät vanhempia sovelluksia."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Median käsittely epäonnistui, yritä uudelleen."</string>
@@ -366,11 +362,6 @@ Haluatko varmasti jatkaa?"</string>
     <item quantity="other">"%1$d kiinnitettyä viestiä"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Kiinnitetyt viestit"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Ilmoituksesi lähetettiin onnistuneesti, mutta kohtasimme ongelman yrittäessämme poistua huoneesta. Yritä uudelleen."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Huoneesta poistuminen epäonnistui"</string>
-  <string name="screen_report_room_reason_footer">"Ilmoita tästä huoneesta palvelimesi ylläpitäjälle. Jos viestit on salattu, ylläpitäjäsi ei voi lukea niitä."</string>
-  <string name="screen_report_room_reason_placeholder">"Kuvaile syytä…"</string>
-  <string name="screen_report_room_title">"Ilmoita huoneesta"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Olet siirtymässä %1$s -tilillesi nollaamaan identiteettisi. Tämän jälkeen sinut ohjataan takaisin sovellukseen."</string>
   <string name="screen_reset_identity_confirmation_title">"Etkö voi vahvistaa? Siirry tilillesi ja nollaa identiteettisi."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Peruuta vahvistus ja lähetä"</string>
diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml
index 90b74e3a62..27cac31aa0 100644
--- a/libraries/ui-strings/src/main/res/values-fr/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml
@@ -261,6 +261,7 @@ Raison : %1$s."</string>
   <string name="common_shared_location">"Position partagée"</string>
   <string name="common_signing_out">"Déconnexion"</string>
   <string name="common_something_went_wrong">"Une erreur s’est produite"</string>
+  <string name="common_something_went_wrong_message">"Nous avons rencontré un problème. Veuillez réessayer."</string>
   <string name="common_starting_chat">"Création de la discussion…"</string>
   <string name="common_sticker">"Autocollant"</string>
   <string name="common_success">"Succès"</string>
@@ -350,11 +351,6 @@ Raison : %1$s."</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Retirer le membre du salon"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Retirer le membre et interdire l’adhésion à l’avenir ?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Enlever %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Vous ne verrez aucun messages ou invitation à un salon de la part de cet utilisateur"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Bloquer l’utilisateur"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Signalez ce salon à votre fournisseur de compte."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Décrivez la raison du signalement…"</string>
-  <string name="screen_decline_and_block_title">"Refuser et bloquer"</string>
   <string name="screen_media_picker_error_failed_selection">"Échec de la sélection du média, veuillez réessayer."</string>
   <string name="screen_media_upload_preview_caption_warning">"Les légendes peuvent ne pas être visibles pour les utilisateurs d’anciennes applications."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Échec du traitement des médias à télécharger, veuillez réessayer."</string>
@@ -366,11 +362,6 @@ Raison : %1$s."</string>
     <item quantity="other">"%1$d messages épinglés"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Messages épinglés"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Votre rapport a été envoyé avec succès, mais nous avons rencontré un problème en essayant de quitter le salon. Veuillez réessayer."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Impossible de quitter le salon"</string>
-  <string name="screen_report_room_reason_footer">"Signaler ce salon à votre admin. Si les messages sont chiffrés, votre admin ne pourra pas les lire."</string>
-  <string name="screen_report_room_reason_placeholder">"Décrivez la raison…"</string>
-  <string name="screen_report_room_title">"Signaler le salon"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Vous êtes sur le point d’accéder à votre compte %1$s pour réinitialiser votre identité. Vous serez ensuite redirigé vers l’application."</string>
   <string name="screen_reset_identity_confirmation_title">"Vous ne pouvez pas confirmer ? Accédez à votre compte pour réinitialiser votre identité."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Révoquer la verification et envoyer"</string>
diff --git a/libraries/ui-strings/src/main/res/values-hu/translations.xml b/libraries/ui-strings/src/main/res/values-hu/translations.xml
index 82a008aee8..d304030e00 100644
--- a/libraries/ui-strings/src/main/res/values-hu/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-hu/translations.xml
@@ -261,6 +261,7 @@ Ok: %1$s."</string>
   <string name="common_shared_location">"Megosztott tartózkodási hely"</string>
   <string name="common_signing_out">"Kijelentkezés"</string>
   <string name="common_something_went_wrong">"Valamilyen hiba történt"</string>
+  <string name="common_something_went_wrong_message">"Problémába ütköztünk. Próbálja újra."</string>
   <string name="common_starting_chat">"Csevegés megkezdése…"</string>
   <string name="common_sticker">"Matrica"</string>
   <string name="common_success">"Sikeres"</string>
@@ -350,11 +351,6 @@ Biztos, hogy folytatja?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Eltávolítás a szobából"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Eltávolítja a tagot, és megtiltja a jövőbeni csatlakozást?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"%1$s eltávolítása…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Ettől a felhasználótól nem fog többé üzeneteket vagy meghívásokat látni."</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Felhasználó letiltása"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"A szoba jelentése a fiókszolgáltatójának."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Írja le a jelentés okát…"</string>
-  <string name="screen_decline_and_block_title">"Elutasítás és blokkolás"</string>
   <string name="screen_media_picker_error_failed_selection">"Nem sikerült kiválasztani a médiát, próbálja újra."</string>
   <string name="screen_media_upload_preview_caption_warning">"Előfordulhat, hogy a feliratok nem láthatók a régebbi alkalmazásokat használók számára."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nem sikerült feldolgozni a feltöltendő médiát, próbálja újra."</string>
@@ -366,11 +362,6 @@ Biztos, hogy folytatja?"</string>
     <item quantity="other">"%1$d kitűzött üzenet"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Kitűzött üzenetek"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"A jelentése sikeresen el lett küldve, de hibát találtunk a szoba elhagyása során. Próbálja újra."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Nem tudja elhagyni a szobát"</string>
-  <string name="screen_report_room_reason_footer">"A szoba jelentése a rendszergazdának. Ha az üzenetek titkosítva vannak, akkor a rendszergazda nem fogja tudni elolvasni őket."</string>
-  <string name="screen_report_room_reason_placeholder">"Írja le az okot…"</string>
-  <string name="screen_report_room_title">"Szoba jelentése"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Arra készül, hogy belépjen a(z) %1$s fiókjába, hogy visszaállítsa a személyazonosságát. Ezután vissza fog térni az alkalmazásba."</string>
   <string name="screen_reset_identity_confirmation_title">"Nem tudja megerősíteni? Ugorjon a fiókjához, és állítsa vissza a személyazonosságát."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Ellenőrzés visszavonása és elküldés"</string>
diff --git a/libraries/ui-strings/src/main/res/values-in/translations.xml b/libraries/ui-strings/src/main/res/values-in/translations.xml
index dfb80edea2..c32ce5f730 100644
--- a/libraries/ui-strings/src/main/res/values-in/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-in/translations.xml
@@ -125,6 +125,7 @@
   <string name="action_view_in_timeline">"Lihat di lini masa"</string>
   <string name="action_view_source">"Tampilkan sumber"</string>
   <string name="action_yes">"Ya"</string>
+  <string name="action_yes_try_again">"Ya, coba lagi"</string>
   <string name="banner_migrate_to_native_sliding_sync_description">"Server Anda kini mendukung protokol baru yang lebih cepat. Keluar dan masuk lagi untuk memperbarui sekarang. Melakukan hal ini sekarang akan membantu Anda menghindari keluar paksa saat protokol lama dihapus nantinya."</string>
   <string name="banner_migrate_to_native_sliding_sync_title">"Peningkatan tersedia"</string>
   <string name="common_about">"Tentang"</string>
@@ -148,6 +149,7 @@
   <string name="common_device_id">"ID Perangkat"</string>
   <string name="common_direct_chat">"Obrolan langsung"</string>
   <string name="common_do_not_show_this_again">"Jangan tampilkan ini lagi"</string>
+  <string name="common_download_failed">"Pengunduhan gagal"</string>
   <string name="common_downloading">"Mengunduh"</string>
   <string name="common_edited_suffix">"(disunting)"</string>
   <string name="common_editing">"Penyuntingan"</string>
@@ -165,6 +167,8 @@ Alasan: %1$s."</string>
   <string name="common_favourite">"Favorit"</string>
   <string name="common_favourited">"Difavoritkan"</string>
   <string name="common_file">"Berkas"</string>
+  <string name="common_file_deleted">"Berkas dihapus"</string>
+  <string name="common_file_saved">"Berkas disimpan"</string>
   <string name="common_file_saved_on_disk_android">"Berkas disimpan ke Unduhan"</string>
   <string name="common_forward_message">"Teruskan pesan"</string>
   <string name="common_frequently_used">"Sering digunakan"</string>
@@ -350,6 +354,7 @@ Alasan: %1$s."</string>
   <string name="settings_version_number">"Versi: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"id"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Riwayat pesan tidak tersedia di perangkat ini"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"Anda harus memverifikasi perangkat ini untuk mengakses riwayat pesan"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"Anda tidak memiliki akses ke pesan ini"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Tidak dapat mendekripsi pesan"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"Pesan ini diblokir karena Anda tidak memverifikasi perangkat Anda atau karena pengirim perlu memverifikasi identitas Anda."</string>
diff --git a/libraries/ui-strings/src/main/res/values-lt/translations.xml b/libraries/ui-strings/src/main/res/values-lt/translations.xml
index 22714ae3f3..7760fec670 100644
--- a/libraries/ui-strings/src/main/res/values-lt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-lt/translations.xml
@@ -134,6 +134,7 @@
   <string name="screen_media_upload_preview_error_failed_processing">"Nepavyko apdoroti įkeliamos laikmenos, bandykite dar kartą."</string>
   <string name="screen_media_upload_preview_error_failed_sending">"Nepavyko įkelti laikmenos, pabandykite dar kartą."</string>
   <string name="screen_room_error_failed_processing_media">"Nepavyko apdoroti įkeliamos laikmenos, bandykite dar kartą."</string>
+  <string name="screen_room_error_failed_retrieving_user_details">"Nepavyko gauti naudotojo išsamios informacijos."</string>
   <string name="settings_version_number">"Versija: %1$s (%2$s)"</string>
   <string name="test_language_identifier">"lt"</string>
 </resources>
diff --git a/libraries/ui-strings/src/main/res/values-nb/translations.xml b/libraries/ui-strings/src/main/res/values-nb/translations.xml
index 4e15d0e5cd..ce8d655b6a 100644
--- a/libraries/ui-strings/src/main/res/values-nb/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-nb/translations.xml
@@ -261,6 +261,7 @@
   <string name="common_shared_location">"Delt posisjon"</string>
   <string name="common_signing_out">"Logger av"</string>
   <string name="common_something_went_wrong">"Noe gikk galt"</string>
+  <string name="common_something_went_wrong_message">"Vi har støtt på et problem. Vennligst prøv igjen."</string>
   <string name="common_starting_chat">"Starter chat…"</string>
   <string name="common_sticker">"Klistremerke"</string>
   <string name="common_success">"Suksess"</string>
@@ -350,11 +351,6 @@ Er du sikker på at du vil fortsette?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Fjern fra rommet"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Fjerne medlem og utestenge fra å bli med i fremtiden?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Fjerner %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Du vil ikke se noen meldinger eller rominvitasjoner fra denne brukeren"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Blokker bruker"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Rapporter dette rommet til din kontoleverandør."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beskriv årsaken for å rapportere…"</string>
-  <string name="screen_decline_and_block_title">"Avslå og blokker"</string>
   <string name="screen_media_picker_error_failed_selection">"Kunne ikke velge medium, prøv igjen."</string>
   <string name="screen_media_upload_preview_caption_warning">"Teksting er kanskje ikke synlig for personer som bruker eldre apper."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Kunne ikke behandle medier for opplasting, vennligst prøv igjen."</string>
@@ -366,11 +362,6 @@ Er du sikker på at du vil fortsette?"</string>
     <item quantity="other">"%1$d Festede meldinger"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Festede meldinger"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Rapporten din ble sendt inn, men vi oppdaget et problem da vi prøvde å forlate rommet. Prøv igjen."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Kan ikke forlate rommet"</string>
-  <string name="screen_report_room_reason_footer">"Rapporter dette rommet til administratoren din. Hvis meldingene er kryptert, vil administratoren ikke kunne lese dem."</string>
-  <string name="screen_report_room_reason_placeholder">"Beskriv årsaken…"</string>
-  <string name="screen_report_room_title">"Rapporter rom"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Du er i ferd med å gå til %1$s kontoen din for å tilbakestille identiteten din. Etterpå blir du tatt tilbake til appen."</string>
   <string name="screen_reset_identity_confirmation_title">"Kan du ikke bekrefte? Gå til kontoen din for å tilbakestille identiteten din."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Trekk tilbake verifikasjon og send"</string>
diff --git a/libraries/ui-strings/src/main/res/values-pl/translations.xml b/libraries/ui-strings/src/main/res/values-pl/translations.xml
index 8175c90302..e3e742072a 100644
--- a/libraries/ui-strings/src/main/res/values-pl/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pl/translations.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_avatar">"Awatar"</string>
   <string name="a11y_delete">"Usuń"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"Wprowadzono %1$d cyfrę"</item>
@@ -7,11 +8,13 @@
     <item quantity="many">"Wprowadzono %1$d cyfr"</item>
   </plurals>
   <string name="a11y_hide_password">"Ukryj hasło"</string>
+  <string name="a11y_join_call">"Dołącz do połączenia"</string>
   <string name="a11y_jump_to_bottom">"Przejdź na dół"</string>
   <string name="a11y_notifications_mentions_only">"Tylko wzmianki"</string>
   <string name="a11y_notifications_muted">"Wyciszone"</string>
   <string name="a11y_page_n">"Strona %1$d"</string>
   <string name="a11y_pause">"Wstrzymaj"</string>
+  <string name="a11y_paused_voice_message">"Wiadomość głosowa, czas trwania: %1$s, aktualna pozycja: %2$s"</string>
   <string name="a11y_pin_field">"Pole PIN"</string>
   <string name="a11y_play">"Odtwórz"</string>
   <string name="a11y_poll">"Ankieta"</string>
@@ -32,6 +35,7 @@
   <string name="a11y_start_call">"Rozpocznij rozmowę"</string>
   <string name="a11y_user_menu">"Menu użytkownika"</string>
   <string name="a11y_view_details">"Wyświetl szczegóły"</string>
+  <string name="a11y_voice_message">"Wiadomość głosowa, czas trwania: %1$s"</string>
   <string name="a11y_voice_message_record">"Nagraj wiadomość głosową."</string>
   <string name="a11y_voice_message_stop_recording">"Zatrzymaj nagrywanie"</string>
   <string name="action_accept">"Akceptuj"</string>
@@ -58,9 +62,11 @@
   <string name="action_deactivate">"Dezaktywuj"</string>
   <string name="action_deactivate_account">"Dezaktywuj konto"</string>
   <string name="action_decline">"Odrzuć"</string>
+  <string name="action_decline_and_block">"Odrzuć i zablokuj"</string>
   <string name="action_delete_poll">"Usuń ankietę"</string>
   <string name="action_disable">"Wyłącz"</string>
   <string name="action_discard">"Odrzuć"</string>
+  <string name="action_dismiss">"Zamknij"</string>
   <string name="action_done">"Gotowe"</string>
   <string name="action_edit">"Edytuj"</string>
   <string name="action_edit_caption">"Edytuj opis"</string>
@@ -102,8 +108,11 @@
   <string name="action_remove_message">"Usuń wiadomość"</string>
   <string name="action_reply">"Odpowiedz"</string>
   <string name="action_reply_in_thread">"Odpowiedz w wątku"</string>
+  <string name="action_report">"Zgłoś"</string>
   <string name="action_report_bug">"Zgłoś błąd"</string>
   <string name="action_report_content">"Zgłoś treść"</string>
+  <string name="action_report_dm">"Zgłoś rozmowę"</string>
+  <string name="action_report_room">"Zgłoś pokój"</string>
   <string name="action_reset">"Resetuj"</string>
   <string name="action_reset_identity">"Zresetuj tożsamość"</string>
   <string name="action_retry">"Spróbuj ponownie"</string>
@@ -205,6 +214,7 @@ Powód: %1$s."</string>
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"Brak wyników"</string>
   <string name="common_no_room_name">"Brak nazwy pokoju"</string>
+  <string name="common_not_encrypted">"Nieszyfrowane"</string>
   <string name="common_offline">"Offline"</string>
   <string name="common_open_source_licenses">"Licencje open-source"</string>
   <string name="common_or">"lub"</string>
@@ -213,6 +223,7 @@ Powód: %1$s."</string>
   <string name="common_permalink">"Link bezpośredni"</string>
   <string name="common_permission">"Uprawnienie"</string>
   <string name="common_pinned">"Przypięte"</string>
+  <string name="common_please_check_internet_connection">"Sprawdź swoje połączenie internetowe"</string>
   <string name="common_please_wait">"Proszę czekać…"</string>
   <string name="common_poll_end_confirmation">"Jesteś pewien, że chcesz zakończyć tę ankietę?"</string>
   <string name="common_poll_summary">"Ankieta: %1$s"</string>
@@ -226,6 +237,7 @@ Powód: %1$s."</string>
   <string name="common_privacy_policy">"Polityka prywatności"</string>
   <string name="common_reaction">"Reakcja"</string>
   <string name="common_reactions">"Reakcje"</string>
+  <string name="common_reason">"Powód"</string>
   <string name="common_recovery_key">"Klucz przywracania"</string>
   <string name="common_refreshing">"Odświeżanie…"</string>
   <string name="common_replying_to">"Odpowiadanie do %1$s"</string>
@@ -253,6 +265,7 @@ Powód: %1$s."</string>
   <string name="common_shared_location">"Udostępniona lokalizacja"</string>
   <string name="common_signing_out">"Wylogowywanie"</string>
   <string name="common_something_went_wrong">"Coś poszło nie tak"</string>
+  <string name="common_something_went_wrong_message">"Napotkaliśmy problem. Spróbuj ponownie."</string>
   <string name="common_starting_chat">"Rozpoczynanie czatu…"</string>
   <string name="common_sticker">"Naklejka"</string>
   <string name="common_success">"Sukces"</string>
@@ -267,7 +280,7 @@ Powód: %1$s."</string>
   <string name="common_unable_to_decrypt">"Nie można odszyfrować"</string>
   <string name="common_unable_to_decrypt_insecure_device">"Wysłane z niebezpiecznego urządzenia"</string>
   <string name="common_unable_to_decrypt_no_access">"Nie masz uprawnień do tej wiadomości"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"Zweryfikowana tożsamość nadawcy uległa zmianie"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"Zweryfikowana tożsamość nadawcy została zresetowana"</string>
   <string name="common_unable_to_invite_message">"Nie udało się wysłać zaproszenia do jednego lub więcej użytkowników."</string>
   <string name="common_unable_to_invite_title">"Nie można wysłać zaproszeń"</string>
   <string name="common_unlock">"Odblokuj"</string>
@@ -287,16 +300,18 @@ Powód: %1$s."</string>
   <string name="common_waiting">"Oczekiwanie…"</string>
   <string name="common_waiting_for_decryption_key">"Oczekiwanie na tę wiadomość"</string>
   <string name="common_you">"Ty"</string>
-  <string name="crypto_identity_change_pin_violation">"Tożsamość %1$s mogła ulec zmianie. %2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"Wygląda na to, że tożsamość %1$s %2$s uległa zmianie. %3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"Tożsamość %1$s została zresetowana. %2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"Tożsamość %1$s %2$s została zresetowana. %3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"Zweryfikowana tożsamość %1$s uległa zmianie"</string>
-  <string name="crypto_identity_change_verification_violation_new">"Zweryfikowana tożsamość %1$s %2$s uległa zmianie.  %3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"Tożsamość %1$s została zresetowana"</string>
+  <string name="crypto_identity_change_verification_violation_new">"Tożsamość %1$s %2$s została zresetowana.  %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"Wycofaj weryfikację"</string>
   <string name="dialog_confirm_link_message">"Link %1$s prowadzi Cię do innej witryny %2$s
 
 Czy na pewno chcesz kontynuować?"</string>
   <string name="dialog_confirm_link_title">"Sprawdź dwukrotnie ten link"</string>
+  <string name="dialog_room_reported">"Pokój zgłoszony"</string>
+  <string name="dialog_room_reported_and_left">"Opuszczono i zgłoszono pokój"</string>
   <string name="dialog_title_confirmation">"Potwierdzenie"</string>
   <string name="dialog_title_error">"Błąd"</string>
   <string name="dialog_title_success">"Sukces"</string>
@@ -333,11 +348,13 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Nie będą mogli ponownie dołączyć do tego pokoju, jeśli zostaną zaproszeni."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Czy na pewno chcesz zbanować tego członka?"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"Banowanie %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Usuń"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Będą mogli ponownie dołączyć do pokoju, jeśli zostaną zaproszeni."</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Czy na pewno chcesz usunąć tego członka?"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Wyświetl profil"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Usuń z pokoju"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Usunąć członka i zablokować możliwość dołączenia w przyszłości?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Usuwanie %1$s…"</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Opisz powód zgłoszenia…"</string>
   <string name="screen_media_picker_error_failed_selection">"Nie udało się wybrać multimediów. Spróbuj ponownie."</string>
   <string name="screen_media_upload_preview_caption_warning">"Opis może być niedostępny dla osób korzystających ze starszej wersji aplikacji."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Przetwarzanie multimediów do przesłania nie powiodło się, spróbuj ponownie."</string>
@@ -354,7 +371,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_reset_identity_confirmation_title">"Nie możesz potwierdzić? Przejdź do swojego konta i zresetuj swoją tożsamość."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Wycofaj weryfikację i wyślij"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"Możesz wycofać weryfikację i wysłać wiadomość mimo wszystko lub anulować i spróbować ponownie po ponownej weryfikacji %1$s."</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"Twoja wiadomość nie została wysłana, ponieważ tożsamość %1$s uległa zmianie."</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"Twoja wiadomość nie została wysłana, ponieważ tożsamość %1$s została zresetowana."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Wyślij wiadomość mimo to"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s korzysta z jednego lub więcej niezweryfikowanych urządzeń. Wyślij wiadomość mimo to lub anuluj i spróbuj ponownie, gdy %2$s zweryfikuje wszystkie swoje urządzenia."</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"Twoja wiadomość nie została wysłana, ponieważ %1$s nie zweryfikował swoich wszystkich urządzeń"</string>
@@ -375,7 +392,7 @@ Czy na pewno chcesz kontynuować?"</string>
   <string name="screen_share_open_google_maps">"Otwórz w Google Maps"</string>
   <string name="screen_share_open_osm_maps">"Otwórz w OpenStreetMap"</string>
   <string name="screen_share_this_location_action">"Udostępnij tę lokalizację"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Wiadomość nie została wysłana, ponieważ tożsamość %1$s uległa zmianie."</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"Wiadomość nie została wysłana, ponieważ tożsamość %1$s została zresetowana."</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"Wiadomość nie została wysłana, ponieważ %1$s nie zweryfikował wszystkich urządzeń."</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"Wiadomość nie została wysłana, ponieważ nie zweryfikowałeś jednego lub więcej swoich urządzeń."</string>
   <string name="screen_view_location_title">"Lokalizacja"</string>
diff --git a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
index 741b6f1eff..b654dd355b 100644
--- a/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt-rBR/translations.xml
@@ -1,22 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_avatar">"Avatar"</string>
   <string name="a11y_delete">"Excluir"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="one">"%1$d dígito inserido"</item>
     <item quantity="other">"%1$d dígitos inseridos"</item>
   </plurals>
   <string name="a11y_hide_password">"Ocultar senha"</string>
+  <string name="a11y_join_call">"Juntar-se à chamada"</string>
   <string name="a11y_jump_to_bottom">"Ir para o final"</string>
   <string name="a11y_notifications_mentions_only">"Apenas menções"</string>
   <string name="a11y_notifications_muted">"Silenciado"</string>
   <string name="a11y_page_n">"Página %1$d"</string>
   <string name="a11y_pause">"Pausar"</string>
+  <string name="a11y_paused_voice_message">"Mensagem de voz, duração: %1$s, posição atual: %2$s"</string>
   <string name="a11y_pin_field">"Campo de PIN"</string>
   <string name="a11y_play">"Reproduzir"</string>
   <string name="a11y_poll">"Enquete"</string>
   <string name="a11y_poll_end">"Enquete encerrada"</string>
   <string name="a11y_react_with">"Reagir com %1$s"</string>
-  <string name="a11y_react_with_other_emojis">"Reaja com outros emojis"</string>
+  <string name="a11y_react_with_other_emojis">"Reagir com outros emojis"</string>
   <string name="a11y_read_receipts_multiple">"Lido por %1$s e %2$s"</string>
   <plurals name="a11y_read_receipts_multiple_with_others">
     <item quantity="one">"Lido por %1$s e %2$d outro"</item>
@@ -24,35 +27,47 @@
   </plurals>
   <string name="a11y_read_receipts_single">"Lido por %1$s"</string>
   <string name="a11y_read_receipts_tap_to_show_all">"Toque para mostrar tudo"</string>
-  <string name="a11y_remove_reaction_with">"Remova a reação com %1$s"</string>
+  <string name="a11y_remove_reaction_with">"Remover reação com %1$s"</string>
   <string name="a11y_send_files">"Enviar arquivos"</string>
   <string name="a11y_show_password">"Mostrar senha"</string>
   <string name="a11y_start_call">"Iniciar uma chamada"</string>
   <string name="a11y_user_menu">"Menu do usuário"</string>
+  <string name="a11y_view_details">"Visualizar detalhes"</string>
+  <string name="a11y_voice_message">"Mensagem de voz, duração: %1$s"</string>
   <string name="a11y_voice_message_record">"Gravar mensagem de voz."</string>
   <string name="a11y_voice_message_stop_recording">"Parar gravação"</string>
   <string name="action_accept">"Aceitar"</string>
+  <string name="action_add_caption">"Adicionar legenda"</string>
   <string name="action_add_to_timeline">"Adicionar à linha do tempo"</string>
   <string name="action_back">"Voltar"</string>
   <string name="action_call">"Chamar"</string>
   <string name="action_cancel">"Cancelar"</string>
+  <string name="action_cancel_for_now">"Cancelar por agora"</string>
   <string name="action_choose_photo">"Escolher foto"</string>
   <string name="action_clear">"Limpar"</string>
   <string name="action_close">"Fechar"</string>
   <string name="action_complete_verification">"Verificação completa"</string>
   <string name="action_confirm">"Confirmar"</string>
+  <string name="action_confirm_password">"Confirmar senha"</string>
   <string name="action_continue">"Continuar"</string>
   <string name="action_copy">"Copiar"</string>
+  <string name="action_copy_caption">"Copiar legenda"</string>
   <string name="action_copy_link">"Copiar link"</string>
   <string name="action_copy_link_to_message">"Copiar link para a mensagem"</string>
+  <string name="action_copy_text">"Copiar texto"</string>
   <string name="action_create">"Criar"</string>
   <string name="action_create_a_room">"Criar uma sala"</string>
+  <string name="action_deactivate">"Desativar"</string>
+  <string name="action_deactivate_account">"Desativar conta"</string>
   <string name="action_decline">"Recusar"</string>
+  <string name="action_decline_and_block">"Recusar e bloquear"</string>
   <string name="action_delete_poll">"Excluir Enquete"</string>
   <string name="action_disable">"Desabilitar"</string>
   <string name="action_discard">"Descartar"</string>
+  <string name="action_dismiss">"Dispensar"</string>
   <string name="action_done">"Concluído"</string>
   <string name="action_edit">"Editar"</string>
+  <string name="action_edit_caption">"Editar legenda"</string>
   <string name="action_edit_poll">"Editar enquete"</string>
   <string name="action_enable">"Habilitar"</string>
   <string name="action_end_poll">"Encerrar enquete"</string>
@@ -60,6 +75,7 @@
   <string name="action_forgot_password">"Esqueceu a senha?"</string>
   <string name="action_forward">"Encaminhar"</string>
   <string name="action_go_back">"Voltar"</string>
+  <string name="action_ignore">"Ignorar"</string>
   <string name="action_invite">"Convidar"</string>
   <string name="action_invite_friends">"Convidar pessoas"</string>
   <string name="action_invite_friends_to_app">"Convidar pessoas para %1$s"</string>
@@ -86,19 +102,26 @@
   <string name="action_react">"Reagir"</string>
   <string name="action_reject">"Recusar"</string>
   <string name="action_remove">"Remover"</string>
+  <string name="action_remove_caption">"Remover legenda"</string>
+  <string name="action_remove_message">"Remover mensagem"</string>
   <string name="action_reply">"Responder"</string>
   <string name="action_reply_in_thread">"Responder no tópico"</string>
+  <string name="action_report">"Reportar"</string>
   <string name="action_report_bug">"Reportar erro"</string>
-  <string name="action_report_content">"Denunciar conteúdo"</string>
+  <string name="action_report_content">"Reportar conteúdo"</string>
+  <string name="action_report_dm">"Reportar conversa"</string>
+  <string name="action_report_room">"Reportar sala"</string>
   <string name="action_reset">"Redefinir"</string>
+  <string name="action_reset_identity">"Redefinir identidade"</string>
   <string name="action_retry">"Tentar novamente"</string>
-  <string name="action_retry_decryption">"Tente descriptografar novamente"</string>
+  <string name="action_retry_decryption">"Tentar descriptografar novamente"</string>
   <string name="action_save">"Salvar"</string>
   <string name="action_search">"Pesquisar"</string>
   <string name="action_send">"Enviar"</string>
   <string name="action_send_message">"Enviar mensagem"</string>
   <string name="action_share">"Compartilhar"</string>
   <string name="action_share_link">"Compartilhar link"</string>
+  <string name="action_show">"Mostrar"</string>
   <string name="action_sign_in_again">"Iniciar sessão novamente"</string>
   <string name="action_signout">"Sair"</string>
   <string name="action_signout_anyway">"Sair mesmo assim"</string>
@@ -110,8 +133,11 @@
   <string name="action_take_photo">"Tirar foto"</string>
   <string name="action_tap_for_options">"Toque para opções"</string>
   <string name="action_try_again">"Tente novamente"</string>
+  <string name="action_unpin">"Desafixar"</string>
+  <string name="action_view_in_timeline">"Visualizar na linha do tempo"</string>
   <string name="action_view_source">"Ver fonte"</string>
   <string name="action_yes">"Sim"</string>
+  <string name="action_yes_try_again">"Sim, tentar novamente"</string>
   <string name="common_about">"Sobre"</string>
   <string name="common_acceptable_use_policy">"Política de uso aceitável"</string>
   <string name="common_advanced_settings">"Configurações avançadas"</string>
diff --git a/libraries/ui-strings/src/main/res/values-pt/translations.xml b/libraries/ui-strings/src/main/res/values-pt/translations.xml
index f3866d99d4..24fa3d7e35 100644
--- a/libraries/ui-strings/src/main/res/values-pt/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-pt/translations.xml
@@ -329,6 +329,7 @@ Tens a certeza de que queres continuar?"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"Não poderão voltar a entrar nesta sala, mesmo se forem convidados."</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Tens a certeza que queres banir este participante?"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"A banir %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"Poderão entrar na sala novamente se convidados."</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"Ver perfil"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Remover da sala"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remover participante e proibir que entre no futuro?"</string>
diff --git a/libraries/ui-strings/src/main/res/values-ru/translations.xml b/libraries/ui-strings/src/main/res/values-ru/translations.xml
index fac746f8b7..0ce75822d2 100644
--- a/libraries/ui-strings/src/main/res/values-ru/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-ru/translations.xml
@@ -352,9 +352,6 @@
   <string name="screen_bottom_sheet_manage_room_member_remove">"Удалить участника из комнаты"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Удалить участника и запретить присоединяться в будущем?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Удаление %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Заблокировать пользователя"</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Опишите причину жалобы…"</string>
-  <string name="screen_decline_and_block_title">"Отклонить и заблокировать"</string>
   <string name="screen_media_picker_error_failed_selection">"Не удалось выбрать носитель, попробуйте еще раз."</string>
   <string name="screen_media_upload_preview_caption_warning">"Подпись может быть не видна пользователям старых приложений."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не удалось обработать медиафайл для загрузки, попробуйте еще раз."</string>
@@ -367,9 +364,6 @@
     <item quantity="many">"%1$d закреплённых сообщений"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Закрепленные сообщения"</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Невозможно покинуть комнату"</string>
-  <string name="screen_report_room_reason_footer">"Сообщите об этой комнате своему администратору. Если сообщения зашифрованы, ваш администратор не сможет их прочитать."</string>
-  <string name="screen_report_room_reason_placeholder">"Опишите причину…"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Вы собираетесь перейти в свою учетную запись %1$s, чтобы сбросить идентификацию. После этого вы вернетесь в приложение."</string>
   <string name="screen_reset_identity_confirmation_title">"Не можете подтвердить? Перейдите в свою учетную запись, чтобы сбросить свою идентификацию."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Отозвать статус и отправить"</string>
diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml
index 60459b456a..7c4302db9a 100644
--- a/libraries/ui-strings/src/main/res/values-sk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml
@@ -265,6 +265,7 @@ Dôvod: %1$s."</string>
   <string name="common_shared_location">"Zdieľaná poloha"</string>
   <string name="common_signing_out">"Odhlasovanie"</string>
   <string name="common_something_went_wrong">"Niečo sa pokazilo"</string>
+  <string name="common_something_went_wrong_message">"Vyskytol sa problém. Skúste to prosím znova."</string>
   <string name="common_starting_chat">"Spustenie konverzácie…"</string>
   <string name="common_sticker">"Nálepka"</string>
   <string name="common_success">"Úspech"</string>
@@ -354,11 +355,6 @@ Naozaj chcete pokračovať?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Odstrániť z miestnosti"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Odstrániť člena a zakázať vstup v budúcnosti?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Odstraňuje sa %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Od tohto používateľa sa vám nezobrazia žiadne správy ani pozvánky do miestnosti"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Zablokovať používateľa"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Nahlásiť túto miestnosť poskytovateľovi účtu."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Opíšte dôvod nahlásenia…"</string>
-  <string name="screen_decline_and_block_title">"Odmietnuť a zablokovať"</string>
   <string name="screen_media_picker_error_failed_selection">"Nepodarilo sa vybrať médium, skúste to prosím znova."</string>
   <string name="screen_media_upload_preview_caption_warning">"Titulky nemusia byť viditeľné pre ľudí používajúcich staršie aplikácie."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Nepodarilo sa spracovať médiá na odoslanie, skúste to prosím znova."</string>
@@ -371,15 +367,10 @@ Naozaj chcete pokračovať?"</string>
     <item quantity="other">"%1$d pripnutých správ"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Pripnuté správy"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Vaša správa bola úspešne odoslaná, ale pri pokuse o opustenie miestnosti sme narazili na problém. Skúste to prosím znova."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Nie je možné opustiť miestnosť"</string>
-  <string name="screen_report_room_reason_footer">"Nahláste túto miestnosť svojmu správcovi. Ak sú správy zašifrované, váš správca ich nebude môcť prečítať."</string>
-  <string name="screen_report_room_reason_placeholder">"Popíšte dôvod…"</string>
-  <string name="screen_report_room_title">"Nahlásiť miestnosť"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Chystáte sa prejsť na svoj %1$s účet, aby ste obnovili svoju identitu. Potom budete vrátení späť do aplikácie."</string>
   <string name="screen_reset_identity_confirmation_title">"Neviete potvrdiť? Prejdite do svojho účtu a obnovte svoju identitu."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Odvolať overenie a odoslať"</string>
-  <string name="screen_resolve_send_failure_changed_identity_subtitle">"Svoje overenie môžete odvolať a odoslať túto správu aj tak, alebo ju môžete zatiaľ zrušiť a po opätovnom overení to skúsiť znova %1$s ."</string>
+  <string name="screen_resolve_send_failure_changed_identity_subtitle">"Svoje overenie môžete odvolať a odoslať túto správu aj tak, alebo ju môžete zatiaľ zrušiť a po opätovnom overení to skúsiť znova %1$s."</string>
   <string name="screen_resolve_send_failure_changed_identity_title">"Vaša správa nebola odoslaná, pretože sa zmenila overená totožnosť používateľa %1$s."</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"Odoslať správu aj tak"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s používa jedno alebo viac neoverených zariadení. Správu môžete odoslať aj tak, alebo ju môžete zatiaľ zrušiť a skúsiť to znova neskôr po %2$s overení všetkých zariadení."</string>
diff --git a/libraries/ui-strings/src/main/res/values-sv/translations.xml b/libraries/ui-strings/src/main/res/values-sv/translations.xml
index 14566e6b0c..0fda3671c3 100644
--- a/libraries/ui-strings/src/main/res/values-sv/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-sv/translations.xml
@@ -261,6 +261,7 @@ Anledning:%1$s."</string>
   <string name="common_shared_location">"Delade plats"</string>
   <string name="common_signing_out">"Loggar ut"</string>
   <string name="common_something_went_wrong">"Något gick fel"</string>
+  <string name="common_something_went_wrong_message">"Vi stötte på ett problem. Vänligen försök igen."</string>
   <string name="common_starting_chat">"Startar chatt …"</string>
   <string name="common_sticker">"Dekal"</string>
   <string name="common_success">"Lyckades"</string>
@@ -350,11 +351,6 @@ Anledning:%1$s."</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Ta bort från rummet"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Ta bort medlem och banna från att gå med i framtiden?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Tar bort %1$s …"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Du kommer inte att se några meddelanden eller rumsinbjudningar från den här användaren"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Blockera användare"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Rapportera det här rummet till din kontoleverantör."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Beskriv skälet för anmälan …"</string>
-  <string name="screen_decline_and_block_title">"Avvisa och blockera"</string>
   <string name="screen_media_picker_error_failed_selection">"Misslyckades att välja media, vänligen pröva igen."</string>
   <string name="screen_media_upload_preview_caption_warning">"Bildtexter kanske inte är synliga för personer som använder äldre appar."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Misslyckades att bearbeta media för uppladdning, vänligen pröva igen."</string>
@@ -366,11 +362,6 @@ Anledning:%1$s."</string>
     <item quantity="other">"%1$d Fästa meddelanden"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Fästa meddelanden"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Din anmälan skickades in framgångsrikt, men vi stötte på ett problem när vi försökte lämna rummet. Vänligen försök igen."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Kunde inte lämna rummet"</string>
-  <string name="screen_report_room_reason_footer">"Anmäl det här rummet till din administratör. Om meddelandena är krypterade kommer din administratör inte att kunna läsa dem."</string>
-  <string name="screen_report_room_reason_placeholder">"Beskriv anledningen …"</string>
-  <string name="screen_report_room_title">"Rapportera rum"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Du är på väg att gå till ditt %1$s-konto för att återställa din identitet. Därefter kommer du att tas tillbaka till appen."</string>
   <string name="screen_reset_identity_confirmation_title">"Kan du inte bekräfta? Gå till ditt konto för att återställa din identitet."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Dra tillbaka verifieringen och skicka"</string>
diff --git a/libraries/ui-strings/src/main/res/values-uk/translations.xml b/libraries/ui-strings/src/main/res/values-uk/translations.xml
index 9f8f21b123..f8a233d183 100644
--- a/libraries/ui-strings/src/main/res/values-uk/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-uk/translations.xml
@@ -265,6 +265,7 @@
   <string name="common_shared_location">"Поширене розташування"</string>
   <string name="common_signing_out">"Вихід"</string>
   <string name="common_something_went_wrong">"Щось пішло не так"</string>
+  <string name="common_something_went_wrong_message">"Ми зіткнулися з проблемою. Будь ласка, повторіть спробу."</string>
   <string name="common_starting_chat">"Початок бесіди…"</string>
   <string name="common_sticker">"Наліпка"</string>
   <string name="common_success">"Успіх"</string>
@@ -354,11 +355,6 @@
   <string name="screen_bottom_sheet_manage_room_member_remove">"Вилучити з кімнати"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Вилучити учасника та заборонити приєднання в майбутньому?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Вилучення %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"Ви не бачитимете повідомлень або запрошень у кімнату від цього користувача"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Заблокувати користувача"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Поскаржитися на цю кімнату постачальнику облікового запису."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Опишіть причину скарги…"</string>
-  <string name="screen_decline_and_block_title">"Відхилити та заблокувати"</string>
   <string name="screen_media_picker_error_failed_selection">"Не вдалося вибрати медіафайл, спробуйте ще раз."</string>
   <string name="screen_media_upload_preview_caption_warning">"Користувачі старих застосунків можуть не бачити підписи."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Не вдалося обробити медіафайл для завантаження, спробуйте ще раз."</string>
@@ -371,11 +367,6 @@
     <item quantity="many">"%1$d Закріплених повідомлення"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Закріплені повідомлення"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Ваша скарга надіслана, але ми зіткнулися з проблемою під час спроби вийти з кімнати. Повторіть спробу."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Не вдалося вийти з кімнати"</string>
-  <string name="screen_report_room_reason_footer">"Поскаржтеся на цю кімнату своєму адміністратору. Якщо повідомлення зашифровані, ваш адміністратор не зможе їх прочитати."</string>
-  <string name="screen_report_room_reason_placeholder">"Опишіть причину…"</string>
-  <string name="screen_report_room_title">"Поскаржитися на кімнату"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"Ви збираєтеся перейти до свого облікового запису %1$s, щоб скинути свій обліковий запис. Після цього ви повернетесь до програми."</string>
   <string name="screen_reset_identity_confirmation_title">"Не можете підтвердити? Перейдіть до свого облікового запису, щоб скинути облікові дані."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Відкликати верифікацію та відправити"</string>
diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
index 2c9cafc8a4..ec0c7be7b6 100644
--- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_avatar">"大頭貼"</string>
   <string name="a11y_delete">"刪除"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="other">"已輸入 %1$d 個位數"</item>
   </plurals>
   <string name="a11y_hide_password">"隱藏密碼"</string>
+  <string name="a11y_join_call">"加入通話"</string>
   <string name="a11y_jump_to_bottom">"跳至底部"</string>
   <string name="a11y_notifications_mentions_only">"僅限提及"</string>
   <string name="a11y_notifications_muted">"已關閉通知"</string>
   <string name="a11y_page_n">"第 %1$d 頁"</string>
   <string name="a11y_pause">"暫停"</string>
+  <string name="a11y_paused_voice_message">"語音訊息，時長：%1$s，目前位置：%2$s"</string>
   <string name="a11y_pin_field">"PIN 碼欄位"</string>
   <string name="a11y_play">"播放"</string>
   <string name="a11y_poll">"投票"</string>
@@ -28,6 +31,7 @@
   <string name="a11y_start_call">"開始通話"</string>
   <string name="a11y_user_menu">"使用者選單"</string>
   <string name="a11y_view_details">"檢視詳細資訊"</string>
+  <string name="a11y_voice_message">"語音訊息，時長：%1$s"</string>
   <string name="a11y_voice_message_record">"錄製語音訊息。"</string>
   <string name="a11y_voice_message_stop_recording">"停止錄音"</string>
   <string name="action_accept">"接受"</string>
@@ -54,9 +58,11 @@
   <string name="action_deactivate">"停用"</string>
   <string name="action_deactivate_account">"停用帳號"</string>
   <string name="action_decline">"拒絕"</string>
+  <string name="action_decline_and_block">"拒絕並封鎖"</string>
   <string name="action_delete_poll">"刪除投票"</string>
   <string name="action_disable">"停用"</string>
   <string name="action_discard">"捨棄"</string>
+  <string name="action_dismiss">"關閉"</string>
   <string name="action_done">"完成"</string>
   <string name="action_edit">"編輯"</string>
   <string name="action_edit_caption">"編輯標題"</string>
@@ -98,8 +104,10 @@
   <string name="action_remove_message">"移除訊息"</string>
   <string name="action_reply">"回覆"</string>
   <string name="action_reply_in_thread">"在討論串中回覆"</string>
+  <string name="action_report">"回報"</string>
   <string name="action_report_bug">"回報程式錯誤"</string>
   <string name="action_report_content">"檢舉內容"</string>
+  <string name="action_report_room">"回報聊天室"</string>
   <string name="action_reset">"重設"</string>
   <string name="action_reset_identity">"重設身份"</string>
   <string name="action_retry">"再試一次"</string>
@@ -143,7 +151,9 @@
   <string name="common_copied_to_clipboard">"已複製到剪貼簿"</string>
   <string name="common_copyright">"著作權"</string>
   <string name="common_creating_room">"正在建立聊天室…"</string>
+  <string name="common_current_user_canceled_knock">"請求已取消"</string>
   <string name="common_current_user_left_room">"已離開聊天室"</string>
+  <string name="common_current_user_rejected_invite">"邀請被拒絕"</string>
   <string name="common_dark">"深色"</string>
   <string name="common_decryption_error">"解密錯誤"</string>
   <string name="common_developer_options">"開發者選項"</string>
@@ -156,6 +166,7 @@
   <string name="common_editing">"編輯中"</string>
   <string name="common_editing_caption">"編輯標題"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"空檔案"</string>
   <string name="common_encryption">"加密"</string>
   <string name="common_encryption_enabled">"已啟用加密"</string>
   <string name="common_enter_your_pin">"輸入您的 PIN 碼"</string>
@@ -180,6 +191,7 @@
   <string name="common_invite_unknown_profile">"找不到此 Matrix ID，因此可能沒有人會收到邀請。"</string>
   <string name="common_leaving_room">"正在離開聊天室"</string>
   <string name="common_light">"淺色"</string>
+  <string name="common_line_copied_to_clipboard">"行已複製到剪貼簿"</string>
   <string name="common_link_copied_to_clipboard">"連結已複製到剪貼簿"</string>
   <string name="common_loading">"載入中…"</string>
   <string name="common_loading_more">"載入更多……"</string>
@@ -195,6 +207,7 @@
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"查無結果"</string>
   <string name="common_no_room_name">"無聊天室名稱"</string>
+  <string name="common_not_encrypted">"未加密"</string>
   <string name="common_offline">"離線"</string>
   <string name="common_open_source_licenses">"開放原始碼授權條款"</string>
   <string name="common_or">"或"</string>
@@ -203,6 +216,7 @@
   <string name="common_permalink">"永久連結"</string>
   <string name="common_permission">"權限"</string>
   <string name="common_pinned">"已釘選"</string>
+  <string name="common_please_check_internet_connection">"請檢查您的網際網路連線"</string>
   <string name="common_please_wait">"請稍等…"</string>
   <string name="common_poll_end_confirmation">"您確定要結束這項投票嗎？"</string>
   <string name="common_poll_summary">"投票：%1$s"</string>
@@ -214,6 +228,7 @@
   <string name="common_privacy_policy">"隱私權政策"</string>
   <string name="common_reaction">"回應"</string>
   <string name="common_reactions">"回應"</string>
+  <string name="common_reason">"理由"</string>
   <string name="common_recovery_key">"復原金鑰"</string>
   <string name="common_refreshing">"重新整理中…"</string>
   <string name="common_replying_to">"正在回覆%1$s"</string>
@@ -255,7 +270,7 @@
   <string name="common_unable_to_decrypt">"無法解密"</string>
   <string name="common_unable_to_decrypt_insecure_device">"從不安全的裝置傳送"</string>
   <string name="common_unable_to_decrypt_no_access">"您無法存取此則訊息"</string>
-  <string name="common_unable_to_decrypt_verification_violation">"傳送者的驗證身份已變更"</string>
+  <string name="common_unable_to_decrypt_verification_violation">"傳送者的驗證身份已重設"</string>
   <string name="common_unable_to_invite_message">"無法發送邀請給一或多個使用者。"</string>
   <string name="common_unable_to_invite_title">"無法發送邀請"</string>
   <string name="common_unlock">"解鎖"</string>
@@ -275,12 +290,18 @@
   <string name="common_waiting">"等待中…"</string>
   <string name="common_waiting_for_decryption_key">"等待此則訊息"</string>
   <string name="common_you">"您"</string>
-  <string name="crypto_identity_change_pin_violation">"%1$s 的身份似乎已變更。%2$s"</string>
-  <string name="crypto_identity_change_pin_violation_new">"%1$s 的 %2$s 身份似乎已變更。%3$s"</string>
+  <string name="crypto_identity_change_pin_violation">"%1$s 的身份似乎已重設。%2$s"</string>
+  <string name="crypto_identity_change_pin_violation_new">"%1$s 的 %2$s 身份似乎已重設。%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"（%1$s）"</string>
-  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的已驗證身份變更了。"</string>
-  <string name="crypto_identity_change_verification_violation_new">"%1$s 的 %2$s 驗證身份已變更。%3$s"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的已驗證身份被重設。"</string>
+  <string name="crypto_identity_change_verification_violation_new">"%1$s 的 %2$s 驗證身份已重設。  %3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"撤回驗證"</string>
+  <string name="dialog_confirm_link_message">"連結 %1$s 會將您帶往其他網站 %2$s
+
+您確定您想要繼續嗎？"</string>
+  <string name="dialog_confirm_link_title">"仔細檢查此連結"</string>
+  <string name="dialog_room_reported">"聊天室已回報"</string>
+  <string name="dialog_room_reported_and_left">"回報並離開聊天室"</string>
   <string name="dialog_title_confirmation">"確認"</string>
   <string name="dialog_title_error">"錯誤"</string>
   <string name="dialog_title_success">"成功"</string>
@@ -317,6 +338,9 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"即使收到邀請，他們仍然無法加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"您確定要將此成員加入黑名單？"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"正在將 %1$s 加入黑名單"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"移除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"若收到邀請，他們可以再次加入此聊天室。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"您真的想要移除此成員嗎？"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"查看個人檔案"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"踢出聊天室"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"移除成員並禁止未來再度加入？"</string>
@@ -335,7 +359,7 @@
   <string name="screen_reset_identity_confirmation_title">"無法確認？前往您的帳號以重設您的身份。"</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"撤回驗證並傳送"</string>
   <string name="screen_resolve_send_failure_changed_identity_subtitle">"您可以撤回您的驗證並仍傳送此訊息，或者您也可以立刻取消並在重新驗證 %1$s 後再試一次。"</string>
-  <string name="screen_resolve_send_failure_changed_identity_title">"因為 %1$s 的驗證身份已變更，因此未傳送您的訊息。"</string>
+  <string name="screen_resolve_send_failure_changed_identity_title">"因為 %1$s 的驗證身份已重設，因此未傳送您的訊息。"</string>
   <string name="screen_resolve_send_failure_unsigned_device_primary_button_title">"仍要傳送訊息"</string>
   <string name="screen_resolve_send_failure_unsigned_device_subtitle">"%1$s 正在使用一個或多個未經驗證的裝置。您仍然可以傳送訊息，也可以立刻取消並在 %2$s 驗證其所有裝置後再試一次。"</string>
   <string name="screen_resolve_send_failure_unsigned_device_title">"未傳送您的訊息，因為 %1$s 尚未驗證所有裝置。"</string>
@@ -343,6 +367,7 @@
   <string name="screen_resolve_send_failure_you_unsigned_device_title">"因為您尚未驗證一個或多個裝置，因為未傳送您的訊息"</string>
   <string name="screen_room_error_failed_processing_media">"無法處理要上傳的媒體，請再試一次。"</string>
   <string name="screen_room_error_failed_retrieving_user_details">"無法擷取使用者詳細資訊"</string>
+  <string name="screen_room_event_pill">"%1$s 中的訊息"</string>
   <string name="screen_room_pinned_banner_indicator">"第 %1$s 個，共 %2$s 個"</string>
   <string name="screen_room_pinned_banner_indicator_description">"%1$s 個釘選訊息"</string>
   <string name="screen_room_pinned_banner_loading_description">"正在載入訊息……"</string>
@@ -355,7 +380,7 @@
   <string name="screen_share_open_google_maps">"在 Google Maps 中開啟"</string>
   <string name="screen_share_open_osm_maps">"在開放街圖（OpenStreetMap） 中開啟"</string>
   <string name="screen_share_this_location_action">"分享這個位置"</string>
-  <string name="screen_timeline_item_menu_send_failure_changed_identity">"因為 %1$s 的驗證身份已變更，因此未傳送訊息。"</string>
+  <string name="screen_timeline_item_menu_send_failure_changed_identity">"因為 %1$s 的驗證身份已重設，因此未傳送訊息。"</string>
   <string name="screen_timeline_item_menu_send_failure_unsigned_device">"訊息未傳送，因為 %1$s 尚未驗證所有裝置。"</string>
   <string name="screen_timeline_item_menu_send_failure_you_unsigned_device">"因為您尚未驗證一個或多個裝置，因此未傳送訊息"</string>
   <string name="screen_view_location_title">"位置"</string>
diff --git a/libraries/ui-strings/src/main/res/values-zh/translations.xml b/libraries/ui-strings/src/main/res/values-zh/translations.xml
index 4732dc313c..cd7cd61f9b 100644
--- a/libraries/ui-strings/src/main/res/values-zh/translations.xml
+++ b/libraries/ui-strings/src/main/res/values-zh/translations.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="a11y_avatar">"头像"</string>
   <string name="a11y_delete">"删除"</string>
   <plurals name="a11y_digits_entered">
     <item quantity="other">"已输入 %1$d 个数字"</item>
   </plurals>
   <string name="a11y_hide_password">"隐藏密码"</string>
+  <string name="a11y_join_call">"加入通话"</string>
   <string name="a11y_jump_to_bottom">"跳转到底部"</string>
   <string name="a11y_notifications_mentions_only">"仅提及"</string>
   <string name="a11y_notifications_muted">"通知已关闭"</string>
   <string name="a11y_page_n">"第 %1$d 页"</string>
   <string name="a11y_pause">"暂停"</string>
+  <string name="a11y_paused_voice_message">"语音消息，时长：%1$s，当前位置：%2$s"</string>
   <string name="a11y_pin_field">"PIN 字段"</string>
   <string name="a11y_play">"播放"</string>
   <string name="a11y_poll">"投票"</string>
@@ -28,7 +31,8 @@
   <string name="a11y_start_call">"开始通话"</string>
   <string name="a11y_user_menu">"用户菜单"</string>
   <string name="a11y_view_details">"查看详情"</string>
-  <string name="a11y_voice_message_record">"录制语音消息。"</string>
+  <string name="a11y_voice_message">"语音消息，时长：%1$s"</string>
+  <string name="a11y_voice_message_record">"录制语音消息"</string>
   <string name="a11y_voice_message_stop_recording">"停止录制"</string>
   <string name="action_accept">"接受"</string>
   <string name="action_add_caption">"添加标题"</string>
@@ -57,6 +61,7 @@
   <string name="action_delete_poll">"删除投票"</string>
   <string name="action_disable">"禁用"</string>
   <string name="action_discard">"丢弃"</string>
+  <string name="action_dismiss">"关闭"</string>
   <string name="action_done">"完成"</string>
   <string name="action_edit">"编辑"</string>
   <string name="action_edit_caption">"编辑标题"</string>
@@ -70,8 +75,8 @@
   <string name="action_ignore">"忽略"</string>
   <string name="action_invite">"邀请"</string>
   <string name="action_invite_friends">"邀请朋友"</string>
-  <string name="action_invite_friends_to_app">"邀请朋友加入 %1$s"</string>
-  <string name="action_invite_people_to_app">"邀请人们加入 %1$s"</string>
+  <string name="action_invite_friends_to_app">"邀请别人加入 %1$s"</string>
+  <string name="action_invite_people_to_app">"邀请别人加入 %1$s"</string>
   <string name="action_invites_list">"邀请"</string>
   <string name="action_join">"加入"</string>
   <string name="action_learn_more">"了解更多"</string>
@@ -143,7 +148,9 @@
   <string name="common_copied_to_clipboard">"已复制到剪贴板"</string>
   <string name="common_copyright">"版权"</string>
   <string name="common_creating_room">"正在创建聊天室…"</string>
+  <string name="common_current_user_canceled_knock">"请求已取消"</string>
   <string name="common_current_user_left_room">"离开聊天室"</string>
+  <string name="common_current_user_rejected_invite">"邀请已拒绝"</string>
   <string name="common_dark">"深色"</string>
   <string name="common_decryption_error">"解密错误"</string>
   <string name="common_developer_options">"开发者选项"</string>
@@ -156,6 +163,7 @@
   <string name="common_editing">"编辑中"</string>
   <string name="common_editing_caption">"编辑标题"</string>
   <string name="common_emote">"* %1$s %2$s"</string>
+  <string name="common_empty_file">"空文件"</string>
   <string name="common_encryption">"加密"</string>
   <string name="common_encryption_enabled">"已启用加密"</string>
   <string name="common_enter_your_pin">"输入 PIN 码"</string>
@@ -180,6 +188,7 @@
   <string name="common_invite_unknown_profile">"找不到此 Matrix ID，因此可能无法收到邀请。"</string>
   <string name="common_leaving_room">"正在离开聊天室"</string>
   <string name="common_light">"浅色"</string>
+  <string name="common_line_copied_to_clipboard">"链接已复制到剪贴板"</string>
   <string name="common_link_copied_to_clipboard">"链接已复制到剪贴板"</string>
   <string name="common_loading">"正在加载…"</string>
   <string name="common_loading_more">"正在加载更多……"</string>
@@ -195,6 +204,7 @@
   <string name="common_name_and_id">"%1$s (%2$s)"</string>
   <string name="common_no_results">"没有结果"</string>
   <string name="common_no_room_name">"无聊天室名"</string>
+  <string name="common_not_encrypted">"未加密"</string>
   <string name="common_offline">"离线"</string>
   <string name="common_open_source_licenses">"开源许可证"</string>
   <string name="common_or">"或"</string>
@@ -214,6 +224,7 @@
   <string name="common_privacy_policy">"隐私政策"</string>
   <string name="common_reaction">"回应"</string>
   <string name="common_reactions">"回应"</string>
+  <string name="common_reason">"理由"</string>
   <string name="common_recovery_key">"恢复密钥"</string>
   <string name="common_refreshing">"正在刷新…"</string>
   <string name="common_replying_to">"正在回复 %1$s"</string>
@@ -223,7 +234,7 @@
   <string name="common_rich_text_editor">"富文本编辑器"</string>
   <string name="common_room">"聊天室"</string>
   <string name="common_room_name">"聊天室名称"</string>
-  <string name="common_room_name_placeholder">"例如：项目名称"</string>
+  <string name="common_room_name_placeholder">"例如：您的项目名称"</string>
   <string name="common_saved_changes">"保存的更改"</string>
   <string name="common_saving">"正在保存"</string>
   <string name="common_screen_lock">"屏幕锁定"</string>
@@ -269,6 +280,7 @@
   <string name="common_verified">"已验证"</string>
   <string name="common_verify_device">"验证设备"</string>
   <string name="common_verify_identity">"验证身份"</string>
+  <string name="common_verify_user">"验证用户"</string>
   <string name="common_video">"视频"</string>
   <string name="common_voice_message">"语音消息"</string>
   <string name="common_waiting">"等待…"</string>
@@ -277,8 +289,13 @@
   <string name="crypto_identity_change_pin_violation">"%1$s 的身份似乎已经改变。%2$s"</string>
   <string name="crypto_identity_change_pin_violation_new">"%1$s 的 %2$s 身份似乎已经改变。%3$s"</string>
   <string name="crypto_identity_change_pin_violation_new_user_id">"(%1$s)"</string>
+  <string name="crypto_identity_change_profile_pin_violation">"%1$s 的身份已重置。"</string>
   <string name="crypto_identity_change_verification_violation_new">"%1$s 的 %2$s 已验证身份已发生改变。%3$s"</string>
   <string name="crypto_identity_change_withdraw_verification_action">"撤回验证"</string>
+  <string name="dialog_confirm_link_message">"链接 %1$s 将跳转至外部网站 %2$s
+
+确定要继续吗？"</string>
+  <string name="dialog_confirm_link_title">"请再次确认链接"</string>
   <string name="dialog_title_confirmation">"确认"</string>
   <string name="dialog_title_error">"错误"</string>
   <string name="dialog_title_success">"成功"</string>
@@ -295,6 +312,7 @@
   <string name="error_missing_location_auth_android">"%1$s 没有权限访问您的位置。您可以在设置中启用位置权限。"</string>
   <string name="error_missing_location_rationale_android">"%1$s 没有权限访问您的位置。在下方启用位置权限。"</string>
   <string name="error_missing_microphone_voice_rationale_android">"%1$s 没有权限访问您的麦克风。启用录制语音消息的权限。"</string>
+  <string name="error_network_or_server_issue">"这可能是由于网络或服务器问题导致"</string>
   <string name="error_room_address_already_exists">"此房间地址已存在。请尝试编辑房间地址字段或更改房间名称"</string>
   <string name="error_room_address_invalid_symbols">"不允许使用某些字符。仅支持字母、数字和以下符号 $ &amp; ‘ ( ) * + / ; = ? @ [ ] - . _"</string>
   <string name="error_some_messages_have_not_been_sent">"某些信息尚未发送"</string>
@@ -314,6 +332,9 @@
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"即使受到邀请，他们也无法再次加入聊天室。"</string>
   <string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"您确定要封禁该成员吗？"</string>
   <string name="screen_bottom_sheet_manage_room_member_banning_user">"封禁 %1$s"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"移除"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"如果受到邀请，他们可以重新加入聊天室。"</string>
+  <string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"您确定要移除此成员吗？"</string>
   <string name="screen_bottom_sheet_manage_room_member_member_user_info">"查看个人资料"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"从聊天室移除"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"删除成员并禁止重新加入？"</string>
diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
index 9fe4895181..1506b12e3e 100644
--- a/libraries/ui-strings/src/main/res/values/localazy.xml
+++ b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -351,11 +351,6 @@ Are you sure you want to continue?"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove">"Remove from room"</string>
   <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remove member and ban from joining in the future?"</string>
   <string name="screen_bottom_sheet_manage_room_member_removing_user">"Removing %1$s…"</string>
-  <string name="screen_decline_and_block_block_user_option_description">"You will not see any messages or room invites from this user"</string>
-  <string name="screen_decline_and_block_block_user_option_title">"Block user"</string>
-  <string name="screen_decline_and_block_report_user_option_description">"Report this room to your account provider."</string>
-  <string name="screen_decline_and_block_report_user_reason_placeholder">"Describe the reason to report…"</string>
-  <string name="screen_decline_and_block_title">"Decline and block"</string>
   <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
   <string name="screen_media_upload_preview_caption_warning">"Captions might not be visible to people using older apps."</string>
   <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>
@@ -367,11 +362,6 @@ Are you sure you want to continue?"</string>
     <item quantity="other">"%1$d Pinned messages"</item>
   </plurals>
   <string name="screen_pinned_timeline_screen_title_empty">"Pinned messages"</string>
-  <string name="screen_report_room_leave_failed_alert_message">"Your report was submitted successfully, but we encountered an issue while trying to leave the room. Please try again."</string>
-  <string name="screen_report_room_leave_failed_alert_title">"Unable to Leave Room"</string>
-  <string name="screen_report_room_reason_footer">"Report this room to your admin. If the messages are encrypted, your admin will not be able to read them."</string>
-  <string name="screen_report_room_reason_placeholder">"Describe the reason to report…"</string>
-  <string name="screen_report_room_title">"Report room"</string>
   <string name="screen_reset_identity_confirmation_subtitle">"You\'re about to go to your %1$s account to reset your identity. Afterwards you\'ll be taken back to the app."</string>
   <string name="screen_reset_identity_confirmation_title">"Can\'t confirm? Go to your account to reset your identity."</string>
   <string name="screen_resolve_send_failure_changed_identity_primary_button_title">"Withdraw verification and send"</string>
diff --git a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
index 12ad5f65b2..8dc6bf2dbe 100644
--- a/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
+++ b/libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/file/DefaultVoiceFileManager.kt
@@ -12,7 +12,7 @@ import io.element.android.libraries.core.hash.md5
 import io.element.android.libraries.di.CacheDirectory
 import io.element.android.libraries.di.RoomScope
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.matrix.api.room.MatrixRoom
+import io.element.android.libraries.matrix.api.room.BaseRoom
 import java.io.File
 import java.util.UUID
 import javax.inject.Inject
@@ -21,7 +21,7 @@ import javax.inject.Inject
 class DefaultVoiceFileManager @Inject constructor(
     @CacheDirectory private val cacheDir: File,
     private val config: VoiceFileConfig,
-    room: MatrixRoom,
+    room: BaseRoom,
 ) : VoiceFileManager {
     private val roomId: RoomId = room.roomId
 
diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt
index 8eae02888e..4f466cd12a 100644
--- a/plugins/src/main/kotlin/Versions.kt
+++ b/plugins/src/main/kotlin/Versions.kt
@@ -29,10 +29,10 @@ import org.gradle.jvm.toolchain.JavaLanguageVersion
  */
 
 private const val versionYear = 25
-private const val versionMonth = 4
+private const val versionMonth = 5
 
 // Note: must be in [0,99]
-private const val versionReleaseNumber = 3
+private const val versionReleaseNumber = 0
 
 object Versions {
     const val VERSION_CODE = (2000 + versionYear) * 10_000 + versionMonth * 100 + versionReleaseNumber
diff --git a/plugins/src/main/kotlin/config/BuildTimeConfig.kt b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
index b687f44391..0f0d05415c 100644
--- a/plugins/src/main/kotlin/config/BuildTimeConfig.kt
+++ b/plugins/src/main/kotlin/config/BuildTimeConfig.kt
@@ -14,14 +14,13 @@ object BuildTimeConfig {
     const val GOOGLE_APP_ID_DEBUG = "1:912726360885:android:def0a4e454042e9b00427c"
     const val GOOGLE_APP_ID_NIGHTLY = "1:912726360885:android:e17435e0beb0303000427c"
 
-    val METADATA_HOST: String? = null
+    val METADATA_HOST_REVERSED: String? = null
     val URL_WEBSITE: String? = null
     val URL_LOGO: String? = null
     val URL_COPYRIGHT: String? = null
     val URL_ACCEPTABLE_USE: String? = null
     val URL_PRIVACY: String? = null
     val URL_POLICY: String? = null
-    val SUPPORT_EMAIL_ADDRESS: String? = null
     val SERVICES_MAPTILER_BASE_URL: String? = null
     val SERVICES_MAPTILER_APIKEY: String? = null
     val SERVICES_MAPTILER_LIGHT_MAPID: String? = null
diff --git a/plugins/src/main/kotlin/extension/KoverExtension.kt b/plugins/src/main/kotlin/extension/KoverExtension.kt
index fff0e3a22a..df927f48d6 100644
--- a/plugins/src/main/kotlin/extension/KoverExtension.kt
+++ b/plugins/src/main/kotlin/extension/KoverExtension.kt
@@ -175,7 +175,7 @@ fun Project.setupKover() {
                         "io.element.android.libraries.maplibre.compose.SaveableCameraPositionState",
                         "io.element.android.libraries.maplibre.compose.SymbolState",
                         "io.element.android.libraries.matrix.api.room.RoomMembershipState",
-                        "io.element.android.libraries.matrix.api.room.MatrixRoomMembersState",
+                        "io.element.android.libraries.matrix.api.room.RoomMembersState",
                         "io.element.android.libraries.matrix.api.timeline.item.event.OtherState$*",
                         "io.element.android.libraries.matrix.api.timeline.item.event.LocalEventSendState*",
                         "io.element.android.libraries.mediaviewer.impl.local.pdf.PdfViewerState",
diff --git a/screenshots/de/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_de.png b/screenshots/de/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_de.png
index ab51fa5996..ad60685d5a 100644
--- a/screenshots/de/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_de.png
+++ b/screenshots/de/features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b59a1a86287872774c28b99a9a0fd5f554cc6b9558228d17540e80727fdbbb07
-size 24984
+oid sha256:c7faebef3489d141d6d62159d13824ea700daeb581c31c85b1eeb8900929d3c3
+size 24982
diff --git a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
index 45c5c03011..b62f41bcdd 100644
--- a/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
+++ b/screenshots/de/features.analytics.impl_AnalyticsOptInView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8e8dc1cbead6c11ef9b868ba7f6077bd8a3221084483fa9925003126c40141a
-size 84178
+oid sha256:03557f342210661a094936ed6d24ef23be1c1ccc58752ba717844cb2f120915e
+size 84222
diff --git a/screenshots/de/features.call.impl.ui_CallScreenView_Day_1_de.png b/screenshots/de/features.call.impl.ui_CallScreenView_Day_1_de.png
index 1ff5d0b1d4..c2c39667d3 100644
--- a/screenshots/de/features.call.impl.ui_CallScreenView_Day_1_de.png
+++ b/screenshots/de/features.call.impl.ui_CallScreenView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48beee519b4b93c8d6175c59f21f7ecac80a77562639cb5ff3800a5da1dd9314
-size 14206
+oid sha256:b281231613c814130499743851deed96cc285b6134ffe64aaa52cbb91e0a5e2a
+size 14402
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png
new file mode 100644
index 0000000000..c1e11cb5f0
--- /dev/null
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04e2998e9387d12ce7d2687d902fa8968170d8a0a79484366cb7925ffccf63f2
+size 24709
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png
new file mode 100644
index 0000000000..7d976baa5b
--- /dev/null
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:871931282cefa516c00fd3a3849e5b357f6ce95fdca9593ca15fa67ce52fdce3
+size 31029
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_de.png
new file mode 100644
index 0000000000..a1bdd4c535
--- /dev/null
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61007af7ad374f26b832e7da5653c7d9ed1d0e02c0219fbe331164f2e110a7f
+size 12405
diff --git a/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_de.png b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_de.png
new file mode 100644
index 0000000000..6659f4baf8
--- /dev/null
+++ b/screenshots/de/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69318c3177594668e96c7c14251382ab3a8cde767c84c1a3763aefba074a8256
+size 12057
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png
new file mode 100644
index 0000000000..0739a9a88d
--- /dev/null
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7700f928691ef54e11aa3252969bff5eb591ef25893474214d870d328b2bb412
+size 41238
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png
new file mode 100644
index 0000000000..94b9c3691d
--- /dev/null
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:389db826df03f939845e83d0561ff0fb0ea35322862c27d23cc01b0bdd9a20c7
+size 46006
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png
new file mode 100644
index 0000000000..559833f3c0
--- /dev/null
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3d8e53c056aae2f406fe15e01a56a5e3cbdf1bc12628035eaf6e065aee89795
+size 41413
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png
new file mode 100644
index 0000000000..35c0ac9f4d
--- /dev/null
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59c1d1bc54a5acaa043edb8a5318e0413acd2d985435e2aa70a2cb99c36044e7
+size 36146
diff --git a/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png
new file mode 100644
index 0000000000..f4a131071c
--- /dev/null
+++ b/screenshots/de/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6926d3a40d8aa88617557d608a2d0c619c177fc11f601a54f810ecf4634b59b8
+size 40211
diff --git a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_1_de.png b/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_1_de.png
deleted file mode 100644
index 7f50bff700..0000000000
--- a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_1_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8116cf01fc86dc1bfc880567ab76fc1076b9b03b3aa042b14557c00dc2a87882
-size 25911
diff --git a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_2_de.png b/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_2_de.png
deleted file mode 100644
index d87b964241..0000000000
--- a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_2_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ddd5c412727e290f0859e2584691694e10d7f543ef75b715c805cda67ca5e45
-size 25387
diff --git a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_3_de.png b/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_3_de.png
deleted file mode 100644
index a3a3b6732a..0000000000
--- a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_3_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65fefac07fd5f3049d6307feb14a471f2494b3a72696de55230c73074041d3f7
-size 44737
diff --git a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_4_de.png b/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_4_de.png
deleted file mode 100644
index 065525c283..0000000000
--- a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_4_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cafc872ec44168b89391fa78e3595d145c8c5733e260e23eceea8772a4099cfb
-size 10185
diff --git a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_5_de.png b/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_5_de.png
deleted file mode 100644
index 065525c283..0000000000
--- a/screenshots/de/features.invite.impl.response_AcceptDeclineInviteView_Day_5_de.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cafc872ec44168b89391fa78e3595d145c8c5733e260e23eceea8772a4099cfb
-size 10185
diff --git a/screenshots/de/features.leaveroom.api_LeaveRoomView_Day_6_de.png b/screenshots/de/features.leaveroom.api_LeaveRoomView_Day_6_de.png
index cc04479d35..f949f43d57 100644
--- a/screenshots/de/features.leaveroom.api_LeaveRoomView_Day_6_de.png
+++ b/screenshots/de/features.leaveroom.api_LeaveRoomView_Day_6_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8322453763ba7dd597ee08b31a60d9ebc0e5bacfe437290b23b9764efcbd2f79
-size 36784
+oid sha256:b6f0565f64493b55beedb27fbd35cae1ddab6b25af667776d1a6802dd532ca92
+size 33375
diff --git a/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_2_de.png b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_2_de.png
index 18a152781a..c7b2937587 100644
--- a/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_2_de.png
+++ b/screenshots/de/features.login.impl.changeserver_ChangeServerView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0dd57c3fdee7f70ae16e87c08d429263357c69d7d2258f54979745480873319
-size 20995
+oid sha256:018cedfb6449364a9b01acbdaf9320e00092accb4e2f35c5d0480cfbcc07e2c3
+size 31804
diff --git a/screenshots/de/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_de.png b/screenshots/de/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_de.png
index 18a152781a..c7b2937587 100644
--- a/screenshots/de/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_de.png
+++ b/screenshots/de/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c0dd57c3fdee7f70ae16e87c08d429263357c69d7d2258f54979745480873319
-size 20995
+oid sha256:018cedfb6449364a9b01acbdaf9320e00092accb4e2f35c5d0480cfbcc07e2c3
+size 31804
diff --git a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
index 6d7665d868..eb1cf522d8 100644
--- a/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
+++ b/screenshots/de/features.logout.impl_AccountDeactivationView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43dc923be16963eb6b877bf89d1f4726ae77e7c11f27d3b1cd538d5647e4a158
-size 69450
+oid sha256:7b6875d4657e7b3fdb5a45b7e89075e328aed5c28536f0507d04d993dfa93888
+size 69852
diff --git a/screenshots/de/features.migration.impl_MigrationView_Day_1_de.png b/screenshots/de/features.migration.impl_MigrationView_Day_1_de.png
index 99dec9a60a..5fcd3f8216 100644
--- a/screenshots/de/features.migration.impl_MigrationView_Day_1_de.png
+++ b/screenshots/de/features.migration.impl_MigrationView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c18a6c4037767617e5547f7191f99e59a5481b11ebda90346ee8db7af8f8deeb
-size 7912
+oid sha256:247ab4981812b290f010be44eee2d7c72b08ef650ad844dbf1e973da3b100833
+size 7913
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
index 1869423b34..3cf570131d 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04bed63251f93251d0af8effc42fc5ce4c452b1dacde89d101f863976962e33a
-size 65037
+oid sha256:c8aa53b03ecc65005e9fd96e690af55a39ee6f94f18ca5ab7fbf99b9caf5ac7d
+size 65016
diff --git a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
index 955abeadc2..985fbc86a3 100644
--- a/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
+++ b/screenshots/de/features.poll.impl.history_PollHistoryView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77d65a2142cdb1d46c07de2a97a3f32219fee251dffcf5a4051a95b1f6fa7cfb
-size 22132
+oid sha256:d05a3a87854480e5a15ca99e70d5cac728c2dedb736ee790961324f54c355dd2
+size 22164
diff --git a/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png b/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
index 677f100cbb..a22e6c4a81 100644
--- a/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
+++ b/screenshots/de/features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:848bdb220be53e683c02744d2b3023cb80c3a9e5cbc14e3db69986ccc424463e
-size 28478
+oid sha256:b740e9fa4983a377d4903c0ae552c275d7df75829b17fe9eb9623915d0823163
+size 28479
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png
new file mode 100644
index 0000000000..739d14a5e9
--- /dev/null
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3b1e80e6d7e3cd377883da370017cc959d0b8d7fff3894ccff3cbe79fdb1b54
+size 34374
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png
new file mode 100644
index 0000000000..49568a385f
--- /dev/null
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_1_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:497fc391210a0cd4dfe3e2573316e08af9472dd7cc8e93dc0dd9bbd1894b27e7
+size 34179
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png
new file mode 100644
index 0000000000..872123f509
--- /dev/null
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_2_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb7ebd6e806d621083e651ba4158d55e9ffd05dbbcba85acb1e5d46196e1926f
+size 33971
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png
new file mode 100644
index 0000000000..708590ec5b
--- /dev/null
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_3_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f371558881fb39504af28ab5633c1458df2c1352c2cc89710220b3601a4a6e5
+size 30634
diff --git a/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png
new file mode 100644
index 0000000000..0ff8944f45
--- /dev/null
+++ b/screenshots/de/features.reportroom.impl_ReportRoomView_Day_4_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67645229b7efbe53411ebaf1e5fe662d9204630a6fa9edd6b5a3d2f565d2c690
+size 33315
diff --git a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_de.png b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_de.png
index fa6e49238f..3266b61cca 100644
--- a/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_de.png
+++ b/screenshots/de/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce1703ab421f8bb5ad331faadd3f4a04ad61d4f6cf3b5a241f2658945e4ad2e9
-size 35395
+oid sha256:0ebacb8a43186ce6c49c3a2207dc706d66eab8f0f01a62e585073cff00383b58
+size 35415
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
index 9d20895b9b..9de805b0a4 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:69a78e5571dd691e55f2aaa3c8cb2a83d27403db4ba5fcbf7280767ba0ead6a8
-size 36393
+oid sha256:a93f5d684a4f2acef7584f02235e29fe086cd9aaa30a4028c9fe9ee2c01a653d
+size 38689
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
index 23b09c45f3..ca68f35bac 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb151d81fbe5ec5d3b191216470e27121784ef3ceb6a381865f0812f176f07cf
-size 38988
+oid sha256:037a9a1db806c3ef0fdb99fecad1c5ce48e47eea02a34872ed47cd20145fba4e
+size 39780
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
index 5491b85adf..442ef30369 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7cfe2c4166bc3af22891ac44a9462909540e885c45dbb870828f7f8a35d2fab2
-size 44372
+oid sha256:aab3abf7dbad2621907481b01b87aabf0f0840579a3cf0983728975ec96d1333
+size 45007
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
index fa3551995a..0c065e43ac 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetailsDark_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e908618187a14ea56e592fe82fabb4dd3e6fc75c7e67ac0fb3a9d638e05940f
-size 43952
+oid sha256:cd400e4d9e78af0102246ff534d9de19f82aa0a086f38a7f17fce223189bf2b9
+size 44217
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
index dbc70be864..6c3e1b6460 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68214599df536d1dfe2a0fd40e9a7fa709a48528ea8b61d03d604ec31219851f
-size 37344
+oid sha256:0abc2fd5fe653f25b3bc13949b1a9c28c5951ca0712db7e399cc7b43dbd71554
+size 39730
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
index 68e52c8016..ceb248fec6 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fcef5de5c8304fcc9bc54391f33069ecbe91eec45413796ffe3a000ae6ac5d8
-size 40087
+oid sha256:3470657e3f74d9069e5a25334f694b3d46cffe2a3e4e0e5fee053a4632bf6802
+size 40904
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
index 346abaf333..182e5470db 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b63d6d13c966cccebc8609f6efe482e8b52fa9c828befc325b103bb9fe22967
-size 45355
+oid sha256:b396844a2de1712a6a49746861f8d2840a485fc18b47a45b3d0ac53dfe727b8a
+size 46022
diff --git a/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png b/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
index 60a282897f..4fd471f5a2 100644
--- a/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
+++ b/screenshots/de/features.roomdetails.impl_RoomDetails_9_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:95b3bf26f26e4fd2487a11a19b12abfb76898c65e13ef54b1969e31712246599
-size 44899
+oid sha256:001e2d6a6428e72e1b1f62927a36701dfceeec0a743ac96c9e52cd1c93b5106c
+size 45159
diff --git a/screenshots/de/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_de.png b/screenshots/de/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_de.png
new file mode 100644
index 0000000000..c18558eb18
--- /dev/null
+++ b/screenshots/de/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_de.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd8ed72b4e9a2daf9981429b15017c587351a042e50d11ba1ef5c5305caa2bbf
+size 29469
diff --git a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_de.png b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_de.png
index ab097c8663..b0a8b71423 100644
--- a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a9b90f431526f9efe788bc3694c092267991f463c514db7aacd706687353bf6
-size 20404
+oid sha256:5f928fff19a317e056a08bbc39f28d7f44241fb1bc1a41fb36236e5e9986a240
+size 24192
diff --git a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_de.png b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_de.png
index 42947942c2..ac5a253bfa 100644
--- a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ff21ad19952d4e02bfa6f8382760e19c9905c8651f629924abc999f0d451a7e9
-size 22384
+oid sha256:a19c853a8c36128d3df9ecfff8acdebfccc37ff1bab1b1cdaf3336cb67a0390d
+size 24468
diff --git a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_de.png b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_de.png
index 7700411036..52ed3cc77a 100644
--- a/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12d2faec3496df07e2da5580384ab83f6ab5ee481d250999e7243d3ae6666f76
-size 22731
+oid sha256:21dc02fd3f71b1a8949c8c4b5ea1beaf030b62cc3a162bb161b5dadbe2fbc029
+size 26690
diff --git a/screenshots/de/features.roomlist.impl_RoomListView_Day_3_de.png b/screenshots/de/features.roomlist.impl_RoomListView_Day_3_de.png
index ee6393d6b4..2cbf067c14 100644
--- a/screenshots/de/features.roomlist.impl_RoomListView_Day_3_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:baab84954bfb0d2316a17c5a7802b33b4c631276920b9670a72fc583bc082d60
-size 65611
+oid sha256:4a78db5c27dc2a7a1192c4cc5ef0fd156c74639c85dfb578d246da3ac11ba6ba
+size 63181
diff --git a/screenshots/de/features.roomlist.impl_RoomListView_Day_4_de.png b/screenshots/de/features.roomlist.impl_RoomListView_Day_4_de.png
index c47737bdeb..4d7b09165e 100644
--- a/screenshots/de/features.roomlist.impl_RoomListView_Day_4_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListView_Day_4_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1923f13ea7d83f69f10ebb5a5865d87154c45a3ac6f69cda96800819df2bdcaa
-size 64981
+oid sha256:c195eccd87cdd2d6cbdd1db91289332251b95d3723c0e74ec280d5294023fe30
+size 62514
diff --git a/screenshots/de/features.roomlist.impl_RoomListView_Day_5_de.png b/screenshots/de/features.roomlist.impl_RoomListView_Day_5_de.png
index 00cdfeb46f..05d0af262a 100644
--- a/screenshots/de/features.roomlist.impl_RoomListView_Day_5_de.png
+++ b/screenshots/de/features.roomlist.impl_RoomListView_Day_5_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68b83825df1ac8b157b8f9aff8157183e549cb50f704657c9a78a018886f869e
-size 63186
+oid sha256:d7d95599664c8ff48e13e4fd9596b0f0f868840bee286e1584c95dc7b2f6c5d3
+size 60788
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
index 4aa4a1d5f9..716dd56ae6 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_0_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf092b3c11e6c22972a82b82dc3a5187252da9660075e295f14f1fe6ca6c16aa
-size 72971
+oid sha256:fcb2a88faceb56481b2dd741d55d1986e2de2bcd7c08310e9eb027b3f243c6e6
+size 72980
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
index 4aa4a1d5f9..716dd56ae6 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_1_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf092b3c11e6c22972a82b82dc3a5187252da9660075e295f14f1fe6ca6c16aa
-size 72971
+oid sha256:fcb2a88faceb56481b2dd741d55d1986e2de2bcd7c08310e9eb027b3f243c6e6
+size 72980
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
index 082192e8fc..7d403ff54a 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_2_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44093893e6cf2d5e5c1610aed19014d3d166dea411f88a4dda37842e563ae657
-size 73492
+oid sha256:f4fe16ac893be2b5fb850bd4aa9f5fae75981af5e3c1197b7f2da60be802e250
+size 73501
diff --git a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
index ac5cdc1578..795146532e 100644
--- a/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
+++ b/screenshots/de/features.securebackup.impl.disable_SecureBackupDisableView_Day_3_de.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58220df4e2eb8444286f4be62ff97bcc4d14b715eeff1c694c3136670926f376
+oid sha256:1da2069254acdee7b84fc2638e19d10016d6212ee64841b46ec9fa98bd0e2285
 size 43097
diff --git a/screenshots/html/data.js b/screenshots/html/data.js
index fafea4237c..ba59ce075a 100644
--- a/screenshots/html/data.js
+++ b/screenshots/html/data.js
@@ -1,70 +1,69 @@
 // Generated file, do not edit
 export const screenshots = [
 ["en","en-dark","de",],
-["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20196,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_0_en","features.invite.impl.response_AcceptDeclineInviteView_Night_0_en",0,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_1_en","features.invite.impl.response_AcceptDeclineInviteView_Night_1_en",20196,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_2_en","features.invite.impl.response_AcceptDeclineInviteView_Night_2_en",20196,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_3_en","features.invite.impl.response_AcceptDeclineInviteView_Night_3_en",20196,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_4_en","features.invite.impl.response_AcceptDeclineInviteView_Night_4_en",20196,],
-["features.invite.impl.response_AcceptDeclineInviteView_Day_5_en","features.invite.impl.response_AcceptDeclineInviteView_Night_5_en",20196,],
-["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20196,],
-["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20196,],
-["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20196,],
-["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20196,],
-["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20196,],
+["features.preferences.impl.about_AboutView_Day_0_en","features.preferences.impl.about_AboutView_Night_0_en",20210,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en",0,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en",20213,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en",20213,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en",20213,],
+["features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en","features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en",20213,],
+["features.logout.impl_AccountDeactivationView_Day_0_en","features.logout.impl_AccountDeactivationView_Night_0_en",20210,],
+["features.logout.impl_AccountDeactivationView_Day_1_en","features.logout.impl_AccountDeactivationView_Night_1_en",20210,],
+["features.logout.impl_AccountDeactivationView_Day_2_en","features.logout.impl_AccountDeactivationView_Night_2_en",20210,],
+["features.logout.impl_AccountDeactivationView_Day_3_en","features.logout.impl_AccountDeactivationView_Night_3_en",20210,],
+["features.logout.impl_AccountDeactivationView_Day_4_en","features.logout.impl_AccountDeactivationView_Night_4_en",20210,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_0_en","features.login.impl.accountprovider_AccountProviderView_Night_0_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_1_en","features.login.impl.accountprovider_AccountProviderView_Night_1_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_2_en","features.login.impl.accountprovider_AccountProviderView_Night_2_en",0,],
 ["features.login.impl.accountprovider_AccountProviderView_Day_3_en","features.login.impl.accountprovider_AccountProviderView_Night_3_en",0,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_0_en","features.messages.impl.actionlist_ActionListViewContent_Night_0_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20196,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_10_en","features.messages.impl.actionlist_ActionListViewContent_Night_10_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_11_en","features.messages.impl.actionlist_ActionListViewContent_Night_11_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_12_en","features.messages.impl.actionlist_ActionListViewContent_Night_12_en",20210,],
 ["features.messages.impl.actionlist_ActionListViewContent_Day_1_en","features.messages.impl.actionlist_ActionListViewContent_Night_1_en",0,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20196,],
-["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20196,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20196,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20196,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20196,],
-["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20196,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20199,],
-["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20199,],
-["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20196,],
-["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20196,],
-["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20196,],
-["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20196,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20196,],
-["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20196,],
-["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20196,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_2_en","features.messages.impl.actionlist_ActionListViewContent_Night_2_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_3_en","features.messages.impl.actionlist_ActionListViewContent_Night_3_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_4_en","features.messages.impl.actionlist_ActionListViewContent_Night_4_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_5_en","features.messages.impl.actionlist_ActionListViewContent_Night_5_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_6_en","features.messages.impl.actionlist_ActionListViewContent_Night_6_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_7_en","features.messages.impl.actionlist_ActionListViewContent_Night_7_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_8_en","features.messages.impl.actionlist_ActionListViewContent_Night_8_en",20210,],
+["features.messages.impl.actionlist_ActionListViewContent_Day_9_en","features.messages.impl.actionlist_ActionListViewContent_Night_9_en",20210,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_0_en","features.createroom.impl.addpeople_AddPeopleView_Night_0_en",20210,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_1_en","features.createroom.impl.addpeople_AddPeopleView_Night_1_en",20210,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_2_en","features.createroom.impl.addpeople_AddPeopleView_Night_2_en",20210,],
+["features.createroom.impl.addpeople_AddPeopleView_Day_3_en","features.createroom.impl.addpeople_AddPeopleView_Night_3_en",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_0_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_1_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_2_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_3_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_4_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewDark_5_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_0_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_1_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_2_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_3_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_4_en","",20210,],
+["features.preferences.impl.advanced_AdvancedSettingsViewLight_5_en","",20210,],
+["libraries.designsystem.components.dialogs_AlertDialogContent_Dialogs_en","",20210,],
+["libraries.designsystem.components.dialogs_AlertDialog_Day_0_en","libraries.designsystem.components.dialogs_AlertDialog_Night_0_en",20210,],
+["features.analytics.impl_AnalyticsOptInView_Day_0_en","features.analytics.impl_AnalyticsOptInView_Night_0_en",20210,],
+["features.analytics.impl_AnalyticsOptInView_Day_1_en","features.analytics.impl_AnalyticsOptInView_Night_1_en",20210,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_0_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_0_en",20210,],
+["features.analytics.api.preferences_AnalyticsPreferencesView_Day_1_en","features.analytics.api.preferences_AnalyticsPreferencesView_Night_1_en",20210,],
+["features.preferences.impl.analytics_AnalyticsSettingsView_Day_0_en","features.preferences.impl.analytics_AnalyticsSettingsView_Night_0_en",20210,],
 ["libraries.designsystem.components_Announcement_Day_0_en","libraries.designsystem.components_Announcement_Night_0_en",0,],
-["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20196,],
+["services.apperror.impl_AppErrorView_Day_0_en","services.apperror.impl_AppErrorView_Night_0_en",20210,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_0_en","libraries.designsystem.components.async_AsyncActionView_Night_0_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20196,],
+["libraries.designsystem.components.async_AsyncActionView_Day_1_en","libraries.designsystem.components.async_AsyncActionView_Night_1_en",20210,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_2_en","libraries.designsystem.components.async_AsyncActionView_Night_2_en",0,],
-["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20196,],
+["libraries.designsystem.components.async_AsyncActionView_Day_3_en","libraries.designsystem.components.async_AsyncActionView_Night_3_en",20210,],
 ["libraries.designsystem.components.async_AsyncActionView_Day_4_en","libraries.designsystem.components.async_AsyncActionView_Night_4_en",0,],
-["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20196,],
+["libraries.designsystem.components.async_AsyncFailure_Day_0_en","libraries.designsystem.components.async_AsyncFailure_Night_0_en",20210,],
 ["libraries.designsystem.components.async_AsyncIndicatorFailure_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorFailure_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncIndicatorLoading_Day_0_en","libraries.designsystem.components.async_AsyncIndicatorLoading_Night_0_en",0,],
 ["libraries.designsystem.components.async_AsyncLoading_Day_0_en","libraries.designsystem.components.async_AsyncLoading_Night_0_en",0,],
-["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20196,],
+["features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Day_0_en","features.messages.impl.messagecomposer_AttachmentSourcePickerMenu_Night_0_en",20210,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_0_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_0_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_1_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_1_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_2_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_2_en",0,],
@@ -74,18 +73,18 @@ export const screenshots = [
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_6_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_6_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_7_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_7_en",0,],
 ["libraries.matrix.ui.components_AttachmentThumbnail_Day_8_en","libraries.matrix.ui.components_AttachmentThumbnail_Night_8_en",0,],
-["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20196,],
-["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20196,],
-["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20196,],
-["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20196,],
-["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20196,],
-["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20196,],
+["features.messages.impl.attachments.preview_AttachmentsView_0_en","",20210,],
+["features.messages.impl.attachments.preview_AttachmentsView_1_en","",20210,],
+["features.messages.impl.attachments.preview_AttachmentsView_2_en","",20210,],
+["features.messages.impl.attachments.preview_AttachmentsView_3_en","",20210,],
+["features.messages.impl.attachments.preview_AttachmentsView_4_en","",20210,],
+["features.messages.impl.attachments.preview_AttachmentsView_5_en","",20210,],
 ["features.messages.impl.attachments.preview_AttachmentsView_6_en","",0,],
-["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20196,],
+["features.messages.impl.attachments.preview_AttachmentsView_7_en","",20210,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_1_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_AudioItemView_Day_2_en","libraries.mediaviewer.impl.gallery.ui_AudioItemView_Night_2_en",0,],
-["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20196,],
+["libraries.matrix.ui.components_AvatarActionBottomSheet_Day_0_en","libraries.matrix.ui.components_AvatarActionBottomSheet_Night_0_en",20210,],
 ["features.knockrequests.impl.banner_AvatarRowRtl_Day_0_en","features.knockrequests.impl.banner_AvatarRowRtl_Night_0_en",0,],
 ["features.knockrequests.impl.banner_AvatarRowRtl_Day_1_en","features.knockrequests.impl.banner_AvatarRowRtl_Night_1_en",0,],
 ["features.knockrequests.impl.banner_AvatarRowRtl_Day_2_en","features.knockrequests.impl.banner_AvatarRowRtl_Night_2_en",0,],
@@ -193,13 +192,13 @@ export const screenshots = [
 ["libraries.designsystem.components_Badge_Day_0_en","libraries.designsystem.components_Badge_Night_0_en",0,],
 ["libraries.designsystem.components_BigCheckmark_Day_0_en","libraries.designsystem.components_BigCheckmark_Night_0_en",0,],
 ["libraries.designsystem.components_BigIcon_Day_0_en","libraries.designsystem.components_BigIcon_Night_0_en",0,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20196,],
-["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20196,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_0_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_0_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_1_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_1_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_2_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_2_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_3_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_3_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_4_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_4_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_5_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_5_en",20210,],
+["features.preferences.impl.blockedusers_BlockedUsersView_Day_6_en","features.preferences.impl.blockedusers_BlockedUsersView_Night_6_en",20210,],
 ["libraries.designsystem.components_BloomInitials_Day_0_en","libraries.designsystem.components_BloomInitials_Night_0_en",0,],
 ["libraries.designsystem.components_BloomInitials_Day_1_en","libraries.designsystem.components_BloomInitials_Night_1_en",0,],
 ["libraries.designsystem.components_BloomInitials_Day_2_en","libraries.designsystem.components_BloomInitials_Night_2_en",0,],
@@ -210,130 +209,135 @@ export const screenshots = [
 ["libraries.designsystem.components_BloomInitials_Day_7_en","libraries.designsystem.components_BloomInitials_Night_7_en",0,],
 ["libraries.designsystem.components_Bloom_Day_0_en","libraries.designsystem.components_Bloom_Night_0_en",0,],
 ["libraries.designsystem.theme.components_BottomSheetDragHandle_Day_0_en","libraries.designsystem.theme.components_BottomSheetDragHandle_Night_0_en",0,],
-["features.rageshake.impl.bugreport_BugReportView_Day_0_en","features.rageshake.impl.bugreport_BugReportView_Night_0_en",20196,],
-["features.rageshake.impl.bugreport_BugReportView_Day_1_en","features.rageshake.impl.bugreport_BugReportView_Night_1_en",20196,],
-["features.rageshake.impl.bugreport_BugReportView_Day_2_en","features.rageshake.impl.bugreport_BugReportView_Night_2_en",20196,],
-["features.rageshake.impl.bugreport_BugReportView_Day_3_en","features.rageshake.impl.bugreport_BugReportView_Night_3_en",20196,],
-["features.rageshake.impl.bugreport_BugReportView_Day_4_en","features.rageshake.impl.bugreport_BugReportView_Night_4_en",20196,],
+["features.rageshake.impl.bugreport_BugReportView_Day_0_en","features.rageshake.impl.bugreport_BugReportView_Night_0_en",20210,],
+["features.rageshake.impl.bugreport_BugReportView_Day_1_en","features.rageshake.impl.bugreport_BugReportView_Night_1_en",20210,],
+["features.rageshake.impl.bugreport_BugReportView_Day_2_en","features.rageshake.impl.bugreport_BugReportView_Night_2_en",20210,],
+["features.rageshake.impl.bugreport_BugReportView_Day_3_en","features.rageshake.impl.bugreport_BugReportView_Night_3_en",20210,],
+["features.rageshake.impl.bugreport_BugReportView_Day_4_en","features.rageshake.impl.bugreport_BugReportView_Night_4_en",20210,],
 ["libraries.designsystem.atomic.molecules_ButtonColumnMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonColumnMolecule_Night_0_en",0,],
 ["libraries.designsystem.atomic.molecules_ButtonRowMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ButtonRowMolecule_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_0_en","features.messages.impl.timeline.components_CallMenuItem_Night_0_en",0,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_1_en","features.messages.impl.timeline.components_CallMenuItem_Night_1_en",0,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20196,],
-["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20196,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_2_en","features.messages.impl.timeline.components_CallMenuItem_Night_2_en",20210,],
+["features.messages.impl.timeline.components_CallMenuItem_Day_3_en","features.messages.impl.timeline.components_CallMenuItem_Night_3_en",20210,],
 ["features.messages.impl.timeline.components_CallMenuItem_Day_4_en","features.messages.impl.timeline.components_CallMenuItem_Night_4_en",0,],
 ["features.call.impl.ui_CallScreenPipView_Day_0_en","features.call.impl.ui_CallScreenPipView_Night_0_en",0,],
 ["features.call.impl.ui_CallScreenPipView_Day_1_en","features.call.impl.ui_CallScreenPipView_Night_1_en",0,],
 ["features.call.impl.ui_CallScreenView_Day_0_en","features.call.impl.ui_CallScreenView_Night_0_en",0,],
-["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20196,],
-["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20196,],
-["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20196,],
-["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20196,],
-["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_0_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_10_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_10_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_1_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_1_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_2_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_2_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_3_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_3_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_4_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_4_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_5_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_5_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_6_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_6_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_7_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_7_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_8_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_8_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_9_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_9_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en",20196,],
+["features.call.impl.ui_CallScreenView_Day_1_en","features.call.impl.ui_CallScreenView_Night_1_en",20210,],
+["features.call.impl.ui_CallScreenView_Day_2_en","features.call.impl.ui_CallScreenView_Night_2_en",20210,],
+["features.call.impl.ui_CallScreenView_Day_3_en","features.call.impl.ui_CallScreenView_Night_3_en",20210,],
+["libraries.textcomposer_CaptionWarningBottomSheet_Day_0_en","libraries.textcomposer_CaptionWarningBottomSheet_Night_0_en",20210,],
+["features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Day_0_en","features.login.impl.screens.changeaccountprovider_ChangeAccountProviderView_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_0_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_10_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_10_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_1_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_1_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_2_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_2_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_3_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_3_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_4_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_4_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_5_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_5_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_6_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_6_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_7_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_7_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_8_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_8_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Day_9_en","features.roomdetails.impl.rolesandpermissions.changeroles_ChangeRolesView_Night_9_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_1_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_2_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_3_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_4_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_5_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions.permissions_ChangeRoomPermissionsView_Night_6_en",20210,],
 ["features.login.impl.changeserver_ChangeServerView_Day_0_en","features.login.impl.changeserver_ChangeServerView_Night_0_en",0,],
-["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20196,],
-["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20196,],
+["features.login.impl.changeserver_ChangeServerView_Day_1_en","features.login.impl.changeserver_ChangeServerView_Night_1_en",20210,],
+["features.login.impl.changeserver_ChangeServerView_Day_2_en","features.login.impl.changeserver_ChangeServerView_Night_2_en",20210,],
 ["libraries.matrix.ui.components_CheckableResolvedUserRow_en","",0,],
-["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20196,],
+["libraries.matrix.ui.components_CheckableUnresolvedUserRow_en","",20210,],
 ["libraries.designsystem.theme.components_Checkboxes_Toggles_en","",0,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20196,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20196,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20196,],
-["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20196,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_0_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_0_en",20210,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_1_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_1_en",20210,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_2_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_2_en",20210,],
+["features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Day_3_en","features.ftue.impl.sessionverification.choosemode_ChooseSelfVerificationModeView_Night_3_en",20210,],
 ["libraries.designsystem.theme.components_CircularProgressIndicator_Progress_Indicators_en","",0,],
 ["libraries.designsystem.components_ClickableLinkText_Text_en","",0,],
 ["libraries.designsystem.theme_ColorAliases_Day_0_en","libraries.designsystem.theme_ColorAliases_Night_0_en",0,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20196,],
-["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20196,],
-["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20196,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_0_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_0_en",20210,],
+["libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Day_1_en","libraries.designsystem.atomic.molecules_ComposerAlertMolecule_Night_1_en",20210,],
+["libraries.textcomposer_ComposerModeView_Day_0_en","libraries.textcomposer_ComposerModeView_Night_0_en",20210,],
 ["libraries.textcomposer_ComposerModeView_Day_1_en","libraries.textcomposer_ComposerModeView_Night_1_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_2_en","libraries.textcomposer_ComposerModeView_Night_2_en",0,],
 ["libraries.textcomposer_ComposerModeView_Day_3_en","libraries.textcomposer_ComposerModeView_Night_3_en",0,],
 ["libraries.designsystem.components.avatar_CompositeAvatar_Avatars_en","",0,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20196,],
-["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20196,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20196,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20196,],
-["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20196,],
-["features.roomlist.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.roomlist.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20196,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en","",20210,],
+["features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en","",20210,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_0_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_0_en",20210,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_1_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_1_en",20210,],
+["features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Day_2_en","features.login.impl.screens.confirmaccountprovider_ConfirmAccountProviderView_Night_2_en",20210,],
+["features.roomlist.impl.components_ConfirmRecoveryKeyBanner_Day_0_en","features.roomlist.impl.components_ConfirmRecoveryKeyBanner_Night_0_en",20210,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ConfirmationDialog_Day_0_en","libraries.designsystem.components.dialogs_ConfirmationDialog_Night_0_en",0,],
 ["features.networkmonitor.api.ui_ConnectivityIndicatorView_Day_0_en","features.networkmonitor.api.ui_ConnectivityIndicatorView_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_CounterAtom_Day_0_en","libraries.designsystem.atomic.atoms_CounterAtom_Night_0_en",0,],
-["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20196,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20196,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20196,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20196,],
-["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20196,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20196,],
-["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20196,],
-["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_0_en","features.createroom.impl.root_CreateRoomRootView_Night_0_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_1_en","features.createroom.impl.root_CreateRoomRootView_Night_1_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_2_en","features.createroom.impl.root_CreateRoomRootView_Night_2_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_3_en","features.createroom.impl.root_CreateRoomRootView_Night_3_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_4_en","features.createroom.impl.root_CreateRoomRootView_Night_4_en",20196,],
-["features.createroom.impl.root_CreateRoomRootView_Day_5_en","features.createroom.impl.root_CreateRoomRootView_Night_5_en",20196,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20196,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20196,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20196,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20196,],
-["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20196,],
+["features.rageshake.api.crash_CrashDetectionView_Day_0_en","features.rageshake.api.crash_CrashDetectionView_Night_0_en",20210,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_0_en","features.login.impl.screens.createaccount_CreateAccountView_Night_0_en",20210,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_1_en","features.login.impl.screens.createaccount_CreateAccountView_Night_1_en",20210,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_2_en","features.login.impl.screens.createaccount_CreateAccountView_Night_2_en",20210,],
+["features.login.impl.screens.createaccount_CreateAccountView_Day_3_en","features.login.impl.screens.createaccount_CreateAccountView_Night_3_en",20210,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_0_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_0_en",20210,],
+["libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Day_1_en","libraries.matrix.ui.components_CreateDmConfirmationBottomSheet_Night_1_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_0_en","features.poll.impl.create_CreatePollView_Night_0_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_1_en","features.poll.impl.create_CreatePollView_Night_1_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_2_en","features.poll.impl.create_CreatePollView_Night_2_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_3_en","features.poll.impl.create_CreatePollView_Night_3_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_4_en","features.poll.impl.create_CreatePollView_Night_4_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_5_en","features.poll.impl.create_CreatePollView_Night_5_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_6_en","features.poll.impl.create_CreatePollView_Night_6_en",20210,],
+["features.poll.impl.create_CreatePollView_Day_7_en","features.poll.impl.create_CreatePollView_Night_7_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_0_en","features.createroom.impl.root_CreateRoomRootView_Night_0_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_1_en","features.createroom.impl.root_CreateRoomRootView_Night_1_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_2_en","features.createroom.impl.root_CreateRoomRootView_Night_2_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_3_en","features.createroom.impl.root_CreateRoomRootView_Night_3_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_4_en","features.createroom.impl.root_CreateRoomRootView_Night_4_en",20210,],
+["features.createroom.impl.root_CreateRoomRootView_Day_5_en","features.createroom.impl.root_CreateRoomRootView_Night_5_en",20210,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_0_en","",20210,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_1_en","",20210,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_2_en","",20210,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_3_en","",20210,],
+["libraries.dateformatter.impl.previews_DateFormatterModeView_4_en","",20210,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_DateItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_DateItemView_Night_1_en",0,],
-["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20196,],
-["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20196,],
+["libraries.designsystem.theme.components.previews_DatePickerDark_DateTime_pickers_en","",20210,],
+["libraries.designsystem.theme.components.previews_DatePickerLight_DateTime_pickers_en","",20210,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en",20213,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en",20213,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en",20213,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en",20213,],
+["features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en","features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en",20213,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_0_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_0_en",0,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20196,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20196,],
-["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20196,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_1_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_1_en",20210,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_2_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_2_en",20210,],
+["features.logout.impl.direct_DefaultDirectLogoutView_Day_3_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_3_en",20210,],
 ["features.logout.impl.direct_DefaultDirectLogoutView_Day_4_en","features.logout.impl.direct_DefaultDirectLogoutView_Night_4_en",0,],
-["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20196,],
-["features.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en","features.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en",20196,],
-["features.roomlist.impl.components_DefaultRoomListTopBar_Day_0_en","features.roomlist.impl.components_DefaultRoomListTopBar_Night_0_en",20196,],
+["features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Day_0_en","features.preferences.impl.notifications.edit_DefaultNotificationSettingOption_Night_0_en",20210,],
+["features.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_Day_0_en","features.roomlist.impl.components_DefaultRoomListTopBarWithIndicator_Night_0_en",20210,],
+["features.roomlist.impl.components_DefaultRoomListTopBar_Day_0_en","features.roomlist.impl.components_DefaultRoomListTopBar_Night_0_en",20210,],
 ["features.licenses.impl.details_DependenciesDetailsView_Day_0_en","features.licenses.impl.details_DependenciesDetailsView_Night_0_en",0,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20196,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20196,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20196,],
-["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20196,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20196,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20196,],
-["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20196,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_0_en","features.licenses.impl.list_DependencyLicensesListView_Night_0_en",20210,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_1_en","features.licenses.impl.list_DependencyLicensesListView_Night_1_en",20210,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_2_en","features.licenses.impl.list_DependencyLicensesListView_Night_2_en",20210,],
+["features.licenses.impl.list_DependencyLicensesListView_Day_3_en","features.licenses.impl.list_DependencyLicensesListView_Night_3_en",20210,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_0_en","features.preferences.impl.developer_DeveloperSettingsView_Night_0_en",20210,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_1_en","features.preferences.impl.developer_DeveloperSettingsView_Night_1_en",20210,],
+["features.preferences.impl.developer_DeveloperSettingsView_Day_2_en","features.preferences.impl.developer_DeveloperSettingsView_Night_2_en",20210,],
 ["libraries.designsystem.theme.components_DialogWithDestructiveButton_Dialog_with_destructive_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithOnlyMessageAndOkButton_Dialog_with_only_message_and_ok_button_Dialogs_en","",0,],
 ["libraries.designsystem.theme.components_DialogWithThirdButton_Dialog_with_third_button_Dialogs_en","",0,],
@@ -346,17 +350,17 @@ export const screenshots = [
 ["libraries.designsystem.text_DpScale_1_0f__en","",0,],
 ["libraries.designsystem.text_DpScale_1_5f__en","",0,],
 ["libraries.designsystem.theme.components_DropdownMenuItem_Menus_en","",0,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20196,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20196,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20196,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20196,],
-["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20196,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20196,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20196,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20196,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20196,],
-["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20196,],
-["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20196,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_0_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_0_en",20210,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_1_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_1_en",20210,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_2_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_2_en",20210,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_3_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_3_en",20210,],
+["features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Day_4_en","features.preferences.impl.notifications.edit_EditDefaultNotificationSettingView_Night_4_en",20210,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_0_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_0_en",20210,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_1_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_1_en",20210,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_2_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_2_en",20210,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_3_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_3_en",20210,],
+["features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Day_4_en","features.roomdetails.impl.securityandprivacy.editroomaddress_EditRoomAddressView_Night_4_en",20210,],
+["features.preferences.impl.user.editprofile_EditUserProfileView_Day_0_en","features.preferences.impl.user.editprofile_EditUserProfileView_Night_0_en",20210,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_0_en","libraries.matrix.ui.components_EditableAvatarView_Night_0_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_1_en","libraries.matrix.ui.components_EditableAvatarView_Night_1_en",0,],
 ["libraries.matrix.ui.components_EditableAvatarView_Day_2_en","libraries.matrix.ui.components_EditableAvatarView_Night_2_en",0,],
@@ -366,9 +370,9 @@ export const screenshots = [
 ["libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Day_0_en","libraries.designsystem.atomic.atoms_ElementLogoAtomMedium_Night_0_en",0,],
 ["features.messages.impl.timeline.components.customreaction_EmojiItem_Day_0_en","features.messages.impl.timeline.components.customreaction_EmojiItem_Night_0_en",0,],
 ["features.messages.impl.timeline.components.customreaction_EmojiPicker_Day_0_en","features.messages.impl.timeline.components.customreaction_EmojiPicker_Night_0_en",0,],
-["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20196,],
-["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20196,],
-["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20196,],
+["libraries.designsystem.components.dialogs_ErrorDialogContent_Dialogs_en","",20210,],
+["libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialogWithDoNotShowAgain_Night_0_en",20210,],
+["libraries.designsystem.components.dialogs_ErrorDialog_Day_0_en","libraries.designsystem.components.dialogs_ErrorDialog_Night_0_en",20210,],
 ["features.messages.impl.timeline.debug_EventDebugInfoView_Day_0_en","features.messages.impl.timeline.debug_EventDebugInfoView_Night_0_en",0,],
 ["libraries.featureflag.ui_FeatureListView_Day_0_en","libraries.featureflag.ui_FeatureListView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_FileItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_FileItemView_Night_0_en",0,],
@@ -386,16 +390,16 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_FloatingActionButton_Floating_Action_Buttons_en","",0,],
 ["libraries.designsystem.atomic.pages_FlowStepPage_Day_0_en","libraries.designsystem.atomic.pages_FlowStepPage_Night_0_en",0,],
 ["features.messages.impl.timeline.focus_FocusRequestStateView_Day_0_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_0_en",0,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20196,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20196,],
-["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20196,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_1_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_1_en",20210,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_2_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_2_en",20210,],
+["features.messages.impl.timeline.focus_FocusRequestStateView_Day_3_en","features.messages.impl.timeline.focus_FocusRequestStateView_Night_3_en",20210,],
 ["features.messages.impl.timeline.components_FocusedEvent_Day_0_en","features.messages.impl.timeline.components_FocusedEvent_Night_0_en",0,],
 ["libraries.textcomposer.components_FormattingOption_Day_0_en","libraries.textcomposer.components_FormattingOption_Night_0_en",0,],
 ["features.messages.impl.forward_ForwardMessagesView_Day_0_en","features.messages.impl.forward_ForwardMessagesView_Night_0_en",0,],
 ["features.messages.impl.forward_ForwardMessagesView_Day_1_en","features.messages.impl.forward_ForwardMessagesView_Night_1_en",0,],
 ["features.messages.impl.forward_ForwardMessagesView_Day_2_en","features.messages.impl.forward_ForwardMessagesView_Night_2_en",0,],
-["features.messages.impl.forward_ForwardMessagesView_Day_3_en","features.messages.impl.forward_ForwardMessagesView_Night_3_en",20196,],
-["features.roomlist.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.roomlist.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20196,],
+["features.messages.impl.forward_ForwardMessagesView_Day_3_en","features.messages.impl.forward_ForwardMessagesView_Night_3_en",20210,],
+["features.roomlist.impl.components_FullScreenIntentPermissionBanner_Day_0_en","features.roomlist.impl.components_FullScreenIntentPermissionBanner_Night_0_en",20210,],
 ["libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButtonCircleShape_Night_0_en",0,],
 ["libraries.designsystem.components.button_GradientFloatingActionButton_Day_0_en","libraries.designsystem.components.button_GradientFloatingActionButton_Night_0_en",0,],
 ["features.messages.impl.timeline.components.group_GroupHeaderView_Day_0_en","features.messages.impl.timeline.components.group_GroupHeaderView_Night_0_en",0,],
@@ -419,8 +423,8 @@ export const screenshots = [
 ["libraries.designsystem.icons_IconsCompound_Day_5_en","libraries.designsystem.icons_IconsCompound_Night_5_en",0,],
 ["libraries.designsystem.icons_IconsOther_Day_0_en","libraries.designsystem.icons_IconsOther_Night_0_en",0,],
 ["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_0_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_0_en",0,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20196,],
-["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20196,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en",20210,],
+["features.messages.impl.crypto.identity_IdentityChangeStateView_Day_2_en","features.messages.impl.crypto.identity_IdentityChangeStateView_Night_2_en",20210,],
 ["libraries.mediaviewer.impl.gallery.ui_ImageItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_ImageItemView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_0_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_0_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_10_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_10_en",0,],
@@ -428,84 +432,84 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_1_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_1_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_2_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_2_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_3_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_3_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20196,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_4_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_4_en",20210,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_5_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_5_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_6_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_6_en",0,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_7_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_7_en",0,],
-["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20196,],
+["libraries.matrix.ui.messages.reply_InReplyToView_Day_8_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_8_en",20210,],
 ["libraries.matrix.ui.messages.reply_InReplyToView_Day_9_en","libraries.matrix.ui.messages.reply_InReplyToView_Night_9_en",0,],
-["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20196,],
-["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20196,],
+["features.call.impl.ui_IncomingCallScreen_Day_0_en","features.call.impl.ui_IncomingCallScreen_Night_0_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_0_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_0_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_10_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_10_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_11_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_11_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_12_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_12_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_13_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_13_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_1_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_1_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_2_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_2_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_3_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_3_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_4_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_4_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_5_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_5_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_6_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_6_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_7_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_7_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_8_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_8_en",20210,],
+["features.verifysession.impl.incoming_IncomingVerificationView_Day_9_en","features.verifysession.impl.incoming_IncomingVerificationView_Night_9_en",20210,],
 ["features.networkmonitor.api.ui_Indicator_Day_0_en","features.networkmonitor.api.ui_Indicator_Night_0_en",0,],
 ["libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en","libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en",0,],
 ["libraries.designsystem.atomic.organisms_InfoListOrganism_Day_0_en","libraries.designsystem.atomic.organisms_InfoListOrganism_Night_0_en",0,],
-["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20196,],
-["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20196,],
+["libraries.matrix.ui.components_InviteSenderView_Day_0_en","libraries.matrix.ui.components_InviteSenderView_Night_0_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_0_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_0_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_1_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_1_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_2_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_2_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_3_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_3_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_4_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_4_en",20210,],
+["features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Day_5_en","features.createroom.impl.joinbyaddress_JoinRoomByAddressView_Night_5_en",20210,],
 ["features.joinroom.impl_JoinRoomView_Day_0_en","features.joinroom.impl_JoinRoomView_Night_0_en",0,],
-["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20196,],
-["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20196,],
-["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20196,],
-["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20196,],
+["features.joinroom.impl_JoinRoomView_Day_10_en","features.joinroom.impl_JoinRoomView_Night_10_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_11_en","features.joinroom.impl_JoinRoomView_Night_11_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_12_en","features.joinroom.impl_JoinRoomView_Night_12_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_13_en","features.joinroom.impl_JoinRoomView_Night_13_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_14_en","features.joinroom.impl_JoinRoomView_Night_14_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_15_en","features.joinroom.impl_JoinRoomView_Night_15_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_16_en","features.joinroom.impl_JoinRoomView_Night_16_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_1_en","features.joinroom.impl_JoinRoomView_Night_1_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_2_en","features.joinroom.impl_JoinRoomView_Night_2_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_3_en","features.joinroom.impl_JoinRoomView_Night_3_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_4_en","features.joinroom.impl_JoinRoomView_Night_4_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_5_en","features.joinroom.impl_JoinRoomView_Night_5_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_6_en","features.joinroom.impl_JoinRoomView_Night_6_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_7_en","features.joinroom.impl_JoinRoomView_Night_7_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_8_en","features.joinroom.impl_JoinRoomView_Night_8_en",20210,],
+["features.joinroom.impl_JoinRoomView_Day_9_en","features.joinroom.impl_JoinRoomView_Night_9_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_0_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_0_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_1_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_1_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_2_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_2_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_3_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_3_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_4_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_4_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_5_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_5_en",20210,],
+["features.knockrequests.impl.banner_KnockRequestsBannerView_Day_6_en","features.knockrequests.impl.banner_KnockRequestsBannerView_Night_6_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_0_en","features.knockrequests.impl.list_KnockRequestsListView_Night_0_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_10_en","features.knockrequests.impl.list_KnockRequestsListView_Night_10_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_1_en","features.knockrequests.impl.list_KnockRequestsListView_Night_1_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_2_en","features.knockrequests.impl.list_KnockRequestsListView_Night_2_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_3_en","features.knockrequests.impl.list_KnockRequestsListView_Night_3_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_4_en","features.knockrequests.impl.list_KnockRequestsListView_Night_4_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_5_en","features.knockrequests.impl.list_KnockRequestsListView_Night_5_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_6_en","features.knockrequests.impl.list_KnockRequestsListView_Night_6_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_7_en","features.knockrequests.impl.list_KnockRequestsListView_Night_7_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_8_en","features.knockrequests.impl.list_KnockRequestsListView_Night_8_en",20210,],
+["features.knockrequests.impl.list_KnockRequestsListView_Day_9_en","features.knockrequests.impl.list_KnockRequestsListView_Night_9_en",20210,],
 ["libraries.designsystem.components_LabelledCheckbox_Toggles_en","",0,],
 ["features.leaveroom.api_LeaveRoomView_Day_0_en","features.leaveroom.api_LeaveRoomView_Night_0_en",0,],
-["features.leaveroom.api_LeaveRoomView_Day_1_en","features.leaveroom.api_LeaveRoomView_Night_1_en",20196,],
-["features.leaveroom.api_LeaveRoomView_Day_2_en","features.leaveroom.api_LeaveRoomView_Night_2_en",20196,],
-["features.leaveroom.api_LeaveRoomView_Day_3_en","features.leaveroom.api_LeaveRoomView_Night_3_en",20196,],
-["features.leaveroom.api_LeaveRoomView_Day_4_en","features.leaveroom.api_LeaveRoomView_Night_4_en",20196,],
-["features.leaveroom.api_LeaveRoomView_Day_5_en","features.leaveroom.api_LeaveRoomView_Night_5_en",20196,],
-["features.leaveroom.api_LeaveRoomView_Day_6_en","features.leaveroom.api_LeaveRoomView_Night_6_en",20196,],
+["features.leaveroom.api_LeaveRoomView_Day_1_en","features.leaveroom.api_LeaveRoomView_Night_1_en",20210,],
+["features.leaveroom.api_LeaveRoomView_Day_2_en","features.leaveroom.api_LeaveRoomView_Night_2_en",20210,],
+["features.leaveroom.api_LeaveRoomView_Day_3_en","features.leaveroom.api_LeaveRoomView_Night_3_en",20210,],
+["features.leaveroom.api_LeaveRoomView_Day_4_en","features.leaveroom.api_LeaveRoomView_Night_4_en",20210,],
+["features.leaveroom.api_LeaveRoomView_Day_5_en","features.leaveroom.api_LeaveRoomView_Night_5_en",20210,],
+["features.leaveroom.api_LeaveRoomView_Day_6_en","features.leaveroom.api_LeaveRoomView_Night_6_en",20210,],
 ["libraries.designsystem.background_LightGradientBackground_Day_0_en","libraries.designsystem.background_LightGradientBackground_Night_0_en",0,],
 ["libraries.designsystem.theme.components_LinearProgressIndicator_Progress_Indicators_en","",0,],
 ["features.messages.impl.link_LinkView_Day_0_en","features.messages.impl.link_LinkView_Night_0_en",0,],
-["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20196,],
+["features.messages.impl.link_LinkView_Day_1_en","features.messages.impl.link_LinkView_Night_1_en",20210,],
 ["libraries.designsystem.components.dialogs_ListDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_ListDialog_Day_0_en","libraries.designsystem.components.dialogs_ListDialog_Night_0_en",0,],
 ["libraries.designsystem.theme.components_ListItemPrimaryActionWithIcon_List_item_-_Primary_action_&_Icon_List_items_en","",0,],
@@ -560,31 +564,31 @@ export const screenshots = [
 ["libraries.designsystem.theme.components_ListSupportingTextSmallPadding_List_supporting_text_-_small_padding_List_sections_en","",0,],
 ["libraries.textcomposer.components_LiveWaveformView_Day_0_en","libraries.textcomposer.components_LiveWaveformView_Night_0_en",0,],
 ["appnav.room.joined_LoadingRoomNodeView_Day_0_en","appnav.room.joined_LoadingRoomNodeView_Night_0_en",0,],
-["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20196,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20196,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20196,],
-["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20196,],
+["appnav.room.joined_LoadingRoomNodeView_Day_1_en","appnav.room.joined_LoadingRoomNodeView_Night_1_en",20210,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_0_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_0_en",20210,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_1_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_1_en",20210,],
+["features.lockscreen.impl.settings_LockScreenSettingsView_Day_2_en","features.lockscreen.impl.settings_LockScreenSettingsView_Night_2_en",20210,],
 ["appnav.loggedin_LoggedInView_Day_0_en","appnav.loggedin_LoggedInView_Night_0_en",0,],
-["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20196,],
-["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20196,],
-["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20196,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20196,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20196,],
-["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20196,],
-["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20196,],
-["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20199,],
-["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20199,],
-["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20196,],
-["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20196,],
-["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20196,],
-["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20196,],
-["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20196,],
-["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20196,],
-["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20196,],
-["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20196,],
-["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20196,],
+["appnav.loggedin_LoggedInView_Day_1_en","appnav.loggedin_LoggedInView_Night_1_en",20210,],
+["appnav.loggedin_LoggedInView_Day_2_en","appnav.loggedin_LoggedInView_Night_2_en",20210,],
+["appnav.loggedin_LoggedInView_Day_3_en","appnav.loggedin_LoggedInView_Night_3_en",20210,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_0_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_0_en",20210,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_1_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_1_en",20210,],
+["features.login.impl.screens.loginpassword_LoginPasswordView_Day_2_en","features.login.impl.screens.loginpassword_LoginPasswordView_Night_2_en",20210,],
+["features.logout.impl_LogoutView_Day_0_en","features.logout.impl_LogoutView_Night_0_en",20210,],
+["features.logout.impl_LogoutView_Day_10_en","features.logout.impl_LogoutView_Night_10_en",20210,],
+["features.logout.impl_LogoutView_Day_11_en","features.logout.impl_LogoutView_Night_11_en",20210,],
+["features.logout.impl_LogoutView_Day_1_en","features.logout.impl_LogoutView_Night_1_en",20210,],
+["features.logout.impl_LogoutView_Day_2_en","features.logout.impl_LogoutView_Night_2_en",20210,],
+["features.logout.impl_LogoutView_Day_3_en","features.logout.impl_LogoutView_Night_3_en",20210,],
+["features.logout.impl_LogoutView_Day_4_en","features.logout.impl_LogoutView_Night_4_en",20210,],
+["features.logout.impl_LogoutView_Day_5_en","features.logout.impl_LogoutView_Night_5_en",20210,],
+["features.logout.impl_LogoutView_Day_6_en","features.logout.impl_LogoutView_Night_6_en",20210,],
+["features.logout.impl_LogoutView_Day_7_en","features.logout.impl_LogoutView_Night_7_en",20210,],
+["features.logout.impl_LogoutView_Day_8_en","features.logout.impl_LogoutView_Night_8_en",20210,],
+["features.logout.impl_LogoutView_Day_9_en","features.logout.impl_LogoutView_Night_9_en",20210,],
 ["libraries.designsystem.components.button_MainActionButton_Buttons_en","",0,],
-["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20196,],
+["libraries.textcomposer_MarkdownTextComposerEdit_Day_0_en","libraries.textcomposer_MarkdownTextComposerEdit_Night_0_en",20210,],
 ["libraries.textcomposer.components.markdown_MarkdownTextInput_Day_0_en","libraries.textcomposer.components.markdown_MarkdownTextInput_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomInfo_Night_0_en",0,],
 ["libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Day_0_en","libraries.designsystem.atomic.atoms_MatrixBadgeAtomNegative_Night_0_en",0,],
@@ -597,22 +601,22 @@ export const screenshots = [
 ["libraries.matrix.ui.components_MatrixUserRow_Day_1_en","libraries.matrix.ui.components_MatrixUserRow_Night_1_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_0_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.audio_MediaAudioView_Day_1_en","libraries.mediaviewer.impl.local.audio_MediaAudioView_Night_1_en",0,],
-["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20196,],
-["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20196,],
+["libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDeleteConfirmationBottomSheet_Night_0_en",20210,],
+["libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Day_0_en","libraries.mediaviewer.impl.details_MediaDetailsBottomSheet_Night_0_en",20210,],
 ["libraries.mediaviewer.impl.local.file_MediaFileView_Day_0_en","libraries.mediaviewer.impl.local.file_MediaFileView_Night_0_en",0,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20196,],
-["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20196,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_0_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_0_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_10_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_10_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_11_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_11_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_12_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_12_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_1_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_1_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_2_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_2_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_3_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_3_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_4_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_4_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_5_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_5_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_6_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_6_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_7_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_7_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_8_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_8_en",20210,],
+["libraries.mediaviewer.impl.gallery_MediaGalleryView_Day_9_en","libraries.mediaviewer.impl.gallery_MediaGalleryView_Night_9_en",20210,],
 ["libraries.mediaviewer.impl.local.image_MediaImageView_Day_0_en","libraries.mediaviewer.impl.local.image_MediaImageView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_0_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Day_1_en","libraries.mediaviewer.impl.local.player_MediaPlayerControllerView_Night_1_en",0,],
@@ -620,14 +624,14 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.video_MediaVideoView_Day_0_en","libraries.mediaviewer.impl.local.video_MediaVideoView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_0_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_10_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20196,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20196,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_11_en","",20210,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_12_en","",20210,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_13_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20196,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_14_en","",20210,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_15_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_16_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_1_en","",0,],
-["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20196,],
+["libraries.mediaviewer.impl.viewer_MediaViewerView_2_en","",20210,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_3_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_4_en","",0,],
 ["libraries.mediaviewer.impl.viewer_MediaViewerView_5_en","",0,],
@@ -639,7 +643,7 @@ export const screenshots = [
 ["libraries.textcomposer.mentions_MentionSpanTheme_Day_0_en","libraries.textcomposer.mentions_MentionSpanTheme_Night_0_en",0,],
 ["libraries.designsystem.theme.components.previews_Menu_Menus_en","",0,],
 ["features.messages.impl.messagecomposer_MessageComposerViewVoice_Day_0_en","features.messages.impl.messagecomposer_MessageComposerViewVoice_Night_0_en",0,],
-["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20196,],
+["features.messages.impl.messagecomposer_MessageComposerView_Day_0_en","features.messages.impl.messagecomposer_MessageComposerView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_0_en","features.messages.impl.timeline.components_MessageEventBubble_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_10_en","features.messages.impl.timeline.components_MessageEventBubble_Night_10_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_11_en","features.messages.impl.timeline.components_MessageEventBubble_Night_11_en",0,],
@@ -656,7 +660,7 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_7_en","features.messages.impl.timeline.components_MessageEventBubble_Night_7_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_8_en","features.messages.impl.timeline.components_MessageEventBubble_Night_8_en",0,],
 ["features.messages.impl.timeline.components_MessageEventBubble_Day_9_en","features.messages.impl.timeline.components_MessageEventBubble_Night_9_en",0,],
-["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20196,],
+["features.messages.impl.timeline.components_MessageShieldView_Day_0_en","features.messages.impl.timeline.components_MessageShieldView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_MessageStateEventContainer_Day_0_en","features.messages.impl.timeline.components_MessageStateEventContainer_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonAdd_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonAdd_Night_0_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButtonExtra_Day_0_en","features.messages.impl.timeline.components_MessagesReactionButtonExtra_Night_0_en",0,],
@@ -664,25 +668,25 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_1_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_1_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_2_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_2_en",0,],
 ["features.messages.impl.timeline.components_MessagesReactionButton_Day_3_en","features.messages.impl.timeline.components_MessagesReactionButton_Night_3_en",0,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20196,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20196,],
-["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20196,],
-["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20196,],
-["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20196,],
-["features.messages.impl_MessagesView_Day_11_en","features.messages.impl_MessagesView_Night_11_en",20196,],
-["features.messages.impl_MessagesView_Day_12_en","features.messages.impl_MessagesView_Night_12_en",20196,],
-["features.messages.impl_MessagesView_Day_13_en","features.messages.impl_MessagesView_Night_13_en",20196,],
-["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20196,],
-["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20196,],
-["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20196,],
-["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20196,],
-["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20196,],
-["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20196,],
-["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20196,],
-["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20196,],
-["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20196,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_0_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_0_en",20210,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en",20210,],
+["features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_2_en","features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_2_en",20210,],
+["features.messages.impl_MessagesView_Day_0_en","features.messages.impl_MessagesView_Night_0_en",20210,],
+["features.messages.impl_MessagesView_Day_10_en","features.messages.impl_MessagesView_Night_10_en",20210,],
+["features.messages.impl_MessagesView_Day_11_en","features.messages.impl_MessagesView_Night_11_en",20210,],
+["features.messages.impl_MessagesView_Day_12_en","features.messages.impl_MessagesView_Night_12_en",20210,],
+["features.messages.impl_MessagesView_Day_13_en","features.messages.impl_MessagesView_Night_13_en",20210,],
+["features.messages.impl_MessagesView_Day_1_en","features.messages.impl_MessagesView_Night_1_en",20210,],
+["features.messages.impl_MessagesView_Day_2_en","features.messages.impl_MessagesView_Night_2_en",20210,],
+["features.messages.impl_MessagesView_Day_3_en","features.messages.impl_MessagesView_Night_3_en",20210,],
+["features.messages.impl_MessagesView_Day_4_en","features.messages.impl_MessagesView_Night_4_en",20210,],
+["features.messages.impl_MessagesView_Day_5_en","features.messages.impl_MessagesView_Night_5_en",20210,],
+["features.messages.impl_MessagesView_Day_6_en","features.messages.impl_MessagesView_Night_6_en",20210,],
+["features.messages.impl_MessagesView_Day_7_en","features.messages.impl_MessagesView_Night_7_en",20210,],
+["features.messages.impl_MessagesView_Day_8_en","features.messages.impl_MessagesView_Night_8_en",20210,],
+["features.messages.impl_MessagesView_Day_9_en","features.messages.impl_MessagesView_Night_9_en",20210,],
 ["features.migration.impl_MigrationView_Day_0_en","features.migration.impl_MigrationView_Night_0_en",0,],
-["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20196,],
+["features.migration.impl_MigrationView_Day_1_en","features.migration.impl_MigrationView_Night_1_en",20210,],
 ["libraries.designsystem.theme.components_ModalBottomSheetDark_Bottom_Sheets_en","",0,],
 ["libraries.designsystem.theme.components_ModalBottomSheetLight_Bottom_Sheets_en","",0,],
 ["appicon.element_MonochromeIcon_en","",0,],
@@ -691,29 +695,29 @@ export const screenshots = [
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelectedTrailingContent_Multiple_selection_List_item_-_selection_in_trailing_content_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItemSelected_Multiple_selection_List_item_-_selection_in_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_MutipleSelectionListItem_Multiple_selection_List_item_-_no_selection_List_items_en","",0,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20196,],
-["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20196,],
-["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20196,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_0_en","features.preferences.impl.notifications_NotificationSettingsView_Night_0_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_10_en","features.preferences.impl.notifications_NotificationSettingsView_Night_10_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_11_en","features.preferences.impl.notifications_NotificationSettingsView_Night_11_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_12_en","features.preferences.impl.notifications_NotificationSettingsView_Night_12_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_13_en","features.preferences.impl.notifications_NotificationSettingsView_Night_13_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_1_en","features.preferences.impl.notifications_NotificationSettingsView_Night_1_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_2_en","features.preferences.impl.notifications_NotificationSettingsView_Night_2_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_3_en","features.preferences.impl.notifications_NotificationSettingsView_Night_3_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_4_en","features.preferences.impl.notifications_NotificationSettingsView_Night_4_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_5_en","features.preferences.impl.notifications_NotificationSettingsView_Night_5_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_6_en","features.preferences.impl.notifications_NotificationSettingsView_Night_6_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_7_en","features.preferences.impl.notifications_NotificationSettingsView_Night_7_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_8_en","features.preferences.impl.notifications_NotificationSettingsView_Night_8_en",20210,],
+["features.preferences.impl.notifications_NotificationSettingsView_Day_9_en","features.preferences.impl.notifications_NotificationSettingsView_Night_9_en",20210,],
+["features.ftue.impl.notifications_NotificationsOptInView_Day_0_en","features.ftue.impl.notifications_NotificationsOptInView_Night_0_en",20210,],
 ["libraries.oidc.impl.webview_OidcView_Day_0_en","libraries.oidc.impl.webview_OidcView_Night_0_en",0,],
 ["libraries.oidc.impl.webview_OidcView_Day_1_en","libraries.oidc.impl.webview_OidcView_Night_1_en",0,],
 ["libraries.designsystem.atomic.pages_OnBoardingPage_Day_0_en","libraries.designsystem.atomic.pages_OnBoardingPage_Night_0_en",0,],
-["features.onboarding.impl_OnBoardingView_Day_0_en","features.onboarding.impl_OnBoardingView_Night_0_en",20196,],
-["features.onboarding.impl_OnBoardingView_Day_1_en","features.onboarding.impl_OnBoardingView_Night_1_en",20196,],
-["features.onboarding.impl_OnBoardingView_Day_2_en","features.onboarding.impl_OnBoardingView_Night_2_en",20196,],
-["features.onboarding.impl_OnBoardingView_Day_3_en","features.onboarding.impl_OnBoardingView_Night_3_en",20196,],
-["features.onboarding.impl_OnBoardingView_Day_4_en","features.onboarding.impl_OnBoardingView_Night_4_en",20196,],
+["features.onboarding.impl_OnBoardingView_Day_0_en","features.onboarding.impl_OnBoardingView_Night_0_en",20210,],
+["features.onboarding.impl_OnBoardingView_Day_1_en","features.onboarding.impl_OnBoardingView_Night_1_en",20210,],
+["features.onboarding.impl_OnBoardingView_Day_2_en","features.onboarding.impl_OnBoardingView_Night_2_en",20210,],
+["features.onboarding.impl_OnBoardingView_Day_3_en","features.onboarding.impl_OnBoardingView_Night_3_en",20210,],
+["features.onboarding.impl_OnBoardingView_Day_4_en","features.onboarding.impl_OnBoardingView_Night_4_en",20210,],
 ["libraries.designsystem.background_OnboardingBackground_Day_0_en","libraries.designsystem.background_OnboardingBackground_Night_0_en",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_OutlinedButtonLarge_Buttons_en","",0,],
@@ -728,65 +732,65 @@ export const screenshots = [
 ["libraries.designsystem.components_PageTitleWithIconFull_Day_5_en","libraries.designsystem.components_PageTitleWithIconFull_Night_5_en",0,],
 ["libraries.designsystem.components_PageTitleWithIconFull_Day_6_en","libraries.designsystem.components_PageTitleWithIconFull_Night_6_en",0,],
 ["libraries.designsystem.components_PageTitleWithIconMinimal_Day_0_en","libraries.designsystem.components_PageTitleWithIconMinimal_Night_0_en",0,],
-["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions.changeroles_PendingMemberRowWithLongName_Day_0_en","features.roomdetails.impl.rolesandpermissions.changeroles_PendingMemberRowWithLongName_Night_0_en",20196,],
-["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20196,],
-["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20196,],
-["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20196,],
-["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20196,],
+["libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Day_0_en","libraries.mediaviewer.impl.local.pdf_PdfPagesErrorView_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions.changeroles_PendingMemberRowWithLongName_Day_0_en","features.roomdetails.impl.rolesandpermissions.changeroles_PendingMemberRowWithLongName_Night_0_en",20210,],
+["libraries.permissions.api_PermissionsView_Day_0_en","libraries.permissions.api_PermissionsView_Night_0_en",20210,],
+["libraries.permissions.api_PermissionsView_Day_1_en","libraries.permissions.api_PermissionsView_Night_1_en",20210,],
+["libraries.permissions.api_PermissionsView_Day_2_en","libraries.permissions.api_PermissionsView_Night_2_en",20210,],
+["libraries.permissions.api_PermissionsView_Day_3_en","libraries.permissions.api_PermissionsView_Night_3_en",20210,],
 ["features.lockscreen.impl.components_PinEntryTextField_Day_0_en","features.lockscreen.impl.components_PinEntryTextField_Night_0_en",0,],
 ["libraries.designsystem.components_PinIcon_Day_0_en","libraries.designsystem.components_PinIcon_Night_0_en",0,],
 ["features.lockscreen.impl.unlock.keypad_PinKeypad_Day_0_en","features.lockscreen.impl.unlock.keypad_PinKeypad_Night_0_en",0,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20196,],
-["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20196,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_0_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_0_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_1_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_1_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_2_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_2_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_3_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_3_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_4_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_4_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_5_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_5_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_6_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_6_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockViewInApp_Day_7_en","features.lockscreen.impl.unlock_PinUnlockViewInApp_Night_7_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_0_en","features.lockscreen.impl.unlock_PinUnlockView_Night_0_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_1_en","features.lockscreen.impl.unlock_PinUnlockView_Night_1_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_2_en","features.lockscreen.impl.unlock_PinUnlockView_Night_2_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_3_en","features.lockscreen.impl.unlock_PinUnlockView_Night_3_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_4_en","features.lockscreen.impl.unlock_PinUnlockView_Night_4_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_5_en","features.lockscreen.impl.unlock_PinUnlockView_Night_5_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_6_en","features.lockscreen.impl.unlock_PinUnlockView_Night_6_en",20210,],
+["features.lockscreen.impl.unlock_PinUnlockView_Day_7_en","features.lockscreen.impl.unlock_PinUnlockView_Night_7_en",20210,],
 ["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_0_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_0_en",0,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20196,],
-["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20196,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20196,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20196,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20196,],
-["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20196,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_10_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_10_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_1_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_1_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_2_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_2_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_3_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_3_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_4_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_4_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_5_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_5_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_6_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_6_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_7_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_7_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_8_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_8_en",20210,],
+["features.messages.impl.pinned.banner_PinnedMessagesBannerView_Day_9_en","features.messages.impl.pinned.banner_PinnedMessagesBannerView_Night_9_en",20210,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_0_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_0_en",20210,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_1_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_1_en",20210,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_2_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_2_en",20210,],
+["features.messages.impl.pinned.list_PinnedMessagesListView_Day_3_en","features.messages.impl.pinned.list_PinnedMessagesListView_Night_3_en",20210,],
 ["libraries.designsystem.atomic.atoms_PlaceholderAtom_Day_0_en","libraries.designsystem.atomic.atoms_PlaceholderAtom_Night_0_en",0,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20196,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedNotSelected_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewDisclosedSelected_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollAnswerViewEndedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedSelected_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerNotSelected_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewEndedWinnerSelected_Night_0_en",20210,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedNotSelected_Night_0_en",0,],
 ["features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Day_0_en","features.poll.api.pollcontent_PollAnswerViewUndisclosedSelected_Night_0_en",0,],
-["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20196,],
-["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20196,],
-["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20196,],
-["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20196,],
-["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20196,],
-["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20196,],
-["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20196,],
+["features.poll.api.pollcontent_PollContentViewCreatorEditable_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEditable_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollContentViewCreatorEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewCreatorEnded_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollContentViewCreator_Day_0_en","features.poll.api.pollcontent_PollContentViewCreator_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollContentViewDisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewDisclosed_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollContentViewEnded_Day_0_en","features.poll.api.pollcontent_PollContentViewEnded_Night_0_en",20210,],
+["features.poll.api.pollcontent_PollContentViewUndisclosed_Day_0_en","features.poll.api.pollcontent_PollContentViewUndisclosed_Night_0_en",20210,],
+["features.poll.impl.history_PollHistoryView_Day_0_en","features.poll.impl.history_PollHistoryView_Night_0_en",20210,],
+["features.poll.impl.history_PollHistoryView_Day_1_en","features.poll.impl.history_PollHistoryView_Night_1_en",20210,],
+["features.poll.impl.history_PollHistoryView_Day_2_en","features.poll.impl.history_PollHistoryView_Night_2_en",20210,],
+["features.poll.impl.history_PollHistoryView_Day_3_en","features.poll.impl.history_PollHistoryView_Night_3_en",20210,],
+["features.poll.impl.history_PollHistoryView_Day_4_en","features.poll.impl.history_PollHistoryView_Night_4_en",20210,],
 ["features.poll.api.pollcontent_PollTitleView_Day_0_en","features.poll.api.pollcontent_PollTitleView_Night_0_en",0,],
 ["libraries.designsystem.components.preferences_PreferenceCategory_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceCheckbox_Preferences_en","",0,],
@@ -800,211 +804,217 @@ export const screenshots = [
 ["libraries.designsystem.components.preferences_PreferenceRow_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSlide_Preferences_en","",0,],
 ["libraries.designsystem.components.preferences_PreferenceSwitch_Preferences_en","",0,],
-["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20196,],
-["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20196,],
-["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20196,],
-["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20196,],
+["features.preferences.impl.root_PreferencesRootViewDark_0_en","",20210,],
+["features.preferences.impl.root_PreferencesRootViewDark_1_en","",20210,],
+["features.preferences.impl.root_PreferencesRootViewLight_0_en","",20210,],
+["features.preferences.impl.root_PreferencesRootViewLight_1_en","",20210,],
 ["features.messages.impl.timeline.components.event_ProgressButton_Day_0_en","features.messages.impl.timeline.components.event_ProgressButton_Night_0_en",0,],
-["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20196,],
-["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20196,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20196,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20196,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20196,],
-["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20196,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20199,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20199,],
-["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20199,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20196,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20196,],
-["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20196,],
-["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20196,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20196,],
-["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20196,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20196,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20196,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20196,],
-["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20196,],
+["libraries.designsystem.components_ProgressDialogContent_Dialogs_en","",20210,],
+["libraries.designsystem.components_ProgressDialog_Day_0_en","libraries.designsystem.components_ProgressDialog_Night_0_en",20210,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_0_en","features.messages.impl.timeline.protection_ProtectedView_Night_0_en",20210,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_1_en","features.messages.impl.timeline.protection_ProtectedView_Night_1_en",20210,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_2_en","features.messages.impl.timeline.protection_ProtectedView_Night_2_en",20210,],
+["features.messages.impl.timeline.protection_ProtectedView_Day_3_en","features.messages.impl.timeline.protection_ProtectedView_Night_3_en",20210,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_0_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_0_en",20210,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_1_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_1_en",20210,],
+["libraries.troubleshoot.impl.history_PushHistoryView_Day_2_en","libraries.troubleshoot.impl.history_PushHistoryView_Night_2_en",20210,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_0_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_0_en",20210,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_1_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_1_en",20210,],
+["features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Day_2_en","features.login.impl.screens.qrcode.confirmation_QrCodeConfirmationView_Night_2_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_0_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_0_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_1_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_1_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_2_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_2_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_3_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_3_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_4_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_4_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_5_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_5_en",20210,],
+["features.login.impl.screens.qrcode.error_QrCodeErrorView_Day_6_en","features.login.impl.screens.qrcode.error_QrCodeErrorView_Night_6_en",20210,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_0_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_0_en",20210,],
+["features.login.impl.screens.qrcode.intro_QrCodeIntroView_Day_1_en","features.login.impl.screens.qrcode.intro_QrCodeIntroView_Night_1_en",20210,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_0_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_0_en",20210,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_1_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_1_en",20210,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_2_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_2_en",20210,],
+["features.login.impl.screens.qrcode.scan_QrCodeScanView_Day_3_en","features.login.impl.screens.qrcode.scan_QrCodeScanView_Night_3_en",20210,],
 ["libraries.designsystem.theme.components_RadioButton_Toggles_en","",0,],
-["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20196,],
-["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20196,],
+["features.rageshake.api.detection_RageshakeDialogContent_Day_0_en","features.rageshake.api.detection_RageshakeDialogContent_Night_0_en",20210,],
+["features.rageshake.api.preferences_RageshakePreferencesView_Day_0_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_0_en",20210,],
 ["features.rageshake.api.preferences_RageshakePreferencesView_Day_1_en","features.rageshake.api.preferences_RageshakePreferencesView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Day_0_en","features.messages.impl.timeline.components.reactionsummary_ReactionSummaryViewContent_Night_0_en",0,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20196,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20196,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20196,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20196,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20196,],
-["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20196,],
-["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20196,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_0_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_0_en",20210,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_1_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_1_en",20210,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_2_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_2_en",20210,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_3_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_3_en",20210,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_4_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_4_en",20210,],
+["features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Day_5_en","features.messages.impl.timeline.components.receipt.bottomsheet_ReadReceiptBottomSheet_Night_5_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_0_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_0_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_10_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_10_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_11_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_11_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_12_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_12_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_13_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_13_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_1_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_1_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_2_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_2_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_3_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_3_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_4_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_4_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_5_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_5_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_6_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_6_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_7_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_7_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_8_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_8_en",20210,],
+["features.securebackup.impl.setup.views_RecoveryKeyView_Day_9_en","features.securebackup.impl.setup.views_RecoveryKeyView_Night_9_en",20210,],
 ["libraries.designsystem.atomic.atoms_RedIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_RedIndicatorAtom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_ReplySwipeIndicator_Day_0_en","features.messages.impl.timeline.components_ReplySwipeIndicator_Night_0_en",0,],
-["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20196,],
-["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20196,],
-["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20196,],
-["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20196,],
-["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20196,],
-["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20196,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20196,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20196,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20196,],
-["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20196,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20196,],
-["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20196,],
+["features.messages.impl.report_ReportMessageView_Day_0_en","features.messages.impl.report_ReportMessageView_Night_0_en",20210,],
+["features.messages.impl.report_ReportMessageView_Day_1_en","features.messages.impl.report_ReportMessageView_Night_1_en",20210,],
+["features.messages.impl.report_ReportMessageView_Day_2_en","features.messages.impl.report_ReportMessageView_Night_2_en",20210,],
+["features.messages.impl.report_ReportMessageView_Day_3_en","features.messages.impl.report_ReportMessageView_Night_3_en",20210,],
+["features.messages.impl.report_ReportMessageView_Day_4_en","features.messages.impl.report_ReportMessageView_Night_4_en",20210,],
+["features.messages.impl.report_ReportMessageView_Day_5_en","features.messages.impl.report_ReportMessageView_Night_5_en",20210,],
+["features.reportroom.impl_ReportRoomView_Day_0_en","features.reportroom.impl_ReportRoomView_Night_0_en",20213,],
+["features.reportroom.impl_ReportRoomView_Day_1_en","features.reportroom.impl_ReportRoomView_Night_1_en",20213,],
+["features.reportroom.impl_ReportRoomView_Day_2_en","features.reportroom.impl_ReportRoomView_Night_2_en",20213,],
+["features.reportroom.impl_ReportRoomView_Day_3_en","features.reportroom.impl_ReportRoomView_Night_3_en",20213,],
+["features.reportroom.impl_ReportRoomView_Day_4_en","features.reportroom.impl_ReportRoomView_Night_4_en",20213,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_0_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_0_en",20210,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_1_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_1_en",20210,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_2_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_2_en",20210,],
+["features.securebackup.impl.reset.password_ResetIdentityPasswordView_Day_3_en","features.securebackup.impl.reset.password_ResetIdentityPasswordView_Night_3_en",20210,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_0_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_0_en",20210,],
+["features.securebackup.impl.reset.root_ResetIdentityRootView_Day_1_en","features.securebackup.impl.reset.root_ResetIdentityRootView_Night_1_en",20210,],
 ["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_0_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_0_en",0,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20196,],
-["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20196,],
-["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20196,],
-["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en",20196,],
-["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en",20196,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_1_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_1_en",20210,],
+["features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Day_2_en","features.messages.impl.crypto.sendfailure.resolve_ResolveVerifiedUserSendFailureView_Night_2_en",20210,],
+["libraries.designsystem.components.dialogs_RetryDialogContent_Dialogs_en","",20210,],
+["libraries.designsystem.components.dialogs_RetryDialog_Day_0_en","libraries.designsystem.components.dialogs_RetryDialog_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_0_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_0_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_1_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_1_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_2_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_2_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_3_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_3_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_4_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_4_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_5_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_5_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_6_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_6_en",20210,],
+["features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Day_7_en","features.roomdetails.impl.rolesandpermissions_RolesAndPermissionsView_Night_7_en",20210,],
 ["libraries.matrix.ui.room.address_RoomAddressField_Day_0_en","libraries.matrix.ui.room.address_RoomAddressField_Night_0_en",0,],
 ["features.roomaliasresolver.impl_RoomAliasResolverView_Day_0_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_0_en",0,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20196,],
-["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20196,],
-["features.roomdetails.impl_RoomDetailsDark_0_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_10_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_11_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_12_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_13_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_14_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_15_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_16_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_17_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_18_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_1_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_2_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_3_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_4_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_5_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_6_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_7_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_8_en","",20196,],
-["features.roomdetails.impl_RoomDetailsDark_9_en","",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20196,],
-["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20196,],
-["features.roomdetails.impl_RoomDetails_0_en","",20196,],
-["features.roomdetails.impl_RoomDetails_10_en","",20196,],
-["features.roomdetails.impl_RoomDetails_11_en","",20196,],
-["features.roomdetails.impl_RoomDetails_12_en","",20196,],
-["features.roomdetails.impl_RoomDetails_13_en","",20196,],
-["features.roomdetails.impl_RoomDetails_14_en","",20196,],
-["features.roomdetails.impl_RoomDetails_15_en","",20196,],
-["features.roomdetails.impl_RoomDetails_16_en","",20196,],
-["features.roomdetails.impl_RoomDetails_17_en","",20196,],
-["features.roomdetails.impl_RoomDetails_18_en","",20196,],
-["features.roomdetails.impl_RoomDetails_1_en","",20196,],
-["features.roomdetails.impl_RoomDetails_2_en","",20196,],
-["features.roomdetails.impl_RoomDetails_3_en","",20196,],
-["features.roomdetails.impl_RoomDetails_4_en","",20196,],
-["features.roomdetails.impl_RoomDetails_5_en","",20196,],
-["features.roomdetails.impl_RoomDetails_6_en","",20196,],
-["features.roomdetails.impl_RoomDetails_7_en","",20196,],
-["features.roomdetails.impl_RoomDetails_8_en","",20196,],
-["features.roomdetails.impl_RoomDetails_9_en","",20196,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20196,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20196,],
-["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_4_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_4_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_5_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_5_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_6_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_6_en",20196,],
-["features.roomdetails.impl.invite_RoomInviteMembersView_Day_7_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_7_en",20196,],
-["features.roomlist.impl.components_RoomListContentView_Day_0_en","features.roomlist.impl.components_RoomListContentView_Night_0_en",20196,],
-["features.roomlist.impl.components_RoomListContentView_Day_1_en","features.roomlist.impl.components_RoomListContentView_Night_1_en",20196,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_1_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_1_en",20210,],
+["features.roomaliasresolver.impl_RoomAliasResolverView_Day_2_en","features.roomaliasresolver.impl_RoomAliasResolverView_Night_2_en",20210,],
+["features.roomdetails.impl_RoomDetailsDark_0_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_10_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_11_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_12_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_13_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_14_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_15_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_16_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_17_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_18_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_1_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_2_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_3_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_4_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_5_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_6_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_7_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_8_en","",20210,],
+["features.roomdetails.impl_RoomDetailsDark_9_en","",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_0_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_0_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_1_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_1_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_2_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_2_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_3_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_3_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_4_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_4_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_5_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_5_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_6_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_6_en",20210,],
+["features.roomdetails.impl.edit_RoomDetailsEditView_Day_7_en","features.roomdetails.impl.edit_RoomDetailsEditView_Night_7_en",20210,],
+["features.roomdetails.impl_RoomDetails_0_en","",20210,],
+["features.roomdetails.impl_RoomDetails_10_en","",20210,],
+["features.roomdetails.impl_RoomDetails_11_en","",20210,],
+["features.roomdetails.impl_RoomDetails_12_en","",20210,],
+["features.roomdetails.impl_RoomDetails_13_en","",20210,],
+["features.roomdetails.impl_RoomDetails_14_en","",20210,],
+["features.roomdetails.impl_RoomDetails_15_en","",20210,],
+["features.roomdetails.impl_RoomDetails_16_en","",20210,],
+["features.roomdetails.impl_RoomDetails_17_en","",20210,],
+["features.roomdetails.impl_RoomDetails_18_en","",20210,],
+["features.roomdetails.impl_RoomDetails_1_en","",20210,],
+["features.roomdetails.impl_RoomDetails_2_en","",20210,],
+["features.roomdetails.impl_RoomDetails_3_en","",20210,],
+["features.roomdetails.impl_RoomDetails_4_en","",20210,],
+["features.roomdetails.impl_RoomDetails_5_en","",20210,],
+["features.roomdetails.impl_RoomDetails_6_en","",20210,],
+["features.roomdetails.impl_RoomDetails_7_en","",20210,],
+["features.roomdetails.impl_RoomDetails_8_en","",20210,],
+["features.roomdetails.impl_RoomDetails_9_en","",20210,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_0_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_0_en",20210,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_1_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_1_en",20210,],
+["features.roomdirectory.impl.root_RoomDirectoryView_Day_2_en","features.roomdirectory.impl.root_RoomDirectoryView_Night_2_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_0_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_0_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_1_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_1_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_2_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_2_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_3_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_3_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_4_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_4_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_5_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_5_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_6_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_6_en",20210,],
+["features.roomdetails.impl.invite_RoomInviteMembersView_Day_7_en","features.roomdetails.impl.invite_RoomInviteMembersView_Night_7_en",20210,],
+["features.roomlist.impl.components_RoomListContentView_Day_0_en","features.roomlist.impl.components_RoomListContentView_Night_0_en",20210,],
+["features.roomlist.impl.components_RoomListContentView_Day_1_en","features.roomlist.impl.components_RoomListContentView_Night_1_en",20210,],
 ["features.roomlist.impl.components_RoomListContentView_Day_2_en","features.roomlist.impl.components_RoomListContentView_Night_2_en",0,],
-["features.roomlist.impl.components_RoomListContentView_Day_3_en","features.roomlist.impl.components_RoomListContentView_Night_3_en",20196,],
-["features.roomlist.impl.components_RoomListContentView_Day_4_en","features.roomlist.impl.components_RoomListContentView_Night_4_en",20196,],
-["features.roomlist.impl.filters_RoomListFiltersView_Day_0_en","features.roomlist.impl.filters_RoomListFiltersView_Night_0_en",20196,],
-["features.roomlist.impl.filters_RoomListFiltersView_Day_1_en","features.roomlist.impl.filters_RoomListFiltersView_Night_1_en",20196,],
-["features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en",20196,],
-["features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en",20196,],
-["features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en",20196,],
+["features.roomlist.impl.components_RoomListContentView_Day_3_en","features.roomlist.impl.components_RoomListContentView_Night_3_en",20210,],
+["features.roomlist.impl.components_RoomListContentView_Day_4_en","features.roomlist.impl.components_RoomListContentView_Night_4_en",20210,],
+["features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_en","features.roomlist.impl_RoomListDeclineInviteMenuContent_Night_0_en",20213,],
+["features.roomlist.impl.filters_RoomListFiltersView_Day_0_en","features.roomlist.impl.filters_RoomListFiltersView_Night_0_en",20210,],
+["features.roomlist.impl.filters_RoomListFiltersView_Day_1_en","features.roomlist.impl.filters_RoomListFiltersView_Night_1_en",20210,],
+["features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en",20210,],
+["features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en",20210,],
+["features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en","features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en",20210,],
 ["features.roomlist.impl.search_RoomListSearchContent_Day_0_en","features.roomlist.impl.search_RoomListSearchContent_Night_0_en",0,],
-["features.roomlist.impl.search_RoomListSearchContent_Day_1_en","features.roomlist.impl.search_RoomListSearchContent_Night_1_en",20196,],
-["features.roomlist.impl_RoomListView_Day_0_en","features.roomlist.impl_RoomListView_Night_0_en",20196,],
-["features.roomlist.impl_RoomListView_Day_10_en","features.roomlist.impl_RoomListView_Night_10_en",20196,],
-["features.roomlist.impl_RoomListView_Day_1_en","features.roomlist.impl_RoomListView_Night_1_en",20196,],
-["features.roomlist.impl_RoomListView_Day_2_en","features.roomlist.impl_RoomListView_Night_2_en",20196,],
-["features.roomlist.impl_RoomListView_Day_3_en","features.roomlist.impl_RoomListView_Night_3_en",20196,],
-["features.roomlist.impl_RoomListView_Day_4_en","features.roomlist.impl_RoomListView_Night_4_en",20196,],
-["features.roomlist.impl_RoomListView_Day_5_en","features.roomlist.impl_RoomListView_Night_5_en",20196,],
-["features.roomlist.impl_RoomListView_Day_6_en","features.roomlist.impl_RoomListView_Night_6_en",20196,],
-["features.roomlist.impl_RoomListView_Day_7_en","features.roomlist.impl_RoomListView_Night_7_en",20196,],
+["features.roomlist.impl.search_RoomListSearchContent_Day_1_en","features.roomlist.impl.search_RoomListSearchContent_Night_1_en",20210,],
+["features.roomlist.impl_RoomListView_Day_0_en","features.roomlist.impl_RoomListView_Night_0_en",20210,],
+["features.roomlist.impl_RoomListView_Day_10_en","features.roomlist.impl_RoomListView_Night_10_en",20210,],
+["features.roomlist.impl_RoomListView_Day_1_en","features.roomlist.impl_RoomListView_Night_1_en",20210,],
+["features.roomlist.impl_RoomListView_Day_2_en","features.roomlist.impl_RoomListView_Night_2_en",20210,],
+["features.roomlist.impl_RoomListView_Day_3_en","features.roomlist.impl_RoomListView_Night_3_en",20210,],
+["features.roomlist.impl_RoomListView_Day_4_en","features.roomlist.impl_RoomListView_Night_4_en",20210,],
+["features.roomlist.impl_RoomListView_Day_5_en","features.roomlist.impl_RoomListView_Night_5_en",20210,],
+["features.roomlist.impl_RoomListView_Day_6_en","features.roomlist.impl_RoomListView_Night_6_en",20210,],
+["features.roomlist.impl_RoomListView_Day_7_en","features.roomlist.impl_RoomListView_Night_7_en",20210,],
 ["features.roomlist.impl_RoomListView_Day_8_en","features.roomlist.impl_RoomListView_Night_8_en",0,],
 ["features.roomlist.impl_RoomListView_Day_9_en","features.roomlist.impl_RoomListView_Night_9_en",0,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20196,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_0_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_0_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_1_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_1_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListViewBanned_Day_2_en","features.roomdetails.impl.members_RoomMemberListViewBanned_Night_2_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_0_en","features.roomdetails.impl.members_RoomMemberListView_Night_0_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_1_en","features.roomdetails.impl.members_RoomMemberListView_Night_1_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_2_en","features.roomdetails.impl.members_RoomMemberListView_Night_2_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_3_en","features.roomdetails.impl.members_RoomMemberListView_Night_3_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_4_en","features.roomdetails.impl.members_RoomMemberListView_Night_4_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_5_en","features.roomdetails.impl.members_RoomMemberListView_Night_5_en",20210,],
 ["features.roomdetails.impl.members_RoomMemberListView_Day_6_en","features.roomdetails.impl.members_RoomMemberListView_Night_6_en",0,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20196,],
-["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20196,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_7_en","features.roomdetails.impl.members_RoomMemberListView_Night_7_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_8_en","features.roomdetails.impl.members_RoomMemberListView_Night_8_en",20210,],
+["features.roomdetails.impl.members_RoomMemberListView_Day_9_en","features.roomdetails.impl.members_RoomMemberListView_Night_9_en",20210,],
 ["libraries.designsystem.atomic.molecules_RoomMembersCountMolecule_Day_0_en","libraries.designsystem.atomic.molecules_RoomMembersCountMolecule_Night_0_en",0,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_0_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_0_en",20196,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_0_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_0_en",20210,],
 ["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_10_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_10_en",0,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_1_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_1_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_2_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_2_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_3_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_3_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_4_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_4_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_5_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_5_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_6_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_6_en",20196,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_1_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_1_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_2_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_2_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_3_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_3_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_4_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_4_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_5_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_5_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_6_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_6_en",20210,],
 ["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_7_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_7_en",0,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_8_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_8_en",20196,],
-["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_9_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_9_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20196,],
-["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20196,],
-["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20196,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_8_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_8_en",20210,],
+["features.roomdetails.impl.members.moderation_RoomMembersModerationView_Day_9_en","features.roomdetails.impl.members.moderation_RoomMembersModerationView_Night_9_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_0_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_1_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_1_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_2_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_2_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_3_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_3_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_4_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_4_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_5_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_5_en",20210,],
+["features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Day_6_en","features.roomdetails.impl.notificationsettings_RoomNotificationSettingsView_Night_6_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_0_en","libraries.roomselect.impl_RoomSelectView_Night_0_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_1_en","libraries.roomselect.impl_RoomSelectView_Night_1_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_2_en","libraries.roomselect.impl_RoomSelectView_Night_2_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_3_en","libraries.roomselect.impl_RoomSelectView_Night_3_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_4_en","libraries.roomselect.impl_RoomSelectView_Night_4_en",20210,],
+["libraries.roomselect.impl_RoomSelectView_Day_5_en","libraries.roomselect.impl_RoomSelectView_Night_5_en",20210,],
 ["features.roomlist.impl.components_RoomSummaryPlaceholderRow_Day_0_en","features.roomlist.impl.components_RoomSummaryPlaceholderRow_Night_0_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_0_en","features.roomlist.impl.components_RoomSummaryRow_Night_0_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_10_en","features.roomlist.impl.components_RoomSummaryRow_Night_10_en",0,],
@@ -1027,12 +1037,12 @@ export const screenshots = [
 ["features.roomlist.impl.components_RoomSummaryRow_Day_26_en","features.roomlist.impl.components_RoomSummaryRow_Night_26_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_27_en","features.roomlist.impl.components_RoomSummaryRow_Night_27_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_28_en","features.roomlist.impl.components_RoomSummaryRow_Night_28_en",0,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_29_en","features.roomlist.impl.components_RoomSummaryRow_Night_29_en",20196,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_2_en","features.roomlist.impl.components_RoomSummaryRow_Night_2_en",20196,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_30_en","features.roomlist.impl.components_RoomSummaryRow_Night_30_en",20196,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_31_en","features.roomlist.impl.components_RoomSummaryRow_Night_31_en",20196,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_32_en","features.roomlist.impl.components_RoomSummaryRow_Night_32_en",20196,],
-["features.roomlist.impl.components_RoomSummaryRow_Day_33_en","features.roomlist.impl.components_RoomSummaryRow_Night_33_en",20196,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_29_en","features.roomlist.impl.components_RoomSummaryRow_Night_29_en",20210,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_2_en","features.roomlist.impl.components_RoomSummaryRow_Night_2_en",20210,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_30_en","features.roomlist.impl.components_RoomSummaryRow_Night_30_en",20210,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_31_en","features.roomlist.impl.components_RoomSummaryRow_Night_31_en",20210,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_32_en","features.roomlist.impl.components_RoomSummaryRow_Night_32_en",20210,],
+["features.roomlist.impl.components_RoomSummaryRow_Day_33_en","features.roomlist.impl.components_RoomSummaryRow_Night_33_en",20210,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_3_en","features.roomlist.impl.components_RoomSummaryRow_Night_3_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_4_en","features.roomlist.impl.components_RoomSummaryRow_Night_4_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_5_en","features.roomlist.impl.components_RoomSummaryRow_Night_5_en",0,],
@@ -1040,77 +1050,77 @@ export const screenshots = [
 ["features.roomlist.impl.components_RoomSummaryRow_Day_7_en","features.roomlist.impl.components_RoomSummaryRow_Night_7_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_8_en","features.roomlist.impl.components_RoomSummaryRow_Night_8_en",0,],
 ["features.roomlist.impl.components_RoomSummaryRow_Day_9_en","features.roomlist.impl.components_RoomSummaryRow_Night_9_en",0,],
-["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20196,],
-["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20196,],
-["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20196,],
+["appnav.root_RootView_Day_0_en","appnav.root_RootView_Night_0_en",20210,],
+["appnav.root_RootView_Day_1_en","appnav.root_RootView_Night_1_en",20210,],
+["appnav.root_RootView_Day_2_en","appnav.root_RootView_Night_2_en",20210,],
 ["appicon.enterprise_RoundIcon_en","",0,],
 ["appicon.element_RoundIcon_en","",0,],
 ["libraries.designsystem.atomic.atoms_RoundedIconAtom_Day_0_en","libraries.designsystem.atomic.atoms_RoundedIconAtom_Night_0_en",0,],
-["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20196,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20196,],
-["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20196,],
+["features.verifysession.impl.emoji_SasEmojis_Day_0_en","features.verifysession.impl.emoji_SasEmojis_Night_0_en",20210,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_0_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_0_en",20210,],
+["features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Day_1_en","features.login.impl.screens.searchaccountprovider_SearchAccountProviderView_Night_1_en",20210,],
 ["libraries.designsystem.theme.components_SearchBarActiveNoneQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithContent_Search_views_en","",0,],
-["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20196,],
+["libraries.designsystem.theme.components_SearchBarActiveWithNoResults_Search_views_en","",20210,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQueryNoBackButton_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarActiveWithQuery_Search_views_en","",0,],
 ["libraries.designsystem.theme.components_SearchBarInactive_Search_views_en","",0,],
-["features.createroom.impl.components_SearchMultipleUsersResultItem_en","",20196,],
-["features.createroom.impl.components_SearchSingleUserResultItem_en","",20196,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20196,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20196,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20196,],
-["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20196,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20196,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20196,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20196,],
-["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20196,],
-["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20196,],
-["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20196,],
-["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20196,],
+["features.createroom.impl.components_SearchMultipleUsersResultItem_en","",20210,],
+["features.createroom.impl.components_SearchSingleUserResultItem_en","",20210,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_0_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_0_en",20210,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_1_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_1_en",20210,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_2_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_2_en",20210,],
+["features.securebackup.impl.disable_SecureBackupDisableView_Day_3_en","features.securebackup.impl.disable_SecureBackupDisableView_Night_3_en",20210,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_0_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_0_en",20210,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_1_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_1_en",20210,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_2_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_2_en",20210,],
+["features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Day_3_en","features.securebackup.impl.enter_SecureBackupEnterRecoveryKeyView_Night_3_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_0_en","features.securebackup.impl.root_SecureBackupRootView_Night_0_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_10_en","features.securebackup.impl.root_SecureBackupRootView_Night_10_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_11_en","features.securebackup.impl.root_SecureBackupRootView_Night_11_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_12_en","features.securebackup.impl.root_SecureBackupRootView_Night_12_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_13_en","features.securebackup.impl.root_SecureBackupRootView_Night_13_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_14_en","features.securebackup.impl.root_SecureBackupRootView_Night_14_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_15_en","features.securebackup.impl.root_SecureBackupRootView_Night_15_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_16_en","features.securebackup.impl.root_SecureBackupRootView_Night_16_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_17_en","features.securebackup.impl.root_SecureBackupRootView_Night_17_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_1_en","features.securebackup.impl.root_SecureBackupRootView_Night_1_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_2_en","features.securebackup.impl.root_SecureBackupRootView_Night_2_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_3_en","features.securebackup.impl.root_SecureBackupRootView_Night_3_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_4_en","features.securebackup.impl.root_SecureBackupRootView_Night_4_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_5_en","features.securebackup.impl.root_SecureBackupRootView_Night_5_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_6_en","features.securebackup.impl.root_SecureBackupRootView_Night_6_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_7_en","features.securebackup.impl.root_SecureBackupRootView_Night_7_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_8_en","features.securebackup.impl.root_SecureBackupRootView_Night_8_en",20210,],
+["features.securebackup.impl.root_SecureBackupRootView_Day_9_en","features.securebackup.impl.root_SecureBackupRootView_Night_9_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_0_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_1_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_2_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_3_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupViewChange_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupViewChange_Night_4_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_0_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_0_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_1_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_1_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_2_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_2_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_3_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_3_en",20210,],
+["features.securebackup.impl.setup_SecureBackupSetupView_Day_4_en","features.securebackup.impl.setup_SecureBackupSetupView_Night_4_en",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_0_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_1_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_2_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_3_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_4_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_5_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_6_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_7_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewDark_8_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_0_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_1_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_2_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_3_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_4_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_5_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_6_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_7_en","",20210,],
+["features.roomdetails.impl.securityandprivacy_SecurityAndPrivacyViewLight_8_en","",20210,],
 ["libraries.matrix.ui.components_SelectedRoom_Day_0_en","libraries.matrix.ui.components_SelectedRoom_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedRoom_Day_1_en","libraries.matrix.ui.components_SelectedRoom_Night_1_en",0,],
 ["libraries.matrix.ui.components_SelectedRoom_Day_2_en","libraries.matrix.ui.components_SelectedRoom_Night_2_en",0,],
@@ -1118,11 +1128,11 @@ export const screenshots = [
 ["libraries.matrix.ui.components_SelectedUser_Day_0_en","libraries.matrix.ui.components_SelectedUser_Night_0_en",0,],
 ["libraries.matrix.ui.components_SelectedUsersRowList_Day_0_en","libraries.matrix.ui.components_SelectedUsersRowList_Night_0_en",0,],
 ["libraries.textcomposer.components_SendButton_Day_0_en","libraries.textcomposer.components_SendButton_Night_0_en",0,],
-["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20196,],
-["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20196,],
-["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20196,],
-["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20196,],
-["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20196,],
+["features.location.impl.send_SendLocationView_Day_0_en","features.location.impl.send_SendLocationView_Night_0_en",20210,],
+["features.location.impl.send_SendLocationView_Day_1_en","features.location.impl.send_SendLocationView_Night_1_en",20210,],
+["features.location.impl.send_SendLocationView_Day_2_en","features.location.impl.send_SendLocationView_Night_2_en",20210,],
+["features.location.impl.send_SendLocationView_Day_3_en","features.location.impl.send_SendLocationView_Night_3_en",20210,],
+["features.location.impl.send_SendLocationView_Day_4_en","features.location.impl.send_SendLocationView_Night_4_en",20210,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_0_en","libraries.matrix.ui.messages.sender_SenderName_Night_0_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_1_en","libraries.matrix.ui.messages.sender_SenderName_Night_1_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_2_en","libraries.matrix.ui.messages.sender_SenderName_Night_2_en",0,],
@@ -1132,27 +1142,27 @@ export const screenshots = [
 ["libraries.matrix.ui.messages.sender_SenderName_Day_6_en","libraries.matrix.ui.messages.sender_SenderName_Night_6_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_7_en","libraries.matrix.ui.messages.sender_SenderName_Night_7_en",0,],
 ["libraries.matrix.ui.messages.sender_SenderName_Day_8_en","libraries.matrix.ui.messages.sender_SenderName_Night_8_en",0,],
-["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20196,],
-["features.roomlist.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.roomlist.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20196,],
-["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20196,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20196,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20196,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20196,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20196,],
-["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20196,],
+["features.verifysession.impl.incoming.ui_SessionDetailsView_Day_0_en","features.verifysession.impl.incoming.ui_SessionDetailsView_Night_0_en",20210,],
+["features.roomlist.impl.components_SetUpRecoveryKeyBanner_Day_0_en","features.roomlist.impl.components_SetUpRecoveryKeyBanner_Night_0_en",20210,],
+["features.lockscreen.impl.setup.biometric_SetupBiometricView_Day_0_en","features.lockscreen.impl.setup.biometric_SetupBiometricView_Night_0_en",20210,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_0_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_0_en",20210,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_1_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_1_en",20210,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_2_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_2_en",20210,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_3_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_3_en",20210,],
+["features.lockscreen.impl.setup.pin_SetupPinView_Day_4_en","features.lockscreen.impl.setup.pin_SetupPinView_Night_4_en",20210,],
 ["features.share.impl_ShareView_Day_0_en","features.share.impl_ShareView_Night_0_en",0,],
 ["features.share.impl_ShareView_Day_1_en","features.share.impl_ShareView_Night_1_en",0,],
 ["features.share.impl_ShareView_Day_2_en","features.share.impl_ShareView_Night_2_en",0,],
-["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20196,],
-["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20196,],
-["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20196,],
+["features.share.impl_ShareView_Day_3_en","features.share.impl_ShareView_Night_3_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_0_en","features.location.impl.show_ShowLocationView_Night_0_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_1_en","features.location.impl.show_ShowLocationView_Night_1_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_2_en","features.location.impl.show_ShowLocationView_Night_2_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_3_en","features.location.impl.show_ShowLocationView_Night_3_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_4_en","features.location.impl.show_ShowLocationView_Night_4_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_5_en","features.location.impl.show_ShowLocationView_Night_5_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_6_en","features.location.impl.show_ShowLocationView_Night_6_en",20210,],
+["features.location.impl.show_ShowLocationView_Day_7_en","features.location.impl.show_ShowLocationView_Night_7_en",20210,],
+["features.signedout.impl_SignedOutView_Day_0_en","features.signedout.impl_SignedOutView_Night_0_en",20210,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialogContent_Dialogs_en","",0,],
 ["libraries.designsystem.components.dialogs_SingleSelectionDialog_Day_0_en","libraries.designsystem.components.dialogs_SingleSelectionDialog_Night_0_en",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItemCustomFormattert_Single_selection_List_item_-_custom_formatter_List_items_en","",0,],
@@ -1161,7 +1171,7 @@ export const screenshots = [
 ["libraries.designsystem.components.list_SingleSelectionListItemUnselectedWithSupportingText_Single_selection_List_item_-_no_selection,_supporting_text_List_items_en","",0,],
 ["libraries.designsystem.components.list_SingleSelectionListItem_Single_selection_List_item_-_no_selection_List_items_en","",0,],
 ["libraries.designsystem.theme.components_Sliders_Sliders_en","",0,],
-["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20196,],
+["features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en","features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en",20210,],
 ["libraries.designsystem.theme.components_SnackbarWithActionAndCloseButton_Snackbar_with_action_and_close_button_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLineAndCloseButton_Snackbar_with_action_and_close_button_on_new_line_Snackbars_en","",0,],
 ["libraries.designsystem.theme.components_SnackbarWithActionOnNewLine_Snackbar_with_action_on_new_line_Snackbars_en","",0,],
@@ -1170,60 +1180,60 @@ export const screenshots = [
 ["libraries.designsystem.modifiers_SquareSizeModifierInsideSquare_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeHeight_en","",0,],
 ["libraries.designsystem.modifiers_SquareSizeModifierLargeWidth_en","",0,],
-["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20196,],
+["features.location.api.internal_StaticMapPlaceholder_Day_0_en","features.location.api.internal_StaticMapPlaceholder_Night_0_en",20210,],
 ["features.location.api_StaticMapView_Day_0_en","features.location.api_StaticMapView_Night_0_en",0,],
-["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20196,],
+["features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Day_0_en","features.messages.impl.messagecomposer.suggestions_SuggestionsPickerView_Night_0_en",20210,],
 ["libraries.designsystem.atomic.pages_SunsetPage_Day_0_en","libraries.designsystem.atomic.pages_SunsetPage_Night_0_en",0,],
 ["libraries.designsystem.components.button_SuperButton_Day_0_en","libraries.designsystem.components.button_SuperButton_Night_0_en",0,],
 ["libraries.designsystem.theme.components_Surface_en","",0,],
 ["libraries.designsystem.theme.components_Switch_Toggles_en","",0,],
-["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20196,],
+["appnav.loggedin_SyncStateView_Day_0_en","appnav.loggedin_SyncStateView_Night_0_en",20210,],
 ["libraries.designsystem.theme.components_TextButtonLargeLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonLarge_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMediumLowPadding_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonMedium_Buttons_en","",0,],
 ["libraries.designsystem.theme.components_TextButtonSmall_Buttons_en","",0,],
-["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20196,],
-["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20196,],
-["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20196,],
-["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20196,],
-["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20196,],
+["libraries.textcomposer_TextComposerAddCaption_Day_0_en","libraries.textcomposer_TextComposerAddCaption_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerCaption_Day_0_en","libraries.textcomposer_TextComposerCaption_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerEditCaption_Day_0_en","libraries.textcomposer_TextComposerEditCaption_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerEditNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerEditNotEncrypted_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerEdit_Day_0_en","libraries.textcomposer_TextComposerEdit_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerFormattingNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerFormattingNotEncrypted_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerFormatting_Day_0_en","libraries.textcomposer_TextComposerFormatting_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLinkWithoutText_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerLinkDialogCreateLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogCreateLink_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerLinkDialogEditLink_Day_0_en","libraries.textcomposer_TextComposerLinkDialogEditLink_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_10_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_10_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_11_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_11_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_1_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_1_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_2_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_2_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_3_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_3_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_4_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_4_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_5_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_5_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_6_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_6_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_7_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_7_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_8_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_8_en",20210,],
+["libraries.textcomposer_TextComposerReplyNotEncrypted_Day_9_en","libraries.textcomposer_TextComposerReplyNotEncrypted_Night_9_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_0_en","libraries.textcomposer_TextComposerReply_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_10_en","libraries.textcomposer_TextComposerReply_Night_10_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_11_en","libraries.textcomposer_TextComposerReply_Night_11_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_1_en","libraries.textcomposer_TextComposerReply_Night_1_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_2_en","libraries.textcomposer_TextComposerReply_Night_2_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_3_en","libraries.textcomposer_TextComposerReply_Night_3_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_4_en","libraries.textcomposer_TextComposerReply_Night_4_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_5_en","libraries.textcomposer_TextComposerReply_Night_5_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_6_en","libraries.textcomposer_TextComposerReply_Night_6_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_7_en","libraries.textcomposer_TextComposerReply_Night_7_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_8_en","libraries.textcomposer_TextComposerReply_Night_8_en",20210,],
+["libraries.textcomposer_TextComposerReply_Day_9_en","libraries.textcomposer_TextComposerReply_Night_9_en",20210,],
+["libraries.textcomposer_TextComposerSimpleNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerSimpleNotEncrypted_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerSimple_Day_0_en","libraries.textcomposer_TextComposerSimple_Night_0_en",20210,],
+["libraries.textcomposer_TextComposerVoiceNotEncrypted_Day_0_en","libraries.textcomposer_TextComposerVoiceNotEncrypted_Night_0_en",20210,],
 ["libraries.textcomposer_TextComposerVoice_Day_0_en","libraries.textcomposer_TextComposerVoice_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextDark_Text_en","",0,],
-["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20196,],
-["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20196,],
+["libraries.designsystem.components.dialogs_TextFieldDialogWithError_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialogWithError_Night_0_en",20210,],
+["libraries.designsystem.components.dialogs_TextFieldDialog_Day_0_en","libraries.designsystem.components.dialogs_TextFieldDialog_Night_0_en",20210,],
 ["libraries.designsystem.components.list_TextFieldListItemEmpty_Text_field_List_item_-_empty_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItemTextFieldValue_Text_field_List_item_-_textfieldvalue_List_items_en","",0,],
 ["libraries.designsystem.components.list_TextFieldListItem_Text_field_List_item_-_text_List_items_en","",0,],
@@ -1235,14 +1245,14 @@ export const screenshots = [
 ["libraries.mediaviewer.impl.local.txt_TextFileContentView_Day_3_en","libraries.mediaviewer.impl.local.txt_TextFileContentView_Night_3_en",0,],
 ["libraries.textcomposer.components_TextFormatting_Day_0_en","libraries.textcomposer.components_TextFormatting_Night_0_en",0,],
 ["libraries.designsystem.theme.components_TextLight_Text_en","",0,],
-["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20196,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20196,],
-["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20196,],
+["libraries.designsystem.theme.components.previews_TimePickerHorizontal_DateTime_pickers_en","",20210,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalDark_DateTime_pickers_en","",20210,],
+["libraries.designsystem.theme.components.previews_TimePickerVerticalLight_DateTime_pickers_en","",20210,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_0_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_1_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_2_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20196,],
-["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20196,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_3_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_3_en",20210,],
+["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_4_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_4_en",20210,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_5_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_6_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineEventTimestampView_Day_7_en","features.messages.impl.timeline.components_TimelineEventTimestampView_Night_7_en",0,],
@@ -1252,18 +1262,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemAudioView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemAudioView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemCallNotifyView_Day_0_en","features.messages.impl.timeline.components_TimelineItemCallNotifyView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Day_1_en","features.messages.impl.timeline.components.virtual_TimelineItemDaySeparatorView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20196,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_0_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_1_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_2_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_3_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_4_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_5_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_6_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_6_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_7_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_7_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Day_8_en","features.messages.impl.timeline.components.event_TimelineItemEncryptedView_Night_8_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowDisambiguated_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowForDirectRoom_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowLongSenderName_en","",0,],
@@ -1271,18 +1281,18 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_3_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_4_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_6_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowTimestamp_Night_7_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemEventRowUtd_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowUtd_Night_0_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithManyReactions_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithRR_Night_2_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_0_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyInformative_Night_1_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_0_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReplyOther_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_0_en",0,],
@@ -1291,40 +1301,40 @@ export const screenshots = [
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_1_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_1_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_2_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_2_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_3_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_3_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_4_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_4_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_5_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_5_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_6_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_6_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_7_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_7_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_8_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_8_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Day_9_en","features.messages.impl.timeline.components_TimelineItemEventRowWithReply_Night_9_en",0,],
 ["features.messages.impl.timeline.components_TimelineItemEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemEventRow_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20196,],
+["features.messages.impl.timeline.components_TimelineItemEventTimestampBelow_en","",20210,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemFileView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemFileView_Night_4_en",0,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentCollapse_Night_0_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Day_0_en","features.messages.impl.timeline.components_TimelineItemGroupedEventsRowContentExpanded_Night_0_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageViewHideMediaContent_Night_0_en",20210,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_2_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemImageView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemImageView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemInformativeView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemInformativeView_Night_0_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20196,],
+["features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLegacyCallInviteView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemLocationView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemLocationView_Night_1_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20196,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_0_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_1_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_2_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemPollView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemPollView_Night_3_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemReactionsLayout_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsLayout_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewFew_Night_0_en",0,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20196,],
-["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20196,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewIncoming_Night_0_en",20210,],
+["features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsViewOutgoing_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemReactionsView_Day_0_en","features.messages.impl.timeline.components_TimelineItemReactionsView_Night_0_en",0,],
-["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20196,],
+["features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemReadMarkerView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_0_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_1_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_2_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_2_en",0,],
@@ -1333,8 +1343,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_5_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_5_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_6_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_6_en",0,],
 ["features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Day_7_en","features.messages.impl.timeline.components.receipt_TimelineItemReadReceiptView_Night_7_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20196,],
-["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20196,],
+["features.messages.impl.timeline.components.event_TimelineItemRedactedView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemRedactedView_Night_0_en",20210,],
+["features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineItemRoomBeginningView_Night_0_en",20210,],
 ["features.messages.impl.timeline.components_TimelineItemStateEventRow_Day_0_en","features.messages.impl.timeline.components_TimelineItemStateEventRow_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStateView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStateView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemStickerView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemStickerView_Night_0_en",0,],
@@ -1349,8 +1359,8 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_3_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_3_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_4_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_4_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemTextView_Day_5_en","features.messages.impl.timeline.components.event_TimelineItemTextView_Night_5_en",0,],
-["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20196,],
-["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20196,],
+["features.messages.impl.timeline.components.event_TimelineItemUnknownView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemUnknownView_Night_0_en",20210,],
+["features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoViewHideMediaContent_Night_0_en",20210,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_0_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_1_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_1_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineItemVideoView_Day_2_en","features.messages.impl.timeline.components.event_TimelineItemVideoView_Night_2_en",0,],
@@ -1373,95 +1383,95 @@ export const screenshots = [
 ["features.messages.impl.timeline.components.event_TimelineItemVoiceView_Day_9_en","features.messages.impl.timeline.components.event_TimelineItemVoiceView_Night_9_en",0,],
 ["features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Day_0_en","features.messages.impl.timeline.components.virtual_TimelineLoadingMoreIndicator_Night_0_en",0,],
 ["features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Day_0_en","features.messages.impl.timeline.components.event_TimelineVideoWithCaptionRow_Night_0_en",0,],
-["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20196,],
+["features.messages.impl.timeline_TimelineViewMessageShield_Day_0_en","features.messages.impl.timeline_TimelineViewMessageShield_Night_0_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_0_en","features.messages.impl.timeline_TimelineView_Night_0_en",20210,],
 ["features.messages.impl.timeline_TimelineView_Day_10_en","features.messages.impl.timeline_TimelineView_Night_10_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20196,],
-["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20196,],
+["features.messages.impl.timeline_TimelineView_Day_11_en","features.messages.impl.timeline_TimelineView_Night_11_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_12_en","features.messages.impl.timeline_TimelineView_Night_12_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_13_en","features.messages.impl.timeline_TimelineView_Night_13_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_14_en","features.messages.impl.timeline_TimelineView_Night_14_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_15_en","features.messages.impl.timeline_TimelineView_Night_15_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_16_en","features.messages.impl.timeline_TimelineView_Night_16_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_17_en","features.messages.impl.timeline_TimelineView_Night_17_en",20210,],
+["features.messages.impl.timeline_TimelineView_Day_1_en","features.messages.impl.timeline_TimelineView_Night_1_en",20210,],
 ["features.messages.impl.timeline_TimelineView_Day_2_en","features.messages.impl.timeline_TimelineView_Night_2_en",0,],
 ["features.messages.impl.timeline_TimelineView_Day_3_en","features.messages.impl.timeline_TimelineView_Night_3_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20196,],
+["features.messages.impl.timeline_TimelineView_Day_4_en","features.messages.impl.timeline_TimelineView_Night_4_en",20210,],
 ["features.messages.impl.timeline_TimelineView_Day_5_en","features.messages.impl.timeline_TimelineView_Night_5_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20196,],
+["features.messages.impl.timeline_TimelineView_Day_6_en","features.messages.impl.timeline_TimelineView_Night_6_en",20210,],
 ["features.messages.impl.timeline_TimelineView_Day_7_en","features.messages.impl.timeline_TimelineView_Night_7_en",0,],
-["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20196,],
+["features.messages.impl.timeline_TimelineView_Day_8_en","features.messages.impl.timeline_TimelineView_Night_8_en",20210,],
 ["features.messages.impl.timeline_TimelineView_Day_9_en","features.messages.impl.timeline_TimelineView_Night_9_en",0,],
 ["libraries.designsystem.theme.components_TopAppBar_App_Bars_en","",0,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20196,],
-["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20196,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_0_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_0_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_1_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_1_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_2_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_2_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_3_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_3_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_4_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_4_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_5_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_5_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_6_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_6_en",20210,],
+["libraries.troubleshoot.impl_TroubleshootNotificationsView_Day_7_en","libraries.troubleshoot.impl_TroubleshootNotificationsView_Night_7_en",20210,],
 ["features.messages.impl.typing_TypingNotificationView_Day_0_en","features.messages.impl.typing_TypingNotificationView_Night_0_en",0,],
-["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20196,],
-["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20196,],
-["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20196,],
-["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20196,],
-["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20196,],
-["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20196,],
+["features.messages.impl.typing_TypingNotificationView_Day_1_en","features.messages.impl.typing_TypingNotificationView_Night_1_en",20210,],
+["features.messages.impl.typing_TypingNotificationView_Day_2_en","features.messages.impl.typing_TypingNotificationView_Night_2_en",20210,],
+["features.messages.impl.typing_TypingNotificationView_Day_3_en","features.messages.impl.typing_TypingNotificationView_Night_3_en",20210,],
+["features.messages.impl.typing_TypingNotificationView_Day_4_en","features.messages.impl.typing_TypingNotificationView_Night_4_en",20210,],
+["features.messages.impl.typing_TypingNotificationView_Day_5_en","features.messages.impl.typing_TypingNotificationView_Night_5_en",20210,],
+["features.messages.impl.typing_TypingNotificationView_Day_6_en","features.messages.impl.typing_TypingNotificationView_Night_6_en",20210,],
 ["features.messages.impl.typing_TypingNotificationView_Day_7_en","features.messages.impl.typing_TypingNotificationView_Night_7_en",0,],
 ["features.messages.impl.typing_TypingNotificationView_Day_8_en","features.messages.impl.typing_TypingNotificationView_Night_8_en",0,],
 ["libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Day_0_en","libraries.designsystem.atomic.atoms_UnreadIndicatorAtom_Night_0_en",0,],
-["libraries.matrix.ui.components_UnresolvedUserRow_en","",20196,],
+["libraries.matrix.ui.components_UnresolvedUserRow_en","",20210,],
 ["libraries.matrix.ui.components_UnsavedAvatar_Day_0_en","libraries.matrix.ui.components_UnsavedAvatar_Night_0_en",0,],
 ["libraries.designsystem.components.avatar_UserAvatarColors_Day_0_en","libraries.designsystem.components.avatar_UserAvatarColors_Night_0_en",0,],
-["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20196,],
-["features.createroom.impl.components_UserListView_Day_0_en","features.createroom.impl.components_UserListView_Night_0_en",20196,],
-["features.createroom.impl.components_UserListView_Day_1_en","features.createroom.impl.components_UserListView_Night_1_en",20196,],
-["features.createroom.impl.components_UserListView_Day_2_en","features.createroom.impl.components_UserListView_Night_2_en",20196,],
+["features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Day_0_en","features.roomdetails.impl.notificationsettings_UserDefinedRoomNotificationSettingsView_Night_0_en",20210,],
+["features.createroom.impl.components_UserListView_Day_0_en","features.createroom.impl.components_UserListView_Night_0_en",20210,],
+["features.createroom.impl.components_UserListView_Day_1_en","features.createroom.impl.components_UserListView_Night_1_en",20210,],
+["features.createroom.impl.components_UserListView_Day_2_en","features.createroom.impl.components_UserListView_Night_2_en",20210,],
 ["features.createroom.impl.components_UserListView_Day_3_en","features.createroom.impl.components_UserListView_Night_3_en",0,],
 ["features.createroom.impl.components_UserListView_Day_4_en","features.createroom.impl.components_UserListView_Night_4_en",0,],
 ["features.createroom.impl.components_UserListView_Day_5_en","features.createroom.impl.components_UserListView_Night_5_en",0,],
 ["features.createroom.impl.components_UserListView_Day_6_en","features.createroom.impl.components_UserListView_Night_6_en",0,],
-["features.createroom.impl.components_UserListView_Day_7_en","features.createroom.impl.components_UserListView_Night_7_en",20196,],
+["features.createroom.impl.components_UserListView_Day_7_en","features.createroom.impl.components_UserListView_Night_7_en",20210,],
 ["features.createroom.impl.components_UserListView_Day_8_en","features.createroom.impl.components_UserListView_Night_8_en",0,],
-["features.createroom.impl.components_UserListView_Day_9_en","features.createroom.impl.components_UserListView_Night_9_en",20196,],
+["features.createroom.impl.components_UserListView_Day_9_en","features.createroom.impl.components_UserListView_Night_9_en",20210,],
 ["features.preferences.impl.user_UserPreferences_Day_0_en","features.preferences.impl.user_UserPreferences_Night_0_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_1_en","features.preferences.impl.user_UserPreferences_Night_1_en",0,],
 ["features.preferences.impl.user_UserPreferences_Day_2_en","features.preferences.impl.user_UserPreferences_Night_2_en",0,],
-["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20196,],
-["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20196,],
-["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20196,],
+["features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Day_0_en","features.userprofile.shared_UserProfileHeaderSectionWithVerificationViolation_Night_0_en",20210,],
+["features.userprofile.shared_UserProfileHeaderSection_Day_0_en","features.userprofile.shared_UserProfileHeaderSection_Night_0_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_0_en","features.userprofile.shared_UserProfileView_Night_0_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_1_en","features.userprofile.shared_UserProfileView_Night_1_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_2_en","features.userprofile.shared_UserProfileView_Night_2_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_3_en","features.userprofile.shared_UserProfileView_Night_3_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_4_en","features.userprofile.shared_UserProfileView_Night_4_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_5_en","features.userprofile.shared_UserProfileView_Night_5_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_6_en","features.userprofile.shared_UserProfileView_Night_6_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_7_en","features.userprofile.shared_UserProfileView_Night_7_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_8_en","features.userprofile.shared_UserProfileView_Night_8_en",20210,],
+["features.userprofile.shared_UserProfileView_Day_9_en","features.userprofile.shared_UserProfileView_Night_9_en",20210,],
 ["features.verifysession.impl.ui_VerificationUserProfileContent_Day_0_en","features.verifysession.impl.ui_VerificationUserProfileContent_Night_0_en",0,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_0_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_0_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_10_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_10_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_11_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_11_en",20196,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_0_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_0_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_10_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_10_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_11_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_11_en",20210,],
 ["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_12_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_12_en",0,],
 ["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_13_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_13_en",0,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_2_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_2_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_3_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_3_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_5_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_5_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_6_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_6_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_7_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_7_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_8_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_8_en",20196,],
-["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_9_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_9_en",20196,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_1_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_1_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_2_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_2_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_3_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_3_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_4_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_4_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_5_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_5_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_6_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_6_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_7_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_7_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_8_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_8_en",20210,],
+["features.verifysession.impl.outgoing_VerifySelfSessionView_Day_9_en","features.verifysession.impl.outgoing_VerifySelfSessionView_Night_9_en",20210,],
 ["libraries.designsystem.ruler_VerticalRuler_Day_0_en","libraries.designsystem.ruler_VerticalRuler_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_0_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_0_en",0,],
 ["libraries.mediaviewer.impl.gallery.ui_VideoItemView_Day_1_en","libraries.mediaviewer.impl.gallery.ui_VideoItemView_Night_1_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_0_en","features.viewfolder.impl.file_ViewFileView_Night_0_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_1_en","features.viewfolder.impl.file_ViewFileView_Night_1_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_2_en","features.viewfolder.impl.file_ViewFileView_Night_2_en",0,],
-["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20196,],
+["features.viewfolder.impl.file_ViewFileView_Day_3_en","features.viewfolder.impl.file_ViewFileView_Night_3_en",20210,],
 ["features.viewfolder.impl.file_ViewFileView_Day_4_en","features.viewfolder.impl.file_ViewFileView_Night_4_en",0,],
 ["features.viewfolder.impl.file_ViewFileView_Day_5_en","features.viewfolder.impl.file_ViewFileView_Night_5_en",0,],
 ["features.viewfolder.impl.folder_ViewFolderView_Day_0_en","features.viewfolder.impl.folder_ViewFolderView_Night_0_en",0,],
@@ -1480,6 +1490,6 @@ export const screenshots = [
 ["libraries.textcomposer.components_VoiceMessageRecording_Day_0_en","libraries.textcomposer.components_VoiceMessageRecording_Night_0_en",0,],
 ["libraries.textcomposer.components_VoiceMessage_Day_0_en","libraries.textcomposer.components_VoiceMessage_Night_0_en",0,],
 ["libraries.designsystem.components.media_WaveformPlaybackView_Day_0_en","libraries.designsystem.components.media_WaveformPlaybackView_Night_0_en",0,],
-["features.ftue.impl.welcome_WelcomeView_Day_0_en","features.ftue.impl.welcome_WelcomeView_Night_0_en",20196,],
+["features.ftue.impl.welcome_WelcomeView_Day_0_en","features.ftue.impl.welcome_WelcomeView_Night_0_en",20210,],
 ["libraries.designsystem.ruler_WithRulers_Day_0_en","libraries.designsystem.ruler_WithRulers_Night_0_en",0,],
 ];
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png
new file mode 100644
index 0000000000..934dc43d9d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db72f73fd89896d575cea546e3cf382c7be3736af6c3db74fc2301434939d99e
+size 21960
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png
new file mode 100644
index 0000000000..b23b2c98d7
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:828b5234e2bfb40965b7b17362402b8e77332d11f0338443866153d6a9ab5437
+size 25963
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en.png
new file mode 100644
index 0000000000..8c50af672e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05e7a67dfcec946de1e355afed430198c6c89f1938755907db1e83ab1bb68488
+size 12177
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en.png
new file mode 100644
index 0000000000..e73f998cc0
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96e2d9fd6b20b70dd3bb9b3caaea2cc3eaed1644c3371889cbc56d608bd4b49b
+size 11826
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en.png
similarity index 100%
rename from tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_0_en.png
rename to tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_0_en.png
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png
new file mode 100644
index 0000000000..c299337e54
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52ee0fa663944b2972f16675c337f52e9bbb3912aea1df86200965fae2cd9849
+size 20040
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png
new file mode 100644
index 0000000000..64da9e64bd
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a51609d679d9ce799a98b7215e99cfe7553c1a154358f6f9ff7d5e0048e031a
+size 24105
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en.png
new file mode 100644
index 0000000000..f9d4df3145
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24adccc976a5611f31d0caaa614212da841a5a9abd5e9ebb706fe1f9cbfb6408
+size 10729
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en.png
new file mode 100644
index 0000000000..cf81e64432
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.acceptdecline_AcceptDeclineInviteView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f41edac4c092e5999950e97b0352ffa46c083ba2cd50c8b5b408eff8a85df06
+size 10376
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png
new file mode 100644
index 0000000000..9b7e2b3ce9
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d7f72a828564c9e798c7b207befbf585753951b04a1c32debc2e10b25bced6c
+size 33179
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png
new file mode 100644
index 0000000000..92a82fefb1
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f8c6170e259cd1cc8579d750ca4dfb68d40e1d2994757c7e3d57a0b1931a593
+size 38072
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png
new file mode 100644
index 0000000000..23f6835b3b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dce84fcbb387139cbcbd5907bafb4954b6b8d52209c45e251eeb715973232fa
+size 33366
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png
new file mode 100644
index 0000000000..d23ab2365e
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4777b45b61243ce502af6fc69d9b262bede2362c9f556bbbfd66d2391d4980d9
+size 30172
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png
new file mode 100644
index 0000000000..0a543ce441
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a1fe6b47d0651ffbd7587fc56f1be0fc8771dc31648050eb98d097198ae4d53
+size 34583
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png
new file mode 100644
index 0000000000..386d1ee720
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e9c0bdaeabc62c5a66649bcd37f207dccca268ea8bd2d118dc151d6a2d55601
+size 31817
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png
new file mode 100644
index 0000000000..ba9f9bdf0d
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c69cd79f91cbba2a72682d229fbbdaed566302067ce6c6910a613e15cc67767
+size 36455
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png
new file mode 100644
index 0000000000..3350b2f936
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:056cedc5a79d692c1cd81eb163e22a809ea52053cef85b8a6ab08cfabc316474
+size 31965
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png
new file mode 100644
index 0000000000..5cf3f2d357
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6f494a918082962ff121a809a54a5cd00911af35c85c0a2f4a49cc8475ba210
+size 28300
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png
new file mode 100644
index 0000000000..14687f0531
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.invite.impl.declineandblock_DeclineAndBlockView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86cf5163cdf20bde56e6a0d858d69ead4fc4275c38c595c0debbd743ea0e9770
+size 32107
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_1_en.png
deleted file mode 100644
index 001133641e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:293b11b5ffbef9253c51922e84c707d4404eb6945d6f99d64ff9abf7c1f632e8
-size 22186
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_2_en.png
deleted file mode 100644
index 0af5940238..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e36bd9c0358f68a2b6a833677775b8db9b93c4d1851e9adf8221fb8b5a005cd4
-size 22767
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_3_en.png
deleted file mode 100644
index 454d34361b..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:970efb76758b76905d04d159e123201bbcf34e25ca92ba49956f5ed4beb68d1e
-size 37097
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_4_en.png
deleted file mode 100644
index bb2c035f90..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f5e0ac8b492e4152a0eb8ef9cb0b6456b6cd9dad9733a23c99ad53def2d15ff
-size 9962
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_5_en.png
deleted file mode 100644
index bb2c035f90..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Day_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3f5e0ac8b492e4152a0eb8ef9cb0b6456b6cd9dad9733a23c99ad53def2d15ff
-size 9962
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_1_en.png
deleted file mode 100644
index 76355d9a9d..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_1_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84adf676f352a072e79269d53b5b572aa3ea12978d0c6076bd442d83db6aeeb3
-size 20110
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_2_en.png
deleted file mode 100644
index 2978d98e7e..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_2_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9a7acf590703274148b0887d0bf71934ad9ba0bfce6c86c8675f2277c49a0bc
-size 20851
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_3_en.png
deleted file mode 100644
index 7c7e5a736f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_3_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b07a822f818e4709be8afe2e3a79a8aa03b42bb67ec3206cc310b5386037ab3
-size 34758
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_4_en.png
deleted file mode 100644
index c35c13d07f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_4_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e05f1b1cfc75e0698e82c76985255d43838fc9e07dbfda39a5f7b27dcd7dcc8
-size 8596
diff --git a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_5_en.png
deleted file mode 100644
index c35c13d07f..0000000000
--- a/tests/uitests/src/test/snapshots/images/features.invite.impl.response_AcceptDeclineInviteView_Night_5_en.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e05f1b1cfc75e0698e82c76985255d43838fc9e07dbfda39a5f7b27dcd7dcc8
-size 8596
diff --git a/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_6_en.png b/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_6_en.png
index 49004b08fa..3ca3f74e6d 100644
--- a/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Day_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9772de041aa3819dc1f322000fc49a0f2c48c5b978181406da9e64b6ac083f08
-size 32821
+oid sha256:a723573878b837d6774d6fb5bdd20d661468c991e1f34054b6551e5c969e5b11
+size 28385
diff --git a/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Night_6_en.png b/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Night_6_en.png
index c88ef3b46a..243070e00f 100644
--- a/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Night_6_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.leaveroom.api_LeaveRoomView_Night_6_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7bed5155e5d41abe69b8a24905a5aa2b4935f56c7b04040206dfdecd59951b0
-size 30817
+oid sha256:1288017d71303ce29628cae7837968b4ec12576fff096ea4c4f9b19bbaf5a2ec
+size 26547
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png
index 6e612f359f..2d6df8b039 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f642737475ed867d2c1ae5cf34af6261298c33c761e6f9182c0a9b75e3f583bc
-size 19091
+oid sha256:fcaa6f6abb01095e62ece79207536c035e70335403a4c6d73c7e18bdc7d0aa5d
+size 27024
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png
index 7727e0abae..ab7ccfe7fd 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.changeserver_ChangeServerView_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3929cf3c7bae2c26b5ad499383ffc5d5aecfee7f5c9d24dff0c1116bec018836
-size 17074
+oid sha256:066175e7a3408f163dc0b1126b3644ab83d08f2627bd0429e3fa4a14e1444c03
+size 25335
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png
index 6e612f359f..2d6df8b039 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f642737475ed867d2c1ae5cf34af6261298c33c761e6f9182c0a9b75e3f583bc
-size 19091
+oid sha256:fcaa6f6abb01095e62ece79207536c035e70335403a4c6d73c7e18bdc7d0aa5d
+size 27024
diff --git a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png
index 7727e0abae..ab7ccfe7fd 100644
--- a/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.login.impl.dialogs_SlidingSyncNotSupportedDialog_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3929cf3c7bae2c26b5ad499383ffc5d5aecfee7f5c9d24dff0c1116bec018836
-size 17074
+oid sha256:066175e7a3408f163dc0b1126b3644ab83d08f2627bd0429e3fa4a14e1444c03
+size 25335
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png
new file mode 100644
index 0000000000..c0c23f4b39
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93b26b97920577fb83bd01e31e2fe9b03de7eafd02edf3946fc59d7d5ae847ba
+size 30476
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png
new file mode 100644
index 0000000000..7b035db776
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b1c42f96f448cde729b0a28ff068439b629b53e64f29a2f722cbba752c2864f2
+size 29951
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png
new file mode 100644
index 0000000000..f564ba51ac
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3add6d1c206f509459fd64d717b6f1457863e333f2c0181982ac27f47f1b6b22
+size 30129
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png
new file mode 100644
index 0000000000..ac89c1f290
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2f1c39e1e23e98d0f80ea492d68993c1d4ff7cabfa5ebcd96414742f2844752
+size 27434
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png
new file mode 100644
index 0000000000..1c10a34c53
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Day_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74403b531a8c2f563e6cf08f0de06392b6c608add907d4d7fee03d01bccb1f7d
+size 33236
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png
new file mode 100644
index 0000000000..af97e0e7fc
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3eb1d959794baf1a25ffc0cef77a496c627cdb32879984b5c7e18692f0b072b
+size 29618
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png
new file mode 100644
index 0000000000..282ea14c1b
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_1_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d7f1374c8b8e4ae2a045bcd7966378183de1a2b5830cd7cb82ef11bc44a6d1f
+size 29175
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png
new file mode 100644
index 0000000000..6349b50c22
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_2_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de1a5b992070e12ecda9f9d26c8460898a1e2b19bab604d34cd45042b561fbaf
+size 29171
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png
new file mode 100644
index 0000000000..f86157cd28
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_3_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dbcd3623d21cd587912cd2444ef0f04ff6fd35bec811f4bc794654f7809584eb
+size 25681
diff --git a/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png
new file mode 100644
index 0000000000..ce98d696ea
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.reportroom.impl_ReportRoomView_Night_4_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1230423b1bed62d800d545855b59d48df3083741d821c5caf1e1fc221b561fc3
+size 30788
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
index 4b06082200..4d26116fc5 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f87139a0e17dbfb4d56bfcc41dc49924a0d185c356af5a5daaf60ff2465841d7
-size 29739
+oid sha256:2f23c7910852f16382a5186a085a06014a61e5297f259a20a450947ff11405f1
+size 29683
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
index 0c484052b1..3c9e3f4e09 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.notificationsettings_RoomNotificationSettingsOption_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6754f38f6f193e2bd63758c0f184939e02f2fc0e3742669eb00ec6103c2a752e
-size 28724
+oid sha256:9fe608e191fa311bdd26cf5e90eb55d25b79c55b536b26ed0a5d2e34343554b6
+size 28664
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
index 9b16567953..4c47f3d623 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6b667d57c0cf7147a8b713535738487f88ace48d7deb9ba338f7e26eea0b643
-size 41233
+oid sha256:11af1897c0ebc05108efb6d79156af7a549788141afabe60e6b3a721e73462b8
+size 41450
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
index 7159edfbf0..5d0e028c03 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:96bda111da271692bb83a6049a65ab62ee706282806026882757b63c12a5629f
-size 40143
+oid sha256:44575c8ffe72df361eab4e6e7775b150cf901b309e7be59d0ceeddc27f9800b1
+size 40360
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
index 772b2f04a5..6d90061fd0 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bcb0a066e02486d81040d7a1089ae2e4baf20e483e661fb513579494769f1461
-size 43381
+oid sha256:022987a206a0277729d65129a6efad6dfb0cdc8f06dc6e811f90307cba9f78be
+size 43596
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
index ffa68efd51..a2551c3c09 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d3ea582081948929abb7229b5d2e7fd87c631963340a506072bcc7be4843e49
-size 41493
+oid sha256:dbf72b0000c25d5a8bc46e187b410b5e1d4dcdf49672b7e238221fd22af014ce
+size 41705
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
index fd91a368d0..1f0daa85dc 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92e08b157e0b3091e136160cdb399926cf96ba48bf1de40ea84e57c5f9f2f0f7
-size 41804
+oid sha256:e610606229c8843fecfc699d798e530277ca7fbfb870198809a95417053fd594
+size 42018
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
index 943d018b45..d57c2018ca 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59c09f612209f3550e3b3a7488347b139422c821a3c47723e44d18b8d2d59593
-size 32366
+oid sha256:efe7ab9fb0d5a0d8e14039ae73bb947558ae8c9ac0be1b146d4fba78c7f96f84
+size 34280
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
index 506a73e964..7a25cb4dce 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa41d32745e495b9b9bb18ee9aa089674ddb5263da29feeb7362fea4e17f8617
-size 34524
+oid sha256:1cbbcbeb51688c957181c186319c8ae3843368ea5e684f407bec67ec16f90371
+size 36219
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
index 2c8e4e9e81..a80e7db43c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a334db0766538dbfbfda746b84af6e81b0cc3beee927c45d0e72368d25167ade
-size 41722
+oid sha256:7f7ff91e97c256c96e261048d2f5c1fe50e7c1b6b752ec830ad63fe51cac44f5
+size 41939
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
index fd822b4361..6941fb2722 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbd0ba4fc6221bf4048bc355fbb7ec2bd4059c8baa8596ebec5f83388e1f8e8a
-size 40592
+oid sha256:ed84b2185eeecdcaf5d846b386f8d3b37f6ae6892d099950d8ec2c988aaf7ae8
+size 41111
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
index 1dfa6994cc..0746cb3861 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47431534c2a84619c74fae1b2c4acda8c7d3310ca31e002ad55b89b5c54ca7ec
-size 42567
+oid sha256:bf0c4686f5c3b8dc33a65eda243bab68a01fce9e5bb747957a421028f67c2f51
+size 42783
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
index e563f552b8..440eb609ec 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47f8d0b06c9aaea4ef5c45bb38614c174870ab0c2f22dc03e54c24f1f5ba2952
-size 41507
+oid sha256:b1c43dcb8fa94250922a5c55da1480295c843881f5f325583061c3a4efcc1c8d
+size 41721
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
index cb57d31474..33d3574fd3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetailsDark_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d50b32ab9b3fd6d7145a04676fb491c8ce31af655c54b9a369c3a946036ae12
-size 41552
+oid sha256:a19942e696011410011085fdb05573d5a9924c26a7cd5eb14d8ef47357520228
+size 41771
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
index 92299d3e4d..dd60c1ceac 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_10_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e86fbb58436a583df74d60e410e625865036d908d792eb9fb1fd506c875c3067
-size 41995
+oid sha256:2989b72b62c6454e2770c24f488be188db70743fc98ec382f96f67a506fda909
+size 42207
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
index bfb8b3ff0b..a6b369d6d3 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_11_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64cd6474f7fdca9dec9d4a0c9c82089e1445c49835afaf1d33469f325174098c
-size 41000
+oid sha256:941447581bdae57977bc6021e586618765756b88fdfc0d5ce5f52aaefa7f6e71
+size 41209
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
index b767349cd8..63bf4ceab4 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_12_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:202cd1054d5177cc8e7fa0ce00c3338cbed0c7a1eda693589bd3d537bfa6a044
-size 43838
+oid sha256:42795ec59657adcab57a18c989be8a84434561448c5b242e655ea2568c3f536a
+size 44046
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
index 5d1f0c5cc5..a348a4ffb7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_13_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0369d8fda8eea52848f520751a295fccaf9d7bf9d9e65161f5e1d10df03347d0
-size 42321
+oid sha256:713573ab48dc25c11ae0e5bfbe1e9909af6a1ba1115ffcfc37394171669c73f3
+size 42535
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
index ace46aa6ee..184d471cc7 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_16_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433e2d955156019aa6ef906418fcb23ed26f7c357ca91b526f941a8fdd9c7161
-size 42664
+oid sha256:c1e43739e24423815b90dc6e5249400fd1049985811763422e9fc2aa9a74e610
+size 42875
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
index 84360a0028..4d9769f32d 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43c94f11c9275eca4386cb5771d62808e7de53d4fe8f0923f73474bd97e933c8
-size 33100
+oid sha256:b1835abce4bbf94590dd7e53387987bfee770bca173639c42b4b2b2587719198
+size 35113
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
index 05eabd23a4..d703fd166b 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe5aade89a3afa13f2d9e0eea8a94c133e1e50f91a35d28d42a92c4e4d3baaf0
-size 35285
+oid sha256:1d1f4f05037d4ad192067d189dc9fddc860d55dceed95a98ae70b57ef3b74a48
+size 37097
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
index af030ef6ef..483f10f66f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9eef5ef526837a00762336f1df6d900500b7956dc70d95b4619f80c4f158b0ee
-size 42459
+oid sha256:3b63477c6dcd324babb989a5bfdccdec99dde345a134e267c13127869748accc
+size 42670
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
index ad155142c2..d661dc86fd 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f038763501f54386b7751684d0aa1402320e9d913bb231cb422da06a02fce300
-size 41427
+oid sha256:596e2613127ccb7ae3f2362727082a473ba617e8ad05a61fece2ada05b0b8c14
+size 42006
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
index 0c8f52659d..bd8f4f8830 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_7_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc543c855b813e48a2e0140555ab9d34ca3c30aa5f9afdc56bafdaae4eb2b476
-size 43529
+oid sha256:aceffc8c16afc95f26a0aabb861aaba630ea0a9365ca1da3ad7a483ab6451282
+size 43740
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
index cb41bda82b..c26265b201 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_8_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a1370d804e4f71194ce4a07f449fbe1c21bb6e3f4de7d42f92ff17b653d1f554
-size 42409
+oid sha256:011c18ce9dd7bc99bc9f09ce4f296aafc619d83ddc4f94f1465b49925591705a
+size 42625
diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
index 8418b73ae1..0b06aa53b8 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl_RoomDetails_9_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cab876c15147e3745112d63154d8097b685cc5d4abb76c2b6600f9334bd449f
-size 42395
+oid sha256:b3971573f164e80b6e59bca91e32fdb1b5336086561e69148c22b1e7bb396935
+size 42601
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_en.png
new file mode 100644
index 0000000000..33e4177147
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Day_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da5423fd025457b1465b9c3073a8ffa29e24f7eec379bbdb43473b2ab4e57257
+size 25968
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Night_0_en.png
new file mode 100644
index 0000000000..3e218b0b78
--- /dev/null
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListDeclineInviteMenuContent_Night_0_en.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5830c192e065e7e59c7995d1079fd2abd08d3aa5cc41fea41505daf6c64e17a8
+size 25245
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en.png
index f329086404..41b808d546 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e12a4d0611f4cd286afe1fecba2e8998995fbad463caaa05dce9475b298d040e
-size 18973
+oid sha256:49e9723d3b41096d7d3ddd29601e1bf510d2a1f92e1ef0d5ada2e0d84ceb19bc
+size 22189
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en.png
index 9c33ba1ce0..939137422f 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:902990e5b54b9e53dd1b8ebf8a3739e0772411c34027b0297c8e363e75dce138
-size 20772
+oid sha256:174037d1706a96148acba807bcb89b3a4e840a3ceb5f6c56550e4f0296f42741
+size 22452
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en.png
index c65254de68..c30a6637e6 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Day_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6361b17cacbb8e41211a385cbb3e66b5bfa7ba8b5710b76b21eb679357cf8a08
-size 21029
+oid sha256:93a9294ae555735ef7fa238f277ec694d8cde7207a270c417714a514eed0e7ba
+size 24028
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en.png
index 4be348ef79..c2aa4ab638 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:749b47983c45b07ad9a1ce72ae31371d39c66435cb1168d3e1ea4c551f9516fa
-size 18258
+oid sha256:6435bc1f5e506257f3a0e6cfd4fc5e500c143d7f396a44e5f74df63ca37e230d
+size 21459
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en.png
index c51578a597..c42cf1e345 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b922fea887898cb032ee881bb397b0897a8e5618eedfc5263bb8c6df5abf290
-size 19975
+oid sha256:40269776883b9c524236936dcc2bb4110a96d381efb68c46a32ff7739220996d
+size 21738
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en.png
index 29e86e956e..800611b721 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListModalBottomSheetContent_Night_2_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cea937451ef247ba0e2bcd4bde84bff258f620682df315a6f1c2c4bb975ccd3a
-size 20175
+oid sha256:f7638ef3bdead48705bac34df1450614d696a9e7ccbfdb70ed68b10bb0fbabf3
+size 23231
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_3_en.png
index a4e5a18c5c..20806bc42c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e5a824bd3d89bb853630704d5033404a093c830c3230a918ecbb13ca8c3bc8c
-size 62048
+oid sha256:4385b380efbae924d4a8fece278a61003d40acbd795fef1aa2eab4c5fadbf367
+size 60691
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_4_en.png
index e7a86d5b09..1b34b511fb 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1ded2f89fe73b0f695b097b47a2461dbaaa76ad15f4d359a8c2f47173913af7
-size 61795
+oid sha256:7d64fa49cfca399eb073a8efac881aebbfed38726116d3113f9a562245ac9a41
+size 60495
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_5_en.png
index 43b441d3f8..13db73a34e 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Day_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a0eb6c87e9d565c7a21d6a9ec136274f5e75dfc467010935a8a5cc63933c672
-size 60038
+oid sha256:020d732b7b3a4f43918bee7b9424ffd03fe20074c5823341811a1c700551b2f2
+size 58734
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_3_en.png
index c685c4fc18..611da1630c 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_3_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_3_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:874fab965a108478a8049c93d3ade9d7eac5d2fff44adc91f06eebffd99d7e7e
-size 70380
+oid sha256:acde7691ec0ebe690bcb29478963107e2dc0fe6fa54892b3600f50e0cf1db2a3
+size 69463
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_4_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_4_en.png
index f3274bfcaa..642eca994d 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_4_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_4_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:182892a050673f4cdc4be1562d2b05ace0c9d6fe6f4598942e218879b667d9dd
-size 70137
+oid sha256:38e55635243d77c084053c4feea03dcedabd549aa556f4a622ec2d629bb4f426
+size 69240
diff --git a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_5_en.png b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_5_en.png
index c05ce5235e..0604b0bc73 100644
--- a/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_5_en.png
+++ b/tests/uitests/src/test/snapshots/images/features.roomlist.impl_RoomListView_Night_5_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de8dd98f70665a8e556e4403df748e52518091bf08b9b18e5f65b2d7926f3d05
-size 68343
+oid sha256:1fc45bd4279456b75cadcb8381451f9e6a0e1fadaf4a8f22274c94aa89c7c348
+size 67496
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png
index 051fb4663a..b807f029dc 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Day_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a1ad0dcf6187838d37d7a6f9362e6fed44af4687b0494404a5343bc2de24723
-size 17311
+oid sha256:d4e6027ed8a8c11bc294add70bb67986fc52c70a51a3410e35f6bab2a8a71a9a
+size 17211
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png
index d660788789..ece67b62f4 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.atomic.molecules_InfoListItemMolecule_Night_0_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8dfb1d166afbd78aa6807be751cd98cb4f5f704dafa46a7b9c98e9376c9f7f1c
-size 16678
+oid sha256:7201f6fb1368435a944b07a557a595509afa01d70cafa9ec0f4d8ff46db95482
+size 16521
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
index 0cc0061903..b474eb2020 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingCheckbox_List_item_(1_line)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:931481a1fb63f4dc01f5ec120b655d6acf3b03a6feece8a8fbe0daeaebcb61cc
-size 10678
+oid sha256:561127e23c0bce4281725a639c95242e120a0ff7f289ec8012294dc627af7cf4
+size 10681
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
index af8ca24222..350ddc194a 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingRadioButton_List_item_(1_line)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef70bc4aaafa730bac6584014bc4fa6291fd5290711497bef6334e969e6959b4
-size 13250
+oid sha256:4fcbf70ce869c505e85f21458bce6e24c2241c0ab7b850681ef4c244dd42c94e
+size 13135
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
index 5e2672fe54..3198e70baf 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineLeadingSwitch_List_item_(1_line)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c105ade197c90cbdd773da3cc8082792ae305704a76e211c230f3a4fcc7d5abd
-size 17909
+oid sha256:79cfec30a9109ed025bfdbf41bfafb75ec6716724f12c5f14f8b322156579e6e
+size 17625
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
index 4383d7cce5..5a46ccad85 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingCheckBox_List_item_(1_line)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e36b943b5ab7ff1750d63b6ec856d341a04e249c48698d6fb606dce1cdae50c
-size 10606
+oid sha256:5d922db570b982ca36125a043ba1f57e573760800066f6bfc3e61fb8d17dc8c4
+size 10611
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
index e5a64ea854..9df59f8971 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingRadioButton_List_item_(1_line)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58f68cea7244703ee8e22a5f3ff33ec6d0959c2d695ef7a460cc675637025228
-size 13234
+oid sha256:b0ff7f9ff66f346e86e82756e403811f136a9813f22589c3cc32c1d60a71ed7f
+size 13106
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
index 497202438e..382a773aac 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemSingleLineTrailingSwitch_List_item_(1_line)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:386b3da0825689ae023ef738d557711aee454cc73aa53872951091e0c33b780c
-size 17644
+oid sha256:3dac42d73f49f877fcb6fb3c665603375d6eaca8869442868e734a15e76796da
+size 17388
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
index 5ff5abefbf..bb3acbc43b 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingCheckbox_List_item_(3_lines)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9013763c103b76796b2aaedf8fd4f470ca4372ecca8d115b59ff5f00b08f4f3
-size 41697
+oid sha256:c1548c6f1689a996a63124ffda33b3f7605de5768a4bd6f65c7b1ab469715ddf
+size 41723
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
index 50af415a4f..3ac83a76c9 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingRadioButton_List_item_(3_lines)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d7561472314ea7f56f80086897d2547e840c04425e317d62f3acb2a7959ba44e
-size 44022
+oid sha256:87578f4f5f6c145f884034120d37ca72738d94570250b81920e9367e65f63710
+size 43932
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
index a788aac61a..be6be53600 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesLeadingSwitch_List_item_(3_lines)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:02fd327d87c9b3e7d4e07a665a5242432c26cd0eaedd05a645c9f44296007dcd
-size 48227
+oid sha256:82c64c6bf6da748cf9b29081392296f0aeb7d9711dab834e1af62e20dbe2f8da
+size 48069
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
index 37b4420bd5..326b590e60 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingCheckBox_List_item_(3_lines)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3caa1ea352417833395592c2d35b0c176ee991748796850b26fefb4c22dcd6da
-size 42048
+oid sha256:251cdade6428df13fb3ef77d557e4919068d60c60d81279b5e29ec6b2d92b054
+size 42064
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
index 12c26dee05..c00f37c4f0 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingRadioButton_List_item_(3_lines)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8d7dff8473263b10d5e717d4f0de8f0ab7f0ff9678d599823895ef3c28b8e5a
-size 44285
+oid sha256:f0d5855a3c319d430945515824a337076d237dc63613181cb0cc5717776293c5
+size 44241
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
index b342cad9e9..dc537aaf34 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemThreeLinesTrailingSwitch_List_item_(3_lines)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1b262c93bf96b3f1cd160ce84203489c315494d2292f3985f514b0feab280bf0
-size 48035
+oid sha256:64c674cc76cba8bdb27b416a68ae9d4ab170a17f41bc06df2e88e981b7128c69
+size 47919
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
index 57762d5e58..e09d4d86ee 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckboxError_List_item_(2_lines)_-_Leading_Checkbox_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d4d25a2d81ae68068e3c69c82178a3aedf122eea767167ac743929ddbe739aae
-size 29612
+oid sha256:203a6626faf4df511645babde9e8eef76698924547c5b051e45b7a2104dc342c
+size 29646
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
index 4f20d64d40..2ae474e5ea 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingCheckbox_List_item_(2_lines)_-_Leading_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e273356ac0c1c3ba1033f31bfb04d33c82457467f680011804f6ba9b027bf620
-size 29523
+oid sha256:ad8304ad2b7f854bcd37bde6695e18fe9c6cb50cc579751101536c17113fc4b1
+size 29561
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
index ec3a5d234e..f888d2c040 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButtonError_List_item_(2_lines)_-_Leading_RadioButton_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b904675e4c1735ad6bb566ca8ca014532d005b21c77500f64475afe293baba74
-size 32213
+oid sha256:2c48bc9aa3aab2e897485a98c7d49291b7b3075b777f6e20503be6b06bb9256d
+size 32128
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
index 705b82af06..b3ef2b68f9 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingRadioButton_List_item_(2_lines)_-_Leading_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d21d8a2fa0ae1fee321079cc0cd752c24a2e4396cf512a8ad7164b63477b4de9
-size 32024
+oid sha256:bbfaae2c8c7c3d66d605d4bdad3e7d054ace167977aeefa6faabfa0d20efb8cb
+size 31947
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
index 9147c837db..4e51b798ac 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitchError_List_item_(2_lines)_-_Leading_Switch_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3ae4d1c58af99419e6f15d16e50b06d45ec8a0611137bd840f872cbb5eb347ae
-size 36455
+oid sha256:a67d10e2a98b6d474ea176b94ee6a5985d3f7ebe0b74502eaa7246a8f618f1e9
+size 36282
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
index 7283b06523..e8a6d444f8 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesLeadingSwitch_List_item_(2_lines)_-_Leading_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee41a7e7b529a976df2c5f3e152e6b090e15291abc6a24c5117c050d070e80da
-size 36072
+oid sha256:6f9f2041e2443931cddced74cf71852407db51d0846f503cc24ec852e6b2c54b
+size 35947
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
index b6fffa2da5..7b2c4a0522 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBoxError_List_item_(2_lines)_-_Trailing_Checkbox_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d57a9dc6d67f26bdda0d3192ada45f41945fda7e204763538e42cada37003ea2
-size 29906
+oid sha256:08473c64d289e750a99b9a0eedb46a0e4d3e2dc4a6f1acfb39f2fc19ba8c4217
+size 29935
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
index 47ae7db4cd..7c0f696449 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingCheckBox_List_item_(2_lines)_-_Trailing_Checkbox_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8ae9d48a57cd796bbb2a8d962b1094d42e07b0726232958fd45575dce5d6e42
-size 29830
+oid sha256:47a9c25c523166f10d0acf4498e9a4fd64f4f2ef125b49d2970e9e5f92a3cac1
+size 29853
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
index 3cb56b25f7..a24670b5dd 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButtonError_List_item_(2_lines)_-_Trailing_RadioButton_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:64bf18409a011ad7871cec5e25034862add9e4ac2d2ac0051bd15090f11f29cc
-size 32388
+oid sha256:ad0c8b79a03f82e5d3b1da8764acf7cb0a33c89b093e2b17f3f202d3ab5734c9
+size 32351
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
index 82b6cc9a95..5e950137a3 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingRadioButton_List_item_(2_lines)_-_Trailing_RadioButton_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:428e23a4e8074a009345b262b4b1652a4c98216353a78603f141251d6c182d43
-size 32183
+oid sha256:8ae2240ed721eee53d14afea75d8cc718ba32d428e0fba31c9e124d88f42b8e9
+size 32146
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
index 08c05d41d3..76dff08463 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitchError_List_item_(2_lines)_-_Trailing_Switch_-_Error_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a3871cd50b8a6aea809402de7f7a41ed3afae0da36988c4fbc3cf4639cb4b3a
-size 36443
+oid sha256:5b678e9204d4b1c248add757b1562a706710c12f997458644418d34db0e02423
+size 36299
diff --git a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
index 7400a5ecf1..c36610fcaa 100644
--- a/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
+++ b/tests/uitests/src/test/snapshots/images/libraries.designsystem.theme.components_ListItemTwoLinesTrailingSwitch_List_item_(2_lines)_-_Trailing_Switch_List_items_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6103e4db65702d046e12a460ed355f724f3fd1d07f7cba9c3d9c702d9947b3f5
-size 36030
+oid sha256:d40308160ebd69910d279499a08b88238b0288bb97ddd139e37ab4044123e573
+size 35935
diff --git a/tools/adb/oidc.sh b/tools/adb/oidc.sh
index 850495d921..6772977e83 100755
--- a/tools/adb/oidc.sh
+++ b/tools/adb/oidc.sh
@@ -8,7 +8,7 @@
 # Format is:
 
 # Error
-# adb shell am start -a android.intent.action.VIEW -d "io.element:/callback?error=access_denied\\&state=IFF1UETGye2ZA8pO"
+# adb shell am start -a android.intent.action.VIEW -d "io.element.android:/?error=access_denied\\&state=IFF1UETGye2ZA8pO"
 
 # Success
-adb shell am start -a android.intent.action.VIEW -d "io.element:/callback?state=IFF1UETGye2ZA8pO\\&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
+adb shell am start -a android.intent.action.VIEW -d "io.element.android:/?state=IFF1UETGye2ZA8pO\\&code=y6X1GZeqA3xxOWcTeShgv8nkgFJXyzWB"
diff --git a/tools/localazy/config.json b/tools/localazy/config.json
index 6fbe996585..e5d35def0c 100644
--- a/tools/localazy/config.json
+++ b/tools/localazy/config.json
@@ -57,7 +57,8 @@
       "name" : ":features:invite:impl",
       "includeRegex" : [
         "screen_invites_.*",
-        "screen\\.join_room\\.decline_and_block_.*"
+        "screen\\.join_room\\.decline_and_block_.*",
+        "screen\\.decline_and_block\\..*"
       ]
     },
     {
@@ -318,6 +319,12 @@
         "screen\\.room\\.single_knock_request.*",
         "screen\\.room\\.multiple_knock_requests.*"
       ]
+    },
+    {
+      "name" : ":features:reportroom:impl",
+      "includeRegex" : [
+        "screen\\.report_room\\..*"
+      ]
     }
   ]
 }