Merge branch 'develop' into separate_import_error

2025-10-02 14:33:55 -04:00
parent c3c5f80cac f5864f9f90
commit 9a7b273beb
2773 changed files with 29051 additions and 10914 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/build_enterprise.yml
+++ b/.github/workflows/build_enterprise.yml
@@ -39,7 +39,7 @@ jobs:
      - name: Clone submodules
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/fork-pr-notice.yml
+++ b/.github/workflows/fork-pr-notice.yml
@@ -15,7 +15,7 @@ jobs:
    if: github.event.pull_request.base.repo.full_name != github.event.pull_request.head.repo.full_name
    steps:
      - name: Add auto-generated commit warning
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
        with:
          script: |
            github.rest.issues.createComment({
--- a/.github/workflows/generate_github_pages.yml
+++ b/.github/workflows/generate_github_pages.yml
@@ -14,7 +14,7 @@ jobs:
      - name: ⏬ Checkout with LFS
        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -23,7 +23,7 @@ jobs:
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: 3.13
      - name: Run World screenshots generation script
--- a/.github/workflows/gradle-wrapper-update.yml
+++ b/.github/workflows/gradle-wrapper-update.yml
@@ -12,7 +12,7 @@ jobs:
    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
    steps:
      - uses: actions/checkout@v5
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
        name: Use JDK 21
        if: (github.event_name == 'pull_request' && github.event.pull_request.fork == null) || github.event_name == 'workflow_dispatch'
        with:
--- a/.github/workflows/maestro-local.yml
+++ b/.github/workflows/maestro-local.yml
@@ -28,7 +28,7 @@ jobs:
          # Ensure we are building the branch and not the branch after being merged on develop
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.ref }}
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
        name: Use JDK 21
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/nightlyReports.yml
+++ b/.github/workflows/nightlyReports.yml
@@ -21,7 +21,7 @@ jobs:
        uses: nschloe/action-cached-lfs-checkout@f46300cd8952454b9f0a21a3d133d4bd5684cfc2 # v1.2.3

      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -62,7 +62,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -13,7 +13,7 @@ jobs:

    steps:
      - name: Trigger pipeline
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
        with:
          github-token: ${{ secrets.ENTERPRISE_ACTIONS_TOKEN }}
          script: |
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -15,7 +15,7 @@ jobs:
      pull-requests: read
    steps:
      - name: Add notice
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
        if: contains(github.event.pull_request.labels.*.name, 'X-Blocked')
        with:
          script: |
@@ -39,7 +39,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN_READ_ORG }}
      - name: Add label
        if: steps.teams.outputs.isTeamMember == 'false'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
        with:
          script: |
            github.rest.issues.addLabels({
@@ -58,7 +58,7 @@ jobs:
      github.event.pull_request.head.repo.full_name != github.repository
    steps:
      - name: Close pull request
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
        with:
          script: |
            github.rest.issues.createComment({
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -35,7 +35,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: 3.13
      - name: Search for invalid screenshot files
@@ -47,7 +47,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -56,7 +56,7 @@ jobs:
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: 3.13
      - name: Search for invalid dependencies
@@ -85,7 +85,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -125,7 +125,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -169,7 +169,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -209,7 +209,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -249,7 +249,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -34,7 +34,7 @@ jobs:
        with:
          persist-credentials: false
      - name: ☕️ Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -61,7 +61,7 @@ jobs:
      - name: Clone submodules
        run: git submodule update --init --recursive
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -89,7 +89,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -28,7 +28,7 @@ jobs:
          # https://github.com/actions/checkout/issues/881
          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
--- a/.github/workflows/sync-localazy.yml
+++ b/.github/workflows/sync-localazy.yml
@@ -13,7 +13,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -22,7 +22,7 @@ jobs:
        with:
          cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: 3.13
      - name: Setup Localazy
--- a/.github/workflows/sync-sas-strings.yml
+++ b/.github/workflows/sync-sas-strings.yml
@@ -14,7 +14,7 @@ jobs:
    steps:
      - uses: actions/checkout@v5
      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
        with:
          python-version: 3.13
      - name: Install Prerequisite dependencies
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -47,7 +47,7 @@ jobs:
        if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'element-hq/element-x-android' }}
        run: git submodule update --init --recursive
      - name: ☕️ Use JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
        with:
          distribution: 'temurin' # See 'Supported distributions' for available options
          java-version: '21'
@@ -82,7 +82,7 @@ jobs:

      # https://github.com/codecov/codecov-action
      - name: ☂️ Upload coverage reports to codecov
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ captures/
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/copilot
+.idea/copilot.*
 .idea/inspectionProfiles
 # Shelved changes in the IDE
 .idea/shelf
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
  <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.2.10" />
+    <option name="version" value="2.2.20" />
  </component>
 </project>
--- a/.maestro/tests/account/verifySession.yaml
+++ b/.maestro/tests/account/verifySession.yaml
@@ -8,6 +8,6 @@ appId: ${MAESTRO_APP_ID}
 - hideKeyboard
 - tapOn: "Continue"
 - extendedWaitUntil:
-    visible: "Verification complete"
+    visible: "Device verified"
    timeout: 30000
 - tapOn: "Continue"
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,200 @@
+Changes in Element X v25.09.2
+=============================
+
+## What's Changed
+### ✨ Features
+* Show progress dialog while we are sending invites in a room by @richvdh in https://github.com/element-hq/element-x-android/pull/5342
+* Call: RTC decline event support by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/5305
+* Add room info to the thread's top app bar by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5374
+### 🙌 Improvements
+* Use the new RtcNotification event instead of the now deprecated CallNotify by @BillCarsonFr in https://github.com/element-hq/element-x-android/pull/5357
+### 🐛 Bugfixes
+* Increase Element Call audio init delay ensuring the right audio device is used by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5315
+* Do not center the dialog title text for dialogs with no icon by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5332
+* Media viewer: release the `ExoPlayers` when the hosting composables are disposed by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5351
+* Make PushData.clientSecret mandatory. by @bmarty in https://github.com/element-hq/element-x-android/pull/5369
+* Cleanup ftue code and ensure verification confirmation is displayed by @bmarty in https://github.com/element-hq/element-x-android/pull/5379
+* Change in clear cache behavior by @bmarty in https://github.com/element-hq/element-x-android/pull/5388
+* fix (room navigation) : fix navigation when leaving room/space by @ganfra in https://github.com/element-hq/element-x-android/pull/5376
+* fix (timeline) : forward pagination regression by @ganfra in https://github.com/element-hq/element-x-android/pull/5389
+* When joining a call, wait for the `content_loaded` action by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5399
+* Ensure the thread summary sender's display name won't wrap to the next line by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5403
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5349
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5385
+### 🧱 Build
+* Improve release script and the file Versions.kt by @bmarty in https://github.com/element-hq/element-x-android/pull/5318
+* Dependency: extract the Matrix SDK and add instructions for upgrading the library by @bmarty in https://github.com/element-hq/element-x-android/pull/5363
+* Add test on DefaultSpaceEntryPoint by @bmarty in https://github.com/element-hq/element-x-android/pull/5343
+### 🚧 In development 🚧
+* Space list by @bmarty in https://github.com/element-hq/element-x-android/pull/5320
+* Feature : Join Space (WIP) by @ganfra in https://github.com/element-hq/element-x-android/pull/5378
+### Dependency upgrades
+* Update activity to v1.11.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5324
+* Update dependency com.google.truth:truth to v1.4.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5322
+* Update dependency io.sentry:sentry-android to v8.21.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5310
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.10 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5323
+* Update dependency androidx.sqlite:sqlite-ktx to v2.6.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5337
+* Update camera to v1.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5336
+* Update dependency com.posthog:posthog-android to v3.21.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5333
+* Update dependency com.google.testparameterinjector:test-parameter-injector to v1.19 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5341
+* Upgrade Rust SDK bindings to v25.09.15 by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5353
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.16 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5359
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.18 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5365
+* Update telephoto to v0.17.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5350
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.19 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5377
+* Update dependency com.google.firebase:firebase-bom to v34.3.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5367
+* Upgrade Element Call embedded dependency to `v0.16.0-rc.4` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5391
+* Update dependencyAnalysis to v3 (major) by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5194
+* Update dependency org.maplibre.gl:android-sdk to v11.13.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5381
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.23 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5396
+* Update plugin dependencycheck to v12.1.5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5382
+* Update dependency io.sentry:sentry-android to v8.22.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5397
+### Others
+* Cleanup nodes by @bmarty in https://github.com/element-hq/element-x-android/pull/5358
+* Complete test on MediaGalleryPresenter by @bmarty in https://github.com/element-hq/element-x-android/pull/5361
+* Remove dead code by @bmarty in https://github.com/element-hq/element-x-android/pull/5306
+* Introduce BugReportFlowNode, and remove NavTarget.ViewLogs from RootFlowNode by @bmarty in https://github.com/element-hq/element-x-android/pull/5370
+* When logging out from Pin code screen, logout from all the sessions. by @bmarty in https://github.com/element-hq/element-x-android/pull/5372
+* Clean MatrixAuthenticationService and SessionStore API by @bmarty in https://github.com/element-hq/element-x-android/pull/5371
+* Add logs to detect duplicates in the room list by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5364
+* Add troubleshoot notification test about blocked users by @bmarty in https://github.com/element-hq/element-x-android/pull/5394
+* Add thread decoration with latest event details by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5355
+* Rework on messages view top bars by @bmarty in https://github.com/element-hq/element-x-android/pull/5401
+* Put developer settings at the end of the view by @p1gp1g in https://github.com/element-hq/element-x-android/pull/5387
+
+## New Contributors
+* @p1gp1g made their first contribution in https://github.com/element-hq/element-x-android/pull/5387
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.09.1...v25.09.2
+
+Changes in Element X v25.09.1
+=============================
+
+## What's Changed
+
+We have migrated our DI libraries from Dagger and Anvil to Metro. If you need more details on the migration steps, please read the [documentation](https://github.com/element-hq/element-x-android/blob/develop/docs/migration_to_metro.md).
+
+### ✨ Features
+* Allow replying to a message with an attachment by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5261
+* Add emoji search to the reaction emoji picker by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5255
+### 🙌 Improvements
+* Spelling correction in Update FeatureFlags.kt by @escix in https://github.com/element-hq/element-x-android/pull/5232
+* [a11y] Add content descriptions to room list item indicators by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5236
+* [a11y] Add click action to the message bottom sheet handle by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5228
+### 🐛 Bugfixes
+* Reload member list after moderation actions by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5268
+* Restore view log code by @bmarty in https://github.com/element-hq/element-x-android/pull/5294
+* Detect mime type when picking a file by @bmarty in https://github.com/element-hq/element-x-android/pull/5291
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5249
+* Sync Strings - new translations to Korean by @ElementBot in https://github.com/element-hq/element-x-android/pull/5286
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5290
+### 🧱 Build
+* Iterate on build chain by @bmarty in https://github.com/element-hq/element-x-android/pull/5272
+* Cleanup our DI solution and add documentation about the migration to Metro by @bmarty in https://github.com/element-hq/element-x-android/pull/5287
+* Revert agp to 8.11 by @bmarty in https://github.com/element-hq/element-x-android/pull/5311
+### 🚧 In development 🚧
+* Space: add content in home screen by @bmarty in https://github.com/element-hq/element-x-android/pull/5273
+* Hide the home navigation bar if the user is not a member of any Space. by @bmarty in https://github.com/element-hq/element-x-android/pull/5292
+### Dependency upgrades
+* Update dependency org.maplibre.gl:android-sdk to v11.13.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5239
+* Update dependency com.google.firebase:firebase-bom to v34.2.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5245
+* Update dependency com.posthog:posthog-android to v3.21.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5238
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.9.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5251
+* Update plugin sonarqube to v6.3.1.5724 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5235
+* Update android.gradle.plugin to v8.12.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5244
+* Update dependency io.element.android:emojibase-bindings to v1.4.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5250
+* Update actions/setup-python action to v6 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5270
+* Update dependency com.posthog:posthog-android to v3.21.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5275
+* Migrate Anvil KSP to Metro by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5253
+* Update actions/github-script action to v8 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5284
+* Update codecov/codecov-action action to v5.5.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5274
+* Update dependency io.sentry:sentry-android to v8.21.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5293
+### Others
+* Remove LoginUserStory. by @bmarty in https://github.com/element-hq/element-x-android/pull/5237
+* Update state in runUpdatingState when CancellationException occurs by @jbrenorv in https://github.com/element-hq/element-x-android/pull/5243
+* Refactor: Move InMemorySessionStore to test module by @bmarty in https://github.com/element-hq/element-x-android/pull/5252
+* Enable `largeHeap` option to have a larger max heap size by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5258
+* Set a custom request config for the Client by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5266
+* Set shortcut ID on received notifications to make them appear as a Conversation by @frebib in https://github.com/element-hq/element-x-android/pull/5192
+* Improve management of shortcut ids. by @bmarty in https://github.com/element-hq/element-x-android/pull/5303
+
+## New Contributors
+* @escix made their first contribution in https://github.com/element-hq/element-x-android/pull/5232
+* @jbrenorv made their first contribution in https://github.com/element-hq/element-x-android/pull/5243
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.09.0...v25.09.1
+
+Changes in Element X v25.09.0
+=============================
+
+This release is the same as `25.08.4` but it includes performance fixes for the timeline load times, included in the Rust SDK version upgrade and internal changes for Element Call.
+
+## What's Changed
+### 🧱 Build
+* Revert "Try following KSP incremental best practices on `anvilcodegen`" by @bmarty in https://github.com/element-hq/element-x-android/pull/5233
+### Dependency upgrades
+* Update dependency io.element.android:element-call-embedded to v0.15.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5229
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.8.26 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5230
+* Downgrade sonar scanner gradle plugin to `v6.2.0.5505` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5234
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.08.4...v25.09.0
+
+Changes in Element X v25.08.4
+=============================
+
+## What's Changed
+### ✨ Features
+* Threads  - first iteration by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5165
+* Add shortcut suggestions for rooms, remove then when leaving by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5180
+* Allow replying to any remote message in a thread by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5201
+### 🙌 Improvements
+* Create room flow rework by @bmarty in https://github.com/element-hq/element-x-android/pull/5166
+### 🐛 Bugfixes
+* Fix bitrate value used for video transcoding by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5183
+* Fix sending videos in Android 11 and lower by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5186
+* Ensure that only one DataStore is active for the same file. by @bmarty in https://github.com/element-hq/element-x-android/pull/5198
+* Handle preference stores corruption by clearing them by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5086
+* Use variable bitrate mode when transcoding to ensure compatibility with old devices by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5223
+### 🗣 Translations
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5178
+* Sync Strings by @ElementBot in https://github.com/element-hq/element-x-android/pull/5211
+### 🧱 Build
+* Build release with the latest build tools 36.0.0 by @bmarty in https://github.com/element-hq/element-x-android/pull/5173
+* Try following KSP incremental best practices on `anvilcodegen` by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5205
+* Split deeplink module and remove setupAnvil from api modules by @bmarty in https://github.com/element-hq/element-x-android/pull/5210
+* Introduce a11y screenshot test by @bmarty in https://github.com/element-hq/element-x-android/pull/5214
+* Custom logo on on boarding screen. by @bmarty in https://github.com/element-hq/element-x-android/pull/5217
+### 🚧 In development 🚧
+* Space UI component by @bmarty in https://github.com/element-hq/element-x-android/pull/5197
+* Add UI components for spaces. by @bmarty in https://github.com/element-hq/element-x-android/pull/5207
+### Dependency upgrades
+* Update core to v1.17.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5168
+* Update kotlin by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5169
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.8.18 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5182
+* Update android.gradle.plugin to v8.12.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5184
+* Update dagger to v2.57.1 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5193
+* Update actions/setup-java action to v5 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5196
+* Update codecov/codecov-action action to v5.5.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5191
+* Update plugin ktlint to v13.1.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5204
+* Update dependency com.posthog:posthog-android to v3.20.3 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5206
+* Update dependency org.jsoup:jsoup to v1.21.2 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5212
+* Update dependency com.posthog:posthog-android to v3.20.4 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5213
+* Update plugin sonarqube to v6.3.0.5676 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5220
+* Update dependency io.sentry:sentry-android to v8.20.0 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5216
+* Update dependency org.matrix.rustcomponents:sdk-android to v25.8.25 by @renovate[bot] in https://github.com/element-hq/element-x-android/pull/5219
+### Others
+* Iterate on invite people UI by @bmarty in https://github.com/element-hq/element-x-android/pull/5185
+* AnalyticsOptInStateProvider does not need to have an injected constructor by @bmarty in https://github.com/element-hq/element-x-android/pull/5215
+* Add extra logs for sending media by @jmartinesp in https://github.com/element-hq/element-x-android/pull/5218
+* Rename custom_logo to onboarding_logo by @bmarty in https://github.com/element-hq/element-x-android/pull/5226
+* Add unit test on VideoCompressorHelper by @bmarty in https://github.com/element-hq/element-x-android/pull/5227
+
+
+**Full Changelog**: https://github.com/element-hq/element-x-android/compare/v25.08.3...v25.08.4
+
 Changes in Element X v25.08.3
 =============================

--- a/anvilannotations/.gitignore
+++ b/anvilannotations/.gitignore
--- a/anvilannotations/build.gradle.kts
+++ b/anvilannotations/build.gradle.kts
@@ -8,7 +8,3 @@ plugins {
    alias(libs.plugins.kotlin.jvm)
    id("com.android.lint")
 }
-
-dependencies {
-    api(libs.inject)
-}
--- a/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
+++ b/anvilannotations/src/main/kotlin/io/element/android/anvilannotations/ContributesNode.kt
@@ -5,7 +5,7 @@
 * Please see LICENSE files in the repository root for full details.
 */

-package io.element.android.anvilannotations
+package io.element.android.annotations

 import kotlin.reflect.KClass

@@ -13,7 +13,7 @@ import kotlin.reflect.KClass
 * Adds Node to the specified component graph.
 * Equivalent to the following declaration:
 *
- * @Module
+ * @BindingContainer
 * @ContributesTo(Scope::class)
 * abstract class YourNodeModule {

--- a/anvilcodegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
+++ b/anvilcodegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -1 +0,0 @@
-io.element.android.anvilcodegen.ContributesNodeProcessorProvider
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,7 +13,6 @@ import com.android.build.gradle.tasks.GenerateBuildConfig
 import com.google.firebase.appdistribution.gradle.firebaseAppDistribution
 import config.BuildTimeConfig
 import extension.AssetCopyTask
-import extension.ComponentMergingStrategy
 import extension.GitBranchNameValueSource
 import extension.GitRevisionValueSource
 import extension.allEnterpriseImpl
@@ -23,8 +22,9 @@ import extension.allServicesImpl
 import extension.buildConfigFieldStr
 import extension.koverDependencies
 import extension.locales
-import extension.setupAnvil
+import extension.setupDependencyInjection
 import extension.setupKover
+import extension.testCommonDependencies
 import java.util.Locale

 plugins {
@@ -37,7 +37,7 @@ plugins {
    alias(libs.plugins.licensee)
    alias(libs.plugins.kotlin.serialization)
    // To be able to update the firebase.xml files, uncomment and build the project
-    // id("com.google.gms.google-services")
+    // alias(libs.plugins.gms.google.services)
 }

 setupKover()
@@ -103,7 +103,8 @@ android {
    }

    val baseAppName = BuildTimeConfig.APPLICATION_NAME
-    logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName)")
+    val buildType = if (isEnterpriseBuild) "Enterprise" else "FOSS"
+    logger.warnInBox("Building ${defaultConfig.applicationId} ($baseAppName) [$buildType]")

    buildTypes {
        val oidcRedirectSchemeBase = BuildTimeConfig.METADATA_HOST_REVERSED ?: "io.element.android"
@@ -247,11 +248,7 @@ knit {
    }
 }

-setupAnvil(
-    generateDaggerCode = true,
-    generateDaggerFactoriesUsingAnvil = false,
-    componentMergingStrategy = ComponentMergingStrategy.KSP,
-)
+setupDependencyInjection()

 dependencies {
    allLibrariesImpl()
@@ -260,6 +257,7 @@ dependencies {
        allEnterpriseImpl(project)
        implementation(projects.appicon.enterprise)
    } else {
+        implementation(projects.features.enterprise.implFoss)
        implementation(projects.appicon.element)
    }
    allFeaturesImpl(project)
@@ -293,12 +291,7 @@ dependencies {

    implementation(libs.matrix.emojibase.bindings)

-    testImplementation(libs.test.junit)
-    testImplementation(libs.test.robolectric)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
+    testCommonDependencies(libs)
    testImplementation(projects.libraries.matrix.test)
    testImplementation(projects.services.toolbox.test)

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
+        android:largeHeap="true"
        android:localeConfig="@xml/locales_config"
        android:networkSecurityConfig="@xml/network_security_config"
        android:roundIcon="@mipmap/ic_launcher_round"
--- a/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
+++ b/app/src/main/kotlin/io/element/android/x/ElementXApplication.kt
@@ -9,16 +9,16 @@ package io.element.android.x

 import android.app.Application
 import androidx.startup.AppInitializer
+import dev.zacsweers.metro.createGraphFactory
 import io.element.android.features.cachecleaner.api.CacheCleanerInitializer
-import io.element.android.libraries.di.DaggerComponentOwner
-import io.element.android.x.di.AppComponent
-import io.element.android.x.di.DaggerAppComponent
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
+import io.element.android.x.di.AppGraph
 import io.element.android.x.info.logApplicationInfo
 import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.PlatformInitializer

-class ElementXApplication : Application(), DaggerComponentOwner {
-    override val daggerComponent: AppComponent = DaggerAppComponent.factory().create(this)
+class ElementXApplication : Application(), DependencyInjectionGraphOwner {
+    override val graph: AppGraph = createGraphFactory<AppGraph.Factory>().create(this)

    override fun onCreate() {
        super.onCreate()
--- a/app/src/main/kotlin/io/element/android/x/MainNode.kt
+++ b/app/src/main/kotlin/io/element/android/x/MainNode.kt
@@ -21,8 +21,8 @@ import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import io.element.android.appnav.RootFlowNode
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
+import io.element.android.libraries.di.annotations.ApplicationContext
 import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize

@@ -38,8 +38,8 @@ class MainNode(
    buildContext = buildContext,
    plugins = plugins,
 ),
-    DaggerComponentOwner {
-    override val daggerComponent = (context as DaggerComponentOwner).daggerComponent
+    DependencyInjectionGraphOwner {
+    override val graph = (context as DependencyInjectionGraphOwner).graph

    override fun resolve(navTarget: RootNavTarget, buildContext: BuildContext): Node {
        return createNode<RootFlowNode>(buildContext = buildContext)
--- a/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppBindings.kt
@@ -7,7 +7,8 @@

 package io.element.android.x.di

-import com.squareup.anvil.annotations.ContributesTo
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.api.MigrationEntryPoint
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.lockscreen.api.LockScreenEntryPoint
@@ -15,7 +16,6 @@ import io.element.android.features.lockscreen.api.LockScreenService
 import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.matrix.api.platform.InitPlatformService
 import io.element.android.libraries.matrix.api.tracing.TracingService
--- a/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppComponent.kt
@@ -1,28 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
- * Please see LICENSE files in the repository root for full details.
- */
-
-package io.element.android.x.di
-
-import android.content.Context
-import com.squareup.anvil.annotations.MergeComponent
-import dagger.BindsInstance
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.di.SingleIn
-
-@SingleIn(AppScope::class)
-@MergeComponent(AppScope::class)
-interface AppComponent : NodeFactoriesBindings {
-    @MergeComponent.Factory
-    interface Factory {
-        fun create(
-            @ApplicationContext @BindsInstance
-            context: Context
-        ): AppComponent
-    }
-}
--- a/app/src/main/kotlin/io/element/android/x/di/AppGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppGraph.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.di
+
+import android.content.Context
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.annotations.ApplicationContext
+
+@DependencyGraph(AppScope::class)
+interface AppGraph : NodeFactoriesBindings {
+    val sessionGraphFactory: SessionGraph.Factory
+
+    @DependencyGraph.Factory
+    interface Factory {
+        fun create(
+            @ApplicationContext @Provides
+            context: Context
+        ): AppGraph
+    }
+}
--- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt
@@ -11,9 +11,11 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Resources
 import androidx.preference.PreferenceManager
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.SingleIn
 import io.element.android.appconfig.ApplicationConfig
 import io.element.android.features.enterprise.api.EnterpriseService
 import io.element.android.features.messages.impl.timeline.components.customreaction.DefaultEmojibaseProvider
@@ -23,24 +25,23 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.core.meta.BuildType
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
+import io.element.android.libraries.di.BaseDirectory
 import io.element.android.libraries.di.CacheDirectory
-import io.element.android.libraries.di.SingleIn
 import io.element.android.libraries.di.annotations.AppCoroutineScope
+import io.element.android.libraries.di.annotations.ApplicationContext
 import io.element.android.x.BuildConfig
 import io.element.android.x.R
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.plus
 import java.io.File

-@Module
+@BindingContainer
@ContributesTo(AppScope::class)
 object AppModule {
    @Provides
+    @BaseDirectory
    fun providesBaseDirectory(@ApplicationContext context: Context): File {
        return File(context.filesDir, "sessions")
    }
@@ -105,11 +106,7 @@ object AppModule {
    @Provides
    @SingleIn(AppScope::class)
    fun providesCoroutineDispatchers(): CoroutineDispatchers {
-        return CoroutineDispatchers(
-            io = Dispatchers.IO,
-            computation = Dispatchers.Default,
-            main = Dispatchers.Main,
-        )
+        return CoroutineDispatchers.Default
    }

    @Provides
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultRoomComponentFactory.kt
@@ -7,20 +7,19 @@

 package io.element.android.x.di

-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.appnav.di.RoomComponentFactory
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.libraries.di.SessionScope
 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 {
+@Inject
+class DefaultRoomGraphFactory(
+    private val sessionGraph: SessionGraph,
+) : RoomGraphFactory {
    override fun create(room: JoinedRoom): Any {
-        return roomComponentBuilder
-            .joinedRoom(room)
-            .baseRoom(room)
-            .build()
+        return sessionGraph.roomGraphFactory
+            .create(room, room)
    }
 }
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionComponentFactory.kt
@@ -1,23 +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.x.di
-
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.appnav.di.SessionComponentFactory
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.matrix.api.MatrixClient
-import javax.inject.Inject
-
-@ContributesBinding(AppScope::class)
-class DefaultSessionComponentFactory @Inject constructor(
-    private val sessionComponentBuilder: SessionComponent.Builder
-) : SessionComponentFactory {
-    override fun create(client: MatrixClient): Any {
-        return sessionComponentBuilder.client(client).build()
-    }
-}
--- a/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/DefaultSessionGraphFactory.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.x.di
+
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import io.element.android.appnav.di.SessionGraphFactory
+import io.element.android.libraries.matrix.api.MatrixClient
+
+@ContributesBinding(AppScope::class)
+@Inject
+class DefaultSessionGraphFactory(
+    private val appGraph: AppGraph
+) : SessionGraphFactory {
+    override fun create(client: MatrixClient): Any {
+        return appGraph.sessionGraphFactory.create(client)
+    }
+}
--- a/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomComponent.kt
@@ -1,38 +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.x.di
-
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.MergeSubcomponent
-import dagger.BindsInstance
-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.BaseRoom
-import io.element.android.libraries.matrix.api.room.JoinedRoom
-
-@SingleIn(RoomScope::class)
-@MergeSubcomponent(RoomScope::class)
-interface RoomComponent : NodeFactoriesBindings {
-    @MergeSubcomponent.Builder
-    interface Builder {
-        @BindsInstance
-        fun joinedRoom(room: JoinedRoom): Builder
-
-        @BindsInstance
-        fun baseRoom(room: BaseRoom): Builder
-
-        fun build(): RoomComponent
-    }
-
-    @ContributesTo(SessionScope::class)
-    interface ParentBindings {
-        fun roomComponentBuilder(): Builder
-    }
-}
--- a/app/src/main/kotlin/io/element/android/x/di/RoomGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/RoomGraph.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.x.di
+
+import dev.zacsweers.metro.GraphExtension
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.RoomScope
+import io.element.android.libraries.matrix.api.room.BaseRoom
+import io.element.android.libraries.matrix.api.room.JoinedRoom
+
+@GraphExtension(RoomScope::class)
+interface RoomGraph : NodeFactoriesBindings {
+    @GraphExtension.Factory
+    interface Factory {
+        fun create(
+            @Provides joinedRoom: JoinedRoom,
+            @Provides baseRoom: BaseRoom
+        ): RoomGraph
+    }
+}
--- a/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/SessionComponent.kt
@@ -1,34 +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.x.di
-
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.MergeSubcomponent
-import dagger.BindsInstance
-import io.element.android.libraries.architecture.NodeFactoriesBindings
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.SessionScope
-import io.element.android.libraries.di.SingleIn
-import io.element.android.libraries.matrix.api.MatrixClient
-
-@SingleIn(SessionScope::class)
-@MergeSubcomponent(SessionScope::class)
-interface SessionComponent : NodeFactoriesBindings {
-    @MergeSubcomponent.Builder
-    interface Builder {
-        @BindsInstance
-        fun client(matrixClient: MatrixClient): Builder
-
-        fun build(): SessionComponent
-    }
-
-    @ContributesTo(AppScope::class)
-    interface ParentBindings {
-        fun sessionComponentBuilder(): Builder
-    }
-}
--- a/app/src/main/kotlin/io/element/android/x/di/SessionGraph.kt
+++ b/app/src/main/kotlin/io/element/android/x/di/SessionGraph.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.x.di
+
+import dev.zacsweers.metro.GraphExtension
+import dev.zacsweers.metro.Provides
+import io.element.android.libraries.architecture.NodeFactoriesBindings
+import io.element.android.libraries.di.SessionScope
+import io.element.android.libraries.matrix.api.MatrixClient
+
+@GraphExtension(SessionScope::class)
+interface SessionGraph : NodeFactoriesBindings {
+    val roomGraphFactory: RoomGraph.Factory
+
+    @GraphExtension.Factory
+    interface Factory {
+        fun create(@Provides matrixClient: MatrixClient): SessionGraph
+    }
+}
--- a/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
+++ b/app/src/main/kotlin/io/element/android/x/initializer/CrashInitializer.kt
@@ -10,10 +10,14 @@ package io.element.android.x.initializer
 import android.content.Context
 import androidx.startup.Initializer
 import io.element.android.features.rageshake.impl.crash.VectorUncaughtExceptionHandler
+import io.element.android.features.rageshake.impl.di.RageshakeBindings
+import io.element.android.libraries.architecture.bindings

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

    override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
--- a/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/intent/DefaultIntentProvider.kt
@@ -10,19 +10,20 @@ package io.element.android.x.intent
 import android.content.Context
 import android.content.Intent
 import androidx.core.net.toUri
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.deeplink.DeepLinkCreator
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.ApplicationContext
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import io.element.android.libraries.deeplink.api.DeepLinkCreator
+import io.element.android.libraries.di.annotations.ApplicationContext
 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.push.impl.intent.IntentProvider
 import io.element.android.x.MainActivity
-import javax.inject.Inject

@ContributesBinding(AppScope::class)
-class DefaultIntentProvider @Inject constructor(
+@Inject
+class DefaultIntentProvider(
    @ApplicationContext private val context: Context,
    private val deepLinkCreator: DeepLinkCreator,
 ) : IntentProvider {
@@ -33,7 +34,7 @@ class DefaultIntentProvider @Inject constructor(
    ): Intent {
        return Intent(context, MainActivity::class.java).apply {
            action = Intent.ACTION_VIEW
-            data = deepLinkCreator.room(sessionId, roomId, threadId).toUri()
+            data = deepLinkCreator.create(sessionId, roomId, threadId).toUri()
        }
    }
 }
--- a/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
+++ b/app/src/main/kotlin/io/element/android/x/oidc/DefaultOidcRedirectUrlProvider.kt
@@ -7,15 +7,16 @@

 package io.element.android.x.oidc

-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.di.AppScope
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 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(
+@Inject
+class DefaultOidcRedirectUrlProvider(
    private val stringProvider: StringProvider,
 ) : OidcRedirectUrlProvider {
    override fun provide() = buildString {
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -9,6 +9,7 @@
    <locale android:name="el"/>
    <locale android:name="en"/>
    <locale android:name="en_US"/>
+    <locale android:name="eo"/>
    <locale android:name="es"/>
    <locale android:name="et"/>
    <locale android:name="eu"/>
@@ -19,6 +20,7 @@
    <locale android:name="in"/>
    <locale android:name="it"/>
    <locale android:name="ka"/>
+    <locale android:name="ko"/>
    <locale android:name="lt"/>
    <locale android:name="nb"/>
    <locale android:name="nl"/>
--- a/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
+++ b/app/src/test/kotlin/io/element/android/x/intent/DefaultIntentProviderTest.kt
@@ -5,15 +5,22 @@
 * Please see LICENSE files in the repository root for full details.
 */

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

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

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

--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@@ -8,7 +8,8 @@
@file:Suppress("UnstableApiUsage")

 import extension.allFeaturesApi
-import extension.setupAnvil
+import extension.setupDependencyInjection
+import extension.testCommonDependencies

 plugins {
    id("io.element.android-compose-library")
@@ -19,15 +20,17 @@ android {
    namespace = "io.element.android.appnav"
 }

-setupAnvil()
+setupDependencyInjection()

 dependencies {
    allFeaturesApi(project)

    implementation(projects.libraries.core)
+    implementation(projects.libraries.accountselect.api)
    implementation(projects.libraries.androidutils)
    implementation(projects.libraries.architecture)
-    implementation(projects.libraries.deeplink)
+    implementation(projects.libraries.deeplink.api)
+    implementation(projects.libraries.featureflag.api)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.oidc.api)
    implementation(projects.libraries.preferences.api)
@@ -35,6 +38,7 @@ dependencies {
    implementation(projects.libraries.pushproviders.api)
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.uiCommon)
    implementation(projects.libraries.uiStrings)
    implementation(projects.features.login.api)

@@ -42,18 +46,12 @@ dependencies {

    implementation(projects.features.ftue.api)
    implementation(projects.features.share.api)
-    implementation(projects.features.viewfolder.api)

    implementation(projects.services.apperror.impl)
    implementation(projects.services.appnavstate.api)
    implementation(projects.services.analytics.api)

-    testImplementation(libs.test.junit)
-    testImplementation(libs.test.robolectric)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
+    testCommonDependencies(libs)
    testImplementation(projects.features.login.test)
    testImplementation(projects.libraries.matrix.test)
    testImplementation(projects.libraries.oidc.test)
@@ -61,11 +59,8 @@ dependencies {
    testImplementation(projects.libraries.push.test)
    testImplementation(projects.libraries.pushproviders.test)
    testImplementation(projects.features.networkmonitor.test)
-    testImplementation(projects.tests.testutils)
    testImplementation(projects.features.rageshake.test)
    testImplementation(projects.services.appnavstate.test)
    testImplementation(projects.services.analytics.test)
    testImplementation(projects.services.toolbox.test)
-    testImplementation(libs.test.appyx.junit)
-    testImplementation(libs.test.arch.core)
 }
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInAppScopeFlowNode.kt
@@ -22,29 +22,30 @@ import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.node.ParentNode
 import com.bumble.appyx.core.plugin.Plugin
 import com.bumble.appyx.core.plugin.plugins
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
-import io.element.android.appnav.di.SessionComponentFactory
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.appnav.di.SessionGraphFactory
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import kotlinx.parcelize.Parcelize

 /**
- * `LoggedInAppScopeFlowNode` is a Node responsible to set up the Dagger
+ * `LoggedInAppScopeFlowNode` is a Node responsible to set up the Session graph.
 * [io.element.android.libraries.di.SessionScope]. It has only one child: [LoggedInFlowNode].
 * This allow to inject objects with SessionScope in the constructor of [LoggedInFlowNode].
 */
@ContributesNode(AppScope::class)
-class LoggedInAppScopeFlowNode @AssistedInject constructor(
+@AssistedInject
+class LoggedInAppScopeFlowNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    sessionComponentFactory: SessionComponentFactory,
+    sessionGraphFactory: SessionGraphFactory,
    private val imageLoaderHolder: ImageLoaderHolder,
 ) : ParentNode<LoggedInAppScopeFlowNode.NavTarget>(
    navModel = PermanentNavModel(
@@ -53,9 +54,10 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
    ),
    buildContext = buildContext,
    plugins = plugins
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
    interface Callback : Plugin {
        fun onOpenBugReport()
+        fun onAddAccount()
    }

    @Parcelize
@@ -66,7 +68,7 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
    ) : NodeInputs

    private val inputs: Inputs = inputs()
-    override val daggerComponent = sessionComponentFactory.create(inputs.matrixClient)
+    override val graph = sessionGraphFactory.create(inputs.matrixClient)

    override fun onBuilt() {
        super.onBuilt()
@@ -82,6 +84,10 @@ class LoggedInAppScopeFlowNode @AssistedInject constructor(
            override fun onOpenBugReport() {
                plugins<Callback>().forEach { it.onOpenBugReport() }
            }
+
+            override fun onAddAccount() {
+                plugins<Callback>().forEach { it.onAddAccount() }
+            }
        }
        return createNode<LoggedInFlowNode>(buildContext, listOf(callback))
    }
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
@@ -7,6 +7,7 @@

 package io.element.android.appnav

+import dev.zacsweers.metro.Inject
 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.RoomMembershipObserver
@@ -18,9 +19,9 @@ import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import javax.inject.Inject

-class LoggedInEventProcessor @Inject constructor(
+@Inject
+class LoggedInEventProcessor(
    private val snackbarDispatcher: SnackbarDispatcher,
    private val roomMembershipObserver: RoomMembershipObserver,
 ) {
@@ -30,9 +31,17 @@ class LoggedInEventProcessor @Inject constructor(
        observingJob = roomMembershipObserver.updates
            .filter { !it.isUserInRoom }
            .distinctUntilChanged()
-            .onEach {
-                when (it.change) {
-                    MembershipChange.LEFT -> displayMessage(CommonStrings.common_current_user_left_room)
+            .onEach { roomMemberShipUpdate ->
+                when (roomMemberShipUpdate.change) {
+                    MembershipChange.LEFT -> {
+                        displayMessage(
+                            if (roomMemberShipUpdate.isSpace) {
+                                CommonStrings.common_current_user_left_space
+                            } else {
+                                CommonStrings.common_current_user_left_room
+                            }
+                        )
+                    }
                    MembershipChange.INVITATION_REJECTED -> displayMessage(CommonStrings.common_current_user_rejected_invite)
                    MembershipChange.KNOCK_RETRACTED -> displayMessage(CommonStrings.common_current_user_canceled_knock)
                    else -> Unit
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -36,10 +36,10 @@ import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.replace
 import com.bumble.appyx.navmodel.backstack.operation.singleTop
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.anvilannotations.ContributesNode
+import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.loggedin.LoggedInNode
 import io.element.android.appnav.loggedin.MediaPreviewConfigMigration
 import io.element.android.appnav.loggedin.SendQueues
@@ -51,7 +51,6 @@ import io.element.android.features.ftue.api.FtueEntryPoint
 import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.ftue.api.state.FtueState
 import io.element.android.features.home.api.HomeEntryPoint
-import io.element.android.features.logout.api.LogoutEntryPoint
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.features.preferences.api.PreferencesEntryPoint
@@ -59,6 +58,7 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.features.roomdirectory.api.RoomDirectoryEntryPoint
 import io.element.android.features.securebackup.api.SecureBackupEntryPoint
 import io.element.android.features.share.api.ShareEntryPoint
+import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.features.startchat.api.StartChatEntryPoint
 import io.element.android.features.userprofile.api.UserProfileEntryPoint
 import io.element.android.features.verifysession.api.IncomingVerificationEntryPoint
@@ -67,7 +67,6 @@ import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.waitForNavTargetAttached
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -75,13 +74,13 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.MAIN_SPACE
 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.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.verification.SessionVerificationServiceListener
 import io.element.android.libraries.matrix.api.verification.VerificationRequest
 import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
+import io.element.android.libraries.ui.common.nodes.emptyNode
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
@@ -100,7 +99,8 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.toKotlinDuration

@ContributesNode(SessionScope::class)
-class LoggedInFlowNode @AssistedInject constructor(
+@AssistedInject
+class LoggedInFlowNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val homeEntryPoint: HomeEntryPoint,
@@ -117,7 +117,6 @@ class LoggedInFlowNode @AssistedInject constructor(
    private val shareEntryPoint: ShareEntryPoint,
    private val matrixClient: MatrixClient,
    private val sendingQueue: SendQueues,
-    private val logoutEntryPoint: LogoutEntryPoint,
    private val incomingVerificationEntryPoint: IncomingVerificationEntryPoint,
    private val mediaPreviewConfigMigration: MediaPreviewConfigMigration,
    private val sessionEnterpriseService: SessionEnterpriseService,
@@ -138,6 +137,7 @@ class LoggedInFlowNode @AssistedInject constructor(
 ) {
    interface Callback : Plugin {
        fun onOpenBugReport()
+        fun onAddAccount()
    }

    private val loggedInFlowProcessor = LoggedInEventProcessor(
@@ -275,16 +275,13 @@ class LoggedInFlowNode @AssistedInject constructor(
        @Parcelize
        data class IncomingShare(val intent: Intent) : NavTarget

-        @Parcelize
-        data object LogoutForNativeSlidingSyncMigrationNeeded : NavTarget
-
        @Parcelize
        data class IncomingVerificationRequest(val data: VerificationRequest.Incoming) : NavTarget
    }

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
-            NavTarget.Placeholder -> createNode<PlaceholderNode>(buildContext)
+            NavTarget.Placeholder -> emptyNode(buildContext)
            NavTarget.LoggedInPermanent -> {
                val callback = object : LoggedInNode.Callback {
                    override fun navigateToNotificationTroubleshoot() {
@@ -322,10 +319,6 @@ class LoggedInFlowNode @AssistedInject constructor(
                    override fun onReportBugClick() {
                        plugins<Callback>().forEach { it.onOpenBugReport() }
                    }
-
-                    override fun onLogoutForNativeSlidingSyncMigrationNeeded() {
-                        backstack.push(NavTarget.LogoutForNativeSlidingSyncMigrationNeeded)
-                    }
                }
                homeEntryPoint
                    .nodeBuilder(this, buildContext)
@@ -333,7 +326,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                    .build()
            }
            is NavTarget.Room -> {
-                val callback = object : JoinedRoomLoadedFlowNode.Callback {
+                val joinedRoomCallback = object : JoinedRoomLoadedFlowNode.Callback {
                    override fun onOpenRoom(roomId: RoomId, serverNames: List<String>) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames))
                    }
@@ -372,6 +365,11 @@ class LoggedInFlowNode @AssistedInject constructor(
                        backstack.push(NavTarget.Settings(PreferencesEntryPoint.InitialTarget.NotificationSettings))
                    }
                }
+                val spaceCallback = object : SpaceEntryPoint.Callback {
+                    override fun onOpenRoom(roomId: RoomId, viaParameters: List<String>) {
+                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), serverNames = viaParameters))
+                    }
+                }
                val inputs = RoomFlowNode.Inputs(
                    roomIdOrAlias = navTarget.roomIdOrAlias,
                    roomDescription = Optional.ofNullable(navTarget.roomDescription),
@@ -379,7 +377,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                    trigger = Optional.ofNullable(navTarget.trigger),
                    initialElement = navTarget.initialElement
                )
-                createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs, callback))
+                createNode<RoomFlowNode>(buildContext, plugins = listOf(inputs, joinedRoomCallback, spaceCallback))
            }
            is NavTarget.UserProfile -> {
                val callback = object : UserProfileEntryPoint.Callback {
@@ -394,6 +392,10 @@ class LoggedInFlowNode @AssistedInject constructor(
            }
            is NavTarget.Settings -> {
                val callback = object : PreferencesEntryPoint.Callback {
+                    override fun onAddAccount() {
+                        plugins<Callback>().forEach { it.onAddAccount() }
+                    }
+
                    override fun onOpenBugReport() {
                        plugins<Callback>().forEach { it.onOpenBugReport() }
                    }
@@ -406,11 +408,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.NotificationSettings))
                    }

-                    override fun navigateTo(sessionId: SessionId, roomId: RoomId, eventId: EventId) {
-                        // We do not check the sessionId, but it will have to be done at some point (multi account)
-                        if (sessionId != matrixClient.sessionId) {
-                            Timber.e("SessionId mismatch, expected ${matrixClient.sessionId} but got $sessionId")
-                        }
+                    override fun navigateTo(roomId: RoomId, eventId: EventId) {
                        backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Messages(eventId)))
                    }
                }
@@ -447,8 +445,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                    .build()
            }
            NavTarget.Ftue -> {
-                ftueEntryPoint.nodeBuilder(this, buildContext)
-                    .build()
+                ftueEntryPoint.createNode(this, buildContext)
            }
            NavTarget.RoomDirectorySearch -> {
                roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
@@ -479,17 +476,6 @@ class LoggedInFlowNode @AssistedInject constructor(
                    .params(ShareEntryPoint.Params(intent = navTarget.intent))
                    .build()
            }
-            is NavTarget.LogoutForNativeSlidingSyncMigrationNeeded -> {
-                val callback = object : LogoutEntryPoint.Callback {
-                    override fun onChangeRecoveryKeyClick() {
-                        backstack.push(NavTarget.SecureBackup())
-                    }
-                }
-
-                logoutEntryPoint.nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
-            }
            is NavTarget.IncomingVerificationRequest -> {
                incomingVerificationEntryPoint.nodeBuilder(this, buildContext)
                    .params(IncomingVerificationEntryPoint.Params(navTarget.data))
@@ -560,12 +546,6 @@ class LoggedInFlowNode @AssistedInject constructor(
            }
        }
    }
-
-    @ContributesNode(AppScope::class)
-    class PlaceholderNode @AssistedInject constructor(
-        @Assisted buildContext: BuildContext,
-        @Assisted plugins: List<Plugin>,
-    ) : Node(buildContext, plugins = plugins)
 }

@Parcelize
--- a/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/NotLoggedInFlowNode.kt
@@ -20,9 +20,10 @@ 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 dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
 import io.element.android.features.login.api.LoginEntryPoint
 import io.element.android.features.login.api.LoginParams
 import io.element.android.libraries.architecture.BackstackView
@@ -31,12 +32,12 @@ import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
 import io.element.android.libraries.designsystem.utils.ForceOrientationInMobileDevices
 import io.element.android.libraries.designsystem.utils.ScreenOrientation
-import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.matrix.ui.media.NotLoggedInImageLoaderFactory
 import kotlinx.parcelize.Parcelize

@ContributesNode(AppScope::class)
-class NotLoggedInFlowNode @AssistedInject constructor(
+@AssistedInject
+class NotLoggedInFlowNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val loginEntryPoint: LoginEntryPoint,
--- a/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt
@@ -9,24 +9,25 @@ package io.element.android.appnav

 import android.content.Intent
 import android.os.Parcelable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.animation.core.Spring
+import androidx.compose.animation.core.spring
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.lifecycleScope
 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.state.MutableSavedStateMap
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.pop
 import com.bumble.appyx.navmodel.backstack.operation.push
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackFader
+import com.bumble.appyx.navmodel.backstack.transitionhandler.rememberBackstackSlider
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.anvilannotations.ContributesNode
+import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.di.MatrixSessionCache
 import io.element.android.appnav.intent.IntentResolver
 import io.element.android.appnav.intent.ResolvedIntent
@@ -38,43 +39,46 @@ import io.element.android.features.login.api.accesscontrol.AccountProviderAccess
 import io.element.android.features.rageshake.api.bugreport.BugReportEntryPoint
 import io.element.android.features.rageshake.api.reporter.BugReporter
 import io.element.android.features.signedout.api.SignedOutEntryPoint
-import io.element.android.features.viewfolder.api.ViewFolderEntryPoint
+import io.element.android.libraries.accountselect.api.AccountSelectEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
+import io.element.android.libraries.architecture.appyx.rememberDelegateTransitionHandler
 import io.element.android.libraries.architecture.createNode
 import io.element.android.libraries.architecture.waitForChildAttached
 import io.element.android.libraries.core.uri.ensureProtocol
-import io.element.android.libraries.deeplink.DeeplinkData
-import io.element.android.libraries.designsystem.theme.components.CircularProgressIndicator
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.deeplink.api.DeeplinkData
+import io.element.android.libraries.featureflag.api.FeatureFlagService
+import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcActionFlow
 import io.element.android.libraries.sessionstorage.api.LoggedInState
+import io.element.android.libraries.sessionstorage.api.SessionStore
+import io.element.android.libraries.ui.common.nodes.emptyNode
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber

-@ContributesNode(AppScope::class)
-class RootFlowNode @AssistedInject constructor(
+@ContributesNode(AppScope::class) @AssistedInject class RootFlowNode(
    @Assisted val buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
-    private val authenticationService: MatrixAuthenticationService,
+    private val sessionStore: SessionStore,
    private val accountProviderAccessControl: AccountProviderAccessControl,
    private val navStateFlowFactory: RootNavStateFlowFactory,
    private val matrixSessionCache: MatrixSessionCache,
    private val presenter: RootPresenter,
    private val bugReportEntryPoint: BugReportEntryPoint,
-    private val viewFolderEntryPoint: ViewFolderEntryPoint,
    private val signedOutEntryPoint: SignedOutEntryPoint,
+    private val accountSelectEntryPoint: AccountSelectEntryPoint,
    private val intentResolver: IntentResolver,
    private val oidcActionFlow: OidcActionFlow,
    private val bugReporter: BugReporter,
+    private val featureFlagService: FeatureFlagService,
 ) : BaseFlowNode<RootFlowNode.NavTarget>(
    backstack = BackStack(
        initialElement = NavTarget.SplashScreen,
@@ -96,27 +100,24 @@ class RootFlowNode @AssistedInject constructor(
    }

    private fun observeNavState() {
-        navStateFlowFactory.create(buildContext.savedStateMap)
-            .distinctUntilChanged()
-            .onEach { navState ->
-                Timber.v("navState=$navState")
-                when (navState.loggedInState) {
-                    is LoggedInState.LoggedIn -> {
-                        if (navState.loggedInState.isTokenValid) {
-                            tryToRestoreLatestSession(
-                                onSuccess = { sessionId -> switchToLoggedInFlow(sessionId, navState.cacheIndex) },
-                                onFailure = { switchToNotLoggedInFlow(null) }
-                            )
-                        } else {
-                            switchToSignedOutFlow(SessionId(navState.loggedInState.sessionId))
-                        }
-                    }
-                    LoggedInState.NotLoggedIn -> {
-                        switchToNotLoggedInFlow(null)
+        navStateFlowFactory.create(buildContext.savedStateMap).distinctUntilChanged().onEach { navState ->
+            Timber.v("navState=$navState")
+            when (navState.loggedInState) {
+                is LoggedInState.LoggedIn -> {
+                    if (navState.loggedInState.isTokenValid) {
+                        tryToRestoreLatestSession(
+                            onSuccess = { sessionId -> switchToLoggedInFlow(sessionId, navState.cacheIndex) },
+                            onFailure = { switchToNotLoggedInFlow(null) }
+                        )
+                    } else {
+                        switchToSignedOutFlow(SessionId(navState.loggedInState.sessionId))
                    }
                }
+                LoggedInState.NotLoggedIn -> {
+                    switchToNotLoggedInFlow(null)
+                }
            }
-            .launchIn(lifecycleScope)
+        }.launchIn(lifecycleScope)
    }

    private fun switchToLoggedInFlow(sessionId: SessionId, navId: Int) {
@@ -138,22 +139,19 @@ class RootFlowNode @AssistedInject constructor(
        onFailure: () -> Unit,
        onSuccess: (SessionId) -> Unit,
    ) {
-        matrixSessionCache.getOrRestore(sessionId)
-            .onSuccess {
-                Timber.v("Succeed to restore session $sessionId")
-                onSuccess(sessionId)
-            }
-            .onFailure {
-                Timber.e(it, "Failed to restore session $sessionId")
-                onFailure()
-            }
+        matrixSessionCache.getOrRestore(sessionId).onSuccess {
+            Timber.v("Succeed to restore session $sessionId")
+            onSuccess(sessionId)
+        }.onFailure {
+            Timber.e(it, "Failed to restore session $sessionId")
+            onFailure()
+        }
    }

    private suspend fun tryToRestoreLatestSession(
-        onSuccess: (SessionId) -> Unit,
-        onFailure: () -> Unit
+        onSuccess: (SessionId) -> Unit, onFailure: () -> Unit
    ) {
-        val latestSessionId = authenticationService.getLatestSessionId()
+        val latestSessionId = sessionStore.getLatestSessionId()
        if (latestSessionId == null) {
            onFailure()
            return
@@ -173,50 +171,63 @@ class RootFlowNode @AssistedInject constructor(
            modifier = modifier,
            onOpenBugReport = this::onOpenBugReport,
        ) {
-            BackstackView()
+            val backstackSlider = rememberBackstackSlider<NavTarget>(
+                transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+            )
+            val backstackFader = rememberBackstackFader<NavTarget>(
+                transitionSpec = { spring(stiffness = Spring.StiffnessMediumLow) },
+            )
+            val transitionHandler = rememberDelegateTransitionHandler<NavTarget, BackStack.State> { navTarget ->
+                when (navTarget) {
+                    is NavTarget.SplashScreen,
+                    is NavTarget.LoggedInFlow -> backstackFader
+                    else -> backstackSlider
+                }
+            }
+            BackstackView(transitionHandler = transitionHandler)
        }
    }

    sealed interface NavTarget : Parcelable {
-        @Parcelize
-        data object SplashScreen : NavTarget
+        @Parcelize data object SplashScreen : NavTarget

-        @Parcelize
-        data class NotLoggedInFlow(
+        @Parcelize data class AccountSelect(
+            val currentSessionId: SessionId,
+            val intent: Intent?,
+            val permalinkData: PermalinkData?,
+        ) : NavTarget
+
+        @Parcelize data class NotLoggedInFlow(
            val params: LoginParams?
        ) : NavTarget

-        @Parcelize
-        data class LoggedInFlow(
-            val sessionId: SessionId,
-            val navId: Int
+        @Parcelize data class LoggedInFlow(
+            val sessionId: SessionId, val navId: Int
        ) : NavTarget

-        @Parcelize
-        data class SignedOutFlow(
+        @Parcelize data class SignedOutFlow(
            val sessionId: SessionId
        ) : NavTarget

-        @Parcelize
-        data object BugReport : NavTarget
-
-        @Parcelize
-        data class ViewLogs(
-            val rootPath: String,
-        ) : NavTarget
+        @Parcelize data object BugReport : NavTarget
    }

    override fun resolve(navTarget: NavTarget, buildContext: BuildContext): Node {
        return when (navTarget) {
            is NavTarget.LoggedInFlow -> {
-                val matrixClient = matrixSessionCache.getOrNull(navTarget.sessionId) ?: return splashNode(buildContext).also {
-                    Timber.w("Couldn't find any session, go through SplashScreen")
-                }
+                val matrixClient = matrixSessionCache.getOrNull(navTarget.sessionId)
+                    ?: return emptyNode(buildContext).also {
+                        Timber.w("Couldn't find any session, go through SplashScreen")
+                    }
                val inputs = LoggedInAppScopeFlowNode.Inputs(matrixClient)
                val callback = object : LoggedInAppScopeFlowNode.Callback {
                    override fun onOpenBugReport() {
                        backstack.push(NavTarget.BugReport)
                    }
+
+                    override fun onAddAccount() {
+                        backstack.push(NavTarget.NotLoggedInFlow(null))
+                    }
                }
                createNode<LoggedInAppScopeFlowNode>(buildContext, plugins = listOf(inputs, callback))
            }
@@ -232,51 +243,46 @@ class RootFlowNode @AssistedInject constructor(
                createNode<NotLoggedInFlowNode>(buildContext, plugins = listOf(params, callback))
            }
            is NavTarget.SignedOutFlow -> {
-                signedOutEntryPoint.nodeBuilder(this, buildContext)
-                    .params(
-                        SignedOutEntryPoint.Params(
-                            sessionId = navTarget.sessionId
-                        )
+                signedOutEntryPoint.nodeBuilder(this, buildContext).params(
+                    SignedOutEntryPoint.Params(
+                        sessionId = navTarget.sessionId
                    )
-                    .build()
+                ).build()
            }
-            NavTarget.SplashScreen -> splashNode(buildContext)
+            NavTarget.SplashScreen -> emptyNode(buildContext)
            NavTarget.BugReport -> {
                val callback = object : BugReportEntryPoint.Callback {
-                    override fun onBugReportSent() {
-                        backstack.pop()
-                    }
-
-                    override fun onViewLogs(basePath: String) {
-                        backstack.push(NavTarget.ViewLogs(rootPath = basePath))
-                    }
-                }
-                bugReportEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .callback(callback)
-                    .build()
-            }
-            is NavTarget.ViewLogs -> {
-                val callback = object : ViewFolderEntryPoint.Callback {
                    override fun onDone() {
                        backstack.pop()
                    }
                }
-                val params = ViewFolderEntryPoint.Params(
-                    rootPath = navTarget.rootPath,
-                )
-                viewFolderEntryPoint
-                    .nodeBuilder(this, buildContext)
-                    .params(params)
-                    .callback(callback)
-                    .build()
+                bugReportEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
            }
-        }
-    }
+            is NavTarget.AccountSelect -> {
+                val callback: AccountSelectEntryPoint.Callback = object : AccountSelectEntryPoint.Callback {
+                    override fun onSelectAccount(sessionId: SessionId) {
+                        lifecycleScope.launch {
+                            if (sessionId == navTarget.currentSessionId) {
+                                // Ensure that the account selection Node is removed from the backstack
+                                // Do not pop when the account is changed to avoid a UI flicker.
+                                backstack.pop()
+                            }
+                            attachSession(sessionId).apply {
+                                if (navTarget.intent != null) {
+                                    attachIncomingShare(navTarget.intent)
+                                } else if (navTarget.permalinkData != null) {
+                                    attachPermalinkData(navTarget.permalinkData)
+                                }
+                            }
+                        }
+                    }

-    private fun splashNode(buildContext: BuildContext) = node(buildContext) {
-        Box(modifier = it.fillMaxSize(), contentAlignment = Alignment.Center) {
-            CircularProgressIndicator()
+                    override fun onCancel() {
+                        backstack.pop()
+                    }
+                }
+                accountSelectEntryPoint.nodeBuilder(this, buildContext).callback(callback).build()
+            }
        }
    }

@@ -292,78 +298,129 @@ class RootFlowNode @AssistedInject constructor(
    }

    private suspend fun onLoginLink(params: LoginParams) {
-        // Is there a session already?
-        val latestSessionId = authenticationService.getLatestSessionId()
-        if (latestSessionId == null) {
-            // No session, open login
-            if (accountProviderAccessControl.isAllowedToConnectToAccountProvider(params.accountProvider.ensureProtocol())) {
-                switchToNotLoggedInFlow(params)
+        if (accountProviderAccessControl.isAllowedToConnectToAccountProvider(params.accountProvider.ensureProtocol())) {
+            // Is there a session already?
+            val sessions = sessionStore.getAllSessions()
+            if (sessions.isNotEmpty()) {
+                if (featureFlagService.isFeatureEnabled(FeatureFlags.MultiAccount)) {
+                    val loginHintMatrixId = params.loginHint?.removePrefix("mxid:")
+                    val existingAccount = sessions.find { it.userId == loginHintMatrixId }
+                    if (existingAccount != null) {
+                        // We have an existing account matching the login hint, ensure this is the current session
+                        sessionStore.setLatestSession(existingAccount.userId)
+                    } else {
+                        val latestSessionId = sessions.maxBy { it.lastUsageIndex }.userId
+                        attachSession(SessionId(latestSessionId))
+                        backstack.push(NavTarget.NotLoggedInFlow(params))
+                    }
+                } else {
+                    Timber.w("Login link ignored, multi account is disabled")
+                }
            } else {
-                Timber.w("Login link ignored, we are not allowed to connect to the homeserver")
-                switchToNotLoggedInFlow(null)
+                switchToNotLoggedInFlow(params)
            }
        } else {
-            // Just ignore the login link if we already have a session
-            Timber.w("Login link ignored, we already have a session")
+            Timber.w("Login link ignored, we are not allowed to connect to the homeserver")
        }
    }

    private suspend fun onIncomingShare(intent: Intent) {
        // Is there a session already?
-        val latestSessionId = authenticationService.getLatestSessionId()
+        val latestSessionId = sessionStore.getLatestSessionId()
        if (latestSessionId == null) {
            // No session, open login
            switchToNotLoggedInFlow(null)
        } else {
-            attachSession(latestSessionId)
-                .attachIncomingShare(intent)
+            // wait for the current session to be restored
+            val loggedInFlowNode = attachSession(latestSessionId)
+            if (sessionStore.getAllSessions().size > 1) {
+                // Several accounts, let the user choose which one to use
+                backstack.push(
+                    NavTarget.AccountSelect(
+                        currentSessionId = latestSessionId,
+                        intent = intent,
+                        permalinkData = null,
+                    )
+                )
+            } else {
+                // Only one account, directly attach the incoming share node.
+                loggedInFlowNode.attachIncomingShare(intent)
+            }
        }
    }

    private suspend fun navigateTo(permalinkData: PermalinkData) {
        Timber.d("Navigating to $permalinkData")
-        attachSession(null)
-            .apply {
-                when (permalinkData) {
-                    is PermalinkData.FallbackLink -> Unit
-                    is PermalinkData.RoomEmailInviteLink -> Unit
-                    is PermalinkData.RoomLink -> {
-                        attachRoom(
-                            roomIdOrAlias = permalinkData.roomIdOrAlias,
-                            trigger = JoinedRoom.Trigger.MobilePermalink,
-                            serverNames = permalinkData.viaParameters,
-                            eventId = permalinkData.eventId,
-                            clearBackstack = true
+        // Is there a session already?
+        val latestSessionId = sessionStore.getLatestSessionId()
+        if (latestSessionId == null) {
+            // No session, open login
+            switchToNotLoggedInFlow(null)
+        } else {
+            // wait for the current session to be restored
+            val loggedInFlowNode = attachSession(latestSessionId)
+            when (permalinkData) {
+                is PermalinkData.FallbackLink -> Unit
+                is PermalinkData.RoomEmailInviteLink -> Unit
+                else -> {
+                    if (sessionStore.getAllSessions().size > 1) {
+                        // Several accounts, let the user choose which one to use
+                        backstack.push(
+                            NavTarget.AccountSelect(
+                                currentSessionId = latestSessionId,
+                                intent = null,
+                                permalinkData = permalinkData,
+                            )
                        )
-                    }
-                    is PermalinkData.UserLink -> {
-                        attachUser(permalinkData.userId)
+                    } else {
+                        // Only one account, directly attach the room or the user node.
+                        loggedInFlowNode.attachPermalinkData(permalinkData)
                    }
                }
            }
+        }
+    }
+
+    private suspend fun LoggedInFlowNode.attachPermalinkData(permalinkData: PermalinkData) {
+        when (permalinkData) {
+            is PermalinkData.FallbackLink -> Unit
+            is PermalinkData.RoomEmailInviteLink -> Unit
+            is PermalinkData.RoomLink -> {
+                attachRoom(
+                    roomIdOrAlias = permalinkData.roomIdOrAlias,
+                    trigger = JoinedRoom.Trigger.MobilePermalink,
+                    serverNames = permalinkData.viaParameters,
+                    eventId = permalinkData.eventId,
+                    clearBackstack = true
+                )
+            }
+            is PermalinkData.UserLink -> {
+                attachUser(permalinkData.userId)
+            }
+        }
    }

    private suspend fun navigateTo(deeplinkData: DeeplinkData) {
        Timber.d("Navigating to $deeplinkData")
-        attachSession(deeplinkData.sessionId)
-            .apply {
-                when (deeplinkData) {
-                    is DeeplinkData.Root -> Unit // The room list will always be shown, observing FtueState
-                    is DeeplinkData.Room -> attachRoom(deeplinkData.roomId.toRoomIdOrAlias(), clearBackstack = true)
-                }
+        attachSession(deeplinkData.sessionId).apply {
+            when (deeplinkData) {
+                is DeeplinkData.Root -> Unit // The room list will always be shown, observing FtueState
+                is DeeplinkData.Room -> attachRoom(deeplinkData.roomId.toRoomIdOrAlias(), clearBackstack = true)
            }
+        }
    }

    private fun onOidcAction(oidcAction: OidcAction) {
        oidcActionFlow.post(oidcAction)
    }

-    // [sessionId] will be null for permalink.
-    private suspend fun attachSession(sessionId: SessionId?): LoggedInFlowNode {
-        // TODO handle multi-session
+    private suspend fun attachSession(sessionId: SessionId): LoggedInFlowNode {
+        // Ensure that the session is the latest one
+        sessionStore.setLatestSession(sessionId.value)
        return waitForChildAttached<LoggedInAppScopeFlowNode, NavTarget> { navTarget ->
-            navTarget is NavTarget.LoggedInFlow && (sessionId == null || navTarget.sessionId == sessionId)
-        }
-            .attachSession()
+            navTarget is NavTarget.LoggedInFlow && navTarget.sessionId == sessionId
+        }.attachSession()
    }
 }
+
+private suspend fun SessionStore.getLatestSessionId() = getLatestSession()?.userId?.let(::SessionId)
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/MatrixSessionCache.kt
@@ -10,9 +10,10 @@ package io.element.android.appnav.di
 import androidx.annotation.VisibleForTesting
 import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
-import com.squareup.anvil.annotations.ContributesBinding
-import io.element.android.libraries.di.AppScope
-import io.element.android.libraries.di.SingleIn
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
@@ -22,7 +23,6 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject

 private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHolder.SaveInstanceKey"

@@ -33,7 +33,8 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.di.MatrixClientsHold
 */
@SingleIn(AppScope::class)
@ContributesBinding(AppScope::class)
-class MatrixSessionCache @Inject constructor(
+@Inject
+class MatrixSessionCache(
    private val authenticationService: MatrixAuthenticationService,
    private val syncOrchestratorFactory: SyncOrchestrator.Factory,
 ) : MatrixClientProvider {
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/RoomComponentFactory.kt
@@ -9,6 +9,6 @@ package io.element.android.appnav.di

 import io.element.android.libraries.matrix.api.room.JoinedRoom

-interface RoomComponentFactory {
+fun interface RoomGraphFactory {
    fun create(room: JoinedRoom): Any
 }
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/SessionComponentFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/SessionComponentFactory.kt
@@ -9,6 +9,6 @@ package io.element.android.appnav.di

 import io.element.android.libraries.matrix.api.MatrixClient

-interface SessionComponentFactory {
+interface SessionGraphFactory {
    fun create(client: MatrixClient): Any
 }
--- a/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/di/SyncOrchestrator.kt
@@ -8,9 +8,9 @@
 package io.element.android.appnav.di

 import androidx.annotation.VisibleForTesting
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -30,7 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds

-class SyncOrchestrator @AssistedInject constructor(
+@AssistedInject
+class SyncOrchestrator(
    @Assisted matrixClient: MatrixClient,
    private val appForegroundStateService: AppForegroundStateService,
    private val networkMonitor: NetworkMonitor,
--- a/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/intent/IntentResolver.kt
@@ -8,16 +8,16 @@
 package io.element.android.appnav.intent

 import android.content.Intent
+import dev.zacsweers.metro.Inject
 import io.element.android.features.login.api.LoginIntentResolver
 import io.element.android.features.login.api.LoginParams
-import io.element.android.libraries.deeplink.DeeplinkData
-import io.element.android.libraries.deeplink.DeeplinkParser
+import io.element.android.libraries.deeplink.api.DeeplinkData
+import io.element.android.libraries.deeplink.api.DeeplinkParser
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.oidc.api.OidcAction
 import io.element.android.libraries.oidc.api.OidcIntentResolver
 import timber.log.Timber
-import javax.inject.Inject

 sealed interface ResolvedIntent {
    data class Navigation(val deeplinkData: DeeplinkData) : ResolvedIntent
@@ -27,7 +27,8 @@ sealed interface ResolvedIntent {
    data class IncomingShare(val intent: Intent) : ResolvedIntent
 }

-class IntentResolver @Inject constructor(
+@Inject
+class IntentResolver(
    private val deeplinkParser: DeeplinkParser,
    private val loginIntentResolver: LoginIntentResolver,
    private val oidcIntentResolver: OidcIntentResolver,
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInNode.kt
@@ -13,13 +13,14 @@ 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 io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
 import io.element.android.libraries.di.SessionScope

@ContributesNode(SessionScope::class)
-class LoggedInNode @AssistedInject constructor(
+@AssistedInject
+class LoggedInNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val loggedInPresenter: LoggedInPresenter,
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt
@@ -17,6 +17,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.CryptoSessionStateChange
 import im.vector.app.features.analytics.plan.UserProperties
 import io.element.android.libraries.architecture.AsyncData
@@ -42,11 +43,11 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject

 private val pusherTag = LoggerTag("Pusher", LoggerTag.PushLoggerTag)

-class LoggedInPresenter @Inject constructor(
+@Inject
+class LoggedInPresenter(
    private val matrixClient: MatrixClient,
    private val syncService: SyncService,
    private val pushService: PushService,
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/MediaPreviewConfigMigration.kt
@@ -7,6 +7,7 @@

 package io.element.android.appnav.loggedin

+import dev.zacsweers.metro.Inject
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.media.MediaPreviewService
 import io.element.android.libraries.preferences.api.store.AppPreferencesStore
@@ -14,13 +15,13 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject

 /**
 * This migration is temporary, will be safe to remove after some time.
 * The goal is to set the server config if it's not set, and remove the local data.
 */
-class MediaPreviewConfigMigration @Inject constructor(
+@Inject
+class MediaPreviewConfigMigration(
    private val mediaPreviewService: MediaPreviewService,
    private val appPreferencesStore: AppPreferencesStore,
    @SessionCoroutineScope
--- a/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/loggedin/SendQueues.kt
@@ -8,9 +8,10 @@
 package io.element.android.appnav.loggedin

 import androidx.annotation.VisibleForTesting
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import io.element.android.features.networkmonitor.api.NetworkStatus
 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.sync.SyncService
 import io.element.android.libraries.matrix.api.sync.SyncState
@@ -21,13 +22,13 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
-import javax.inject.Inject

@VisibleForTesting
 const val SEND_QUEUES_RETRY_DELAY_MILLIS = 500L

@SingleIn(SessionScope::class)
-class SendQueues @Inject constructor(
+@Inject
+class SendQueues(
    private val matrixClient: MatrixClient,
    private val syncService: SyncService,
 ) {
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -21,16 +21,18 @@ 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.newRoot
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
-import io.element.android.anvilannotations.ContributesNode
+import io.element.android.annotations.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.features.joinroom.api.JoinRoomEntryPoint
 import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint
+import io.element.android.features.roomaliasesolver.api.RoomAliasResolverEntryPoint.Params
 import io.element.android.features.roomdirectory.api.RoomDescription
+import io.element.android.features.space.api.SpaceEntryPoint
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
@@ -52,7 +54,6 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.shareIn
@@ -63,7 +64,8 @@ import java.util.Optional
 import kotlin.jvm.optionals.getOrNull

@ContributesNode(SessionScope::class)
-class RoomFlowNode @AssistedInject constructor(
+@AssistedInject
+class RoomFlowNode(
    @Assisted val buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val client: MatrixClient,
@@ -71,6 +73,7 @@ class RoomFlowNode @AssistedInject constructor(
    private val roomAliasResolverEntryPoint: RoomAliasResolverEntryPoint,
    private val syncService: SyncService,
    private val membershipObserver: RoomMembershipObserver,
+    private val spaceEntryPoint: SpaceEntryPoint,
 ) : BaseFlowNode<RoomFlowNode.NavTarget>(
    backstack = BackStack(
        initialElement = NavTarget.Loading,
@@ -105,6 +108,9 @@ class RoomFlowNode @AssistedInject constructor(

        @Parcelize
        data class JoinedRoom(val roomId: RoomId) : NavTarget
+
+        @Parcelize
+        data class JoinedSpace(val spaceId: RoomId) : NavTarget
    }

    override fun onBuilt() {
@@ -142,40 +148,28 @@ class RoomFlowNode @AssistedInject constructor(
            .withPreviousValue()
        combine(currentMembershipFlow, isSpaceFlow) { (previousMembership, membership), isSpace ->
            Timber.d("Room membership: $membership")
-            when (membership) {
-                CurrentUserMembership.JOINED -> {
-                    if (isSpace) {
-                        // It should not happen, but probably due to an issue in the sliding sync,
-                        // we can have a space here in case the space has just been joined.
-                        // So navigate to the JoinRoom target for now, which will
-                        // handle the space not supported screen
-                        backstack.newRoot(
-                            NavTarget.JoinRoom(
-                                roomId = roomId,
-                                serverNames = serverNames,
-                                trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,
-                            )
-                        )
-                    } else {
-                        backstack.newRoot(NavTarget.JoinedRoom(roomId))
-                    }
+            if (membership == CurrentUserMembership.JOINED) {
+                if (isSpace) {
+                    backstack.newRoot(NavTarget.JoinedSpace(spaceId = roomId))
+                } else {
+                    backstack.newRoot(NavTarget.JoinedRoom(roomId))
                }
-                else -> {
-                    if (membership == CurrentUserMembership.LEFT && previousMembership == CurrentUserMembership.JOINED) {
-                        // The user left the room in this device, remove the room from the backstack
-                        if (!membershipUpdateFlow.first().isUserInRoom) {
-                            navigateUp()
-                        }
-                    } else {
-                        // Was invited or the room is not known, display the join room screen
-                        backstack.newRoot(
-                            NavTarget.JoinRoom(
-                                roomId = roomId,
-                                serverNames = serverNames,
-                                trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,
-                            )
+            } else {
+                val leavingFromCurrentDevice =
+                    membership == CurrentUserMembership.LEFT &&
+                        previousMembership == CurrentUserMembership.JOINED &&
+                        membershipUpdateFlow.replayCache.lastOrNull()?.isUserInRoom == false
+
+                if (leavingFromCurrentDevice) {
+                    navigateUp()
+                } else {
+                    backstack.newRoot(
+                        NavTarget.JoinRoom(
+                            roomId = roomId,
+                            serverNames = serverNames,
+                            trigger = inputs.trigger.getOrNull() ?: JoinedRoom.Trigger.Invite,
                        )
-                    }
+                    )
                }
            }
        }.launchIn(lifecycleScope)
@@ -193,7 +187,7 @@ class RoomFlowNode @AssistedInject constructor(
                        )
                    }
                }
-                val params = RoomAliasResolverEntryPoint.Params(navTarget.roomAlias)
+                val params = Params(navTarget.roomAlias)
                roomAliasResolverEntryPoint.nodeBuilder(this, buildContext)
                    .callback(callback)
                    .params(params)
@@ -217,6 +211,13 @@ class RoomFlowNode @AssistedInject constructor(
                )
                createNode<JoinedRoomFlowNode>(buildContext, plugins = listOf(inputs) + roomFlowNodeCallback)
            }
+            is NavTarget.JoinedSpace -> {
+                val spaceCallback = plugins<SpaceEntryPoint.Callback>().single()
+                spaceEntryPoint.nodeBuilder(this, buildContext)
+                    .inputs(SpaceEntryPoint.Inputs(roomId = navTarget.spaceId))
+                    .callback(spaceCallback)
+                    .build()
+            }
        }
    }

--- 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
@@ -24,9 +24,9 @@ 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.newRoot
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
@@ -45,7 +45,8 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.parcelize.Parcelize

@ContributesNode(SessionScope::class)
-class JoinedRoomFlowNode @AssistedInject constructor(
+@AssistedInject
+class JoinedRoomFlowNode(
    @Assisted val buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    loadingRoomStateFlowFactory: LoadingRoomStateFlowFactory,
--- 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
@@ -17,10 +17,10 @@ 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.appnav.di.RoomComponentFactory
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
+import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.features.messages.api.MessagesEntryPoint
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
@@ -28,7 +28,7 @@ import io.element.android.libraries.architecture.BackstackView
 import io.element.android.libraries.architecture.BaseFlowNode
 import io.element.android.libraries.architecture.NodeInputs
 import io.element.android.libraries.architecture.inputs
-import io.element.android.libraries.di.DaggerComponentOwner
+import io.element.android.libraries.di.DependencyInjectionGraphOwner
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.di.annotations.SessionCoroutineScope
 import io.element.android.libraries.matrix.api.MatrixClient
@@ -45,7 +45,8 @@ import kotlinx.parcelize.Parcelize
 import timber.log.Timber

@ContributesNode(SessionScope::class)
-class JoinedRoomLoadedFlowNode @AssistedInject constructor(
+@AssistedInject
+class JoinedRoomLoadedFlowNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val messagesEntryPoint: MessagesEntryPoint,
@@ -55,7 +56,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
    private val sessionCoroutineScope: CoroutineScope,
    private val matrixClient: MatrixClient,
    private val activeRoomsHolder: ActiveRoomsHolder,
-    roomComponentFactory: RoomComponentFactory,
+    roomGraphFactory: RoomGraphFactory,
 ) : BaseFlowNode<JoinedRoomLoadedFlowNode.NavTarget>(
    backstack = BackStack(
        initialElement = when (val input = plugins.filterIsInstance<Inputs>().first().initialElement) {
@@ -67,7 +68,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
    ),
    buildContext = buildContext,
    plugins = plugins,
-), DaggerComponentOwner {
+), DependencyInjectionGraphOwner {
    interface Callback : Plugin {
        fun onOpenRoom(roomId: RoomId, serverNames: List<String>)
        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
@@ -82,7 +83,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(

    private val inputs: Inputs = inputs()
    private val callbacks = plugins.filterIsInstance<Callback>()
-    override val daggerComponent = roomComponentFactory.create(inputs.room)
+    override val graph = roomGraphFactory.create(inputs.room)

    init {
        lifecycle.subscribe(
--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootNavStateFlowFactory.kt
@@ -9,18 +9,16 @@ package io.element.android.appnav.root

 import com.bumble.appyx.core.state.MutableSavedStateMap
 import com.bumble.appyx.core.state.SavedStateMap
+import dev.zacsweers.metro.Inject
 import io.element.android.appnav.di.MatrixSessionCache
-import io.element.android.features.login.api.LoginUserStory
 import io.element.android.features.preferences.api.CacheService
-import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 import io.element.android.libraries.matrix.ui.media.ImageLoaderHolder
 import io.element.android.libraries.preferences.api.store.SessionPreferencesStoreFactory
-import io.element.android.libraries.sessionstorage.api.LoggedInState
+import io.element.android.libraries.sessionstorage.api.SessionStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onEach
-import javax.inject.Inject

 private const val SAVE_INSTANCE_KEY = "io.element.android.x.RootNavStateFlowFactory.SAVE_INSTANCE_KEY"

@@ -28,12 +26,12 @@ private const val SAVE_INSTANCE_KEY = "io.element.android.x.RootNavStateFlowFact
 * This class is responsible for creating a flow of [RootNavState].
 * It gathers data from multiple datasource and creates a unique one.
 */
-class RootNavStateFlowFactory @Inject constructor(
-    private val authenticationService: MatrixAuthenticationService,
+@Inject
+class RootNavStateFlowFactory(
+    private val sessionStore: SessionStore,
    private val cacheService: CacheService,
    private val matrixSessionCache: MatrixSessionCache,
    private val imageLoaderHolder: ImageLoaderHolder,
-    private val loginUserStory: LoginUserStory,
    private val sessionPreferencesStoreFactory: SessionPreferencesStoreFactory,
 ) {
    private var currentCacheIndex = 0
@@ -41,14 +39,12 @@ class RootNavStateFlowFactory @Inject constructor(
    fun create(savedStateMap: SavedStateMap?): Flow<RootNavState> {
        return combine(
            cacheIndexFlow(savedStateMap),
-            authenticationService.loggedInStateFlow(),
-            loginUserStory.loginFlowIsDone,
-        ) { cacheIndex, loggedInState, loginFlowIsDone ->
-            if (loginFlowIsDone) {
-                RootNavState(cacheIndex = cacheIndex, loggedInState = loggedInState)
-            } else {
-                RootNavState(cacheIndex = cacheIndex, loggedInState = LoggedInState.NotLoggedIn)
-            }
+            sessionStore.loggedInStateFlow(),
+        ) { cacheIndex, loggedInState ->
+            RootNavState(
+                cacheIndex = cacheIndex,
+                loggedInState = loggedInState,
+            )
        }
    }

--- a/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/root/RootPresenter.kt
@@ -11,6 +11,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import dev.zacsweers.metro.Inject
 import im.vector.app.features.analytics.plan.SuperProperties
 import io.element.android.features.rageshake.api.crash.CrashDetectionState
 import io.element.android.features.rageshake.api.detection.RageshakeDetectionState
@@ -18,9 +19,9 @@ import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.matrix.api.SdkMetadata
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.apperror.api.AppErrorStateService
-import javax.inject.Inject

-class RootPresenter @Inject constructor(
+@Inject
+class RootPresenter(
    private val crashDetectionPresenter: Presenter<CrashDetectionState>,
    private val rageshakeDetectionPresenter: Presenter<RageshakeDetectionState>,
    private val appErrorStateService: AppErrorStateService,
--- a/appnav/src/main/res/values-de/translations.xml
+++ b/appnav/src/main/res/values-de/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="banner_migrate_to_native_sliding_sync_action">"Abmelden und aktualisieren"</string>
-  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s unterstützt das alte Protokoll nicht mehr. Bitte melden Sie sich ab und wieder an, um die App weiter nutzen zu können."</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s unterstützt das alte Protokoll nicht mehr. Bitte melde dich ab und wieder an, um die App weiter nutzen zu können."</string>
  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Dein Homeserver unterstützt das alte Protokoll nicht mehr. Bitte logge dich aus und melde dich wieder an, um die App weiter zu nutzen."</string>
 </resources>
--- a/appnav/src/main/res/values-ko/translations.xml
+++ b/appnav/src/main/res/values-ko/translations.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="banner_migrate_to_native_sliding_sync_action">"로그아웃 및 업그레이드"</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>
--- a/appnav/src/main/res/values-pt-rBR/translations.xml
+++ b/appnav/src/main/res/values-pt-rBR/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="banner_migrate_to_native_sliding_sync_action">"Sair e atualizar"</string>
-  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s não suporta mais o protocolo antigo. Termine sessão e volte a iniciar sessão para continuar a utilizar a aplicação."</string>
-  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Seu servidor doméstico não é mais compatível com o protocolo antigo. Faça logout e login novamente para continuar usando o aplicativo."</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s não tem mais suporte ao protocolo antigo. Saia da sua conta e entre novamente para continuar utilizando o aplicativo."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Seu servidor-casa não é mais compatível com o protocolo antigo. Saia da sua conta e entre novamente para continuar usando o aplicativo."</string>
 </resources>
--- a/appnav/src/main/res/values-pt/translations.xml
+++ b/appnav/src/main/res/values-pt/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">"Sair &amp; Atualizar"</string>
  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s já não suporta o protocolo antigo. Termina a sessão e volta a iniciar sessão para continuares a utilizar a aplicação."</string>
-  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Seu homeserver não suporta mais o protocolo antigo. Termine sessão e volte a iniciar sessão para continuar a utilizar a aplicação."</string>
+  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"O teu servidor já não permite o protocolo antigo. Termine sessão e volte a iniciá-la para continuar a utilizar a aplicação."</string>
 </resources>
--- a/appnav/src/main/res/values-ro/translations.xml
+++ b/appnav/src/main/res/values-ro/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">"Deconectați-vă și faceți upgrade"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s nu mai acceptă vechiul protocol. Vă rugăm să vă deconectați și să vă reconectați pentru a continua utilizarea aplicației."</string>
  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Serverul dvs. de acasă nu mai acceptă vechiul protocol. Vă rugăm să vă deconectați și să vă conectați din nou pentru a continua să utilizați aplicația."</string>
 </resources>
--- a/appnav/src/main/res/values-tr/translations.xml
+++ b/appnav/src/main/res/values-tr/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="banner_migrate_to_native_sliding_sync_action">"Çıkış Yap ve Yükselt"</string>
+  <string name="banner_migrate_to_native_sliding_sync_app_force_logout_title">"%1$s artık eski protokolü destekleniyor. Uygulamayı kullanmaya devam etmek için lütfen çıkış yapın ve tekrar giriş yapın
+"</string>
  <string name="banner_migrate_to_native_sliding_sync_force_logout_title">"Ana sunucunuz artık eski protokolü desteklemiyor. Lütfen oturumu kapatın ve uygulamayı kullanmaya devam etmek için tekrar oturum açın."</string>
 </resources>
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt
@@ -17,7 +17,7 @@ import com.bumble.appyx.navmodel.backstack.activeElement
 import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
 import com.bumble.appyx.testing.unit.common.helper.parentNodeTestHelper
 import com.google.common.truth.Truth.assertThat
-import io.element.android.appnav.di.RoomComponentFactory
+import io.element.android.appnav.di.RoomGraphFactory
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.appnav.room.joined.JoinedRoomLoadedFlowNode
 import io.element.android.features.messages.api.MessagesEntryPoint
@@ -70,7 +70,7 @@ class JoinedRoomLoadedFlowNodeTest {
        }
    }

-    private class FakeRoomComponentFactory : RoomComponentFactory {
+    private class FakeRoomGraphFactory : RoomGraphFactory {
        override fun create(room: JoinedRoom): Any {
            return Unit
        }
@@ -110,7 +110,7 @@ class JoinedRoomLoadedFlowNodeTest {
        roomDetailsEntryPoint = roomDetailsEntryPoint,
        appNavigationStateService = FakeAppNavigationStateService(),
        sessionCoroutineScope = this,
-        roomComponentFactory = FakeRoomComponentFactory(),
+        roomGraphFactory = FakeRoomGraphFactory(),
        matrixClient = FakeMatrixClient(),
        activeRoomsHolder = activeRoomsHolder,
    )
--- a/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/intent/IntentResolverTest.kt
@@ -14,9 +14,7 @@ import androidx.core.net.toUri
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.login.api.LoginParams
 import io.element.android.features.login.test.FakeLoginIntentResolver
-import io.element.android.libraries.deeplink.DeepLinkCreator
-import io.element.android.libraries.deeplink.DeeplinkData
-import io.element.android.libraries.deeplink.DeeplinkParser
+import io.element.android.libraries.deeplink.api.DeeplinkData
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.permalink.PermalinkData
 import io.element.android.libraries.matrix.test.A_ROOM_ID
@@ -46,15 +44,11 @@ class IntentResolverTest {

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

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

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

    private fun createIntentResolver(
+        deeplinkParserResult: DeeplinkData? = null,
        permalinkParserResult: (String) -> PermalinkData = { lambdaError() },
        loginIntentResolverResult: (String) -> LoginParams? = { lambdaError() },
        oidcIntentResolverResult: (Intent) -> OidcAction? = { lambdaError() },
    ): IntentResolver {
        return IntentResolver(
-            deeplinkParser = DeeplinkParser(),
+            deeplinkParser = { deeplinkParserResult },
            loginIntentResolver = FakeLoginIntentResolver(
                parseResult = loginIntentResolverResult,
            ),
--- a/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/loggedin/LoggedInPresenterTest.kt
@@ -501,22 +501,16 @@ class LoggedInPresenterTest {

    @Test
    fun `present - CheckSlidingSyncProxyAvailability forces the sliding sync migration under the right circumstances`() = runTest {
-        // The migration will be forced if:
-        // - The user is not using the native sliding sync
-        // - The sliding sync proxy is no longer supported
-        // - The native sliding sync is supported
+        // The migration will be forced if the user is not using the native sliding sync
        val matrixClient = FakeMatrixClient(
            currentSlidingSyncVersionLambda = { Result.success(SlidingSyncVersion.Proxy) },
-            availableSlidingSyncVersionsLambda = { Result.success(listOf(SlidingSyncVersion.Native)) },
        )
        createLoggedInPresenter(
            matrixClient = matrixClient,
        ).test {
            val initialState = awaitItem()
            assertThat(initialState.forceNativeSlidingSyncMigration).isFalse()
-
            initialState.eventSink(LoggedInEvents.CheckSlidingSyncProxyAvailability)
-
            assertThat(awaitItem().forceNativeSlidingSyncMigration).isTrue()
        }
    }
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,24 +5,15 @@
 * Please see LICENSE files in the repository root for full details.
 */

-buildscript {
-    dependencies {
-        classpath(libs.kotlin.gradle.plugin)
-        classpath(libs.gms.google.services)
-    }
-}
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
    id("io.element.android-root")
+    alias(libs.plugins.kotlin.jvm) apply false
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
    alias(libs.plugins.kotlin.android) apply false
    alias(libs.plugins.compose.compiler) apply false
    alias(libs.plugins.ksp) apply false
-    alias(libs.plugins.anvil) apply false
-    alias(libs.plugins.kotlin.jvm) apply false
-    alias(libs.plugins.kapt) apply false
    alias(libs.plugins.dependencycheck) apply false
    alias(libs.plugins.dependencyanalysis)
    alias(libs.plugins.detekt)
@@ -102,6 +93,8 @@ allprojects {
            // Fix compilation warning for annotations
            // See https://youtrack.jetbrains.com/issue/KT-73255/Change-defaulting-rule-for-annotations for more details
            freeCompilerArgs.add("-Xannotation-default-target=first-only")
+            // Opt-in to context receivers
+            freeCompilerArgs.add("-Xcontext-parameters")
        }
    }
 }
--- a/anvilcodegen/.gitignore
+++ b/anvilcodegen/.gitignore
--- a/anvilcodegen/build.gradle.kts
+++ b/anvilcodegen/build.gradle.kts
@@ -10,11 +10,10 @@ plugins {
 }

 dependencies {
-    implementation(projects.anvilannotations)
-    api(libs.anvil.compiler.api)
-    implementation(libs.anvil.compiler.utils)
+    implementation(projects.annotations)
+    implementation(libs.metro.runtime)
+    implementation(libs.kotlin.compiler)
    implementation(libs.kotlinpoet)
-    implementation(libs.dagger)
    implementation(libs.ksp.plugin)
    implementation(libs.kotlinpoet.ksp)
 }
--- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessor.kt
@@ -5,7 +5,7 @@
 * Please see LICENSE files in the repository root for full details.
 */

-package io.element.android.anvilcodegen
+package io.element.android.codegen

 import com.google.devtools.ksp.KspExperimental
 import com.google.devtools.ksp.getConstructors
@@ -19,7 +19,6 @@ import com.google.devtools.ksp.symbol.KSAnnotated
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.validate
-import com.squareup.anvil.annotations.ContributesTo
 import com.squareup.kotlinpoet.AnnotationSpec
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
@@ -30,13 +29,14 @@ import com.squareup.kotlinpoet.STAR
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
-import dagger.Binds
-import dagger.Module
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dagger.multibindings.IntoMap
-import io.element.android.anvilannotations.ContributesNode
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.IntoMap
+import dev.zacsweers.metro.Origin
+import io.element.android.annotations.ContributesNode
 import org.jetbrains.kotlin.name.FqName

 class ContributesNodeProcessor(
@@ -72,15 +72,16 @@ class ContributesNodeProcessor(
        val scope = annotation.arguments.find { it.name?.asString() == "scope" }!!.value as KSType
        val modulePackage = ksClass.packageName.asString()
        val moduleClassName = "${ksClass.simpleName.asString()}_Module"
+        val nodeClassName = ClassName.bestGuess(ksClass.qualifiedName!!.asString())
        val content = FileSpec.builder(
            packageName = modulePackage,
            fileName = moduleClassName,
        )
            .addType(
-                TypeSpec.classBuilder(moduleClassName)
-                    .addModifiers(KModifier.ABSTRACT)
-                    .addAnnotation(Module::class)
-                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember("%T::class", scope.toTypeName()).build())
+                TypeSpec.interfaceBuilder(moduleClassName)
+                    .addAnnotation(AnnotationSpec.builder(Origin::class).addMember(CLASS_PLACEHOLDER, nodeClassName).build())
+                    .addAnnotation(BindingContainer::class)
+                    .addAnnotation(AnnotationSpec.builder(ContributesTo::class).addMember(CLASS_PLACEHOLDER, scope.toTypeName()).build())
                    .addFunction(
                        FunSpec.builder("bind${ksClass.simpleName.asString()}Factory")
                            .addModifiers(KModifier.ABSTRACT)
@@ -90,7 +91,7 @@ class ContributesNodeProcessor(
                            .addAnnotation(IntoMap::class)
                            .addAnnotation(
                                AnnotationSpec.Companion.builder(ClassName.bestGuess(nodeKeyFqName.asString())).addMember(
-                                    "%T::class",
+                                    CLASS_PLACEHOLDER,
                                    ClassName.bestGuess(ksClass.qualifiedName!!.asString())
                                ).build()
                            )
@@ -103,7 +104,7 @@ class ContributesNodeProcessor(
        content.writeTo(
            codeGenerator = codeGenerator,
            dependencies = Dependencies(
-                aggregating = true,
+                aggregating = false,
                ksClass.containingFile!!
            ),
        )
@@ -113,23 +114,23 @@ class ContributesNodeProcessor(
    private fun generateFactory(ksClass: KSClassDeclaration) {
        val generatedPackage = ksClass.packageName.asString()
        val assistedFactoryClassName = "${ksClass.simpleName.asString()}_AssistedFactory"
-        val constructor = ksClass.getConstructors().singleOrNull { it.isAnnotationPresent(AssistedInject::class) }
-        val assistedParameters = constructor?.parameters?.filter { it.isAnnotationPresent(Assisted::class) }.orEmpty()
-        if (constructor == null || assistedParameters.size != 2) {
+        val constructor = ksClass.getConstructors().first { it.parameters.isNotEmpty() }
+        val assistedParameters = constructor.parameters.filter { it.isAnnotationPresent(Assisted::class) }
+        if (assistedParameters.size != 2) {
            error(
-                "${ksClass.qualifiedName} must have an @AssistedInject constructor with 2 @Assisted parameters",
+                "${ksClass.qualifiedName?.asString()} must have a constructor with 2 @Assisted parameters. Found: ${assistedParameters.size}",
            )
        }
        val contextAssistedParam = assistedParameters[0]
        if (contextAssistedParam.name?.asString() != "buildContext") {
            error(
-                "${ksClass.qualifiedName} @Assisted parameter must be named buildContext",
+                "${ksClass.qualifiedName?.asString()} @Assisted parameter must be named buildContext",
            )
        }
        val pluginsAssistedParam = assistedParameters[1]
        if (pluginsAssistedParam.name?.asString() != "plugins") {
            error(
-                "${ksClass.qualifiedName} @Assisted parameter must be named plugins",
+                "${ksClass.qualifiedName?.asString()} @Assisted parameter must be named plugins",
            )
        }

@@ -140,6 +141,7 @@ class ContributesNodeProcessor(
            .addType(
                TypeSpec.interfaceBuilder(assistedFactoryClassName)
                    .addSuperinterface(ClassName.bestGuess(assistedNodeFactoryFqName.asString()).parameterizedBy(nodeClassName))
+                    .addAnnotation(AnnotationSpec.builder(Origin::class).addMember("%T::class", nodeClassName).build())
                    .addAnnotation(AssistedFactory::class)
                    .addFunction(
                        FunSpec.builder("create")
@@ -156,13 +158,14 @@ class ContributesNodeProcessor(
        content.writeTo(
            codeGenerator = codeGenerator,
            dependencies = Dependencies(
-                aggregating = true,
+                aggregating = false,
                ksClass.containingFile!!
            ),
        )
    }

    companion object {
+        private const val CLASS_PLACEHOLDER = "%T::class"
        private val assistedNodeFactoryFqName = FqName("io.element.android.libraries.architecture.AssistedNodeFactory")
        private val nodeKeyFqName = FqName("io.element.android.libraries.architecture.NodeKey")
    }
--- a/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessorProvider.kt
+++ b/anvilcodegen/src/main/kotlin/io/element/android/anvilcodegen/ContributesNodeProcessorProvider.kt
@@ -5,7 +5,7 @@
 * Please see LICENSE files in the repository root for full details.
 */

-package io.element.android.anvilcodegen
+package io.element.android.codegen

 import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
--- a/codegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
+++ b/codegen/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@@ -0,0 +1 @@
+io.element.android.codegen.ContributesNodeProcessorProvider
--- a/docs/_developer_onboarding.md
+++ b/docs/_developer_onboarding.md
@@ -249,8 +249,7 @@ Main libraries and frameworks used in this application:

 - Navigation state with [Appyx](https://bumble-tech.github.io/appyx/). Please
  watch [this video](https://www.droidcon.com/2022/11/15/model-driven-navigation-with-appyx-from-zero-to-hero/) to learn more about Appyx!
- DI: [Dagger](https://dagger.dev/) and [Anvil](https://github.com/square/anvil). Please
-  watch [this video](https://www.droidcon.com/2022/06/28/dagger-anvil-learning-to-love-dependency-injection/) to learn more about Anvil!
+- Dependency injection: [Metro](https://zacsweers.github.io/metro/latest/)
 - Reactive State management with Compose runtime and [Molecule](https://github.com/cashapp/molecule)

 Some patterns are inspired by [Circuit](https://slackhq.github.io/circuit/)
@@ -261,7 +260,7 @@ Here are the main points:
 2. Views are compose first
 3. Presenters are also compose first, and have a single `present(): State` method. It's using the power of compose-runtime/compiler.
 4. The point of connection between a `View` and a `Presenter` is a `Node`.
-5. A `Node` is also responsible for managing Dagger components if any.
+5. A `Node` is also responsible for managing DI graph if any, see for instance `LoggedInAppScopeFlowNode`.
 6. A `ParentNode` has some children `Node` and only know about them.
 7. This is a single activity full compose application. The `MainActivity` is responsible for holding and configuring the `RootNode`.
 8. There is no more needs for Android Architecture Component ViewModel as configuration change should be handled by Composable if needed.
@@ -423,7 +422,7 @@ Rageshake can be very useful to get logs from a release version of the applicati
 - When this is possible, prefer using `sealed interface` instead of `sealed class`;
 - When writing temporary code, using the string "DO NOT COMMIT" in a comment can help to avoid committing things by mistake. If committed and pushed, the CI
  will detect this String and will warn the user about it. (TODO Not supported yet!)
- Very occasionally the gradle cache misbehaves and causes problems with Dagger. Try building with `--no-build-cache` if Dagger isn't behaving how you expect.
+- Very occasionally the gradle cache misbehaves and causes problems with code generation. Adding `--no-build-cache` to the `gradlew` command line can help to fix compilation issue.

 ## Happy coding!

--- a/docs/migration_to_metro.md
+++ b/docs/migration_to_metro.md
@@ -0,0 +1,15 @@
+# Migration to Metro
+
+The dependency injection library is now [Metro](https://zacsweers.github.io/metro/latest/). It replaces both Dagger and Anvil.
+
+Migration of the current Element X code has been performed in https://github.com/element-hq/element-x-android/pull/5253.
+
+To migrate other existing code you will need to:
+
+- replace `setupAnvil()` with `setupDependencyInjection()` in your `build.gradle.kts` files
+- replace the Dagger and Anvil imports with Metro ones
+- move the `@Inject` apply to the constructor to the class itself (only applicable if there is only one primary constructor
+- replace `@AssistedInject` with `@Inject`
+- replace `@Module` with `@BindingContainer`
+
+This should help to migrate your existing code.
--- a/2
+++ b/2
--- a/fastlane/metadata/android/en-US/changelogs/202508040.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202508040.txt
@@ -0,0 +1,2 @@
+Main changes in this version: you can now create shortcuts to your recent conversations, several bug fixes related to media processing and downloading.
+Full changelog: https://github.com/element-hq/element-x-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/202509000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202509000.txt
@@ -0,0 +1,2 @@
+Main changes in this version: improved timeline loading times, you can now create shortcuts to your recent conversations, several bug fixes related to media processing and downloading.
+Full changelog: https://github.com/element-hq/element-x-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/202509010.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202509010.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
--- a/fastlane/metadata/android/en-US/changelogs/202509020.txt
+++ b/fastlane/metadata/android/en-US/changelogs/202509020.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
--- a/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt
+++ b/features/analytics/api/src/main/kotlin/io/element/android/features/analytics/api/AnalyticsEntryPoint.kt
@@ -9,4 +9,4 @@ package io.element.android.features.analytics.api

 import io.element.android.libraries.architecture.SimpleFeatureEntryPoint

-interface AnalyticsEntryPoint : SimpleFeatureEntryPoint
+fun interface AnalyticsEntryPoint : SimpleFeatureEntryPoint
--- 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">"Sie können unsere Bedingungen %1$s lesen."</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>
--- a/features/analytics/api/src/main/res/values-ko/translations.xml
+++ b/features/analytics/api/src/main/res/values-ko/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_analytics_settings_help_us_improve">"익명화된 사용 데이터를 공유하여 문제점을 파악하는 데 도움을 주십시오."</string>
+  <string name="screen_analytics_settings_read_terms">"모든 이용 약관은 %1$s 에서 확인하실 수 있습니다."</string>
+  <string name="screen_analytics_settings_read_terms_content_link">"여기"</string>
+  <string name="screen_analytics_settings_share_data">"분석 데이터 공유"</string>
+</resources>
--- a/features/analytics/api/src/main/res/values-pt-rBR/translations.xml
+++ b/features/analytics/api/src/main/res/values-pt-rBR/translations.xml
@@ -3,5 +3,5 @@
  <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_content_link">"aqui"</string>
-  <string name="screen_analytics_settings_share_data">"Compartilhar dados de utilização"</string>
+  <string name="screen_analytics_settings_share_data">"Compartilhar dados analíticos"</string>
 </resources>
--- a/features/analytics/impl/build.gradle.kts
+++ b/features/analytics/impl/build.gradle.kts
@@ -1,4 +1,5 @@
-import extension.setupAnvil
+import extension.setupDependencyInjection
+import extension.testCommonDependencies

 /*
 * Copyright 2023, 2024 New Vector Ltd.
@@ -16,7 +17,7 @@ android {
    namespace = "io.element.android.features.analytics.impl"
 }

-setupAnvil()
+setupDependencyInjection()

 dependencies {
    implementation(projects.libraries.androidutils)
@@ -30,13 +31,7 @@ dependencies {
    implementation(libs.androidx.datastore.preferences)
    implementation(libs.androidx.browser)

-    testImplementation(libs.test.junit)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
-    testImplementation(libs.test.mockk)
+    testCommonDependencies(libs)
    testImplementation(projects.libraries.matrix.test)
    testImplementation(projects.services.analytics.test)
-    testImplementation(projects.tests.testutils)
 }
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt
@@ -14,16 +14,17 @@ 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 dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedInject
+import io.element.android.annotations.ContributesNode
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
-import io.element.android.libraries.di.AppScope

@ContributesNode(AppScope::class)
-class AnalyticsOptInNode @AssistedInject constructor(
+@AssistedInject
+class AnalyticsOptInNode(
    @Assisted buildContext: BuildContext,
    @Assisted plugins: List<Plugin>,
    private val presenter: AnalyticsOptInPresenter,
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInPresenter.kt
@@ -9,6 +9,7 @@ package io.element.android.features.analytics.impl

 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.libraries.architecture.Presenter
@@ -16,9 +17,9 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject

-class AnalyticsOptInPresenter @Inject constructor(
+@Inject
+class AnalyticsOptInPresenter(
    private val buildMeta: BuildMeta,
    private val analyticsService: AnalyticsService,
 ) : Presenter<AnalyticsOptInState> {
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInStateProvider.kt
@@ -8,9 +8,8 @@
 package io.element.android.features.analytics.impl

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

-open class AnalyticsOptInStateProvider @Inject constructor() : PreviewParameterProvider<AnalyticsOptInState> {
+open class AnalyticsOptInStateProvider : PreviewParameterProvider<AnalyticsOptInState> {
    override val values: Sequence<AnalyticsOptInState>
        get() = sequenceOf(
            aAnalyticsOptInState(),
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/DefaultAnalyticsEntryPoint.kt
@@ -9,14 +9,15 @@ package io.element.android.features.analytics.impl

 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
-import com.squareup.anvil.annotations.ContributesBinding
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
 import io.element.android.features.analytics.api.AnalyticsEntryPoint
 import io.element.android.libraries.architecture.createNode
-import io.element.android.libraries.di.AppScope
-import javax.inject.Inject

@ContributesBinding(AppScope::class)
-class DefaultAnalyticsEntryPoint @Inject constructor() : AnalyticsEntryPoint {
+@Inject
+class DefaultAnalyticsEntryPoint : AnalyticsEntryPoint {
    override fun createNode(parentNode: Node, buildContext: BuildContext): Node {
        return parentNode.createNode<AnalyticsOptInNode>(buildContext)
    }
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/di/AnalyticsModule.kt
@@ -7,16 +7,16 @@

 package io.element.android.features.analytics.impl.di

-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Binds
-import dagger.Module
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.Binds
+import dev.zacsweers.metro.ContributesTo
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
 import io.element.android.features.analytics.impl.preferences.AnalyticsPreferencesPresenter
 import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.di.AppScope

@ContributesTo(AppScope::class)
-@Module
+@BindingContainer
 interface AnalyticsModule {
    @Binds
    fun bindAnalyticsPreferencesPresenter(presenter: AnalyticsPreferencesPresenter): Presenter<AnalyticsPreferencesState>
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/AnalyticsPreferencesPresenter.kt
@@ -10,6 +10,7 @@ package io.element.android.features.analytics.impl.preferences
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
+import dev.zacsweers.metro.Inject
 import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
@@ -18,9 +19,9 @@ import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject

-class AnalyticsPreferencesPresenter @Inject constructor(
+@Inject
+class AnalyticsPreferencesPresenter(
    private val analyticsService: AnalyticsService,
    private val buildMeta: BuildMeta,
 ) : Presenter<AnalyticsPreferencesState> {
--- a/features/analytics/impl/src/main/res/values-de/translations.xml
+++ b/features/analytics/impl/src/main/res/values-de/translations.xml
@@ -1,10 +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">"Wir zeichnen keine persönlichen Daten auf und erstellen keine Profile."</string>
+  <string name="screen_analytics_prompt_data_usage">"Wir speichern oder profilieren keine personenbezogenen Daten."</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">"Sie können unsere Bedingungen %1$s lesen."</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">"Sie können dies jederzeit beenden"</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>
  <string name="screen_analytics_prompt_title">"Hilf uns %1$s zu verbessern"</string>
 </resources>
--- a/features/analytics/impl/src/main/res/values-ko/translations.xml
+++ b/features/analytics/impl/src/main/res/values-ko/translations.xml
@@ -0,0 +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">"개인 데이터는 기록하거나 프로파일링하지 않습니다."</string>
+  <string name="screen_analytics_prompt_help_us_improve">"익명화된 사용 데이터를 공유하여 문제점을 파악하는 데 도움을 주십시오."</string>
+  <string name="screen_analytics_prompt_read_terms">"모든 이용 약관은 %1$s 에서 확인하실 수 있습니다."</string>
+  <string name="screen_analytics_prompt_read_terms_content_link">"여기"</string>
+  <string name="screen_analytics_prompt_settings">"이 기능을 언제든지 비활성화할 수 있습니다."</string>
+  <string name="screen_analytics_prompt_third_party_sharing">"우리는 귀하의 데이터를 제3자와 공유하지 않습니다."</string>
+  <string name="screen_analytics_prompt_title">"%1$s 개선하기"</string>
+</resources>
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`io.element.android.anvilcodegen.ContributesNodeProcessorProvider`
				`@@ -0,0 +1 @@`
				`io.element.android.codegen.ContributesNodeProcessorProvider`