diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d602f0191..e11aa1db91 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,10 +8,8 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-    --no-daemon
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
   debug:
@@ -37,7 +35,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble ${{ matrix.target }} debug apk
-        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES --stacktrace
+        run: ./gradlew assemble${{ matrix.target }}Debug $CI_GRADLE_ARG_PROPERTIES
       - name: Upload ${{ matrix.target }} debug APKs
         uses: actions/upload-artifact@v3
         with:
@@ -69,7 +67,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Assemble ${{ matrix.target }} unsigned apk
-        run: ./gradlew clean assemble${{ matrix.target }}Release $CI_GRADLE_ARG_PROPERTIES  --stacktrace
+        run: ./gradlew clean assemble${{ matrix.target }}Release $CI_GRADLE_ARG_PROPERTIES
       - name: Upload ${{ matrix.target }} unsigned APKs
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
new file mode 100644
index 0000000000..a1d754b4de
--- /dev/null
+++ b/.github/workflows/danger.yml
@@ -0,0 +1,18 @@
+name: Danger CI
+
+on: [pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Danger
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          npm install --save-dev @babel/plugin-transform-flow-strip-types
+      - name: Danger
+        uses: danger/danger-js@11.1.1
+        with:
+          args: "--dangerfile tools/danger/dangerfile.js"
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 4e701faa44..7b68c0077d 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,8 @@
 name: "Validate Gradle Wrapper"
-on: [push, pull_request]
+on:
+  pull_request: { }
+  push:
+    branches: [ main, develop ]
 
 jobs:
   validation:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 49934b7fa4..6232176f49 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -6,10 +6,8 @@ on:
     - cron: "0 4 * * *"
 
 env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-    --no-daemon
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
   nightly:
@@ -42,7 +40,7 @@ jobs:
           yes n | towncrier build --version nightly
       - name: Build and upload Gplay Nightly APK
         run: |
-          ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES --stacktrace
+          ./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
         env:
           ELEMENT_ANDROID_NIGHTLY_KEYID: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYID }}
           ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD: ${{ secrets.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD }}
diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
index add707e7d9..ced52e087a 100644
--- a/.github/workflows/post-pr.yml
+++ b/.github/workflows/post-pr.yml
@@ -10,10 +10,8 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-    --no-daemon
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
 
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 34910763e3..6e5e2e4d67 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -1,4 +1,3 @@
-
 name: Code Quality Checks
 
 on:
@@ -8,10 +7,8 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-    --no-daemon
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
   check:
@@ -30,79 +27,50 @@ jobs:
       - uses: actions/checkout@v3
       - name: Run knit
         run: |
-          ./gradlew knit
+          ./gradlew knitCheck
 
-  # ktlint for all the modules
-  ktlint:
-    name: Kotlin Linter
+  # Check the project: ktlint, detekt, lint
+  lint:
+    name: Android Linter
     runs-on: ubuntu-latest
     # Allow all jobs on main and develop. Just one per PR.
     concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('ktlint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('ktlint-develop-{0}', github.sha) || format('ktlint-{0}', github.ref) }}
+      group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v3
       - name: Run ktlint
         run: |
           ./gradlew ktlintCheck --continue
+      - name: Run detekt
+        if: always()
+        run: |
+          ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES
+      - name: Run lint
+        # Not always, if ktlint or detekt fail, avoid running the long lint check.
+        run: |
+          ./gradlew lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
       - name: Upload reports
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: ktlinting-report
+          name: linting-report
           path: |
-            */build/reports/ktlint/ktlint*/ktlint*.txt
-      - name: Handle Results
+            */build/reports/**/*.*
+      - name: Prepare Danger
         if: always()
-        id: ktlint-results
         run: |
-          results="$(cat */*/build/reports/ktlint/ktlint*/ktlint*.txt */build/reports/ktlint/ktlint*/ktlint*.txt | sed -r "s/\x1B\[([0-9]{1,3}(;[0-9]{1,2})?)?[mGK]//g")"
-          if [ -z  "$results" ]; then
-            echo "::set-output name=add_comment::false"
-          else
-            body="👎\`Failed${results}\`"
-            body="${body//'%'/'%25'}"
-            body="${body//$'\n'/'%0A'}"
-            body="${body//$'\r'/'%0D'}"
-            body="$( echo $body | sed 's/\/home\/runner\/work\/tchap-android\/tchap-android\//\`<br\/>\`/g')"
-            body="$( echo $body | sed 's/\/src\/main\/java\// 🔸 /g')"
-            body="$( echo $body | sed 's/im\/vector\/app\///g')"
-            body="$( echo $body | sed 's/im\/vector\/lib\/attachmentviewer\///g')"
-            body="$( echo $body | sed 's/im\/vector\/lib\/multipicker\///g')"
-            body="$( echo $body | sed 's/im\/vector\/lib\///g')"
-            body="$( echo $body | sed 's/org\/matrix\/android\/sdk\///g')"
-            body="$( echo $body | sed 's/\/src\/androidTest\/java\// 🔸 /g')"
-            echo "::set-output name=add_comment::true"
-            echo "::set-output name=body::$body"
-          fi
-      - name: Find Comment
-        if: always() && github.event_name == 'pull_request'
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: 'github-actions[bot]'
-          body-includes: Ktlint Results
-      - name: Add comment if needed
-        if: always() && github.event_name == 'pull_request' && steps.ktlint-results.outputs.add_comment == 'true'
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            ### Ktlint Results
-            ${{ steps.ktlint-results.outputs.body }}
-          edit-mode: replace
-      - name: Delete comment if needed
-        if: always() && github.event_name == 'pull_request' && steps.fc.outputs.comment-id != '' && steps.ktlint-results.outputs.add_comment == 'false'
-        uses: actions/github-script@v3
+          npm install --save-dev @babel/core
+          npm install --save-dev @babel/plugin-transform-flow-strip-types
+          yarn add danger-plugin-lint-report --dev
+      - name: Danger lint
+        if: always()
+        uses: danger/danger-js@11.1.1
         with:
-          script: |
-            github.issues.deleteComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              comment_id: ${{ steps.fc.outputs.comment-id }}
-            })
+          args: "--dangerfile tools/danger/dangerfile-lint.js"
+        env:
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
 
   # Gradle dependency analysis using https://github.com/autonomousapps/dependency-analysis-android-gradle-plugin
   dependency-analysis:
@@ -122,107 +90,3 @@ jobs:
         with:
           name: dependency-analysis
           path: build/reports/dependency-check-report.html
-
-  # Lint for main module
-  android-lint:
-    name: Android Linter
-    runs-on: ubuntu-latest
-    # Allow all jobs on main and develop. Just one per PR.
-    concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('android-lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('android-lint-develop-{0}', github.sha) || format('android-lint-{0}', github.ref) }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Lint analysis
-        run: ./gradlew clean :vector:lint --stacktrace $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload reports
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: lint-report
-          path: |
-            vector/build/reports/*.*
-
-  # Lint for Gplay and Fdroid release APK
-  apk-lint:
-    name: Lint APK (${{ matrix.target }})
-    runs-on: ubuntu-latest
-    if: github.ref != 'refs/heads/main'
-    strategy:
-      fail-fast: false
-      matrix:
-        target: [ GplayBtchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning ]
-    # Allow all jobs on develop. Just one per PR.
-    concurrency:
-      group: ${{ github.ref == 'refs/heads/develop' && format('apk-lint-develop-{0}-{1}', matrix.target, github.sha) || format('apk-lint-{0}-{1}', matrix.target, github.ref) }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Lint ${{ matrix.target }} release
-        run: ./gradlew clean lint${{ matrix.target }}Release --stacktrace $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload ${{ matrix.target }} linting report
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: release-lint-report-${{ matrix.target }}
-          path: |
-            vector/build/reports/*.*
-
-  detekt:
-    name: Detekt Analysis
-    runs-on: ubuntu-latest
-    # Allow all jobs on main and develop. Just one per PR.
-    concurrency:
-      group: ${{ github.ref == 'refs/heads/main' && format('detekt-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('detekt-develop-{0}', github.sha) || format('detekt-{0}', github.ref) }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run detekt
-        run: |
-          ./gradlew detekt $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload reports
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: detekt-report
-          path: |
-            */build/reports/detekt/detekt.html
-
-#  towncrier:
-#    name: Towncrier check
-#    runs-on: ubuntu-latest
-#    if: github.event_name == 'pull_request' && github.head_ref == 'develop'
-#    steps:
-#      - uses: actions/checkout@v3
-#      - name: Set up Python 3.8
-#        uses: actions/setup-python@v4
-#        with:
-#          python-version: 3.8
-#      - name: Install towncrier
-#        run: |
-#          python3 -m pip install towncrier
-#      - name: Run towncrier
-#        # Fetch the pull request' base branch so towncrier will be able to
-#        # compare the current branch with the base branch.
-#        # Source: https://github.com/actions/checkout/#fetch-all-branches.
-#        run: |
-#          git fetch --no-tags origin +refs/heads/${BASE_BRANCH}:refs/remotes/origin/${BASE_BRANCH}
-#          towncrier check --compare-with origin/${BASE_BRANCH}
-#      env:
-#        BASE_BRANCH: ${{ github.base_ref }}
diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml
index 3d411d3965..911ab62b1c 100644
--- a/.github/workflows/sanity_test.yml
+++ b/.github/workflows/sanity_test.yml
@@ -70,7 +70,7 @@ jobs:
             touch emulator.log
             chmod 777 emulator.log
             adb logcat >> emulator.log &
-            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
+            ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapWithoutvoipWithoutpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1
       - name: Upload Test Report Log
         uses: actions/upload-artifact@v2
         if: always()
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 30bd283a12..952f6c7d51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,10 +7,8 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  CI_GRADLE_ARG_PROPERTIES: >
-    -Porg.gradle.jvmargs=-Xmx4g
-    -Porg.gradle.parallel=false
-    --no-daemon
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
   tests:
@@ -51,9 +49,9 @@ jobs:
           disable-animations: true
           emulator-build: 7425822
           script: |
-            ./gradlew unitTestsWithCoverage --stacktrace $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage --stacktrace $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport --stacktrace $CI_GRADLE_ARG_PROPERTIES
+            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
 # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves stes.tests.outcome = 'failure'
       - name: Run all the codecoverage tests at once (retry if emulator failed)
         uses: reactivecircus/android-emulator-runner@v2
@@ -67,16 +65,16 @@ jobs:
           disable-animations: true
           emulator-build: 7425822
           script: |
-            ./gradlew unitTestsWithCoverage --stacktrace $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew instrumentationTestsWithCoverage --stacktrace $CI_GRADLE_ARG_PROPERTIES
-            ./gradlew generateCoverageReport --stacktrace $CI_GRADLE_ARG_PROPERTIES
-       # Tchap: Skip for forks
-#      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
-#        if: always() # we may have failed a previous step and retried, that's OK
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
+            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
+            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
+      - run: ./gradlew sonarqube $CI_GRADLE_ARG_PROPERTIES
+        # Tchap: Skip in forks
+        if: github.repository == 'vector-im/element-android' && always() # we may have failed a previous step and retried, that's OK
+        env:
+          GITHUB_TOKEN: ${{ secrets.SONARQUBE_GITHUB_API_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          ORG_GRADLE_PROJECT_SONAR_LOGIN: ${{ secrets.SONAR_TOKEN }}
 
       - name: Format unit test results
         if: always()
@@ -115,4 +113,4 @@ jobs:
 #          restore-keys: | 
 #            ${{ runner.os }}-gradle- 
 #      - name: Build Android Tests  
-#        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES --stacktrace 
+#        run: ./gradlew clean assembleAndroidTest $CI_GRADLE_ARG_PROPERTIES
diff --git a/.gitignore b/.gitignore
index 8313fb5c63..f1c0b99b58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,8 @@
 /fastlane/report.xml
 
 /**/build
+
+# Added by yarn
+/package.json
+/yarn.lock
+/node_modules
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6e67639284..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# FTR: Configuration on https://travis-ci.org/github/vector-im/element-android/settings
-#
-# - Build only if .travis.yml is present -> On
-# - Limit concurrent jobs                -> Off
-# - Build pushed branches                -> On (build the branch)
-# - Build pushed pull request            -> On (build the PR after auto-merge)
-#
-# - Auto cancel branch builds            -> On
-# - Auto cancel pull request builds      -> On
-
-sudo: false
-
-notifications:
-  email: false
-
-# Just run a simple script here
-script:
-  - ./tools/travis/check_pr.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 44b87c6141..108fa46424 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -103,7 +103,7 @@ For ktlint to fix some detected errors for you (you still have to check and comm
 Make sure the following commands execute without any error:
 
 <pre>
-./gradlew testGplayBtchapWithoutvoipWithpinningReleaseUnitTest
+./gradlew testGplayBtchapWithoutvoipWithoutpinningReleaseUnitTest
 </pre>
 
 ### Tests
diff --git a/ELEMENT_CHANGES.md b/ELEMENT_CHANGES.md
index 2c6fc1501c..829b1a0caa 100644
--- a/ELEMENT_CHANGES.md
+++ b/ELEMENT_CHANGES.md
@@ -1,3 +1,47 @@
+Changes in Element v1.4.32 (2022-08-10)
+=======================================
+
+Features ✨
+----------
+ - [Location Share] Render fallback UI when map fails to load ([#6711](https://github.com/vector-im/element-android/issues/6711))
+
+Bugfixes 🐛
+----------
+ - Fix message content sometimes appearing in the log ([#6706](https://github.com/vector-im/element-android/issues/6706))
+ - Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. ([#6713](https://github.com/vector-im/element-android/issues/6713))
+ - Fix crash when biometric key is used when coming back to foreground and KeyStore reports that the device is still locked. ([#6768](https://github.com/vector-im/element-android/issues/6768))
+ - Catch all exceptions on lockscreen system key migrations. ([#6769](https://github.com/vector-im/element-android/issues/6769))
+ - Fixes crash when entering non ascii characters during account creation ([#6735](https://github.com/vector-im/element-android/issues/6735))
+ - Fixes onboarding login/account creation errors showing after navigation ([#6737](https://github.com/vector-im/element-android/issues/6737))
+ - [Location sharing] Invisible text on map symbol ([#6687](https://github.com/vector-im/element-android/issues/6687))
+
+In development 🚧
+----------------
+  - Adds new app layout toolbar ([#6655](https://github.com/vector-im/element-android/issues/6655))
+
+Other changes
+-------------
+ - [Modularization] Provides abstraction to avoid direct usages of BuildConfig ([#6406](https://github.com/vector-im/element-android/issues/6406))
+ - Refactors SpaceStateHandler (previously AppStateHandler) and adds unit tests for it ([#6598](https://github.com/vector-im/element-android/issues/6598))
+ - Setup Danger to the project ([#6637](https://github.com/vector-im/element-android/issues/6637))
+ - [Location Share] Open maximized map on tapping on live sharing notification ([#6642](https://github.com/vector-im/element-android/issues/6642))
+ - [Location sharing] Align naming of components for live location feature ([#6647](https://github.com/vector-im/element-android/issues/6647))
+ - [Location share] Update minimum sending period to 5 seconds for a live ([#6653](https://github.com/vector-im/element-android/issues/6653))
+ - [Location sharing] - Fix the memory leaks ([#6674](https://github.com/vector-im/element-android/issues/6674))
+ - [Timeline] Memory leak in audio message playback tracker ([#6678](https://github.com/vector-im/element-android/issues/6678))
+ - [FTUE] Memory leak on FtueAuthSplashCarouselFragment ([#6680](https://github.com/vector-im/element-android/issues/6680))
+ - Link directly to DCO docs from danger message. ([#6739](https://github.com/vector-im/element-android/issues/6739))
+
+
+Changes in Element v1.4.31 (2022-08-01)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fixes crash when returning to the app after backgrounding ([#6709](https://github.com/vector-im/element-android/issues/6709))
+ - Fix message content sometimes appearing in the log ([#6706](https://github.com/vector-im/element-android/issues/6706))
+
+
 Changes in Element v1.4.30 (2022-07-29)
 =======================================
 
diff --git a/Gemfile b/Gemfile
index 7a118b49be..c90138ee44 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
 gem "fastlane"
+gem 'danger'
diff --git a/Gemfile.lock b/Gemfile.lock
index 345b4c1502..90e846860e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,10 +24,29 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
+    claide-plugins (0.9.2)
+      cork
+      nap
+      open4 (~> 1.3)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    cork (0.3.0)
+      colored2 (~> 3.1)
+    danger (8.6.1)
+      claide (~> 1.0)
+      claide-plugins (>= 0.9.2)
+      colored2 (~> 3.1)
+      cork (~> 0.1)
+      faraday (>= 0.9.0, < 2.0)
+      faraday-http-cache (~> 2.0)
+      git (~> 1.7)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      no_proxy_fix
+      octokit (~> 4.7)
+      terminal-table (>= 1, < 4)
     declarative (0.0.20)
     digest-crc (0.6.3)
       rake (>= 12.0.0, < 14.0.0)
@@ -52,6 +71,8 @@ GEM
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-http-cache (2.4.0)
+      faraday (>= 0.8)
     faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
@@ -98,6 +119,8 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
+    git (1.11.0)
+      rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.8.0)
       google-apis-core (>= 0.4, < 2.a)
     google-apis-core (0.4.0)
@@ -143,17 +166,28 @@ GEM
     jmespath (1.4.0)
     json (2.5.1)
     jwt (2.2.3)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
+    nap (1.1.0)
     naturally (2.2.1)
+    no_proxy_fix (0.1.2)
+    octokit (4.25.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    open4 (1.3.4)
     os (1.1.1)
     plist (3.6.0)
     public_suffix (4.0.6)
     rake (13.0.6)
+    rchardet (1.8.0)
     representable (3.1.1)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -163,6 +197,9 @@ GEM
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     security (0.1.3)
     signet (0.15.0)
       addressable (~> 2.3)
@@ -200,9 +237,11 @@ GEM
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  universal-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES
+  danger
   fastlane
 
 BUNDLED WITH
diff --git a/build.gradle b/build.gradle
index 33c6edd599..13ae745dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ buildscript {
         classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
         classpath "com.likethesalad.android:stem-plugin:2.1.1"
         classpath 'org.owasp:dependency-check-gradle:7.1.1'
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.0"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -41,10 +41,10 @@ plugins {
     // ktlint Plugin
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     // Detekt
-    id "io.gitlab.arturbosch.detekt" version "1.20.0"
+    id "io.gitlab.arturbosch.detekt" version "1.21.0"
 
     // Dependency Analysis
-    id 'com.autonomousapps.dependency-analysis' version "1.9.0"
+    id 'com.autonomousapps.dependency-analysis' version "1.11.2"
 }
 
 // https://github.com/jeremylong/DependencyCheck
@@ -126,6 +126,11 @@ allprojects {
         enableExperimentalRules = true
         // display the corresponding rule
         verbose = true
+        reporters {
+            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
+            // To have XML report for Danger
+            reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
+        }
         disabledRules = [
                 // TODO Re-enable these 4 rules after reformatting project
                 "indent",
diff --git a/coverage.gradle b/coverage.gradle
index 2f349b77bc..76b70a4476 100644
--- a/coverage.gradle
+++ b/coverage.gradle
@@ -81,11 +81,11 @@ task generateCoverageReport(type: JacocoReport) {
 task unitTestsWithCoverage(type: GradleBuild) {
     // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
     startParameter.projectProperties.coverage = [enableTestCoverage:  false]
-    tasks = [':vector:testGplayBtchapWithoutvoipWithpinningDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
+    tasks = [':vector:testGplayBtchapWithoutvoipWithoutpinningDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
 }
 
 task instrumentationTestsWithCoverage(type: GradleBuild) {
     startParameter.projectProperties.coverage = [enableTestCoverage:  true]
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector:connectedGplayBtchapWithoutvoipWithpinningDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector:connectedGplayBtchapWithoutvoipWithoutpinningDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index e8e39dc5f7..93a62a548e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -20,9 +20,9 @@ def retrofit = "2.9.0"
 def arrow = "0.8.2"
 def markwon = "4.6.2"
 def moshi = "1.13.0"
-def lifecycle = "2.5.0"
+def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.154.0"
+def flipper = "0.156.0"
 def epoxy = "4.6.2"
 def mavericks = "2.7.0"
 def glide = "4.13.2"
@@ -30,7 +30,7 @@ def bigImageViewer = "1.8.1"
 def jjwt = "0.11.5"
 def vanniktechEmoji = "0.15.0"
 
-def fragment = "1.5.0"
+def fragment = "1.5.1"
 
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
@@ -50,7 +50,7 @@ ext.libs = [
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
-                'activity'                : "androidx.activity:activity:1.5.0",
+                'activity'                : "androidx.activity:activity:1.5.1",
                 'appCompat'               : "androidx.appcompat:appcompat:1.4.2",
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
                 'core'                    : "androidx.core:core-ktx:1.8.0",
diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle
index e89c69a594..d5972ed846 100644
--- a/dependencies_groups.gradle
+++ b/dependencies_groups.gradle
@@ -74,6 +74,7 @@ ext.groups = [
                         'com.github.javaparser',
                         'com.github.piasy',
                         'com.github.shyiko.klob',
+                        'com.github.rubensousa',
                         'com.google',
                         'com.google.android',
                         'com.google.api.grpc',
@@ -125,6 +126,7 @@ ext.groups = [
                         'info.picocli',
                         'io.arrow-kt',
                         'io.element.android',
+                        'io.github.davidburstrom.contester',
                         'io.github.detekt.sarif4k',
                         'io.github.microutils',
                         'io.github.reactivecircus.flowbinding',
diff --git a/docs/danger.md b/docs/danger.md
new file mode 100644
index 0000000000..19728f00e9
--- /dev/null
+++ b/docs/danger.md
@@ -0,0 +1,102 @@
+## Danger
+
+<!--- TOC -->
+
+* [What does danger checks](#what-does-danger-checks)
+  * [PR check](#pr-check)
+  * [Quality check](#quality-check)
+* [Setup](#setup)
+* [Run danger locally](#run-danger-locally)
+* [Danger user](#danger-user)
+* [Useful links](#useful-links)
+
+<!--- END -->
+
+## What does danger checks
+
+### PR check
+
+See the [dangerfile](../tools/danger/dangerfile.js). If you add rules in the dangerfile, please update the list below!
+
+Here are the checks that Danger does so far:
+
+- PR description is not empty
+- Big PR got a warning to recommend to split
+- PR contains a file for towncrier and extension is checked
+- PR contains a Sign-Off, with exception for Element employee contributors
+- PR with change on layout should include screenshot in the description
+- PR which adds png file warn about the usage of vector drawables
+- non draft PR should have a reviewer
+
+### Quality check
+
+After all the checks that generate checkstyle XML report, such as Ktlint, lint, or Detekt, Danger is run with this [dangerfile](../tools/danger/dangerfile-lint.js), in order to post comments to the PR with the detected error and warnings.
+
+To run locally, you will have to install the plugin `danger-plugin-lint-report` using:
+
+```shell
+yarn add danger-plugin-lint-report --dev
+```
+
+## Setup
+
+This operation should not be necessary, since Danger is already setup for the project.
+
+To setup danger to the project, run:
+
+```shell
+bundle exec danger init
+```
+
+## Run danger locally
+
+When modifying the [dangerfile](../tools/danger/dangerfile.js), you can check it by running Danger locally.
+
+To run danger locally, install it and run:
+
+```shell
+bundle exec danger pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
+```
+
+For instance:
+
+```shell
+bundle exec danger pr https://github.com/vector-im/element-android/pull/6637 --dangerfile=./tools/danger/dangerfile.js
+```
+
+We may need to create a GitHub token to have less API rate limiting, and then set the env var:
+
+```shell
+export DANGER_GITHUB_API_TOKEN='YOUR_TOKEN'
+```
+
+Swift and Kotlin (just in case)
+
+```shell
+bundle exec danger-swift pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
+bundle exec danger-kotlin pr <PR_URL> --dangerfile=./tools/danger/dangerfile.js
+```
+
+## Danger user
+
+To let Danger check all the PRs, including PRs form forks, a GitHub account have been created:
+- login: ElementBot
+- password: Stored on Passbolt
+- GitHub token: A token with limited access has been created and added to the repository https://github.com/vector-im/element-android as secret DANGER_GITHUB_API_TOKEN. This token is not saved anywhere else. In case of problem, just delete it and create a new one, then update the secret.
+
+## Useful links
+
+- https://danger.systems/
+- https://danger.systems/js/
+- https://danger.systems/js/guides/getting_started.html
+- https://danger.systems/js/reference.html
+- https://github.com/danger/awesome-danger
+
+Some danger files to get inspired from
+
+- https://github.com/artsy/emission/blob/master/dangerfile.ts
+- https://github.com/facebook/react-native/blob/master/bots/dangerfile.js
+- https://github.com/apollographql/apollo-client/blob/master/config/dangerfile.ts
+- https://github.com/styleguidist/react-styleguidist/blob/master/dangerfile.js
+- https://github.com/storybooks/storybook/blob/master/dangerfile.js
+- https://github.com/ReactiveX/rxjs/blob/master/dangerfile.js
diff --git a/docs/nightly_build.md b/docs/nightly_build.md
index 91f18214c4..7750e0466a 100644
--- a/docs/nightly_build.md
+++ b/docs/nightly_build.md
@@ -48,7 +48,7 @@ mv towncrier.toml towncrier.toml.bak
 sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
 rm towncrier.toml.bak
 yes n | towncrier --version nightly
-./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES --stacktrace
+./gradlew assembleGplayNightly appDistributionUploadGplayNightly $CI_GRADLE_ARG_PROPERTIES
 ```
 
 Then you can reset the change on the codebase.
diff --git a/fastlane/metadata/android/en-US/changelogs/40104310.txt b/fastlane/metadata/android/en-US/changelogs/40104310.txt
new file mode 100644
index 0000000000..c0b3284c4f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Enables the improved sign in and sign up journeys.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/fastlane/metadata/android/en-US/changelogs/40104320.txt b/fastlane/metadata/android/en-US/changelogs/40104320.txt
new file mode 100644
index 0000000000..61db61727a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
diff --git a/library/ui-styles/src/main/res/drawable/ic_home_search.xml b/library/ui-styles/src/main/res/drawable/ic_home_search.xml
new file mode 100644
index 0000000000..5cb88ba1e4
--- /dev/null
+++ b/library/ui-styles/src/main/res/drawable/ic_home_search.xml
@@ -0,0 +1,4 @@
+<vector android:height="22dp" android:viewportHeight="22"
+    android:viewportWidth="22" android:width="22dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#737D8C" android:fillType="evenOdd" android:pathData="M16.999,14.899C18.07,13.407 18.7,11.577 18.7,9.6C18.7,4.574 14.626,0.5 9.6,0.5C4.574,0.5 0.5,4.574 0.5,9.6C0.5,14.626 4.574,18.7 9.6,18.7C11.577,18.7 13.406,18.07 14.899,16.999C14.941,17.055 14.988,17.109 15.039,17.161L18.939,21.061C19.525,21.646 20.475,21.646 21.06,21.061C21.646,20.475 21.646,19.525 21.06,18.939L17.16,15.039C17.109,14.988 17.055,14.941 16.999,14.899ZM15.7,9.6C15.7,12.969 12.969,15.7 9.6,15.7C6.231,15.7 3.5,12.969 3.5,9.6C3.5,6.231 6.231,3.5 9.6,3.5C12.969,3.5 15.7,6.231 15.7,9.6Z"/>
+</vector>
diff --git a/library/ui-styles/src/main/res/values/dimens.xml b/library/ui-styles/src/main/res/values/dimens.xml
index 70d051b457..53f1044a12 100644
--- a/library/ui-styles/src/main/res/values/dimens.xml
+++ b/library/ui-styles/src/main/res/values/dimens.xml
@@ -71,4 +71,7 @@
     <dimen name="location_sharing_compass_button_margin_horizontal">8dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_horizontal">12dp</dimen>
     <dimen name="location_sharing_live_duration_choice_margin_vertical">22dp</dimen>
+
+    <!-- Material 3 -->
+    <dimen name="collapsing_toolbar_layout_medium_size">112dp</dimen>
 </resources>
diff --git a/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml b/library/ui-styles/src/main/res/values/stylable_live_location_ended_banner_view.xml
similarity index 79%
rename from library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
rename to library/ui-styles/src/main/res/values/stylable_live_location_ended_banner_view.xml
index 81e377d39b..30ac6229c5 100644
--- a/library/ui-styles/src/main/res/values/stylable_location_live_ended_banner_view.xml
+++ b/library/ui-styles/src/main/res/values/stylable_live_location_ended_banner_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <declare-styleable name="LocationLiveEndedBannerView">
+    <declare-styleable name="LiveLocationEndedBannerView">
         <attr name="locLiveEndedBkgWithAlpha" format="boolean" />
         <attr name="locLiveEndedIconMarginStart" format="dimension" />
     </declare-styleable>
diff --git a/library/ui-styles/src/main/res/values/stylable_map_loading_error_view.xml b/library/ui-styles/src/main/res/values/stylable_map_loading_error_view.xml
new file mode 100644
index 0000000000..911167e52a
--- /dev/null
+++ b/library/ui-styles/src/main/res/values/stylable_map_loading_error_view.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="MapLoadingErrorView">
+        <attr name="mapErrorDescription" format="string" />
+    </declare-styleable>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/styles_location.xml b/library/ui-styles/src/main/res/values/styles_location.xml
index 41ddbc73ca..ee893046ba 100644
--- a/library/ui-styles/src/main/res/values/styles_location.xml
+++ b/library/ui-styles/src/main/res/values/styles_location.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Vector.Button.Text.OnPrimary.LocationLive">
+    <style name="Widget.Vector.Button.Text.OnPrimary.LiveLocation">
         <item name="android:foreground">?selectableItemBackground</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textSize">12sp</item>
@@ -12,7 +12,7 @@
         <item name="android:insetLeft">8dp</item>
     </style>
 
-    <style name="Widget.Vector.Button.Text.LocationLive">
+    <style name="Widget.Vector.Button.Text.LiveLocation">
         <item name="android:foreground">?selectableItemBackground</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
diff --git a/library/ui-styles/src/main/res/values/styles_toolbar.xml b/library/ui-styles/src/main/res/values/styles_toolbar.xml
index 505419c6fe..893de92aae 100644
--- a/library/ui-styles/src/main/res/values/styles_toolbar.xml
+++ b/library/ui-styles/src/main/res/values/styles_toolbar.xml
@@ -39,4 +39,14 @@
         <item name="android:textSize">12sp</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <!-- Material 3 -->
+
+    <style name="Widget.Vector.Material3.Toolbar" parent="Widget.Material3.Toolbar" />
+
+    <style name="Widget.Vector.Material3.CollapsingToolbar.Medium" parent="Widget.Material3.CollapsingToolbar.Medium">
+        <item name="expandedTitleTextAppearance">@style/TextAppearance.Vector.Title.Medium</item>
+        <item name="expandedTitleMarginBottom">20dp</item>
+        <item name="collapsedTitleTextAppearance">@style/TextAppearance.Vector.Headline.Bold</item>
+    </style>
+
+</resources>
diff --git a/library/ui-styles/src/main/res/values/text_appearances.xml b/library/ui-styles/src/main/res/values/text_appearances.xml
index 1e60e05acf..570d26fdfd 100644
--- a/library/ui-styles/src/main/res/values/text_appearances.xml
+++ b/library/ui-styles/src/main/res/values/text_appearances.xml
@@ -32,6 +32,15 @@
         <item name="android:textColor">?vctr_content_primary</item>
     </style>
 
+    <style name="TextAppearance.Vector.Headline.Bold" parent="TextAppearance.MaterialComponents.Headline1">
+        <item name="fontFamily">sans-serif</item>
+        <item name="android:fontFamily">sans-serif</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textSize">@dimen/text_size_headline</item>
+        <item name="android:letterSpacing">0</item>
+        <item name="android:textColor">?vctr_content_primary</item>
+    </style>
+
     <style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="fontFamily">sans-serif</item>
         <item name="android:fontFamily">sans-serif</item>
diff --git a/library/ui-styles/src/main/res/values/theme_common.xml b/library/ui-styles/src/main/res/values/theme_common.xml
index 2e9c2c5123..107534fe1a 100644
--- a/library/ui-styles/src/main/res/values/theme_common.xml
+++ b/library/ui-styles/src/main/res/values/theme_common.xml
@@ -25,4 +25,4 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index b88feb40f2..2f65b77c69 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -150,6 +150,9 @@
 
         <!-- Location sharing -->
         <item name="vctr_live_location">@color/vctr_live_location_dark</item>
+
+        <!-- Material 3 -->
+        <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index 4d3490f7de..1f83eb57a7 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -151,8 +151,12 @@
 
         <!-- Location sharing -->
         <item name="vctr_live_location">@color/vctr_live_location_light</item>
+
+        <!-- Material 3 -->
+        <item name="collapsingToolbarLayoutMediumSize">@dimen/collapsing_toolbar_layout_medium_size</item>
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
 
 </resources>
+
diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index ee58db748c..45a962f12c 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -60,7 +60,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.30\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.32\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@@ -199,7 +199,7 @@ dependencies {
     implementation libs.apache.commonsImaging
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.52'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.53'
 
     testImplementation libs.tests.junit
     // Note: version sticks to 1.9.2 due to https://github.com/mockk/mockk/issues/281
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index a78953caac..f30d2dab81 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
 import org.matrix.android.sdk.api.auth.registration.RegistrationResult
+import org.matrix.android.sdk.api.crypto.MXCryptoConfig
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toModel
@@ -103,7 +104,9 @@ class CommonTestHelper internal constructor(context: Context) {
                     context,
                     MatrixConfiguration(
                             applicationFlavor = "TestFlavor",
-                            roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider()
+                            roomDisplayNameFallbackProvider = TestRoomDisplayNameFallbackProvider(),
+                            // Tchap: Do not limit here key requests to my devices to unblock crypto tests
+                            cryptoConfig = MXCryptoConfig(limitRoomKeyRequestsToMyDevices = false),
                     )
             )
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
index 6e198fb98c..68b931b33c 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/failure/Extensions.kt
@@ -62,7 +62,10 @@ fun Throwable.isUsernameInUse() = this is Failure.ServerError &&
         error.code == MatrixError.M_USER_IN_USE
 
 fun Throwable.isInvalidUsername() = this is Failure.ServerError &&
-        error.code == MatrixError.M_INVALID_USERNAME
+        (error.code == MatrixError.M_INVALID_USERNAME || usernameContainsNonAsciiCharacters())
+
+private fun Failure.ServerError.usernameContainsNonAsciiCharacters() = error.code == MatrixError.M_UNKNOWN &&
+        error.message == "Query parameter \'username\' must be ascii"
 
 fun Throwable.isInvalidPassword() = this is Failure.ServerError &&
         error.code == MatrixError.M_FORBIDDEN &&
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/StringOrderUtils.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/StringOrderUtils.kt
index 83c8585941..1de0a36034 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/StringOrderUtils.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/StringOrderUtils.kt
@@ -76,7 +76,7 @@ object StringOrderUtils {
     }
 
     fun stringToBase(x: String, alphabet: CharArray): BigInteger {
-        if (x.isEmpty()) throw IllegalArgumentException()
+        require(x.isNotEmpty())
         val len = alphabet.size.toBigInteger()
         var result = BigInteger("0")
         x.reversed().forEachIndexed { index, c ->
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
index 96d97a41d7..771b5f9a62 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt
@@ -535,7 +535,7 @@ internal class MXMegolmEncryption(
 
     @Throws
     override suspend fun shareHistoryKeysWithDevice(inboundSessionWrapper: InboundGroupSessionHolder, deviceInfo: CryptoDeviceInfo) {
-        if (!inboundSessionWrapper.wrapper.sessionData.sharedHistory) throw IllegalArgumentException("This key can't be shared")
+        require(inboundSessionWrapper.wrapper.sessionData.sharedHistory) { "This key can't be shared" }
         Timber.tag(loggerTag.value).i("process shareHistoryKeys for ${inboundSessionWrapper.wrapper.safeSessionId} to ${deviceInfo.shortDebugString()}")
         val userId = deviceInfo.userId
         val deviceId = deviceInfo.deviceId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
index 821663bcff..8a805a5588 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationMessageProcessor.kt
@@ -63,7 +63,7 @@ internal class VerificationMessageProcessor @Inject constructor(
         // the message should be ignored by the receiver.
 
         if (!VerificationService.isValidRequest(event.ageLocalTs, clock.epochMillis())) return Unit.also {
-            Timber.d("## SAS Verification live observer: msgId: ${event.eventId} is outdated age:$event.ageLocalTs ms")
+            Timber.d("## SAS Verification live observer: msgId: ${event.eventId} is outdated age:${event.ageLocalTs} ms")
         }
 
         Timber.v("## SAS Verification live observer: received msgId: ${event.eventId} type: ${event.getClearType()}")
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
index c5b13043d7..51107c9655 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/EventSenderProcessorThread.kt
@@ -119,7 +119,7 @@ internal class EventSenderProcessorThread @Inject constructor(
 
     override fun cancel(eventId: String, roomId: String) {
         (currentTask as? SendEventQueuedTask)
-                ?.takeIf { it -> it.event.eventId == eventId && it.event.roomId == roomId }
+                ?.takeIf { it.event.eventId == eventId && it.event.roomId == roomId }
                 ?.cancel()
     }
 
diff --git a/tools/danger/dangerfile-lint.js b/tools/danger/dangerfile-lint.js
new file mode 100644
index 0000000000..b0531fef9b
--- /dev/null
+++ b/tools/danger/dangerfile-lint.js
@@ -0,0 +1,29 @@
+import { schedule } from 'danger'
+
+/**
+ * Ref and documentation: https://github.com/damian-burke/danger-plugin-lint-report
+ * This file will check all the error in XML Checkstyle format.
+ * It covers, lint, ktlint, and detekt errors
+ */
+
+const reporter = require("danger-plugin-lint-report")
+schedule(reporter.scan({
+    /**
+     * File mask used to find XML checkstyle reports.
+     */
+    fileMask: "**/reports/**/**.xml",
+    /**
+     * If set to true, the severity will be used to switch between the different message formats (message, warn, fail).
+     */
+    reportSeverity: true,
+    /**
+     * If set to true, only issues will be reported that are contained in the current changeset (line comparison).
+     * If set to false, all issues that are in modified files will be reported.
+     */
+    requireLineModification: false,
+    /**
+     * Optional: Sets a prefix foreach violation message.
+     * This can be useful if there are multiple reports being parsed to make them distinguishable.
+     */
+     // outputPrefix?: ""
+}))
diff --git a/tools/danger/dangerfile.js b/tools/danger/dangerfile.js
new file mode 100644
index 0000000000..4efd236419
--- /dev/null
+++ b/tools/danger/dangerfile.js
@@ -0,0 +1,107 @@
+const {danger, warn} = require('danger')
+
+/**
+ * Note: if you update the checks in this file, please also update the file ./docs/danger.md
+ */
+
+// Useful to see what we got in danger object
+// warn(JSON.stringify(danger))
+
+const pr = danger.github.pr
+const github = danger.github
+// User who has created the PR.
+const user = pr.user.login
+const modified = danger.git.modified_files
+const created = danger.git.created_files
+const editedFiles = [...modified, ...created]
+
+// Check that the PR has a description
+if (pr.body.length == 0) {
+    warn("Please provide a description for this PR.")
+}
+
+// Warn when there is a big PR
+if (editedFiles.length > 50) {
+    message("This pull request seems relatively large. Please consider splitting it into multiple smaller ones.")
+}
+
+// Request a changelog for each PR
+const changelogAllowList = [
+    "dependabot[bot]",
+]
+
+const requiresChangelog = !changelogAllowList.includes(user)
+
+if (requiresChangelog) {
+    const changelogFiles = editedFiles.filter(file => file.startsWith("changelog.d/"))
+
+    if (changelogFiles.length == 0) {
+        warn("Please add a changelog. See instructions [here](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog)")
+    } else {
+        const validTowncrierExtensions = [
+            "bugfix",
+            "doc",
+            "feature",
+            "misc",
+            "sdk",
+            "wip",
+        ]
+        if (!changelogFiles.every(file => validTowncrierExtensions.includes(file.split(".").pop()))) {
+            fail("Invalid extension for changelog. See instructions [here](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog)")
+        }
+    }
+}
+
+// Check for a sign-off
+const signOff = "Signed-off-by:"
+
+// Please add new names following the alphabetical order.
+const allowList = [
+    "aringenbach",
+    "BillCarsonFr",
+    "bmarty",
+    "Claire1817",
+    "dependabot[bot]",
+    "ericdecanini",
+    "fedrunov",
+    "Florian14",
+    "ganfra",
+    "jmartinesp",
+    "langleyd",
+    "MadLittleMods",
+    "manuroe",
+    "mnaturel",
+    "onurays",
+    "ouchadam",
+    "stefanceriu",
+    "yostyle",
+]
+
+const requiresSignOff = !allowList.includes(user)
+
+if (requiresSignOff) {
+    const hasPRBodySignOff = pr.body.includes(signOff)
+    const hasCommitSignOff = danger.git.commits.every(commit => commit.message.includes(signOff))
+    if (!hasPRBodySignOff && !hasCommitSignOff) {
+        fail("Please add a sign-off to either the PR description or to the commits themselves. See instructions [here](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off).")
+    }
+}
+
+// Check for screenshots on view changes
+const hasChangedViews = editedFiles.filter(file => file.includes("/layout")).length > 0
+if (hasChangedViews) {
+    if (!pr.body.includes("user-images")) {
+        warn("You seem to have made changes to views. Please consider adding screenshots.")
+    }
+}
+
+// Check for pngs on resources
+const hasPngs = editedFiles.filter(file => file.toLowerCase().endsWith(".png")).length > 0
+if (hasPngs) {
+    warn("You seem to have made changes to some images. Please consider using an vector drawable.")
+}
+
+// Check for reviewers
+if (github.requested_reviewers.users.length == 0 && !pr.draft) {
+    warn("Please add a reviewer to your PR.")
+}
diff --git a/tools/detekt/detekt.yml b/tools/detekt/detekt.yml
index a836edc47a..96adb3d117 100644
--- a/tools/detekt/detekt.yml
+++ b/tools/detekt/detekt.yml
@@ -23,6 +23,8 @@ style:
     active: false
   ProtectedMemberInFinalClass:
     active: false
+  UseCheckOrError:
+    active: false
 
 empty-blocks:
   EmptyFunctionBlock:
@@ -43,6 +45,8 @@ exceptions:
     active: false
   TooGenericExceptionThrown:
     active: false
+  InstanceOfCheckForException:
+    active: false
 
 complexity:
   TooManyFunctions:
diff --git a/tools/travis/check_pr.sh b/tools/travis/check_pr.sh
deleted file mode 100755
index d8d95879e2..0000000000
--- a/tools/travis/check_pr.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Copyright 2018 New Vector Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-branch=${TRAVIS_BRANCH}
-
-# echo ${TRAVIS_BRANCH}
-
-# If not on develop, exit, else we cannot get the list of modified files
-# It is ok to check only when on develop branch
-if [[ "${branch}" -eq 'develop' ]]; then
-    echo "Check that a file has been added to /changelog.d"
-else
-    echo "Not on develop branch"
-    exit 0
-fi
-
-# git status
-
-listOfModifiedFiles=`git diff --name-only HEAD ${branch}`
-
-# echo "List of modified files by this PR:"
-# echo ${listOfModifiedFiles}
-
-
-if [[ ${listOfModifiedFiles} = *"changelog.d"* ]]; then
-  echo "A file has been added to /changelog.d!"
-else
-  echo "❌ Please add a file describing your changes in /changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog"
-  exit 1
-fi
diff --git a/vector-config/src/main/java/im/vector/app/config/Analytics.kt b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
new file mode 100644
index 0000000000..7fdc78dc8a
--- /dev/null
+++ b/vector-config/src/main/java/im/vector/app/config/Analytics.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.config
+
+/**
+ * The types of analytics Element currently supports.
+ */
+sealed interface Analytics {
+
+    /**
+     * Disables the analytics integrations.
+     */
+    object Disabled : Analytics
+
+    /**
+     * Analytics integration via PostHog.
+     */
+    data class PostHog(
+            /**
+             * The PostHog instance url.
+             */
+            val postHogHost: String,
+
+            /**
+             * The PostHog instance API key.
+             */
+            val postHogApiKey: String,
+
+            /**
+             * A URL to more information about the analytics collection.
+             */
+            val policyLink: String,
+    ) : Analytics
+}
diff --git a/vector-config/src/main/java/im/vector/app/config/Config.kt b/vector-config/src/main/java/im/vector/app/config/Config.kt
index c1413f2e93..b8daa6349e 100644
--- a/vector-config/src/main/java/im/vector/app/config/Config.kt
+++ b/vector-config/src/main/java/im/vector/app/config/Config.kt
@@ -20,6 +20,14 @@ package im.vector.app.config
  * Set of flags to configure the application.
  */
 object Config {
+
+    // Tchap: The spaces feature is hidden, show all rooms in the home
+    const val SHOW_SPACES = false
+    const val SPACES_SHOW_ALL_IN_HOME = !SHOW_SPACES
+
+    // Tchap: Hide voice message recorder button
+    const val SHOW_VOICE_RECORDER = false
+
     /**
      * Flag to allow external UnifiedPush distributors to be chosen by the user.
      *
@@ -35,5 +43,50 @@ object Config {
      * - Changing the value from `false` to `true` will let the user be able to select an external UnifiedPush distributor;
      * - Changing the value from `true` to `false` will force the app to return to the background sync / Firebase Push.
      */
-    const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false
+    const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = false // Tchap: Disable UnifiedPush (use Firebase/background sync)
+
+    const val ENABLE_LOCATION_SHARING = false // Tchap: Disable Location Sharing
+    const val LOCATION_MAP_TILER_KEY = "" // Tchap: Disable Location Sharing
+
+    /**
+     * The maximum length of voice messages in milliseconds.
+     */
+    const val VOICE_MESSAGE_LIMIT_MS = 120_000L
+
+    /**
+     * The strategy for sharing device keys.
+     */
+    val KEY_SHARING_STRATEGY = KeySharingStrategy.WhenTyping
+
+    /**
+     * The onboarding flow.
+     */
+    val ONBOARDING_VARIANT = OnboardingVariant.LEGACY // Tchap: Use legacy login flow
+
+    /**
+     * If set, MSC3086 asserted identity messages sent on VoIP calls will cause the call to appear in the room corresponding to the asserted identity.
+     * This *must* only be set in trusted environments.
+     */
+    const val HANDLE_CALL_ASSERTED_IDENTITY_EVENTS = false
+
+    const val LOW_PRIVACY_LOG_ENABLE = false
+    const val ENABLE_STRICT_MODE_LOGS = false
+
+    /**
+     * The analytics configuration to use for the Debug build type.
+     * Can be disabled by providing Analytics.Disabled
+     */
+    val DEBUG_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics
+
+    /**
+     * The analytics configuration to use for the Release build type.
+     * Can be disabled by providing Analytics.Disabled
+     */
+    val RELEASE_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics
+
+    /**
+     * The analytics configuration to use for the Nightly build type.
+     * Can be disabled by providing Analytics.Disabled
+     */
+    val NIGHTLY_ANALYTICS_CONFIG = Analytics.Disabled // Tchap: No analytics
 }
diff --git a/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt b/vector-config/src/main/java/im/vector/app/config/KeySharingStrategy.kt
similarity index 50%
rename from vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt
rename to vector-config/src/main/java/im/vector/app/config/KeySharingStrategy.kt
index e1427338b2..51f3d81151 100644
--- a/vector/src/release/java/im/vector/app/config/AnalyticsConfig.kt
+++ b/vector-config/src/main/java/im/vector/app/config/KeySharingStrategy.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,20 @@
 
 package im.vector.app.config
 
-import im.vector.app.BuildConfig
-import im.vector.app.features.analytics.AnalyticsConfig
+enum class KeySharingStrategy {
+    /**
+     * Keys will be sent for the first time when the first message is sent.
+     * This is handled by the Matrix SDK so there's no need to do it in Vector.
+     */
+    WhenSendingEvent,
 
-private val allowedPackageList = listOf(
-        "im.vector.app",
-        "im.vector.app.nightly",
-)
+    /**
+     * Keys will be sent for the first time when the timeline displayed.
+     */
+    WhenEnteringRoom,
 
-val analyticsConfig: AnalyticsConfig = object : AnalyticsConfig {
-    override val isEnabled = BuildConfig.APPLICATION_ID in allowedPackageList
-    override val postHogHost = "https://posthog.hss.element.io"
-    override val postHogApiKey = "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO"
-    override val policyLink = "https://element.io/cookie-policy"
+    /**
+     * Keys will be sent for the first time when a typing started.
+     */
+    WhenTyping
 }
diff --git a/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt b/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt
new file mode 100644
index 0000000000..ae8cfd1172
--- /dev/null
+++ b/vector-config/src/main/java/im/vector/app/config/OnboardingVariant.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.config
+
+enum class OnboardingVariant {
+    LEGACY,
+    LOGIN_2,
+    FTUE_AUTH
+}
diff --git a/vector/build.gradle b/vector/build.gradle
index cdddef7671..895ee6a175 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -27,6 +27,7 @@ knit {
         exclude '**/.gradle/**'
         exclude '**/towncrier/template.md'
         exclude '**/CHANGES.md'
+        exclude '/node_modules'
     }
 }
 
@@ -157,39 +158,15 @@ android {
         buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
         buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
 
-        buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.LEGACY"
-
-        buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"
-
-        buildConfigField "Long", "VOICE_MESSAGE_DURATION_LIMIT_MS", "120_000L"
-
-        //  If set, MSC3086 asserted identity messages sent on VoIP calls will cause the call to appear in the room corresponding to the asserted identity.
-        //  This *must* only be set in trusted environments.
-        buildConfigField "Boolean", "handleCallAssertedIdentityEvents", "false"
-
         // Tchap: Disable Location Sharing
-        def enableLocationSharing = false
-        buildConfigField "Boolean", "enableLocationSharing", "${enableLocationSharing}"
-        resValue "bool", "enable_location_sharing", "${enableLocationSharing}"
-        buildConfigField "String", "mapTilerKey", "\"\""
+        resValue "bool", "enable_location_sharing", "false"
 
         // Tchap: The spaces feature is hidden, show all rooms in the home
         def showSpaces = false
         def showAllInHome = !showSpaces
-        buildConfigField "Boolean", "SHOW_SPACES", "${showSpaces}"
         resValue "bool", "show_spaces", "${showSpaces}"
-        buildConfigField "Boolean", "SPACES_SHOW_ALL_IN_HOME", "${showAllInHome}"
         resValue "bool", "spaces_show_all_in_home", "${showAllInHome}"
 
-        // Tchap: Hide voice message recorder button
-        buildConfigField "Boolean", "SHOW_VOICE_RECORDER", "false"
-
-        // Tchap: Enable add messages reaction
-        buildConfigField "Boolean", "SHOW_ADD_MESSAGE_REACTION", "true"
-
-        // Tchap: Enable editing messages
-        buildConfigField "Boolean", "SHOW_EDIT_MESSAGE", "true"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // Tchap: Disable universalApk
@@ -278,12 +255,6 @@ android {
 //            resValue "string", "app_name", "Element dbg"
 //            resValue "color", "launcher_background", "#0DBD8B"
 
-            buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
-            // Set to true if you want to enable strict mode in debug
-            buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
-
-            // Tchap: Disable the location sharing
-            buildConfigField "Boolean", "ENABLE_LIVE_LOCATION_SHARING", "false"
             // Tchap: Show developer mode only in debug
             resValue "bool", "developer_mode_visible", "true"
 
@@ -298,13 +269,9 @@ android {
 //            resValue "string", "app_name", "Element"
 //            resValue "color", "launcher_background", "#0DBD8B"
 
-            buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
-            buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
-
             // Tchap: Show developer mode only in debug
             resValue "bool", "developer_mode_visible", "false"
 
-            // When updating this block, please also update the same block in the `nightly` buildType below
             postprocessing {
                 removeUnusedCode true
                 removeUnusedResources true
@@ -369,7 +336,6 @@ android {
             isDefault = true
 
             resValue "bool", "isGplay", "true"
-            buildConfigField "boolean", "ALLOW_FCM_USE", "true"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
         }
@@ -378,7 +344,6 @@ android {
             dimension "store"
 
             resValue "bool", "isGplay", "false"
-            buildConfigField "boolean", "ALLOW_FCM_USE", "false"
             buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
             buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
         }
@@ -606,7 +571,7 @@ dependencies {
     implementation 'com.facebook.stetho:stetho:1.6.0'
 
     // Phone number https://github.com/google/libphonenumber
-    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.52'
+    implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.53'
 
     // FlowBinding
     implementation libs.github.flowBinding
@@ -618,6 +583,9 @@ dependencies {
     implementation libs.airbnb.epoxyPaging
     implementation libs.airbnb.mavericks
 
+    // Snap Helper https://github.com/rubensousa/GravitySnapHelper
+    implementation 'com.github.rubensousa:gravitysnaphelper:2.2.2'
+
     // Nightly
     // API-only library
     gplayImplementation libs.google.appdistributionApi
@@ -758,44 +726,44 @@ dependencies {
 
     // Tchap: We had to exclude fbjni for withVoip, the library is already include in jitsi library
     // Flipper, debug builds only
-    gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
 
-    fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
 
-    gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
 
-    fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
-    fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni'}
-    fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) {exclude group: 'com.facebook.fbjni', module: 'fbjni'}
+    fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
+    fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' }
 
     gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper)
     gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin)
@@ -837,7 +805,7 @@ dependencies {
 
     debugImplementation 'com.facebook.soloader:soloader:0.10.4'
     debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
-    
+
     // Activate when you want to check for leaks, from time to time.
     //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.3'
 
@@ -862,4 +830,5 @@ dependencies {
     androidTestImplementation libs.mockk.mockkAndroid
     androidTestUtil libs.androidx.orchestrator
     debugImplementation libs.androidx.fragmentTesting
+    androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10"
 }
diff --git a/vector/lint.xml b/vector/lint.xml
index 225f1db517..023b9dad7c 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -108,6 +108,7 @@
     <!-- Wording -->
     <issue id="Typos" severity="error" />
     <issue id="TypographyDashes" severity="error" />
+    <issue id="PluralsCandidate" severity="error" />
 
     <!-- DI -->
     <issue id="JvmStaticProvidesInObjectDetector" severity="error" />
diff --git a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt b/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt
index ba844e56b7..90ed8e5948 100644
--- a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt
+++ b/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt
@@ -25,17 +25,22 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import im.vector.app.features.MainActivity
 import im.vector.app.ui.robot.ElementRobot
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
 @LargeTest
+@Ignore("Tchap: Secure Backup is disabled, so this test cannot succeed")
 class CantVerifyTest : VerificationTestBase() {
 
     @get:Rule
-    val activityRule = ActivityScenarioRule(MainActivity::class.java)
+    val testRule = RuleChain
+            .outerRule(ActivityScenarioRule(MainActivity::class.java))
+            .around(ClearCurrentSessionRule())
 
     private val elementRobot = ElementRobot()
     var userName: String = "loginTest_${UUID.randomUUID()}"
diff --git a/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt b/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
new file mode 100644
index 0000000000..735e96c1e0
--- /dev/null
+++ b/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import androidx.test.platform.app.InstrumentationRegistry
+import im.vector.app.features.analytics.store.AnalyticsStore
+import kotlinx.coroutines.runBlocking
+import org.junit.rules.TestWatcher
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+import kotlin.reflect.KClass
+
+/**
+ * A TestRule to reset and clear the current Session.
+ * If a Session is active it will be signed out and cleared from the ActiveSessionHolder.
+ * The VectorPreferences and AnalyticsDatastore are also cleared in an attempt to recreate a fresh base.
+ */
+class ClearCurrentSessionRule : TestWatcher() {
+    override fun apply(base: Statement, description: Description): Statement {
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        runBlocking {
+            reflectAnalyticDatastore(context).edit { it.clear() }
+            runCatching {
+                val holder = (context.applicationContext as VectorApplication).activeSessionHolder
+                holder.getSafeActiveSession()?.signOutService()?.signOut(true)
+                (context.applicationContext as VectorApplication).vectorPreferences.clearPreferences()
+                holder.clearActiveSession()
+            }
+        }
+        return super.apply(base, description)
+    }
+}
+
+private fun KClass<*>.asTopLevel() = Class.forName("${qualifiedName}Kt")
+
+/**
+ * Fetches the top level, private [Context.dataStore] extension property from [im.vector.app.features.analytics.store.AnalyticsStore]
+ * via reflection to avoid exposing property to all callers.
+ */
+@Suppress("UNCHECKED_CAST")
+private fun reflectAnalyticDatastore(context: Context): DataStore<Preferences> {
+    val klass = AnalyticsStore::class.asTopLevel()
+    val method = klass.getMethod("access\$getDataStore", Context::class.java)
+    return method.invoke(klass, context) as DataStore<Preferences>
+}
diff --git a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelperTests.kt b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelperTests.kt
index 53c154ae30..30520dd44f 100644
--- a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelperTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelperTests.kt
@@ -31,7 +31,6 @@ import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
 import im.vector.app.TestBuildVersionSdkIntProvider
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguratorProvider
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenCryptoConstants
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeyRepository
@@ -40,6 +39,7 @@ import im.vector.app.features.pin.lockscreen.ui.fallbackprompt.FallbackBiometric
 import im.vector.app.features.pin.lockscreen.utils.DevicePromptCheck
 import io.mockk.clearAllMocks
 import io.mockk.every
+import io.mockk.justRun
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkStatic
@@ -54,8 +54,10 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.coInvoking
 import org.amshove.kluent.shouldBeFalse
 import org.amshove.kluent.shouldBeTrue
+import org.amshove.kluent.shouldThrow
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Test
@@ -239,36 +241,35 @@ class BiometricHelperTests {
 
     @Test
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.R) // Due to some issues with mockk and CryptoObject initialization
-    fun authenticateCreatesSystemKeyIfNeededOnSuccessOnAndroidM() = runTest {
+    fun enableAuthenticationDeletesSystemKeyOnFailure() = runTest {
         buildVersionSdkIntProvider.value = Build.VERSION_CODES.M
-        every { lockScreenKeyRepository.isSystemKeyValid() } returns true
         val mockAuthChannel = Channel<Boolean>(capacity = 1)
         val biometricUtils = spyk(createBiometricHelper(createDefaultConfiguration(isBiometricsEnabled = true))) {
             every { createAuthChannel() } returns mockAuthChannel
             every { authenticateWithPromptInternal(any(), any(), any()) } returns mockk()
         }
+        justRun { lockScreenKeyRepository.deleteSystemKey() }
 
         val latch = CountDownLatch(1)
         val intent = Intent(InstrumentationRegistry.getInstrumentation().targetContext, LockScreenTestActivity::class.java)
         ActivityScenario.launch<LockScreenTestActivity>(intent).onActivity { activity ->
             activity.lifecycleScope.launch {
+                val exception = IllegalStateException("Some error")
                 launch {
-                    mockAuthChannel.send(true)
-                    mockAuthChannel.close()
+                    mockAuthChannel.close(exception)
                 }
-                biometricUtils.authenticate(activity).collect()
+                coInvoking { biometricUtils.enableAuthentication(activity).collect() } shouldThrow exception
                 latch.countDown()
             }
         }
 
         latch.await(1, TimeUnit.SECONDS)
-        verify { lockScreenKeyRepository.ensureSystemKey() }
+        verify { lockScreenKeyRepository.deleteSystemKey() }
     }
 
     private fun createBiometricHelper(configuration: LockScreenConfiguration): BiometricHelper {
         val context = InstrumentationRegistry.getInstrumentation().targetContext
-        val configProvider = LockScreenConfiguratorProvider(configuration)
-        return BiometricHelper(context, lockScreenKeyRepository, configProvider, biometricManager, buildVersionSdkIntProvider)
+        return BiometricHelper(configuration, context, lockScreenKeyRepository, biometricManager, buildVersionSdkIntProvider)
     }
 
     private fun createDefaultConfiguration(
diff --git a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCryptoTests.kt b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCryptoTests.kt
index 6e02cc0262..1712ec889e 100644
--- a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCryptoTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCryptoTests.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.pin.lockscreen.crypto
 
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
+import android.security.keystore.UserNotAuthenticatedException
 import androidx.test.platform.app.InstrumentationRegistry
 import im.vector.app.TestBuildVersionSdkIntProvider
 import io.mockk.every
@@ -69,10 +70,12 @@ class KeyStoreCryptoTests {
         runCatching { keyStoreCrypto.ensureKey() }
         keyStoreCrypto.hasValidKey() shouldBe true
 
-        val exception = KeyPermanentlyInvalidatedException()
-        every { secretStoringUtils.getEncryptCipher(any()) } throws exception
+        val keyInvalidatedException = KeyPermanentlyInvalidatedException()
+        every { secretStoringUtils.getEncryptCipher(any()) } throws keyInvalidatedException
+        keyStoreCrypto.hasValidKey() shouldBe false
 
-        runCatching { keyStoreCrypto.ensureKey() }
+        val userNotAuthenticatedException = UserNotAuthenticatedException()
+        every { secretStoringUtils.getEncryptCipher(any()) } throws userNotAuthenticatedException
         keyStoreCrypto.hasValidKey() shouldBe false
     }
 
diff --git a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepositoryTests.kt b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepositoryTests.kt
index 924dbfee9e..8d14ca9153 100644
--- a/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepositoryTests.kt
+++ b/vector/src/androidTest/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeyRepositoryTests.kt
@@ -17,8 +17,6 @@
 package im.vector.app.features.pin.lockscreen.crypto
 
 import androidx.test.platform.app.InstrumentationRegistry
-import im.vector.app.features.pin.lockscreen.crypto.migrations.LegacyPinCodeMigrator
-import im.vector.app.features.settings.VectorPreferences
 import io.mockk.clearAllMocks
 import io.mockk.every
 import io.mockk.mockk
@@ -44,8 +42,6 @@ class LockScreenKeyRepositoryTests {
     }
 
     private lateinit var lockScreenKeyRepository: LockScreenKeyRepository
-    private val legacyPinCodeMigrator: LegacyPinCodeMigrator = mockk(relaxed = true)
-    private val vectorPreferences: VectorPreferences = mockk(relaxed = true)
 
     private val keyStore: KeyStore by lazy {
         KeyStore.getInstance(LockScreenCryptoConstants.ANDROID_KEY_STORE).also { it.load(null) }
diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
index e72535c116..77b238acaf 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt
@@ -22,19 +22,26 @@ import androidx.test.espresso.Espresso.pressBack
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.platform.app.InstrumentationRegistry
 import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled
 import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled
 import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.adevinta.android.barista.interaction.BaristaEditTextInteractions.writeTo
 import im.vector.app.R
+import im.vector.app.config.OnboardingVariant
 import im.vector.app.espresso.tools.waitUntilViewVisible
 import im.vector.app.features.DefaultVectorFeatures
+import im.vector.app.features.debug.features.DebugVectorFeatures
 import im.vector.app.waitForView
 
 class OnboardingRobot {
 
-    private val defaultVectorFeatures = DefaultVectorFeatures()
+    // Tchap: Use different onboarding variant to run the tests
+    private val context = InstrumentationRegistry.getInstrumentation().targetContext
+    private val defaultVectorFeatures = DebugVectorFeatures(context, DefaultVectorFeatures()).apply {
+        overrideEnum(OnboardingVariant.FTUE_AUTH, OnboardingVariant::class)
+    }
 
     fun crawl() {
         waitUntilViewVisible(withId(R.id.loginSplashSubmit))
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
index 8fe65bd387..d7e402c4dc 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt
@@ -70,6 +70,11 @@ class DebugFeaturesStateFactory @Inject constructor(
                                 key = DebugFeatureKeys.allowExternalUnifiedPushDistributors,
                                 factory = VectorFeatures::allowExternalUnifiedPushDistributors
                         ),
+                        createBooleanFeature(
+                                label = "Enable Live Location Sharing",
+                                key = DebugFeatureKeys.liveLocationSharing,
+                                factory = VectorFeatures::isLocationSharingEnabled
+                        ),
                         createBooleanFeature(
                                 label = "Force usage of OpusEncoder library",
                                 key = DebugFeatureKeys.forceUsageOfOpusEncoder,
diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
index 23aad65653..031ff11d59 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt
@@ -24,6 +24,7 @@ import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import im.vector.app.config.OnboardingVariant
 import im.vector.app.features.DefaultVectorFeatures
 import im.vector.app.features.VectorFeatures
 import kotlinx.coroutines.flow.first
@@ -39,8 +40,8 @@ class DebugVectorFeatures(
 
     private val dataStore = context.dataStore
 
-    override fun onboardingVariant(): VectorFeatures.OnboardingVariant {
-        return readPreferences().getEnum<VectorFeatures.OnboardingVariant>() ?: vectorFeatures.onboardingVariant()
+    override fun onboardingVariant(): OnboardingVariant {
+        return readPreferences().getEnum<OnboardingVariant>() ?: vectorFeatures.onboardingVariant()
     }
 
     override fun isOnboardingAlreadyHaveAccountSplashEnabled(): Boolean = read(DebugFeatureKeys.onboardingAlreadyHaveAnAccount)
@@ -66,6 +67,9 @@ class DebugVectorFeatures(
     override fun isScreenSharingEnabled(): Boolean = read(DebugFeatureKeys.screenSharing)
             ?: vectorFeatures.isScreenSharingEnabled()
 
+    override fun isLocationSharingEnabled(): Boolean = read(DebugFeatureKeys.liveLocationSharing)
+            ?: vectorFeatures.isLocationSharingEnabled()
+
     override fun forceUsageOfOpusEncoder(): Boolean = read(DebugFeatureKeys.forceUsageOfOpusEncoder)
             ?: vectorFeatures.forceUsageOfOpusEncoder()
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index f9f1a4bf3f..0b5f0c6f63 100644
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -351,7 +351,7 @@
         <activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
         <activity android:name=".features.poll.create.CreatePollActivity" />
         <activity android:name=".features.location.LocationSharingActivity" />
-        <activity android:name=".features.location.live.map.LocationLiveMapViewActivity" />
+        <activity android:name=".features.location.live.map.LiveLocationMapViewActivity" />
         <activity android:name=".features.settings.font.FontScaleSettingActivity"/>
 
         <activity android:name="fr.gouv.tchap.features.expired.ExpiredAccountActivity" />
@@ -383,7 +383,7 @@
         </service>
 
         <service
-            android:name=".features.location.LocationSharingAndroidService"
+            android:name=".features.location.live.tracking.LocationSharingAndroidService"
             android:exported="false"
             android:foregroundServiceType="location" />
 
diff --git a/vector/src/main/java/im/vector/app/SpaceStateHandler.kt b/vector/src/main/java/im/vector/app/SpaceStateHandler.kt
new file mode 100644
index 0000000000..d9f002be37
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandler.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import androidx.lifecycle.DefaultLifecycleObserver
+import arrow.core.Option
+import kotlinx.coroutines.flow.Flow
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+/**
+ * Gets info about the current space the user has navigated to, any space backstack they may have
+ * and handles switching to different spaces.
+ */
+interface SpaceStateHandler : DefaultLifecycleObserver {
+
+    /**
+     * Gets the current space the current user has navigated to.
+     *
+     * @return null if the user is not in
+     */
+    fun getCurrentSpace(): RoomSummary?
+
+    /**
+     * Sets the new space the current user is navigating to.
+     *
+     * @param spaceId the id of the space being navigated to
+     * @param session the current active session
+     * @param persistNow if true, the current space will immediately be persisted in shared prefs
+     * @param isForwardNavigation whether this navigation is a forward action to properly handle backstack
+     */
+    fun setCurrentSpace(
+            spaceId: String?,
+            session: Session? = null,
+            persistNow: Boolean = false,
+            isForwardNavigation: Boolean = true,
+    )
+
+    /**
+     * Gets the current backstack of spaces (via their id).
+     *
+     * null may be an entry in the ArrayDeque to indicate the root space (All Chats)
+     */
+    fun getSpaceBackstack(): ArrayDeque<String?>
+
+    /**
+     * Gets a flow of the selected space for clients to react immediately to space changes.
+     */
+    fun getSelectedSpaceFlow(): Flow<Option<RoomSummary>>
+
+    /**
+     * Gets the id of the active space, or null if there is none.
+     */
+    fun getSafeActiveSpaceId(): String?
+}
diff --git a/vector/src/main/java/im/vector/app/AppStateHandler.kt b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
similarity index 76%
rename from vector/src/main/java/im/vector/app/AppStateHandler.kt
rename to vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
index e18b576637..c6a4b2c5f0 100644
--- a/vector/src/main/java/im/vector/app/AppStateHandler.kt
+++ b/vector/src/main/java/im/vector/app/SpaceStateHandlerImpl.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app
 
-import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import arrow.core.Option
 import im.vector.app.core.di.ActiveSessionHolder
@@ -46,54 +45,60 @@ import javax.inject.Singleton
 
 /**
  * This class handles the global app state.
- * It requires to be added to ProcessLifecycleOwner.get().lifecycle
+ * It is required that this class is added as an observer to ProcessLifecycleOwner.get().lifecycle in [VectorApplication]
  */
-// TODO Keep this class for now, will maybe be used fro Space
 @Singleton
-class AppStateHandler @Inject constructor(
+class SpaceStateHandlerImpl @Inject constructor(
         private val sessionDataSource: ActiveSessionDataSource,
         private val uiStateRepository: UiStateRepository,
         private val activeSessionHolder: ActiveSessionHolder,
         private val analyticsTracker: AnalyticsTracker
-) : DefaultLifecycleObserver {
+) : SpaceStateHandler {
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
     private val selectedSpaceDataSource = BehaviorDataSource<Option<RoomSummary>>(Option.empty())
-
-    val selectedSpaceFlow = selectedSpaceDataSource.stream()
-
+    private val selectedSpaceFlow = selectedSpaceDataSource.stream()
     private val spaceBackstack = ArrayDeque<String?>()
 
-    fun getCurrentSpace(): RoomSummary? {
+    override fun getCurrentSpace(): RoomSummary? {
         return selectedSpaceDataSource.currentValue?.orNull()?.let { spaceSummary ->
             activeSessionHolder.getSafeActiveSession()?.roomService()?.getRoomSummary(spaceSummary.roomId)
         }
     }
 
-    fun setCurrentSpace(spaceId: String?, session: Session? = null, persistNow: Boolean = false, isForwardNavigation: Boolean = true) {
+    override fun setCurrentSpace(
+            spaceId: String?,
+            session: Session?,
+            persistNow: Boolean,
+            isForwardNavigation: Boolean,
+    ) {
+        val activeSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
         val currentSpace = selectedSpaceDataSource.currentValue?.orNull()
-        val uSession = session ?: activeSessionHolder.getSafeActiveSession() ?: return
-        if (currentSpace != null && spaceId == currentSpace.roomId) return
-        val spaceSum = spaceId?.let { uSession.getRoomSummary(spaceId) }
+        val spaceSummary = spaceId?.let { activeSession.getRoomSummary(spaceId) }
+        val sameSpaceSelected = currentSpace != null && spaceId == currentSpace.roomId
+
+        if (sameSpaceSelected) {
+            return
+        }
 
         if (isForwardNavigation) {
             spaceBackstack.addLast(currentSpace?.roomId)
         }
 
         if (persistNow) {
-            uiStateRepository.storeSelectedSpace(spaceSum?.roomId, uSession.sessionId)
+            uiStateRepository.storeSelectedSpace(spaceSummary?.roomId, activeSession.sessionId)
         }
 
-        if (spaceSum == null) {
+        if (spaceSummary == null) {
             selectedSpaceDataSource.post(Option.empty())
         } else {
-            selectedSpaceDataSource.post(Option.just(spaceSum))
+            selectedSpaceDataSource.post(Option.just(spaceSummary))
         }
 
         if (spaceId != null) {
-            uSession.coroutineScope.launch(Dispatchers.IO) {
+            activeSession.coroutineScope.launch(Dispatchers.IO) {
                 tryOrNull {
-                    uSession.getRoom(spaceId)?.membershipService()?.loadRoomMembersIfNeeded()
+                    activeSession.getRoom(spaceId)?.membershipService()?.loadRoomMembersIfNeeded()
                 }
             }
         }
@@ -122,9 +127,11 @@ class AppStateHandler @Inject constructor(
                 }.launchIn(session.coroutineScope)
     }
 
-    fun getSpaceBackstack() = spaceBackstack
+    override fun getSpaceBackstack() = spaceBackstack
+
+    override fun getSelectedSpaceFlow() = selectedSpaceFlow
 
-    fun safeActiveSpaceId(): String? {
+    override fun getSafeActiveSpaceId(): String? {
         return selectedSpaceDataSource.currentValue?.orNull()?.roomId
     }
 
diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector/src/main/java/im/vector/app/VectorApplication.kt
index ef882dcaf7..d253a2cae0 100644
--- a/vector/src/main/java/im/vector/app/VectorApplication.kt
+++ b/vector/src/main/java/im/vector/app/VectorApplication.kt
@@ -25,22 +25,28 @@ import android.content.res.Configuration
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.StrictMode
+import android.view.Gravity
 import androidx.core.provider.FontRequest
 import androidx.core.provider.FontsContractCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDex
+import androidx.recyclerview.widget.SnapHelper
+import com.airbnb.epoxy.Carousel
 import com.airbnb.epoxy.EpoxyAsyncUtil
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.Mavericks
 import com.facebook.stetho.Stetho
 import com.gabrielittner.threetenbp.LazyThreeTen
+import com.github.rubensousa.gravitysnaphelper.GravitySnapHelper
 import com.mapbox.mapboxsdk.Mapbox
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.google.GoogleEmojiProvider
 import dagger.hilt.android.HiltAndroidApp
+import im.vector.app.config.Config
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.call.webrtc.WebRtcCallManager
 import im.vector.app.features.configuration.VectorConfiguration
@@ -87,7 +93,7 @@ class VectorApplication :
     @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var versionProvider: VersionProvider
     @Inject lateinit var notificationUtils: NotificationUtils
-    @Inject lateinit var appStateHandler: AppStateHandler
+    @Inject lateinit var spaceStateHandler: SpaceStateHandler
     @Inject lateinit var popupAlertManager: PopupAlertManager
     @Inject lateinit var pinLocker: PinLocker
     @Inject lateinit var callManager: WebRtcCallManager
@@ -98,6 +104,7 @@ class VectorApplication :
     @Inject lateinit var flipperProxy: FlipperProxy
     @Inject lateinit var matrix: Matrix
     @Inject lateinit var fcmHelper: FcmHelper
+    @Inject lateinit var buildMeta: BuildMeta
 
     // font thread handler
     private var fontThreadHandler: Handler? = null
@@ -128,19 +135,20 @@ class VectorApplication :
                     .forEach { Timber.uproot(it) }
         }
 
-        if (BuildConfig.DEBUG) {
+        if (buildMeta.isDebug) {
             Timber.plant(Timber.DebugTree())
         }
         Timber.plant(vectorFileLogger)
 
-        if (BuildConfig.DEBUG) {
+        if (buildMeta.isDebug) {
             Stetho.initializeWithDefaults(this)
         }
         logInfo()
         LazyThreeTen.init(this)
         Mavericks.initialize(debugMode = false)
-        EpoxyController.defaultDiffingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
-        EpoxyController.defaultModelBuildingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
+
+        configureEpoxy()
+
         registerActivityLifecycleCallbacks(VectorActivityLifecycleCallbacks(popupAlertManager))
         val fontRequest = FontRequest(
                 "com.google.android.gms.fonts",
@@ -149,7 +157,7 @@ class VectorApplication :
                 R.array.com_google_android_gms_fonts_certs
         )
         FontsContractCompat.requestFont(this, fontRequest, emojiCompatFontProvider, getFontThreadHandler())
-        VectorLocale.init(this)
+        VectorLocale.init(this, buildMeta)
         ThemeUtils.init(this)
         vectorConfiguration.applyToApplicationContext()
 
@@ -178,7 +186,7 @@ class VectorApplication :
                 fcmHelper.onEnterBackground(activeSessionHolder)
             }
         })
-        ProcessLifecycleOwner.get().lifecycle.addObserver(appStateHandler)
+        ProcessLifecycleOwner.get().lifecycle.addObserver(spaceStateHandler)
         ProcessLifecycleOwner.get().lifecycle.addObserver(pinLocker)
         ProcessLifecycleOwner.get().lifecycle.addObserver(callManager)
         // This should be done as early as possible
@@ -196,8 +204,18 @@ class VectorApplication :
         Mapbox.getInstance(this)
     }
 
+    private fun configureEpoxy() {
+        EpoxyController.defaultDiffingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
+        EpoxyController.defaultModelBuildingHandler = EpoxyAsyncUtil.getAsyncBackgroundHandler()
+        Carousel.setDefaultGlobalSnapHelperFactory(object : Carousel.SnapHelperFactory() {
+            override fun buildSnapHelper(context: Context?): SnapHelper {
+                return GravitySnapHelper(Gravity.START)
+            }
+        })
+    }
+
     private fun enableStrictModeIfNeeded() {
-        if (BuildConfig.ENABLE_STRICT_MODE_LOGS) {
+        if (Config.ENABLE_STRICT_MODE_LOGS) {
             StrictMode.setThreadPolicy(
                     StrictMode.ThreadPolicy.Builder()
                             .detectAll()
diff --git a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
index 21b4e287c6..7a1d613ab9 100644
--- a/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
+++ b/vector/src/main/java/im/vector/app/core/di/ActiveSessionHolder.kt
@@ -16,8 +16,10 @@
 
 package im.vector.app.core.di
 
+import android.content.Context
 import arrow.core.Option
 import im.vector.app.ActiveSessionDataSource
+import im.vector.app.core.extensions.configureAndStart
 import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.features.call.webrtc.WebRtcCallManager
@@ -25,6 +27,8 @@ import im.vector.app.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.app.features.crypto.verification.IncomingVerificationRequestHandler
 import im.vector.app.features.notifications.PushRuleTriggerListener
 import im.vector.app.features.session.SessionListener
+import kotlinx.coroutines.runBlocking
+import org.matrix.android.sdk.api.auth.AuthenticationService
 import org.matrix.android.sdk.api.session.Session
 import timber.log.Timber
 import java.util.concurrent.atomic.AtomicReference
@@ -41,7 +45,10 @@ class ActiveSessionHolder @Inject constructor(
         private val sessionListener: SessionListener,
         private val imageManager: ImageManager,
         private val unifiedPushHelper: UnifiedPushHelper,
-        private val guardServiceStarter: GuardServiceStarter
+        private val guardServiceStarter: GuardServiceStarter,
+        private val sessionInitializer: SessionInitializer,
+        private val applicationContext: Context,
+        private val authenticationService: AuthenticationService,
 ) {
 
     private var activeSessionReference: AtomicReference<Session?> = AtomicReference()
@@ -80,18 +87,27 @@ class ActiveSessionHolder @Inject constructor(
     }
 
     fun hasActiveSession(): Boolean {
-        return activeSessionReference.get() != null
+        return activeSessionReference.get() != null || authenticationService.hasAuthenticatedSessions()
     }
 
     fun getSafeActiveSession(): Session? {
-        return activeSessionReference.get()
+        return runBlocking { getOrInitializeSession(startSync = true) }
     }
 
     fun getActiveSession(): Session {
-        return activeSessionReference.get()
+        return getSafeActiveSession()
                 ?: throw IllegalStateException("You should authenticate before using this")
     }
 
+    suspend fun getOrInitializeSession(startSync: Boolean): Session? {
+        return activeSessionReference.get() ?: sessionInitializer.tryInitialize(readCurrentSession = { activeSessionReference.get() }) { session ->
+            setActiveSession(session)
+            session.configureAndStart(applicationContext, startSyncing = startSync)
+        }
+    }
+
+    fun isWaitingForSessionInitialization() = activeSessionReference.get() == null && authenticationService.hasAuthenticatedSessions()
+
     // TODO Stop sync ?
 //    fun switchToSession(sessionParams: SessionParams) {
 //        val newActiveSession = authenticationService.getSession(sessionParams)
diff --git a/vector/src/main/java/im/vector/app/core/di/ActiveSessionSetter.kt b/vector/src/main/java/im/vector/app/core/di/ActiveSessionSetter.kt
deleted file mode 100644
index 09479a230f..0000000000
--- a/vector/src/main/java/im/vector/app/core/di/ActiveSessionSetter.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.core.di
-
-import android.content.Context
-import im.vector.app.core.extensions.configureAndStart
-import org.matrix.android.sdk.api.auth.AuthenticationService
-import javax.inject.Inject
-
-class ActiveSessionSetter @Inject constructor(
-        private val activeSessionHolder: ActiveSessionHolder,
-        private val authenticationService: AuthenticationService,
-        private val applicationContext: Context,
-) {
-    fun shouldSetActionSession(): Boolean {
-        return authenticationService.hasAuthenticatedSessions() && !activeSessionHolder.hasActiveSession()
-    }
-
-    fun tryToSetActiveSession(startSync: Boolean) {
-        if (shouldSetActionSession()) {
-            val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
-            activeSessionHolder.setActiveSession(lastAuthenticatedSession)
-            lastAuthenticatedSession.configureAndStart(applicationContext, startSyncing = startSync)
-        }
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
new file mode 100644
index 0000000000..a75b3fa46b
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.di
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import im.vector.app.BuildConfig
+import im.vector.app.config.Analytics
+import im.vector.app.config.Config
+import im.vector.app.config.KeySharingStrategy
+import im.vector.app.features.analytics.AnalyticsConfig
+import im.vector.app.features.call.webrtc.VoipConfig
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
+import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageConfig
+import im.vector.app.features.location.LocationSharingConfig
+import im.vector.app.features.raw.wellknown.CryptoConfig
+
+@InstallIn(SingletonComponent::class)
+@Module
+object ConfigurationModule {
+
+    @Provides
+    fun providesAnalyticsConfig(): AnalyticsConfig {
+        val config: Analytics = when (BuildConfig.BUILD_TYPE) {
+            "debug" -> Config.DEBUG_ANALYTICS_CONFIG
+            "nightly" -> Config.NIGHTLY_ANALYTICS_CONFIG
+            "release" -> Config.RELEASE_ANALYTICS_CONFIG
+            else -> throw IllegalStateException("Unhandled build type: ${BuildConfig.BUILD_TYPE}")
+        }
+        return when (config) {
+            Analytics.Disabled -> AnalyticsConfig(isEnabled = false, "", "", "")
+            is Analytics.PostHog -> AnalyticsConfig(
+                    isEnabled = true,
+                    postHogHost = config.postHogHost,
+                    postHogApiKey = config.postHogApiKey,
+                    policyLink = config.policyLink
+            )
+        }
+    }
+
+    @Provides
+    fun providesVoiceMessageConfig() = VoiceMessageConfig(
+            lengthLimitMs = Config.VOICE_MESSAGE_LIMIT_MS
+    )
+
+    @Provides
+    fun providesCryptoConfig() = CryptoConfig(
+            fallbackKeySharingStrategy = when (Config.KEY_SHARING_STRATEGY) {
+                KeySharingStrategy.WhenSendingEvent -> OutboundSessionKeySharingStrategy.WhenSendingEvent
+                KeySharingStrategy.WhenEnteringRoom -> OutboundSessionKeySharingStrategy.WhenSendingEvent
+                KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenSendingEvent
+            }
+    )
+
+    @Provides
+    fun providesLocationSharingConfig() = LocationSharingConfig(
+            mapTilerKey = Config.LOCATION_MAP_TILER_KEY,
+    )
+
+    @Provides
+    fun providesVoipConfig() = VoipConfig(
+            handleCallAssertedIdentityEvents = Config.HANDLE_CALL_ASSERTED_IDENTITY_EVENTS
+    )
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
index 315834b6ca..1e7e227629 100644
--- a/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
@@ -62,14 +62,15 @@ import im.vector.app.features.discovery.change.SetIdentityServerFragment
 import im.vector.app.features.home.HomeDetailFragment
 import im.vector.app.features.home.HomeDrawerFragment
 import im.vector.app.features.home.LoadingFragment
+import im.vector.app.features.home.NewHomeDetailFragment
 import im.vector.app.features.home.room.breadcrumbs.BreadcrumbsFragment
 import im.vector.app.features.home.room.detail.TimelineFragment
 import im.vector.app.features.home.room.detail.search.SearchFragment
 import im.vector.app.features.home.room.list.RoomListFragment
 import im.vector.app.features.home.room.list.home.HomeRoomListFragment
 import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
-import im.vector.app.features.location.LocationPreviewFragment
 import im.vector.app.features.location.LocationSharingFragment
+import im.vector.app.features.location.preview.LocationPreviewFragment
 import im.vector.app.features.login.LoginCaptchaFragment
 import im.vector.app.features.login.LoginFragment
 import im.vector.app.features.login.LoginGenericTextInputFormFragment
@@ -269,6 +270,11 @@ interface FragmentModule {
     @FragmentKey(HomeDetailFragment::class)
     fun bindHomeDetailFragment(fragment: HomeDetailFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(NewHomeDetailFragment::class)
+    fun bindNewHomeDetailFragment(fragment: NewHomeDetailFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(EmojiSearchResultFragment::class)
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
index 236622210f..331b4afa18 100644
--- a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -55,7 +55,8 @@ import im.vector.app.features.home.room.list.home.HomeRoomListViewModel
 import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
 import im.vector.app.features.invite.InviteUsersToRoomViewModel
 import im.vector.app.features.location.LocationSharingViewModel
-import im.vector.app.features.location.live.map.LocationLiveMapViewModel
+import im.vector.app.features.location.live.map.LiveLocationMapViewModel
+import im.vector.app.features.location.preview.LocationPreviewViewModel
 import im.vector.app.features.login.LoginViewModel
 import im.vector.app.features.login2.LoginViewModel2
 import im.vector.app.features.login2.created.AccountCreatedViewModel
@@ -605,6 +606,11 @@ interface MavericksViewModelModule {
     @MavericksViewModelKey(LocationSharingViewModel::class)
     fun createLocationSharingViewModelFactory(factory: LocationSharingViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(LocationPreviewViewModel::class)
+    fun createLocationPreviewViewModelFactory(factory: LocationPreviewViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
     @Binds
     @IntoMap
     @MavericksViewModelKey(VectorAttachmentViewerViewModel::class)
@@ -612,8 +618,8 @@ interface MavericksViewModelModule {
 
     @Binds
     @IntoMap
-    @MavericksViewModelKey(LocationLiveMapViewModel::class)
-    fun locationLiveMapViewModelFactory(factory: LocationLiveMapViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+    @MavericksViewModelKey(LiveLocationMapViewModel::class)
+    fun liveLocationMapViewModelFactory(factory: LiveLocationMapViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 
     @Binds
     @IntoMap
diff --git a/vector/src/main/java/im/vector/app/core/di/SessionInitializer.kt b/vector/src/main/java/im/vector/app/core/di/SessionInitializer.kt
new file mode 100644
index 0000000000..e1d4844940
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/core/di/SessionInitializer.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.core.di
+
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
+import org.matrix.android.sdk.api.auth.AuthenticationService
+import org.matrix.android.sdk.api.session.Session
+import javax.inject.Inject
+
+private val initializerSemaphore = Semaphore(permits = 1)
+
+class SessionInitializer @Inject constructor(
+        private val authenticationService: AuthenticationService,
+) {
+
+    /**
+     * A thread safe way to initialize the last authenticated Session instance.
+     *
+     * @param readCurrentSession expects an in-memory Session to be provided or null if not yet set.
+     * @param initializer callback to allow additional initialization on the Session, such as setting the in-memory Session instance.
+     * @return the initialized Session or null when no authenticated sessions are available.
+     */
+    suspend fun tryInitialize(readCurrentSession: () -> Session?, initializer: (Session) -> Unit): Session? {
+        return initializerSemaphore.withPermit {
+            val currentInMemorySession = readCurrentSession()
+            when {
+                currentInMemorySession != null -> currentInMemorySession
+                authenticationService.hasAuthenticatedSessions() -> {
+                    val lastAuthenticatedSession = authenticationService.getLastAuthenticatedSession()!!
+                    lastAuthenticatedSession.also { initializer(lastAuthenticatedSession) }
+                }
+                else -> null
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
index 4ff62b241e..94aa545f92 100644
--- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
+++ b/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt
@@ -32,7 +32,9 @@ import im.vector.app.BuildConfig
 import im.vector.app.EmojiCompatWrapper
 import im.vector.app.EmojiSpanify
 import im.vector.app.R
-import im.vector.app.config.analyticsConfig
+import im.vector.app.SpaceStateHandler
+import im.vector.app.SpaceStateHandlerImpl
+import im.vector.app.config.Config
 import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.core.error.DefaultErrorFormatter
 import im.vector.app.core.error.ErrorFormatter
@@ -41,7 +43,6 @@ import im.vector.app.core.time.Clock
 import im.vector.app.core.time.DefaultClock
 import im.vector.app.core.utils.AndroidSystemSettingsProvider
 import im.vector.app.core.utils.SystemSettingsProvider
-import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.VectorAnalytics
 import im.vector.app.features.analytics.impl.DefaultVectorAnalytics
@@ -109,6 +110,9 @@ abstract class VectorBindModule {
 
     @Binds
     abstract fun bindSystemSettingsProvide(provider: AndroidSystemSettingsProvider): SystemSettingsProvider
+
+    @Binds
+    abstract fun bindSpaceStateHandler(spaceStateHandlerImpl: SpaceStateHandlerImpl): SpaceStateHandler
 }
 
 @InstallIn(SingletonComponent::class)
@@ -204,17 +208,23 @@ object VectorStaticModule {
         return GlobalScope
     }
 
-    @Provides
-    fun providesAnalyticsConfig(): AnalyticsConfig {
-        return analyticsConfig
-    }
-
     @Provides
     fun providesPhoneNumberUtil(): PhoneNumberUtil = PhoneNumberUtil.getInstance()
 
     @Provides
     @Singleton
-    fun providesBuildMeta() = BuildMeta()
+    fun providesBuildMeta() = BuildMeta(
+            isDebug = BuildConfig.DEBUG,
+            applicationId = BuildConfig.APPLICATION_ID,
+            lowPrivacyLoggingEnabled = Config.LOW_PRIVACY_LOG_ENABLE,
+            versionName = BuildConfig.VERSION_NAME,
+            gitRevision = BuildConfig.GIT_REVISION,
+            gitRevisionDate = BuildConfig.GIT_REVISION_DATE,
+            gitBranchName = BuildConfig.GIT_BRANCH_NAME,
+            buildNumber = BuildConfig.BUILD_NUMBER,
+            flavorDescription = BuildConfig.FLAVOR_DESCRIPTION,
+            flavorShortDescription = BuildConfig.SHORT_FLAVOR_DESCRIPTION,
+    )
 
     @Provides
     @Singleton
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Context.kt b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
index 509dd6a862..14e639bf32 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Context.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Context.kt
@@ -37,7 +37,7 @@ import androidx.datastore.preferences.core.Preferences
 import dagger.hilt.EntryPoints
 import im.vector.app.core.datastore.dataStoreProvider
 import im.vector.app.core.di.SingletonEntryPoint
-import im.vector.app.core.resources.BuildMeta
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import java.io.OutputStream
 import kotlin.math.roundToInt
 
@@ -93,9 +93,9 @@ fun Context.safeOpenOutputStream(uri: Uri): OutputStream? {
  */
 @Suppress("deprecation")
 @SuppressLint("NewApi") // false positive
-fun Context.inferNoConnectivity(buildMeta: BuildMeta): Boolean {
+fun Context.inferNoConnectivity(sdkIntProvider: BuildVersionSdkIntProvider): Boolean {
     val connectivityManager = getSystemService<ConnectivityManager>()!!
-    return if (buildMeta.sdkInt > Build.VERSION_CODES.M) {
+    return if (sdkIntProvider.get() > Build.VERSION_CODES.M) {
         val networkCapabilities = connectivityManager.getNetworkCapabilities(connectivityManager.activeNetwork)
         when {
             networkCapabilities?.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) == true -> false
diff --git a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
index 24c8e6bd36..2e2c8429d0 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/EditText.kt
@@ -28,7 +28,7 @@ import im.vector.app.R
 import im.vector.app.core.platform.SimpleTextWatcher
 
 fun EditText.setupAsSearch(
-        @DrawableRes searchIconRes: Int = R.drawable.ic_search,
+        @DrawableRes searchIconRes: Int = R.drawable.ic_home_search,
         @DrawableRes clearIconRes: Int = R.drawable.ic_x_gray
 ) {
     addTextChangedListener(object : SimpleTextWatcher() {
diff --git a/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt b/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
index 4739840f01..909c343a45 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/TextInputLayout.kt
@@ -78,10 +78,14 @@ fun TextInputLayout.setOnImeDoneListener(action: () -> Unit) {
     }
 }
 
-fun TextInputLayout.setOnFocusLostListener(action: () -> Unit) {
+/**
+ * Set a listener for when the input has lost focus, such as moving to the another input field.
+ * The listener is only called when the view is in a resumed state to avoid triggers when exiting a screen.
+ */
+fun TextInputLayout.setOnFocusLostListener(lifecycleOwner: LifecycleOwner, action: () -> Unit) {
     editText().setOnFocusChangeListener { _, hasFocus ->
         when (hasFocus) {
-            false -> action()
+            false -> lifecycleOwner.lifecycleScope.launchWhenResumed { action() }
             else -> {
                 // do nothing
             }
diff --git a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
index 3631100c7a..34711f41d7 100644
--- a/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt
@@ -50,10 +50,10 @@ import androidx.viewbinding.ViewBinding
 import com.airbnb.mvrx.MavericksView
 import com.bumptech.glide.util.Util
 import com.google.android.material.appbar.MaterialToolbar
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.EntryPointAccessors
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.ActivityEntryPoint
@@ -67,11 +67,13 @@ import im.vector.app.core.extensions.restart
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.extensions.singletonEntryPoint
 import im.vector.app.core.extensions.toMvRxBundle
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.AndroidSystemSettingsProvider
 import im.vector.app.core.utils.ToolbarConfig
 import im.vector.app.core.utils.toast
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.configuration.VectorConfiguration
@@ -155,11 +157,12 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
     protected lateinit var bugReporter: BugReporter
     private lateinit var pinLocker: PinLocker
 
-    @Inject
-    lateinit var rageShake: RageShake
+    @Inject lateinit var rageShake: RageShake
+    @Inject lateinit var buildMeta: BuildMeta
+    @Inject lateinit var fontScalePreferences: FontScalePreferences
 
     @Inject
-    lateinit var fontScalePreferences: FontScalePreferences
+    lateinit var vectorFeatures: VectorFeatures
 
     lateinit var navigator: Navigator
         private set
@@ -253,6 +256,14 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
 
         initUiAndData()
 
+        if (vectorFeatures.isNewAppLayoutEnabled()) {
+            tryOrNull { // Add to XML theme when feature flag is removed
+                val toolbarBackground = MaterialColors.getColor(views.root, R.attr.vctr_toolbar_background)
+                window.statusBarColor = toolbarBackground
+                window.navigationBarColor = toolbarBackground
+            }
+        }
+
         val titleRes = getTitleRes()
         if (titleRes != -1) {
             supportActionBar?.let {
@@ -420,7 +431,7 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
         }
         DebugReceiver
                 .getIntentFilter(this)
-                .takeIf { BuildConfig.DEBUG }
+                .takeIf { buildMeta.isDebug }
                 ?.let {
                     debugReceiver = DebugReceiver()
                     registerReceiver(debugReceiver, it)
diff --git a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
index be84dfeaba..8e88e44627 100644
--- a/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
+++ b/vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
@@ -25,19 +25,19 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.BuildConfig
 import im.vector.app.core.di.ActiveSessionHolder
-import im.vector.app.core.di.ActiveSessionSetter
 import im.vector.app.core.network.WifiDetector
 import im.vector.app.core.pushers.model.PushData
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.services.GuardServiceStarter
 import im.vector.app.features.notifications.NotifiableEventResolver
+import im.vector.app.features.notifications.NotificationActionIds
 import im.vector.app.features.notifications.NotificationDrawerManager
-import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.settings.BackgroundSyncMode
 import im.vector.app.features.settings.VectorDataStore
 import im.vector.app.features.settings.VectorPreferences
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -60,7 +60,6 @@ class VectorMessagingReceiver : MessagingReceiver() {
     @Inject lateinit var notificationDrawerManager: NotificationDrawerManager
     @Inject lateinit var notifiableEventResolver: NotifiableEventResolver
     @Inject lateinit var pushersManager: PushersManager
-    @Inject lateinit var activeSessionSetter: ActiveSessionSetter
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var vectorPreferences: VectorPreferences
     @Inject lateinit var vectorDataStore: VectorDataStore
@@ -69,6 +68,8 @@ class VectorMessagingReceiver : MessagingReceiver() {
     @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
     @Inject lateinit var unifiedPushStore: UnifiedPushStore
     @Inject lateinit var pushParser: PushParser
+    @Inject lateinit var actionIds: NotificationActionIds
+    @Inject lateinit var buildMeta: BuildMeta
 
     private val coroutineScope = CoroutineScope(SupervisorJob())
 
@@ -88,7 +89,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
         Timber.tag(loggerTag.value).d("## onMessage() received")
 
         val sMessage = String(message)
-        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+        if (buildMeta.lowPrivacyLoggingEnabled) {
             Timber.tag(loggerTag.value).d("## onMessage() $sMessage")
         }
 
@@ -101,7 +102,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
 
         // Diagnostic Push
         if (pushData.eventId == PushersManager.TEST_EVENT_ID) {
-            val intent = Intent(NotificationUtils.PUSH_ACTION)
+            val intent = Intent(actionIds.push)
             LocalBroadcastManager.getInstance(context).sendBroadcast(intent)
             return
         }
@@ -116,7 +117,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
                 // we are in foreground, let the sync do the things?
                 Timber.tag(loggerTag.value).d("PUSH received in a foreground state, ignore")
             } else {
-                onMessageReceivedInternal(pushData)
+                coroutineScope.launch(Dispatchers.IO) { onMessageReceivedInternal(pushData) }
             }
         }
     }
@@ -170,20 +171,15 @@ class VectorMessagingReceiver : MessagingReceiver() {
      *
      * @param pushData Object containing message data.
      */
-    private fun onMessageReceivedInternal(pushData: PushData) {
+    private suspend fun onMessageReceivedInternal(pushData: PushData) {
         try {
-            if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+            if (buildMeta.lowPrivacyLoggingEnabled) {
                 Timber.tag(loggerTag.value).d("## onMessageReceivedInternal() : $pushData")
             } else {
                 Timber.tag(loggerTag.value).d("## onMessageReceivedInternal()")
             }
 
-            val session = activeSessionHolder.getSafeActiveSession()
-                    ?: run {
-                        // Active session may not exist yet, if MainActivity has not been launched
-                        activeSessionSetter.tryToSetActiveSession(startSync = false)
-                        activeSessionHolder.getSafeActiveSession()
-                    }
+            val session = activeSessionHolder.getOrInitializeSession(startSync = false)
 
             if (session == null) {
                 Timber.tag(loggerTag.value).w("## Can't sync from push, no current session")
@@ -204,7 +200,7 @@ class VectorMessagingReceiver : MessagingReceiver() {
         }
     }
 
-    private fun getEventFastLane(session: Session, pushData: PushData) {
+    private suspend fun getEventFastLane(session: Session, pushData: PushData) {
         pushData.roomId ?: return
         pushData.eventId ?: return
 
@@ -218,18 +214,16 @@ class VectorMessagingReceiver : MessagingReceiver() {
             return
         }
 
-        coroutineScope.launch {
-            Timber.tag(loggerTag.value).d("Fast lane: start request")
-            val event = tryOrNull { session.eventService().getEvent(pushData.roomId, pushData.eventId) } ?: return@launch
+        Timber.tag(loggerTag.value).d("Fast lane: start request")
+        val event = tryOrNull { session.eventService().getEvent(pushData.roomId, pushData.eventId) } ?: return
 
-            val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event, canBeReplaced = true)
+        val resolvedEvent = notifiableEventResolver.resolveInMemoryEvent(session, event, canBeReplaced = true)
 
-            resolvedEvent
-                    ?.also { Timber.tag(loggerTag.value).d("Fast lane: notify drawer") }
-                    ?.let {
-                        notificationDrawerManager.updateEvents { it.onNotifiableEventReceived(resolvedEvent) }
-                    }
-        }
+        resolvedEvent
+                ?.also { Timber.tag(loggerTag.value).d("Fast lane: notify drawer") }
+                ?.let {
+                    notificationDrawerManager.updateEvents { it.onNotifiableEventReceived(resolvedEvent) }
+                }
     }
 
     // check if the event was not yet received
diff --git a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
index 14d97e4c8f..6c25348ea1 100644
--- a/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
+++ b/vector/src/main/java/im/vector/app/core/resources/BuildMeta.kt
@@ -16,8 +16,15 @@
 
 package im.vector.app.core.resources
 
-import android.os.Build
-
 data class BuildMeta(
-        val sdkInt: Int = Build.VERSION.SDK_INT
+        val isDebug: Boolean,
+        val applicationId: String,
+        val lowPrivacyLoggingEnabled: Boolean,
+        val versionName: String,
+        val gitRevision: String,
+        val gitRevisionDate: String,
+        val gitBranchName: String,
+        val buildNumber: String,
+        val flavorDescription: String,
+        val flavorShortDescription: String,
 )
diff --git a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
index b572cd3ba3..74bca41ced 100644
--- a/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/ExternalApplicationsUtil.kt
@@ -39,7 +39,6 @@ import androidx.browser.customtabs.CustomTabsSession
 import androidx.core.app.ShareCompat
 import androidx.core.content.FileProvider
 import androidx.core.content.getSystemService
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.share.IncomingShareActivity
@@ -183,7 +182,7 @@ fun openUri(activity: Activity, uri: String) {
  */
 fun openMedia(activity: Activity, savedMediaPath: String, mimeType: String) {
     val file = File(savedMediaPath)
-    val uri = FileProvider.getUriForFile(activity, BuildConfig.APPLICATION_ID + ".fileProvider", file)
+    val uri = FileProvider.getUriForFile(activity, activity.packageName + ".fileProvider", file)
 
     val intent = Intent(Intent.ACTION_VIEW).apply {
         setDataAndType(uri, mimeType)
@@ -215,7 +214,7 @@ fun openLocation(activity: Activity, latitude: Double, longitude: Double) {
 
 fun shareMedia(context: Context, file: File, mediaMimeType: String?) {
     val mediaUri = try {
-        FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", file)
+        FileProvider.getUriForFile(context, context.packageName + ".fileProvider", file)
     } catch (e: Exception) {
         Timber.e(e, "onMediaAction Selected File cannot be shared")
         return
@@ -388,7 +387,7 @@ private fun addToGallery(savedFile: File, mediaMimeType: String?, context: Conte
 /**
  * Open the play store to the provided application Id, default to this app.
  */
-fun openPlayStore(activity: Activity, appId: String = BuildConfig.APPLICATION_ID) {
+fun openPlayStore(activity: Activity, appId: String) {
     try {
         activity.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$appId")))
     } catch (activityNotFoundException: ActivityNotFoundException) {
diff --git a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
index bb38411980..6cfe8acc16 100644
--- a/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
+++ b/vector/src/main/java/im/vector/app/core/utils/SystemUtils.kt
@@ -159,7 +159,7 @@ fun startInstallFromSourceIntent(context: Context, activityResultLauncher: Activ
 }
 
 fun startSharePlainTextIntent(
-        fragment: Fragment,
+        context: Context,
         activityResultLauncher: ActivityResultLauncher<Intent>?,
         chooserTitle: String?,
         text: String,
@@ -182,10 +182,10 @@ fun startSharePlainTextIntent(
         if (activityResultLauncher != null) {
             activityResultLauncher.launch(intent)
         } else {
-            fragment.startActivity(intent)
+            context.startActivity(intent)
         }
     } catch (activityNotFoundException: ActivityNotFoundException) {
-        fragment.activity?.toast(R.string.error_no_external_application_found)
+        context.toast(R.string.error_no_external_application_found)
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
index 3a56f31b72..290d21879d 100644
--- a/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
+++ b/vector/src/main/java/im/vector/app/features/VectorFeatures.kt
@@ -16,8 +16,8 @@
 
 package im.vector.app.features
 
-import im.vector.app.BuildConfig
 import im.vector.app.config.Config
+import im.vector.app.config.OnboardingVariant
 
 interface VectorFeatures {
 
@@ -30,19 +30,14 @@ interface VectorFeatures {
     fun isOnboardingCombinedLoginEnabled(): Boolean
     fun allowExternalUnifiedPushDistributors(): Boolean
     fun isScreenSharingEnabled(): Boolean
+    fun isLocationSharingEnabled(): Boolean
     fun forceUsageOfOpusEncoder(): Boolean
     fun shouldStartDmOnFirstMessage(): Boolean
     fun isNewAppLayoutEnabled(): Boolean
-
-    enum class OnboardingVariant {
-        LEGACY,
-        LOGIN_2,
-        FTUE_AUTH
-    }
 }
 
 class DefaultVectorFeatures : VectorFeatures {
-    override fun onboardingVariant(): VectorFeatures.OnboardingVariant = BuildConfig.ONBOARDING_VARIANT
+    override fun onboardingVariant() = Config.ONBOARDING_VARIANT
     override fun isOnboardingAlreadyHaveAccountSplashEnabled() = true
     override fun isOnboardingSplashCarouselEnabled() = true
     override fun isOnboardingUseCaseEnabled() = true
@@ -51,6 +46,7 @@ class DefaultVectorFeatures : VectorFeatures {
     override fun isOnboardingCombinedLoginEnabled() = true
     override fun allowExternalUnifiedPushDistributors(): Boolean = Config.ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS
     override fun isScreenSharingEnabled(): Boolean = true
+    override fun isLocationSharingEnabled() = Config.ENABLE_LOCATION_SHARING
     override fun forceUsageOfOpusEncoder(): Boolean = false
     override fun shouldStartDmOnFirstMessage(): Boolean = false
     override fun isNewAppLayoutEnabled(): Boolean = false
diff --git a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
index 46119f5563..bffba6fa9c 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/AnalyticsConfig.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 
 package im.vector.app.features.analytics
 
-interface AnalyticsConfig {
-    val isEnabled: Boolean
-    val postHogHost: String
-    val postHogApiKey: String
-    val policyLink: String
-}
+data class AnalyticsConfig(
+        val isEnabled: Boolean,
+        val postHogHost: String,
+        val postHogApiKey: String,
+        val policyLink: String,
+)
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt
index 029732f76c..7442989352 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/PostHogFactory.kt
@@ -18,11 +18,15 @@ package im.vector.app.features.analytics.impl
 
 import android.content.Context
 import com.posthog.android.PostHog
-import im.vector.app.BuildConfig
-import im.vector.app.config.analyticsConfig
+import im.vector.app.core.resources.BuildMeta
+import im.vector.app.features.analytics.AnalyticsConfig
 import javax.inject.Inject
 
-class PostHogFactory @Inject constructor(private val context: Context) {
+class PostHogFactory @Inject constructor(
+        private val context: Context,
+        private val analyticsConfig: AnalyticsConfig,
+        private val buildMeta: BuildMeta,
+) {
 
     fun createPosthog(): PostHog {
         return PostHog.Builder(context, analyticsConfig.postHogApiKey, analyticsConfig.postHogHost)
@@ -43,7 +47,7 @@ class PostHogFactory @Inject constructor(private val context: Context) {
     }
 
     private fun getLogLevel(): PostHog.LogLevel {
-        return if (BuildConfig.DEBUG) {
+        return if (buildMeta.isDebug) {
             PostHog.LogLevel.DEBUG
         } else {
             PostHog.LogLevel.INFO
diff --git a/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt b/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
index 823d6285ed..fe1e8ad9ce 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
@@ -29,6 +29,9 @@ import kotlinx.coroutines.flow.map
 import org.matrix.android.sdk.api.extensions.orFalse
 import javax.inject.Inject
 
+/**
+ * Also accessed via reflection by the instrumentation tests @see [im.vector.app.ClearCurrentSessionRule].
+ */
 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "vector_analytics")
 
 /**
diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
index 320386aebd..a5bafa2ee6 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsOptInFragment.kt
@@ -22,17 +22,17 @@ import android.view.View
 import android.view.ViewGroup
 import com.airbnb.mvrx.activityViewModel
 import im.vector.app.R
-import im.vector.app.config.analyticsConfig
 import im.vector.app.core.extensions.setTextWithColoredPart
 import im.vector.app.core.platform.OnBackPressed
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentAnalyticsOptinBinding
+import im.vector.app.features.analytics.AnalyticsConfig
 import javax.inject.Inject
 
-class AnalyticsOptInFragment @Inject constructor() :
-        VectorBaseFragment<FragmentAnalyticsOptinBinding>(),
-        OnBackPressed {
+class AnalyticsOptInFragment @Inject constructor(
+        private val analyticsConfig: AnalyticsConfig,
+) : VectorBaseFragment<FragmentAnalyticsOptinBinding>(), OnBackPressed {
 
     // Share the view model with the Activity so that the Activity
     // can decide what to do when the data has been saved
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
index d0843b3b64..f8aa22f418 100644
--- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
@@ -23,9 +23,9 @@ import android.os.Bundle
 import androidx.activity.result.ActivityResultLauncher
 import im.vector.app.core.dialogs.PhotoOrVideoDialog
 import im.vector.app.core.platform.Restorable
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.lib.multipicker.MultiPicker
-import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.session.content.ContentAttachmentData
 import timber.log.Timber
 
@@ -35,15 +35,14 @@ private const val PENDING_TYPE_KEY = "PENDING_TYPE_KEY"
 /**
  * This class helps to handle attachments by providing simple methods.
  */
-class AttachmentsHelper(val context: Context, val callback: Callback) : Restorable {
+class AttachmentsHelper(
+        val context: Context,
+        val callback: Callback,
+        private val buildMeta: BuildMeta,
+) : Restorable {
 
     interface Callback {
-        fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
-            if (BuildConfig.LOG_PRIVATE_DATA) {
-                Timber.v("On contact attachment ready: $contactAttachment")
-            }
-        }
-
+        fun onContactAttachmentReady(contactAttachment: ContactAttachment)
         fun onContentAttachmentsReady(attachments: List<ContentAttachmentData>)
     }
 
@@ -144,6 +143,9 @@ class AttachmentsHelper(val context: Context, val callback: Callback) : Restorab
                 .firstOrNull()
                 ?.toContactAttachment()
                 ?.let {
+                    if (buildMeta.lowPrivacyLoggingEnabled) {
+                        Timber.v("On contact attachment ready: $it")
+                    }
                     callback.onContactAttachmentReady(it)
                 }
     }
diff --git a/vector/src/main/java/im/vector/app/features/call/webrtc/VoipConfig.kt b/vector/src/main/java/im/vector/app/features/call/webrtc/VoipConfig.kt
new file mode 100644
index 0000000000..03a9312999
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/call/webrtc/VoipConfig.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.call.webrtc
+
+data class VoipConfig(
+      val handleCallAssertedIdentityEvents: Boolean
+)
diff --git a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
index 61148f3aab..b8b84ea322 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/keysbackup/setup/KeysBackupSetupStep3Fragment.kt
@@ -142,7 +142,7 @@ class KeysBackupSetupStep3Fragment @Inject constructor() : VectorBaseFragment<Fr
 
         dialog.findViewById<View>(R.id.keys_backup_setup_share)?.debouncedClicks {
             startSharePlainTextIntent(
-                    fragment = this,
+                    context = requireContext(),
                     activityResultLauncher = null,
                     chooserTitle = context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
                     text = recoveryKey,
diff --git a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
index efabae2f3a..db24807c1b 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSaveRecoveryKeyFragment.kt
@@ -104,7 +104,7 @@ class BootstrapSaveRecoveryKeyFragment @Inject constructor(
                 ?: return@withState
 
         startSharePlainTextIntent(
-                this,
+                requireContext(),
                 copyStartForActivityResult,
                 context?.getString(R.string.keys_backup_setup_step3_share_intent_chooser_title),
                 recoveryKey,
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
index 0b493a262e..f94e68e12a 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
@@ -35,8 +35,8 @@ import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.viewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.AppStateHandler
 import im.vector.app.R
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.hideKeyboard
 import im.vector.app.core.extensions.registerStartForActivityResult
@@ -46,6 +46,7 @@ import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.core.platform.VectorMenuProvider
 import im.vector.app.core.pushers.PushersManager
 import im.vector.app.core.pushers.UnifiedPushHelper
+import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.ActivityHomeBinding
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
@@ -134,7 +135,7 @@ class HomeActivity :
     @Inject lateinit var permalinkHandler: PermalinkHandler
     @Inject lateinit var avatarRenderer: AvatarRenderer
     @Inject lateinit var initSyncStepFormatter: InitSyncStepFormatter
-    @Inject lateinit var appStateHandler: AppStateHandler
+    @Inject lateinit var spaceStateHandler: SpaceStateHandler
     @Inject lateinit var unifiedPushHelper: UnifiedPushHelper
     @Inject lateinit var fcmHelper: FcmHelper
     @Inject lateinit var nightlyProxy: NightlyProxy
@@ -207,11 +208,16 @@ class HomeActivity :
                 )
             }
         }
-        sharedActionViewModel = viewModelProvider.get(HomeSharedActionViewModel::class.java)
+        sharedActionViewModel = viewModelProvider[HomeSharedActionViewModel::class.java]
         views.drawerLayout.addDrawerListener(drawerListener)
         if (isFirstCreation()) {
-            replaceFragment(views.homeDetailFragmentContainer, HomeDetailFragment::class.java)
-            replaceFragment(views.homeDrawerFragmentContainer, HomeDrawerFragment::class.java)
+            if (vectorFeatures.isNewAppLayoutEnabled()) {
+                views.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+                replaceFragment(views.homeDetailFragmentContainer, NewHomeDetailFragment::class.java)
+            } else {
+                replaceFragment(views.homeDetailFragmentContainer, HomeDetailFragment::class.java)
+                replaceFragment(views.homeDrawerFragmentContainer, HomeDrawerFragment::class.java)
+            }
         }
 
         sharedActionViewModel
@@ -569,7 +575,7 @@ class HomeActivity :
         nightlyProxy.onHomeResumed()
     }
 
-    override fun getMenuRes() = R.menu.home
+    override fun getMenuRes() = if (vectorFeatures.isNewAppLayoutEnabled()) R.menu.menu_new_home else R.menu.menu_home
 
     override fun handlePrepareMenu(menu: Menu) {
         menu.findItem(R.id.menu_home_init_sync_legacy).isVisible = vectorPreferences.developerMode()
@@ -609,10 +615,29 @@ class HomeActivity :
                 navigator.openSettings(this)
                 true
             }
+            R.id.menu_home_invite_friends -> {
+                launchInviteFriends()
+                true
+            }
             else -> false
         }
     }
 
+    private fun launchInviteFriends() {
+        activeSessionHolder.getSafeActiveSession()?.permalinkService()?.createPermalink(sharedActionViewModel.session.myUserId)?.let { permalink ->
+            analyticsTracker.screen(MobileScreen(screenName = MobileScreen.ScreenName.InviteFriends))
+            val text = getString(R.string.invite_friends_text, permalink)
+
+            startSharePlainTextIntent(
+                    context = this,
+                    activityResultLauncher = null,
+                    chooserTitle = getString(R.string.invite_friends),
+                    text = text,
+                    extraTitle = getString(R.string.invite_friends_rich_title)
+            )
+        }
+    }
+
     override fun onBackPressed() {
         if (views.drawerLayout.isDrawerOpen(GravityCompat.START)) {
             views.drawerLayout.closeDrawer(GravityCompat.START)
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 63b7983496..48700a328c 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -23,11 +23,11 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import im.vector.app.BuildConfig
-import im.vector.app.config.analyticsConfig
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsType
 import im.vector.app.features.analytics.plan.Signup
@@ -81,7 +81,8 @@ class HomeActivityViewModel @AssistedInject constructor(
         private val analyticsStore: AnalyticsStore,
         private val lightweightSettingsStorage: LightweightSettingsStorage,
         private val vectorPreferences: VectorPreferences,
-        private val analyticsTracker: AnalyticsTracker
+        private val analyticsTracker: AnalyticsTracker,
+        private val analyticsConfig: AnalyticsConfig,
 ) : VectorViewModel<HomeActivityViewState, HomeActivityViewActions, HomeActivityViewEvents>(initialState) {
 
     @AssistedFactory
@@ -232,9 +233,9 @@ class HomeActivityViewModel @AssistedInject constructor(
         session.syncService().getSyncRequestStateFlow()
                 .onEach { status ->
                     when (status) {
-                            is SyncRequestState.Idle                   -> {
-                                maybeVerifyOrBootstrapCrossSigning()
-                            }
+                        is SyncRequestState.Idle -> {
+                            maybeVerifyOrBootstrapCrossSigning()
+                        }
                         else -> Unit
                     }
 
@@ -473,7 +474,7 @@ class HomeActivityViewModel @AssistedInject constructor(
             HomeActivityViewActions.ViewStarted -> {
                 initialize()
             }
-            HomeActivityViewActions.DisclaimerDialogShown     -> {
+            HomeActivityViewActions.DisclaimerDialogShown -> {
                 // Tchap: in case of migration, there is no initial sync, so force the update of the identity server url
                 updateIdentityServer()
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
index ef5399c080..408c52a32b 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
@@ -31,9 +31,9 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.badge.BadgeDrawable
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.AppStateHandler
 import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.toMvRxBundle
 import im.vector.app.core.platform.OnBackPressed
@@ -45,7 +45,6 @@ import im.vector.app.core.ui.views.CurrentCallsView
 import im.vector.app.core.ui.views.CurrentCallsViewPresenter
 import im.vector.app.core.ui.views.KeysBackupBanner
 import im.vector.app.databinding.FragmentHomeDetailBinding
-import im.vector.app.features.VectorFeatures
 import im.vector.app.features.call.SharedKnownCallsViewModel
 import im.vector.app.features.call.VectorCallActivity
 import im.vector.app.features.call.dialpad.DialPadFragment
@@ -57,7 +56,6 @@ import im.vector.app.features.createdirect.CreateDirectRoomViewState
 import im.vector.app.features.home.room.list.RoomListFragment
 import im.vector.app.features.home.room.list.RoomListParams
 import im.vector.app.features.home.room.list.UnreadCounterBadgeView
-import im.vector.app.features.home.room.list.home.HomeRoomListFragment
 import im.vector.app.features.popup.PopupAlertManager
 import im.vector.app.features.popup.VerificationVectorAlert
 import im.vector.app.features.settings.VectorLocale
@@ -79,8 +77,7 @@ class HomeDetailFragment @Inject constructor(
         private val alertManager: PopupAlertManager,
         private val callManager: WebRtcCallManager,
         private val vectorPreferences: VectorPreferences,
-        private val appStateHandler: AppStateHandler,
-        private val vectorFeatures: VectorFeatures,
+        private val spaceStateHandler: SpaceStateHandler,
 ) : VectorBaseFragment<FragmentHomeDetailBinding>(),
         KeysBackupBanner.Delegate,
         CurrentCallsView.Callback,
@@ -243,13 +240,13 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun navigateBack() {
-        val previousSpaceId = appStateHandler.getSpaceBackstack().removeLastOrNull()
-        val parentSpaceId = appStateHandler.getCurrentSpace()?.flattenParentIds?.lastOrNull()
+        val previousSpaceId = spaceStateHandler.getSpaceBackstack().removeLastOrNull()
+        val parentSpaceId = spaceStateHandler.getCurrentSpace()?.flattenParentIds?.lastOrNull()
         setCurrentSpace(previousSpaceId ?: parentSpaceId)
     }
 
     private fun setCurrentSpace(spaceId: String?) {
-        appStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
+        spaceStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
         sharedActionViewModel.post(HomeActivitySharedAction.OnCloseSpace)
     }
 
@@ -272,7 +269,7 @@ class HomeDetailFragment @Inject constructor(
     }
 
     private fun refreshSpaceState() {
-        appStateHandler.getCurrentSpace()?.let {
+        spaceStateHandler.getCurrentSpace()?.let {
             onSpaceChange(it)
         }
     }
@@ -416,12 +413,8 @@ class HomeDetailFragment @Inject constructor(
             if (fragmentToShow == null) {
                 when (tab) {
                     is HomeTab.RoomList -> {
-                        if (vectorFeatures.isNewAppLayoutEnabled()) {
-                            add(R.id.roomListContainer, HomeRoomListFragment::class.java, null, fragmentTag)
-                        } else {
-                            val params = RoomListParams(tab.displayMode)
-                            add(R.id.roomListContainer, RoomListFragment::class.java, params.toMvRxBundle(), fragmentTag)
-                        }
+                        val params = RoomListParams(tab.displayMode)
+                        add(R.id.roomListContainer, RoomListFragment::class.java, params.toMvRxBundle(), fragmentTag)
                     }
                     is HomeTab.DialPad -> {
                         add(R.id.roomListContainer, createDialPadFragment(), fragmentTag)
@@ -553,7 +546,7 @@ class HomeDetailFragment @Inject constructor(
                 .show()
     }
 
-    override fun onBackPressed(toolbarButton: Boolean) = if (appStateHandler.getCurrentSpace() != null) {
+    override fun onBackPressed(toolbarButton: Boolean) = if (spaceStateHandler.getCurrentSpace() != null) {
         navigateBack()
         true
     } else {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 4be30f753b..b010a9d577 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -22,7 +22,7 @@ import com.airbnb.mvrx.ViewModelContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.extensions.singletonEntryPoint
@@ -68,7 +68,7 @@ class HomeDetailViewModel @AssistedInject constructor(
         private val vectorDataStore: VectorDataStore,
         private val callManager: WebRtcCallManager,
         private val directRoomHelper: DirectRoomHelper,
-        private val appStateHandler: AppStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
         private val autoAcceptInvites: AutoAcceptInvites,
         private val vectorOverrides: VectorOverrides
 ) : VectorViewModel<HomeDetailViewState, HomeDetailAction, HomeDetailViewEvents>(initialState),
@@ -206,7 +206,7 @@ class HomeDetailViewModel @AssistedInject constructor(
     }
 
     private fun observeRoomGroupingMethod() {
-        appStateHandler.selectedSpaceFlow
+        spaceStateHandler.getSelectedSpaceFlow()
                 .setOnEach {
                     copy(
                             selectedSpace = it.orNull()
@@ -215,7 +215,7 @@ class HomeDetailViewModel @AssistedInject constructor(
     }
 
     private fun observeRoomSummaries() {
-        appStateHandler.selectedSpaceFlow.distinctUntilChanged().flatMapLatest {
+        spaceStateHandler.getSelectedSpaceFlow().distinctUntilChanged().flatMapLatest {
             // we use it as a trigger to all changes in room, but do not really load
             // the actual models
             session.roomService().getPagedRoomSummariesLive(
@@ -227,7 +227,7 @@ class HomeDetailViewModel @AssistedInject constructor(
         }
                 .throttleFirst(300)
                 .onEach {
-                    val activeSpaceRoomId = appStateHandler.getCurrentSpace()?.roomId
+                    val activeSpaceRoomId = spaceStateHandler.getCurrentSpace()?.roomId
                     var dmInvites = 0
                     var roomsInvite = 0
                     if (autoAcceptInvites.showInvites()) {
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
index 72837df3a0..987cc99241 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
@@ -26,11 +26,13 @@ import androidx.core.view.isVisible
 import fr.gouv.tchap.core.dialogs.InviteByEmailDialog
 import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.config.Config
 import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.extensions.observeK
 import im.vector.app.core.extensions.replaceChildFragment
 import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.startSharePlainTextIntent
 import im.vector.app.databinding.FragmentHomeDrawerBinding
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -44,10 +46,11 @@ import org.matrix.android.sdk.api.util.toMatrixItem
 import javax.inject.Inject
 
 class HomeDrawerFragment @Inject constructor(
+        private val homeDrawerActionsController: HomeDrawerActionsController,
         private val session: Session,
         private val vectorPreferences: VectorPreferences,
         private val avatarRenderer: AvatarRenderer,
-        private val homeDrawerActionsController: HomeDrawerActionsController
+        private val buildMeta: BuildMeta,
 ) : VectorBaseFragment<FragmentHomeDrawerBinding>(),
         HomeDrawerActionsController.Listener {
 
@@ -65,7 +68,7 @@ class HomeDrawerFragment @Inject constructor(
         homeDrawerActionsController.listener = this
         views.tchapHomeDrawerActionsRecyclerView.configureWith(homeDrawerActionsController)
 
-        if (BuildConfig.SHOW_SPACES && savedInstanceState == null) {
+        if (Config.SHOW_SPACES && savedInstanceState == null) {
             replaceChildFragment(R.id.homeDrawerGroupListContainer, SpaceListFragment::class.java)
         }
         session.userService().getUserLive(session.myUserId).observeK(viewLifecycleOwner) { optionalUser ->
@@ -110,7 +113,7 @@ class HomeDrawerFragment @Inject constructor(
                 val text = getString(R.string.invite_friends_text, permalink)
 
                 startSharePlainTextIntent(
-                        fragment = this,
+                        context = requireContext(),
                         activityResultLauncher = null,
                         chooserTitle = getString(R.string.invite_friends),
                         text = text,
@@ -120,7 +123,7 @@ class HomeDrawerFragment @Inject constructor(
         }
 
         // Debug menu
-        views.homeDrawerHeaderDebugView.isVisible = BuildConfig.DEBUG && vectorPreferences.developerMode()
+        views.homeDrawerHeaderDebugView.isVisible = buildMeta.isDebug && vectorPreferences.developerMode()
         views.homeDrawerHeaderDebugView.debouncedClicks {
             sharedActionViewModel.post(HomeActivitySharedAction.CloseDrawer)
             navigator.openDebug(requireActivity())
diff --git a/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
new file mode 100644
index 0000000000..2e36748069
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
@@ -0,0 +1,459 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import com.airbnb.mvrx.activityViewModel
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import com.google.android.material.badge.BadgeDrawable
+import im.vector.app.R
+import im.vector.app.SpaceStateHandler
+import im.vector.app.core.extensions.commitTransaction
+import im.vector.app.core.platform.OnBackPressed
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.core.platform.VectorMenuProvider
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.ui.views.CurrentCallsView
+import im.vector.app.core.ui.views.CurrentCallsViewPresenter
+import im.vector.app.core.ui.views.KeysBackupBanner
+import im.vector.app.databinding.FragmentNewHomeDetailBinding
+import im.vector.app.features.call.SharedKnownCallsViewModel
+import im.vector.app.features.call.VectorCallActivity
+import im.vector.app.features.call.dialpad.DialPadFragment
+import im.vector.app.features.call.webrtc.WebRtcCallManager
+import im.vector.app.features.home.room.list.home.HomeRoomListFragment
+import im.vector.app.features.popup.PopupAlertManager
+import im.vector.app.features.popup.VerificationVectorAlert
+import im.vector.app.features.settings.VectorLocale
+import im.vector.app.features.settings.VectorPreferences
+import im.vector.app.features.settings.VectorSettingsActivity.Companion.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS
+import im.vector.app.features.themes.ThemeUtils
+import im.vector.app.features.workers.signout.BannerState
+import im.vector.app.features.workers.signout.ServerBackupStatusViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.crypto.model.DeviceInfo
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class NewHomeDetailFragment @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val colorProvider: ColorProvider,
+        private val alertManager: PopupAlertManager,
+        private val callManager: WebRtcCallManager,
+        private val vectorPreferences: VectorPreferences,
+        private val appStateHandler: SpaceStateHandler,
+        private val session: Session,
+) : VectorBaseFragment<FragmentNewHomeDetailBinding>(),
+        KeysBackupBanner.Delegate,
+        CurrentCallsView.Callback,
+        OnBackPressed,
+        VectorMenuProvider {
+
+    private val viewModel: HomeDetailViewModel by fragmentViewModel()
+    private val unknownDeviceDetectorSharedViewModel: UnknownDeviceDetectorSharedViewModel by activityViewModel()
+    private val unreadMessagesSharedViewModel: UnreadMessagesSharedViewModel by activityViewModel()
+    private val serverBackupStatusViewModel: ServerBackupStatusViewModel by activityViewModel()
+
+    private lateinit var sharedActionViewModel: HomeSharedActionViewModel
+    private lateinit var sharedCallActionViewModel: SharedKnownCallsViewModel
+
+    private var hasUnreadRooms = false
+        set(value) {
+            if (value != field) {
+                field = value
+                invalidateOptionsMenu()
+            }
+        }
+
+    override fun getMenuRes() = R.menu.room_list
+
+    override fun handleMenuItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.menu_home_mark_all_as_read -> {
+                viewModel.handle(HomeDetailAction.MarkAllRoomsRead)
+                true
+            }
+            else -> false
+        }
+    }
+
+    override fun handlePrepareMenu(menu: Menu) {
+        withState(viewModel) { state ->
+            val isRoomList = state.currentTab is HomeTab.RoomList
+            menu.findItem(R.id.menu_home_mark_all_as_read).isVisible = isRoomList && hasUnreadRooms
+        }
+    }
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentNewHomeDetailBinding {
+        return FragmentNewHomeDetailBinding.inflate(inflater, container, false)
+    }
+
+    private val currentCallsViewPresenter = CurrentCallsViewPresenter()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        sharedActionViewModel = activityViewModelProvider.get(HomeSharedActionViewModel::class.java)
+        sharedCallActionViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
+        setupBottomNavigationView()
+        setupToolbar()
+        setupKeysBackupBanner()
+        setupActiveCallView()
+
+        withState(viewModel) {
+            // Update the navigation view if needed (for when we restore the tabs)
+            views.bottomNavigationView.selectedItemId = it.currentTab.toMenuId()
+        }
+
+        viewModel.onEach(HomeDetailViewState::selectedSpace) { selectedSpace ->
+            onSpaceChange(selectedSpace)
+        }
+
+        viewModel.onEach(HomeDetailViewState::currentTab) { currentTab ->
+            updateUIForTab(currentTab)
+        }
+
+        viewModel.onEach(HomeDetailViewState::showDialPadTab) { showDialPadTab ->
+            updateTabVisibilitySafely(R.id.bottom_action_dial_pad, showDialPadTab)
+        }
+
+        viewModel.observeViewEvents { viewEvent ->
+            when (viewEvent) {
+                HomeDetailViewEvents.CallStarted -> handleCallStarted()
+                is HomeDetailViewEvents.FailToCall -> showFailure(viewEvent.failure)
+                HomeDetailViewEvents.Loading -> showLoadingDialog()
+            }
+        }
+
+        unknownDeviceDetectorSharedViewModel.onEach { state ->
+            state.unknownSessions.invoke()?.let { unknownDevices ->
+                if (unknownDevices.firstOrNull()?.currentSessionTrust == true) {
+                    val uid = "review_login"
+                    alertManager.cancelAlert(uid)
+                    val olderUnverified = unknownDevices.filter { !it.isNew }
+                    val newest = unknownDevices.firstOrNull { it.isNew }?.deviceInfo
+                    if (newest != null) {
+                        promptForNewUnknownDevices(uid, state, newest)
+                    } else if (olderUnverified.isNotEmpty()) {
+                        // In this case we prompt to go to settings to review logins
+                        promptToReviewChanges(uid, state, olderUnverified.map { it.deviceInfo })
+                    }
+                }
+            }
+        }
+
+        sharedCallActionViewModel
+                .liveKnownCalls
+                .observe(viewLifecycleOwner) {
+                    currentCallsViewPresenter.updateCall(callManager.getCurrentCall(), callManager.getCalls())
+                    invalidateOptionsMenu()
+                }
+    }
+
+    private fun navigateBack() {
+        val previousSpaceId = appStateHandler.getSpaceBackstack().removeLastOrNull()
+        val parentSpaceId = appStateHandler.getCurrentSpace()?.flattenParentIds?.lastOrNull()
+        setCurrentSpace(previousSpaceId ?: parentSpaceId)
+    }
+
+    private fun setCurrentSpace(spaceId: String?) {
+        appStateHandler.setCurrentSpace(spaceId, isForwardNavigation = false)
+        sharedActionViewModel.post(HomeActivitySharedAction.OnCloseSpace)
+    }
+
+    private fun handleCallStarted() {
+        dismissLoadingDialog()
+        val fragmentTag = HomeTab.DialPad.toFragmentTag()
+        (childFragmentManager.findFragmentByTag(fragmentTag) as? DialPadFragment)?.clear()
+    }
+
+    override fun onDestroyView() {
+        currentCallsViewPresenter.unBind()
+        super.onDestroyView()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        updateTabVisibilitySafely(R.id.bottom_action_notification, vectorPreferences.labAddNotificationTab())
+        callManager.checkForProtocolsSupportIfNeeded()
+        refreshSpaceState()
+    }
+
+    private fun refreshSpaceState() {
+        appStateHandler.getCurrentSpace()?.let {
+            onSpaceChange(it)
+        }
+    }
+
+    private fun promptForNewUnknownDevices(uid: String, state: UnknownDevicesState, newest: DeviceInfo) {
+        val user = state.myMatrixItem
+        alertManager.postVectorAlert(
+                VerificationVectorAlert(
+                        uid = uid,
+                        title = getString(R.string.new_session),
+                        description = getString(R.string.verify_this_session, newest.displayName ?: newest.deviceId ?: ""),
+                        iconId = R.drawable.ic_shield_warning
+                ).apply {
+                    viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
+                    colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
+                    contentAction = Runnable {
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)
+                                ?.navigator
+                                ?.requestSessionVerification(requireContext(), newest.deviceId ?: "")
+                        unknownDeviceDetectorSharedViewModel.handle(
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                        )
+                    }
+                    dismissedAction = Runnable {
+                        unknownDeviceDetectorSharedViewModel.handle(
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(newest.deviceId?.let { listOf(it) }.orEmpty())
+                        )
+                    }
+                }
+        )
+    }
+
+    private fun promptToReviewChanges(uid: String, state: UnknownDevicesState, oldUnverified: List<DeviceInfo>) {
+        val user = state.myMatrixItem
+        alertManager.postVectorAlert(
+                VerificationVectorAlert(
+                        uid = uid,
+                        title = getString(R.string.review_logins),
+                        description = getString(R.string.verify_other_sessions),
+                        iconId = R.drawable.ic_shield_warning
+                ).apply {
+                    viewBinder = VerificationVectorAlert.ViewBinder(user, avatarRenderer)
+                    colorInt = colorProvider.getColorFromAttribute(R.attr.colorPrimary)
+                    contentAction = Runnable {
+                        (weakCurrentActivity?.get() as? VectorBaseActivity<*>)?.let { activity ->
+                            // mark as ignored to avoid showing it again
+                            unknownDeviceDetectorSharedViewModel.handle(
+                                    UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(oldUnverified.mapNotNull { it.deviceId })
+                            )
+                            activity.navigator.openSettings(activity, EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY_MANAGE_SESSIONS)
+                        }
+                    }
+                    dismissedAction = Runnable {
+                        unknownDeviceDetectorSharedViewModel.handle(
+                                UnknownDeviceDetectorSharedViewModel.Action.IgnoreDevice(oldUnverified.mapNotNull { it.deviceId })
+                        )
+                    }
+                }
+        )
+    }
+
+    private fun onSpaceChange(spaceSummary: RoomSummary?) {
+        // Reimplement in next PR
+        println(spaceSummary)
+    }
+
+    private fun setupKeysBackupBanner() {
+        serverBackupStatusViewModel
+                .onEach {
+                    when (val banState = it.bannerState.invoke()) {
+                        is BannerState.Setup -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Setup(banState.numberOfKeys), false)
+                        BannerState.BackingUp -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.BackingUp, false)
+                        null,
+                        BannerState.Hidden -> views.homeKeysBackupBanner.render(KeysBackupBanner.State.Hidden, false)
+                    }
+                }
+        views.homeKeysBackupBanner.delegate = this
+    }
+
+    private fun setupActiveCallView() {
+        currentCallsViewPresenter.bind(views.currentCallsView, this)
+    }
+
+    private fun setupToolbar() {
+        setupToolbar(views.toolbar)
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            session.userService().getUser(session.myUserId)?.let { user ->
+                avatarRenderer.render(user.toMatrixItem(), views.avatar)
+            }
+        }
+
+        views.avatar.debouncedClicks {
+            navigator.openSettings(requireContext())
+        }
+    }
+
+    private fun setupBottomNavigationView() {
+        views.bottomNavigationView.menu.findItem(R.id.bottom_action_notification).isVisible = vectorPreferences.labAddNotificationTab()
+        views.bottomNavigationView.setOnItemSelectedListener {
+            val tab = when (it.itemId) {
+                R.id.bottom_action_people -> HomeTab.RoomList(RoomListDisplayMode.PEOPLE)
+                R.id.bottom_action_rooms -> HomeTab.RoomList(RoomListDisplayMode.ROOMS)
+                R.id.bottom_action_notification -> HomeTab.RoomList(RoomListDisplayMode.NOTIFICATIONS)
+                else -> HomeTab.DialPad
+            }
+            viewModel.handle(HomeDetailAction.SwitchTab(tab))
+            true
+        }
+    }
+
+    private fun updateUIForTab(tab: HomeTab) {
+        views.bottomNavigationView.menu.findItem(tab.toMenuId()).isChecked = true
+        updateSelectedFragment(tab)
+        invalidateOptionsMenu()
+    }
+
+    private fun HomeTab.toFragmentTag() = "FRAGMENT_TAG_$this"
+
+    private fun updateSelectedFragment(tab: HomeTab) {
+        val fragmentTag = tab.toFragmentTag()
+        val fragmentToShow = childFragmentManager.findFragmentByTag(fragmentTag)
+        childFragmentManager.commitTransaction {
+            childFragmentManager.fragments
+                    .filter { it != fragmentToShow }
+                    .forEach {
+                        detach(it)
+                    }
+            if (fragmentToShow == null) {
+                when (tab) {
+                    is HomeTab.RoomList -> {
+                        add(R.id.roomListContainer, HomeRoomListFragment::class.java, null, fragmentTag)
+                    }
+                    is HomeTab.DialPad -> {
+                        add(R.id.roomListContainer, createDialPadFragment(), fragmentTag)
+                    }
+                }
+            } else {
+                if (tab is HomeTab.DialPad) {
+                    (fragmentToShow as? DialPadFragment)?.applyCallback()
+                }
+                attach(fragmentToShow)
+            }
+        }
+    }
+
+    private fun createDialPadFragment(): Fragment {
+        val fragment = childFragmentManager.fragmentFactory.instantiate(vectorBaseActivity.classLoader, DialPadFragment::class.java.name)
+        return (fragment as DialPadFragment).apply {
+            arguments = Bundle().apply {
+                putBoolean(DialPadFragment.EXTRA_ENABLE_DELETE, true)
+                putBoolean(DialPadFragment.EXTRA_ENABLE_OK, true)
+                putString(DialPadFragment.EXTRA_REGION_CODE, VectorLocale.applicationLocale.country)
+            }
+            applyCallback()
+        }
+    }
+
+    private fun updateTabVisibilitySafely(tabId: Int, isVisible: Boolean) {
+        val wasVisible = views.bottomNavigationView.menu.findItem(tabId).isVisible
+        views.bottomNavigationView.menu.findItem(tabId).isVisible = isVisible
+        if (wasVisible && !isVisible) {
+            // As we hide it check if it's not the current item!
+            withState(viewModel) {
+                if (it.currentTab.toMenuId() == tabId) {
+                    viewModel.handle(HomeDetailAction.SwitchTab(HomeTab.RoomList(RoomListDisplayMode.PEOPLE)))
+                }
+            }
+        }
+    }
+
+    /* ==========================================================================================
+     * KeysBackupBanner Listener
+     * ========================================================================================== */
+
+    override fun setupKeysBackup() {
+        navigator.openKeysBackupSetup(requireActivity(), false)
+    }
+
+    override fun recoverKeysBackup() {
+        navigator.openKeysBackupManager(requireActivity())
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_people).render(it.notificationCountPeople, it.notificationHighlightPeople)
+        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_rooms).render(it.notificationCountRooms, it.notificationHighlightRooms)
+        views.bottomNavigationView.getOrCreateBadge(R.id.bottom_action_notification).render(it.notificationCountCatchup, it.notificationHighlightCatchup)
+        views.syncStateView.render(
+                it.syncState,
+                it.incrementalSyncRequestState,
+                it.pushCounter,
+                vectorPreferences.developerShowDebugInfo()
+        )
+
+        hasUnreadRooms = it.hasUnreadMessages
+    }
+
+    private fun BadgeDrawable.render(count: Int, highlight: Boolean) {
+        isVisible = count > 0
+        number = count
+        maxCharacterCount = 3
+        badgeTextColor = ThemeUtils.getColor(requireContext(), R.attr.colorOnPrimary)
+        backgroundColor = if (highlight) {
+            ThemeUtils.getColor(requireContext(), R.attr.colorError)
+        } else {
+            ThemeUtils.getColor(requireContext(), R.attr.vctr_unread_background)
+        }
+    }
+
+    private fun HomeTab.toMenuId() = when (this) {
+        is HomeTab.DialPad -> R.id.bottom_action_dial_pad
+        is HomeTab.RoomList -> when (displayMode) {
+            RoomListDisplayMode.PEOPLE -> R.id.bottom_action_people
+            RoomListDisplayMode.ROOMS -> R.id.bottom_action_rooms
+            else -> R.id.bottom_action_notification
+        }
+    }
+
+    override fun onTapToReturnToCall() {
+        callManager.getCurrentCall()?.let { call ->
+            VectorCallActivity.newIntent(
+                    context = requireContext(),
+                    callId = call.callId,
+                    signalingRoomId = call.signalingRoomId,
+                    otherUserId = call.mxCall.opponentUserId,
+                    isIncomingCall = !call.mxCall.isOutgoing,
+                    isVideoCall = call.mxCall.isVideoCall,
+                    mode = null
+            ).let {
+                startActivity(it)
+            }
+        }
+    }
+
+    private fun DialPadFragment.applyCallback(): DialPadFragment {
+        callback = object : DialPadFragment.Callback {
+            override fun onOkClicked(formatted: String?, raw: String?) {
+                if (raw.isNullOrEmpty()) return
+                viewModel.handle(HomeDetailAction.StartCallWithPhoneNumber(raw))
+            }
+        }
+        return this
+    }
+
+    override fun onBackPressed(toolbarButton: Boolean) = if (appStateHandler.getCurrentSpace() != null) {
+        navigateBack()
+        true
+    } else {
+        false
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
index a51b8eff63..861fdc64b2 100644
--- a/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
+++ b/vector/src/main/java/im/vector/app/features/home/ShortcutCreator.kt
@@ -24,8 +24,8 @@ import androidx.annotation.WorkerThread
 import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
-import im.vector.app.BuildConfig
 import im.vector.app.core.glide.GlideApp
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.MainActivity
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -35,13 +35,15 @@ import javax.inject.Inject
 private val useAdaptiveIcon = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
 private const val adaptiveIconSizeDp = 108
 private const val adaptiveIconOuterSidesDp = 18
-private const val directShareCategory = BuildConfig.APPLICATION_ID + ".SHORTCUT_SHARE"
 
 class ShortcutCreator @Inject constructor(
         private val context: Context,
         private val avatarRenderer: AvatarRenderer,
-        private val dimensionConverter: DimensionConverter
+        private val dimensionConverter: DimensionConverter,
+        buildMeta: BuildMeta,
 ) {
+
+    private val directShareCategory = buildMeta.applicationId + ".SHORTCUT_SHARE"
     private val adaptiveIconSize = dimensionConverter.dpToPx(adaptiveIconSizeDp)
     private val adaptiveIconOuterSides = dimensionConverter.dpToPx(adaptiveIconOuterSidesDp)
     private val iconSize by lazy {
diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index 5f4782123c..25781e68f0 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -22,7 +22,7 @@ import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyAction
@@ -58,7 +58,7 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(
         @Assisted initialState: UnreadMessagesState,
         session: Session,
         private val vectorPreferences: VectorPreferences,
-        appStateHandler: AppStateHandler,
+        spaceStateHandler: SpaceStateHandler,
         private val autoAcceptInvites: AutoAcceptInvites
 ) :
         VectorViewModel<UnreadMessagesState, EmptyAction, EmptyViewEvents>(initialState) {
@@ -109,8 +109,8 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(
                 }
 
         combine(
-                appStateHandler.selectedSpaceFlow.distinctUntilChanged(),
-                appStateHandler.selectedSpaceFlow.flatMapLatest {
+                spaceStateHandler.getSelectedSpaceFlow().distinctUntilChanged(),
+                spaceStateHandler.getSelectedSpaceFlow().flatMapLatest {
                     roomService.getPagedRoomSummariesLive(
                             roomSummaryQueryParams {
                                 this.memberships = Membership.activeMemberships()
@@ -162,10 +162,10 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(
             CountInfo(
                     homeCount = counts,
                     otherCount = RoomAggregateNotificationCount(
-                            notificationCount = rootCounts.fold(0, { acc, rs -> acc + rs.notificationCount }) +
+                            notificationCount = rootCounts.fold(0) { acc, rs -> acc + rs.notificationCount } +
                                     (counts.notificationCount.takeIf { selectedSpace != null } ?: 0) +
                                     spaceInviteCount,
-                            highlightCount = rootCounts.fold(0, { acc, rs -> acc + rs.highlightCount }) +
+                            highlightCount = rootCounts.fold(0) { acc, rs -> acc + rs.highlightCount } +
                                     (counts.highlightCount.takeIf { selectedSpace != null } ?: 0) +
                                     spaceInviteCount
                     )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
index 9f3ae1365e..82257d87dd 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -68,8 +68,8 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.vanniktech.emoji.EmojiPopup
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.config.Config
 import im.vector.app.core.animations.play
 import im.vector.app.core.dialogs.ConfirmationDialogBuilder
 import im.vector.app.core.dialogs.GalleryOrCameraDialogHelper
@@ -93,6 +93,7 @@ import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.platform.VectorMenuProvider
 import im.vector.app.core.platform.lifecycleAwareLazy
 import im.vector.app.core.platform.showOptimizedSnackbar
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.ColorProvider
 import im.vector.app.core.resources.UserPreferencesProvider
 import im.vector.app.core.time.Clock
@@ -126,6 +127,7 @@ import im.vector.app.core.utils.startInstallFromSourceIntent
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogReportContentBinding
 import im.vector.app.databinding.FragmentTimelineBinding
+import im.vector.app.features.VectorFeatures
 import im.vector.app.features.analytics.extensions.toAnalyticsInteraction
 import im.vector.app.features.analytics.plan.Interaction
 import im.vector.app.features.analytics.plan.MobileScreen
@@ -276,7 +278,9 @@ class TimelineFragment @Inject constructor(
         private val callManager: WebRtcCallManager,
         private val audioMessagePlaybackTracker: AudioMessagePlaybackTracker,
         private val shareIntentHandler: ShareIntentHandler,
-        private val clock: Clock
+        private val clock: Clock,
+        private val vectorFeatures: VectorFeatures,
+        private val buildMeta: BuildMeta,
 ) :
         VectorBaseFragment<FragmentTimelineBinding>(),
         TimelineEventController.Callback,
@@ -373,7 +377,7 @@ class TimelineFragment @Inject constructor(
         sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java)
         sharedActivityActionViewModel = activityViewModelProvider.get(RoomDetailSharedActionViewModel::class.java)
         knownCallsViewModel = activityViewModelProvider.get(SharedKnownCallsViewModel::class.java)
-        attachmentsHelper = AttachmentsHelper(requireContext(), this).register()
+        attachmentsHelper = AttachmentsHelper(requireContext(), this, buildMeta).register()
         callActionsHandler = StartCallActionsHandler(
                 roomId = timelineArgs.roomId,
                 fragment = this,
@@ -544,7 +548,7 @@ class TimelineFragment @Inject constructor(
         } else {
             views.composerLayout.views.sendButton.isInvisible = true
             views.voiceMessageRecorderView.alpha = 0f
-            views.voiceMessageRecorderView.isVisible = BuildConfig.SHOW_VOICE_RECORDER
+            views.voiceMessageRecorderView.isVisible = Config.SHOW_VOICE_RECORDER
             views.voiceMessageRecorderView.animate().alpha(1f).setDuration(150).start()
         }
     }
@@ -657,8 +661,8 @@ class TimelineFragment @Inject constructor(
                 )
     }
 
-    private fun navigateToLocationLiveMap() {
-        navigator.openLocationLiveMap(
+    private fun navigateToLiveLocationMap() {
+        navigator.openLiveLocationMap(
                 context = requireContext(),
                 roomId = timelineArgs.roomId
         )
@@ -858,11 +862,11 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun setupLiveLocationIndicator() {
-        views.locationLiveStatusIndicator.stopButton.debouncedClicks {
+        views.liveLocationStatusIndicator.stopButton.debouncedClicks {
             timelineViewModel.handle(RoomDetailAction.StopLiveLocationSharing)
         }
-        views.locationLiveStatusIndicator.debouncedClicks {
-            navigateToLocationLiveMap()
+        views.liveLocationStatusIndicator.debouncedClicks {
+            navigateToLiveLocationMap()
         }
     }
 
@@ -963,7 +967,7 @@ class TimelineFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        audioMessagePlaybackTracker.makeAllPlaybacksIdle()
+        messageComposerViewModel.endAllVoiceActions()
         lazyLoadedViews.unBind()
         timelineEventController.callback = null
         timelineEventController.removeModelBuildListener(modelBuildListener)
@@ -1096,7 +1100,7 @@ class TimelineFragment @Inject constructor(
                 else -> state.isAllowedToManageWidgets
             }
             menu.findItem(R.id.video_call).icon?.alpha = if (callButtonsEnabled) 0xFF else 0x40
-            menu.findItem(R.id.voice_call).icon?.alpha = if (callButtonsEnabled  || state.hasActiveElementCallWidget()) 0xFF else 0x40
+            menu.findItem(R.id.voice_call).icon?.alpha = if (callButtonsEnabled || state.hasActiveElementCallWidget()) 0xFF else 0x40
 
             val matrixAppsMenuItem = menu.findItem(R.id.open_matrix_apps)
             val widgetsCount = state.activeRoomWidgets.invoke()?.size ?: 0
@@ -1560,7 +1564,7 @@ class TimelineFragment @Inject constructor(
                     attachmentTypeSelector = AttachmentTypeSelectorView(vectorBaseActivity, vectorBaseActivity.layoutInflater, this@TimelineFragment)
                     attachmentTypeSelector.setAttachmentVisibility(
                             AttachmentTypeSelectorView.Type.LOCATION,
-                            BuildConfig.enableLocationSharing
+                            vectorFeatures.isLocationSharingEnabled(),
                     )
                     // Tchap: Disable Polls
                     attachmentTypeSelector.setAttachmentVisibility(
@@ -1658,7 +1662,7 @@ class TimelineFragment @Inject constructor(
             if (mainState.tombstoneEvent == null) {
                 views.composerLayout.isInvisible = !messageComposerState.isComposerVisible
                 views.voiceMessageRecorderView.isVisible = messageComposerState.isVoiceMessageRecorderVisible
-                if (BuildConfig.SHOW_VOICE_RECORDER) {
+                if (Config.SHOW_VOICE_RECORDER) {
                     views.composerLayout.views.sendButton.isInvisible = !messageComposerState.isSendButtonVisible
                 } else {
                     // Tchap: set visibility to gone if there is no voice recorder button
@@ -1703,7 +1707,7 @@ class TimelineFragment @Inject constructor(
     }
 
     private fun updateLiveLocationIndicator(isSharingLiveLocation: Boolean) {
-        views.locationLiveStatusIndicator.isVisible = isSharingLiveLocation
+        views.liveLocationStatusIndicator.isVisible = isSharingLiveLocation
     }
 
     private fun FragmentTimelineBinding.hideComposerViews() {
@@ -2083,7 +2087,7 @@ class TimelineFragment @Inject constructor(
                 handleShowLocationPreview(messageContent, informationData.senderId)
             }
             is MessageBeaconInfoContent -> {
-                navigateToLocationLiveMap()
+                navigateToLiveLocationMap()
             }
             else -> {
                 val handled = onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
@@ -2664,7 +2668,6 @@ class TimelineFragment @Inject constructor(
     }
 
     override fun onContactAttachmentReady(contactAttachment: ContactAttachment) {
-        super.onContactAttachmentReady(contactAttachment)
         val formattedContact = contactAttachment.toHumanReadable()
         messageComposerViewModel.handle(MessageComposerAction.SendMessage(formattedContact, false))
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
index 11938b0b38..c33782f9f1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -27,13 +27,14 @@ import com.airbnb.mvrx.Uninitialized
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
 import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.mvrx.runCatchingToAsync
 import im.vector.app.core.platform.VectorViewModel
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.BehaviorDataSource
 import im.vector.app.features.analytics.AnalyticsTracker
@@ -53,10 +54,11 @@ import im.vector.app.features.home.room.detail.sticker.StickerPickerActionHandle
 import im.vector.app.features.home.room.detail.timeline.factory.TimelineFactory
 import im.vector.app.features.home.room.detail.timeline.url.PreviewUrlRetriever
 import im.vector.app.features.home.room.typing.TypingHelper
-import im.vector.app.features.location.LocationSharingServiceConnection
 import im.vector.app.features.location.live.StopLiveLocationShareUseCase
+import im.vector.app.features.location.live.tracking.LocationSharingServiceConnection
 import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.powerlevel.PowerLevelsFlowFactory
+import im.vector.app.features.raw.wellknown.CryptoConfig
 import im.vector.app.features.raw.wellknown.getOutboundSessionKeySharingStrategyOrDefault
 import im.vector.app.features.raw.wellknown.withElementWellKnown
 import im.vector.app.features.session.coroutineScope
@@ -138,8 +140,10 @@ class TimelineViewModel @AssistedInject constructor(
         private val locationSharingServiceConnection: LocationSharingServiceConnection,
         private val stopLiveLocationShareUseCase: StopLiveLocationShareUseCase,
         private val redactLiveLocationShareEventUseCase: RedactLiveLocationShareEventUseCase,
+        private val cryptoConfig: CryptoConfig,
+        buildMeta: BuildMeta,
         timelineFactory: TimelineFactory,
-        appStateHandler: AppStateHandler,
+        spaceStateHandler: SpaceStateHandler,
 ) : VectorViewModel<RoomDetailViewState, RoomDetailAction, RoomDetailViewEvents>(initialState),
         Timeline.Listener, ChatEffectManager.Delegate, CallProtocolsChecker.Listener, LocationSharingServiceConnection.Callback {
 
@@ -151,7 +155,7 @@ class TimelineViewModel @AssistedInject constructor(
     val timeline = timelineFactory.createTimeline(viewModelScope, room, eventId, initialState.rootThreadEventId)
 
     // Same lifecycle than the ViewModel (survive to screen rotation)
-    val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope)
+    val previewUrlRetriever = PreviewUrlRetriever(session, viewModelScope, buildMeta)
 
     // Slot to keep a pending action during permission request
     var pendingAction: RoomDetailAction? = null
@@ -206,7 +210,7 @@ class TimelineViewModel @AssistedInject constructor(
         // Ensure to share the outbound session keys with all members
         if (room.roomCryptoService().isEncrypted()) {
             rawService.withElementWellKnown(viewModelScope, session.sessionParams) {
-                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault()
+                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault(cryptoConfig.fallbackKeySharingStrategy)
                 if (strategy == OutboundSessionKeySharingStrategy.WhenEnteringRoom) {
                     prepareForEncryption()
                 }
@@ -221,16 +225,16 @@ class TimelineViewModel @AssistedInject constructor(
         if (initialState.switchToParentSpace) {
             // We are coming from a notification, try to switch to the most relevant space
             // so that when hitting back the room will appear in the list
-            appStateHandler.getCurrentSpace().let { currentSpace ->
+            spaceStateHandler.getCurrentSpace().let { currentSpace ->
                 val currentRoomSummary = room.roomSummary() ?: return@let
                 // nothing we are good
                 if ((currentSpace == null && !vectorPreferences.prefSpacesShowAllRoomInHome()) ||
                         (currentSpace != null && !currentRoomSummary.flattenParentIds.contains(currentSpace.roomId))) {
                     // take first one or switch to home
-                    appStateHandler.setCurrentSpace(
+                    spaceStateHandler.setCurrentSpace(
                             currentRoomSummary
                                     .flattenParentIds.firstOrNull { it.isNotBlank() },
-                            // force persist, because if not on resume the AppStateHandler will resume
+                            // force persist, because if not on resume the SpaceStateHandler will resume
                             // the current space from what was persisted on enter background
                             persistNow = true
                     )
@@ -689,7 +693,7 @@ class TimelineViewModel @AssistedInject constructor(
         // Ensure outbound session keys
         if (room.roomCryptoService().isEncrypted()) {
             rawService.withElementWellKnown(viewModelScope, session.sessionParams) {
-                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault()
+                val strategy = it.getOutboundSessionKeySharingStrategyOrDefault(cryptoConfig.fallbackKeySharingStrategy)
                 if (strategy == OutboundSessionKeySharingStrategy.WhenTyping && action.focused) {
                     // Should we add some rate limit here, or do it only once per model lifecycle?
                     prepareForEncryption()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
index 9374d51228..2e150daee6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/AudioMessageHelper.kt
@@ -20,7 +20,7 @@ import android.content.Context
 import android.media.AudioAttributes
 import android.media.MediaPlayer
 import androidx.core.content.FileProvider
-import im.vector.app.BuildConfig
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.home.room.detail.timeline.helper.AudioMessagePlaybackTracker
 import im.vector.app.features.voice.VoiceFailure
 import im.vector.app.features.voice.VoiceRecorder
@@ -43,6 +43,7 @@ import javax.inject.Inject
 class AudioMessageHelper @Inject constructor(
         private val context: Context,
         private val playbackTracker: AudioMessagePlaybackTracker,
+        private val buildMeta: BuildMeta,
         voiceRecorderProvider: VoiceRecorderProvider
 ) {
     private var mediaPlayer: MediaPlayer? = null
@@ -88,7 +89,7 @@ class AudioMessageHelper @Inject constructor(
 
         try {
             voiceMessageFile?.let {
-                val outputFileUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".fileProvider", it, "Voice message.${it.extension}")
+                val outputFileUri = FileProvider.getUriForFile(context, buildMeta.applicationId + ".fileProvider", it, "Voice message.${it.extension}")
                 return outputFileUri
                         .toMultiPickerAudioType(context)
                         ?.apply {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
index 0da324ffc2..527f42a67a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
@@ -41,7 +41,6 @@ sealed class MessageComposerAction : VectorViewModelAction {
     object PauseRecordingVoiceMessage : MessageComposerAction()
     data class PlayOrPauseVoicePlayback(val eventId: String, val messageAudioContent: MessageAudioContent) : MessageComposerAction()
     object PlayOrPauseRecordingPlayback : MessageComposerAction()
-    data class EndAllVoiceActions(val deleteRecord: Boolean = true) : MessageComposerAction()
     data class VoiceWaveformTouchedUp(val eventId: String, val duration: Int, val percentage: Float) : MessageComposerAction()
     data class VoiceWaveformMovedTo(val eventId: String, val duration: Int, val percentage: Float) : MessageComposerAction()
     data class AudioSeekBarMovedTo(val eventId: String, val duration: Int, val percentage: Float) : MessageComposerAction()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
index 749ceebca4..d33534d295 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
@@ -111,7 +111,6 @@ class MessageComposerViewModel @AssistedInject constructor(
             is MessageComposerAction.PlayOrPauseVoicePlayback -> handlePlayOrPauseVoicePlayback(action)
             MessageComposerAction.PauseRecordingVoiceMessage -> handlePauseRecordingVoiceMessage()
             MessageComposerAction.PlayOrPauseRecordingPlayback -> handlePlayOrPauseRecordingPlayback()
-            is MessageComposerAction.EndAllVoiceActions -> handleEndAllVoiceActions(action.deleteRecord)
             is MessageComposerAction.InitializeVoiceRecorder -> handleInitializeVoiceRecorder(action.attachmentData)
             is MessageComposerAction.OnEntersBackground -> handleEntersBackground(action.composerText)
             is MessageComposerAction.VoiceWaveformTouchedUp -> handleVoiceWaveformTouchedUp(action)
@@ -904,7 +903,7 @@ class MessageComposerViewModel @AssistedInject constructor(
         audioMessageHelper.startOrPauseRecordingPlayback()
     }
 
-    private fun handleEndAllVoiceActions(deleteRecord: Boolean) {
+    fun endAllVoiceActions(deleteRecord: Boolean = true) {
         audioMessageHelper.clearTracker()
         audioMessageHelper.stopAllVoiceActions(deleteRecord)
     }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
index 3ae66e0b94..7981ad07a6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
@@ -17,7 +17,7 @@
 package im.vector.app.features.home.room.detail.composer
 
 import com.airbnb.mvrx.MavericksState
-import im.vector.app.BuildConfig
+import im.vector.app.config.Config
 import im.vector.app.features.home.room.detail.arguments.TimelineArgs
 import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -60,7 +60,7 @@ fun CanSendStatus.boolean(): Boolean {
         CanSendStatus.Allowed -> true
         CanSendStatus.NoPermission -> false
         is CanSendStatus.UnSupportedE2eAlgorithm -> false
-        CanSendStatus.EmptyDM                    -> false
+        CanSendStatus.EmptyDM -> false
     }
 }
 
@@ -84,7 +84,7 @@ data class MessageComposerViewState(
     val isVoiceMessageIdle = !isVoiceRecording
 
     val isComposerVisible = canSendMessage.boolean() && !isVoiceRecording
-    val isVoiceMessageRecorderVisible = canSendMessage.boolean() && !isSendButtonVisible && BuildConfig.SHOW_VOICE_RECORDER
+    val isVoiceMessageRecorderVisible = canSendMessage.boolean() && !isSendButtonVisible && Config.SHOW_VOICE_RECORDER
 
     constructor(args: TimelineArgs) : this(
             roomId = args.roomId,
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageConfig.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageConfig.kt
new file mode 100644
index 0000000000..5ba5e40ca8
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageConfig.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.detail.composer.voice
+
+data class VoiceMessageConfig(
+        val lengthLimitMs: Long
+)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
index 536a582ec1..13e0477ab6 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
@@ -21,7 +21,6 @@ import android.util.AttributeSet
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import dagger.hilt.android.AndroidEntryPoint
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.hardware.vibrate
 import im.vector.app.core.time.Clock
@@ -57,6 +56,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
     }
 
     @Inject lateinit var clock: Clock
+    @Inject lateinit var voiceMessageConfig: VoiceMessageConfig
 
     // We need to define views as lateinit var to be able to check if initialized for the bug fix on api 21 and 22.
     @Suppress("UNNECESSARY_LATEINIT")
@@ -202,7 +202,7 @@ class VoiceMessageRecorderView @JvmOverloads constructor(
 
     private fun onRecordingTick(isLocked: Boolean, milliseconds: Long) {
         voiceMessageViews.renderRecordingTimer(isLocked, milliseconds / 1_000)
-        val timeDiffToRecordingLimit = BuildConfig.VOICE_MESSAGE_DURATION_LIMIT_MS - milliseconds
+        val timeDiffToRecordingLimit = voiceMessageConfig.lengthLimitMs - milliseconds
         if (timeDiffToRecordingLimit <= 0) {
             post {
                 callback.onRecordingLimitReached()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 43a2b38700..d918703f95 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -17,7 +17,6 @@ package im.vector.app.features.home.room.detail.timeline.action
 
 import com.airbnb.epoxy.TypedEpoxyController
 import com.airbnb.mvrx.Success
-import im.vector.app.BuildConfig
 import im.vector.app.EmojiCompatFontProvider
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
@@ -149,10 +148,8 @@ class MessageActionsEpoxyController @Inject constructor(
             }
         }
 
-        // Tchap: Disable message reaction
         // Quick reactions
-        if (state.canReact() && state.quickStates is Success &&
-                BuildConfig.SHOW_ADD_MESSAGE_REACTION) {
+        if (state.canReact() && state.quickStates is Success) {
             // Separator
             bottomSheetDividerItem {
                 id("reaction_separator")
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 5057a6f2f7..adbdff7669 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -20,7 +20,6 @@ import dagger.Lazy
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
@@ -295,8 +294,7 @@ class MessageActionsViewModel @AssistedInject constructor(
             add(EventSharedAction.Resend(eventId))
         }
         add(EventSharedAction.Remove(eventId))
-        // Tchap: Disable editing messages
-        if (canEdit(timelineEvent, session.myUserId, actionPermissions) && BuildConfig.SHOW_EDIT_MESSAGE) {
+        if (canEdit(timelineEvent, session.myUserId, actionPermissions)) {
             add(EventSharedAction.Edit(eventId, timelineEvent.root.getClearType()))
         }
         if (canCopy(msgType)) {
@@ -350,8 +348,7 @@ class MessageActionsViewModel @AssistedInject constructor(
             if (canEndPoll(timelineEvent, actionPermissions)) {
                 add(EventSharedAction.EndPoll(timelineEvent.eventId))
             }
-            // Tchap: Disable editing messages
-            if (canEdit(timelineEvent, session.myUserId, actionPermissions) && BuildConfig.SHOW_EDIT_MESSAGE) {
+            if (canEdit(timelineEvent, session.myUserId, actionPermissions)) {
                 add(EventSharedAction.Edit(eventId, timelineEvent.root.getClearType()))
             }
 
@@ -360,9 +357,7 @@ class MessageActionsViewModel @AssistedInject constructor(
                 add(EventSharedAction.Copy(messageContent!!.body))
             }
 
-            // Tchap: Disable message reaction
-            if (timelineEvent.canReact() && actionPermissions.canReact &&
-                    BuildConfig.SHOW_ADD_MESSAGE_REACTION) {
+            if (timelineEvent.canReact() && actionPermissions.canReact) {
                 add(EventSharedAction.AddReaction(eventId))
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
index b7790b8a30..4903b8c8cf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageLocationItem.kt
@@ -36,6 +36,8 @@ import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
 import im.vector.app.features.home.room.detail.timeline.style.granularRoundedCorners
+import im.vector.app.features.location.MapLoadingErrorView
+import im.vector.app.features.location.MapLoadingErrorViewState
 
 abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>(
         @LayoutRes layoutId: Int = R.layout.item_timeline_event_base
@@ -86,8 +88,10 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>(
                             target: Target<Drawable>?,
                             isFirstResource: Boolean
                     ): Boolean {
-                        holder.staticMapPinImageView.setImageResource(R.drawable.ic_location_pin_failed)
-                        holder.staticMapErrorTextView.isVisible = true
+                        holder.staticMapPinImageView.setImageDrawable(null)
+                        holder.staticMapLoadingErrorView.isVisible = true
+                        val mapErrorViewState = MapLoadingErrorViewState(imageCornerTransformation)
+                        holder.staticMapLoadingErrorView.render(mapErrorViewState)
                         holder.staticMapCopyrightTextView.isVisible = false
                         return false
                     }
@@ -103,7 +107,7 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>(
                             // we are not using Glide since it does not display it correctly when there is no user photo
                             holder.staticMapPinImageView.setImageDrawable(pinDrawable)
                         }
-                        holder.staticMapErrorTextView.isVisible = false
+                        holder.staticMapLoadingErrorView.isVisible = false
                         holder.staticMapCopyrightTextView.isVisible = true
                         return false
                     }
@@ -115,7 +119,7 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>(
     abstract class Holder(@IdRes stubId: Int) : AbsMessageItem.Holder(stubId) {
         val staticMapImageView by bind<ImageView>(R.id.staticMapImageView)
         val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView)
-        val staticMapErrorTextView by bind<TextView>(R.id.staticMapErrorTextView)
+        val staticMapLoadingErrorView by bind<MapLoadingErrorView>(R.id.staticMapLoadingError)
         val staticMapCopyrightTextView by bind<TextView>(R.id.staticMapCopyrightTextView)
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
index fae8091f06..5c72980cc8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationInactiveItem.kt
@@ -42,8 +42,8 @@ abstract class MessageLiveLocationInactiveItem :
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
-        val bannerImageView by bind<ImageView>(R.id.locationLiveEndedBannerBackground)
-        val noLocationMapImageView by bind<ImageView>(R.id.locationLiveInactiveMap)
+        val bannerImageView by bind<ImageView>(R.id.liveLocationEndedBannerBackground)
+        val noLocationMapImageView by bind<ImageView>(R.id.liveLocationInactiveMap)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
index b35b4dff8b..863d03b18c 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationItem.kt
@@ -26,8 +26,8 @@ import im.vector.app.core.resources.toTimestamp
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.features.home.room.detail.RoomDetailAction
 import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout
-import im.vector.app.features.location.live.LocationLiveMessageBannerViewState
-import im.vector.app.features.location.live.LocationLiveRunningBannerView
+import im.vector.app.features.location.live.LiveLocationMessageBannerViewState
+import im.vector.app.features.location.live.LiveLocationRunningBannerView
 import org.threeten.bp.LocalDateTime
 
 @EpoxyModelClass
@@ -44,17 +44,17 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
 
     override fun bind(holder: Holder) {
         super.bind(holder)
-        bindLocationLiveBanner(holder)
+        bindLiveLocationBanner(holder)
     }
 
-    private fun bindLocationLiveBanner(holder: Holder) {
+    private fun bindLiveLocationBanner(holder: Holder) {
         // TODO in a future PR add check on device id to confirm that is the one that sent the beacon
         val isEmitter = currentUserId != null && currentUserId == locationUserId
         val messageLayout = attributes.informationData.messageLayout
         val viewState = buildViewState(holder, messageLayout, isEmitter)
-        holder.locationLiveRunningBanner.isVisible = true
-        holder.locationLiveRunningBanner.render(viewState)
-        holder.locationLiveRunningBanner.stopButton.setOnClickListener {
+        holder.liveLocationRunningBanner.isVisible = true
+        holder.liveLocationRunningBanner.render(viewState)
+        holder.liveLocationRunningBanner.stopButton.setOnClickListener {
             attributes.callback?.onTimelineItemAction(RoomDetailAction.StopLiveLocationSharing)
         }
     }
@@ -63,24 +63,24 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
             holder: Holder,
             messageLayout: TimelineMessageLayout,
             isEmitter: Boolean
-    ): LocationLiveMessageBannerViewState {
+    ): LiveLocationMessageBannerViewState {
         return when {
             messageLayout is TimelineMessageLayout.Bubble && isEmitter ->
-                LocationLiveMessageBannerViewState.Emitter(
+                LiveLocationMessageBannerViewState.Emitter(
                         remainingTimeInMillis = getRemainingTimeOfLiveInMillis(),
                         bottomStartCornerRadiusInDp = messageLayout.cornersRadius.bottomStartRadius,
                         bottomEndCornerRadiusInDp = messageLayout.cornersRadius.bottomEndRadius,
                         isStopButtonCenteredVertically = false
                 )
             messageLayout is TimelineMessageLayout.Bubble ->
-                LocationLiveMessageBannerViewState.Watcher(
+                LiveLocationMessageBannerViewState.Watcher(
                         bottomStartCornerRadiusInDp = messageLayout.cornersRadius.bottomStartRadius,
                         bottomEndCornerRadiusInDp = messageLayout.cornersRadius.bottomEndRadius,
                         formattedLocalTimeOfEndOfLive = getFormattedLocalTimeEndOfLive(),
                 )
             isEmitter -> {
                 val cornerRadius = getBannerCornerRadiusForDefaultLayout(holder)
-                LocationLiveMessageBannerViewState.Emitter(
+                LiveLocationMessageBannerViewState.Emitter(
                         remainingTimeInMillis = getRemainingTimeOfLiveInMillis(),
                         bottomStartCornerRadiusInDp = cornerRadius,
                         bottomEndCornerRadiusInDp = cornerRadius,
@@ -89,7 +89,7 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
             }
             else -> {
                 val cornerRadius = getBannerCornerRadiusForDefaultLayout(holder)
-                LocationLiveMessageBannerViewState.Watcher(
+                LiveLocationMessageBannerViewState.Watcher(
                         bottomStartCornerRadiusInDp = cornerRadius,
                         bottomEndCornerRadiusInDp = cornerRadius,
                         formattedLocalTimeOfEndOfLive = getFormattedLocalTimeEndOfLive(),
@@ -112,7 +112,7 @@ abstract class MessageLiveLocationItem : AbsMessageLocationItem<MessageLiveLocat
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageLocationItem.Holder(STUB_ID) {
-        val locationLiveRunningBanner by bind<LocationLiveRunningBannerView>(R.id.locationLiveRunningBanner)
+        val liveLocationRunningBanner by bind<LiveLocationRunningBannerView>(R.id.liveLocationRunningBanner)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
index a847c24f57..129ae2a17a 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLiveLocationStartItem.kt
@@ -42,8 +42,8 @@ abstract class MessageLiveLocationStartItem :
     override fun getViewStubId() = STUB_ID
 
     class Holder : AbsMessageItem.Holder(STUB_ID) {
-        val bannerImageView by bind<ImageView>(R.id.locationLiveStartBanner)
-        val noLocationMapImageView by bind<ImageView>(R.id.locationLiveStartMap)
+        val bannerImageView by bind<ImageView>(R.id.liveLocationStartBanner)
+        val noLocationMapImageView by bind<ImageView>(R.id.liveLocationStartMap)
     }
 
     companion object {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
index eef649dbc0..1c5cdd2562 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlRetriever.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.home.room.detail.timeline.url
 
-import im.vector.app.BuildConfig
+import im.vector.app.core.resources.BuildMeta
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -27,7 +27,8 @@ import org.matrix.android.sdk.api.session.room.timeline.getLatestEventId
 
 class PreviewUrlRetriever(
         session: Session,
-        private val coroutineScope: CoroutineScope
+        private val coroutineScope: CoroutineScope,
+        private val buildMeta: BuildMeta,
 ) {
     private val mediaService = session.mediaService()
 
@@ -77,7 +78,7 @@ class PreviewUrlRetriever(
                     mediaService.getPreviewUrl(
                             url = urlToRetrieve,
                             timestamp = null,
-                            cacheStrategy = if (BuildConfig.DEBUG) CacheStrategy.NoCache else CacheStrategy.TtlCache(CACHE_VALIDITY, false)
+                            cacheStrategy = if (buildMeta.isDebug) CacheStrategy.NoCache else CacheStrategy.TtlCache(CACHE_VALIDITY, false)
                     )
                 }.fold(
                         {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
index b2187fb365..236cf3fb69 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt
@@ -23,8 +23,8 @@ import androidx.lifecycle.asFlow
 import androidx.lifecycle.liveData
 import androidx.paging.PagedList
 import com.airbnb.mvrx.Async
-import im.vector.app.AppStateHandler
 import im.vector.app.R
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.features.home.RoomListDisplayMode
 import im.vector.app.features.invite.AutoAcceptInvites
@@ -59,7 +59,7 @@ import timber.log.Timber
 class RoomListSectionBuilder(
         private val session: Session,
         private val stringProvider: StringProvider,
-        private val appStateHandler: AppStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
         private val viewModelScope: CoroutineScope,
         private val autoAcceptInvites: AutoAcceptInvites,
         private val onUpdatable: (UpdatableLivePageResult) -> Unit,
@@ -95,7 +95,7 @@ class RoomListSectionBuilder(
             }
         }
 
-        appStateHandler.selectedSpaceFlow
+        spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .onEach { selectedSpaceOption ->
                     val selectedSpace = selectedSpaceOption.orNull()
@@ -150,7 +150,7 @@ class RoomListSectionBuilder(
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
-            it.roomTagQueryFilter = RoomTagQueryFilter(false, false, false)
+            it.roomTagQueryFilter = RoomTagQueryFilter(isFavorite = false, isLowPriority = false, isServerNotice = false)
         }
 
         addSection(
@@ -187,7 +187,7 @@ class RoomListSectionBuilder(
 
         // add suggested rooms
         val suggestedRoomsFlow = // MutableLiveData<List<SpaceChildInfo>>()
-                appStateHandler.selectedSpaceFlow
+                spaceStateHandler.getSelectedSpaceFlow()
                         .distinctUntilChanged()
                         .flatMapLatest { selectedSpaceOption ->
                             val selectedSpace = selectedSpaceOption.orNull()
@@ -271,7 +271,7 @@ class RoomListSectionBuilder(
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-            it.roomTagQueryFilter = RoomTagQueryFilter(false, false, null)
+            it.roomTagQueryFilter = RoomTagQueryFilter(isFavorite = false, isLowPriority = false, isServerNotice = null)
         }
 
         addSection(
@@ -283,7 +283,7 @@ class RoomListSectionBuilder(
         ) {
             it.memberships = listOf(Membership.JOIN)
             it.roomCategoryFilter = RoomCategoryFilter.ONLY_DM
-            it.roomTagQueryFilter = RoomTagQueryFilter(false, true, null)
+            it.roomTagQueryFilter = RoomTagQueryFilter(isFavorite = false, isLowPriority = true, isServerNotice = null)
         }
     }
 
@@ -360,7 +360,7 @@ class RoomListSectionBuilder(
             query: (RoomSummaryQueryParams.Builder) -> Unit
     ) {
         withQueryParams(query) { roomQueryParams ->
-            val updatedQueryParams = roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
+            val updatedQueryParams = roomQueryParams.process(spaceFilterStrategy, spaceStateHandler.getSafeActiveSpaceId())
             val liveQueryParams = MutableStateFlow(updatedQueryParams)
             val itemCountFlow = liveQueryParams
                     .flatMapLatest {
@@ -371,7 +371,7 @@ class RoomListSectionBuilder(
 
             val name = stringProvider.getString(nameRes)
             val filteredPagedRoomSummariesLive = session.roomService().getFilteredPagedRoomSummariesLive(
-                    roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId()),
+                    roomQueryParams.process(spaceFilterStrategy, spaceStateHandler.getSafeActiveSpaceId()),
                     pagedListConfig
             )
             when (spaceFilterStrategy) {
@@ -418,7 +418,7 @@ class RoomListSectionBuilder(
                                             RoomAggregateNotificationCount(it.size, it.size)
                                         } else {
                                             session.roomService().getNotificationCountForRooms(
-                                                    roomQueryParams.process(spaceFilterStrategy, appStateHandler.safeActiveSpaceId())
+                                                    roomQueryParams.process(spaceFilterStrategy, spaceStateHandler.getSafeActiveSpaceId())
                                             )
                                         }
                                 )
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
index 7439ce3508..7dc458cc24 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
@@ -25,7 +25,7 @@ import com.airbnb.mvrx.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
@@ -60,7 +60,7 @@ class RoomListViewModel @AssistedInject constructor(
         @Assisted initialState: RoomListViewState,
         val session: Session,
         stringProvider: StringProvider,
-        appStateHandler: AppStateHandler,
+        spaceStateHandler: SpaceStateHandler,
         vectorPreferences: VectorPreferences,
         autoAcceptInvites: AutoAcceptInvites,
         private val analyticsTracker: AnalyticsTracker
@@ -100,7 +100,7 @@ class RoomListViewModel @AssistedInject constructor(
         observeMembershipChanges()
         observeLocalRooms()
 
-        appStateHandler.selectedSpaceFlow
+        spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .execute {
                     copy(
@@ -146,17 +146,17 @@ class RoomListViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<RoomListViewModel, RoomListViewState> by hiltMavericksViewModelFactory()
 
     private val roomListSectionBuilder = RoomListSectionBuilder(
-            session,
-            stringProvider,
-            appStateHandler,
-            viewModelScope,
-            autoAcceptInvites,
-            {
-                updatableQuery = it
-            },
-            suggestedRoomJoiningState,
-            !vectorPreferences.prefSpacesShowAllRoomInHome()
-    )
+                session,
+                stringProvider,
+                spaceStateHandler,
+                viewModelScope,
+                autoAcceptInvites,
+                {
+                    updatableQuery = it
+                },
+                suggestedRoomJoiningState,
+                !vectorPreferences.prefSpacesShowAllRoomInHome()
+        )
 
     val sections: List<RoomsSection> by lazy {
         roomListSectionBuilder.buildSections(initialState.displayMode)
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
index f0eb027785..02122a5ee1 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
@@ -30,6 +30,7 @@ import com.airbnb.mvrx.withState
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.epoxy.LayoutManagerStateRestorer
+import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.resources.UserPreferencesProvider
@@ -43,6 +44,7 @@ import im.vector.app.features.home.room.list.RoomSummaryPagedController
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsBottomSheet
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedAction
 import im.vector.app.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
+import im.vector.app.features.home.room.list.home.recent.RecentRoomCarouselController
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
@@ -53,7 +55,8 @@ import javax.inject.Inject
 
 class HomeRoomListFragment @Inject constructor(
         private val roomSummaryItemFactory: RoomSummaryItemFactory,
-        private val userPreferencesProvider: UserPreferencesProvider
+        private val userPreferencesProvider: UserPreferencesProvider,
+        private val recentRoomCarouselController: RecentRoomCarouselController
 ) : VectorBaseFragment<FragmentRoomListBinding>(),
         RoomListListener {
 
@@ -180,6 +183,12 @@ class HomeRoomListFragment @Inject constructor(
                     }
                 }.adapter
             }
+            is HomeRoomSection.RecentRoomsData -> recentRoomCarouselController.also { controller ->
+                controller.listener = this
+                data.list.observe(viewLifecycleOwner) { list ->
+                    controller.submitList(list)
+                }
+            }.adapter
         }
     }
 
@@ -192,6 +201,12 @@ class HomeRoomListFragment @Inject constructor(
         )
     }
 
+    override fun onDestroyView() {
+        views.roomListView.cleanup()
+        recentRoomCarouselController.listener = null
+        super.onDestroyView()
+    }
+
     // region RoomListListener
 
     override fun onRoomClicked(room: RoomSummary) {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
index 7b257b1d1c..479e22497f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt
@@ -22,7 +22,7 @@ import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.StateView
@@ -37,6 +37,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
+import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.query.SpaceFilter
 import org.matrix.android.sdk.api.query.toActiveSpaceOrNoFilter
 import org.matrix.android.sdk.api.query.toActiveSpaceOrOrphanRooms
@@ -45,12 +46,13 @@ import org.matrix.android.sdk.api.session.getRoom
 import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.tag.RoomTag
+import org.matrix.android.sdk.api.session.room.roomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.state.isPublic
 
 class HomeRoomListViewModel @AssistedInject constructor(
         @Assisted initialState: HomeRoomListViewState,
         private val session: Session,
-        private val appStateHandler: AppStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
         private val vectorPreferences: VectorPreferences,
 ) : VectorViewModel<HomeRoomListViewState, HomeRoomListAction, HomeRoomListViewEvents>(initialState) {
 
@@ -78,6 +80,7 @@ class HomeRoomListViewModel @AssistedInject constructor(
     private fun configureSections() {
         val newSections = mutableSetOf<HomeRoomSection>()
 
+        newSections.add(getRecentRoomsSection())
         newSections.add(getAllRoomsSection())
 
         viewModelScope.launch {
@@ -89,6 +92,18 @@ class HomeRoomListViewModel @AssistedInject constructor(
         }
     }
 
+    private fun getRecentRoomsSection(): HomeRoomSection {
+        val liveList = session.roomService()
+                .getBreadcrumbsLive(roomSummaryQueryParams {
+                    displayName = QueryStringValue.NoCondition
+                    memberships = listOf(Membership.JOIN)
+                })
+
+        return HomeRoomSection.RecentRoomsData(
+                list = liveList
+        )
+    }
+
     private fun getAllRoomsSection(): HomeRoomSection.RoomSummaryData {
         val builder = RoomSummaryQueryParams.Builder().also {
             it.memberships = listOf(Membership.JOIN)
@@ -99,10 +114,10 @@ class HomeRoomListViewModel @AssistedInject constructor(
                 pagedListConfig
         )
 
-        appStateHandler.selectedSpaceFlow
+        spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .onStart {
-                    emit(appStateHandler.getCurrentSpace().toOption())
+                    emit(spaceStateHandler.getCurrentSpace().toOption())
                 }
                 .onEach { selectedSpaceOption ->
                     val selectedSpace = selectedSpaceOption.orNull()
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt
index 7bfd0a769e..14c76b08bf 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomSection.kt
@@ -24,4 +24,8 @@ sealed class HomeRoomSection {
     data class RoomSummaryData(
             val list: LiveData<PagedList<RoomSummary>>
     ) : HomeRoomSection()
+
+    data class RecentRoomsData(
+            val list: LiveData<List<RoomSummary>>
+    ) : HomeRoomSection()
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
new file mode 100644
index 0000000000..53832bbc74
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomCarouselController.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list.home.recent
+
+import android.content.res.Resources
+import android.util.TypedValue
+import com.airbnb.epoxy.Carousel
+import com.airbnb.epoxy.CarouselModelBuilder
+import com.airbnb.epoxy.EpoxyController
+import com.airbnb.epoxy.EpoxyModel
+import com.airbnb.epoxy.carousel
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.RoomListListener
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class RecentRoomCarouselController @Inject constructor(
+        private val avatarRenderer: AvatarRenderer,
+        private val resources: Resources,
+) : EpoxyController() {
+
+    private var data: List<RoomSummary>? = null
+    var listener: RoomListListener? = null
+
+    private val hPadding = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            16f,
+            resources.displayMetrics
+    ).toInt()
+
+    private val itemSpacing = TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            24f,
+            resources.displayMetrics
+    ).toInt()
+
+    fun submitList(recentList: List<RoomSummary>) {
+        this.data = recentList
+        requestModelBuild()
+    }
+
+    override fun buildModels() {
+        val host = this
+        data?.let { data ->
+            carousel {
+                id("recents_carousel")
+                padding(Carousel.Padding(host.hPadding, host.itemSpacing))
+                withModelsFrom(data) { roomSummary ->
+                    val onClick = host.listener?.let { it::onRoomClicked }
+                    val onLongClick = host.listener?.let { it::onRoomLongClicked }
+
+                    RecentRoomItem_()
+                            .id(roomSummary.roomId)
+                            .avatarRenderer(host.avatarRenderer)
+                            .matrixItem(roomSummary.toMatrixItem())
+                            .unreadNotificationCount(roomSummary.notificationCount)
+                            .showHighlighted(roomSummary.highlightCount > 0)
+                            .itemLongClickListener { _ -> onLongClick?.invoke(roomSummary) ?: false }
+                            .itemClickListener { onClick?.invoke(roomSummary) }
+                }
+            }
+        }
+    }
+}
+
+private inline fun <T> CarouselModelBuilder.withModelsFrom(
+        items: List<T>,
+        modelBuilder: (T) -> EpoxyModel<*>
+) {
+    models(items.map { modelBuilder(it) })
+}
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
new file mode 100644
index 0000000000..6a575a2b6a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/recent/RecentRoomItem.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.home.room.list.home.recent
+
+import android.view.HapticFeedbackConstants
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.airbnb.epoxy.EpoxyAttribute
+import com.airbnb.epoxy.EpoxyModelClass
+import im.vector.app.R
+import im.vector.app.core.epoxy.ClickListener
+import im.vector.app.core.epoxy.VectorEpoxyHolder
+import im.vector.app.core.epoxy.VectorEpoxyModel
+import im.vector.app.core.epoxy.onClick
+import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.home.AvatarRenderer
+import im.vector.app.features.home.room.list.UnreadCounterBadgeView
+import org.matrix.android.sdk.api.util.MatrixItem
+
+@EpoxyModelClass
+abstract class RecentRoomItem : VectorEpoxyModel<RecentRoomItem.Holder>(R.layout.item_recent_room) {
+
+    @EpoxyAttribute lateinit var avatarRenderer: AvatarRenderer
+    @EpoxyAttribute lateinit var matrixItem: MatrixItem
+    @EpoxyAttribute var unreadNotificationCount: Int = 0
+    @EpoxyAttribute var showHighlighted: Boolean = false
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemLongClickListener: View.OnLongClickListener? = null
+
+    @EpoxyAttribute(EpoxyAttribute.Option.DoNotHash)
+    var itemClickListener: ClickListener? = null
+
+    override fun bind(holder: Holder) {
+        super.bind(holder)
+
+        holder.rootView.onClick(itemClickListener)
+        holder.rootView.setOnLongClickListener {
+            it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+            itemLongClickListener?.onLongClick(it) ?: false
+        }
+
+        avatarRenderer.render(matrixItem, holder.avatarImageView)
+        holder.avatarImageView.contentDescription = matrixItem.getBestName()
+        holder.unreadCounterBadgeView.render(UnreadCounterBadgeView.State(unreadNotificationCount, showHighlighted))
+        holder.title.text = matrixItem.getBestName()
+    }
+
+    override fun unbind(holder: Holder) {
+        holder.rootView.setOnClickListener(null)
+        holder.rootView.setOnLongClickListener(null)
+        avatarRenderer.clear(holder.avatarImageView)
+        super.unbind(holder)
+    }
+
+    class Holder : VectorEpoxyHolder() {
+        val unreadCounterBadgeView by bind<UnreadCounterBadgeView>(R.id.recentUnreadCounterBadgeView)
+        val avatarImageView by bind<ImageView>(R.id.recentImageView)
+        val title by bind<TextView>(R.id.recentTitle)
+        val rootView by bind<ViewGroup>(R.id.recentRoot)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/Config.kt b/vector/src/main/java/im/vector/app/features/location/Config.kt
index c29e2e911a..b65b5517d1 100644
--- a/vector/src/main/java/im/vector/app/features/location/Config.kt
+++ b/vector/src/main/java/im/vector/app/features/location/Config.kt
@@ -22,5 +22,3 @@ const val DEFAULT_PIN_ID = "DEFAULT_PIN_ID"
 
 const val INITIAL_MAP_ZOOM_IN_PREVIEW = 15.0
 const val INITIAL_MAP_ZOOM_IN_TIMELINE = 17.0
-const val MIN_TIME_TO_UPDATE_LOCATION_MILLIS = 2 * 1_000L // every 2 seconds
-const val MIN_DISTANCE_TO_UPDATE_LOCATION_METERS = 10f
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
index 264b1f0e0b..5a1edbf8a1 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt
@@ -25,4 +25,5 @@ sealed class LocationSharingAction : VectorViewModelAction {
     object ZoomToUserLocation : LocationSharingAction()
     object LiveLocationSharingRequested : LocationSharingAction()
     data class StartLiveLocationSharing(val durationMillis: Long) : LocationSharingAction()
+    object ShowMapLoadingError : LocationSharingAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
index 169af4a5a2..9eddcad649 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt
@@ -23,6 +23,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityLocationSharingBinding
+import im.vector.app.features.location.preview.LocationPreviewFragment
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingConfig.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingConfig.kt
new file mode 100644
index 0000000000..4615564e41
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingConfig.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location
+
+data class LocationSharingConfig(
+        val mapTilerKey: String,
+)
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index 17e53e63d1..d96410010e 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -24,6 +24,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
@@ -42,6 +43,7 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.location.live.LiveLocationLabsFlagPromotionBottomSheet
 import im.vector.app.features.location.live.duration.ChooseLiveDurationBottomSheet
+import im.vector.app.features.location.live.tracking.LocationSharingAndroidService
 import im.vector.app.features.location.option.LocationSharingOption
 import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.util.MatrixItem
@@ -68,6 +70,7 @@ class LocationSharingFragment @Inject constructor(
     private var mapView: WeakReference<MapView>? = null
 
     private var hasRenderedUserAvatar = false
+    private var mapLoadingErrorListener: MapView.OnDidFailLoadingMapListener? = null
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationSharingBinding {
         return FragmentLocationSharingBinding.inflate(inflater, container, false)
@@ -86,6 +89,9 @@ class LocationSharingFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
 
         mapView = WeakReference(views.mapView)
+        mapLoadingErrorListener = MapView.OnDidFailLoadingMapListener {
+            viewModel.handle(LocationSharingAction.ShowMapLoadingError)
+        }.also { views.mapView.addOnDidFailLoadingMapListener(it) }
         views.mapView.onCreate(savedInstanceState)
 
         lifecycleScope.launchWhenCreated {
@@ -111,6 +117,12 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
+    override fun onDestroyView() {
+        mapLoadingErrorListener?.let { mapView?.get()?.removeOnDidFailLoadingMapListener(it) }
+        mapLoadingErrorListener = null
+        super.onDestroyView()
+    }
+
     override fun onResume() {
         super.onResume()
         views.mapView.onResume()
@@ -255,20 +267,27 @@ class LocationSharingFragment @Inject constructor(
     }
 
     private fun updateMap(state: LocationSharingViewState) {
-        // first, update the options view
-        val options: Set<LocationSharingOption> = when (state.areTargetAndUserLocationEqual) {
-            true -> setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE)
-            false -> setOf(LocationSharingOption.PINNED)
-            else -> emptySet()
-        }
-        views.shareLocationOptionsPicker.render(options)
-
-        // then, update the map using the height of the options view after it has been rendered
-        views.shareLocationOptionsPicker.post {
-            val mapState = state
-                    .toMapState()
-                    .copy(logoMarginBottom = views.shareLocationOptionsPicker.height)
-            views.mapView.render(mapState)
+        if (state.loadingMapHasFailed) {
+            views.shareLocationOptionsPicker.render(emptySet())
+            views.shareLocationMapLoadingError.isVisible = true
+        } else {
+            // first, update the options view
+            val options: Set<LocationSharingOption> = when (state.areTargetAndUserLocationEqual) {
+                true -> setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE)
+                false -> setOf(LocationSharingOption.PINNED)
+                else -> emptySet()
+            }
+            views.shareLocationOptionsPicker.render(options)
+
+            // then, update the map using the height of the options view after it has been rendered
+            views.shareLocationOptionsPicker.post {
+                val mapState = state
+                        .toMapState()
+                        .copy(logoMarginBottom = views.shareLocationOptionsPicker.height)
+                views.mapView.render(mapState)
+            }
+
+            views.shareLocationMapLoadingError.isGone = true
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index 8056b72d57..28e37a38eb 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -152,6 +152,7 @@ class LocationSharingViewModel @AssistedInject constructor(
             LocationSharingAction.ZoomToUserLocation -> handleZoomToUserLocationAction()
             LocationSharingAction.LiveLocationSharingRequested -> handleLiveLocationSharingRequestedAction()
             is LocationSharingAction.StartLiveLocationSharing -> handleStartLiveLocationSharingAction(action.durationMillis)
+            LocationSharingAction.ShowMapLoadingError -> handleShowMapLoadingError()
         }
     }
 
@@ -211,6 +212,10 @@ class LocationSharingViewModel @AssistedInject constructor(
         )
     }
 
+    private fun handleShowMapLoadingError() {
+        setState { copy(loadingMapHasFailed = true) }
+    }
+
     private fun onLocationUpdate(locationData: LocationData) {
         Timber.d("onLocationUpdate()")
         setState {
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
index d5226eacfb..c7a2349afa 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt
@@ -36,6 +36,7 @@ data class LocationSharingViewState(
         val lastKnownUserLocation: LocationData? = null,
         val locationTargetDrawable: Drawable? = null,
         val canShareLiveLocation: Boolean = false,
+        val loadingMapHasFailed: Boolean = false
 ) : MavericksState {
 
     constructor(locationSharingArgs: LocationSharingArgs) : this(
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt b/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt
index aa05fe764b..c617277f3f 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationTracker.kt
@@ -24,8 +24,8 @@ import androidx.annotation.RequiresPermission
 import androidx.annotation.VisibleForTesting
 import androidx.core.content.getSystemService
 import androidx.core.location.LocationListenerCompat
-import im.vector.app.BuildConfig
 import im.vector.app.core.di.ActiveSessionHolder
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -36,11 +36,16 @@ import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
+import kotlin.time.Duration.Companion.seconds
+
+@VisibleForTesting
+const val MIN_DISTANCE_TO_UPDATE_LOCATION_METERS = 10f
 
 @Singleton
 class LocationTracker @Inject constructor(
         context: Context,
-        private val activeSessionHolder: ActiveSessionHolder
+        private val activeSessionHolder: ActiveSessionHolder,
+        private val buildMeta: BuildMeta,
 ) : LocationListenerCompat {
 
     private val locationManager = context.getSystemService<LocationManager>()
@@ -61,14 +66,25 @@ class LocationTracker @Inject constructor(
     @VisibleForTesting
     var hasLocationFromGPSProvider = false
 
+    private var firstLocationHandled = false
     private val _locations = MutableSharedFlow<Location>(replay = 1)
 
+    @VisibleForTesting
+    val minDurationToUpdateLocationMillis = 5.seconds.inWholeMilliseconds
+
     /**
      * SharedFlow to collect location updates.
      */
     val locations = _locations.asSharedFlow()
             .onEach { Timber.d("new location emitted") }
-            .debounce(MIN_TIME_TO_UPDATE_LOCATION_MILLIS)
+            .debounce {
+                if (firstLocationHandled) {
+                    minDurationToUpdateLocationMillis
+                } else {
+                    firstLocationHandled = true
+                    0
+                }
+            }
             .onEach { Timber.d("new location emitted after debounce") }
             .map { it.toLocationData() }
 
@@ -95,7 +111,7 @@ class LocationTracker @Inject constructor(
 
                         locationManager.requestLocationUpdates(
                                 provider,
-                                MIN_TIME_TO_UPDATE_LOCATION_MILLIS,
+                                minDurationToUpdateLocationMillis,
                                 MIN_DISTANCE_TO_UPDATE_LOCATION_METERS,
                                 this
                         )
@@ -104,7 +120,7 @@ class LocationTracker @Inject constructor(
                     }
                     .maxByOrNull { location -> location.time }
                     ?.let { latestKnownLocation ->
-                        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+                        if (buildMeta.lowPrivacyLoggingEnabled) {
                             Timber.d("lastKnownLocation: $latestKnownLocation")
                         } else {
                             Timber.d("lastKnownLocation: ${latestKnownLocation.provider}")
@@ -162,7 +178,7 @@ class LocationTracker @Inject constructor(
     }
 
     override fun onLocationChanged(location: Location) {
-        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+        if (buildMeta.lowPrivacyLoggingEnabled) {
             Timber.d("onLocationChanged: $location")
         } else {
             Timber.d("onLocationChanged: ${location.provider}")
@@ -196,7 +212,7 @@ class LocationTracker @Inject constructor(
 
     private fun notifyLocation(location: Location) {
         activeSessionHolder.getSafeActiveSession()?.coroutineScope?.launch {
-            if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+            if (buildMeta.lowPrivacyLoggingEnabled) {
                 Timber.d("notify location: $location")
             } else {
                 Timber.d("notify location: ${location.provider}")
diff --git a/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorView.kt b/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorView.kt
new file mode 100644
index 0000000000..8ea4fcac54
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorView.kt
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.drawable.ColorDrawable
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.res.use
+import im.vector.app.R
+import im.vector.app.core.glide.GlideApp
+import im.vector.app.databinding.ViewMapLoadingErrorBinding
+import im.vector.app.features.themes.ThemeUtils
+
+/**
+ * Custom view to display an error when map fails to load.
+ */
+class MapLoadingErrorView @JvmOverloads constructor(
+        context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewMapLoadingErrorBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+
+    init {
+        context.obtainStyledAttributes(
+                attrs,
+                R.styleable.MapLoadingErrorView,
+                0,
+                0
+        ).use {
+            setErrorDescription(it)
+        }
+    }
+
+    private fun setErrorDescription(typedArray: TypedArray) {
+        val description = typedArray.getString(R.styleable.MapLoadingErrorView_mapErrorDescription)
+        if (description.isNullOrEmpty()) {
+            binding.mapLoadingErrorDescription.setText(R.string.location_share_loading_map_error)
+        } else {
+            binding.mapLoadingErrorDescription.text = description
+        }
+    }
+
+    fun render(mapLoadingErrorViewState: MapLoadingErrorViewState) {
+        GlideApp.with(binding.mapLoadingErrorBackground)
+                .load(ColorDrawable(ThemeUtils.getColor(context, R.attr.vctr_system)))
+                .transform(mapLoadingErrorViewState.backgroundTransformation)
+                .into(binding.mapLoadingErrorBackground)
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorViewState.kt b/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorViewState.kt
new file mode 100644
index 0000000000..8098d26a12
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/MapLoadingErrorViewState.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location
+
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
+
+data class MapLoadingErrorViewState(val backgroundTransformation: BitmapTransformation)
diff --git a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
index 491386ba64..b001621bf4 100644
--- a/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/MapTilerMapView.kt
@@ -23,6 +23,7 @@ import android.view.Gravity
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
+import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.marginBottom
 import androidx.core.view.marginTop
 import androidx.core.view.updateLayoutParams
@@ -76,6 +77,12 @@ class MapTilerMapView @JvmOverloads constructor(
         showLocationButton = typedArray.getBoolean(R.styleable.MapTilerMapView_showLocateButton, false)
     }
 
+    override fun onDestroy() {
+        mapRefs?.symbolManager?.onDestroy()
+        mapRefs = null
+        super.onDestroy()
+    }
+
     /**
      * For location fragments.
      */
@@ -162,7 +169,7 @@ class MapTilerMapView @JvmOverloads constructor(
         pinDrawable?.let { drawable ->
             if (!safeMapRefs.style.isFullyLoaded ||
                     safeMapRefs.style.getImage(state.pinId) == null) {
-                safeMapRefs.style.addImage(state.pinId, drawable)
+                safeMapRefs.style.addImage(state.pinId, drawable.toBitmap())
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
index f043006d70..3748b1b19e 100644
--- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.location
 
-import im.vector.app.BuildConfig
 import im.vector.app.features.raw.wellknown.getElementWellknown
 import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.raw.RawService
@@ -25,9 +24,10 @@ import javax.inject.Inject
 
 class UrlMapProvider @Inject constructor(
         private val session: Session,
-        private val rawService: RawService
+        private val rawService: RawService,
+        locationSharingConfig: LocationSharingConfig,
 ) {
-    private val keyParam = "?key=${BuildConfig.mapTilerKey}"
+    private val keyParam = "?key=${locationSharingConfig.mapTilerKey}"
 
     private val fallbackMapUrl = buildString {
         append(MAP_BASE_URL)
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationEndedBannerView.kt
similarity index 75%
rename from vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
rename to vector/src/main/java/im/vector/app/features/location/live/LiveLocationEndedBannerView.kt
index 82fa17a625..29037a710a 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveEndedBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationEndedBannerView.kt
@@ -24,17 +24,17 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.res.use
 import androidx.core.view.updateLayoutParams
 import im.vector.app.R
-import im.vector.app.databinding.ViewLocationLiveEndedBannerBinding
+import im.vector.app.databinding.ViewLiveLocationEndedBannerBinding
 
 private const val BACKGROUND_ALPHA = 0.75f
 
-class LocationLiveEndedBannerView @JvmOverloads constructor(
+class LiveLocationEndedBannerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private val binding = ViewLocationLiveEndedBannerBinding.inflate(
+    private val binding = ViewLiveLocationEndedBannerBinding.inflate(
             LayoutInflater.from(context),
             this
     )
@@ -42,7 +42,7 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
     init {
         context.obtainStyledAttributes(
                 attrs,
-                R.styleable.LocationLiveEndedBannerView,
+                R.styleable.LiveLocationEndedBannerView,
                 0,
                 0
         ).use {
@@ -52,13 +52,13 @@ class LocationLiveEndedBannerView @JvmOverloads constructor(
     }
 
     private fun setBackgroundAlpha(typedArray: TypedArray) {
-        val withAlpha = typedArray.getBoolean(R.styleable.LocationLiveEndedBannerView_locLiveEndedBkgWithAlpha, false)
-        binding.locationLiveEndedBannerBackground.alpha = if (withAlpha) BACKGROUND_ALPHA else 1f
+        val withAlpha = typedArray.getBoolean(R.styleable.LiveLocationEndedBannerView_locLiveEndedBkgWithAlpha, false)
+        binding.liveLocationEndedBannerBackground.alpha = if (withAlpha) BACKGROUND_ALPHA else 1f
     }
 
     private fun setIconMarginStart(typedArray: TypedArray) {
-        val margin = typedArray.getDimensionPixelOffset(R.styleable.LocationLiveEndedBannerView_locLiveEndedIconMarginStart, 0)
-        binding.locationLiveEndedBannerIcon.updateLayoutParams<MarginLayoutParams> {
+        val margin = typedArray.getDimensionPixelOffset(R.styleable.LiveLocationEndedBannerView_locLiveEndedIconMarginStart, 0)
+        binding.liveLocationEndedBannerIcon.updateLayoutParams<MarginLayoutParams> {
             marginStart = margin
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerViewState.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationMessageBannerViewState.kt
similarity index 87%
rename from vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerViewState.kt
rename to vector/src/main/java/im/vector/app/features/location/live/LiveLocationMessageBannerViewState.kt
index 976085386b..d67265bfa4 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveMessageBannerViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationMessageBannerViewState.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.features.location.live
 
-sealed class LocationLiveMessageBannerViewState(
+sealed class LiveLocationMessageBannerViewState(
         open val bottomStartCornerRadiusInDp: Float,
         open val bottomEndCornerRadiusInDp: Float,
 ) {
@@ -26,11 +26,11 @@ sealed class LocationLiveMessageBannerViewState(
             override val bottomEndCornerRadiusInDp: Float,
             val remainingTimeInMillis: Long,
             val isStopButtonCenteredVertically: Boolean
-    ) : LocationLiveMessageBannerViewState(bottomStartCornerRadiusInDp, bottomEndCornerRadiusInDp)
+    ) : LiveLocationMessageBannerViewState(bottomStartCornerRadiusInDp, bottomEndCornerRadiusInDp)
 
     data class Watcher(
             override val bottomStartCornerRadiusInDp: Float,
             override val bottomEndCornerRadiusInDp: Float,
             val formattedLocalTimeOfEndOfLive: String,
-    ) : LocationLiveMessageBannerViewState(bottomStartCornerRadiusInDp, bottomEndCornerRadiusInDp)
+    ) : LiveLocationMessageBannerViewState(bottomStartCornerRadiusInDp, bottomEndCornerRadiusInDp)
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationRunningBannerView.kt
similarity index 79%
rename from vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
rename to vector/src/main/java/im/vector/app/features/location/live/LiveLocationRunningBannerView.kt
index 4ca8475da1..0872250abb 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveRunningBannerView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationRunningBannerView.kt
@@ -31,51 +31,51 @@ import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners
 import im.vector.app.R
 import im.vector.app.core.glide.GlideApp
 import im.vector.app.core.utils.TextUtils
-import im.vector.app.databinding.ViewLocationLiveRunningBannerBinding
+import im.vector.app.databinding.ViewLiveLocationRunningBannerBinding
 import im.vector.app.features.themes.ThemeUtils
 import org.threeten.bp.Duration
 
 private const val REMAINING_TIME_COUNTER_INTERVAL_IN_MS = 1000L
 
-class LocationLiveRunningBannerView @JvmOverloads constructor(
+class LiveLocationRunningBannerView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private val binding = ViewLocationLiveRunningBannerBinding.inflate(
+    private val binding = ViewLiveLocationRunningBannerBinding.inflate(
             LayoutInflater.from(context),
             this
     )
 
     val stopButton: Button
-        get() = binding.locationLiveRunningBannerStop
+        get() = binding.liveLocationRunningBannerStop
 
     private val background: ImageView
-        get() = binding.locationLiveRunningBannerBackground
+        get() = binding.liveLocationRunningBannerBackground
 
     private val title: TextView
-        get() = binding.locationLiveRunningBannerTitle
+        get() = binding.liveLocationRunningBannerTitle
 
     private val subTitle: TextView
-        get() = binding.locationLiveRunningBannerSubTitle
+        get() = binding.liveLocationRunningBannerSubTitle
 
     private var countDownTimer: CountDownTimer? = null
 
-    fun render(viewState: LocationLiveMessageBannerViewState) {
+    fun render(viewState: LiveLocationMessageBannerViewState) {
         when (viewState) {
-            is LocationLiveMessageBannerViewState.Emitter -> renderEmitter(viewState)
-            is LocationLiveMessageBannerViewState.Watcher -> renderWatcher(viewState)
+            is LiveLocationMessageBannerViewState.Emitter -> renderEmitter(viewState)
+            is LiveLocationMessageBannerViewState.Watcher -> renderWatcher(viewState)
         }
 
         GlideApp.with(context)
                 .load(ColorDrawable(ThemeUtils.getColor(context, android.R.attr.colorBackground)))
-                .placeholder(binding.locationLiveRunningBannerBackground.drawable)
+                .placeholder(binding.liveLocationRunningBannerBackground.drawable)
                 .transform(GranularRoundedCorners(0f, 0f, viewState.bottomEndCornerRadiusInDp, viewState.bottomStartCornerRadiusInDp))
                 .into(background)
     }
 
-    private fun renderEmitter(viewState: LocationLiveMessageBannerViewState.Emitter) {
+    private fun renderEmitter(viewState: LiveLocationMessageBannerViewState.Emitter) {
         stopButton.isVisible = true
         title.text = context.getString(R.string.location_share_live_enabled)
 
@@ -109,23 +109,28 @@ class LocationLiveRunningBannerView @JvmOverloads constructor(
 
             if (viewState.isStopButtonCenteredVertically) {
                 constraintSet.connect(
-                        R.id.locationLiveRunningBannerStop,
+                        R.id.liveLocationRunningBannerStop,
                         ConstraintSet.BOTTOM,
-                        R.id.locationLiveRunningBannerBackground,
+                        R.id.liveLocationRunningBannerBackground,
                         ConstraintSet.BOTTOM,
                         0
                 )
             } else {
-                constraintSet.clear(R.id.locationLiveRunningBannerStop, ConstraintSet.BOTTOM)
+                constraintSet.clear(R.id.liveLocationRunningBannerStop, ConstraintSet.BOTTOM)
             }
 
             constraintSet.applyTo(parentLayout)
         }
     }
 
-    private fun renderWatcher(viewState: LocationLiveMessageBannerViewState.Watcher) {
+    private fun renderWatcher(viewState: LiveLocationMessageBannerViewState.Watcher) {
         stopButton.isVisible = false
         title.text = context.getString(R.string.location_share_live_view)
         subTitle.text = context.getString(R.string.location_share_live_until, viewState.formattedLocalTimeOfEndOfLive)
     }
+
+    override fun onDetachedFromWindow() {
+        countDownTimer?.cancel()
+        super.onDetachedFromWindow()
+    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationStatusView.kt
similarity index 82%
rename from vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt
rename to vector/src/main/java/im/vector/app/features/location/live/LiveLocationStatusView.kt
index a4c58c9e5b..fe80434835 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationStatusView.kt
@@ -21,19 +21,19 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.Button
 import androidx.constraintlayout.widget.ConstraintLayout
-import im.vector.app.databinding.ViewLocationLiveStatusBinding
+import im.vector.app.databinding.ViewLiveLocationStatusBinding
 
-class LocationLiveStatusView @JvmOverloads constructor(
+class LiveLocationStatusView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    private val binding = ViewLocationLiveStatusBinding.inflate(
+    private val binding = ViewLiveLocationStatusBinding.inflate(
             LayoutInflater.from(context),
             this
     )
 
     val stopButton: Button
-        get() = binding.locationLiveStatusStop
+        get() = binding.liveLocationStatusStop
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
index e8a6b22b7e..0616ea84d9 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationBottomSheetController.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.location.live.map
 
-import android.content.Context
 import com.airbnb.epoxy.EpoxyController
 import im.vector.app.R
 import im.vector.app.core.date.DateFormatKind
@@ -33,7 +32,6 @@ class LiveLocationBottomSheetController @Inject constructor(
         private val vectorDateFormatter: VectorDateFormatter,
         private val stringProvider: StringProvider,
         private val clock: Clock,
-        private val context: Context,
 ) : EpoxyController() {
 
     interface Callback {
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapAction.kt
similarity index 75%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapAction.kt
index b88fffc733..295d6b5d41 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapAction.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapAction.kt
@@ -18,8 +18,9 @@ package im.vector.app.features.location.live.map
 
 import im.vector.app.core.platform.VectorViewModelAction
 
-sealed class LocationLiveMapAction : VectorViewModelAction {
-    data class AddMapSymbol(val key: String, val value: Long) : LocationLiveMapAction()
-    data class RemoveMapSymbol(val key: String) : LocationLiveMapAction()
-    object StopSharing : LocationLiveMapAction()
+sealed class LiveLocationMapAction : VectorViewModelAction {
+    data class AddMapSymbol(val key: String, val value: Long) : LiveLocationMapAction()
+    data class RemoveMapSymbol(val key: String) : LiveLocationMapAction()
+    object StopSharing : LiveLocationMapAction()
+    object ShowMapLoadingError : LiveLocationMapAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapMarkerOptionsDialog.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapMarkerOptionsDialog.kt
similarity index 97%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapMarkerOptionsDialog.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapMarkerOptionsDialog.kt
index 5f9d4a4db5..9fa82d56e6 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapMarkerOptionsDialog.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapMarkerOptionsDialog.kt
@@ -23,7 +23,7 @@ import android.widget.PopupWindow
 import im.vector.app.R
 import im.vector.app.databinding.ViewLiveLocationMarkerPopupBinding
 
-class LocationLiveMapMarkerOptionsDialog(
+class LiveLocationMapMarkerOptionsDialog(
         context: Context,
 ) : PopupWindow() {
 
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
similarity index 64%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
index c0f07dba57..149e80d81a 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewActivity.kt
@@ -24,20 +24,21 @@ import im.vector.app.R
 import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivityLocationSharingBinding
+import im.vector.app.features.MainActivity
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-data class LocationLiveMapViewArgs(
+data class LiveLocationMapViewArgs(
         val roomId: String
 ) : Parcelable
 
 @AndroidEntryPoint
-class LocationLiveMapViewActivity : VectorBaseActivity<ActivityLocationSharingBinding>() {
+class LiveLocationMapViewActivity : VectorBaseActivity<ActivityLocationSharingBinding>() {
 
     override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
 
     override fun initUiAndData() {
-        val mapViewArgs: LocationLiveMapViewArgs? = intent?.extras?.getParcelable(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS)
+        val mapViewArgs: LiveLocationMapViewArgs? = intent?.extras?.getParcelable(EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS)
         if (mapViewArgs == null) {
             finish()
             return
@@ -49,7 +50,7 @@ class LocationLiveMapViewActivity : VectorBaseActivity<ActivityLocationSharingBi
         if (isFirstCreation()) {
             addFragment(
                     views.fragmentContainer,
-                    LocationLiveMapViewFragment::class.java,
+                    LiveLocationMapViewFragment::class.java,
                     mapViewArgs
             )
         }
@@ -57,11 +58,16 @@ class LocationLiveMapViewActivity : VectorBaseActivity<ActivityLocationSharingBi
 
     companion object {
 
-        private const val EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS = "EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS"
+        private const val EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS = "EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS"
 
-        fun getIntent(context: Context, locationLiveMapViewArgs: LocationLiveMapViewArgs): Intent {
-            return Intent(context, LocationLiveMapViewActivity::class.java).apply {
-                putExtra(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS, locationLiveMapViewArgs)
+        fun getIntent(context: Context, liveLocationMapViewArgs: LiveLocationMapViewArgs, firstStartMainActivity: Boolean = false): Intent {
+            val intent = Intent(context, LiveLocationMapViewActivity::class.java).apply {
+                putExtra(EXTRA_LIVE_LOCATION_MAP_VIEW_ARGS, liveLocationMapViewArgs)
+            }
+            return if (firstStartMainActivity) {
+                MainActivity.getIntentWithNextIntent(context, intent)
+            } else {
+                intent
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewEvents.kt
similarity index 84%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewEvents.kt
index 23771299c8..2c4f34dce0 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewEvents.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewEvents.kt
@@ -18,6 +18,6 @@ package im.vector.app.features.location.live.map
 
 import im.vector.app.core.platform.VectorViewEvents
 
-sealed interface LocationLiveMapViewEvents : VectorViewEvents {
-    data class Error(val error: Throwable) : LocationLiveMapViewEvents
+sealed interface LiveLocationMapViewEvents : VectorViewEvents {
+    data class Error(val error: Throwable) : LiveLocationMapViewEvents
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
similarity index 84%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
index 3aacd70f0e..85095e7c9f 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
@@ -35,6 +35,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap
 import com.mapbox.mapboxsdk.maps.MapboxMapOptions
 import com.mapbox.mapboxsdk.maps.Style
 import com.mapbox.mapboxsdk.maps.SupportMapFragment
+import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolClickListener
 import com.mapbox.mapboxsdk.plugins.annotation.Symbol
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager
 import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions
@@ -42,11 +43,12 @@ import com.mapbox.mapboxsdk.style.layers.Property
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.extensions.addChildFragment
+import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.core.utils.DimensionConverter
 import im.vector.app.core.utils.openLocation
-import im.vector.app.databinding.FragmentLocationLiveMapViewBinding
+import im.vector.app.databinding.FragmentLiveLocationMapViewBinding
 import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.UrlMapProvider
 import im.vector.app.features.location.zoomToBounds
@@ -60,27 +62,31 @@ import javax.inject.Inject
  * Screen showing a map with all the current users sharing their live location in a room.
  */
 @AndroidEntryPoint
-class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<FragmentLocationLiveMapViewBinding>() {
+class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<FragmentLiveLocationMapViewBinding>() {
 
     @Inject lateinit var urlMapProvider: UrlMapProvider
     @Inject lateinit var bottomSheetController: LiveLocationBottomSheetController
     @Inject lateinit var dimensionConverter: DimensionConverter
 
-    private val viewModel: LocationLiveMapViewModel by fragmentViewModel()
+    private val viewModel: LiveLocationMapViewModel by fragmentViewModel()
 
     private var mapboxMap: WeakReference<MapboxMap>? = null
+    private var mapView: MapView? = null
     private var symbolManager: SymbolManager? = null
     private var mapStyle: Style? = null
     private val pendingLiveLocations = mutableListOf<UserLiveLocationViewState>()
     private var isMapFirstUpdate = true
+    private var onSymbolClickListener: OnSymbolClickListener? = null
+    private var mapLoadingErrorListener: MapView.OnDidFailLoadingMapListener? = null
 
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationLiveMapViewBinding {
-        return FragmentLocationLiveMapViewBinding.inflate(layoutInflater, container, false)
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLiveLocationMapViewBinding {
+        return FragmentLiveLocationMapViewBinding.inflate(layoutInflater, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         observeViewEvents()
+        setupMap()
 
         views.liveLocationBottomSheetRecyclerView.configureWith(bottomSheetController, hasFixedSize = false, disableItemAnimation = true)
 
@@ -90,7 +96,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
             }
 
             override fun onStopLocationClicked() {
-                viewModel.handle(LocationLiveMapAction.StopSharing)
+                viewModel.handle(LiveLocationMapAction.StopSharing)
             }
         }
     }
@@ -98,29 +104,39 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
     private fun observeViewEvents() {
         viewModel.observeViewEvents { viewEvent ->
             when (viewEvent) {
-                is LocationLiveMapViewEvents.Error -> displayErrorDialog(viewEvent.error)
+                is LiveLocationMapViewEvents.Error -> displayErrorDialog(viewEvent.error)
             }
         }
     }
 
-    override fun onResume() {
-        super.onResume()
-        setupMap()
+    override fun onDestroyView() {
+        onSymbolClickListener?.let { symbolManager?.removeClickListener(it) }
+        symbolManager?.onDestroy()
+        bottomSheetController.callback = null
+        views.liveLocationBottomSheetRecyclerView.cleanup()
+        mapLoadingErrorListener?.let { mapView?.removeOnDidFailLoadingMapListener(it) }
+        mapLoadingErrorListener = null
+        mapView = null
+        super.onDestroyView()
     }
 
     private fun setupMap() {
         val mapFragment = getOrCreateSupportMapFragment()
         mapFragment.getMapAsync { mapboxMap ->
+            (mapFragment.view as? MapView)?.let {
+                mapView = it
+                listenMapLoadingError(it)
+            }
             lifecycleScope.launch {
                 mapboxMap.setStyle(urlMapProvider.getMapUrl()) { style ->
                     mapStyle = style
-                    this@LocationLiveMapViewFragment.mapboxMap = WeakReference(mapboxMap)
+                    this@LiveLocationMapViewFragment.mapboxMap = WeakReference(mapboxMap)
                     symbolManager = SymbolManager(mapFragment.view as MapView, mapboxMap, style).apply {
                         iconAllowOverlap = true
-                        addClickListener {
+                        onSymbolClickListener = OnSymbolClickListener {
                             onSymbolClicked(it)
                             true
-                        }
+                        }.also { addClickListener(it) }
                     }
                     pendingLiveLocations
                             .takeUnless { it.isEmpty() }
@@ -130,15 +146,21 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
         }
     }
 
+    private fun listenMapLoadingError(mapView: MapView) {
+        mapLoadingErrorListener = MapView.OnDidFailLoadingMapListener {
+            viewModel.handle(LiveLocationMapAction.ShowMapLoadingError)
+        }.also { mapView.addOnDidFailLoadingMapListener(it) }
+    }
+
     private fun onSymbolClicked(symbol: Symbol?) {
         symbol?.let {
             mapboxMap
                     ?.get()
                     ?.zoomToLocation(LocationData(it.latLng.latitude, it.latLng.longitude, null), preserveCurrentZoomLevel = false)
 
-            LocationLiveMapMarkerOptionsDialog(requireContext())
+            LiveLocationMapMarkerOptionsDialog(requireContext())
                     .apply {
-                        callback = object : LocationLiveMapMarkerOptionsDialog.Callback {
+                        callback = object : LiveLocationMapMarkerOptionsDialog.Callback {
                             override fun onShareLocationClicked() {
                                 shareLocation(symbol)
                                 dismiss()
@@ -162,7 +184,12 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
                     }
 
     override fun invalidate() = withState(viewModel) { viewState ->
-        updateMap(viewState.userLocations)
+        if (viewState.loadingMapHasFailed) {
+            views.mapPreviewLoadingError.isVisible = true
+        } else {
+            views.mapPreviewLoadingError.isGone = true
+            updateMap(viewState.userLocations)
+        }
         updateUserListBottomSheet(viewState.userLocations)
     }
 
@@ -238,7 +265,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
         addUserPinToMapStyle(userLocation.matrixItem.id, userLocation.pinDrawable)
         val symbolOptions = buildSymbolOptions(userLocation)
         val symbol = symbolManager.create(symbolOptions)
-        viewModel.handle(LocationLiveMapAction.AddMapSymbol(userLocation.matrixItem.id, symbol.id))
+        viewModel.handle(LiveLocationMapAction.AddMapSymbol(userLocation.matrixItem.id, symbol.id))
     }
 
     private fun updateSymbol(symbolId: Long, userLocation: UserLiveLocationViewState, symbolManager: SymbolManager) {
@@ -254,7 +281,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
         val userIdsToRemove = state.mapSymbolIds.keys.subtract(userLiveLocations.map { it.matrixItem.id }.toSet())
         userIdsToRemove.forEach { userId ->
             removeUserPinFromMapStyle(userId)
-            viewModel.handle(LocationLiveMapAction.RemoveMapSymbol(userId))
+            viewModel.handle(LiveLocationMapAction.RemoveMapSymbol(userId))
 
             state.mapSymbolIds[userId]?.let { symbolId ->
                 Timber.d("trying to delete symbol with id: $symbolId")
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewModel.kt
similarity index 68%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewModel.kt
index 44d39862f9..33c584ff85 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewModel.kt
@@ -23,26 +23,26 @@ import dagger.assisted.AssistedInject
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.features.location.LocationSharingServiceConnection
 import im.vector.app.features.location.live.StopLiveLocationShareUseCase
+import im.vector.app.features.location.live.tracking.LocationSharingServiceConnection
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.session.room.location.UpdateLiveLocationShareResult
 
-class LocationLiveMapViewModel @AssistedInject constructor(
-        @Assisted private val initialState: LocationLiveMapViewState,
+class LiveLocationMapViewModel @AssistedInject constructor(
+        @Assisted private val initialState: LiveLocationMapViewState,
         getListOfUserLiveLocationUseCase: GetListOfUserLiveLocationUseCase,
         private val locationSharingServiceConnection: LocationSharingServiceConnection,
         private val stopLiveLocationShareUseCase: StopLiveLocationShareUseCase,
-) : VectorViewModel<LocationLiveMapViewState, LocationLiveMapAction, LocationLiveMapViewEvents>(initialState), LocationSharingServiceConnection.Callback {
+) : VectorViewModel<LiveLocationMapViewState, LiveLocationMapAction, LiveLocationMapViewEvents>(initialState), LocationSharingServiceConnection.Callback {
 
     @AssistedFactory
-    interface Factory : MavericksAssistedViewModelFactory<LocationLiveMapViewModel, LocationLiveMapViewState> {
-        override fun create(initialState: LocationLiveMapViewState): LocationLiveMapViewModel
+    interface Factory : MavericksAssistedViewModelFactory<LiveLocationMapViewModel, LiveLocationMapViewState> {
+        override fun create(initialState: LiveLocationMapViewState): LiveLocationMapViewModel
     }
 
-    companion object : MavericksViewModelFactory<LocationLiveMapViewModel, LocationLiveMapViewState> by hiltMavericksViewModelFactory()
+    companion object : MavericksViewModelFactory<LiveLocationMapViewModel, LiveLocationMapViewState> by hiltMavericksViewModelFactory()
 
     init {
         getListOfUserLiveLocationUseCase.execute(initialState.roomId)
@@ -56,22 +56,23 @@ class LocationLiveMapViewModel @AssistedInject constructor(
         super.onCleared()
     }
 
-    override fun handle(action: LocationLiveMapAction) {
+    override fun handle(action: LiveLocationMapAction) {
         when (action) {
-            is LocationLiveMapAction.AddMapSymbol -> handleAddMapSymbol(action)
-            is LocationLiveMapAction.RemoveMapSymbol -> handleRemoveMapSymbol(action)
-            LocationLiveMapAction.StopSharing -> handleStopSharing()
+            is LiveLocationMapAction.AddMapSymbol -> handleAddMapSymbol(action)
+            is LiveLocationMapAction.RemoveMapSymbol -> handleRemoveMapSymbol(action)
+            LiveLocationMapAction.StopSharing -> handleStopSharing()
+            LiveLocationMapAction.ShowMapLoadingError -> handleShowMapLoadingError()
         }
     }
 
-    private fun handleAddMapSymbol(action: LocationLiveMapAction.AddMapSymbol) = withState { state ->
+    private fun handleAddMapSymbol(action: LiveLocationMapAction.AddMapSymbol) = withState { state ->
         val newMapSymbolIds = state.mapSymbolIds.toMutableMap().apply { set(action.key, action.value) }
         setState {
             copy(mapSymbolIds = newMapSymbolIds)
         }
     }
 
-    private fun handleRemoveMapSymbol(action: LocationLiveMapAction.RemoveMapSymbol) = withState { state ->
+    private fun handleRemoveMapSymbol(action: LiveLocationMapAction.RemoveMapSymbol) = withState { state ->
         val newMapSymbolIds = state.mapSymbolIds.toMutableMap().apply { remove(action.key) }
         setState {
             copy(mapSymbolIds = newMapSymbolIds)
@@ -82,11 +83,15 @@ class LocationLiveMapViewModel @AssistedInject constructor(
         viewModelScope.launch {
             val result = stopLiveLocationShareUseCase.execute(initialState.roomId)
             if (result is UpdateLiveLocationShareResult.Failure) {
-                _viewEvents.post(LocationLiveMapViewEvents.Error(result.error))
+                _viewEvents.post(LiveLocationMapViewEvents.Error(result.error))
             }
         }
     }
 
+    private fun handleShowMapLoadingError() {
+        setState { copy(loadingMapHasFailed = true) }
+    }
+
     override fun onLocationServiceRunning(roomIds: Set<String>) {
         // NOOP
     }
@@ -96,6 +101,6 @@ class LocationLiveMapViewModel @AssistedInject constructor(
     }
 
     override fun onLocationServiceError(error: Throwable) {
-        _viewEvents.post(LocationLiveMapViewEvents.Error(error))
+        _viewEvents.post(LiveLocationMapViewEvents.Error(error))
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewState.kt
similarity index 83%
rename from vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt
rename to vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewState.kt
index e96fdb2645..ddd1cd2369 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewState.kt
@@ -21,16 +21,17 @@ import com.airbnb.mvrx.MavericksState
 import im.vector.app.features.location.LocationData
 import org.matrix.android.sdk.api.util.MatrixItem
 
-data class LocationLiveMapViewState(
+data class LiveLocationMapViewState(
         val roomId: String,
         val userLocations: List<UserLiveLocationViewState> = emptyList(),
         /**
          * Map to keep track of symbol ids associated to each user Id.
          */
-        val mapSymbolIds: Map<String, Long> = emptyMap()
+        val mapSymbolIds: Map<String, Long> = emptyMap(),
+        val loadingMapHasFailed: Boolean = false,
 ) : MavericksState {
-    constructor(locationLiveMapViewArgs: LocationLiveMapViewArgs) : this(
-            roomId = locationLiveMapViewArgs.roomId
+    constructor(liveLocationMapViewArgs: LiveLocationMapViewArgs) : this(
+            roomId = liveLocationMapViewArgs.roomId
     )
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
index 0a4742fafc..bab7f4c7f9 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationUserItem.kt
@@ -79,15 +79,12 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
             }
         }
 
-        stopTimer(holder)
-        holder.timer = CountUpTimer(1000).apply {
-            tickListener = object : CountUpTimer.TickListener {
-                override fun onTick(milliseconds: Long) {
-                    holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
-                }
+        holder.timer.tickListener = object : CountUpTimer.TickListener {
+            override fun onTick(milliseconds: Long) {
+                holder.itemLastUpdatedAtTextView.text = getFormattedLastUpdatedAt(locationUpdateTimeMillis)
             }
-            resume()
         }
+        holder.timer.resume()
 
         holder.view.setOnClickListener { callback?.onUserSelected(matrixItem.id) }
     }
@@ -98,8 +95,7 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
     }
 
     private fun stopTimer(holder: Holder) {
-        holder.timer?.stop()
-        holder.timer = null
+        holder.timer.stop()
     }
 
     private fun getFormattedLastUpdatedAt(locationUpdateTimeMillis: Long?): String {
@@ -111,7 +107,7 @@ abstract class LiveLocationUserItem : VectorEpoxyModel<LiveLocationUserItem.Hold
     }
 
     class Holder : VectorEpoxyHolder() {
-        var timer: CountUpTimer? = null
+        val timer: CountUpTimer = CountUpTimer(1000)
         val itemUserAvatarImageView by bind<ImageView>(R.id.itemUserAvatarImageView)
         val itemUserDisplayNameTextView by bind<TextView>(R.id.itemUserDisplayNameTextView)
         val itemRemainingTimeTextView by bind<TextView>(R.id.itemRemainingTimeTextView)
diff --git a/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt
new file mode 100644
index 0000000000..5bc730f3d7
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LiveLocationNotificationBuilder.kt
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.tracking
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import androidx.core.app.NotificationCompat
+import androidx.core.app.TaskStackBuilder
+import im.vector.app.R
+import im.vector.app.core.extensions.createIgnoredUri
+import im.vector.app.core.platform.PendingIntentCompat
+import im.vector.app.core.resources.StringProvider
+import im.vector.app.core.time.Clock
+import im.vector.app.features.home.HomeActivity
+import im.vector.app.features.home.room.detail.RoomDetailActivity
+import im.vector.app.features.home.room.detail.arguments.TimelineArgs
+import im.vector.app.features.location.live.map.LiveLocationMapViewActivity
+import im.vector.app.features.location.live.map.LiveLocationMapViewArgs
+import im.vector.app.features.notifications.NotificationActionIds
+import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.themes.ThemeUtils
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LiveLocationNotificationBuilder @Inject constructor(
+        private val context: Context,
+        private val stringProvider: StringProvider,
+        private val clock: Clock,
+        private val actionIds: NotificationActionIds,
+) {
+
+    /**
+     * Creates a notification that indicates the application is retrieving location even if it is in background or killed.
+     * @param roomId the id of the room where a live location is shared
+     */
+    fun buildLiveLocationSharingNotification(roomId: String): Notification {
+        return NotificationCompat.Builder(context, NotificationUtils.SILENT_NOTIFICATION_CHANNEL_ID)
+                .setContentTitle(stringProvider.getString(R.string.live_location_sharing_notification_title))
+                .setContentText(stringProvider.getString(R.string.live_location_sharing_notification_description))
+                .setSmallIcon(R.drawable.ic_attachment_live_location_white)
+                .setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary))
+                .setCategory(NotificationCompat.CATEGORY_LOCATION_SHARING)
+                .setContentIntent(buildOpenLiveLocationMapIntent(roomId))
+                .build()
+    }
+
+    private fun buildOpenLiveLocationMapIntent(roomId: String): PendingIntent? {
+        val homeIntent = HomeActivity.newIntent(context, firstStartMainActivity = false)
+        val roomIntent = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true), firstStartMainActivity = false)
+        val mapIntent = LiveLocationMapViewActivity.getIntent(
+                context = context,
+                liveLocationMapViewArgs = LiveLocationMapViewArgs(roomId = roomId),
+                firstStartMainActivity = true
+        )
+        mapIntent.action = actionIds.tapToView
+        // pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
+        mapIntent.data = createIgnoredUri("openLiveLocationMap?$roomId")
+
+        // Recreate the back stack
+        return TaskStackBuilder.create(context)
+                .addNextIntentWithParentStack(homeIntent)
+                .addNextIntent(roomIntent)
+                .addNextIntent(mapIntent)
+                .getPendingIntent(
+                        clock.epochMillis().toInt(),
+                        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
+                )
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingAndroidService.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
similarity index 79%
rename from vector/src/main/java/im/vector/app/features/location/LocationSharingAndroidService.kt
rename to vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
index 635c0bf87d..819ec8634e 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingAndroidService.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidService.kt
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location
+package im.vector.app.features.location.live.tracking
 
 import android.content.Intent
-import android.os.Binder
 import android.os.IBinder
 import android.os.Parcelable
+import androidx.core.app.NotificationManagerCompat
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.services.VectorAndroidService
+import im.vector.app.features.location.LocationData
+import im.vector.app.features.location.LocationTracker
 import im.vector.app.features.location.live.GetLiveLocationShareSummaryUseCase
-import im.vector.app.features.notifications.NotificationUtils
 import im.vector.app.features.redaction.CheckIfEventIsRedactedUseCase
 import im.vector.app.features.session.coroutineScope
 import kotlinx.coroutines.CoroutineScope
@@ -54,21 +55,19 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
             val durationMillis: Long
     ) : Parcelable
 
-    @Inject lateinit var notificationUtils: NotificationUtils
+    @Inject lateinit var liveLocationNotificationBuilder: LiveLocationNotificationBuilder
     @Inject lateinit var locationTracker: LocationTracker
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var getLiveLocationShareSummaryUseCase: GetLiveLocationShareSummaryUseCase
     @Inject lateinit var checkIfEventIsRedactedUseCase: CheckIfEventIsRedactedUseCase
 
-    private val binder = LocalBinder()
+    private var binder: LocationSharingAndroidServiceBinder? = null
 
-    /**
-     * Keep track of a map between beacon event Id starting the live and RoomArgs.
-     */
-    private val roomArgsMap = mutableMapOf<String, RoomArgs>()
+    private val liveInfoSet = linkedSetOf<LiveInfo>()
     var callback: Callback? = null
     private val jobs = mutableListOf<Job>()
     private var startInProgress = false
+    private var foregroundModeStarted = false
 
     private val _roomIdsOfActiveLives = MutableSharedFlow<Set<String>>(replay = 1)
     val roomIdsOfActiveLives = _roomIdsOfActiveLives.asSharedFlow()
@@ -76,7 +75,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     override fun onCreate() {
         super.onCreate()
         Timber.i("onCreate")
-
+        binder = LocationSharingAndroidServiceBinder().also { it.setup(this) }
         initLocationTracking()
     }
 
@@ -102,8 +101,13 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
 
         if (roomArgs != null) {
             // Show a sticky notification
-            val notification = notificationUtils.buildLiveLocationSharingNotification()
-            startForeground(roomArgs.roomId.hashCode(), notification)
+            val notification = liveLocationNotificationBuilder.buildLiveLocationSharingNotification(roomArgs.roomId)
+            if (foregroundModeStarted) {
+                NotificationManagerCompat.from(this).notify(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
+            } else {
+                startForeground(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
+                foregroundModeStarted = true
+            }
 
             // Send beacon info state event
             launchWithActiveSession { session ->
@@ -148,15 +152,24 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     private fun stopSharingLocation(beaconEventId: String) {
         Timber.i("stopSharingLocation for beacon $beaconEventId")
         removeRoomArgs(beaconEventId)
+        updateNotification()
         tryToDestroyMe()
     }
 
+    private fun updateNotification() {
+        if (liveInfoSet.isNotEmpty()) {
+            val roomId = liveInfoSet.last().roomArgs.roomId
+            val notification = liveLocationNotificationBuilder.buildLiveLocationSharingNotification(roomId)
+            NotificationManagerCompat.from(this).notify(FOREGROUND_SERVICE_NOTIFICATION_ID, notification)
+        }
+    }
+
     private fun onLocationUpdate(locationData: LocationData) {
         Timber.i("onLocationUpdate. Uncertainty: ${locationData.uncertainty}")
 
         // Emit location update to all rooms in which live location sharing is active
-        roomArgsMap.toMap().forEach { item ->
-            sendLiveLocation(item.value.roomId, item.key, locationData)
+        liveInfoSet.toSet().forEach { liveInfo ->
+            sendLiveLocation(liveInfo.roomArgs.roomId, liveInfo.beaconEventId, locationData)
         }
     }
 
@@ -183,7 +196,7 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     }
 
     private fun tryToDestroyMe() {
-        if (startInProgress.not() && roomArgsMap.isEmpty()) {
+        if (startInProgress.not() && liveInfoSet.isEmpty()) {
             Timber.i("Destroying self, time is up for all rooms")
             stopSelf()
         }
@@ -192,6 +205,8 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
     override fun onDestroy() {
         super.onDestroy()
         Timber.i("onDestroy")
+        binder?.cleanUp()
+        binder = null
         jobs.forEach { it.cancel() }
         jobs.clear()
         locationTracker.removeCallback(this)
@@ -199,13 +214,14 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
 
     private fun addRoomArgs(beaconEventId: String, roomArgs: RoomArgs) {
         Timber.i("adding roomArgs for beaconEventId: $beaconEventId")
-        roomArgsMap[beaconEventId] = roomArgs
+        liveInfoSet.removeAll { it.beaconEventId == beaconEventId }
+        liveInfoSet.add(LiveInfo(beaconEventId, roomArgs))
         launchWithActiveSession { _roomIdsOfActiveLives.emit(getRoomIdsOfActiveLives()) }
     }
 
     private fun removeRoomArgs(beaconEventId: String) {
         Timber.i("removing roomArgs for beaconEventId: $beaconEventId")
-        roomArgsMap.remove(beaconEventId)
+        liveInfoSet.removeAll { it.beaconEventId == beaconEventId }
         launchWithActiveSession { _roomIdsOfActiveLives.emit(getRoomIdsOfActiveLives()) }
     }
 
@@ -234,22 +250,24 @@ class LocationSharingAndroidService : VectorAndroidService(), LocationTracker.Ca
                     }
 
     fun getRoomIdsOfActiveLives(): Set<String> {
-        return roomArgsMap.map { it.value.roomId }.toSet()
+        return liveInfoSet.map { it.roomArgs.roomId }.toSet()
     }
 
-    override fun onBind(intent: Intent?): IBinder {
+    override fun onBind(intent: Intent?): IBinder? {
         return binder
     }
 
-    inner class LocalBinder : Binder() {
-        fun getService(): LocationSharingAndroidService = this@LocationSharingAndroidService
-    }
-
     interface Callback {
         fun onServiceError(error: Throwable)
     }
 
     companion object {
         const val EXTRA_ROOM_ARGS = "EXTRA_ROOM_ARGS"
+        private const val FOREGROUND_SERVICE_NOTIFICATION_ID = 300
     }
+
+    private data class LiveInfo(
+            val beaconEventId: String,
+            val roomArgs: RoomArgs
+    )
 }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidServiceBinder.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidServiceBinder.kt
new file mode 100644
index 0000000000..5298e75f08
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingAndroidServiceBinder.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live.tracking
+
+import android.os.Binder
+
+class LocationSharingAndroidServiceBinder : Binder() {
+
+    private var locationSharingAndroidService: LocationSharingAndroidService? = null
+
+    fun setup(service: LocationSharingAndroidService) {
+        locationSharingAndroidService = service
+    }
+
+    fun cleanUp() {
+        locationSharingAndroidService = null
+    }
+
+    fun getService() = locationSharingAndroidService
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingServiceConnection.kt b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingServiceConnection.kt
similarity index 97%
rename from vector/src/main/java/im/vector/app/features/location/LocationSharingServiceConnection.kt
rename to vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingServiceConnection.kt
index 3be73e9fd4..9bbf7980fa 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingServiceConnection.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/tracking/LocationSharingServiceConnection.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location
+package im.vector.app.features.location.live.tracking
 
 import android.content.ComponentName
 import android.content.Context
@@ -66,7 +66,7 @@ class LocationSharingServiceConnection @Inject constructor(
     }
 
     override fun onServiceConnected(className: ComponentName, binder: IBinder) {
-        locationSharingAndroidService = (binder as LocationSharingAndroidService.LocalBinder).getService().also { service ->
+        locationSharingAndroidService = (binder as LocationSharingAndroidServiceBinder).getService()?.also { service ->
             service.callback = this
             getActiveSessionCoroutineScope()?.let { scope ->
                 service.roomIdsOfActiveLives
diff --git a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt
new file mode 100644
index 0000000000..38f6952f67
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewAction.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.preview
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class LocationPreviewAction : VectorViewModelAction {
+    object ShowMapLoadingError : LocationPreviewAction()
+}
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
similarity index 78%
rename from vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt
rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
index 131119a7aa..8285d0156b 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationPreviewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewFragment.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 New Vector Ltd
+ * Copyright (c) 2022 New Vector Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.location
+package im.vector.app.features.location.preview
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
 import com.mapbox.mapboxsdk.maps.MapView
 import im.vector.app.R
 import im.vector.app.core.platform.VectorBaseFragment
@@ -30,6 +33,10 @@ import im.vector.app.core.platform.VectorMenuProvider
 import im.vector.app.core.utils.openLocation
 import im.vector.app.databinding.FragmentLocationPreviewBinding
 import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
+import im.vector.app.features.location.DEFAULT_PIN_ID
+import im.vector.app.features.location.LocationSharingArgs
+import im.vector.app.features.location.MapState
+import im.vector.app.features.location.UrlMapProvider
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
@@ -44,9 +51,13 @@ class LocationPreviewFragment @Inject constructor(
 
     private val args: LocationSharingArgs by args()
 
+    private val viewModel: LocationPreviewViewModel by fragmentViewModel()
+
     // Keep a ref to handle properly the onDestroy callback
     private var mapView: WeakReference<MapView>? = null
 
+    private var mapLoadingErrorListener: MapView.OnDidFailLoadingMapListener? = null
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationPreviewBinding {
         return FragmentLocationPreviewBinding.inflate(layoutInflater, container, false)
     }
@@ -55,6 +66,9 @@ class LocationPreviewFragment @Inject constructor(
         super.onViewCreated(view, savedInstanceState)
 
         mapView = WeakReference(views.mapView)
+        mapLoadingErrorListener = MapView.OnDidFailLoadingMapListener {
+            viewModel.handle(LocationPreviewAction.ShowMapLoadingError)
+        }.also { views.mapView.addOnDidFailLoadingMapListener(it) }
         views.mapView.onCreate(savedInstanceState)
 
         lifecycleScope.launchWhenCreated {
@@ -63,6 +77,12 @@ class LocationPreviewFragment @Inject constructor(
         }
     }
 
+    override fun onDestroyView() {
+        mapLoadingErrorListener?.let { mapView?.get()?.removeOnDidFailLoadingMapListener(it) }
+        mapLoadingErrorListener = null
+        super.onDestroyView()
+    }
+
     override fun onResume() {
         super.onResume()
         views.mapView.onResume()
@@ -99,6 +119,10 @@ class LocationPreviewFragment @Inject constructor(
         super.onDestroy()
     }
 
+    override fun invalidate() = withState(viewModel) { state ->
+        views.mapPreviewLoadingError.isVisible = state.loadingMapHasFailed
+    }
+
     override fun getMenuRes() = R.menu.menu_location_preview
 
     override fun handleMenuItemSelected(item: MenuItem): Boolean {
diff --git a/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt
new file mode 100644
index 0000000000..f0698249ce
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewModel.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.preview
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.EmptyViewEvents
+import im.vector.app.core.platform.VectorViewModel
+
+class LocationPreviewViewModel @AssistedInject constructor(
+        @Assisted private val initialState: LocationPreviewViewState,
+) : VectorViewModel<LocationPreviewViewState, LocationPreviewAction, EmptyViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<LocationPreviewViewModel, LocationPreviewViewState> {
+        override fun create(initialState: LocationPreviewViewState): LocationPreviewViewModel
+    }
+
+    companion object : MavericksViewModelFactory<LocationPreviewViewModel, LocationPreviewViewState> by hiltMavericksViewModelFactory()
+
+    override fun handle(action: LocationPreviewAction) {
+        when (action) {
+            LocationPreviewAction.ShowMapLoadingError -> handleShowMapLoadingError()
+        }
+    }
+
+    private fun handleShowMapLoadingError() {
+        setState { copy(loadingMapHasFailed = true) }
+    }
+}
diff --git a/vector/src/debug/java/im/vector/app/config/AnalyticsConfig.kt b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt
similarity index 55%
rename from vector/src/debug/java/im/vector/app/config/AnalyticsConfig.kt
rename to vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt
index 63f14f72f6..96e8316323 100644
--- a/vector/src/debug/java/im/vector/app/config/AnalyticsConfig.kt
+++ b/vector/src/main/java/im/vector/app/features/location/preview/LocationPreviewViewState.kt
@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-package im.vector.app.config
+package im.vector.app.features.location.preview
 
-import im.vector.app.BuildConfig
-import im.vector.app.features.analytics.AnalyticsConfig
+import com.airbnb.mvrx.MavericksState
 
-val analyticsConfig: AnalyticsConfig = object : AnalyticsConfig {
-    override val isEnabled = BuildConfig.APPLICATION_ID == "im.vector.app.debug"
-    override val postHogHost = "https://posthog.element.dev"
-    override val postHogApiKey = "phc_VtA1L35nw3aeAtHIx1ayrGdzGkss7k1xINeXcoIQzXN"
-    override val policyLink = "https://element.io/cookie-policy"
-}
+data class LocationPreviewViewState(
+        val loadingMapHasFailed: Boolean = false
+) : MavericksState
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
index b0adeff04b..937e1bdf55 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginServerUrlFormFragment.kt
@@ -27,9 +27,9 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentLoginServerUrlFormBinding
@@ -43,7 +43,9 @@ import javax.inject.Inject
 /**
  * In this screen, the user is prompted to enter a homeserver url.
  */
-class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<FragmentLoginServerUrlFormBinding>() {
+class LoginServerUrlFormFragment @Inject constructor(
+        private val buildMeta: BuildMeta,
+) : AbstractLoginFragment<FragmentLoginServerUrlFormBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlFormBinding {
         return FragmentLoginServerUrlFormBinding.inflate(inflater, container, false)
@@ -99,7 +101,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment<F
                 views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
         }
-        val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
+        val completions = state.knownCustomHomeServersUrls + if (buildMeta.isDebug) listOf("http://10.0.2.2:8080") else emptyList()
         views.loginServerUrlFormHomeServerUrl.setAdapter(
                 ArrayAdapter(
                         requireContext(),
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
index f3287ae333..7f5e87967b 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginSplashFragment.kt
@@ -23,8 +23,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentLoginSplashBinding
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.settings.VectorPreferences
@@ -36,7 +36,8 @@ import javax.inject.Inject
  * In this screen, the user is viewing an introduction to what he can do with this application.
  */
 class LoginSplashFragment @Inject constructor(
-        private val vectorPreferences: VectorPreferences
+        private val vectorPreferences: VectorPreferences,
+        private val buildMeta: BuildMeta,
 ) : AbstractLoginFragment<FragmentLoginSplashBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplashBinding {
@@ -57,12 +58,12 @@ class LoginSplashFragment @Inject constructor(
     private fun setupViews() {
         views.loginSplashSubmit.debouncedClicks { getStarted() }
 
-        if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
+        if (buildMeta.isDebug || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}\n" +
-                    "Branch: ${BuildConfig.GIT_BRANCH_NAME}\n" +
-                    "Build: ${BuildConfig.BUILD_NUMBER}"
+            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
+                    "Branch: ${buildMeta.gitBranchName}\n" +
+                    "Build: ${buildMeta.buildNumber}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
index bcd2d84346..50f8f38634 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginServerUrlFormFragment2.kt
@@ -26,9 +26,9 @@ import android.widget.ArrayAdapter
 import androidx.core.view.isInvisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.databinding.FragmentLoginServerUrlForm2Binding
 import kotlinx.coroutines.flow.launchIn
@@ -43,7 +43,9 @@ import javax.net.ssl.HttpsURLConnection
 /**
  * In this screen, the user is prompted to enter a homeserver url.
  */
-class LoginServerUrlFormFragment2 @Inject constructor() : AbstractLoginFragment2<FragmentLoginServerUrlForm2Binding>() {
+class LoginServerUrlFormFragment2 @Inject constructor(
+        private val buildMeta: BuildMeta,
+) : AbstractLoginFragment2<FragmentLoginServerUrlForm2Binding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlForm2Binding {
         return FragmentLoginServerUrlForm2Binding.inflate(inflater, container, false)
@@ -80,7 +82,7 @@ class LoginServerUrlFormFragment2 @Inject constructor() : AbstractLoginFragment2
     }
 
     private fun setupUi(state: LoginViewState2) {
-        val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
+        val completions = state.knownCustomHomeServersUrls + if (buildMeta.isDebug) listOf("http://10.0.2.2:8080") else emptyList()
         views.loginServerUrlFormHomeServerUrl.setAdapter(
                 ArrayAdapter(
                         requireContext(),
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt
index 611b5f4cd2..84af28f75e 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginSplashSignUpSignInSelectionFragment2.kt
@@ -22,7 +22,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import im.vector.app.BuildConfig
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentLoginSplash2Binding
 import im.vector.app.features.settings.VectorPreferences
 import javax.inject.Inject
@@ -32,7 +32,8 @@ import javax.inject.Inject
  * This is the new splash screen.
  */
 class LoginSplashSignUpSignInSelectionFragment2 @Inject constructor(
-        private val vectorPreferences: VectorPreferences
+        private val vectorPreferences: VectorPreferences,
+        private val buildMeta: BuildMeta,
 ) : AbstractLoginFragment2<FragmentLoginSplash2Binding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginSplash2Binding {
@@ -49,12 +50,12 @@ class LoginSplashSignUpSignInSelectionFragment2 @Inject constructor(
         views.loginSignupSigninSignUp.setOnClickListener { signUp() }
         views.loginSignupSigninSignIn.setOnClickListener { signIn() }
 
-        if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
+        if (buildMeta.isDebug || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}\n" +
-                    "Branch: ${BuildConfig.GIT_BRANCH_NAME}\n" +
-                    "Build: ${BuildConfig.BUILD_NUMBER}"
+            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
+                    "Branch: ${buildMeta.gitBranchName}\n" +
+                    "Build: ${buildMeta.buildNumber}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 0c20144e4e..6da29e59ab 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -32,13 +32,13 @@ import androidx.core.util.Pair
 import androidx.core.view.ViewCompat
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import fr.gouv.tchap.features.login.TchapLoginActivity
-import im.vector.app.AppStateHandler
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.SpaceStateHandler
+import im.vector.app.config.Config
+import im.vector.app.config.OnboardingVariant
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.error.fatalError
 import im.vector.app.features.VectorFeatures
-import im.vector.app.features.VectorFeatures.OnboardingVariant
 import im.vector.app.features.analytics.AnalyticsTracker
 import im.vector.app.features.analytics.extensions.toAnalyticsViewRoom
 import im.vector.app.features.analytics.plan.ViewRoom
@@ -68,8 +68,8 @@ import im.vector.app.features.location.LocationData
 import im.vector.app.features.location.LocationSharingActivity
 import im.vector.app.features.location.LocationSharingArgs
 import im.vector.app.features.location.LocationSharingMode
-import im.vector.app.features.location.live.map.LocationLiveMapViewActivity
-import im.vector.app.features.location.live.map.LocationLiveMapViewArgs
+import im.vector.app.features.location.live.map.LiveLocationMapViewActivity
+import im.vector.app.features.location.live.map.LiveLocationMapViewArgs
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.matrixto.MatrixToBottomSheet
 import im.vector.app.features.matrixto.OriginOfMatrixTo
@@ -123,7 +123,7 @@ class DefaultNavigator @Inject constructor(
         private val sessionHolder: ActiveSessionHolder,
         private val vectorPreferences: VectorPreferences,
         private val widgetArgsBuilder: WidgetArgsBuilder,
-        private val appStateHandler: AppStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
         private val supportedVerificationMethodsProvider: SupportedVerificationMethodsProvider,
         private val features: VectorFeatures,
         private val analyticsTracker: AnalyticsTracker
@@ -170,7 +170,7 @@ class DefaultNavigator @Inject constructor(
             analyticsTracker.capture(
                     sessionHolder.getActiveSession().getRoomSummary(roomId).toAnalyticsViewRoom(
                             trigger = trigger,
-                            selectedSpace = appStateHandler.getCurrentSpace()
+                            selectedSpace = spaceStateHandler.getCurrentSpace()
                     )
             )
         }
@@ -185,11 +185,12 @@ class DefaultNavigator @Inject constructor(
             fatalError("Trying to open an unknown space $spaceId", vectorPreferences.failFast())
             return
         }
-        if (!BuildConfig.SHOW_SPACES) {
+        // Tchap: feature flag
+        if (!Config.SHOW_SPACES) {
             Timber.w("Spaces are not available in this version, navigation aborted")
             return
         }
-        appStateHandler.setCurrentSpace(spaceId)
+        spaceStateHandler.setCurrentSpace(spaceId)
         when (postSwitchSpaceAction) {
             Navigator.PostSwitchSpaceAction.None -> {
                 // go back to home if we are showing room details?
@@ -333,7 +334,7 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openRoomDirectory(context: Context, initialFilter: String) {
-        when (val currentSpace = appStateHandler.getCurrentSpace()) {
+        when (val currentSpace = spaceStateHandler.getCurrentSpace()) {
             null -> RoomDirectoryActivity.getIntent(context, initialFilter)
             else -> SpaceExploreActivity.newIntent(context, currentSpace.roomId)
         }.start(context)
@@ -345,14 +346,14 @@ class DefaultNavigator @Inject constructor(
     }
 
     override fun openCreateDirectRoom(context: Context) {
-        when (val currentSpace = appStateHandler.getCurrentSpace()) {
+        when (val currentSpace = spaceStateHandler.getCurrentSpace()) {
             null -> CreateDirectRoomActivity.getIntent(context)
             else -> SpacePeopleActivity.newIntent(context, currentSpace.roomId)
         }.start(context)
     }
 
     override fun openInviteUsersToRoom(context: Context, roomId: String) {
-        when (val currentSpace = appStateHandler.getCurrentSpace()) {
+        when (val currentSpace = spaceStateHandler.getCurrentSpace()) {
             null -> InviteUsersToRoomActivity.getIntent(context, roomId).start(context)
             else -> showInviteToDialog(context, currentSpace, roomId)
         }
@@ -575,10 +576,10 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
-    override fun openLocationLiveMap(context: Context, roomId: String) {
-        val intent = LocationLiveMapViewActivity.getIntent(
+    override fun openLiveLocationMap(context: Context, roomId: String) {
+        val intent = LiveLocationMapViewActivity.getIntent(
                 context = context,
-                locationLiveMapViewArgs = LocationLiveMapViewArgs(roomId = roomId)
+                liveLocationMapViewArgs = LiveLocationMapViewArgs(roomId = roomId)
         )
         context.startActivity(intent)
     }
diff --git a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
index 7410d412c2..8e01b3ed50 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
@@ -186,7 +186,7 @@ interface Navigator {
             locationOwnerId: String?
     )
 
-    fun openLocationLiveMap(context: Context, roomId: String)
+    fun openLiveLocationMap(context: Context, roomId: String)
 
     fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
 
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
index 1ca72b8399..1cf80de4ee 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotifiableEventResolver.kt
@@ -16,9 +16,9 @@
 package im.vector.app.features.notifications
 
 import android.net.Uri
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.takeAs
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.time.Clock
 import im.vector.app.features.displayname.getBestName
@@ -62,6 +62,7 @@ class NotifiableEventResolver @Inject constructor(
         private val noticeEventFormatter: NoticeEventFormatter,
         private val displayableEventFormatter: DisplayableEventFormatter,
         private val clock: Clock,
+        private val buildMeta: BuildMeta,
 ) {
 
     // private val eventDisplay = RiotEventDisplay(context)
@@ -264,7 +265,7 @@ class NotifiableEventResolver @Inject constructor(
             )
         } else {
             Timber.e("## unsupported notifiable event for eventId [${event.eventId}]")
-            if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+            if (buildMeta.lowPrivacyLoggingEnabled) {
                 Timber.e("## unsupported notifiable event for event [$event]")
             }
             // TODO generic handling?
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationActionIds.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationActionIds.kt
new file mode 100644
index 0000000000..3bd7a635ae
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationActionIds.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.notifications
+
+import im.vector.app.core.resources.BuildMeta
+import javax.inject.Inject
+
+/**
+ * Util class for creating notifications.
+ * Note: Cannot inject ColorProvider in the constructor, because it requires an Activity
+ */
+
+data class NotificationActionIds @Inject constructor(
+        private val buildMeta: BuildMeta,
+) {
+
+    val join = "${buildMeta.applicationId}.NotificationActions.JOIN_ACTION"
+    val reject = "${buildMeta.applicationId}.NotificationActions.REJECT_ACTION"
+    val quickLaunch = "${buildMeta.applicationId}.NotificationActions.QUICK_LAUNCH_ACTION"
+    val markRoomRead = "${buildMeta.applicationId}.NotificationActions.MARK_ROOM_READ_ACTION"
+    val smartReply = "${buildMeta.applicationId}.NotificationActions.SMART_REPLY_ACTION"
+    val dismissSummary = "${buildMeta.applicationId}.NotificationActions.DISMISS_SUMMARY_ACTION"
+    val dismissRoom = "${buildMeta.applicationId}.NotificationActions.DISMISS_ROOM_NOTIF_ACTION"
+    val tapToView = "${buildMeta.applicationId}.NotificationActions.TAP_TO_VIEW_ACTION"
+    val diagnostic = "${buildMeta.applicationId}.NotificationActions.DIAGNOSTIC"
+    val push = "${buildMeta.applicationId}.PUSH"
+}
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
index c01be9a44f..3fe0898eb4 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationBroadcastReceiver.kt
@@ -48,31 +48,32 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
     @Inject lateinit var activeSessionHolder: ActiveSessionHolder
     @Inject lateinit var analyticsTracker: AnalyticsTracker
     @Inject lateinit var clock: Clock
+    @Inject lateinit var actionIds: NotificationActionIds
 
     override fun onReceive(context: Context?, intent: Intent?) {
         if (intent == null || context == null) return
         Timber.v("NotificationBroadcastReceiver received : $intent")
         when (intent.action) {
-            NotificationUtils.SMART_REPLY_ACTION ->
+            actionIds.smartReply ->
                 handleSmartReply(intent, context)
-            NotificationUtils.DISMISS_ROOM_NOTIF_ACTION ->
+            actionIds.dismissRoom ->
                 intent.getStringExtra(KEY_ROOM_ID)?.let { roomId ->
                     notificationDrawerManager.updateEvents { it.clearMessagesForRoom(roomId) }
                 }
-            NotificationUtils.DISMISS_SUMMARY_ACTION ->
+            actionIds.dismissSummary ->
                 notificationDrawerManager.clearAllEvents()
-            NotificationUtils.MARK_ROOM_READ_ACTION ->
+            actionIds.markRoomRead ->
                 intent.getStringExtra(KEY_ROOM_ID)?.let { roomId ->
                     notificationDrawerManager.updateEvents { it.clearMessagesForRoom(roomId) }
                     handleMarkAsRead(roomId)
                 }
-            NotificationUtils.JOIN_ACTION -> {
+            actionIds.join -> {
                 intent.getStringExtra(KEY_ROOM_ID)?.let { roomId ->
                     notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(roomId) }
                     handleJoinRoom(roomId)
                 }
             }
-            NotificationUtils.REJECT_ACTION -> {
+            actionIds.reject -> {
                 intent.getStringExtra(KEY_ROOM_ID)?.let { roomId ->
                     notificationDrawerManager.updateEvents { it.clearMemberShipNotificationForRoom(roomId) }
                     handleRejectRoom(roomId)
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
index 686ed324dc..5f43ff6b90 100644
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
@@ -20,8 +20,8 @@ import android.os.Handler
 import android.os.HandlerThread
 import androidx.annotation.WorkerThread
 import im.vector.app.ActiveSessionDataSource
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.FirstThrottler
 import im.vector.app.features.displayname.getBestName
 import im.vector.app.features.settings.VectorPreferences
@@ -46,7 +46,8 @@ class NotificationDrawerManager @Inject constructor(
         private val activeSessionDataSource: ActiveSessionDataSource,
         private val notifiableEventProcessor: NotifiableEventProcessor,
         private val notificationRenderer: NotificationRenderer,
-        private val notificationEventPersistence: NotificationEventPersistence
+        private val notificationEventPersistence: NotificationEventPersistence,
+        private val buildMeta: BuildMeta,
 ) {
 
     private val handlerThread: HandlerThread = HandlerThread("NotificationDrawerManager", Thread.MIN_PRIORITY)
@@ -92,7 +93,7 @@ class NotificationDrawerManager @Inject constructor(
         }
         // If we support multi session, event list should be per userId
         // Currently only manage single session
-        if (BuildConfig.LOW_PRIVACY_LOG_ENABLE) {
+        if (buildMeta.lowPrivacyLoggingEnabled) {
             Timber.d("onNotifiableEventReceived(): $notifiableEvent")
         } else {
             Timber.d("onNotifiableEventReceived(): is push: ${notifiableEvent.canBeReplaced}")
diff --git a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
index bf4a8023c5..547f89a7c4 100755
--- a/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
+++ b/vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
@@ -45,7 +45,6 @@ import androidx.core.content.getSystemService
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.fragment.app.Fragment
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.createIgnoredUri
 import im.vector.app.core.platform.PendingIntentCompat
@@ -69,16 +68,13 @@ import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.random.Random
 
-/**
- * Util class for creating notifications.
- * Note: Cannot inject ColorProvider in the constructor, because it requires an Activity
- */
 @Singleton
 class NotificationUtils @Inject constructor(
         private val context: Context,
         private val stringProvider: StringProvider,
         private val vectorPreferences: VectorPreferences,
         private val clock: Clock,
+        private val actionIds: NotificationActionIds,
 ) {
 
     companion object {
@@ -94,21 +90,6 @@ class NotificationUtils @Inject constructor(
          */
         const val NOTIFICATION_ID_FOREGROUND_SERVICE = 61
 
-        /* ==========================================================================================
-         * IDs for actions
-         * ========================================================================================== */
-
-        const val JOIN_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.JOIN_ACTION"
-        const val REJECT_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.REJECT_ACTION"
-        private const val QUICK_LAUNCH_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.QUICK_LAUNCH_ACTION"
-        const val MARK_ROOM_READ_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.MARK_ROOM_READ_ACTION"
-        const val SMART_REPLY_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.SMART_REPLY_ACTION"
-        const val DISMISS_SUMMARY_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DISMISS_SUMMARY_ACTION"
-        const val DISMISS_ROOM_NOTIF_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DISMISS_ROOM_NOTIF_ACTION"
-        private const val TAP_TO_VIEW_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.TAP_TO_VIEW_ACTION"
-        const val DIAGNOSTIC_ACTION = "${BuildConfig.APPLICATION_ID}.NotificationActions.DIAGNOSTIC"
-        const val PUSH_ACTION = "${BuildConfig.APPLICATION_ID}.PUSH"
-
         /* ==========================================================================================
          * IDs for channels
          * ========================================================================================== */
@@ -118,7 +99,7 @@ class NotificationUtils @Inject constructor(
 
         private const val NOISY_NOTIFICATION_CHANNEL_ID = "DEFAULT_NOISY_NOTIFICATION_CHANNEL_ID"
 
-        private const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2"
+        const val SILENT_NOTIFICATION_CHANNEL_ID = "DEFAULT_SILENT_NOTIFICATION_CHANNEL_ID_V2"
         private const val CALL_NOTIFICATION_CHANNEL_ID = "CALL_NOTIFICATION_CHANNEL_ID_V2"
 
         fun supportNotificationChannels() = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
@@ -540,20 +521,6 @@ class NotificationUtils @Inject constructor(
         return builder.build()
     }
 
-    /**
-     * Creates a notification that indicates the application is retrieving location even if it is in background or killed.
-     */
-    fun buildLiveLocationSharingNotification(): Notification {
-        return NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID)
-                .setContentTitle(stringProvider.getString(R.string.live_location_sharing_notification_title))
-                .setContentText(stringProvider.getString(R.string.live_location_sharing_notification_description))
-                .setSmallIcon(R.drawable.ic_attachment_location_live_white)
-                .setColor(ThemeUtils.getColor(context, android.R.attr.colorPrimary))
-                .setCategory(NotificationCompat.CATEGORY_LOCATION_SHARING)
-                .setContentIntent(buildOpenHomePendingIntentForSummary())
-                .build()
-    }
-
     /**
      * Creates a notification that indicates the application is capturing the screen.
      */
@@ -665,7 +632,7 @@ class NotificationUtils @Inject constructor(
                     // Add actions and notification intents
                     // Mark room as read
                     val markRoomReadIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-                    markRoomReadIntent.action = MARK_ROOM_READ_ACTION
+                    markRoomReadIntent.action = actionIds.markRoomRead
                     markRoomReadIntent.data = createIgnoredUri(roomInfo.roomId)
                     markRoomReadIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId)
                     val markRoomReadPendingIntent = PendingIntent.getBroadcast(
@@ -712,7 +679,7 @@ class NotificationUtils @Inject constructor(
 
                     val intent = Intent(context, NotificationBroadcastReceiver::class.java)
                     intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomInfo.roomId)
-                    intent.action = DISMISS_ROOM_NOTIF_ACTION
+                    intent.action = actionIds.dismissRoom
                     val pendingIntent = PendingIntent.getBroadcast(
                             context.applicationContext,
                             clock.epochMillis().toInt(),
@@ -747,7 +714,7 @@ class NotificationUtils @Inject constructor(
                     val roomId = inviteNotifiableEvent.roomId
                     // offer to type a quick reject button
                     val rejectIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-                    rejectIntent.action = REJECT_ACTION
+                    rejectIntent.action = actionIds.reject
                     rejectIntent.data = createIgnoredUri("$roomId&$matrixId")
                     rejectIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
                     val rejectIntentPendingIntent = PendingIntent.getBroadcast(
@@ -765,7 +732,7 @@ class NotificationUtils @Inject constructor(
 
                     // offer to type a quick accept button
                     val joinIntent = Intent(context, NotificationBroadcastReceiver::class.java)
-                    joinIntent.action = JOIN_ACTION
+                    joinIntent.action = actionIds.join
                     joinIntent.data = createIgnoredUri("$roomId&$matrixId")
                     joinIntent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
                     val joinIntentPendingIntent = PendingIntent.getBroadcast(
@@ -848,7 +815,7 @@ class NotificationUtils @Inject constructor(
 
     private fun buildOpenRoomIntent(roomId: String): PendingIntent? {
         val roomIntentTap = RoomDetailActivity.newIntent(context, TimelineArgs(roomId = roomId, switchToParentSpace = true), true)
-        roomIntentTap.action = TAP_TO_VIEW_ACTION
+        roomIntentTap.action = actionIds.tapToView
         // pending intent get reused by system, this will mess up the extra params, so put unique info to avoid that
         roomIntentTap.data = createIgnoredUri("openRoom?$roomId")
 
@@ -886,7 +853,7 @@ class NotificationUtils @Inject constructor(
         val intent: Intent
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent = Intent(context, NotificationBroadcastReceiver::class.java)
-            intent.action = SMART_REPLY_ACTION
+            intent.action = actionIds.smartReply
             intent.data = createIgnoredUri(roomId)
             intent.putExtra(NotificationBroadcastReceiver.KEY_ROOM_ID, roomId)
             return PendingIntent.getBroadcast(
@@ -962,7 +929,7 @@ class NotificationUtils @Inject constructor(
 
     private fun getDismissSummaryPendingIntent(): PendingIntent {
         val intent = Intent(context, NotificationBroadcastReceiver::class.java)
-        intent.action = DISMISS_SUMMARY_ACTION
+        intent.action = actionIds.dismissSummary
         intent.data = createIgnoredUri("deleteSummary")
         return PendingIntent.getBroadcast(
                 context.applicationContext,
@@ -1001,7 +968,7 @@ class NotificationUtils @Inject constructor(
 
     fun displayDiagnosticNotification() {
         val testActionIntent = Intent(context, TestNotificationReceiver::class.java)
-        testActionIntent.action = DIAGNOSTIC_ACTION
+        testActionIntent.action = actionIds.diagnostic
         val testPendingIntent = PendingIntent.getBroadcast(
                 context,
                 0,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
index 8d9f372bdd..9837db8e91 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.onboarding
 
+import im.vector.app.config.OnboardingVariant
 import im.vector.app.core.platform.ScreenOrientationLocker
 import im.vector.app.databinding.ActivityLoginBinding
 import im.vector.app.features.VectorFeatures
@@ -34,8 +35,8 @@ class OnboardingVariantFactory @Inject constructor(
             onboardingViewModel: Lazy<OnboardingViewModel>,
             loginViewModel2: Lazy<LoginViewModel2>
     ) = when (vectorFeatures.onboardingVariant()) {
-        VectorFeatures.OnboardingVariant.LEGACY -> error("Legacy is not supported by the FTUE")
-        VectorFeatures.OnboardingVariant.FTUE_AUTH -> FtueAuthVariant(
+        OnboardingVariant.LEGACY -> error("Legacy is not supported by the FTUE")
+        OnboardingVariant.FTUE_AUTH -> FtueAuthVariant(
                 views = views,
                 onboardingViewModel = onboardingViewModel.value,
                 activity = activity,
@@ -43,7 +44,7 @@ class OnboardingVariantFactory @Inject constructor(
                 vectorFeatures = vectorFeatures,
                 orientationLocker = orientationLocker
         )
-        VectorFeatures.OnboardingVariant.LOGIN_2 -> Login2Variant(
+        OnboardingVariant.LOGIN_2 -> Login2Variant(
                 views = views,
                 loginViewModel = loginViewModel2.value,
                 activity = activity,
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
index 6cadb4308a..73288bd6d5 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
@@ -32,7 +32,6 @@ import im.vector.app.core.extensions.isMatrixId
 import im.vector.app.core.extensions.toReducedUrl
 import im.vector.app.core.extensions.vectorStore
 import im.vector.app.core.platform.VectorViewModel
-import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.StringProvider
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.ensureTrailingSlash
@@ -63,6 +62,7 @@ import org.matrix.android.sdk.api.auth.registration.RegistrationAvailability
 import org.matrix.android.sdk.api.auth.registration.RegistrationWizard
 import org.matrix.android.sdk.api.failure.isHomeserverUnavailable
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import timber.log.Timber
 import java.util.UUID
 import java.util.concurrent.CancellationException
@@ -86,7 +86,7 @@ class OnboardingViewModel @AssistedInject constructor(
         private val startAuthenticationFlowUseCase: StartAuthenticationFlowUseCase,
         private val vectorOverrides: VectorOverrides,
         private val registrationActionHandler: RegistrationActionHandler,
-        private val buildMeta: BuildMeta,
+        private val sdkIntProvider: BuildVersionSdkIntProvider,
 ) : VectorViewModel<OnboardingViewState, OnboardingAction, OnboardingViewEvents>(initialState) {
 
     @AssistedFactory
@@ -193,25 +193,32 @@ class OnboardingViewModel @AssistedInject constructor(
     }
 
     private suspend fun checkUserNameAvailability(userName: String) {
-        when (val result = registrationWizard.registrationAvailable(userName)) {
-            RegistrationAvailability.Available -> {
-                setState {
-                    copy(
-                            registrationState = RegistrationState(
-                                    isUserNameAvailable = true,
-                                    selectedMatrixId = when {
-                                        userName.isMatrixId() -> userName
-                                        else -> "@$userName:${selectedHomeserver.userFacingUrl.toReducedUrl()}"
-                                    },
-                            )
-                    )
-                }
-            }
+        runCatching { registrationWizard.registrationAvailable(userName) }.fold(
+                onSuccess = { result ->
+                    when (result) {
+                        RegistrationAvailability.Available -> {
+                            setState {
+                                copy(
+                                        registrationState = RegistrationState(
+                                                isUserNameAvailable = true,
+                                                selectedMatrixId = when {
+                                                    userName.isMatrixId() -> userName
+                                                    else -> "@$userName:${selectedHomeserver.userFacingUrl.toReducedUrl()}"
+                                                },
+                                        )
+                                )
+                            }
+                        }
 
-            is RegistrationAvailability.NotAvailable -> {
-                _viewEvents.post(OnboardingViewEvents.Failure(result.failure))
-            }
-        }
+                        is RegistrationAvailability.NotAvailable -> {
+                            _viewEvents.post(OnboardingViewEvents.Failure(result.failure))
+                        }
+                    }
+                },
+                onFailure = {
+                    _viewEvents.post(OnboardingViewEvents.Failure(it))
+                }
+        )
     }
 
     private fun withAction(action: OnboardingAction, block: (OnboardingAction) -> Unit) {
@@ -708,7 +715,7 @@ class OnboardingViewModel @AssistedInject constructor(
 
     private fun onAuthenticationStartError(error: Throwable, trigger: OnboardingAction.HomeServerChange) {
         when {
-            error.isHomeserverUnavailable() && applicationContext.inferNoConnectivity(buildMeta) -> _viewEvents.post(
+            error.isHomeserverUnavailable() && applicationContext.inferNoConnectivity(sdkIntProvider) -> _viewEvents.post(
                     OnboardingViewEvents.Failure(error)
             )
             deeplinkUrlIsUnavailable(error, trigger) -> _viewEvents.post(
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
index 58b1edddf8..c2d2346765 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedLoginFragment.kt
@@ -63,7 +63,9 @@ class FtueAuthCombinedLoginFragment @Inject constructor(
         views.loginRoot.realignPercentagesToParent()
         views.editServerButton.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.EditServerSelection)) }
         views.loginPasswordInput.setOnImeDoneListener { submit() }
-        views.loginInput.setOnFocusLostListener { viewModel.handle(OnboardingAction.UserNameEnteredAction.Login(views.loginInput.content())) }
+        views.loginInput.setOnFocusLostListener(viewLifecycleOwner) {
+            viewModel.handle(OnboardingAction.UserNameEnteredAction.Login(views.loginInput.content()))
+        }
         views.loginForgotPassword.debouncedClicks { viewModel.handle(OnboardingAction.PostViewEvent(OnboardingViewEvents.OnForgetPasswordClicked)) }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
index c69706a17b..8340fb903a 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthCombinedRegisterFragment.kt
@@ -86,7 +86,7 @@ class FtueAuthCombinedRegisterFragment @Inject constructor() : AbstractSSOFtueAu
             views.createAccountEntryFooter.text = ""
         }
 
-        views.createAccountInput.setOnFocusLostListener {
+        views.createAccountInput.setOnFocusLostListener(viewLifecycleOwner) {
             viewModel.handle(OnboardingAction.UserNameEnteredAction.Registration(views.createAccountInput.content()))
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
index b2a99ffb7e..b16ad3ee93 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthServerUrlFormFragment.kt
@@ -27,9 +27,9 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.hideKeyboard
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.ensureProtocol
 import im.vector.app.core.utils.openUrlInChromeCustomTab
 import im.vector.app.databinding.FragmentLoginServerUrlFormBinding
@@ -47,7 +47,9 @@ import javax.inject.Inject
 /**
  * In this screen, the user is prompted to enter a homeserver url.
  */
-class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFragment<FragmentLoginServerUrlFormBinding>() {
+class FtueAuthServerUrlFormFragment @Inject constructor(
+        private val buildMeta: BuildMeta,
+) : AbstractFtueAuthFragment<FragmentLoginServerUrlFormBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLoginServerUrlFormBinding {
         return FragmentLoginServerUrlFormBinding.inflate(inflater, container, false)
@@ -103,7 +105,7 @@ class FtueAuthServerUrlFormFragment @Inject constructor() : AbstractFtueAuthFrag
                 views.loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
         }
-        val completions = state.knownCustomHomeServersUrls + if (BuildConfig.DEBUG) listOf("http://10.0.2.2:8080") else emptyList()
+        val completions = state.knownCustomHomeServersUrls + if (buildMeta.isDebug) listOf("http://10.0.2.2:8080") else emptyList()
         views.loginServerUrlFormHomeServerUrl.setAdapter(
                 ArrayAdapter(
                         requireContext(),
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
index 0d86c4cd24..0333f6047b 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashCarouselFragment.kt
@@ -27,10 +27,10 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.incrementByOneAndWrap
 import im.vector.app.core.extensions.setCurrentItem
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentFtueSplashCarouselBinding
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.onboarding.OnboardingAction
@@ -48,9 +48,12 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
         private val vectorPreferences: VectorPreferences,
         private val vectorFeatures: VectorFeatures,
         private val carouselController: SplashCarouselController,
-        private val carouselStateFactory: SplashCarouselStateFactory
+        private val carouselStateFactory: SplashCarouselStateFactory,
+        private val buildMeta: BuildMeta,
 ) : AbstractFtueAuthFragment<FragmentFtueSplashCarouselBinding>() {
 
+    private var tabLayoutMediator: TabLayoutMediator? = null
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueSplashCarouselBinding {
         return FragmentFtueSplashCarouselBinding.inflate(inflater, container, false)
     }
@@ -60,10 +63,19 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
         setupViews()
     }
 
+    override fun onDestroyView() {
+        tabLayoutMediator?.detach()
+        tabLayoutMediator = null
+        views.splashCarousel.adapter = null
+        super.onDestroyView()
+    }
+
     private fun setupViews() {
         val carouselAdapter = carouselController.adapter
         views.splashCarousel.adapter = carouselAdapter
-        TabLayoutMediator(views.carouselIndicator, views.splashCarousel) { _, _ -> }.attach()
+        tabLayoutMediator = TabLayoutMediator(views.carouselIndicator, views.splashCarousel) { _, _ -> }
+                .also { it.attach() }
+
         carouselController.setData(carouselStateFactory.create())
 
         val isAlreadyHaveAccountEnabled = vectorFeatures.isOnboardingAlreadyHaveAccountSplashEnabled()
@@ -76,11 +88,11 @@ class FtueAuthSplashCarouselFragment @Inject constructor(
             debouncedClicks { alreadyHaveAnAccount() }
         }
 
-        if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
+        if (buildMeta.isDebug || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}#${BuildConfig.BUILD_NUMBER}\n" +
-                    "Branch: ${BuildConfig.GIT_BRANCH_NAME}"
+            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}#${buildMeta.buildNumber}\n" +
+                    "Branch: ${buildMeta.gitBranchName}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
         views.splashCarousel.registerAutomaticUntilInteractionTransitions()
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
index cd1e4b2714..a04e8a5c01 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthSplashFragment.kt
@@ -22,8 +22,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.isVisible
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.databinding.FragmentFtueAuthSplashBinding
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.onboarding.OnboardingAction
@@ -36,7 +36,8 @@ import javax.inject.Inject
  */
 class FtueAuthSplashFragment @Inject constructor(
         private val vectorPreferences: VectorPreferences,
-        private val vectorFeatures: VectorFeatures
+        private val vectorFeatures: VectorFeatures,
+        private val buildMeta: BuildMeta,
 ) : AbstractFtueAuthFragment<FragmentFtueAuthSplashBinding>() {
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentFtueAuthSplashBinding {
@@ -59,12 +60,12 @@ class FtueAuthSplashFragment @Inject constructor(
             debouncedClicks { alreadyHaveAnAccount() }
         }
 
-        if (BuildConfig.DEBUG || vectorPreferences.developerMode()) {
+        if (buildMeta.isDebug || vectorPreferences.developerMode()) {
             views.loginSplashVersion.isVisible = true
             @SuppressLint("SetTextI18n")
-            views.loginSplashVersion.text = "Version : ${BuildConfig.VERSION_NAME}\n" +
-                    "Branch: ${BuildConfig.GIT_BRANCH_NAME}\n" +
-                    "Build: ${BuildConfig.BUILD_NUMBER}"
+            views.loginSplashVersion.text = "Version : ${buildMeta.versionName}\n" +
+                    "Branch: ${buildMeta.gitBranchName}\n" +
+                    "Build: ${buildMeta.buildNumber}"
             views.loginSplashVersion.debouncedClicks { navigator.openDebug(requireContext()) }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
index 69548f24f0..1688452167 100644
--- a/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
@@ -24,6 +24,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import com.airbnb.mvrx.args
+import com.airbnb.mvrx.asMavericksArgs
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.R
 import im.vector.app.core.extensions.replaceFragment
@@ -33,7 +34,7 @@ import im.vector.app.databinding.FragmentPinBinding
 import im.vector.app.features.MainActivity
 import im.vector.app.features.MainActivityArgs
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricAuthError
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguratorProvider
+import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import im.vector.app.features.pin.lockscreen.ui.AuthMethod
 import im.vector.app.features.pin.lockscreen.ui.LockScreenFragment
@@ -51,7 +52,7 @@ data class PinArgs(
 class PinFragment @Inject constructor(
         private val pinCodeStore: PinCodeStore,
         private val vectorPreferences: VectorPreferences,
-        private val configuratorProvider: LockScreenConfiguratorProvider,
+        private val defaultConfiguration: LockScreenConfiguration,
 ) : VectorBaseFragment<FragmentPinBinding>() {
 
     private val fragmentArgs: PinArgs by args()
@@ -81,21 +82,17 @@ class PinFragment @Inject constructor(
                 vectorBaseActivity.finish()
             }
         }
-
-        configuratorProvider.updateDefaultConfiguration {
-            copy(
-                    mode = LockScreenMode.CREATE,
-                    title = getString(R.string.create_pin_title),
-                    needsNewCodeValidation = true,
-                    newCodeConfirmationTitle = getString(R.string.create_pin_confirm_title),
-            )
-        }
+        createFragment.arguments = defaultConfiguration.copy(
+                mode = LockScreenMode.CREATE,
+                title = getString(R.string.create_pin_title),
+                needsNewCodeValidation = true,
+                newCodeConfirmationTitle = getString(R.string.create_pin_confirm_title),
+        ).asMavericksArgs()
         replaceFragment(R.id.pinFragmentContainer, createFragment)
     }
 
     private fun showAuthFragment() {
         val authFragment = LockScreenFragment()
-        val canUseBiometrics = vectorPreferences.useBiometricsToUnlock()
         authFragment.onLeftButtonClickedListener = View.OnClickListener { displayForgotPinWarningDialog() }
         authFragment.lockScreenListener = object : LockScreenListener {
             override fun onAuthenticationFailure(authMethod: AuthMethod) {
@@ -133,18 +130,12 @@ class PinFragment @Inject constructor(
                         .show()
             }
         }
-        configuratorProvider.updateDefaultConfiguration {
-            copy(
-                    mode = LockScreenMode.VERIFY,
-                    title = getString(R.string.auth_pin_title),
-                    isStrongBiometricsEnabled = isStrongBiometricsEnabled && canUseBiometrics,
-                    isWeakBiometricsEnabled = isWeakBiometricsEnabled && canUseBiometrics,
-                    isDeviceCredentialUnlockEnabled = isDeviceCredentialUnlockEnabled && canUseBiometrics,
-                    autoStartBiometric = canUseBiometrics,
-                    leftButtonTitle = getString(R.string.auth_pin_forgot),
-                    clearCodeOnError = true,
-            )
-        }
+        authFragment.arguments = defaultConfiguration.copy(
+                mode = LockScreenMode.VERIFY,
+                title = getString(R.string.auth_pin_title),
+                leftButtonTitle = getString(R.string.auth_pin_forgot),
+                clearCodeOnError = true,
+        ).asMavericksArgs()
         replaceFragment(R.id.pinFragmentContainer, authFragment)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
index ae4fa637b4..9bcf6e4264 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/biometrics/BiometricHelper.kt
@@ -31,10 +31,12 @@ import androidx.biometric.BiometricPrompt
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import im.vector.app.R
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguratorProvider
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeyRepository
 import im.vector.app.features.pin.lockscreen.ui.fallbackprompt.FallbackBiometricDialogFragment
 import im.vector.app.features.pin.lockscreen.utils.DevicePromptCheck
@@ -54,22 +56,24 @@ import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import java.security.KeyStore
 import javax.crypto.Cipher
-import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
 
 /**
  * This is a helper to manage system authentication (biometric and other types) and the system key.
  */
-class BiometricHelper @Inject constructor(
+class BiometricHelper @AssistedInject constructor(
+        @Assisted private val configuration: LockScreenConfiguration,
         @ApplicationContext private val context: Context,
         private val lockScreenKeyRepository: LockScreenKeyRepository,
-        private val configurationProvider: LockScreenConfiguratorProvider,
         private val biometricManager: BiometricManager,
         private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
 ) {
     private var prompt: BiometricPrompt? = null
 
-    private val configuration: LockScreenConfiguration get() = configurationProvider.currentConfiguration
+    @AssistedFactory
+    interface BiometricHelperFactory {
+        fun create(configuration: LockScreenConfiguration): BiometricHelper
+    }
 
     /**
      * Returns true if a weak biometric method (i.e.: some face or iris unlock implementations) can be used.
@@ -174,16 +178,18 @@ class BiometricHelper @Inject constructor(
                 when (val exception = result.exceptionOrNull()) {
                     null -> result.getOrNull()?.let { emit(it) }
                     else -> {
-                        // Exception found, stop collecting, throw it and remove the prompt reference
+                        // Exception found:
+                        // 1. Stop collecting.
+                        // 2. Remove the system key if we were creating it.
+                        // 3. Throw the exception and remove the prompt reference
+                        if (!checkSystemKeyExists) {
+                            lockScreenKeyRepository.deleteSystemKey()
+                        }
                         prompt = null
                         throw exception
                     }
                 }
             }
-            // Generates the system key on successful authentication
-            if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M) {
-                lockScreenKeyRepository.ensureSystemKey()
-            }
             // Channel is closed, remove prompt reference
             prompt = null
         }
@@ -213,11 +219,11 @@ class BiometricHelper @Inject constructor(
                 .setAllowedAuthenticators(authenticators)
                 .build()
 
-        return BiometricPrompt(activity, executor, callback).also {
+        return BiometricPrompt(activity, executor, callback).also { prompt ->
             showFallbackFragmentIfNeeded(activity, channel.receiveAsFlow(), executor.asCoroutineDispatcher()) {
                 // For some reason this seems to be needed unless we want to receive a fragment transaction exception
                 delay(1L)
-                it.authenticate(promptInfo, cryptoObject)
+                prompt.authenticate(promptInfo, cryptoObject)
             }
         }
     }
@@ -253,11 +259,9 @@ class BiometricHelper @Inject constructor(
     ): BiometricPrompt.AuthenticationCallback = object : BiometricPrompt.AuthenticationCallback() {
         private val scope = CoroutineScope(coroutineContext)
         override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-            scope.launch {
-                // Error is a terminal event, should close both the Channel and the CoroutineScope to free resources.
-                channel.close(BiometricAuthError(errorCode, errString.toString()))
-                scope.cancel()
-            }
+            // Error is a terminal event, should close both the Channel and the CoroutineScope to free resources.
+            channel.close(BiometricAuthError(errorCode, errString.toString()))
+            scope.cancel()
         }
 
         override fun onAuthenticationFailed() {
@@ -274,10 +278,8 @@ class BiometricHelper @Inject constructor(
                     scope.cancel()
                 }
             } else {
-                scope.launch {
-                    channel.close(IllegalStateException("System key was not valid after authentication."))
-                    scope.cancel()
-                }
+                channel.close(IllegalStateException("System key was not valid after authentication."))
+                scope.cancel()
             }
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguration.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguration.kt
index 8f3e67dfe5..12846c254c 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguration.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguration.kt
@@ -16,9 +16,13 @@
 
 package im.vector.app.features.pin.lockscreen.configuration
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
 /**
  * Configuration to be used by the lockscreen feature.
  */
+@Parcelize
 data class LockScreenConfiguration(
         /** Which mode should the UI display, [LockScreenMode.VERIFY] or [LockScreenMode.CREATE]. */
         val mode: LockScreenMode,
@@ -56,4 +60,4 @@ data class LockScreenConfiguration(
         val biometricSubtitle: String? = null,
         /** Text for the cancel button of the Biometric prompt dialog. Optional. */
         val biometricCancelButtonTitle: String? = null,
-)
+) : Parcelable
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguratorProvider.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguratorProvider.kt
deleted file mode 100644
index 338ac66125..0000000000
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/configuration/LockScreenConfiguratorProvider.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2022 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package im.vector.app.features.pin.lockscreen.configuration
-
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import javax.inject.Inject
-import javax.inject.Singleton
-
-/**
- * Class used to hold both the [defaultConfiguration] and an updated version in [currentConfiguration].
- */
-@Singleton
-class LockScreenConfiguratorProvider @Inject constructor(
-        /** Default [LockScreenConfiguration], any derived configuration created using [updateDefaultConfiguration] will use this as a base. */
-        val defaultConfiguration: LockScreenConfiguration,
-) {
-
-    private val mutableConfigurationFlow = MutableStateFlow(defaultConfiguration)
-
-    /**
-     * A [Flow] that emits any changes in configuration.
-     */
-    val configurationFlow: Flow<LockScreenConfiguration> = mutableConfigurationFlow
-
-    /**
-     * The current configuration to be read and used.
-     */
-    val currentConfiguration get() = mutableConfigurationFlow.value
-
-    /**
-     * Applies the changes in [block] to the [defaultConfiguration] to generate a new [currentConfiguration].
-     */
-    fun updateDefaultConfiguration(block: LockScreenConfiguration.() -> LockScreenConfiguration) {
-        mutableConfigurationFlow.value = defaultConfiguration.block()
-    }
-
-    /**
-     * Resets the [currentConfiguration] to the [defaultConfiguration].
-     */
-    fun reset() {
-        mutableConfigurationFlow.value = defaultConfiguration
-    }
-}
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
index 4c52fccbaa..a42ce3a9b7 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/KeyStoreCrypto.kt
@@ -26,6 +26,7 @@ import androidx.biometric.BiometricPrompt
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import org.matrix.android.sdk.api.extensions.tryOrNull
 import org.matrix.android.sdk.api.securestorage.SecretStoringUtils
 import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import java.security.Key
@@ -112,12 +113,8 @@ class KeyStoreCrypto @AssistedInject constructor(
     fun hasValidKey(): Boolean {
         val keyExists = hasKey()
         return if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M && keyExists) {
-            try {
-                ensureKey()
-                true
-            } catch (e: KeyPermanentlyInvalidatedException) {
-                false
-            }
+            val initializedKey = tryOrNull("Error validating lockscreen system key.") { ensureKey() }
+            initializedKey != null
         } else {
             keyExists
         }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
index 68acfcebf3..bb55ceb1b7 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/LockScreenKeysMigrator.kt
@@ -40,7 +40,7 @@ class LockScreenKeysMigrator @Inject constructor(
     suspend fun migrateIfNeeded() {
         if (legacyPinCodeMigrator.isMigrationNeeded()) {
             legacyPinCodeMigrator.migrate()
-            missingSystemKeyMigrator.migrate()
+            missingSystemKeyMigrator.migrateIfNeeded()
         }
 
         if (systemKeyV1Migrator.isMigrationNeeded() && versionProvider.get() >= Build.VERSION_CODES.M) {
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
index f8d3520047..4c33c14954 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigrator.kt
@@ -18,7 +18,6 @@ package im.vector.app.features.pin.lockscreen.crypto.migrations
 
 import android.annotation.SuppressLint
 import android.os.Build
-import android.security.keystore.KeyPermanentlyInvalidatedException
 import im.vector.app.features.pin.lockscreen.crypto.KeyStoreCrypto
 import im.vector.app.features.pin.lockscreen.di.BiometricKeyAlias
 import im.vector.app.features.settings.VectorPreferences
@@ -40,12 +39,15 @@ class MissingSystemKeyMigrator @Inject constructor(
      * If user had biometric auth enabled, ensure system key exists, creating one if needed.
      */
     @SuppressLint("NewApi")
-    fun migrate() {
+    fun migrateIfNeeded() {
         if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M && vectorPreferences.useBiometricsToUnlock()) {
-            try {
-                keystoreCryptoFactory.provide(systemKeyAlias, true).ensureKey()
-            } catch (e: KeyPermanentlyInvalidatedException) {
-                Timber.e("Could not automatically create biometric key.", e)
+            val systemKeyStoreCrypto = keystoreCryptoFactory.provide(systemKeyAlias, true)
+            runCatching {
+                systemKeyStoreCrypto.ensureKey()
+            }.onFailure { e ->
+                Timber.e(e, "Could not automatically create biometric key. Biometric authentication will be disabled.")
+                systemKeyStoreCrypto.deleteKey()
+                vectorPreferences.setUseBiometricToUnlock(false)
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1Migrator.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1Migrator.kt
index 25e9d24272..748001af8b 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1Migrator.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1Migrator.kt
@@ -20,6 +20,8 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import im.vector.app.features.pin.lockscreen.crypto.KeyStoreCrypto
 import im.vector.app.features.pin.lockscreen.di.BiometricKeyAlias
+import im.vector.app.features.settings.VectorPreferences
+import timber.log.Timber
 import java.security.KeyStore
 import javax.inject.Inject
 
@@ -30,6 +32,7 @@ class SystemKeyV1Migrator @Inject constructor(
         @BiometricKeyAlias private val systemKeyAlias: String,
         private val keyStore: KeyStore,
         private val keystoreCryptoFactory: KeyStoreCrypto.Factory,
+        private val vectorPreferences: VectorPreferences,
 ) {
 
     /**
@@ -39,7 +42,13 @@ class SystemKeyV1Migrator @Inject constructor(
     fun migrate() {
         keyStore.deleteEntry(SYSTEM_KEY_ALIAS_V1)
         val systemKeyStoreCrypto = keystoreCryptoFactory.provide(systemKeyAlias, keyNeedsUserAuthentication = true)
-        systemKeyStoreCrypto.ensureKey()
+        runCatching {
+            systemKeyStoreCrypto.ensureKey()
+        }.onFailure { e ->
+            Timber.e(e, "Could not migrate v1 biometric key. Biometric authentication will be disabled.")
+            systemKeyStoreCrypto.deleteKey()
+            vectorPreferences.setUseBiometricToUnlock(false)
+        }
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/di/LockScreenModule.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/di/LockScreenModule.kt
index fb333b96bb..811a66f3af 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/di/LockScreenModule.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/di/LockScreenModule.kt
@@ -16,8 +16,10 @@
 
 package im.vector.app.features.pin.lockscreen.di
 
+import android.app.KeyguardManager
 import android.content.Context
 import androidx.biometric.BiometricManager
+import androidx.core.content.getSystemService
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
@@ -83,6 +85,9 @@ object LockScreenModule {
             SecretStoringUtils(context, keyStore, buildVersionSdkIntProvider),
             buildVersionSdkIntProvider,
     )
+
+    @Provides
+    fun provideKeyguardManager(context: Context): KeyguardManager = context.getSystemService()!!
 }
 
 @Module
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenAction.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenAction.kt
index 7f8d08dddd..729cf24aa5 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenAction.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenAction.kt
@@ -22,4 +22,5 @@ import im.vector.app.core.platform.VectorViewModelAction
 sealed class LockScreenAction : VectorViewModelAction {
     data class PinCodeEntered(val value: String) : LockScreenAction()
     data class ShowBiometricPrompt(val callingActivity: FragmentActivity) : LockScreenAction()
+    object OnUIReady : LockScreenAction()
 }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
index 0e6fdfb61e..a7a228a105 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenFragment.kt
@@ -23,7 +23,6 @@ import android.view.ViewGroup
 import android.view.animation.AnimationUtils
 import android.widget.TextView
 import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
@@ -55,22 +54,7 @@ class LockScreenFragment : VectorBaseFragment<FragmentLockScreenBinding>() {
             handleEvent(it)
         }
 
-        withState(viewModel) { state ->
-            if (state.lockScreenConfiguration.mode == LockScreenMode.CREATE) return@withState
-
-            viewLifecycleOwner.lifecycleScope.launchWhenResumed {
-                if (state.isBiometricKeyInvalidated) {
-                    lockScreenListener?.onBiometricKeyInvalidated()
-                } else if (state.showBiometricPromptAutomatically) {
-                    showBiometricPrompt()
-                }
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        viewModel.reset()
+        viewModel.handle(LockScreenAction.OnUIReady)
     }
 
     override fun invalidate() = withState(viewModel) { state ->
@@ -83,6 +67,7 @@ class LockScreenFragment : VectorBaseFragment<FragmentLockScreenBinding>() {
                 setupTitleView(views.titleTextView, false, state.lockScreenConfiguration)
             }
         }
+
         renderDeleteOrFingerprintButtons(views, views.codeView.enteredDigits)
     }
 
@@ -123,6 +108,8 @@ class LockScreenFragment : VectorBaseFragment<FragmentLockScreenBinding>() {
             is LockScreenViewEvent.AuthSuccessful -> lockScreenListener?.onAuthenticationSuccess(viewEvent.method)
             is LockScreenViewEvent.AuthFailure -> onAuthFailure(viewEvent.method)
             is LockScreenViewEvent.AuthError -> onAuthError(viewEvent.method, viewEvent.throwable)
+            is LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage -> lockScreenListener?.onBiometricKeyInvalidated()
+            is LockScreenViewEvent.ShowBiometricPromptAutomatically -> showBiometricPrompt()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewEvent.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewEvent.kt
index cbde16876c..543ed58ffa 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewEvent.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewEvent.kt
@@ -24,4 +24,6 @@ sealed class LockScreenViewEvent : VectorViewEvents {
     data class AuthSuccessful(val method: AuthMethod) : LockScreenViewEvent()
     data class AuthFailure(val method: AuthMethod) : LockScreenViewEvent()
     data class AuthError(val method: AuthMethod, val throwable: Throwable) : LockScreenViewEvent()
+    object ShowBiometricKeyInvalidatedMessage : LockScreenViewEvent()
+    object ShowBiometricPromptAutomatically : LockScreenViewEvent()
 }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
index 79c1967670..d40f67ea35 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewModel.kt
@@ -17,12 +17,11 @@
 package im.vector.app.features.pin.lockscreen.ui
 
 import android.annotation.SuppressLint
+import android.app.KeyguardManager
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import androidx.fragment.app.FragmentActivity
 import com.airbnb.mvrx.MavericksViewModelFactory
-import com.airbnb.mvrx.ViewModelContext
-import com.airbnb.mvrx.withState
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -31,26 +30,29 @@ import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricAuthError
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricHelper
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguratorProvider
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeysMigrator
 import im.vector.app.features.pin.lockscreen.pincode.PinCodeHelper
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.emitAll
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
 
 class LockScreenViewModel @AssistedInject constructor(
         @Assisted val initialState: LockScreenViewState,
         private val pinCodeHelper: PinCodeHelper,
-        private val biometricHelper: BiometricHelper,
+        biometricHelperFactory: BiometricHelper.BiometricHelperFactory,
         private val lockScreenKeysMigrator: LockScreenKeysMigrator,
-        private val configuratorProvider: LockScreenConfiguratorProvider,
-        private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
+        private val versionProvider: BuildVersionSdkIntProvider,
+        private val keyguardManager: KeyguardManager,
 ) : VectorViewModel<LockScreenViewState, LockScreenAction, LockScreenViewEvent>(initialState) {
 
     @AssistedFactory
@@ -58,27 +60,9 @@ class LockScreenViewModel @AssistedInject constructor(
         override fun create(initialState: LockScreenViewState): LockScreenViewModel
     }
 
-    companion object : MavericksViewModelFactory<LockScreenViewModel, LockScreenViewState> by hiltMavericksViewModelFactory() {
+    companion object : MavericksViewModelFactory<LockScreenViewModel, LockScreenViewState> by hiltMavericksViewModelFactory()
 
-        override fun initialState(viewModelContext: ViewModelContext): LockScreenViewState {
-            return LockScreenViewState(
-                    lockScreenConfiguration = DUMMY_CONFIGURATION,
-                    canUseBiometricAuth = false,
-                    showBiometricPromptAutomatically = false,
-                    pinCodeState = PinCodeState.Idle,
-                    isBiometricKeyInvalidated = false,
-            )
-        }
-
-        private val DUMMY_CONFIGURATION = LockScreenConfiguration(
-                mode = LockScreenMode.VERIFY,
-                pinCodeLength = 4,
-                isStrongBiometricsEnabled = false,
-                isDeviceCredentialUnlockEnabled = false,
-                isWeakBiometricsEnabled = false,
-                needsNewCodeValidation = false,
-        )
-    }
+    private val biometricHelper = biometricHelperFactory.create(initialState.lockScreenConfiguration)
 
     private var firstEnteredCode: String? = null
 
@@ -86,18 +70,37 @@ class LockScreenViewModel @AssistedInject constructor(
     private var isSystemAuthTemporarilyDisabledByBiometricPrompt = false
 
     init {
-        // We need this to run synchronously before we start reading the configurations
-        runBlocking { lockScreenKeysMigrator.migrateIfNeeded() }
+        viewModelScope.launch {
+            // Wait until the keyguard is unlocked before performing migrations, it might cause crashes otherwise on Android 12 and 12L
+            waitUntilKeyguardIsUnlocked()
+            // Migrate pin code / system keys if needed
+            lockScreenKeysMigrator.migrateIfNeeded()
+            // Update initial state with biometric info
+            updateStateWithBiometricInfo()
+        }
+    }
+
+    private fun observeStateChanges() {
+        // The first time the state allows it, show the biometric prompt
+        viewModelScope.launch {
+            if (stateFlow.firstOrNull { it.showBiometricPromptAutomatically } != null) {
+                _viewEvents.post(LockScreenViewEvent.ShowBiometricPromptAutomatically)
+            }
+        }
 
-        configuratorProvider.configurationFlow
-                .onEach { updateConfiguration(it) }
-                .launchIn(viewModelScope)
+        // The first time the state allows it, react to biometric key being invalidated
+        viewModelScope.launch {
+            if (stateFlow.firstOrNull { it.isBiometricKeyInvalidated } != null) {
+                onBiometricKeyInvalidated()
+            }
+        }
     }
 
     override fun handle(action: LockScreenAction) {
         when (action) {
             is LockScreenAction.PinCodeEntered -> onPinCodeEntered(action.value)
             is LockScreenAction.ShowBiometricPrompt -> showBiometricPrompt(action.callingActivity)
+            is LockScreenAction.OnUIReady -> observeStateChanges()
         }
     }
 
@@ -141,13 +144,18 @@ class LockScreenViewModel @AssistedInject constructor(
     private fun showBiometricPrompt(activity: FragmentActivity) = flow {
         emitAll(biometricHelper.authenticate(activity))
     }.catch { error ->
-        if (buildVersionSdkIntProvider.get() >= Build.VERSION_CODES.M && error is KeyPermanentlyInvalidatedException) {
-            removeBiometricAuthentication()
-        } else if (error is BiometricAuthError && error.isAuthDisabledError) {
-            isSystemAuthTemporarilyDisabledByBiometricPrompt = true
-            updateStateWithBiometricInfo()
+        when {
+            versionProvider.get() >= Build.VERSION_CODES.M && error is KeyPermanentlyInvalidatedException -> {
+                onBiometricKeyInvalidated()
+            }
+            else -> {
+                if (error is BiometricAuthError && error.isAuthDisabledError) {
+                    isSystemAuthTemporarilyDisabledByBiometricPrompt = true
+                    updateStateWithBiometricInfo()
+                }
+                _viewEvents.post(LockScreenViewEvent.AuthError(AuthMethod.BIOMETRICS, error))
+            }
         }
-        _viewEvents.post(LockScreenViewEvent.AuthError(AuthMethod.BIOMETRICS, error))
     }.onEach { success ->
         _viewEvents.post(
                 if (success) LockScreenViewEvent.AuthSuccessful(AuthMethod.BIOMETRICS)
@@ -155,24 +163,22 @@ class LockScreenViewModel @AssistedInject constructor(
         )
     }.launchIn(viewModelScope)
 
-    fun reset() {
-        configuratorProvider.reset()
-    }
-
-    private fun removeBiometricAuthentication() {
+    private suspend fun onBiometricKeyInvalidated() {
         biometricHelper.disableAuthentication()
         updateStateWithBiometricInfo()
+        _viewEvents.post(LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage)
     }
 
-    private fun updateStateWithBiometricInfo() {
-        val configuration = withState(this) { it.lockScreenConfiguration }
-        val canUseBiometricAuth = configuration.mode == LockScreenMode.VERIFY &&
+    @SuppressLint("NewApi")
+    private suspend fun updateStateWithBiometricInfo() {
+        // This is a terrible hack, but I found no other way to ensure this would be called only after the device is considered unlocked on Android 12+
+        waitUntilKeyguardIsUnlocked()
+        setState {
+            val isBiometricKeyInvalidated = biometricHelper.hasSystemKey && !biometricHelper.isSystemKeyValid
+            val canUseBiometricAuth = lockScreenConfiguration.mode == LockScreenMode.VERIFY &&
                 !isSystemAuthTemporarilyDisabledByBiometricPrompt &&
                 biometricHelper.isSystemAuthEnabledAndValid
-        val isBiometricKeyInvalidated = biometricHelper.hasSystemKey && !biometricHelper.isSystemKeyValid
-        val showBiometricPromptAutomatically = canUseBiometricAuth &&
-                configuration.autoStartBiometric
-        setState {
+            val showBiometricPromptAutomatically = canUseBiometricAuth && lockScreenConfiguration.autoStartBiometric
             copy(
                     canUseBiometricAuth = canUseBiometricAuth,
                     showBiometricPromptAutomatically = showBiometricPromptAutomatically,
@@ -181,8 +187,18 @@ class LockScreenViewModel @AssistedInject constructor(
         }
     }
 
-    private fun updateConfiguration(configuration: LockScreenConfiguration) {
-        setState { copy(lockScreenConfiguration = configuration) }
-        updateStateWithBiometricInfo()
+    /**
+     * Wait until the device is unlocked. There seems to be a behavior change on Android 12 that makes [KeyguardManager.isDeviceLocked] return `false` even
+     * after an Activity's `onResume` method. If we mix that with the system keys needing the device to be unlocked before they're used, we get crashes.
+     * See issue [#6768](https://github.com/vector-im/element-android/issues/6768).
+     */
+    @SuppressLint("NewApi")
+    private suspend fun waitUntilKeyguardIsUnlocked() {
+        if (versionProvider.get() < Build.VERSION_CODES.S) return
+        withTimeoutOrNull(5.seconds) {
+            while (keyguardManager.isDeviceLocked) {
+                delay(50.milliseconds)
+            }
+        }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewState.kt b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewState.kt
index 8d2037953b..f689e1faf1 100644
--- a/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/pin/lockscreen/ui/LockScreenViewState.kt
@@ -25,7 +25,11 @@ data class LockScreenViewState(
         val showBiometricPromptAutomatically: Boolean,
         val pinCodeState: PinCodeState,
         val isBiometricKeyInvalidated: Boolean,
-) : MavericksState
+) : MavericksState {
+    constructor(lockScreenConfiguration: LockScreenConfiguration) : this(
+            lockScreenConfiguration, false, false, PinCodeState.Idle, false
+    )
+}
 
 sealed class PinCodeState {
     object Idle : PinCodeState()
diff --git a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
index 3a5bb8f648..b29863d3d5 100755
--- a/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
+++ b/vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
@@ -30,6 +30,7 @@ import im.vector.app.R
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.extensions.getAllChildFragments
 import im.vector.app.core.extensions.toOnOff
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.features.settings.VectorLocale
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.settings.devtools.GossipingEventsSerializer
@@ -50,6 +51,7 @@ import okhttp3.Response
 import org.json.JSONException
 import org.json.JSONObject
 import org.matrix.android.sdk.api.Matrix
+import org.matrix.android.sdk.api.util.BuildVersionSdkIntProvider
 import org.matrix.android.sdk.api.util.JsonDict
 import org.matrix.android.sdk.api.util.MatrixJsonParser
 import org.matrix.android.sdk.api.util.MimeTypes
@@ -74,7 +76,9 @@ class BugReporter @Inject constructor(
         private val vectorPreferences: VectorPreferences,
         private val vectorFileLogger: VectorFileLogger,
         private val systemLocaleProvider: SystemLocaleProvider,
-        private val matrix: Matrix
+        private val matrix: Matrix,
+        private val buildMeta: BuildMeta,
+        private val sdkIntProvider: BuildVersionSdkIntProvider,
 ) {
     var inMultiWindowMode = false
 
@@ -287,14 +291,14 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
                             .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false))
-                            .addFormDataPart("branch_name", BuildConfig.GIT_BRANCH_NAME)
+                            .addFormDataPart("branch_name", buildMeta.gitBranchName)
                             .addFormDataPart("matrix_sdk_version", Matrix.getSdkVersion())
                             .addFormDataPart("olm_version", olmVersion)
                             .addFormDataPart("device", Build.MODEL.trim())
                             .addFormDataPart("verbose_log", vectorPreferences.labAllowedExtendedLogging().toOnOff())
                             .addFormDataPart("multi_window", inMultiWindowMode.toOnOff())
                             .addFormDataPart(
-                                    "os", Build.VERSION.RELEASE + " (API " + Build.VERSION.SDK_INT + ") " +
+                                    "os", Build.VERSION.RELEASE + " (API " + sdkIntProvider.get() + ") " +
                                     Build.VERSION.INCREMENTAL + "-" + Build.VERSION.CODENAME
                             )
                             .addFormDataPart("locale", Locale.getDefault().toString())
@@ -308,7 +312,7 @@ class BugReporter @Inject constructor(
                                 }
                             }
 
-                    val buildNumber = BuildConfig.BUILD_NUMBER
+                    val buildNumber = buildMeta.buildNumber
                     if (buildNumber.isNotEmpty() && buildNumber != "0") {
                         builder.addFormDataPart("build_number", buildNumber)
                     }
@@ -348,9 +352,9 @@ class BugReporter @Inject constructor(
                     screenshot = null
 
                     // add some github labels
-                    builder.addFormDataPart("label", BuildConfig.VERSION_NAME)
-                    builder.addFormDataPart("label", BuildConfig.FLAVOR_DESCRIPTION)
-                    builder.addFormDataPart("label", BuildConfig.GIT_BRANCH_NAME)
+                    builder.addFormDataPart("label", buildMeta.versionName)
+                    builder.addFormDataPart("label", buildMeta.flavorDescription)
+                    builder.addFormDataPart("label", buildMeta.gitBranchName)
 
                     // Special for Element
                     builder.addFormDataPart("label", "[${BuildConfig.FLAVOR_target}]")
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/CryptoConfig.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/CryptoConfig.kt
new file mode 100644
index 0000000000..130fa0078a
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/CryptoConfig.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.raw.wellknown
+
+import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
+
+data class CryptoConfig(
+        val fallbackKeySharingStrategy: OutboundSessionKeySharingStrategy
+)
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
index 0df5f0e9cf..78329350d3 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
@@ -68,7 +68,7 @@ data class E2EWellKnownConfig(
         val secureBackupSetupMethods: List<String>? = null,
 
         /**
-         * Configuration for sharing keys strategy which should be used instead of [im.vector.app.BuildConfig.outboundSessionKeySharingStrategy].
+         * Configuration for sharing keys strategy which should be used instead of [im.vector.app.config.Config.KEY_SHARING_STRATEGY].
          * One of on_room_opening, on_typing or disabled.
          */
         @Json(name = "outbound_keys_pre_sharing_mode")
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
index 73662613f7..28c7fecf0b 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnownExt.kt
@@ -16,7 +16,6 @@
 
 package im.vector.app.features.raw.wellknown
 
-import im.vector.app.BuildConfig
 import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -35,12 +34,12 @@ suspend fun RawService.getElementWellknown(sessionParams: SessionParams): Elemen
 
 fun ElementWellKnown.isE2EByDefault() = elementE2E?.e2eDefault ?: riotE2E?.e2eDefault ?: true
 
-fun ElementWellKnown?.getOutboundSessionKeySharingStrategyOrDefault(): OutboundSessionKeySharingStrategy {
+fun ElementWellKnown?.getOutboundSessionKeySharingStrategyOrDefault(fallback: OutboundSessionKeySharingStrategy): OutboundSessionKeySharingStrategy {
     return when (this?.elementE2E?.outboundsKeyPreSharingMode) {
         "on_room_opening" -> OutboundSessionKeySharingStrategy.WhenEnteringRoom
         "on_typing" -> OutboundSessionKeySharingStrategy.WhenTyping
         "disabled" -> OutboundSessionKeySharingStrategy.WhenSendingEvent
-        else -> BuildConfig.outboundSessionKeySharingStrategy
+        else -> fallback
     }
 }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
index 04d54ee447..d677fbb68d 100644
--- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt
@@ -30,7 +30,7 @@ import fr.gouv.tchap.android.sdk.api.session.room.model.RoomAccessRules
 import fr.gouv.tchap.android.sdk.api.session.room.model.RoomAccessRulesContent
 import fr.gouv.tchap.core.utils.TchapRoomType
 import fr.gouv.tchap.core.utils.TchapUtils
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
@@ -62,7 +62,7 @@ class CreateRoomViewModel @AssistedInject constructor(
         @Assisted private val initialState: CreateRoomViewState,
         private val session: Session,
         private val rawService: RawService,
-        appStateHandler: AppStateHandler,
+        spaceStateHandler: SpaceStateHandler,
         private val analyticsTracker: AnalyticsTracker
 ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
 
@@ -80,7 +80,7 @@ class CreateRoomViewModel @AssistedInject constructor(
         initUserDomain()
         initAdminE2eByDefault()
 
-        val parentSpaceId = initialState.parentSpaceId ?: appStateHandler.safeActiveSpaceId()
+        val parentSpaceId = initialState.parentSpaceId ?: spaceStateHandler.getSafeActiveSpaceId()
 
         val restrictedSupport = session.homeServerCapabilitiesService().getHomeServerCapabilities()
                 .isFeatureSupported(HomeServerCapabilities.ROOM_CAP_RESTRICTED)
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
index d050b0d561..686c87a18c 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileFragment.kt
@@ -334,7 +334,7 @@ class RoomMemberProfileFragment @Inject constructor(
                 .setNeutralButton(R.string.ok, null)
                 .setPositiveButton(R.string.share_by_text) { _, _ ->
                     startSharePlainTextIntent(
-                            fragment = this,
+                            context = requireContext(),
                             activityResultLauncher = null,
                             chooserTitle = null,
                             text = permalink
diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
index 2c30555696..d38b2a0a69 100644
--- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileViewModel.kt
@@ -117,7 +117,7 @@ class RoomMemberProfileViewModel @AssistedInject constructor(
                             it.fold(true) { prev, dev -> prev && (dev.trustLevel?.crossSigningVerified == true) }
                     )
                 }
-                .execute { it ->
+                .execute {
                     copy(
                             allDevicesAreTrusted = it()?.first == true,
                             allDevicesAreCrossSignedTrusted = it()?.second == true
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
index 152e222ab8..a914d5da2c 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt
@@ -345,7 +345,7 @@ class RoomProfileFragment @Inject constructor(
 
     private fun onShareRoomProfile(permalink: String) {
         startSharePlainTextIntent(
-                fragment = this,
+                context = requireContext(),
                 activityResultLauncher = null,
                 chooserTitle = null,
                 text = permalink
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
index 75ef2442b9..177934c129 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorLocale.kt
@@ -19,9 +19,9 @@ package im.vector.app.features.settings
 import android.content.Context
 import android.content.res.Configuration
 import androidx.core.content.edit
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.resources.BuildMeta
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -53,12 +53,14 @@ object VectorLocale {
         private set
 
     private lateinit var context: Context
+    private lateinit var buildMeta: BuildMeta
 
     /**
      * Init this object.
      */
-    fun init(context: Context) {
+    fun init(context: Context, buildMeta: BuildMeta) {
         this.context = context
+        this.buildMeta = buildMeta
         val preferences = DefaultSharedPreferences.getInstance(context)
 
         if (preferences.contains(APPLICATION_LOCALE_LANGUAGE_KEY)) {
@@ -174,7 +176,7 @@ object VectorLocale {
                         .setScript(script)
                         .build()
             } catch (exception: IllformedLocaleException) {
-                if (BuildConfig.DEBUG) {
+                if (buildMeta.isDebug) {
                     throw exception
                 }
                 // Ignore this locale in production
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index e7d38173cc..bf19cebf53 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -23,9 +23,10 @@ import android.provider.MediaStore
 import androidx.annotation.BoolRes
 import androidx.core.content.edit
 import com.squareup.seismic.ShakeDetector
-import im.vector.app.BuildConfig
 import im.vector.app.R
+import im.vector.app.config.Config
 import im.vector.app.core.di.DefaultSharedPreferences
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.time.Clock
 import im.vector.app.features.disclaimer.SHARED_PREF_KEY
 import im.vector.app.features.home.ShortcutsHandler
@@ -38,6 +39,7 @@ import javax.inject.Inject
 class VectorPreferences @Inject constructor(
         private val context: Context,
         private val clock: Clock,
+        private val buildMeta: BuildMeta,
 ) {
 
     companion object {
@@ -369,7 +371,7 @@ class VectorPreferences @Inject constructor(
     }
 
     fun failFast(): Boolean {
-        return BuildConfig.DEBUG || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
+        return buildMeta.isDebug || (developerMode() && defaultPrefs.getBoolean(SETTINGS_DEVELOPER_MODE_FAIL_FAST_PREFERENCE_KEY, false))
     }
 
     fun didAskUserToEnableSessionPush(): Boolean {
@@ -1036,7 +1038,7 @@ class VectorPreferences @Inject constructor(
 
     fun prefSpacesShowAllRoomInHome(): Boolean {
         // Tchap: Show all rooms in the home while the spaces are hidden
-        return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, BuildConfig.SPACES_SHOW_ALL_IN_HOME)
+        return defaultPrefs.getBoolean(SETTINGS_PREF_SPACE_SHOW_ALL_ROOM_IN_HOME, Config.SPACES_SHOW_ALL_IN_HOME)
     }
 
     /*
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
index 5844467a1f..df7baa7397 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
@@ -18,10 +18,10 @@ package im.vector.app.features.settings
 
 import android.os.Bundle
 import androidx.preference.Preference
-import im.vector.app.BuildConfig
 import im.vector.app.R
 import im.vector.app.core.extensions.orEmpty
 import im.vector.app.core.preference.VectorPreference
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.utils.FirstThrottler
 import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.openAppSettingsPage
@@ -32,7 +32,8 @@ import org.matrix.android.sdk.api.Matrix
 import javax.inject.Inject
 
 class VectorSettingsHelpAboutFragment @Inject constructor(
-        private val versionProvider: VersionProvider
+        private val versionProvider: VersionProvider,
+        private val buildMeta: BuildMeta,
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.preference_root_help_about
@@ -66,9 +67,9 @@ class VectorSettingsHelpAboutFragment @Inject constructor(
         findPreference<VectorPreference>(VectorPreferences.SETTINGS_VERSION_PREFERENCE_KEY)!!.let {
             it.summary = buildString {
                 append(versionProvider.getVersion(longFormat = false, useBuildNumber = true))
-                if (BuildConfig.DEBUG) {
+                if (buildMeta.isDebug) {
                     append(" ")
-                    append(BuildConfig.GIT_BRANCH_NAME)
+                    append(buildMeta.gitBranchName)
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
index 087ee18afa..db402758f1 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
@@ -28,6 +28,8 @@ import im.vector.app.features.notifications.NotificationDrawerManager
 import im.vector.app.features.pin.PinCodeStore
 import im.vector.app.features.pin.PinMode
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricHelper
+import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
+import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.extensions.orFalse
@@ -38,12 +40,15 @@ class VectorSettingsPinFragment @Inject constructor(
         private val pinCodeStore: PinCodeStore,
         private val navigator: Navigator,
         private val notificationDrawerManager: NotificationDrawerManager,
-        private val biometricHelper: BiometricHelper,
+        biometricHelperFactory: BiometricHelper.BiometricHelperFactory,
+        defaultLockScreenConfiguration: LockScreenConfiguration,
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.settings_security_application_protection_screen_title
     override val preferenceXmlRes = R.xml.vector_settings_pin
 
+    private val biometricHelper = biometricHelperFactory.create(defaultLockScreenConfiguration.copy(mode = LockScreenMode.CREATE))
+
     private val usePinCodePref by lazy {
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_PIN_CODE_FLAG)!!
     }
@@ -60,17 +65,16 @@ class VectorSettingsPinFragment @Inject constructor(
         findPreference<SwitchPreference>(VectorPreferences.SETTINGS_SECURITY_USE_BIOMETRICS_FLAG)!!
     }
 
-    private fun shouldCheckBiometricPref(isPinCodeChecked: Boolean): Boolean {
-        return isPinCodeChecked && // Biometric auth depends on PIN auth
-                biometricHelper.isSystemAuthEnabledAndValid &&
-                biometricHelper.isSystemKeyValid
+    private fun updateBiometricPrefState(isPinCodeChecked: Boolean) {
+        // Biometric auth depends on PIN auth
+        useBiometricPref.isEnabled = isPinCodeChecked && biometricHelper.canUseAnySystemAuth
+        useBiometricPref.isChecked = isPinCodeChecked && biometricHelper.isSystemAuthEnabledAndValid
     }
 
     override fun onResume() {
         super.onResume()
 
-        useBiometricPref.isEnabled = usePinCodePref.isChecked
-        useBiometricPref.isChecked = shouldCheckBiometricPref(usePinCodePref.isChecked)
+        updateBiometricPrefState(isPinCodeChecked = usePinCodePref.isChecked)
     }
 
     override fun bindPref() {
@@ -78,8 +82,7 @@ class VectorSettingsPinFragment @Inject constructor(
 
         usePinCodePref.setOnPreferenceChangeListener { _, value ->
             val isChecked = (value as? Boolean).orFalse()
-            useBiometricPref.isEnabled = isChecked
-            useBiometricPref.isChecked = shouldCheckBiometricPref(isChecked)
+            updateBiometricPrefState(isPinCodeChecked = isChecked)
             if (!isChecked) {
                 disableBiometricAuthentication()
             }
@@ -104,9 +107,10 @@ class VectorSettingsPinFragment @Inject constructor(
                     }.onFailure {
                         showEnableBiometricErrorMessage()
                     }
-                    useBiometricPref.isChecked = shouldCheckBiometricPref(usePinCodePref.isChecked)
+
+                    updateBiometricPrefState(isPinCodeChecked = usePinCodePref.isChecked)
                 }
-                false
+                true
             } else {
                 disableBiometricAuthentication()
                 true
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
index dfd2e703a1..9c66d3976c 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
@@ -36,7 +36,6 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import im.vector.app.BuildConfig
 import im.vector.app.R
-import im.vector.app.config.analyticsConfig
 import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.dialogs.ExportKeysDialog
 import im.vector.app.core.extensions.queryExportKeys
@@ -52,6 +51,7 @@ import im.vector.app.core.utils.copyToClipboard
 import im.vector.app.core.utils.openFileSelection
 import im.vector.app.core.utils.toast
 import im.vector.app.databinding.DialogImportE2eKeysBinding
+import im.vector.app.features.analytics.AnalyticsConfig
 import im.vector.app.features.analytics.plan.MobileScreen
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewActions
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
@@ -85,7 +85,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
         private val keysExporter: KeysExporter,
         private val keysImporter: KeysImporter,
         private val rawService: RawService,
-        private val navigator: Navigator
+        private val navigator: Navigator,
+        private val analyticsConfig: AnalyticsConfig,
 ) : VectorSettingsBaseFragment() {
 
     override var titleRes = R.string.settings_security_and_privacy
diff --git a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
index 0eb22bf24d..8a3407b428 100644
--- a/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationsTroubleshootFragment.kt
@@ -34,7 +34,7 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.platform.VectorBaseFragment
 import im.vector.app.databinding.FragmentSettingsNotificationsTroubleshootBinding
-import im.vector.app.features.notifications.NotificationUtils
+import im.vector.app.features.notifications.NotificationActionIds
 import im.vector.app.features.rageshake.BugReporter
 import im.vector.app.features.settings.VectorSettingsFragmentInteractionListener
 import im.vector.app.features.settings.troubleshoot.NotificationTroubleshootTestManager
@@ -46,7 +46,8 @@ import javax.inject.Inject
 
 class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
         private val bugReporter: BugReporter,
-        private val testManagerFactory: NotificationTroubleshootTestManagerFactory
+        private val testManagerFactory: NotificationTroubleshootTestManagerFactory,
+        private val actionIds: NotificationActionIds,
 ) : VectorBaseFragment<FragmentSettingsNotificationsTroubleshootBinding>() {
 
     private var testManager: NotificationTroubleshootTestManager? = null
@@ -151,11 +152,11 @@ class VectorSettingsNotificationsTroubleshootFragment @Inject constructor(
 
         tryOrNull("Unable to register the receiver") {
             LocalBroadcastManager.getInstance(requireContext())
-                    .registerReceiver(broadcastReceiverPush, IntentFilter(NotificationUtils.PUSH_ACTION))
+                    .registerReceiver(broadcastReceiverPush, IntentFilter(actionIds.push))
         }
         tryOrNull("Unable to register the receiver") {
             LocalBroadcastManager.getInstance(requireContext())
-                    .registerReceiver(broadcastReceiverNotification, IntentFilter(NotificationUtils.DIAGNOSTIC_ACTION))
+                    .registerReceiver(broadcastReceiverNotification, IntentFilter(actionIds.diagnostic))
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
index ad131cbd57..b358a8c1a6 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListFragment.kt
@@ -31,21 +31,25 @@ import im.vector.app.core.extensions.cleanup
 import im.vector.app.core.extensions.configureWith
 import im.vector.app.core.platform.StateView
 import im.vector.app.core.platform.VectorBaseFragment
-import im.vector.app.databinding.FragmentGroupListBinding
+import im.vector.app.databinding.FragmentSpaceListBinding
 import im.vector.app.features.home.HomeActivitySharedAction
 import im.vector.app.features.home.HomeSharedActionViewModel
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
 import javax.inject.Inject
 
+/**
+ * This Fragment is displayed in the navigation drawer [im.vector.app.features.home.HomeDrawerFragment] and
+ * is displaying the space hierarchy, with some actions on Spaces.
+ */
 class SpaceListFragment @Inject constructor(
         private val spaceController: SpaceSummaryController
-) : VectorBaseFragment<FragmentGroupListBinding>(), SpaceSummaryController.Callback {
+) : VectorBaseFragment<FragmentSpaceListBinding>(), SpaceSummaryController.Callback {
 
     private lateinit var sharedActionViewModel: HomeSharedActionViewModel
     private val viewModel: SpaceListViewModel by fragmentViewModel()
 
-    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGroupListBinding {
-        return FragmentGroupListBinding.inflate(inflater, container, false)
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentSpaceListBinding {
+        return FragmentSpaceListBinding.inflate(inflater, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
index a104e9b170..eea11f9b1b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
@@ -23,7 +23,7 @@ import com.airbnb.mvrx.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.VectorViewModel
@@ -61,7 +61,7 @@ import org.matrix.android.sdk.flow.flow
 
 class SpaceListViewModel @AssistedInject constructor(
         @Assisted initialState: SpaceListViewState,
-        private val appStateHandler: AppStateHandler,
+        private val spaceStateHandler: SpaceStateHandler,
         private val session: Session,
         private val vectorPreferences: VectorPreferences,
         private val autoAcceptInvites: AutoAcceptInvites,
@@ -85,8 +85,7 @@ class SpaceListViewModel @AssistedInject constructor(
                 }
 
         observeSpaceSummaries()
-//        observeSelectionState()
-        appStateHandler.selectedSpaceFlow
+        spaceStateHandler.getSelectedSpaceFlow()
                 .distinctUntilChanged()
                 .setOnEach { selectedSpaceOption ->
                     copy(
@@ -219,7 +218,7 @@ class SpaceListViewModel @AssistedInject constructor(
         if (state.selectedSpace?.roomId != action.spaceSummary?.roomId) {
             analyticsTracker.capture(Interaction(null, null, Interaction.Name.SpacePanelSwitchSpace))
             setState { copy(selectedSpace = action.spaceSummary) }
-            appStateHandler.setCurrentSpace(action.spaceSummary?.roomId)
+            spaceStateHandler.setCurrentSpace(action.spaceSummary?.roomId)
             _viewEvents.post(SpaceListViewEvents.CloseDrawer)
         } else {
             analyticsTracker.capture(Interaction(null, null, Interaction.Name.SpacePanelSelectedSpace))
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
index 7b53b09187..6b1f9f88d5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
@@ -24,7 +24,7 @@ import com.airbnb.mvrx.Uninitialized
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
@@ -50,7 +50,7 @@ import timber.log.Timber
 class SpaceMenuViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceMenuState,
         val session: Session,
-        val appStateHandler: AppStateHandler
+        val spaceStateHandler: SpaceStateHandler
 ) : VectorViewModel<SpaceMenuState, SpaceLeaveViewAction, EmptyViewEvents>(initialState) {
 
     @AssistedFactory
@@ -73,9 +73,9 @@ class SpaceMenuViewModel @AssistedInject constructor(
                 it.getOrNull()?.let {
                     if (it.membership == Membership.LEAVE) {
                         setState { copy(leavingState = Success(Unit)) }
-                        if (appStateHandler.safeActiveSpaceId() == initialState.spaceId) {
+                        if (spaceStateHandler.getSafeActiveSpaceId() == initialState.spaceId) {
                             // switch to home?
-                            appStateHandler.setCurrentSpace(null, session)
+                            spaceStateHandler.setCurrentSpace(null, session)
                         }
                     }
                 }
diff --git a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
index 7413386709..800447d4c5 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/leave/SpaceLeaveAdvancedViewModel.kt
@@ -24,7 +24,7 @@ import com.airbnb.mvrx.Uninitialized
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.AppStateHandler
+import im.vector.app.SpaceStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
 import im.vector.app.core.platform.EmptyViewEvents
@@ -53,7 +53,7 @@ import timber.log.Timber
 class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
         @Assisted val initialState: SpaceLeaveAdvanceViewState,
         private val session: Session,
-        private val appStateHandler: AppStateHandler
+        private val spaceStateHandler: SpaceStateHandler
 ) : VectorViewModel<SpaceLeaveAdvanceViewState, SpaceLeaveAdvanceViewAction, EmptyViewEvents>(initialState) {
 
     init {
@@ -75,19 +75,19 @@ class SpaceLeaveAdvancedViewModel @AssistedInject constructor(
         }
 
         setState { copy(spaceSummary = spaceSummary) }
-        session.getRoom(initialState.spaceId)?.let { room ->
-            room.flow().liveRoomSummary()
-                    .unwrap()
-                    .onEach {
-                        if (it.membership == Membership.LEAVE) {
-                            setState { copy(leaveState = Success(Unit)) }
-                            if (appStateHandler.safeActiveSpaceId() == initialState.spaceId) {
-                                // switch to home?
-                                appStateHandler.setCurrentSpace(null, session)
-                            }
+        session.getRoom(initialState.spaceId)
+                ?.flow()
+                ?.liveRoomSummary()
+                ?.unwrap()
+                ?.onEach {
+                    if (it.membership == Membership.LEAVE) {
+                        setState { copy(leaveState = Success(Unit)) }
+                        if (spaceStateHandler.getSafeActiveSpaceId() == initialState.spaceId) {
+                            // switch to home?
+                            spaceStateHandler.setCurrentSpace(null, session)
                         }
-                    }.launchIn(viewModelScope)
-        }
+                    }
+                }?.launchIn(viewModelScope)
 
         viewModelScope.launch {
             val children = session.roomService().getRoomSummaries(
diff --git a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
index 72a2b6c156..3b0bc7f0fe 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/share/ShareSpaceBottomSheet.kt
@@ -89,7 +89,7 @@ class ShareSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetSpa
                 }
                 is ShareSpaceViewEvents.ShowInviteByLink -> {
                     startSharePlainTextIntent(
-                            fragment = this,
+                            context = requireContext(),
                             activityResultLauncher = null,
                             chooserTitle = getString(R.string.share_by_text),
                             text = getString(R.string.share_space_link_message, event.spaceName, event.permalink),
diff --git a/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt b/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
index 62a7517f5a..4b2e7bef98 100644
--- a/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/start/StartAppViewModel.kt
@@ -20,9 +20,10 @@ import com.airbnb.mvrx.MavericksViewModelFactory
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import im.vector.app.core.di.ActiveSessionSetter
+import im.vector.app.core.di.ActiveSessionHolder
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.dispatchers.CoroutineDispatchers
 import im.vector.app.core.platform.VectorViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -31,7 +32,8 @@ import kotlin.time.Duration.Companion.seconds
 
 class StartAppViewModel @AssistedInject constructor(
         @Assisted val initialState: StartAppViewState,
-        private val activeSessionSetter: ActiveSessionSetter,
+        private val sessionHolder: ActiveSessionHolder,
+        private val dispatchers: CoroutineDispatchers,
 ) : VectorViewModel<StartAppViewState, StartAppAction, StartAppViewEvent>(initialState) {
 
     @AssistedFactory
@@ -42,7 +44,7 @@ class StartAppViewModel @AssistedInject constructor(
     companion object : MavericksViewModelFactory<StartAppViewModel, StartAppViewState> by hiltMavericksViewModelFactory()
 
     fun shouldStartApp(): Boolean {
-        return activeSessionSetter.shouldSetActionSession()
+        return sessionHolder.isWaitingForSessionInitialization()
     }
 
     override fun handle(action: StartAppAction) {
@@ -53,13 +55,17 @@ class StartAppViewModel @AssistedInject constructor(
 
     private fun handleStartApp() {
         handleLongProcessing()
-        viewModelScope.launch(Dispatchers.IO) {
+        viewModelScope.launch(dispatchers.io) {
             // This can take time because of DB migration(s), so do it in a background task.
-            activeSessionSetter.tryToSetActiveSession(startSync = true)
+            eagerlyInitializeSession()
             _viewEvents.post(StartAppViewEvent.AppStarted)
         }
     }
 
+    private suspend fun eagerlyInitializeSession() {
+        sessionHolder.getOrInitializeSession(startSync = true)
+    }
+
     private fun handleLongProcessing() {
         viewModelScope.launch(Dispatchers.Default) {
             delay(1.seconds.inWholeMilliseconds)
diff --git a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt b/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
index a31b0d3a25..259a220874 100644
--- a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt
@@ -67,7 +67,7 @@ class ShowUserCodeFragment @Inject constructor(
         sharedViewModel.observeViewEvents {
             if (it is UserCodeShareViewEvents.SharePlainText) {
                 startSharePlainTextIntent(
-                        fragment = this,
+                        context = requireContext(),
                         activityResultLauncher = null,
                         chooserTitle = it.title,
                         text = it.text,
diff --git a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
index b31833e37c..3fe95cfb7c 100644
--- a/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/userdirectory/UserListFragment.kt
@@ -96,7 +96,7 @@ class UserListFragment @Inject constructor(
                 is UserListViewEvents.OpenShareMatrixToLink -> {
                     val text = getString(R.string.invite_friends_text, it.link)
                     startSharePlainTextIntent(
-                            fragment = this,
+                            context = requireContext(),
                             activityResultLauncher = null,
                             chooserTitle = getString(R.string.invite_friends),
                             text = text,
diff --git a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
index 96a7d917e5..4c8188dc8b 100644
--- a/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/version/VersionProvider.kt
@@ -16,24 +16,27 @@
 
 package im.vector.app.features.version
 
-import im.vector.app.BuildConfig
+import im.vector.app.core.resources.BuildMeta
 import im.vector.app.core.resources.VersionCodeProvider
 import javax.inject.Inject
 
-class VersionProvider @Inject constructor(private val versionCodeProvider: VersionCodeProvider) {
+class VersionProvider @Inject constructor(
+        private val versionCodeProvider: VersionCodeProvider,
+        private val buildMeta: BuildMeta,
+) {
 
     fun getVersion(longFormat: Boolean, useBuildNumber: Boolean): String {
-        var result = "${BuildConfig.VERSION_NAME} [${versionCodeProvider.getVersionCode()}]"
+        var result = "${buildMeta.versionName} [${versionCodeProvider.getVersionCode()}]"
 
-        var flavor = BuildConfig.SHORT_FLAVOR_DESCRIPTION
+        var flavor = buildMeta.flavorShortDescription
 
         if (flavor.isNotBlank()) {
             flavor += "-"
         }
 
-        var gitVersion = BuildConfig.GIT_REVISION
-        val gitRevisionDate = BuildConfig.GIT_REVISION_DATE
-        val buildNumber = BuildConfig.BUILD_NUMBER
+        var gitVersion = buildMeta.gitRevision
+        val gitRevisionDate = buildMeta.gitRevisionDate
+        val buildNumber = buildMeta.buildNumber
 
         var useLongFormat = longFormat
 
diff --git a/vector/src/main/res/drawable/ic_attachment_location_live_white.xml b/vector/src/main/res/drawable/ic_attachment_live_location_white.xml
similarity index 100%
rename from vector/src/main/res/drawable/ic_attachment_location_live_white.xml
rename to vector/src/main/res/drawable/ic_attachment_live_location_white.xml
diff --git a/vector/src/main/res/drawable/ic_location_pin_failed.xml b/vector/src/main/res/drawable/ic_location_pin_failed.xml
deleted file mode 100644
index 250d048836..0000000000
--- a/vector/src/main/res/drawable/ic_location_pin_failed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="70dp"
-    android:height="70dp"
-    android:viewportWidth="70"
-    android:viewportHeight="70">
-  <path
-      android:pathData="M34.9997,5.8335C23.7122,5.8335 14.583,15.2112 14.583,26.8059C14.583,39.2995 27.4747,56.5269 32.783,63.0882C33.9497,64.5264 36.0788,64.5264 37.2455,63.0882C42.5247,56.5269 55.4163,39.2995 55.4163,26.8059C55.4163,15.2112 46.2872,5.8335 34.9997,5.8335ZM34.9997,34.2961C30.9747,34.2961 27.708,30.9405 27.708,26.8059C27.708,22.6714 30.9747,19.3158 34.9997,19.3158C39.0247,19.3158 42.2913,22.6714 42.2913,26.8059C42.2913,30.9405 39.0247,34.2961 34.9997,34.2961Z"
-      android:fillColor="#C1C6CD"/>
-</vector>
diff --git a/vector/src/main/res/drawable/ic_search_no_results.xml b/vector/src/main/res/drawable/ic_search_no_results.xml
index 24c0f00131..b87f25f0eb 100644
--- a/vector/src/main/res/drawable/ic_search_no_results.xml
+++ b/vector/src/main/res/drawable/ic_search_no_results.xml
@@ -17,4 +17,4 @@
         android:left="14dp"
         android:right="14dp"
         android:top="14dp" />
-</layer-list>
\ No newline at end of file
+</layer-list>
diff --git a/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml b/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml
index 438e60a4d3..a95f5f9554 100644
--- a/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml
+++ b/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml
@@ -17,7 +17,7 @@
         android:backgroundTint="?vctr_live_location"
         android:importantForAccessibility="no"
         android:padding="4dp"
-        android:src="@drawable/ic_attachment_location_live_white" />
+        android:src="@drawable/ic_attachment_live_location_white" />
 
     <TextView
         style="@style/TextAppearance.Vector.Headline.Medium"
diff --git a/vector/src/main/res/layout/fragment_ftue_combined_login.xml b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
index 9533ab29fc..12943b4dc0 100644
--- a/vector/src/main/res/layout/fragment_ftue_combined_login.xml
+++ b/vector/src/main/res/layout/fragment_ftue_combined_login.xml
@@ -147,6 +147,7 @@
             app:layout_constraintTop_toBottomOf="@id/serverSelectionSpacing">
 
             <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginEditText"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionNext"
@@ -176,6 +177,7 @@
             app:layout_constraintTop_toBottomOf="@id/entrySpacing">
 
             <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/loginPasswordEditText"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionDone"
diff --git a/vector/src/main/res/layout/fragment_ftue_combined_register.xml b/vector/src/main/res/layout/fragment_ftue_combined_register.xml
index 0a7b5b57d0..605254fc0a 100644
--- a/vector/src/main/res/layout/fragment_ftue_combined_register.xml
+++ b/vector/src/main/res/layout/fragment_ftue_combined_register.xml
@@ -145,6 +145,7 @@
             app:layout_constraintTop_toBottomOf="@id/serverSelectionSpacing">
 
             <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/createAccountEditText"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionNext"
@@ -186,6 +187,7 @@
             app:layout_constraintTop_toBottomOf="@id/entrySpacing">
 
             <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/createAccountPassword"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:imeOptions="actionDone"
diff --git a/vector/src/main/res/layout/fragment_location_live_map_view.xml b/vector/src/main/res/layout/fragment_live_location_map_view.xml
similarity index 88%
rename from vector/src/main/res/layout/fragment_location_live_map_view.xml
rename to vector/src/main/res/layout/fragment_live_location_map_view.xml
index f0a3fbfc89..369404ddbd 100644
--- a/vector/src/main/res/layout/fragment_location_live_map_view.xml
+++ b/vector/src/main/res/layout/fragment_live_location_map_view.xml
@@ -17,6 +17,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <im.vector.app.features.location.MapLoadingErrorView
+        android:id="@+id/mapPreviewLoadingError"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="180dp"
+        android:visibility="gone" />
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottomSheet"
         android:layout_width="match_parent"
@@ -49,7 +56,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <im.vector.app.features.location.live.LocationLiveEndedBannerView
+    <im.vector.app.features.location.live.LiveLocationEndedBannerView
         android:id="@+id/liveLocationMapFragmentEndedBanner"
         android:layout_width="match_parent"
         android:layout_height="56dp"
diff --git a/vector/src/main/res/layout/fragment_location_preview.xml b/vector/src/main/res/layout/fragment_location_preview.xml
index 5499e5b427..126edbb5e1 100644
--- a/vector/src/main/res/layout/fragment_location_preview.xml
+++ b/vector/src/main/res/layout/fragment_location_preview.xml
@@ -6,9 +6,23 @@
 
     <im.vector.app.features.location.MapTilerMapView
         android:id="@+id/mapView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:mapbox_renderTextureMode="true"
         app:showLocateButton="false" />
 
+    <im.vector.app.features.location.MapLoadingErrorView
+        android:id="@+id/mapPreviewLoadingError"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_location_sharing.xml b/vector/src/main/res/layout/fragment_location_sharing.xml
index cd15f418ea..4f0825b992 100644
--- a/vector/src/main/res/layout/fragment_location_sharing.xml
+++ b/vector/src/main/res/layout/fragment_location_sharing.xml
@@ -52,4 +52,14 @@
         app:layout_constraintBottom_toBottomOf="@id/shareLocationOptionsPicker"
         app:layout_constraintEnd_toEndOf="@id/shareLocationOptionsPicker" />
 
+    <im.vector.app.features.location.MapLoadingErrorView
+        android:id="@+id/shareLocationMapLoadingError"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/shareLocationOptionsPicker"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_new_home_detail.xml b/vector/src/main/res/layout/fragment_new_home_detail.xml
new file mode 100644
index 0000000000..b0e7bf7634
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_new_home_detail.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <im.vector.app.core.ui.views.KeysBackupBanner
+        android:id="@+id/homeKeysBackupBanner"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="?vctr_keys_backup_banner_accent_color"
+        android:minHeight="67dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="gone" />
+
+    <im.vector.app.core.ui.views.CurrentCallsView
+        android:id="@+id/currentCallsView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="48dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/homeKeysBackupBanner"
+        tools:visibility="gone" />
+
+    <im.vector.app.features.sync.widget.SyncStateView
+        android:id="@+id/syncStateView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/currentCallsView"
+        tools:visibility="gone" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/currentCallsView">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            app:layout_constraintTop_toBottomOf="@id/syncStateView">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                style="@style/Widget.Vector.Material3.CollapsingToolbar.Medium"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Widget.Vector.Material3.Toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:elevation="0dp"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/all_chats">
+
+                    <ImageView
+                        android:id="@+id/avatar"
+                        android:layout_width="36dp"
+                        android:layout_height="36dp"
+                        android:padding="6dp"
+                        android:contentDescription="@string/a11y_open_settings"
+                        tools:src="@sample/user_round_avatars" />
+
+                </com.google.android.material.appbar.MaterialToolbar>
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.fragment.app.FragmentContainerView
+                android:id="@+id/roomListContainer"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toTopOf="@id/bottomNavigationView"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <com.google.android.material.bottomnavigation.BottomNavigationView
+                android:id="@+id/bottomNavigationView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:menu="@menu/home_bottom_navigation" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/fragment_group_list.xml b/vector/src/main/res/layout/fragment_space_list.xml
similarity index 92%
rename from vector/src/main/res/layout/fragment_group_list.xml
rename to vector/src/main/res/layout/fragment_space_list.xml
index cdf0ffeb9a..d54ffa7155 100644
--- a/vector/src/main/res/layout/fragment_group_list.xml
+++ b/vector/src/main/res/layout/fragment_space_list.xml
@@ -10,6 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:overScrollMode="always"
-        tools:listitem="@layout/item_group" />
+        tools:listitem="@layout/item_space" />
 
 </im.vector.app.core.platform.StateView>
diff --git a/vector/src/main/res/layout/fragment_timeline.xml b/vector/src/main/res/layout/fragment_timeline.xml
index ea35d82886..d505e23103 100644
--- a/vector/src/main/res/layout/fragment_timeline.xml
+++ b/vector/src/main/res/layout/fragment_timeline.xml
@@ -45,8 +45,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/appBarLayout" />
 
-    <im.vector.app.features.location.live.LocationLiveStatusView
-        android:id="@+id/locationLiveStatusIndicator"
+    <im.vector.app.features.location.live.LiveLocationStatusView
+        android:id="@+id/liveLocationStatusIndicator"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:visibility="gone"
@@ -63,7 +63,7 @@
         android:minHeight="54dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/locationLiveStatusIndicator" />
+        app:layout_constraintTop_toBottomOf="@id/liveLocationStatusIndicator" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/timelineRecyclerView"
diff --git a/vector/src/main/res/layout/item_recent_room.xml b/vector/src/main/res/layout/item_recent_room.xml
new file mode 100644
index 0000000000..8e17707ff3
--- /dev/null
+++ b/vector/src/main/res/layout/item_recent_room.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/recentRoot"
+    android:layout_width="60dp"
+    android:layout_height="wrap_content"
+    android:background="?android:colorBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?attr/selectableItemBackground"
+    tools:viewBindingIgnore="true">
+
+    <ImageView
+        android:id="@+id/recentImageView"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginHorizontal="12dp"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription"
+        tools:src="@sample/room_round_avatars" />
+
+    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
+        android:id="@+id/recentUnreadCounterBadgeView"
+        style="@style/Widget.Vector.TextView.Micro"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:minWidth="18dp"
+        android:minHeight="18dp"
+        android:textColor="?colorOnError"
+        android:visibility="gone"
+        app:layout_constraintCircle="@id/recentImageView"
+        app:layout_constraintCircleAngle="45"
+        app:layout_constraintCircleRadius="28dp"
+        tools:background="@drawable/bg_unread_highlight"
+        tools:ignore="MissingConstraints"
+        tools:text="24"
+        tools:visibility="visible" />
+
+
+    <TextView
+        android:id="@+id/recentTitle"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:textColor="?vctr_content_primary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/recentImageView"
+        tools:text="Coffee" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
index 53b740bb4e..3495f4cae0 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_inactive_stub.xml
@@ -7,7 +7,7 @@
 
     <!-- Size will be overrode -->
     <ImageView
-        android:id="@+id/locationLiveInactiveMap"
+        android:id="@+id/liveLocationInactiveMap"
         android:layout_width="300dp"
         android:layout_height="200dp"
         android:contentDescription="@string/a11y_static_map_image"
@@ -15,29 +15,29 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <im.vector.app.features.location.live.LocationLiveEndedBannerView
-        android:id="@+id/locationLiveEndedBanner"
+    <im.vector.app.features.location.live.LiveLocationEndedBannerView
+        android:id="@+id/liveLocationEndedBanner"
         android:layout_width="0dp"
         android:layout_height="48dp"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveInactiveMap"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationInactiveMap"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationInactiveMap"
+        app:layout_constraintStart_toStartOf="@id/liveLocationInactiveMap"
         app:locLiveEndedBkgWithAlpha="true"
         app:locLiveEndedIconMarginStart="8dp" />
 
     <ImageView
-        android:id="@+id/locationLiveInactiveIcon"
+        android:id="@+id/liveLocationInactiveIcon"
         android:layout_width="0dp"
         android:layout_height="65dp"
         android:src="@drawable/ic_attachment_location_white"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveInactiveVerticalCenter"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveInactiveMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveInactiveMap"
+        app:layout_constraintBottom_toTopOf="@id/liveLocationInactiveVerticalCenter"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationInactiveMap"
+        app:layout_constraintStart_toStartOf="@id/liveLocationInactiveMap"
         app:tint="?vctr_content_quaternary"
         tools:ignore="ContentDescription" />
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/locationLiveInactiveVerticalCenter"
+        android:id="@+id/liveLocationInactiveVerticalCenter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
diff --git a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
index 9b44cc495b..617edbf4b2 100644
--- a/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_live_location_start_stub.xml
@@ -7,7 +7,7 @@
 
     <!-- Size will be overrode -->
     <ImageView
-        android:id="@+id/locationLiveStartMap"
+        android:id="@+id/liveLocationStartMap"
         android:layout_width="300dp"
         android:layout_height="200dp"
         android:contentDescription="@string/a11y_static_map_image"
@@ -16,18 +16,18 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
-        android:id="@+id/locationLiveStartBanner"
+        android:id="@+id/liveLocationStartBanner"
         android:layout_width="0dp"
         android:layout_height="48dp"
         android:alpha="0.75"
         android:src="?android:colorBackground"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveStartMap"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveStartMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveStartMap"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationStartMap"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationStartMap"
+        app:layout_constraintStart_toStartOf="@id/liveLocationStartMap"
         tools:ignore="ContentDescription" />
 
     <ImageView
-        android:id="@+id/locationLiveStartIcon"
+        android:id="@+id/liveLocationStartIcon"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginVertical="8dp"
@@ -35,15 +35,15 @@
         android:background="@drawable/circle"
         android:backgroundTint="?vctr_content_quaternary"
         android:padding="3dp"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveStartBanner"
-        app:layout_constraintStart_toStartOf="@id/locationLiveStartBanner"
-        app:layout_constraintTop_toTopOf="@id/locationLiveStartBanner"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationStartBanner"
+        app:layout_constraintStart_toStartOf="@id/liveLocationStartBanner"
+        app:layout_constraintTop_toTopOf="@id/liveLocationStartBanner"
+        app:srcCompat="@drawable/ic_attachment_live_location_white"
         app:tint="?android:colorBackground"
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/locationLiveStartTitle"
+        android:id="@+id/liveLocationStartTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -52,19 +52,19 @@
         android:ellipsize="end"
         android:text="@string/location_share_live_started"
         android:textColor="?vctr_content_tertiary"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveStartBanner"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveStartBanner"
-        app:layout_constraintStart_toEndOf="@id/locationLiveStartIcon"
-        app:layout_constraintTop_toTopOf="@id/locationLiveStartBanner" />
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationStartBanner"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationStartBanner"
+        app:layout_constraintStart_toEndOf="@id/liveLocationStartIcon"
+        app:layout_constraintTop_toTopOf="@id/liveLocationStartBanner" />
 
     <ProgressBar
-        android:id="@+id/locationLiveStartLoader"
+        android:id="@+id/liveLocationStartLoader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:indeterminateTint="?vctr_content_quaternary"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveStartBanner"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveStartMap"
-        app:layout_constraintStart_toStartOf="@id/locationLiveStartMap"
-        app:layout_constraintTop_toTopOf="@id/locationLiveStartMap" />
+        app:layout_constraintBottom_toTopOf="@id/liveLocationStartBanner"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationStartMap"
+        app:layout_constraintStart_toStartOf="@id/liveLocationStartMap"
+        app:layout_constraintTop_toTopOf="@id/liveLocationStartMap" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_timeline_event_location_stub.xml b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
index 3875a25773..8de98b2260 100644
--- a/vector/src/main/res/layout/item_timeline_event_location_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
@@ -29,24 +29,19 @@
         app:layout_constraintTop_toTopOf="@id/staticMapImageView"
         app:layout_constraintVertical_bias="1.0" />
 
-    <TextView
-        android:id="@+id/staticMapErrorTextView"
-        style="@style/Widget.Vector.TextView.Subtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal|bottom"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="54dp"
-        android:text="@string/location_timeline_failed_to_load_map"
-        android:textColor="?vctr_content_tertiary"
+    <im.vector.app.features.location.MapLoadingErrorView
+        android:id="@+id/staticMapLoadingError"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@id/staticMapPinImageView"
-        app:layout_constraintStart_toStartOf="@id/staticMapPinImageView"
-        app:layout_constraintTop_toBottomOf="@id/staticMapPinImageView"
-        tools:visibility="visible" />
+        app:layout_constraintBottom_toTopOf="@id/liveLocationRunningBanner"
+        app:layout_constraintEnd_toEndOf="@id/staticMapImageView"
+        app:layout_constraintStart_toStartOf="@id/staticMapImageView"
+        app:layout_constraintTop_toTopOf="@id/staticMapImageView"
+        app:mapErrorDescription="@string/location_timeline_failed_to_load_map" />
 
-    <im.vector.app.features.location.live.LocationLiveRunningBannerView
-        android:id="@+id/locationLiveRunningBanner"
+    <im.vector.app.features.location.live.LiveLocationRunningBannerView
+        android:id="@+id/liveLocationRunningBanner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/view_location_live_ended_banner.xml b/vector/src/main/res/layout/view_live_location_ended_banner.xml
similarity index 70%
rename from vector/src/main/res/layout/view_location_live_ended_banner.xml
rename to vector/src/main/res/layout/view_live_location_ended_banner.xml
index 983f268757..bb19a1e0d9 100644
--- a/vector/src/main/res/layout/view_location_live_ended_banner.xml
+++ b/vector/src/main/res/layout/view_live_location_ended_banner.xml
@@ -7,7 +7,7 @@
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
-        android:id="@+id/locationLiveEndedBannerBackground"
+        android:id="@+id/liveLocationEndedBannerBackground"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:src="?android:colorBackground"
@@ -18,7 +18,7 @@
         tools:ignore="ContentDescription" />
 
     <ImageView
-        android:id="@+id/locationLiveEndedBannerIcon"
+        android:id="@+id/liveLocationEndedBannerIcon"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginVertical="8dp"
@@ -26,15 +26,15 @@
         android:background="@drawable/circle"
         android:backgroundTint="?vctr_content_quaternary"
         android:padding="3dp"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveEndedBannerBackground"
-        app:layout_constraintStart_toStartOf="@id/locationLiveEndedBannerBackground"
-        app:layout_constraintTop_toTopOf="@id/locationLiveEndedBannerBackground"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationEndedBannerBackground"
+        app:layout_constraintStart_toStartOf="@id/liveLocationEndedBannerBackground"
+        app:layout_constraintTop_toTopOf="@id/liveLocationEndedBannerBackground"
+        app:srcCompat="@drawable/ic_attachment_live_location_white"
         app:tint="?android:colorBackground"
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/locationLiveEndedTitle"
+        android:id="@+id/liveLocationEndedTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -43,8 +43,8 @@
         android:lines="1"
         android:text="@string/location_share_live_ended"
         android:textColor="?vctr_content_tertiary"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveEndedBannerBackground"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveEndedBannerBackground"
-        app:layout_constraintStart_toEndOf="@id/locationLiveEndedBannerIcon"
-        app:layout_constraintTop_toTopOf="@id/locationLiveEndedBannerBackground" />
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationEndedBannerBackground"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationEndedBannerBackground"
+        app:layout_constraintStart_toEndOf="@id/liveLocationEndedBannerIcon"
+        app:layout_constraintTop_toTopOf="@id/liveLocationEndedBannerBackground" />
 </merge>
diff --git a/vector/src/main/res/layout/view_location_live_running_banner.xml b/vector/src/main/res/layout/view_live_location_running_banner.xml
similarity index 71%
rename from vector/src/main/res/layout/view_location_live_running_banner.xml
rename to vector/src/main/res/layout/view_live_location_running_banner.xml
index 5bf8c8258d..862c0f6dbd 100644
--- a/vector/src/main/res/layout/view_location_live_running_banner.xml
+++ b/vector/src/main/res/layout/view_live_location_running_banner.xml
@@ -7,7 +7,7 @@
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <ImageView
-        android:id="@+id/locationLiveRunningBannerBackground"
+        android:id="@+id/liveLocationRunningBannerBackground"
         android:layout_width="0dp"
         android:layout_height="50dp"
         android:alpha="0.75"
@@ -18,7 +18,7 @@
         tools:ignore="ContentDescription" />
 
     <ImageView
-        android:id="@+id/locationLiveRunningBannerIcon"
+        android:id="@+id/liveLocationRunningBannerIcon"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginHorizontal="8dp"
@@ -26,13 +26,13 @@
         android:backgroundTint="?vctr_live_location"
         android:padding="3dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/locationLiveRunningBannerBackground"
+        app:layout_constraintStart_toStartOf="@id/liveLocationRunningBannerBackground"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        app:srcCompat="@drawable/ic_attachment_live_location_white"
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/locationLiveRunningBannerTitle"
+        android:id="@+id/liveLocationRunningBannerTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -40,16 +40,16 @@
         android:ellipsize="end"
         android:lines="1"
         android:textColor="?colorOnSurface"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveRunningBannerSubTitle"
-        app:layout_constraintEnd_toStartOf="@id/locationLiveRunningBannerStop"
+        app:layout_constraintBottom_toTopOf="@id/liveLocationRunningBannerSubTitle"
+        app:layout_constraintEnd_toStartOf="@id/liveLocationRunningBannerStop"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toEndOf="@id/locationLiveRunningBannerIcon"
+        app:layout_constraintStart_toEndOf="@id/liveLocationRunningBannerIcon"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
         tools:text="@string/location_share_live_enabled" />
 
     <TextView
-        android:id="@+id/locationLiveRunningBannerSubTitle"
+        android:id="@+id/liveLocationRunningBannerSubTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -57,19 +57,19 @@
         android:lines="1"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="@id/locationLiveRunningBannerTitle"
+        app:layout_constraintEnd_toEndOf="@id/liveLocationRunningBannerTitle"
         app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="@id/locationLiveRunningBannerTitle"
-        app:layout_constraintTop_toBottomOf="@id/locationLiveRunningBannerTitle"
+        app:layout_constraintStart_toStartOf="@id/liveLocationRunningBannerTitle"
+        app:layout_constraintTop_toBottomOf="@id/liveLocationRunningBannerTitle"
         tools:text="9min left" />
 
     <Button
-        android:id="@+id/locationLiveRunningBannerStop"
-        style="@style/Widget.Vector.Button.Text.LocationLive"
+        android:id="@+id/liveLocationRunningBannerStop"
+        style="@style/Widget.Vector.Button.Text.LiveLocation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/location_share_live_stop"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveRunningBannerBackground"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationRunningBannerBackground"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/locationLiveRunningBannerBackground" />
+        app:layout_constraintTop_toTopOf="@id/liveLocationRunningBannerBackground" />
 </merge>
diff --git a/vector/src/main/res/layout/view_location_live_status.xml b/vector/src/main/res/layout/view_live_location_status.xml
similarity index 73%
rename from vector/src/main/res/layout/view_location_live_status.xml
rename to vector/src/main/res/layout/view_live_location_status.xml
index 4274b6788a..2fdb904cc9 100644
--- a/vector/src/main/res/layout/view_location_live_status.xml
+++ b/vector/src/main/res/layout/view_live_location_status.xml
@@ -7,14 +7,14 @@
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <androidx.constraintlayout.helper.widget.Flow
-        android:id="@+id/locationLiveStatusContainer"
+        android:id="@+id/liveLocationStatusContainer"
         android:layout_width="0dp"
         android:layout_height="32dp"
         android:background="?colorPrimary"
         android:duplicateParentState="true"
         android:paddingStart="9dp"
         android:paddingEnd="12dp"
-        app:constraint_referenced_ids="locationLiveStatusIcon,locationLiveStatusTitle"
+        app:constraint_referenced_ids="liveLocationStatusIcon,liveLocationStatusTitle"
         app:flow_horizontalBias="0"
         app:flow_horizontalGap="8dp"
         app:flow_horizontalStyle="packed"
@@ -23,14 +23,14 @@
         app:layout_constraintStart_toStartOf="parent" />
 
     <ImageView
-        android:id="@+id/locationLiveStatusIcon"
+        android:id="@+id/liveLocationStatusIcon"
         android:layout_width="wrap_content"
         android:layout_height="13dp"
-        app:srcCompat="@drawable/ic_attachment_location_live_white"
+        app:srcCompat="@drawable/ic_attachment_live_location_white"
         tools:ignore="ContentDescription" />
 
     <TextView
-        android:id="@+id/locationLiveStatusTitle"
+        android:id="@+id/liveLocationStatusTitle"
         style="@style/Widget.Vector.TextView.Caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -38,12 +38,12 @@
         android:textColor="?colorOnPrimary" />
 
     <Button
-        android:id="@+id/locationLiveStatusStop"
-        style="@style/Widget.Vector.Button.Text.OnPrimary.LocationLive"
+        android:id="@+id/liveLocationStatusStop"
+        style="@style/Widget.Vector.Button.Text.OnPrimary.LiveLocation"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:text="@string/location_share_live_stop"
-        app:layout_constraintBottom_toBottomOf="@id/locationLiveStatusContainer"
+        app:layout_constraintBottom_toBottomOf="@id/liveLocationStatusContainer"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/locationLiveStatusContainer" />
+        app:layout_constraintTop_toTopOf="@id/liveLocationStatusContainer" />
 </merge>
diff --git a/vector/src/main/res/layout/view_location_sharing_option_picker.xml b/vector/src/main/res/layout/view_location_sharing_option_picker.xml
index 292963d898..0b8bd05d9c 100644
--- a/vector/src/main/res/layout/view_location_sharing_option_picker.xml
+++ b/vector/src/main/res/layout/view_location_sharing_option_picker.xml
@@ -65,7 +65,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/locationSharingOptionUserCurrent"
-        app:locShareIcon="@drawable/ic_attachment_location_live_white"
+        app:locShareIcon="@drawable/ic_attachment_live_location_white"
         app:locShareIconBackground="@drawable/circle"
         app:locShareIconBackgroundTint="?vctr_live_location"
         app:locShareIconDescription="@string/a11y_location_share_option_user_live_icon"
diff --git a/vector/src/main/res/layout/view_map_loading_error.xml b/vector/src/main/res/layout/view_map_loading_error.xml
new file mode 100644
index 0000000000..ac2c24a56e
--- /dev/null
+++ b/vector/src/main/res/layout/view_map_loading_error.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/mapLoadingErrorBackground"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:src="?vctr_system"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="ContentDescription" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/mapLoadingErrorContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:constraint_referenced_ids="mapLoadingErrorIcon,mapLoadingErrorDescription"
+        app:flow_verticalGap="12dp"
+        app:flow_verticalStyle="packed"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/mapLoadingErrorIcon"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:src="@drawable/ic_warning_badge"
+        tools:ignore="ContentDescription" />
+
+    <TextView
+        android:id="@+id/mapLoadingErrorDescription"
+        style="@style/TextAppearance.Vector.Body"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/location_share_loading_map_error"
+        android:textColor="?vctr_content_primary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintWidth_percent="0.8" />
+
+</merge>
diff --git a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
index 637d709707..8ccff89c9d 100644
--- a/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
+++ b/vector/src/main/res/menu/menu_emoji_reaction_picker.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/ic_search"
+        android:icon="@drawable/ic_home_search"
         app:iconTint="?vctr_content_primary"
         android:title="@string/search"
         app:actionViewClass="android.widget.SearchView"
diff --git a/vector/src/main/res/menu/home.xml b/vector/src/main/res/menu/menu_home.xml
similarity index 100%
rename from vector/src/main/res/menu/home.xml
rename to vector/src/main/res/menu/menu_home.xml
diff --git a/vector/src/main/res/menu/menu_new_home.xml b/vector/src/main/res/menu/menu_new_home.xml
new file mode 100644
index 0000000000..e893624d54
--- /dev/null
+++ b/vector/src/main/res/menu/menu_new_home.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <item
+        android:id="@+id/menu_home_invite_friends"
+        android:title="@string/invite_friends"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_suggestion"
+        android:icon="@drawable/ic_material_bug_report"
+        android:title="@string/send_suggestion"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_report_bug"
+        android:icon="@drawable/ic_material_bug_report"
+        android:title="@string/send_bug_report"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_init_sync_legacy"
+        android:title="Do a legacy init sync"
+        tools:ignore="HardcodedText"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_init_sync_optimized"
+        android:title="Do an optimized init sync"
+        tools:ignore="HardcodedText"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/menu_home_filter"
+        android:icon="@drawable/ic_home_search"
+        android:title="@string/home_filter_placeholder_home"
+        app:iconTint="?vctr_content_secondary"
+        app:showAsAction="always" />
+
+</menu>
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
index aa28d9f481..1df5563686 100644
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -97,14 +97,14 @@
     <string name="notice_room_server_acl_updated_was_banned">• الخوادِم المُطابقة لـ %s أُزيلت مِن قائمة الحظر.</string>
     <string name="notice_room_server_acl_updated_banned">• الخوادِم المُطابقة لـ %s محظورة الآن.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• خوادِم مُطابقة IP الحرفية مسموحة الآن.</string>
-    <string name="notice_room_server_acl_updated_title_by_you">لقد قمت بتغيير قائمة الوصول لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_updated_title">قام %s بتغيير قائمة الوصول (ACL) لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_title_by_you">لقد غَيَّرت قائمة الوصول لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_updated_title">غَيَّرَ %s قائمة التحكم بالوصول (ACL) لهذه الغُرفة.</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• الخوادِم المتطابقة من حيث بروتوكول الإنترنت (IP) المستخدم محظورة.</string>
     <string name="notice_room_server_acl_set_allowed">• الخوادِم المُطابقة لـِ %s مسموحة.</string>
     <string name="notice_room_server_acl_set_banned">• الخوادِم المُطابقة لـ %s محظورة.</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">الخوادِم المتطابقة من حيث بروتوكول الإنترنت (IP) المستخدم مسموحة.</string>
-    <string name="notice_room_server_acl_set_title_by_you">لقد قمت بتعيين قائمة التحكم بالوصول لهذه الغُرفة.</string>
-    <string name="notice_room_server_acl_set_title">%s قام بتعيين قائمة التحكم بالوصول لهذه الغرفة.</string>
+    <string name="notice_room_server_acl_set_title_by_you">لقد عيَّنت قائمة التحكم بالوصول لهذه الغُرفة.</string>
+    <string name="notice_room_server_acl_set_title">عيَّنَ %s قائمة التحكم بالوصول لهذه الغرفة.</string>
     <string name="notice_direct_room_update_by_you">رقيتَ هُنا.</string>
     <string name="notice_direct_room_update">رقّى %s هُنا.</string>
     <string name="notice_made_future_direct_room_visibility_by_you">جعلتَ الرسائل المُستقبلية مرئية لـ %1$s</string>
@@ -895,11 +895,11 @@
         <item quantity="other">%d ثانية</item>
     </plurals>
     <string name="login_server_url_form_other_hint">العنوان</string>
-    <string name="login_clear_homeserver_history">امسح التأريخ</string>
+    <string name="login_clear_homeserver_history">امسح التاريخ</string>
     <string name="login_signin">لِج</string>
     <string name="login_signup">سجّل</string>
     <string name="login_signin_to">لج عبر %1$s</string>
-    <string name="login_connect_to_a_custom_server">اتص بخادم مخصص</string>
+    <string name="login_connect_to_a_custom_server">اتصل بخادم مخصص</string>
     <string name="login_connect_to_modular">اتصل بخدمات مايتركس لـ Element</string>
     <string name="login_connect_to">اتصل بـ %1$s</string>
     <string name="login_continue">تابع</string>
@@ -1168,4 +1168,9 @@
     <string name="initial_sync_request_title">طَلَبُ مُزامَنة أوَّلِيّ</string>
     <string name="a11y_public_room">غُرفة عامة</string>
     <string name="a11y_video">تسجيل مرئيّ</string>
+    <string name="login_reset_password_error_not_found">هذا البريد الإلكتروني غير مربوط بأي حساب</string>
+    <string name="login_reset_password_warning_submit">تابع</string>
+    <string name="login_reset_password_email_hint">البريد الإلكتروني</string>
+    <string name="login_reset_password_password_hint">كلمة السر الجديدة</string>
+    <string name="login_reset_password_submit">التالي</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
index f224c80aab..f7366b7dd3 100644
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -1277,7 +1277,7 @@
     <string name="open_terms_of">Consulta els termes de %s</string>
     <string name="login_terms_title">Accepta els termes per a continuar</string>
     <string name="settings_discovery_disconnect_with_bound_pid">Estàs compartint les adreces de correu electrònic o números de telèfon amb el servidor d\'identitat %1$s. Per parar de compartir-les t\'has de tornar a connectar a %2$s.</string>
-    <string name="message_view_edit_history">Visualitza Edita Històric</string>
+    <string name="message_view_edit_history">Visualitza l\'històric d\'edició</string>
     <string name="settings_show_redacted_summary">Indica els missatges eliminats</string>
     <string name="bootstrap_migration_backup_recovery_key">Clau de recuperació de la còpia de seguretat de claus</string>
     <string name="bootstrap_migration_use_recovery_key">utilitzar la clau de recuperació de còpia de seguretat de claus</string>
@@ -1777,7 +1777,7 @@
     <string name="verify_this_session">Verifica el nou inici de sessió que està accedint al teu compte: %1$s</string>
     <string name="verification_open_other_to_verify">Utilitza aquesta sessió per a verificar-ne una de nova i poder-li donar accés als missatges xifrats.</string>
     <string name="verification_profile_device_untrust_info">Fins que aquest usuari no confiï en aquesta sessió, els missatges enviats i rebuts es marcaran amb una alerta. Com a alternativa, pots verificar-lo manualment.</string>
-    <string name="crosssigning_verify_this_session">Verifica aquest inici de sessió</string>
+    <string name="crosssigning_verify_this_session">Verifica aquest dispositiu</string>
     <string name="settings_active_sessions_unverified_device_desc">Verifica aquesta sessió per fer-la de confiança i permetre que accedeixi als missatges xifrats. Si no has estat tu el que ha iniciat sessió aquí, pot ser que el teu compte estigui compromès:</string>
     <string name="verification_verify_device">Verifica aquesta sessió</string>
     <string name="verification_conclusion_compromised">Alguna de les següents pot haver estat compromesa:
@@ -2228,7 +2228,7 @@
     <string name="error_file_too_big_simple">El fitxer és massa gran per carregar-lo.</string>
     <string name="attachment_type_location">Ubicació</string>
     <string name="ftue_auth_carousel_encrypted_body">Xifrat d\'extrem a extrem i sense haver de donar cap número de telèfon. Sense anuncis ni extracció de dades.</string>
-    <string name="ftue_auth_carousel_control_body">Tria on es desen les teves converses, donant-te control i independència. Connectat a través de Matrix.</string>
+    <string name="ftue_auth_carousel_control_body">Tria on es desen les teves converses, et dona control i independència. Connectat a través de Matrix.</string>
     <string name="ftue_auth_carousel_secure_body">Comunicació segura i independent que t\'ofereix el mateix nivell de privadesa que una conversa cara a cara a casa teva.</string>
     <string name="ftue_auth_carousel_workplace_title">Missatgeria pel teu equip.</string>
     <string name="ftue_auth_carousel_encrypted_title">Missatgeria segura.</string>
@@ -2535,7 +2535,7 @@
     <string name="send_your_first_msg_to_invite">Envia un primer missatge per convidar %s a parlar</string>
     <string name="direct_room_encryption_enabled_tile_description_future">Els missatges d\'aquest xat seran xifrats d\'extrem a extrem.</string>
     <string name="create_room_action_go">Crea</string>
-    <string name="ftue_auth_email_verification_subtitle">Confirma el teu correu electrònic, prem el botó del correu que t\'hem enviat a %s</string>
+    <string name="ftue_auth_email_verification_subtitle">Segueix les instruccions enviades a %s</string>
     <string name="ftue_auth_terms_subtitle">Si us plau, llegeix les condicions i polítiques de %s</string>
     <string name="ftue_auth_choose_server_ems_cta">Contacta</string>
     <string name="ftue_auth_create_account_username_entry_footer">Et podran trobar com a %s</string>
@@ -2547,7 +2547,7 @@
     <string name="ftue_auth_login_username_entry">Usuari / Correu / Telèfon</string>
     <string name="permalink_unsupported_groups">No es pot obrir l\'enllaç: les comunitats han estat substituïdes pels espais</string>
     <string name="live_location_not_enough_permission_dialog_title">No tens permís per compartir la ubicació en directe</string>
-    <string name="ftue_auth_email_verification_title">Comprova el teu correu per verificar.</string>
+    <string name="ftue_auth_email_verification_title">Verifica el teu correu</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Torna a enviar el codi</string>
     <string name="ftue_auth_phone_confirmation_subtitle">S\'ha enviat un codi al %s</string>
     <string name="ftue_auth_phone_confirmation_title">Confirma el teu número de telèfon</string>
@@ -2588,4 +2588,19 @@
     <string name="ftue_auth_password_reset_confirmation">Restabliment de contrasenya</string>
     <string name="ftue_auth_forgot_password">Contrasenya oblidada</string>
     <string name="ftue_auth_choose_server_ems_subtitle">Element Matrix Services (EMS) és un servei robust i fiable d\'allotjament (servidors) per comunicacions ràpides, segures i en temps real. Descobreix-ho a &lt;a href=\"${ftue_ems_url}\"&gt;element.io/ems&lt;/a&gt;</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">No podràs accedir a l\'històric de missatges xifrats. Restableix la còpia de seguretat de missatges i les claus de verificació per començar de nou.</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Aprova automàticament els ginys d\'Element Call i permet l\'accés a la càmera i el micròfon</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Activa els permisos d\'accés directe d\'Element Call</string>
+    <string name="live_location_description">Ubicació en directe</string>
+    <string name="verify_invalid_qr_notice">Aquest codi QR sembla incorrecte. Prova de fer la verificació amb un altre mètode.</string>
+    <string name="crosssigning_cannot_verify_this_session">No s\'ha pogut verificar aquest dispositiu</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Quina és l\'adreça del teu servidor\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">On viuen les teves converses</string>
+    <string name="updating_your_data">Actualitzant dades…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s i %2$d altre</item>
+        <item quantity="other">%1$s i %2$d altres</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s i %2$s</string>
+    <string name="auth_reset_password_error_unverified">Correu no verificat, mira la teva safata d\'entrada</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index a9f177128f..5733fde468 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1321,7 +1321,7 @@
         <item quantity="few">%d aktivní relace</item>
         <item quantity="other">%d aktivních relací</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Ověřit tuto relaci</string>
+    <string name="crosssigning_verify_this_session">Ověřit toto zařízení</string>
     <string name="verification_open_other_to_verify">Pro ověření této relace použijte existující relaci, a tím ji udělíte přístup k zašifrovaným zprávám.</string>
     <string name="verification_profile_verify">Ověřit</string>
     <string name="verification_profile_verified">Ověřeno</string>
@@ -2599,8 +2599,8 @@
     <string name="ftue_auth_forgot_password">Zapomenuté heslo</string>
     <string name="ftue_auth_email_resend_email">Znovu poslat e-mail</string>
     <string name="ftue_auth_email_verification_footer">Nepřišel vám e-mail\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Pro potvrzení e-mailu klepněte na tlačítko ve zprávě, kterou jsme právě odeslali na adresu %s</string>
-    <string name="ftue_auth_email_verification_title">Pro ověření si zkontrolujte svůj e-mail.</string>
+    <string name="ftue_auth_email_verification_subtitle">Postupujte podle pokynů zaslaných na adresu %s</string>
+    <string name="ftue_auth_email_verification_title">Ověřte svůj e-mail</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Znovu odeslat kód</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Kód byl odeslán na %s</string>
     <string name="ftue_auth_phone_confirmation_title">Potvrďte své telefonní číslo</string>
@@ -2637,4 +2637,20 @@
     <string name="font_size_section_manually">Zvolit ručně</string>
     <string name="font_size_section_auto">Nastavit automaticky</string>
     <string name="font_size_title">Volba velikosti písma</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Automaticky schvalovat widgety Element hovorů a udělit přístup ke kameře/mikrofonu</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Zapnout zkratky pro povolení Element hovorů</string>
+    <string name="live_location_description">Poloha živě</string>
+    <string name="verify_invalid_qr_notice">Tento kód QR vypadá chybně. Zkuste provést ověření jinou metodou.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Nebudete mít přístup k historii zašifrovaných zpráv. Obnovte zálohování zabezpečených zpráv a ověřovací klíče a začněte znovu.</string>
+    <string name="crosssigning_cannot_verify_this_session">Nepodařilo se ověřit toto zařízení</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Jaká je adresa vašeho serveru\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Kde žijí vaše konverzace</string>
+    <string name="updating_your_data">Aktualizace vašich dat…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s a %2$d další</item>
+        <item quantity="few">%1$s a %2$d další</item>
+        <item quantity="other">%1$s a %2$d dalších</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s a %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-mail nebyl ověřen, zkontrolujte si schránku</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index fcb82889f5..fa42cc44a1 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1092,7 +1092,7 @@
     <string name="login_reset_password_email_hint">E-Mail</string>
     <string name="login_reset_password_password_hint">Neues Passwort</string>
     <string name="login_reset_password_warning_title">Achtung!</string>
-    <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssek zurücksetzen. Dein verschlüsselter Chatverlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
+    <string name="login_reset_password_warning_content">Eine Änderung deines Passworts wird alle Ende-zu-Ende-Schlüssel zurücksetzen. Dein verschlüsselter Chatverlauf wird dadurch unlesbar. Richte die Schlüsselsicherung ein oder exportiere deine Raumschlüssel aus einer anderen Sitzung, bevor du dein Passwort zurücksetzt.</string>
     <string name="login_reset_password_warning_submit">Fortfahren</string>
     <string name="login_reset_password_error_not_found">Diese E-Mail-Adresse ist mit keinem Benutzerkonto verknüpft</string>
     <string name="login_reset_password_mail_confirmation_title">Prüfe deinen Posteingang</string>
@@ -1297,7 +1297,7 @@
         <item quantity="one">Eine aktive Sitzung</item>
         <item quantity="other">%d aktive Sitzungen</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Verifiziere diese Sitzung</string>
+    <string name="crosssigning_verify_this_session">Verifiziere dieses Gerät</string>
     <string name="verification_open_other_to_verify">Nutze eine vorhandene Sitzung um diese Sitzung zu verifizieren und ihr Zugriff auf verschlüsselte Nachrichten zu gewähren.</string>
     <string name="verification_profile_verify">Verifizieren</string>
     <string name="verification_profile_verified">Verifiziert</string>
@@ -1520,7 +1520,7 @@
     <string name="secure_backup_banner_setup_line1">Backup</string>
     <string name="secure_backup_banner_setup_line2">Absicherung gegen den Verlust verschlüsselter Nachrichten</string>
     <string name="secure_backup_setup">Richte Backup ein</string>
-    <string name="event_redacted">Nachricht gelöscht</string>
+    <string name="event_redacted">Nachricht entfernt</string>
     <string name="settings_show_redacted">Gelöschte Nachrichten zeigen</string>
     <string name="settings_show_redacted_summary">Zeigt einen Platzhalter für gelöschte Nachrichten an</string>
     <string name="labs_show_unread_notifications_as_tab">Dedizierten Tab für ungelesene Nachrichten zur Hauptansicht hinzufügen</string>
@@ -2367,7 +2367,7 @@
     <string name="ftue_auth_use_case_join_existing_server">Möchtest du einem existierenden Server beitreten\?</string>
     <string name="ftue_auth_use_case_option_three">Communities</string>
     <string name="ftue_auth_use_case_option_two">Teams</string>
-    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, in Verbindung zu kommen.</string>
+    <string name="ftue_auth_use_case_subtitle">Wir helfen dir, in Verbindung zu kommen</string>
     <string name="ftue_auth_use_case_title">Mit wem wirst du am meisten chatten\?</string>
     <string name="action_thread_copy_link_to_thread">Link zu Thread kopieren</string>
     <string name="action_view_threads">Threads anzeigen</string>
@@ -2375,8 +2375,8 @@
     <string name="location_timeline_failed_to_load_map">Laden der Karte fehlgeschlagen</string>
     <string name="a11y_static_map_image">Karte</string>
     <string name="labs_enable_thread_messages_desc">Hinweis: App wird neugestartet</string>
-    <string name="ftue_auth_use_case_skip_partial">diese Frage überspringen</string>
-    <string name="ftue_auth_use_case_skip">Noch nicht sicher\? Du kannst %s</string>
+    <string name="ftue_auth_use_case_skip_partial">Diese Frage überspringen</string>
+    <string name="ftue_auth_use_case_skip">Noch nicht sicher\? %s</string>
     <string name="ftue_auth_use_case_option_one">Freunde und Familie</string>
     <string name="reply_in_thread">In Thread antworten</string>
     <string name="search_thread_from_a_thread">Aus einem Thread</string>
@@ -2471,7 +2471,7 @@
     <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string>
     <string name="settings_show_latest_profile_description">Die neuesten Profilinformationen (Avatar und Anzeigename) für alle Nachrichten anzeigen.</string>
     <string name="settings_show_latest_profile">Aktuelle Benutzerinformationen anzeigen</string>
-    <string name="ftue_personalize_complete_title">Du kannst loslegen!</string>
+    <string name="ftue_personalize_complete_title">Sieht gut aus!</string>
     <string name="ftue_display_name_title">einen Anzeigenamen wählen</string>
     <string name="ftue_account_created_take_me_home">Zurück zum Home-Screen</string>
     <string name="send_feedback_threads_title">Threads Beta-Feedback</string>
@@ -2516,17 +2516,67 @@
     <string name="sent_live_location">teilten ihren Live-Standort</string>
     <string name="ftue_personalize_skip_this_step">Schritt überspringen</string>
     <string name="ftue_personalize_submit">Speichern und fortfahren</string>
-    <string name="ftue_personalize_complete_subtitle">Deine Einstellungen wurden gespeichert.</string>
+    <string name="ftue_personalize_complete_subtitle">Öffne die Einstellungen jederzeit um dein Profil zu aktualisieren</string>
     <string name="ftue_personalize_lets_go">Los geht\'s</string>
-    <string name="ftue_profile_picture_subtitle">Du kannst das jederzeit ändern.</string>
+    <string name="ftue_profile_picture_subtitle">Zeit, dem Namen ein Gesicht zu geben</string>
     <string name="ftue_profile_picture_title">Profilbild hinzufügen</string>
     <string name="ftue_display_name_entry_footer">Du kannst dies später ändern</string>
     <string name="ftue_display_name_entry_title">Anzeigename</string>
     <string name="ftue_display_name_subtitle">Dies wird angezeigt, wenn Du Nachrichten sendest.</string>
-    <string name="ftue_account_created_subtitle">Dein Konto %s wurde erstellt.</string>
+    <string name="ftue_account_created_subtitle">Dein Konto %s wurde erstellt</string>
     <string name="ftue_account_created_congratulations_title">Herzlichen Glückwunsch!</string>
     <string name="ftue_account_created_personalize">Profil personalisieren</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} ist auch für den Arbeitsplatz geeignet. Die sichersten Organisationen der Welt vertrauen darauf.</string>
     <string name="send_feedback_threads_info">Threads sind noch in Arbeit, und es stehen neue, aufregende Funktionen an, wie z. B. verbesserte Benachrichtigungen. Wir würden uns sehr über Dein Feedback freuen!</string>
-    <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in diesem Chat werden End-zu-End-Verschlüsselt</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Nachrichten in diesem Chat werden Ende-zu-Ende-verschlüsselt.</string>
+    <string name="ftue_auth_captcha_title">Bist du ein Mensch\?</string>
+    <string name="ftue_auth_terms_subtitle">Bitte lies dir %ss Bedingungen und Richtlinien durch</string>
+    <string name="ftue_auth_terms_title">Server-Richtlinien</string>
+    <string name="ftue_auth_email_verification_subtitle">Folge den Anweisungen, die an %s gesendet wurden</string>
+    <string name="ftue_auth_email_verification_title">E-Mail bestätigen</string>
+    <string name="poll_undisclosed_not_ended">Ergebnisse sind nach Beenden der Abstimmung sichtbar</string>
+    <string name="ftue_auth_reset_password_breaker_title">Prüfe deine E-Mails.</string>
+    <string name="ftue_auth_reset_password">Passwort zurücksetzen</string>
+    <string name="ftue_auth_new_password_subtitle">Gib mindestens 8 Zeichen ein.</string>
+    <string name="ftue_auth_email_entry_title">E-Mail-Adresse</string>
+    <string name="ftue_auth_phone_entry_title">Telefonnummer</string>
+    <string name="ftue_auth_email_resend_email">Erneut senden</string>
+    <string name="ftue_auth_reset_password_email_subtitle">%s wird dir einen Bestätigungslink schicken</string>
+    <string name="ftue_auth_email_title">Deine E-Mail-Adresse</string>
+    <string name="ftue_auth_new_password_entry_title">Neues Passwort</string>
+    <string name="ftue_auth_new_password_title">Wähle ein neues Passwort</string>
+    <string name="ftue_auth_sign_out_all_devices">Alle Geräte abmelden</string>
+    <string name="ftue_auth_phone_confirmation_title">Bestätige deine Telefonnummer</string>
+    <string name="ftue_auth_email_verification_footer">Keine E-Mail erhalten\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Folge den Anweisungen, die an %s gesendet wurden</string>
+    <string name="permalink_unsupported_groups">Kann Link nicht öffnen: Communities wurden durch Spaces ersetzt</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Raumschlüssel für vorherige Nachrichten teilen</string>
+    <string name="labs_enable_msc3061_share_history_desc">Beim Einladen in einen Raum mit sichtbarem Verlauf wird der verschlüsselte Verlauf sichtbar sein.</string>
+    <string name="live_location_description">Live-Standort</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">%d Nachricht gelöscht</item>
+        <item quantity="other">%d Nachrichten gelöscht</item>
+    </plurals>
+    <string name="labs_enable_element_call_permission_shortcuts">Keine Element Call-Berechtigungsabfragen</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Bestätige automatisch Element Call-Widgets und erlaube Kamera- und Mikrofonzugriff</string>
+    <string name="create_room_action_go">Los</string>
+    <string name="ftue_auth_create_account_edit_server_selection">ändern</string>
+    <string name="ftue_auth_create_account_sso_section_header">oder</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Das Zuhause deiner Gespräche</string>
+    <string name="ftue_auth_create_account_choose_server_header">Das zukünftige Zuhause für deine Gespräche</string>
+    <string name="font_size_use_system">Systemstandard nutzen</string>
+    <string name="font_size_section_auto">Automatisch festlegen</string>
+    <string name="font_size_title">Schriftgröße wählen</string>
+    <string name="font_size_section_manually">Manuell wählen</string>
+    <string name="search_space_two_parents">%1$s und %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-Mail nicht bestätigt, prüfe deinen Posteingang</string>
+    <string name="ftue_auth_welcome_back_title">Willkommen zurück!</string>
+    <string name="ftue_auth_forgot_password">Passwort vergessen</string>
+    <string name="ftue_auth_login_username_entry">Benutzername / E-Mail / Telefon</string>
+    <string name="ftue_auth_create_account_title">Erstelle dein Konto</string>
+    <string name="ftue_auth_choose_server_entry_hint">Serveradresse</string>
+    <string name="ftue_auth_choose_server_subtitle">Wie lautet die Adresse deines Servers\? Das wird eine Art Zuhause für deine Daten</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Wie lautet die Adresse deines Servers\?</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Muss 8 oder mehr Zeichen umfassen</string>
+    <string name="ftue_auth_choose_server_title">Wähle deinen Server</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml
index 45d8a1f96e..124ca1eae7 100644
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@@ -720,7 +720,7 @@
         <item quantity="one">%d aktiivne sessioon</item>
         <item quantity="other">%d aktiivset sessiooni</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Verifitseeri see sisselogimissessioon</string>
+    <string name="crosssigning_verify_this_session">Verifitseeri see seade</string>
     <string name="verification_open_other_to_verify">Kasuta olemasolevat sessiooni selle sessiooni verifitseerimiseks, andes sellega ligipääsu krüptitud sõnumitele.</string>
     <string name="verification_profile_verify">Verifitseeri</string>
     <string name="verification_profile_verified">Verifitseeritud</string>
@@ -2541,8 +2541,8 @@
     <string name="ftue_auth_forgot_password">Kas unustasid oma salasõna</string>
     <string name="ftue_auth_email_resend_email">Saada e-kiri uuesti</string>
     <string name="ftue_auth_email_verification_footer">Sa ei saanud e-kirja kätte\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Oma e-posti aadressi kinnitamiseks klõpsi selles kirjas leiduvat nuppu, mille just saatsime %s aadressile</string>
-    <string name="ftue_auth_email_verification_title">Kinnitamiseks vaata oma e-kirju.</string>
+    <string name="ftue_auth_email_verification_subtitle">Palun järgi juhtnööre, mille just saatsime %s aadressile</string>
+    <string name="ftue_auth_email_verification_title">Verifitseeri oma e-posti aadress</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Saada kinnituskood uuesti</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Kinnituskoodi saatsime telefoninumbrile %s</string>
     <string name="ftue_auth_phone_confirmation_title">Kinnita oma telefoninumber</string>
@@ -2579,4 +2579,19 @@
     <string name="font_size_section_manually">Vali ise</string>
     <string name="font_size_section_auto">Määra automaatselt</string>
     <string name="font_size_title">Vali kirjatüübi suurus</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Automaatsel luba kasutada Element\'i põhiste kõnede vidinaid ning luba ligipääs kaamerale ja mikrofonile</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Võta kasutsele Element\'i põhiste kõnede õiguste kiirnupud</string>
+    <string name="live_location_description">Asukoht reaalajas</string>
+    <string name="verify_invalid_qr_notice">See QR-kood tundub olema vigane. Palun proovi verifitseerimist mõne muu meetodiga.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Sa ei saa lugeda varasemaid krüptitud sõnumeid. Uuesti alustamiseks seadista varundusvõtmed ja verifitseerimisvõtmed.</string>
+    <string name="crosssigning_cannot_verify_this_session">Selle seadme verifitseerimine ei õnnestunud</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Mis on sinu koduserveri aadress\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Kuidas sinu vestlusi hallatakse</string>
+    <string name="updating_your_data">Sinu andmed on uuendamisel…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s ja veel %2$d</item>
+        <item quantity="other">%1$s ja veel %2$d muud</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s ja %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-posti aadress on kinnitamata, palun vaata oma saabunud e-kirju</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml
index 26a006f498..591ae21198 100644
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@@ -982,7 +982,7 @@
     <string name="encryption_information_dg_xsigning_disabled">ورود چندگانه به کار نیفتاده</string>
     <string name="settings_hs_admin_e2e_disabled">مدیر کارسازتان رمزنگاری سرتاسری پیش‌گزیده را در اتاق‌های خصوصی و پیام‌های مستقیم از کار انداخته است.</string>
     <string name="settings_active_sessions_signout_device">خروج از این نشست</string>
-    <string name="crosssigning_verify_this_session">تأیید این ورود</string>
+    <string name="crosssigning_verify_this_session">تأیید این افزاره</string>
     <string name="verification_open_other_to_verify">استفاده از نشستی موجود برای تأییدش که به پیام‌های رمزشده دسترسی می‌دهد.</string>
     <string name="verification_profile_verify">تأیید</string>
     <string name="verification_profile_verified">تأیید‌شده</string>
@@ -2550,8 +2550,8 @@
     <string name="ftue_auth_forgot_password">فراموشی گذرواژه</string>
     <string name="ftue_auth_email_resend_email">فرستادن دوبارهٔ رایانامه</string>
     <string name="ftue_auth_email_verification_footer">رایانامه‌ای نگرفتید؟</string>
-    <string name="ftue_auth_email_verification_subtitle">برای تأیید رایانامه‌تان، روی دکمه در رایانامه‌ای‌که اکنون برایتان به %s فرستادیم بزنید</string>
-    <string name="ftue_auth_email_verification_title">برای تأیید، رایانامه‌تان را بررسی کنید.</string>
+    <string name="ftue_auth_email_verification_subtitle">دستورالعمل‌های فرستاده شده به %s را دنبال کنید</string>
+    <string name="ftue_auth_email_verification_title">رایانامه‌تان را تأیید کنید</string>
     <string name="ftue_auth_phone_confirmation_resend_code">فرستادن دوبارهٔ رمز</string>
     <string name="ftue_auth_phone_confirmation_subtitle">رمزی به %s فرستاده خواهد شد</string>
     <string name="ftue_auth_phone_confirmation_title">شمارهٔ تلفنتان را تأیید کنید</string>
@@ -2588,4 +2588,19 @@
     <string name="font_size_section_manually">گزینش دستی</string>
     <string name="font_size_section_auto">تنظیم خودکار</string>
     <string name="font_size_title">گزینش اندازهٔ قلم</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">تأیید خودکار ابزارک‌های تماس و اعطای دسترسی دوربین و میکروفون</string>
+    <string name="labs_enable_element_call_permission_shortcuts">به کار انداخت میان‌برهای اجازهٔ تماس المنت</string>
+    <string name="live_location_description">مکان زنده</string>
+    <string name="verify_invalid_qr_notice">این رمز QR بدریخت به نظر می‌رسد. لطفاً تأیید با روشی دیگر را بیازمایید.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">نخواهید توانست به تاریخچهٔ پیام رمزشده دست یابید. برای آغاز تازه، کلیدهای تأیید و پشتیبان پیام امنتان را بازنشانی کنید.</string>
+    <string name="crosssigning_cannot_verify_this_session">ناتوان در تأیید این افزاره</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">نشانی کارسازتان چیست؟</string>
+    <string name="ftue_auth_sign_in_choose_server_header">زیستگاه گفت‌وگوهایتان</string>
+    <string name="updating_your_data">به‌روز رساندن داده‌هایتان…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s و ۱ والد دیگر</item>
+        <item quantity="other">%1$s و %2$d والد دیگر</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s و %2$s</string>
+    <string name="auth_reset_password_error_unverified">رایانامه تأیید نشده. صندوق ورودیتان را بررسی کنید</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index c2f3122a0c..6b81337c26 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1273,7 +1273,7 @@
         <item quantity="one">%d session active</item>
         <item quantity="other">%d sessions actives</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Vérifier cette session</string>
+    <string name="crosssigning_verify_this_session">Vérifier cet appareil</string>
     <string name="verification_open_other_to_verify">Utilisez une session existante pour vérifier celle-ci, ce qui lui permettra d’avoir accès aux messages chiffrés.</string>
     <string name="verification_profile_verify">Vérifier</string>
     <string name="verification_profile_verified">Vérifié</string>
@@ -2550,8 +2550,8 @@
     <string name="ftue_auth_forgot_password">Mot de passe oublié</string>
     <string name="ftue_auth_email_resend_email">Renvoyer le courriel</string>
     <string name="ftue_auth_email_verification_footer">Pas reçu de courriel \?</string>
-    <string name="ftue_auth_email_verification_subtitle">Pour confirmer votre courriel, appuyez sur le bouton dans le courriel que nous venons d’envoyer à %s</string>
-    <string name="ftue_auth_email_verification_title">Relevez vos courriels pour la vérification.</string>
+    <string name="ftue_auth_email_verification_subtitle">Suivez les instructions envoyées à %s</string>
+    <string name="ftue_auth_email_verification_title">Vérifiez votre courriel</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Renvoyer le code</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Un code a été envoyé au %s</string>
     <string name="ftue_auth_phone_confirmation_title">Confirmer votre numéro de téléphone</string>
@@ -2588,4 +2588,19 @@
     <string name="font_size_section_manually">Choisir manuellement</string>
     <string name="font_size_section_auto">Automatique</string>
     <string name="font_size_title">Choisir la taille de la police</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Approuve automatiquement les widgets de Element Call et leur donner l’accès au micro et à la caméra</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Activer les raccourcis de permission de Element Call</string>
+    <string name="live_location_description">Position en direct</string>
+    <string name="verify_invalid_qr_notice">Ce QR code semble incorrect. Veuillez réessayer la vérification avec une autre méthode.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Vous ne pourrez plus accéder à l’historique des messages chiffrés. Réinitialiser votre sauvegarde sécurisée des messages et vos clés de récupération pour un nouveau départ.</string>
+    <string name="crosssigning_cannot_verify_this_session">Impossible de vérifier cet appareil</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Quelle est l’adresse de votre serveur \?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Où seront vos conversations</string>
+    <string name="updating_your_data">Mise-à-jour de vos données…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s et %2$d autre</item>
+        <item quantity="other">%1$s et %2$d autres</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s et %2$s</string>
+    <string name="auth_reset_password_error_unverified">Courriel non vérifié, relevez votre boîte de réception</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index dc9e17fc75..33c0044843 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1064,9 +1064,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="login_mode_not_supported">Az alkalmazás nem tud bejelentkezni a Matrix szerverbe. A Matrix szerver ezeket a bejelentkezési módokat támogatja: %1$s.
 \n
 \nWeb klienssel szeretnél bejelentkezni\?</string>
-    <string name="login_registration_not_supported">Az alkalmazás nem tud fiókot készíteni ezen a Matrix szerveren.
+    <string name="login_registration_not_supported">Ez az alkalmazás nem tudott fiókot készíteni ezen a Matrix szerveren.
 \n
-\nWeb klienssel szeretnél bejelentkezni\?</string>
+\nSzeretnél a webes kliens segítségével létrehozni egy fiókot\?</string>
     <string name="login_reset_password_mail_confirmation_notice_2">Koppints a linkre az új jelszó megerősítéséhez. Miután követted a linket, kattints alább.</string>
     <string name="login_set_email_notice">Állíts be egy e-mail címet a fiókod visszaállításához. Később esetleg engedélyezheted, hogy ismerősök e-mail címmel megtalálhassanak.</string>
     <string name="login_msisdn_error_not_international">Nemzetközi telefonszámnak „+” jellel kell kezdődnie</string>
@@ -1077,7 +1077,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="login_signup_submit">Következő</string>
     <string name="login_signup_error_user_in_use">A felhasználónév már használatban van</string>
     <string name="login_signup_cancel_confirmation_title">Figyelmeztetés</string>
-    <string name="login_signup_cancel_confirmation_content">A felhasználói fiókod még nincs kész. Megállítód a regisztrációt\?</string>
+    <string name="login_signup_cancel_confirmation_content">A felhasználói fiókod még nincs kész. Félbehagyod a regisztrációt\?</string>
     <string name="login_a11y_choose_matrix_org">matrix.org kiválasztása</string>
     <string name="login_a11y_choose_modular">Element Matrix Services kiválasztása</string>
     <string name="login_a11y_choose_other">Egyedi matrix szerver kiválasztása</string>
@@ -2318,7 +2318,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="restart_the_application_to_apply_changes">A változások életbelépéséhez indítsd újra az alkalmazást.</string>
     <string name="labs_enable_latex_maths">LaTeX matematikai szintaxis engedélyezése</string>
     <string name="room_error_access_unauthorized">Nem léphetsz be ebbe a szobába</string>
-    <string name="ftue_auth_carousel_secure_title">Birtokold a beszélgetéseid.</string>
+    <string name="ftue_auth_carousel_secure_title">Vedd birtokba a beszélgetéseid.</string>
     <string name="labs_auto_report_uisi_desc">Titkosítás visszafejtési hiba esemény alkalmával a rendszer automatikusan elküldi a logokat</string>
     <string name="labs_auto_report_uisi">Titkosítás visszafejtési hibák automatikus jelentése.</string>
     <string name="tooltip_attachment_poll">Szavazás létrehozása</string>
@@ -2330,7 +2330,7 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="room_member_override_nick_color">Megjelenítendő név színének megváltoztatása</string>
     <string name="login_splash_already_have_account">Már van fiókom</string>
     <string name="ftue_auth_carousel_encrypted_title">Biztonságos üzenetküldés.</string>
-    <string name="ftue_auth_carousel_control_title">Te irányítasz.</string>
+    <string name="ftue_auth_carousel_control_title">Tiéd az irányítás.</string>
     <string name="tooltip_attachment_location">Tartózkodási hely megosztása</string>
     <string name="location_share_external">Megnyitás ezzel</string>
     <string name="location_not_available_dialog_content">Az ${app_name} nem fér hozzá a tartózkodási helyedhez. Próbáld újra később.</string>
@@ -2351,9 +2351,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="sent_location">A földrajzi helyzetüket megosztották</string>
     <string name="login_splash_create_account">Fiók létrehozása</string>
     <string name="ftue_auth_carousel_workplace_title">Üzenetküldés a csoportodnak.</string>
-    <string name="ftue_auth_carousel_encrypted_body">Telefonszám nélkül végpontok között titkosított. Reklámok és adatbányászat nélkül.</string>
-    <string name="ftue_auth_carousel_control_body">Válaszd meg hol legyenek a beszélgetéseid tárolva, visszaadja az irányítást és függetlenné tesz. Csatlakozva a Matrixhoz.</string>
-    <string name="ftue_auth_carousel_secure_body">Biztonságos és független kommunikáció ami olyan biztonságos mintha valakivel négyszemközt beszélgetnél a házadban.</string>
+    <string name="ftue_auth_carousel_encrypted_body">Végponti tikosítással és telefonszám nélküli regisztrációval. Reklámok és adatbányászat nélkül.</string>
+    <string name="ftue_auth_carousel_control_body">Te választhatod ki, hogy hol legyenek a beszélgetéseid tárolva, ezáltal visszadva az irányítást és a függetlenséget neked. A Matrix hálózathoz csatlakozva.</string>
+    <string name="ftue_auth_carousel_secure_body">Biztonságos és független kommunikáció, ami olyan biztonságos mint ha valakivel négyszemközt beszélgetnél a házadban.</string>
     <string name="attachment_type_location">Földrajzi helyzet</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">A titkosítás beállítása hibás így nem lehet üzenetet küldeni. Kattints a beállításokért.</string>
     <string name="room_unsupported_e2e_algorithm">A titkosítás beállítása hibás így nem lehet üzenetet küldeni. Kérjük vedd fel a kapcsolatot az adminisztrátorral a titkosítás helyreállításához.</string>
@@ -2367,9 +2367,9 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="ftue_auth_use_case_skip_partial">Kihagyhatod ezt a kérdést.</string>
     <string name="ftue_auth_use_case_skip">Még nem tudod\? %s</string>
     <string name="ftue_auth_use_case_option_three">Közösségek</string>
-    <string name="ftue_auth_use_case_option_two">Csoportok</string>
+    <string name="ftue_auth_use_case_option_two">Munkahelyi csoportok</string>
     <string name="ftue_auth_use_case_option_one">Barátok és család</string>
-    <string name="ftue_auth_use_case_subtitle">Segítünk a kapcsolatteremtésben.</string>
+    <string name="ftue_auth_use_case_subtitle">Segítünk a kapcsolatteremtésben</string>
     <string name="ftue_auth_use_case_title">Kikkel fogsz legtöbbet beszélgetni\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Jelenleg ezt az üzenetszálat olvasod!</string>
     <string name="view_in_room">Megjelenítés szobában</string>
@@ -2424,17 +2424,17 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="live_location_sharing_notification_title">${app_name} Folyamatos helymeghatározás</string>
     <string name="error_forbidden_digits_only_username">A matrix szerver nem fogad el olyan felhasználói nevet ami csak számokból áll.</string>
     <string name="ftue_personalize_skip_this_step">Lépés kihagyása</string>
-    <string name="ftue_personalize_submit">Mentés és tovább</string>
-    <string name="ftue_personalize_complete_subtitle">A beállítások elmentve.</string>
-    <string name="ftue_personalize_complete_title">Minden kész!</string>
+    <string name="ftue_personalize_submit">Mentés és folytatás</string>
+    <string name="ftue_personalize_complete_subtitle">A beállításokban bármikor megváltoztathatod a profilod adatait</string>
+    <string name="ftue_personalize_complete_title">Jónak tűnik!</string>
     <string name="ftue_personalize_lets_go">Gyerünk</string>
-    <string name="ftue_profile_picture_subtitle">Bármikor megváltoztatható.</string>
+    <string name="ftue_profile_picture_subtitle">Itt az ideje egy profilképet adni a fiókhoz</string>
     <string name="ftue_profile_picture_title">Profilkép hozzáadása</string>
     <string name="ftue_display_name_entry_footer">Ezt később meg lehet változtatni</string>
     <string name="ftue_display_name_entry_title">Megjelenítendő név</string>
     <string name="ftue_display_name_subtitle">Ez fog megjelenni amikor üzenetet küldesz.</string>
-    <string name="ftue_display_name_title">Válassz egy megjelenítési nevet</string>
-    <string name="ftue_account_created_subtitle">A fiókod elkészült: %s.</string>
+    <string name="ftue_display_name_title">Válassz egy megjelenítendő nevet</string>
+    <string name="ftue_account_created_subtitle">A fiókod elkészült. A Matrix címed: %s</string>
     <string name="ftue_account_created_congratulations_title">Gratulálunk!</string>
     <string name="ftue_account_created_take_me_home">A kezdőlapra</string>
     <string name="ftue_account_created_personalize">Profil személyre szabása</string>
@@ -2499,35 +2499,35 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="time_unit_second_short">mperc</string>
     <string name="time_unit_minute_short">perc</string>
     <string name="time_unit_hour_short">ó</string>
-    <string name="live_location_labs_promotion_switch_title">Földrajzi hely megosztás engedélyezése</string>
-    <string name="live_location_labs_promotion_description">Figyelem: ez a labor lehetőség egy átmeneti megvalósítás. Ez azt jelenti, hogy a szobába már elküldött helyadatok az élő hely megosztás leállítása után is hozzáférhetők maradnak a szobában.</string>
-    <string name="live_location_labs_promotion_title">Élő földrajzi hely megosztása</string>
+    <string name="live_location_labs_promotion_switch_title">Földrajzi hely megosztásának engedélyezése</string>
+    <string name="live_location_labs_promotion_description">Figyelem: ez a labs lehetőség egy átmeneti megvalósítás. Ez azt jelenti, hogy nem lehet utólag törölni a megosztott helyadatokat. A technikailag hozzáértő szoba tagok a helyzetmegosztás leállítása után is meg tudják nézni az útvonalat.</string>
+    <string name="live_location_labs_promotion_title">Folyamatos helyzetmegosztás</string>
     <string name="settings_troubleshoot_test_current_gateway">Jelenlegi átjáró: %s</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Átjáró (gateway)</string>
     <string name="settings_troubleshoot_test_current_endpoint_failed">Nem található végpont.</string>
     <string name="settings_troubleshoot_test_current_endpoint_success">Jelenlegi végpont: %s</string>
     <string name="settings_troubleshoot_test_current_endpoint_title">Végpont</string>
     <string name="settings_troubleshoot_test_current_distributor">Jelenleg használatban: %s.</string>
-    <string name="settings_troubleshoot_test_current_distributor_title">Metódus</string>
+    <string name="settings_troubleshoot_test_current_distributor_title">Mód</string>
     <plurals name="settings_troubleshoot_test_distributors_many">
-        <item quantity="one">%d beállítás található.</item>
-        <item quantity="other">%d beállítás található.</item>
+        <item quantity="one">%d mód található.</item>
+        <item quantity="other">%d mód található.</item>
     </plurals>
-    <string name="settings_troubleshoot_test_distributors_fdroid">A háttér szinkronizációs szolgáltatástól eltérő beállítási lehetőség nem érhető el.</string>
-    <string name="settings_troubleshoot_test_distributors_gplay">A Google Play szolgáltatástól eltérő beállítási lehetőség nem érhető el.</string>
-    <string name="settings_troubleshoot_test_distributors_title">Elérhető beállítások</string>
-    <string name="settings_notification_method">Értesítési beállítások</string>
+    <string name="settings_troubleshoot_test_distributors_fdroid">A háttér szinkronizációs szolgáltatáson kívül nem található más mód.</string>
+    <string name="settings_troubleshoot_test_distributors_gplay">A Google Play szolgáltatásokon kívül nem található más mód.</string>
+    <string name="settings_troubleshoot_test_distributors_title">Elérhető módok</string>
+    <string name="settings_notification_method">Értesítési módok</string>
     <string name="unifiedpush_distributor_background_sync">Szinkronizálás a háttérben</string>
     <string name="unifiedpush_distributor_fcm_fallback">Google szolgáltatások</string>
     <string name="unifiedpush_getdistributors_dialog_title">Válaszd ki, hogyan szeretnél értesítéseket kapni</string>
-    <string name="poll_undisclosed_not_ended">Az eredmény a szavazás végeztével válik láthatóvá</string>
-    <string name="labs_enable_msc3061_share_history_desc">Ha olyan titkosított szobába hívsz meg valakit ahol a régi üzenetek megosztása engedélyezett a régi titkosított üzenetek is láthatóak lesznek a meghívott számára.</string>
+    <string name="poll_undisclosed_not_ended">Az eredmény a szavazás lezárása után válik láthatóvá</string>
+    <string name="labs_enable_msc3061_share_history_desc">Ha olyan titkosított szobába hívsz meg valakit ahol a régi üzenetek megosztása be van kapcsolva, akkor a meghívott felhasználó el fogja tudni olvasni a meghívása előtt küldött üzeneteket is.</string>
     <string name="labs_enable_msc3061_share_history">MSC3061: Szoba kulcsok megosztása a régi üzenetekhez</string>
-    <string name="settings_security_pin_code_use_biometrics_error">A biometrikus azonosítást nem lehet engedélyezni.</string>
-    <string name="auth_biometric_key_invalidated_message">A biometrikus azonosítás kikapcsolásra került mivel egy új biometrikus azonosítási metódus került hozzáadásra. Újra engedélyezheted a Beállításokban.</string>
-    <string name="send_your_first_msg_to_invite">Az első üzeneteddel hívd meg ide őt: %s</string>
+    <string name="settings_security_pin_code_use_biometrics_error">Nem sikerült bekapcsolni a biometrikus azonosítást.</string>
+    <string name="auth_biometric_key_invalidated_message">A biometrikus azonosítás kikapcsolásra került mivel egy új biometrikus azonosítási mód került hozzáadásra. Újra engedélyezheted a Beállításokban.</string>
+    <string name="send_your_first_msg_to_invite">A meghívó elküldéséhez küldj %s felhasználónak egy üzenetet</string>
     <string name="direct_room_encryption_enabled_tile_description_future">Az üzenetek ebben a beszélgetésben végpontok közötti titkosítással lesznek védve.</string>
-    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Értesítési metódus visszaállítása</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Értesítési mód visszaállítása</string>
     <string name="push_gateway_item_profile_tag">Profil címke:</string>
     <string name="create_room_action_go">Menj</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">Végpont token regisztrációja sikertelen a Matrix-kiszolgálón:
@@ -2535,4 +2535,44 @@ A Visszaállítási Kulcsot tartsd biztonságos helyen, mint pl. egy jelszókeze
     <string name="settings_troubleshoot_test_endpoint_registration_success">Végpont sikeresen regisztrálva lett a matrix szerveren.</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">Végpont regisztráció</string>
     <string name="action_next">Következő</string>
+    <string name="ftue_auth_login_username_entry">Felhasználónév / e-mail / telefonszám</string>
+    <string name="ftue_auth_captcha_title">Valódi személy vagy\?</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Kövesd az útmutatást, amit ide küldtünk: %s</string>
+    <string name="ftue_auth_password_reset_confirmation">Jelszó visszaállítás</string>
+    <string name="ftue_auth_forgot_password">Elfelejtett jelszó</string>
+    <string name="ftue_auth_email_resend_email">E-mail újraküldése</string>
+    <string name="ftue_auth_email_verification_footer">Nem kaptad meg az e-mailt\?</string>
+    <string name="ftue_auth_email_verification_subtitle">Kövesd az útmutatást, amit ide küldtünk: %s</string>
+    <string name="ftue_auth_email_verification_title">E-mail ellenőrzése</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Kód újraküldése</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Egy kódot küldtünk ide: %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Telefonszám megerősítése</string>
+    <string name="ftue_auth_sign_out_all_devices">Összes eszközöm kijelentkeztetése</string>
+    <string name="ftue_auth_reset_password">Jelszó visszaállítása</string>
+    <string name="ftue_auth_new_password_subtitle">Bizonyosodj meg róla, hogy minimum 8 karakter hosszú.</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Megerősítő kód</string>
+    <string name="ftue_auth_phone_entry_title">Telefonszám</string>
+    <string name="ftue_auth_phone_subtitle">A %s szervernek ellenőriznie kell a fiókod</string>
+    <string name="ftue_auth_phone_title">Add meg a telefonszámod</string>
+    <string name="ftue_auth_email_entry_title">E-mail</string>
+    <string name="ftue_auth_email_subtitle">A %s szervernek ellenőriznie kell a fiókod</string>
+    <string name="ftue_auth_email_title">Add meg az e-mail címed</string>
+    <string name="ftue_auth_terms_subtitle">Kérünk, olvasd el a %s szerver felhasználási feltételeit</string>
+    <string name="ftue_auth_terms_title">Szerver szabályok</string>
+    <string name="ftue_auth_choose_server_ems_cta">Kapcsolatfelvétel</string>
+    <string name="ftue_auth_choose_server_ems_subtitle">Az Element Matrix Services (EMS) egy robosztus és megbízható szerver üzemeltetési szolgáltatás a gyors és biztonságos kommunikáció céljaira. Tudj meg többet itt: <a href="${ftue_ems_url}">element.io/ems</a></string>
+    <string name="ftue_auth_choose_server_ems_title">Szeretnél egy saját szervert\?</string>
+    <string name="ftue_auth_choose_server_entry_hint">Szerver URL</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Mi a szervered címe\?</string>
+    <string name="ftue_auth_choose_server_title">Válassz szervert</string>
+    <string name="ftue_auth_welcome_back_title">Üdv újra!</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Szerkesztés</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Ahol a beszélgetéseid tárolva vannak</string>
+    <string name="ftue_auth_create_account_sso_section_header">vagy</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Minimum 8 karakterből kell álljon</string>
+    <string name="ftue_auth_create_account_username_entry_footer">Mások ezen a címen tudnak írni neked: %s</string>
+    <string name="ftue_auth_create_account_title">Fiók létrehozása</string>
+    <string name="ftue_auth_create_account_choose_server_header">Itt lesznek tárolva a beszélgetéseid</string>
+    <string name="ftue_auth_choose_server_subtitle">Mi a szervered címe\? Itt lesz tárolva az összes üzeneted</string>
+    <string name="auth_reset_password_error_unverified">Az email cím nem lett ellenőrizve, kérlek nézd meg a beérkező email-jeidet</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 6dbdffd27e..46bb5453a8 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1289,7 +1289,7 @@
         <item quantity="one">%d sessione attiva</item>
         <item quantity="other">%d sessioni attive</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Verifica questo accesso</string>
+    <string name="crosssigning_verify_this_session">Verifica questo dispositivo</string>
     <string name="verification_open_other_to_verify">Usa una sessione esistente per verificare questa, dandole l\'accesso ai messaggi criptati.</string>
     <string name="verification_profile_verify">Verifica</string>
     <string name="verification_profile_verified">Verificato</string>
@@ -2541,8 +2541,8 @@
     <string name="ftue_auth_forgot_password">Password dimenticata</string>
     <string name="ftue_auth_email_resend_email">Reinvia email</string>
     <string name="ftue_auth_email_verification_footer">Non hai ricevuto un\'email\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Per confermare l\'email, tocca il pulsante nell\'email che abbiamo appena inviato a %s</string>
-    <string name="ftue_auth_email_verification_title">Controlla l\'email per verificare.</string>
+    <string name="ftue_auth_email_verification_subtitle">Segui le istruzioni inviate a %s</string>
+    <string name="ftue_auth_email_verification_title">Verifica l\'email</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Reinvia codice</string>
     <string name="ftue_auth_phone_confirmation_subtitle">È stato inviato un codice a %s</string>
     <string name="ftue_auth_phone_confirmation_title">Conferma il tuo numero di telefono</string>
@@ -2579,4 +2579,19 @@
     <string name="font_size_section_manually">Scegli manualmente</string>
     <string name="font_size_section_auto">Imposta automaticamente</string>
     <string name="font_size_title">Scegli dimensione caratteri</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Auto-approva i widget di Element Call e consenti accesso a fotocamera / microfono</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Attiva scorciatoie di autorizzazione di Element Call</string>
+    <string name="live_location_description">Posizione in tempo reale</string>
+    <string name="verify_invalid_qr_notice">Questo codice QR sembra sbagliato. Prova la verifica con un altro metodo.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Non potrai accedere alla cronologia dei messaggi cifrati. Reimposta il backup dei messaggi sicuri e le chiavi di verifica per ricominciare.</string>
+    <string name="crosssigning_cannot_verify_this_session">Impossibile verificare questo dispositivo</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Qual è l\'indirizzo del tuo server\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Dove vivono le tue conversazioni</string>
+    <string name="updating_your_data">Aggiornamento dei tuoi dati…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s e %2$d altro</item>
+        <item quantity="other">%1$s e altri %2$d</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s e %2$s</string>
+    <string name="auth_reset_password_error_unverified">Email non verificata, controlla la posta in arrivo</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 2c66e51960..a79f5e7aee 100644
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -2000,7 +2000,7 @@
     <string name="verification_profile_device_verified_because">Deze sessie wordt vertrouwd voor veilig berichtenverkeer omdat %1$s (%2$s) deze heeft geverifieerd:</string>
     <string name="room_member_profile_failed_to_get_devices">Kan geen sessies ophalen</string>
     <string name="verification_open_other_to_verify">Gebruik een bestaande sessie om deze te verifiëren en deze toegang te verlenen tot versleutelde berichten.</string>
-    <string name="crosssigning_verify_this_session">Verifieer deze login</string>
+    <string name="crosssigning_verify_this_session">Verifieer dit apparaat</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d actieve sessie</item>
         <item quantity="other">%d actieve sessies</item>
@@ -2550,8 +2550,8 @@
     <string name="ftue_auth_forgot_password">Wachtwoord vergeten</string>
     <string name="ftue_auth_email_resend_email">Email opnieuw verzenden</string>
     <string name="ftue_auth_email_verification_footer">Geen e-mail ontvangen\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Om uw e-mailadres te bevestigen, tikt u op de knop in de e-mail die we zojuist naar %s hebben gestuurd</string>
-    <string name="ftue_auth_email_verification_title">Controleer uw e-mail om te verifiëren.</string>
+    <string name="ftue_auth_email_verification_subtitle">Volg de instructies die naar %s zijn gestuurd</string>
+    <string name="ftue_auth_email_verification_title">Verifieer uw e-mailadres</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Code nogmaals versturen</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Er is een code verzonden naar %s</string>
     <string name="ftue_auth_phone_confirmation_title">Bevestig uw telefoonnummer</string>
@@ -2588,4 +2588,19 @@
     <string name="font_size_section_manually">Handmatig kiezen</string>
     <string name="font_size_section_auto">Automatisch instellen</string>
     <string name="font_size_title">Kies lettergrootte</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Keur automatisch Element Oproep widgets goed en verleen camera-/microfoontoegang</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Snelkoppelingen voor Element Oproep machtigingen inschakelen</string>
+    <string name="live_location_description">Live locatie</string>
+    <string name="verify_invalid_qr_notice">Deze QR-code lijkt misvormd. Probeer te verifiëren met een andere methode.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">U hebt geen toegang tot de gecodeerde berichtgeschiedenis. Reset uw Veilige Berichten Back-up en verificatiesleutels om opnieuw te beginnen.</string>
+    <string name="crosssigning_cannot_verify_this_session">Kan dit apparaat niet verifiëren</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Wat is het adres van uw server\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Waar uw conversaties leven</string>
+    <string name="updating_your_data">Uw gegevens bijwerken…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s en %2$d andere</item>
+        <item quantity="other">%1$s en %2$d andere</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s en %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-mailadres niet geverifieerd, controleer je inbox</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 421de65bce..71669740db 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -457,7 +457,7 @@
     <string name="markdown_has_been_enabled">Markdown został włączony.</string>
     <string name="markdown_has_been_disabled">Markdown został wyłączony.</string>
     <string name="generic_label_and_value">%1$s: %2$s</string>
-    <string name="x_plus">%d+</string>
+    <string name="x_plus">+%d</string>
     <string name="settings_call_ringtone_use_app_ringtone">Użyj domyślnego dzwonka ${app_name} dla przychodzących połączeń</string>
     <string name="settings_call_category">Połączenia</string>
     <string name="room_participants_action_remove">Wyrzuć</string>
@@ -1132,7 +1132,7 @@
         <item quantity="many">%d aktywnych sesji</item>
         <item quantity="other">%d aktywnych sesji</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Zweryfikuj tą sesję</string>
+    <string name="crosssigning_verify_this_session">Zweryfikuj te urządzenie</string>
     <string name="verification_open_other_to_verify">Otwórz obecną sesję i użyj jej do zweryfikowania obecnej, przyznając jej dostęp do zaszyfrowanych wiadomości.</string>
     <string name="verification_profile_verify">Zweryfkuj</string>
     <string name="verification_profile_verified">Zweryfikowano</string>
@@ -1303,7 +1303,7 @@
     <string name="room_created_summary_item">%s stworzył(a) i skonfigurował(a) ten pokój.</string>
     <string name="encryption_unknown_algorithm_tile_description">Szyfrowanie wykorzystywane przez ten pokój nie jest obsługiwane</string>
     <string name="encryption_not_enabled">Szyfrowanie wyłączone</string>
-    <string name="direct_room_encryption_enabled_tile_description">Wiadomości w tym pokoju są szyfrowane w trybie punkt-punkt (e2e).</string>
+    <string name="direct_room_encryption_enabled_tile_description">Wiadomości w tym czacie są szyfrowane end-to-end.</string>
     <string name="encryption_enabled_tile_description">Wiadomości w tym pokoju są szyfrowane punkt-punkt (e2e). Możesz dowiedzieć się więcej i zweryfikować użytkowników w ich profilach.</string>
     <string name="encryption_enabled">Szyfrowanie włączone</string>
     <string name="bootstrap_cancel_text">Jeżeli teraz przerwiesz, możesz utracić zaszyfrowane wiadomości oraz dane jeżeli utracisz dostęp do zalogowanych sesji. 
@@ -2377,28 +2377,28 @@
     <string name="login_splash_create_account">Utwórz konto</string>
     <string name="ftue_personalize_skip_this_step">Pomiń ten krok</string>
     <string name="ftue_personalize_submit">Zapisz i kontynuuj</string>
-    <string name="ftue_personalize_complete_subtitle">Twoje ustawienia zostały zapisane.</string>
-    <string name="ftue_personalize_complete_title">Wszystko ustawiłeś!</string>
+    <string name="ftue_personalize_complete_subtitle">Zawsze możesz zmienić swój profil w ustawieniach</string>
+    <string name="ftue_personalize_complete_title">Dobrze wyglądasz!</string>
     <string name="ftue_personalize_lets_go">Chodźmy</string>
-    <string name="ftue_profile_picture_subtitle">Możesz go zmienić w każdym momencie.</string>
+    <string name="ftue_profile_picture_subtitle">Pora nadać tej nazwie jakąś twarz</string>
     <string name="ftue_profile_picture_title">Dodaj obraz profilu</string>
     <string name="ftue_display_name_entry_footer">Możesz zmienić ją później</string>
     <string name="room_message_autocomplete_notification">Powiadomienie pokoju</string>
     <string name="ftue_display_name_entry_title">Wyświetlana nazwa</string>
     <string name="ftue_display_name_subtitle">Będzie ona widoczna podczas wysyłania wiadomości.</string>
     <string name="ftue_display_name_title">Wybierz wyświetlaną nazwę</string>
-    <string name="ftue_account_created_subtitle">Twoje konto %s zostało utworzone.</string>
+    <string name="ftue_account_created_subtitle">Twoje konto %s zostało utworzone</string>
     <string name="ftue_account_created_congratulations_title">Gratulacje!</string>
     <string name="ftue_account_created_take_me_home">Zabierz mnie do domu</string>
     <string name="ftue_account_created_personalize">Spersonalizuj profil</string>
     <string name="ftue_auth_use_case_connect_to_server">Połącz się z serwerem</string>
     <string name="ftue_auth_use_case_join_existing_server">Chcesz dołączyć do istniejącego serwera\?</string>
-    <string name="ftue_auth_use_case_skip_partial">pominąć to pytanie</string>
-    <string name="ftue_auth_use_case_skip">Nie wiesz jeszcze\? Możesz %s</string>
+    <string name="ftue_auth_use_case_skip_partial">Pomiń to pytanie</string>
+    <string name="ftue_auth_use_case_skip">Nie wiesz jeszcze\? %s</string>
     <string name="ftue_auth_use_case_option_three">Społeczności</string>
     <string name="ftue_auth_use_case_option_two">Zespoły</string>
     <string name="ftue_auth_use_case_option_one">Przyjaciele i rodzina</string>
-    <string name="ftue_auth_use_case_subtitle">Pomożemy Ci się połączyć.</string>
+    <string name="ftue_auth_use_case_subtitle">Pomożemy Ci się połączyć</string>
     <string name="ftue_auth_use_case_title">Z kim będziesz najczęściej rozmawiać\?</string>
     <string name="ftue_auth_carousel_encrypted_body">Szyfrowane od-końca-do-końca i nie wymaga numeru telefonu. Brak reklam i dataminingu.</string>
     <string name="ftue_auth_carousel_control_body">Wybierz, gdzie prowadzone są Twoje rozmowy, dając Ci kontrolę i niezależność. Połączenie przez sieć Matrix.</string>
@@ -2636,8 +2636,8 @@
     <string name="ftue_auth_forgot_password">Zapomniane hasło</string>
     <string name="ftue_auth_email_resend_email">Wyślij wiadomość ponownie</string>
     <string name="ftue_auth_email_verification_footer">Email nie dotarł\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Aby potwierdzić swój email, dotknij przycisk we wiadomości wysłanej na %s</string>
-    <string name="ftue_auth_email_verification_title">Sprawdź swoją skrzynkę email aby dokończyć weryfikację.</string>
+    <string name="ftue_auth_email_verification_subtitle">Wykonaj instrukcje podane w wiadomości wysłanej na %s</string>
+    <string name="ftue_auth_email_verification_title">Potwierdź swój email</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Wyślij kod ponownie</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Kod został wysłany do %s</string>
     <string name="ftue_auth_phone_confirmation_title">Potwierdź swój numer telefonu</string>
@@ -2672,4 +2672,25 @@
     <string name="font_size_section_manually">Ustaw ręcznie</string>
     <string name="font_size_section_auto">Ustaw automatycznie</string>
     <string name="font_size_title">Wybierz rozmiar czcionki</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Automatycznie akceptuj widżety Element Call i przyznaj dostęp do kamery i mikrofonu</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Włącz skróty uprawnień dla Element Call</string>
+    <string name="live_location_labs_promotion_description">Uwaga: to eksperymentalna funkcja wykorzystująca tymczasową implementację. Oznacza to, że nie będzie możliwości usunięcia historii lokalizacji, a zaawansowani użytkownicy będą mogli ją zobaczyć nawet gdy przestaniesz dzielić się lokalizacją na żywo z tym pokojem.</string>
+    <string name="live_location_description">Lokalizacja na żywo</string>
+    <string name="labs_enable_msc3061_share_history_desc">Zapraszając kogoś do zaszyfrowanego pokoju który współdzieli historię, zaszyfrowana historia będzie dla tej osoby widoczna.</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Współdzielenie kluczy pokoju dla wcześniejszych wiadomości</string>
+    <string name="verify_invalid_qr_notice">Ten kod QR wygląda na niepoprawny. Spróbuj zweryfikować przy użyciu innej metody.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Dostęp do wcześniejszych zaszyfrowanych wiadomości nie będzie możliwy. Zresetuj bezpieczną kopię zapasową wiadomości oraz klucze weryfikacyjne by zacząć od nowa.</string>
+    <string name="crosssigning_cannot_verify_this_session">Nie udało się zweryfikować tego urządzenia</string>
+    <string name="ftue_auth_terms_subtitle">Zapoznaj się z warunkami i zasadami serwera %s</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Jaki jest adres twojego serwera\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Miejsce na twoje konwersacje</string>
+    <string name="updating_your_data">Aktualizowanie twoich danych…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s i %2$d inny</item>
+        <item quantity="few">%1$s i %2$d inne</item>
+        <item quantity="many">%1$s i %2$d innych</item>
+        <item quantity="other">%1$s i %2$d innych</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s i %2$s</string>
+    <string name="auth_reset_password_error_unverified">Email nie został zweryfikowany, sprawdź swoją skrzynkę</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 26218a509a..8e4e1942da 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1390,7 +1390,7 @@
         <item quantity="one">%d sessão ativa</item>
         <item quantity="other">%d sessões ativas</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Verificar este login</string>
+    <string name="crosssigning_verify_this_session">Verificar este dispositivo</string>
     <string name="verification_open_other_to_verify">Use uma sessão existente para verificar esta aqui, concedendo-lhe acesso a mensagens encriptadas.</string>
     <string name="verification_profile_verify">Verificar</string>
     <string name="verification_profile_verified">Verificada(o)</string>
@@ -2549,8 +2549,8 @@
     <string name="ftue_auth_forgot_password">Esqueceu senha</string>
     <string name="ftue_auth_email_resend_email">Reenviar email</string>
     <string name="ftue_auth_email_verification_footer">Não recebeu um email\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Para confirmar seu email, toque no botão no email que nós acabamos de enviar para %s</string>
-    <string name="ftue_auth_email_verification_title">Checar seu email para verificar.</string>
+    <string name="ftue_auth_email_verification_subtitle">Siga as instruções enviadas para %s</string>
+    <string name="ftue_auth_email_verification_title">Verifique seu email</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Reenviar código</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Um código foi enviado para %s</string>
     <string name="ftue_auth_phone_confirmation_title">Confirmar seu número de telefone</string>
@@ -2588,4 +2588,19 @@
     <string name="font_size_section_manually">Escolher manualmente</string>
     <string name="font_size_section_auto">Definir automaticamente</string>
     <string name="font_size_title">Encolher tamanho de fonte</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Auto-aprovar widgets de Element Call e conceder acesso de câmera / mic</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Habilitar atalhos de permissão de Element Call</string>
+    <string name="live_location_description">Localização ao vivo</string>
+    <string name="verify_invalid_qr_notice">Este QR code parece malformado. Por favor tente verificar com um outro método.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Você não vai ser capaz de acessar histórico de mensagem encriptada. Resette seu Backup de Mensagem Seguro e chaves de verificação para começar do zero.</string>
+    <string name="crosssigning_cannot_verify_this_session">Incapaz de verificar este dispositivo</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Qual é o endereço de seu servidor\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Onde suas conversas vivem</string>
+    <string name="updating_your_data">Atualizando seus dados…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s e %2$d outro</item>
+        <item quantity="other">%1$s e %2$d outros</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s e %2$s</string>
+    <string name="auth_reset_password_error_unverified">Email não verificado, cheque sua inbox</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 55c5ab0127..1fd522c7d5 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -194,7 +194,7 @@
     <string name="room_displayname_3_members">%1$s, %2$s и %3$s</string>
     <string name="notice_room_server_acl_allow_is_empty">🎉 Всем серверам запрещено участвовать! Эта комната больше не может быть использована.</string>
     <string name="notice_room_server_acl_updated_no_change">Без изменений.</string>
-    <string name="room_displayname_empty_room_was">Пустая комната (была %s)</string>
+    <string name="room_displayname_empty_room_was">Пустая комната (был(а) %s)</string>
     <string name="notice_room_server_acl_set_banned">• Соответствующие серверы %s заблокированы.</string>
     <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Серверы, соответствующие буквальным IP-адресам, теперь запрещены.</string>
     <string name="notice_room_server_acl_updated_ip_literals_allowed">• Серверы, соответствующие буквальным IP-адресам, теперь разрешены.</string>
@@ -302,7 +302,7 @@
     <string name="option_take_photo_video">Камера</string>
     <string name="auth_login">Вход</string>
     <string name="auth_submit">Подать</string>
-    <string name="auth_invalid_login_param">Неправильный логин и/или пароль</string>
+    <string name="auth_invalid_login_param">Неправильное имя пользователя и/или пароль</string>
     <string name="auth_invalid_email">Это не похоже на действительный адрес электронной почты</string>
     <string name="auth_email_already_defined">Этот адрес электронной почты уже используется.</string>
     <string name="auth_forgot_password">Забыли пароль?</string>
@@ -962,7 +962,7 @@
     <string name="room_filtering_filter_hint">Отфильтровать беседы…</string>
     <string name="room_filtering_footer_title">Не можете найти то, что ищете\?</string>
     <string name="room_filtering_footer_create_new_room">Создать новую комнату</string>
-    <string name="room_filtering_footer_create_new_direct_message">Отправить новое сообщение в диалог</string>
+    <string name="room_filtering_footer_create_new_direct_message">Отправить новое личное сообщение</string>
     <string name="room_filtering_footer_open_room_directory">Просмотр каталога комнат</string>
     <string name="room_directory_search_hint">Имя или ID (#example:matrix.org)</string>
     <string name="labs_swipe_to_reply_in_timeline">Включить жест смахивания для ответа в ленте сообщений</string>
@@ -1455,7 +1455,7 @@
         <item quantity="few">%d сессии активны</item>
         <item quantity="many">%d сессий активно</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">Подтвердите эту сессию</string>
+    <string name="crosssigning_verify_this_session">Подтвердите это устройство</string>
     <string name="verification_open_other_to_verify">Используйте существующую сессию для подтверждения этой, предоставив ей доступ к зашифрованным сообщениям.</string>
     <string name="settings_dev_tools">Инструменты для разработчиков</string>
     <string name="settings_account_data">Данные учётной записи</string>
@@ -1749,7 +1749,7 @@
     <string name="bad_passphrase_key_reset_all_action">Забыли или потеряли все варианты восстановления\? Сбросить все</string>
     <string name="direct_room_created_summary_item_by_you">Вы вошли.</string>
     <string name="direct_room_created_summary_item">%s вошёл(ла).</string>
-    <string name="direct_room_encryption_enabled_tile_description">Сообщения в этой комнате зашифрованы сквозным шифрованием.</string>
+    <string name="direct_room_encryption_enabled_tile_description">Сообщения в этой переписке защищены сквозным шифрованием.</string>
     <string name="direct_room_profile_section_more_leave">Покинуть</string>
     <string name="direct_room_profile_section_more_settings">Настройки</string>
     <string name="direct_room_profile_encrypted_subtitle">Сообщения здесь защищены сквозным шифрованием.
@@ -1840,7 +1840,7 @@
     <string name="send_bug_report_include_key_share_history">Отправить историю запросов на обмен ключами</string>
     <string name="start_chatting">Начать беседу</string>
     <string name="room_created_summary_no_topic_creation_text">%s чтобы люди знали, о чём эта комната.</string>
-    <string name="this_is_the_beginning_of_dm">Это начало вашей истории диалога с %s.</string>
+    <string name="this_is_the_beginning_of_dm">Это начало вашей переписки с %s.</string>
     <string name="settings_export_trail">Экспорт аудита</string>
     <string name="room_member_open_or_create_dm">Личное сообщение</string>
     <string name="settings_discovery_consent_title">Отправить электронную почту и номера телефонов</string>
@@ -2035,7 +2035,7 @@
     <string name="looking_for_someone_not_in_space">Ищете кого-то не в %s\?</string>
     <string name="user_invites_you">%s приглашает вас</string>
     <string name="you_are_invited">Вы приглашены</string>
-    <string name="spaces_beta_welcome_to_spaces_desc">Пространства - это новый способ группировки комнат и людей.</string>
+    <string name="spaces_beta_welcome_to_spaces_desc">Пространства — это новый способ организации комнат и людей.</string>
     <string name="space_add_existing_rooms">Добавить существующие комнаты и пространство</string>
     <string name="space_leave_prompt_msg_as_admin">Вы единственный администратор этого пространства. Если вы его покинете, то никто не сможет управлять им.</string>
     <string name="space_leave_prompt_msg_private">Вы сможете присоединиться только после повторного приглашения.</string>
@@ -2387,7 +2387,7 @@
     <string name="room_profile_section_restore_security">Восстановить шифрование</string>
     <string name="contact_admin_to_restore_encryption">Обратитесь к администратору, чтобы восстановить шифрование до рабочего состояния.</string>
     <string name="encryption_has_been_misconfigured">Шифрование настроено неправильно.</string>
-    <string name="sent_location">Поделились своим местоположением</string>
+    <string name="sent_location">Поделился(лась) местоположением</string>
     <string name="login_splash_already_have_account">У меня уже есть учётная запись</string>
     <string name="login_splash_create_account">Создать учётную запись</string>
     <string name="ftue_auth_carousel_workplace_title">Обмен сообщениями для вашей команды.</string>
@@ -2443,12 +2443,12 @@
     <string name="labs_enable_thread_messages">Включить обсуждения сообщений</string>
     <string name="ftue_auth_use_case_connect_to_server">Подключиться к серверу</string>
     <string name="ftue_auth_use_case_join_existing_server">Хотите присоединиться к существующему серверу\?</string>
-    <string name="ftue_auth_use_case_skip_partial">пропустить вопрос</string>
-    <string name="ftue_auth_use_case_skip">Пока не уверенны\? Вы можете %s</string>
+    <string name="ftue_auth_use_case_skip_partial">Пропустить вопрос</string>
+    <string name="ftue_auth_use_case_skip">Пока не уверены\? %s</string>
     <string name="ftue_auth_use_case_option_three">Сообщества</string>
     <string name="ftue_auth_use_case_option_two">Команды</string>
     <string name="ftue_auth_use_case_option_one">Друзья и семья</string>
-    <string name="ftue_auth_use_case_subtitle">Мы поможем вам подключится.</string>
+    <string name="ftue_auth_use_case_subtitle">Мы поможем вам подключиться</string>
     <string name="ftue_auth_use_case_title">С кем вы будете общаться больше всего\?</string>
     <string name="navigate_to_thread_when_already_in_the_thread">Вы уже просматриваете это обсуждение!</string>
     <string name="view_in_room">Просмотр в Комнате</string>
@@ -2489,7 +2489,7 @@
     <string name="ftue_display_name_entry_title">Отображаемое имя</string>
     <string name="ftue_display_name_subtitle">Показывается, когда вы отправляете сообщения.</string>
     <string name="ftue_display_name_title">Выберите отображаемое имя</string>
-    <string name="ftue_account_created_subtitle">Ваш аккаунт «%s» создан.</string>
+    <string name="ftue_account_created_subtitle">Ваша учётная запись %s создана</string>
     <string name="ftue_account_created_congratulations_title">Поздравляем!</string>
     <string name="ftue_account_created_take_me_home">Домой</string>
     <string name="ftue_account_created_personalize">Персонализировать</string>
@@ -2523,7 +2523,7 @@
     <string name="location_share_live_started">Загрузка трансляции местоположения…</string>
     <string name="location_share_live_select_duration_title">Поделиться трансляцией местоположения на</string>
     <string name="a11y_location_share_option_user_live_icon">Трансляцией местоположения</string>
-    <string name="sent_live_location">Поделились трансляцией местоположения</string>
+    <string name="sent_live_location">Поделился(лась) трансляцией местоположения</string>
     <string name="location_share_option_user_live">Трансляцией местоположения</string>
     <string name="space_explore_filter_no_result_description">Некоторые результаты могут быть скрыты, поскольку они являются приватными и для их просмотра необходимо приглашение.</string>
     <string name="time_unit_minute_short">мин</string>
@@ -2550,7 +2550,7 @@
     <string name="ftue_personalize_skip_this_step">Пропустить этот шаг</string>
     <string name="ftue_personalize_submit">Сохранить и продолжить</string>
     <string name="ftue_personalize_complete_subtitle">Ваши предпочтения были сохранены.</string>
-    <string name="ftue_personalize_complete_title">Всё готово!</string>
+    <string name="ftue_personalize_complete_title">Выглядит хорошо!</string>
     <string name="ftue_auth_carousel_workplace_body">${app_name} также отлично подходит для работы. Ему доверяют самые надёжные организации в мире.</string>
     <string name="keys_backup_settings_signature_from_this_user">Резервная копия имеет действительную подпись для данного пользователя.</string>
     <string name="settings_autoplay_animated_images_summary">Воспроизводить анимированные изображения, как только они попадают в поле зрения</string>
@@ -2609,4 +2609,58 @@
     <string name="settings_troubleshoot_test_current_endpoint_success">Текущая конечная точка: %s</string>
     <string name="settings_troubleshoot_test_current_endpoint_title">Конечная точка</string>
     <string name="space_leave_radio_buttons_title">Вещи в этом пространстве</string>
-</resources>
+    <string name="live_location_share_location_item_share">Поделиться местоположением</string>
+    <string name="labs_enable_msc3061_share_history">MSC3061: Предоставление ключей от прошлых сообщений</string>
+    <string name="create_room_action_go">Вперёд</string>
+    <string name="ftue_auth_new_password_subtitle">Убедитесь, что он состоит из 8 или более символов.</string>
+    <string name="font_size_section_manually">Выбрать вручную</string>
+    <string name="font_size_title">Выбор размера шрифта</string>
+    <plurals name="room_removed_messages">
+        <item quantity="one">Удалено %d сообщение</item>
+        <item quantity="few">Удалено %d сообщения</item>
+        <item quantity="many">Удалено %d сообщений</item>
+        <item quantity="other">Удалено %d сообщений</item>
+    </plurals>
+    <string name="ftue_auth_sign_out_all_devices">Выйти из учётной записи на всех устройствах</string>
+    <string name="live_location_description">Трансляция местоположения</string>
+    <string name="direct_room_encryption_enabled_tile_description_future">Сообщения в этой переписке будут защищены сквозным шифрованием.</string>
+    <string name="updating_your_data">Обновление данных…</string>
+    <string name="ftue_auth_email_resend_email">Повторно отправить письмо</string>
+    <string name="ftue_auth_email_verification_subtitle">Следуйте инструкциям, отправленным на %s</string>
+    <string name="ftue_auth_email_verification_title">Подтвердите свою электронную почту</string>
+    <string name="ftue_auth_reset_password_breaker_title">Проверьте электронную почту.</string>
+    <string name="ftue_auth_terms_subtitle">Пожалуйста, ознакомьтесь с условиями и правилами %s</string>
+    <string name="ftue_auth_choose_server_ems_title">Хотите разместить собственный сервер\?</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Какой адрес у вашего сервера\?</string>
+    <string name="ftue_auth_choose_server_subtitle">Какой адрес у вашего сервера\? Это что-то вроде дома для всех ваших данных</string>
+    <string name="ftue_auth_choose_server_title">Выберите свой сервер</string>
+    <string name="font_size_section_auto">Установить автоматически</string>
+    <string name="auth_reset_password_error_unverified">Почта не подтверждена, проверьте почтовый ящик</string>
+    <string name="ftue_auth_create_account_edit_server_selection">Изменить</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Где хранятся ваши переписки</string>
+    <string name="ftue_auth_create_account_choose_server_header">Где будут храниться ваши переписки</string>
+    <string name="ftue_auth_create_account_password_entry_footer">Должно быть 8 или более символов</string>
+    <string name="crosssigning_cannot_verify_this_session">Не удалось подтвердить это устройство</string>
+    <string name="permalink_unsupported_groups">Невозможно открыть эту ссылку: сообщества были заменены пространствами</string>
+    <string name="ftue_auth_login_username_entry">Имя пользователя / Почта / Телефон</string>
+    <string name="ftue_auth_password_reset_email_confirmation_subtitle">Следуйте инструкциям, отправленным на %s</string>
+    <string name="ftue_auth_forgot_password">Забыли пароль</string>
+    <string name="ftue_auth_email_verification_footer">Не получили письмо\?</string>
+    <string name="ftue_auth_captcha_title">Вы человек\?</string>
+    <string name="ftue_auth_phone_confirmation_resend_code">Повторно отправить код</string>
+    <string name="ftue_auth_phone_confirmation_subtitle">Код отправлен на %s</string>
+    <string name="ftue_auth_phone_confirmation_title">Подтвердите номер телефона</string>
+    <string name="ftue_auth_reset_password">Сбросить пароль</string>
+    <string name="ftue_auth_new_password_entry_title">Новый пароль</string>
+    <string name="ftue_auth_phone_confirmation_entry_title">Код подтверждения</string>
+    <string name="ftue_auth_phone_entry_title">Номер телефона</string>
+    <string name="ftue_auth_phone_title">Введите номер телефона</string>
+    <string name="ftue_auth_email_entry_title">Электронная почта</string>
+    <string name="ftue_auth_email_title">Введите адрес электронной почты</string>
+    <string name="ftue_auth_terms_title">Правила сервера</string>
+    <string name="ftue_auth_choose_server_entry_hint">URL-адрес сервера</string>
+    <string name="ftue_auth_welcome_back_title">С возвращением!</string>
+    <string name="ftue_auth_create_account_sso_section_header">Или</string>
+    <string name="ftue_auth_create_account_title">Создать учётную запись</string>
+    <string name="search_space_two_parents">%1$s и %2$s</string>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index f0cf54953e..cac6187d8a 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -1239,7 +1239,7 @@
     <string name="encryption_not_enabled">Šifrovanie nie je zapnuté</string>
     <string name="keep_it_safe">Udržujte ho v bezpečí</string>
     <string name="verify_new_session_was_not_me">Toto som nebol ja</string>
-    <string name="crosssigning_verify_this_session">Overte toto prihlásenie</string>
+    <string name="crosssigning_verify_this_session">Overiť toto zariadenie</string>
     <plurals name="settings_active_sessions_count">
         <item quantity="one">%d aktívna relácia</item>
         <item quantity="few">%d aktívne relácie</item>
@@ -2600,8 +2600,8 @@
     <string name="ftue_auth_forgot_password">Zabudnuté heslo</string>
     <string name="ftue_auth_email_resend_email">Opätovne odoslať e-mail</string>
     <string name="ftue_auth_email_verification_footer">Nedostali ste e-mail\?</string>
-    <string name="ftue_auth_email_verification_subtitle">Ak chcete potvrdiť svoj e-mail, ťuknite na tlačidlo v e-maile, ktorý sme práve poslali na adresu %s</string>
-    <string name="ftue_auth_email_verification_title">Pre overenie skontrolujte svoj e-mail.</string>
+    <string name="ftue_auth_email_verification_subtitle">Postupujte podľa pokynov zaslaných na adresu %s</string>
+    <string name="ftue_auth_email_verification_title">Overte svoj e-mail</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Znovu odoslať kód</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Kód bol odoslaný na %s</string>
     <string name="ftue_auth_phone_confirmation_title">Potvrďte svoje telefónne číslo</string>
@@ -2637,4 +2637,20 @@
     <string name="font_size_section_manually">Vybrať manuálne</string>
     <string name="font_size_section_auto">Nastaviť automaticky</string>
     <string name="font_size_title">Vyberte veľkosť písma</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Automaticky schvaľovať miniaplikácie Element Call a udeliť prístup ku kamere/mikrofónu</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Zapnúť skratky na povolenie Element hovorov</string>
+    <string name="live_location_description">Poloha v reálnom čase</string>
+    <string name="verify_invalid_qr_notice">Tento QR kód vyzerá chybne. Skúste vykonať overenie inou metódou.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">K zašifrovanej histórii správ nebudete mať prístup. Obnovte zálohu zabezpečených správ a overovacie kľúče a začnite odznova.</string>
+    <string name="crosssigning_cannot_verify_this_session">Nie je možné overiť toto zariadenie</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Aká je adresa vášho servera\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Kde vaše rozhovory žijú</string>
+    <string name="updating_your_data">Aktualizácia vašich údajov…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s a %2$d ďalší</item>
+        <item quantity="few">%1$s a %2$d ďalší</item>
+        <item quantity="other">%1$s a %2$d ďalších</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s a %2$s</string>
+    <string name="auth_reset_password_error_unverified">E-mail nie je overený, skontrolujte si schránku</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 45a057dd5f..8300199e8a 100644
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1207,7 +1207,7 @@
     <string name="verification_open_other_to_verify">Використайте чинний сеанс, щоб звірити цей сеанс, таким чином надавши йому доступ до зашифрованих повідомлень.</string>
     <string name="confirm_your_identity_quad_s">Підтвердьте вашу тотожність, звіривши цей вхід та надавши йому доступ до зашифрованих повідомлень.</string>
     <string name="verify_this_session">Звірте новий вхід, що доступається до вашого облікового запису: %1$s</string>
-    <string name="crosssigning_verify_this_session">Звірте цей вхід</string>
+    <string name="crosssigning_verify_this_session">Звірте цей пристрій</string>
     <string name="verification_request_waiting">Очікування…</string>
     <string name="new_session">Новий вхід. Це були ви\?</string>
     <string name="refresh">Оновити</string>
@@ -1227,7 +1227,7 @@
     <string name="notice_room_third_party_registered_invite_with_reason_by_you">Ви прийняли запрошення для %1$s. Причина: %2$s</string>
     <string name="notice_room_third_party_registered_invite_with_reason">%1$s приймає запрошення для %2$s. Причина: %3$s</string>
     <string name="notice_room_ban_with_reason_by_you">Ви заблокували %1$s. Причина: %2$s</string>
-    <string name="notice_room_ban_with_reason">%1$s заблоковано %2$s. Причина: %3$s</string>
+    <string name="notice_room_ban_with_reason">%1$s блокує %2$s. Причина: %3$s</string>
     <string name="notice_room_unban_with_reason_by_you">Ви розблокували %1$s. Причина: %2$s</string>
     <string name="notice_room_unban_with_reason">%1$s розблоковує %2$s. Причина: %3$s</string>
     <string name="notice_room_remove_with_reason_by_you">Ви вилучили %1$s. Причина: %2$s</string>
@@ -1436,11 +1436,11 @@
     </plurals>
     <string name="keys_backup_restore_success_title">Резервну копію відновлено %s!</string>
     <string name="keys_backup_recovery_code_error_decrypt">Не вдалося розшифрувати резервну копію за допомогою цього ключа відновлення: переконайтеся, що ви ввели правильний ключ відновлення.</string>
-    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервери з відповідними літералам IP тепер заблоковано.</string>
+    <string name="notice_room_server_acl_updated_ip_literals_not_allowed">• Сервери з відповідними літералам IP тепер заблоковані.</string>
     <string name="notice_room_server_acl_updated_was_banned">• Відповідні сервери %s було вилучено зі списку блокування.</string>
-    <string name="notice_room_server_acl_updated_banned">• Відповідні сервери %s тепер заблоковано.</string>
-    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервери, що з відповідними літералам IP заблоковано.</string>
-    <string name="notice_room_server_acl_set_banned">• Відповідні сервери %s заблоковано.</string>
+    <string name="notice_room_server_acl_updated_banned">• Відповідні сервери %s відтепер заблоковані.</string>
+    <string name="notice_room_server_acl_set_ip_literals_not_allowed">• Сервери з відповідними літералам IP заблоковані.</string>
+    <string name="notice_room_server_acl_set_banned">• Відповідні сервери %s заблоковані.</string>
     <string name="error_opening_banned_room">Неможливо відкрити кімнату, у якій вас заблоковано.</string>
     <string name="room_filtering_footer_open_room_directory">Переглянути каталог кімнат</string>
     <string name="create_room_in_progress">Створення кімнати…</string>
@@ -2648,8 +2648,8 @@
     <string name="ftue_auth_forgot_password">Забули пароль</string>
     <string name="ftue_auth_email_verification_footer">Не отримали лист\?</string>
     <string name="ftue_auth_email_resend_email">Повторно надіслати електронний лист</string>
-    <string name="ftue_auth_email_verification_subtitle">Щоб підтвердити свою електронну адресу, торкніться кнопки в електронному листі, який ми щойно надіслали на адресу %s</string>
-    <string name="ftue_auth_email_verification_title">Перейдіть до своєї електронної пошти для підтвердження.</string>
+    <string name="ftue_auth_email_verification_subtitle">Виконайте вказівки надіслані на %s</string>
+    <string name="ftue_auth_email_verification_title">Підтвердьте свою електронну адресу</string>
     <string name="ftue_auth_phone_confirmation_resend_code">Повторно надіслати код</string>
     <string name="ftue_auth_phone_confirmation_subtitle">Код було надіслано на %s</string>
     <string name="ftue_auth_phone_confirmation_title">Підтвердьте свій номер телефону</string>
@@ -2686,4 +2686,21 @@
     <string name="font_size_section_manually">Вибрати вручну</string>
     <string name="font_size_section_auto">Установити автоматично</string>
     <string name="font_size_title">Виберіть розмір шрифту</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">Віджети автосхвалення викликів Element і надання доступу до камери/мікрофона</string>
+    <string name="labs_enable_element_call_permission_shortcuts">Увімкнути ярлики дозволів на виклик елемента</string>
+    <string name="live_location_description">Місце перебування наживо</string>
+    <string name="verify_invalid_qr_notice">Цей QR-код має неправильний вигляд. Спробуйте звірити іншим методом.</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">Ви не зможете отримати доступ до історії зашифрованих повідомлень. Скиньте захищену резервну копію повідомлень і ключі підтвердження, щоб почати заново.</string>
+    <string name="crosssigning_cannot_verify_this_session">Не вдалося звірити цей пристрій</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">Яка адреса вашого сервера\?</string>
+    <string name="ftue_auth_sign_in_choose_server_header">Де відбуватимуться ваші розмови</string>
+    <string name="updating_your_data">Оновлення ваших даних…</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="one">%1$s і %2$d інший</item>
+        <item quantity="few">%1$s і %2$d інші</item>
+        <item quantity="many">%1$s і %2$d інших</item>
+        <item quantity="other">%1$s і %2$d інших</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s і %2$s</string>
+    <string name="auth_reset_password_error_unverified">Електронна пошта не підтверджена, перевірте свою поштову скриньку</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-vi/strings.xml b/vector/src/main/res/values-vi/strings.xml
index dca5645f1d..61b8728ca0 100644
--- a/vector/src/main/res/values-vi/strings.xml
+++ b/vector/src/main/res/values-vi/strings.xml
@@ -975,7 +975,7 @@
 \nVui lòng kiểm tra thiết lập.</string>
     <string name="settings_troubleshoot_test_system_settings_success">Thông báo được bật trong thiết lập hệ thống.</string>
     <string name="settings_troubleshoot_test_system_settings_title">Thiết lập hệ thống.</string>
-    <string name="settings_notification_troubleshoot">Xử lý lỗi thông báo</string>
+    <string name="settings_notification_troubleshoot">Thông báo khắc phục lỗi</string>
     <string name="settings_notification_keyword_contains_invalid_character">Từ khóa không được chứa \'%s\'</string>
     <string name="settings_notification_keyword_contains_dot">Từ khóa không được bắt đầu với \'.\'</string>
     <string name="settings_notification_new_keyword">Thêm mới từ khóa</string>
@@ -2274,4 +2274,7 @@
     <string name="settings_presence_user_always_appears_offline">Chế độ ngoại tuyến</string>
     <string name="settings_presence">Sự hiện diện</string>
     <string name="message_bubbles">Hiển thị bong bóng tin nhắn</string>
+    <string name="unifiedpush_getdistributors_dialog_title">Chọn cách nhận thông báo</string>
+    <string name="settings_notification_method">Phương thức thông báo</string>
+    <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">Đặt lại phương thức thông báo</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 0fae38bf6e..0549bd84a9 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -90,7 +90,7 @@
     <string name="notice_room_join_by_you">你加入了房间</string>
     <string name="notice_room_leave_by_you">你离开了房间</string>
     <string name="notice_room_reject_by_you">你拒绝了邀请</string>
-    <string name="notice_room_remove_by_you">你移除了 %1$s</string>
+    <string name="notice_room_remove_by_you">你踢了 %1$s</string>
     <string name="notice_room_unban_by_you">你解封了 %1$s</string>
     <string name="notice_room_ban_by_you">你封禁了 %1$s</string>
     <string name="notice_room_withdraw_by_you">你撤回了对 %1$s 的邀请</string>
@@ -108,7 +108,7 @@
     <string name="notice_call_candidates_by_you">你发送了数据以建立通话。</string>
     <string name="notice_answered_call_by_you">你接听了通话。</string>
     <string name="notice_ended_call_by_you">你结束了通话。</string>
-    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间记录对%1$s可见</string>
+    <string name="notice_made_future_room_visibility_by_you">你已让未来的房间历史对%1$s可见</string>
     <string name="notice_room_update_by_you">你升级了此房间。</string>
     <string name="notice_room_name_removed_by_you">你移除了房间名称</string>
     <string name="notice_room_topic_removed_by_you">你移除了房间主题</string>
@@ -163,7 +163,7 @@
     <string name="notice_direct_room_third_party_invite_by_you">你邀请了 %1$s</string>
     <string name="notice_direct_room_third_party_invite">%1$s 邀请了 %2$s</string>
     <string name="notice_direct_room_update_by_you">你在此处升级。</string>
-    <string name="notice_direct_room_update">%s 在此处升级。</string>
+    <string name="notice_direct_room_update">%s 是升级后的房间。</string>
     <string name="notice_made_future_direct_room_visibility_by_you">你使未来的消息对 %1$s 可见</string>
     <string name="notice_made_future_direct_room_visibility">%1$s 使未来的消息对 %2$s 可见</string>
     <string name="notice_direct_room_leave_by_you">你离开了房间</string>
@@ -193,7 +193,7 @@
     <string name="logout">登出</string>
     <string name="search">搜索</string>
     <string name="option_send_files">发送文件</string>
-    <string name="call_ended">通话结束</string>
+    <string name="call_ended">通话已结束</string>
     <string name="_continue">继续</string>
     <string name="action_join">加入</string>
     <string name="action_reject">拒绝</string>
@@ -420,12 +420,12 @@
     <string name="black_theme">黑色主题</string>
     <string name="settings_notification_ringtone">通知声音</string>
     <string name="settings_12_24_timestamps">使用12小时制显示时间戳</string>
-    <string name="widget_delete_message_confirmation">你确定要删除这个挂件吗？</string>
+    <string name="widget_delete_message_confirmation">确定要从此房间删除此挂件吗？</string>
     <string name="widget_integration_unable_to_create">无法创建挂件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
     <string name="widget_integration_positive_power_level">权力级别必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">你不在这个房间。</string>
-    <string name="widget_integration_no_permission_in_room">你没有在当前房间中执行此操作的权限。</string>
+    <string name="widget_integration_no_permission_in_room">你没权限在当前房间执行此操作。</string>
     <string name="widget_integration_missing_room_id">请求中缺失 room_id。</string>
     <string name="widget_integration_missing_user_id">请求中缺失 user_id。</string>
     <string name="widget_integration_room_not_visible">房间 %s 不可见。</string>
@@ -470,14 +470,14 @@
         <item quantity="other">%d个成员</item>
     </plurals>
     <plurals name="notification_unread_notified_messages">
-        <item quantity="other">%d 条未读消息</item>
+        <item quantity="other">%d条未读的已通知消息</item>
     </plurals>
     <string name="list_members">成员</string>
     <plurals name="notification_unread_notified_messages_in_room_rooms">
         <item quantity="other">%d 个房间</item>
     </plurals>
     <plurals name="active_widgets">
-        <item quantity="other">已启用 %d 个挂件</item>
+        <item quantity="other">%d个启用的挂件</item>
     </plurals>
     <string name="group_details_home">主页</string>
     <string name="rooms">房间</string>
@@ -504,7 +504,7 @@
     <string name="no_sticker_application_dialog_content">你目前没有启用任何贴纸包。
 \n
 \n要添加一些吗？</string>
-    <string name="widget_integration_missing_parameter">缺少所需的参数。</string>
+    <string name="widget_integration_missing_parameter">缺少一个必需参数。</string>
     <string name="dialog_user_consent_content">要想继续使用主服务器 %1$s 你必须阅读并同意其服务条款。</string>
     <string name="dialog_user_consent_submit">现在阅读</string>
     <string name="action_download">下载</string>
@@ -587,7 +587,7 @@
     <string name="settings_troubleshoot_test_token_registration_success">FCM令牌已成功注册至主服务器。</string>
     <string name="settings_troubleshoot_test_token_registration_failed">未能将FCM令牌注册到主服务器：
 \n %1$s</string>
-    <string name="settings_labs_native_camera_summary">调用系统相机应用而非使用 ${app_name} 内置的相机界面。</string>
+    <string name="settings_labs_native_camera_summary">启动系统相机而非自定义的相机屏幕。</string>
     <string name="settings_troubleshoot_test_service_boot_title">开机时启动</string>
     <string name="settings_troubleshoot_test_service_boot_quickfix">启用开机时启动</string>
     <string name="settings_troubleshoot_test_bg_restricted_title">检查后台限制</string>
@@ -760,12 +760,12 @@
     <string name="settings_play_shutter_sound">播放快门声</string>
     <string name="action_mark_room_read">标记为已读</string>
     <plurals name="notification_compat_summary_line_for_room">
-        <item quantity="other">%1$s: %2$d 条消息</item>
+        <item quantity="other">%1$s：%2$d条消息</item>
     </plurals>
     <plurals name="notification_compat_summary_title">
         <item quantity="other">%d 条通知</item>
     </plurals>
-    <string name="notification_unknown_new_event">新活动</string>
+    <string name="notification_unknown_new_event">新事件</string>
     <string name="notification_unknown_room_name">房间</string>
     <string name="notification_new_messages">新消息</string>
     <string name="notification_new_invitation">新邀请</string>
@@ -812,11 +812,11 @@
     <string name="room_preview_no_preview">无法预览此房间</string>
     <string name="fab_menu_create_room">房间</string>
     <string name="create_room_action_create">创建</string>
-    <string name="create_room_name_hint">房间名称</string>
+    <string name="create_room_name_hint">名称</string>
     <string name="settings_sdk_version">Matrix SDK 版本</string>
     <string name="settings_general_title">通用</string>
-    <string name="settings_preferences">选项</string>
-    <string name="settings_security_and_privacy">隐私安全</string>
+    <string name="settings_preferences">偏好</string>
+    <string name="settings_security_and_privacy">安全与隐私</string>
     <string name="settings_push_rules">推送规则</string>
     <string name="settings_push_rules_no_rules">尚未定义任何推送规则</string>
     <string name="settings_push_gateway_no_pushers">没有已注册的推送通道</string>
@@ -893,7 +893,7 @@
     <string name="settings_secure_backup_reset">重置安全备份</string>
     <string name="settings_secure_backup_enter_to_setup">在此设备上设置</string>
     <string name="settings_secure_backup_section_info">通过在你的服务器上备份加密密钥，防止失去对加密信息和数据的访问。</string>
-    <string name="reset_secure_backup_title">为你已有的备份生成新的安全密钥或设置新的安全口令。</string>
+    <string name="reset_secure_backup_title">为你已有的备份生成新的安全密钥或设置新的安全短语。</string>
     <string name="reset_secure_backup_warning">这将替换你的当前密钥或短语。</string>
     <string name="settings_discovery_category">发现</string>
     <string name="settings_discovery_manage">管理你的发现设置。</string>
@@ -905,16 +905,16 @@
         <item quantity="other">%d 个封禁用户</item>
     </plurals>
     <string name="encryption_exported_successfully">成功导出密钥</string>
-    <string name="notification_ticker_text_dm">%1$s: %2$s</string>
-    <string name="notification_ticker_text_group">%1$s: %2$s %3$s</string>
+    <string name="notification_ticker_text_dm">%1$s：%2$s</string>
+    <string name="notification_ticker_text_group">%1$s：%2$s %3$s</string>
     <string name="active_widget_view_action">查看</string>
     <string name="active_widgets_title">活动挂件</string>
     <string name="room_widget_activity_title">挂件</string>
     <string name="room_widget_permission_title">载入挂件</string>
     <string name="room_widget_permission_added_by">此挂件添加者：</string>
-    <string name="room_widget_permission_webview_shared_info_title">使用它会设置 cookie 并与 %s 分享数据：</string>
-    <string name="room_widget_permission_shared_info_title">使用它会与 %s 分享数据：</string>
-    <string name="room_widget_failed_to_load">无法载入挂件。
+    <string name="room_widget_permission_webview_shared_info_title">使用它可能会设置cookie并与%s分享数据：</string>
+    <string name="room_widget_permission_shared_info_title">使用它可能会与%s分享数据：</string>
+    <string name="room_widget_failed_to_load">载入挂件失败。
 \n%s</string>
     <string name="room_widget_reload">重载挂件</string>
     <string name="room_widget_open_in_browser">在浏览器中打开</string>
@@ -956,7 +956,7 @@
     <string name="create_room_public_description">任何人都可以加入此房间</string>
     <string name="keys_backup_unable_to_get_trust_info">获取信任信息时发生错误</string>
     <string name="keys_backup_unable_to_get_keys_backup_data">获取密钥备份数据时发生错误</string>
-    <string name="import_e2e_keys_from_file">从文件 \"%1$s\" 导入端对端密钥。</string>
+    <string name="import_e2e_keys_from_file">从文件“%1$s”导入端到端密钥。</string>
     <string name="settings_other_third_party_notices">其他第三方通知</string>
     <string name="navigate_to_room_when_already_in_the_room">你已经在查看此房间！</string>
     <string name="settings_troubleshoot_test_token_registration_quick_fix">注册令牌</string>
@@ -1319,7 +1319,7 @@
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 个活动会话</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">验证此登录</string>
+    <string name="crosssigning_verify_this_session">验证此设备</string>
     <string name="verification_open_other_to_verify">使用现有会话来验证此会话，并授予其访问加密消息的权限。</string>
     <string name="verification_profile_verify">验证</string>
     <string name="verification_profile_verified">已验证</string>
@@ -1335,7 +1335,7 @@
     <string name="reset_cross_signing">重置密钥</string>
     <string name="a11y_qr_code_for_verification">二维码</string>
     <string name="qr_code_scanned_by_other_notice">快要完成了！%s 显示对勾了吗？</string>
-    <string name="qr_code_scanned_by_other_yes">使</string>
+    <string name="qr_code_scanned_by_other_yes">是</string>
     <string name="qr_code_scanned_by_other_no">否</string>
     <string name="no_connectivity_to_the_server_indicator">到服务器的连接已丢失</string>
     <string name="no_connectivity_to_the_server_indicator_airplane">飞行模式已打开</string>
@@ -1350,7 +1350,7 @@
         <item quantity="other">发送原始尺寸图片</item>
     </plurals>
     <string name="delete_event_dialog_title">确认移除</string>
-    <string name="delete_event_dialog_content">你确实想要移除（删除）此事件吗？注意如果你删除房间名或话题更改，可以撤销更改。</string>
+    <string name="delete_event_dialog_content">你确定要移除（删除）此事件吗？注意，如果删除房间名称或话题的更改，更改会被撤销。</string>
     <string name="delete_event_dialog_reason_checkbox">附加理由</string>
     <string name="delete_event_dialog_reason_hint">编辑理由</string>
     <string name="event_redacted_by_user_reason_with_reason">事件被用户删除，理由：%1$s</string>
@@ -1379,7 +1379,7 @@
     <string name="message_key">消息密钥</string>
     <string name="enter_account_password">输入你的 %s 以继续。</string>
     <string name="bootstrap_dont_reuse_pwd">不要使用你的账户密码。</string>
-    <string name="bootstrap_info_text_2">输入只有你知道的安全口令，用于保护服务器上的秘密。</string>
+    <string name="bootstrap_info_text_2">输入只有你知道的安全短语，用于保护服务器上的秘密。</string>
     <string name="bootstrap_loading_text">这可能会花费数秒，请耐心等待。</string>
     <string name="bootstrap_loading_title">设置恢复。</string>
     <string name="bootstrap_finish_title">完成了！</string>
@@ -1517,20 +1517,20 @@
     <string name="bottom_sheet_setup_secure_backup_submit">设置</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_title">使用安全密钥</string>
     <string name="bottom_sheet_setup_secure_backup_security_key_subtitle">生成安全密钥存储在安全的地方如密码管理器或保险箱。</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全口令</string>
-    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有你知道的安全口令，生成备份用的密钥。</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_title">使用安全短语</string>
+    <string name="bottom_sheet_setup_secure_backup_security_phrase_subtitle">输入仅有你知道的秘密短语，生成备份用的密钥。</string>
     <string name="bottom_sheet_save_your_recovery_key_title">保存你的安全密钥</string>
     <string name="bottom_sheet_save_your_recovery_key_content">将你的安全密钥存储在安全的地方，例如密码管理器或保险箱。</string>
-    <string name="set_a_security_phrase_title">设置安全口令</string>
-    <string name="set_a_security_phrase_notice">输入只有你知道的安全口令，用于保护你的服务器上的秘密。</string>
-    <string name="set_a_security_phrase_hint">安全口令</string>
-    <string name="set_a_security_phrase_again_notice">再次输入你的安全口令以确认。</string>
+    <string name="set_a_security_phrase_title">设置安全短语</string>
+    <string name="set_a_security_phrase_notice">输入只有你知道的安全短语，用于保护你的服务器上的秘密。</string>
+    <string name="set_a_security_phrase_hint">安全短语</string>
+    <string name="set_a_security_phrase_again_notice">再次输入你的安全短语以确认。</string>
     <string name="room_settings_name_hint">房间名称</string>
     <string name="room_settings_topic_hint">主题</string>
     <string name="room_settings_save_success">你已成功更改房间设置</string>
     <string name="notice_crypto_unable_to_decrypt_final">你无法访问此消息</string>
     <string name="notice_crypto_unable_to_decrypt_friendly">正在等待此消息，可能会花费一些时间</string>
-    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由于端对端加密，你可能需要等待某人的消息到达因为加密密钥未正确发送给你。</string>
+    <string name="notice_crypto_unable_to_decrypt_friendly_desc">由于端到端加密，你可能需要等待某人的消息到达，因为加密密钥未正确发送给你。</string>
     <string name="crypto_error_withheld_blacklisted">你无法访问此消息因为你已屏蔽此发送者</string>
     <string name="crypto_error_withheld_unverified">你无法访问此消息，因为你的会话不被发送者信任</string>
     <string name="crypto_error_withheld_generic">你无法访问此消息因为发送者有意不发送密钥</string>
@@ -1540,7 +1540,7 @@
     <string name="disclaimer_negative_button">明白了</string>
     <string name="disclaimer_positive_button">了解更多</string>
     <string name="save_recovery_key_chooser_hint">将恢复密钥保存到</string>
-    <string name="loading_contact_book">正在获取你的联系人…</string>
+    <string name="loading_contact_book">正在获取你的联系人……</string>
     <string name="empty_contact_book">你的通讯录是空的</string>
     <string name="contacts_book_title">通讯录</string>
     <string name="three_pid_revoke_invite_dialog_title">撤销邀请</string>
@@ -1548,7 +1548,7 @@
     <string name="member_banned_by">被 %1$s 封禁</string>
     <string name="failed_to_unban">解封用户失败</string>
     <string name="alert_push_are_disabled_title">推送通知已禁用</string>
-    <string name="alert_push_are_disabled_description">查看你的设置以启用推送通知</string>
+    <string name="alert_push_are_disabled_description">检查你的设置以启用推送通知</string>
     <string name="create_pin_title">选择 PIN 以确保安全</string>
     <string name="create_pin_confirm_title">确认 PIN</string>
     <string name="create_pin_confirm_failure">验证 PIN 失败，请输入新的。</string>
@@ -1583,7 +1583,7 @@
     <plurals name="wrong_pin_message_remaining_attempts">
         <item quantity="other">错误代码，剩余 %d 次尝试</item>
     </plurals>
-    <string name="wrong_pin_message_last_remaining_attempt">注意！登出前最后一次尝试！</string>
+    <string name="wrong_pin_message_last_remaining_attempt">警告！登出前最后一次尝试！</string>
     <string name="too_many_pin_failures">错误次数过多，你已被登出</string>
     <string name="auth_msisdn_already_defined">此电话号码已定义。</string>
     <string name="settings_phone_number_empty">你的账户尚未添加电话号码</string>
@@ -1613,8 +1613,8 @@
     <string name="settings_security_pin_code_grace_period_summary_off">每次打开 ${app_name} 都要求 PIN 码。</string>
     <string name="settings_security_pin_code_grace_period_summary_on">在 2 分钟未使用 ${app_name} 后要求 PIN 码。</string>
     <string name="settings_security_pin_code_grace_period_title">2 分钟后要求 PIN</string>
-    <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单通知中显示未读消息内容数量。</string>
-    <string name="settings_security_pin_code_notifications_summary_on">显示细节如房间名称和消息内容。</string>
+    <string name="settings_security_pin_code_notifications_summary_off">仅在一个简单的通知中显示未读消息的数量。</string>
+    <string name="settings_security_pin_code_notifications_summary_on">显示详情，如房间名称和消息内容。</string>
     <string name="settings_security_pin_code_notifications_title">在通知中显示内容</string>
     <string name="settings_security_pin_code_use_biometrics_summary_off">PIN 码是解锁 ${app_name} 的唯一方式。</string>
     <string name="settings_security_pin_code_use_biometrics_summary_on">启用设备特定的生物特征识别，如指纹和面部识别。</string>
@@ -1775,7 +1775,7 @@
     <string name="notice_room_server_acl_updated_banned">• 匹配 %s 的服务器现已被屏蔽。</string>
     <string name="notice_room_server_acl_set_ip_literals_not_allowed">• 已封禁匹配 IP 地址的服务器。</string>
     <string name="notice_room_server_acl_set_ip_literals_allowed">• 已允许匹配 IP 地址的服务器。</string>
-    <string name="notice_room_server_acl_set_banned">• 匹配 %s 的服务器被屏蔽。</string>
+    <string name="notice_room_server_acl_set_banned">• 匹配 %s 的服务器已被屏蔽。</string>
     <string name="notice_room_server_acl_set_allowed">• 已允许匹配 %s 的服务器。</string>
     <string name="a11y_checked">已勾选</string>
     <string name="a11y_selected">已选中</string>
@@ -1901,7 +1901,7 @@
     <string name="invite_to_space_with_name">邀请至 %s</string>
     <string name="invite_by_link">分享链接</string>
     <string name="invite_by_email">通过电子邮件进行邀请</string>
-    <string name="invite_people_to_your_space_desc">此刻仅有你自己。%s 与他人一道会更好。</string>
+    <string name="invite_people_to_your_space_desc">此刻只有你。%s与他人一道会更好。</string>
     <string name="invite_to_space">邀请至 %s</string>
     <string name="invite_people_menu">邀请人们</string>
     <string name="invite_people_to_your_space">邀请人们加入你的空间</string>
@@ -1925,7 +1925,7 @@
     <string name="create_spaces_me_and_teammates">我和伙伴</string>
     <string name="create_spaces_organise_rooms">用于整理你房间的私有空间</string>
     <string name="create_spaces_just_me">仅我</string>
-    <string name="create_spaces_make_sure_access">确保对的人可以访问 %s。</string>
+    <string name="create_spaces_make_sure_access">确保正确的人可以访问%s。</string>
     <string name="create_spaces_who_are_you_working_with">你与谁一同工作？</string>
     <string name="create_spaces_join_info_help">要加入现有空间，你需要获得邀请。</string>
     <string name="create_spaces_you_can_change_later">你可以稍后更改</string>
@@ -1974,7 +1974,7 @@
     <string name="send_feedback_space_info">你正在使用空间的测试版。你的反馈将有助于改善下一版本。我们将会记录你的平台和用户名以帮助我们尽我们所能多发挥你的反馈的作用。</string>
     <string name="feedback">反馈</string>
     <string name="send_feedback_space_title">空间反馈</string>
-    <string name="jitsi_leave_conf_to_join_another_one_content">离开当前的回忆并切换至其他会议？</string>
+    <string name="jitsi_leave_conf_to_join_another_one_content">离开当前会议并切换至另一个？</string>
     <string name="error_jitsi_join_conf">抱歉，在尝试加入会议时发生了错误</string>
     <string name="room_settings_room_access_restricted_description">所有在此空间中的人都可以找到并加入它。仅有此房间的管理员可以将其添加到空间中。</string>
     <string name="room_settings_room_access_restricted_title">仅空间成员</string>
@@ -2127,7 +2127,7 @@
     <string name="call_tile_video_declined">视频通话被拒绝</string>
     <string name="call_tile_voice_declined">语音通话被拒绝</string>
     <string name="call_tile_video_call_has_ended">视频通话已结束 • %1$s</string>
-    <string name="call_tile_voice_call_has_ended">语音通话结束了 • %1$s</string>
+    <string name="call_tile_voice_call_has_ended">语音通话已结束 • %1$s</string>
     <string name="call_tile_video_incoming">视频来电</string>
     <string name="call_tile_voice_incoming">语音来电</string>
     <string name="call_tile_you_declined_this_call">你拒绝了此通话</string>
@@ -2143,7 +2143,7 @@
     <string name="settings_notification_new_keyword">添加新关键词</string>
     <string name="settings_notification_your_keywords">你的关键词</string>
     <string name="room_settings_none">无</string>
-    <string name="room_settings_mention_and_keyword_only">仅提及 &amp; 关键词</string>
+    <string name="room_settings_mention_and_keyword_only">仅提及和关键词</string>
     <string name="call_remove_jitsi_widget_progress">正结束通话…</string>
     <string name="call_ended_invite_timeout_title">无应答</string>
     <string name="call_ended_user_busy_description">你呼叫的用户正忙。</string>
@@ -2224,7 +2224,7 @@
     <string name="attachment_type_poll">投票</string>
     <string name="identity_server_consent_dialog_title_2">向 %s 发送电子邮件和电话号码</string>
     <string name="settings_discovery_consent_notice_off_2">您的联系人是私密的。 要从您的联系人中发现用户，我们需要您的许可才能将联系信息发送到您的身份服务器。</string>
-    <string name="shortcut_disabled_reason_sign_out">已退出此会话！</string>
+    <string name="shortcut_disabled_reason_sign_out">已登出此会话！</string>
     <string name="shortcut_disabled_reason_room_left">已离开此房间！</string>
     <string name="identity_server_consent_dialog_content_question">你同意发送此信息吗？</string>
     <string name="identity_server_consent_dialog_content_3">要发现现有的联系人，您需要将联系人信息(电子邮件和电话号码)发送到您的身份服务器。出乎隐私考量，我们会在发送前对您的数据进行散列处理。</string>
@@ -2232,7 +2232,7 @@
     <string name="delete_poll_dialog_content">您确定要删除此投票吗？一旦移除，就无法恢复。</string>
     <string name="delete_poll_dialog_title">删除投票</string>
     <string name="poll_end_room_list_preview">投票已结束</string>
-    <string name="poll_response_room_list_preview">已投票</string>
+    <string name="poll_response_room_list_preview">投票</string>
     <string name="end_poll_confirmation_approve_button">结束投票</string>
     <string name="end_poll_confirmation_description">这将使人们无法再投票，并将显示投票的最终结果。</string>
     <string name="end_poll_confirmation_title">结束此投票？</string>
@@ -2274,7 +2274,7 @@
     <plurals name="notice_room_server_acl_changes">
         <item quantity="other">修改服务器 %d 的 ACLs</item>
     </plurals>
-    <string name="thread_list_empty_subtitle">Thread帮助你的对话不离题且易于跟踪。</string>
+    <string name="thread_list_empty_subtitle">消息列帮助你的对话不离题且易于跟踪。</string>
     <string name="thread_list_modal_all_threads_subtitle">显示当前房间的所有子区</string>
     <string name="thread_list_modal_all_threads_title">所有子区</string>
     <string name="thread_list_modal_title">筛选器</string>
@@ -2310,7 +2310,7 @@
     <string name="a11y_location_share_locate_button">缩放到当前位置</string>
     <string name="a11y_location_share_pin_on_map">地图上选定位置的图钉</string>
     <string name="poll_no_votes_cast">无投票</string>
-    <string name="ftue_auth_email_verification_title">检查你的电子邮件以验证。</string>
+    <string name="ftue_auth_email_verification_title">验证你的电子邮件</string>
     <plurals name="room_removed_messages">
         <item quantity="other">%d条消息已移除</item>
     </plurals>
@@ -2374,9 +2374,9 @@
     <string name="location_activity_title_preview">位置</string>
     <string name="location_activity_title_static_sharing">分享位置</string>
     <string name="closed_poll_option_description">结果仅在你结束投票后展示</string>
-    <string name="closed_poll_option_title">已关闭的投票</string>
+    <string name="closed_poll_option_title">封闭式投票</string>
     <string name="open_poll_option_description">投票者一投票就能看到结果</string>
-    <string name="open_poll_option_title">开启投票</string>
+    <string name="open_poll_option_title">开放式投票</string>
     <string name="poll_type_title">投票类型</string>
     <string name="edit_poll_title">编辑投票</string>
     <string name="poll_undisclosed_not_ended">结果将在投票结束时可见</string>
@@ -2386,7 +2386,7 @@
     <string name="ftue_profile_picture_title">添加用户资料图片</string>
     <string name="ftue_auth_email_resend_email">重发电子邮件</string>
     <string name="ftue_auth_email_verification_footer">没有收到电子邮件？</string>
-    <string name="ftue_auth_email_verification_subtitle">要确认你的电子邮件地址，点击我们刚刚寄到%s的电子邮件里的按钮</string>
+    <string name="ftue_auth_email_verification_subtitle">跟随发送到%s的说明</string>
     <string name="ftue_auth_phone_confirmation_resend_code">重新发送验证码</string>
     <string name="ftue_auth_phone_confirmation_subtitle">代码已发送到%s</string>
     <string name="ftue_auth_phone_confirmation_title">确认你的电话号码</string>
@@ -2430,7 +2430,7 @@
     <string name="ftue_auth_carousel_encrypted_title">安全传送消息。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_failed">向主服务器注册端点token失败：
 \n%1$s</string>
-    <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用thread会刷新应用。这对一些账户可能需要更长时间。</string>
+    <string name="threads_beta_enable_notice_message">Threads帮助保持你的对话不离题且易于跟踪。%s启用消息列会刷新应用。这对一些账户可能需要更长时间。</string>
     <string name="restart_the_application_to_apply_changes">重启应用以使更改生效。</string>
     <string name="labs_enable_latex_maths">启用LaTeX数学</string>
     <string name="audio_message_file_size">（%1$s）</string>
@@ -2442,7 +2442,7 @@
     <string name="a11y_audio_message_item">%1$s、%2$s、%3$s</string>
     <string name="settings_show_latest_profile">显示最新用户信息</string>
     <string name="labs_enable_thread_messages_desc">注意：应用将重启</string>
-    <string name="labs_enable_thread_messages">启用thread消息</string>
+    <string name="labs_enable_thread_messages">启用消息列消息</string>
     <string name="labs_auto_report_uisi_desc">当无法解密的错误出现时，你的系统会自动发送日志</string>
     <string name="labs_auto_report_uisi">自动报告解密错误。</string>
     <string name="space_explore_filter_no_result_description">一些结果可能被隐藏，因为它们是私有的，你需要它们的邀请。</string>
@@ -2495,11 +2495,11 @@
     <string name="beta_title_bottom_sheet_action">BETA</string>
     <string name="settings_troubleshoot_test_endpoint_registration_quick_fix">重设通知方式</string>
     <string name="push_gateway_item_profile_tag">资料标签：</string>
-    <string name="navigate_to_thread_when_already_in_the_thread">你已经在查看这个thread了！</string>
+    <string name="navigate_to_thread_when_already_in_the_thread">你已经在查看这个消息列了！</string>
     <string name="create_room_action_go">出发</string>
-    <string name="reply_in_thread">在thread中回复</string>
+    <string name="reply_in_thread">在消息列中回复</string>
     <string name="keys_backup_settings_signature_from_this_user">备份具有来自该用户的有效签名。</string>
-    <string name="command_not_supported_in_threads">命令“%s”可被识别但在threads中不被支持。</string>
+    <string name="command_not_supported_in_threads">命令“%s”可被识别但在消息列中不被支持。</string>
     <string name="font_size_use_system">使用系统默认值</string>
     <string name="font_size_section_manually">手动选择</string>
     <string name="font_size_section_auto">自动设置</string>
@@ -2516,13 +2516,13 @@
     <string name="settings_autoplay_animated_images_title">自动播放动画图片</string>
     <string name="settings_troubleshoot_test_endpoint_registration_success">端点成功注册到主服务器。</string>
     <string name="settings_troubleshoot_test_endpoint_registration_title">端点注册</string>
-    <string name="threads_labs_enable_notice_message">你的主服务器当前不支持threads，所以此功能可能不可靠。Some threaded messages may not be reliably available. %s你仍要启用threads吗？</string>
+    <string name="threads_labs_enable_notice_message">你的主服务器当前不支持消息列，所以此功能可能不可靠。Some threaded messages may not be reliably available. %s你仍要启用消息列吗？</string>
     <string name="threads_notice_migration_title">Threads接近Beta了 🎉</string>
-    <string name="search_thread_from_a_thread">来自thread</string>
+    <string name="search_thread_from_a_thread">来自消息列</string>
     <string name="thread_list_empty_notice">实用提示：长按消息并使用“%s”。</string>
-    <string name="thread_list_empty_title">使用threads来保持讨论的条理性</string>
-    <string name="thread_list_modal_my_threads_subtitle">显示你参与的所有threads</string>
-    <string name="thread_list_modal_my_threads_title">我的threads</string>
+    <string name="thread_list_empty_title">使用消息列来保持讨论的条理性</string>
+    <string name="thread_list_modal_my_threads_subtitle">显示你参与的所有消息列</string>
+    <string name="thread_list_modal_my_threads_title">我的消息列s</string>
     <string name="room_unsupported_e2e_algorithm_as_admin">加密被错误地配置了，所以你无法发送消息。点击以打开设置。</string>
     <string name="room_unsupported_e2e_algorithm">加密被错误地配置了，所以你无法发送消息。请联系管理员将加密还原到有效的状态。</string>
     <string name="room_notification_more_than_two_users_are_typing">%1$s、%2$s与其他人</string>
@@ -2539,4 +2539,18 @@
     <string name="time_unit_hour_short">小时</string>
     <string name="initial_sync_request_reason_unignored_users">- 一些用户已被取消忽略</string>
     <string name="initial_sync_request_title">初始同步请求</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="other">%1$s与其他%2$d人</item>
+    </plurals>
+    <string name="updating_your_data">正在更新你的数据……</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">自动批准Element通话组件，授予相机/麦克风权限</string>
+    <string name="labs_enable_element_call_permission_shortcuts">启用Element通话权限捷径</string>
+    <string name="live_location_description">实时位置</string>
+    <string name="verify_invalid_qr_notice">这个QR码看起来不正常。请尝试用另一个方法验证。</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">你无法访问加密消息历史。重置你的安全消息备份和验证密钥以重新开始。</string>
+    <string name="crosssigning_cannot_verify_this_session">无法验证此设备</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">你的服务器地址是什么？</string>
+    <string name="ftue_auth_sign_in_choose_server_header">你的对话发生的地方</string>
+    <string name="search_space_two_parents">%1$s和%2$s</string>
+    <string name="auth_reset_password_error_unverified">电子邮件未确认，检查你的收件箱</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index ee96ee6063..effb6e7410 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1273,7 +1273,7 @@
     <plurals name="settings_active_sessions_count">
         <item quantity="other">%d 活躍的工作階段</item>
     </plurals>
-    <string name="crosssigning_verify_this_session">驗證此登入</string>
+    <string name="crosssigning_verify_this_session">驗證此裝置</string>
     <string name="verification_open_other_to_verify">使用既有的工作階段來驗證這個，讓它可以存取已加密的訊息。</string>
     <string name="verification_profile_verify">驗證</string>
     <string name="verification_profile_verified">已驗證</string>
@@ -1304,7 +1304,7 @@
         <item quantity="other">使用原始大小傳送圖片</item>
     </plurals>
     <string name="delete_event_dialog_title">確認移除</string>
-    <string name="delete_event_dialog_content">您確定您想要移除（刪除）此活動嗎？注意，如果您刪除聊天室名稱或變更主題，則可能會撤銷變更。</string>
+    <string name="delete_event_dialog_content">您確定您想要移除（刪除）此活動嗎？注意，如果您刪除聊天室名稱或主題的變更，變更會被撤銷。</string>
     <string name="delete_event_dialog_reason_checkbox">包含理由</string>
     <string name="delete_event_dialog_reason_hint">修改原因</string>
     <string name="event_redacted_by_user_reason_with_reason">被使用者刪除的活動，理由：%1$s</string>
@@ -2293,9 +2293,9 @@
     <string name="location_activity_title_preview">位置</string>
     <string name="location_activity_title_static_sharing">分享位置</string>
     <string name="closed_poll_option_description">結果僅在您結束投票後顯示</string>
-    <string name="closed_poll_option_title">已關閉投票</string>
+    <string name="closed_poll_option_title">封闭式投票</string>
     <string name="open_poll_option_description">投票者在投票後可以立刻看到投票結果</string>
-    <string name="open_poll_option_title">開啟投票</string>
+    <string name="open_poll_option_title">開放式投票</string>
     <string name="poll_type_title">投票類型</string>
     <string name="edit_poll_title">編輯投票</string>
     <string name="poll_no_votes_cast">沒有投票</string>
@@ -2486,7 +2486,7 @@
     <string name="labs_enable_msc3061_share_history">MSC3061：為過去的訊息分享聊天室金鑰</string>
     <string name="send_your_first_msg_to_invite">傳送您的第一則訊息以邀請 %s 來聊天</string>
     <string name="direct_room_encryption_enabled_tile_description_future">此聊天中的訊息將會是端到端加密。</string>
-    <string name="create_room_action_go">到</string>
+    <string name="create_room_action_go">出發</string>
     <plurals name="room_removed_messages">
         <item quantity="other">已移除 %d 則訊息</item>
     </plurals>
@@ -2501,8 +2501,8 @@
     <string name="ftue_auth_forgot_password">忘記密碼</string>
     <string name="ftue_auth_email_resend_email">重新傳送電子郵件</string>
     <string name="ftue_auth_email_verification_footer">沒有收到電子郵件？</string>
-    <string name="ftue_auth_email_verification_subtitle">要確認您的電子郵件，請點擊我們剛剛寄給 %s 的電子郵件中的按鈕</string>
-    <string name="ftue_auth_email_verification_title">檢查您的電子郵件以驗證。</string>
+    <string name="ftue_auth_email_verification_subtitle">請遵循傳送至 %s 中的步驟</string>
+    <string name="ftue_auth_email_verification_title">驗證您的電子郵件</string>
     <string name="ftue_auth_phone_confirmation_resend_code">重新傳送驗證碼</string>
     <string name="ftue_auth_phone_confirmation_subtitle">驗證碼已傳送至 %s</string>
     <string name="ftue_auth_phone_confirmation_title">確認您的電話號碼</string>
@@ -2539,4 +2539,18 @@
     <string name="font_size_section_manually">手動選擇</string>
     <string name="font_size_section_auto">自動設定</string>
     <string name="font_size_title">選擇字型大小</string>
+    <string name="labs_enable_element_call_permission_shortcuts_summary">自動批准 Element Call 小工具並授予相機/麥克風存取權限</string>
+    <string name="labs_enable_element_call_permission_shortcuts">啟用 Element Call 權限捷徑</string>
+    <string name="live_location_description">即時位置</string>
+    <string name="verify_invalid_qr_notice">這個 QR code 的格式似乎不正確。請嘗試使用其他方法進行驗證。</string>
+    <string name="crosssigning_cannot_verify_this_session_desc">您將無法存取已加密的訊息歷史紀錄。重設您的安全訊息備份與驗證金鑰以重新開始。</string>
+    <string name="crosssigning_cannot_verify_this_session">無法驗證此裝置</string>
+    <string name="ftue_auth_choose_server_sign_in_subtitle">您的伺服器地址是？</string>
+    <string name="ftue_auth_sign_in_choose_server_header">您的對話所在位置</string>
+    <string name="updating_your_data">正在更新您的資料……</string>
+    <plurals name="search_space_multiple_parents">
+        <item quantity="other">%1$s 與 %2$d 個其他人</item>
+    </plurals>
+    <string name="search_space_two_parents">%1$s 與 %2$s</string>
+    <string name="auth_reset_password_error_unverified">電子郵件未驗證，請檢查您的收件匣</string>
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 40cfe7e3ed..37607cd6b9 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -136,6 +136,7 @@
     <string name="matrix_error">Matrix error</string>
 
     <!-- Home Screen -->
+    <string name="all_chats">All Chats</string>
 
     <!-- Last seen time -->
 
@@ -1633,8 +1634,8 @@
     <string name="room_preview_no_preview">"This room can't be previewed"</string>
     <string name="room_preview_not_found">This room is not accessible at this time.\nTry again later, or ask a room admin to check if you have access.</string>
     <string name="room_preview_no_preview_join">"This room can't be previewed. Do you want to join it?"</string>
-    <string name="fab_menu_create_room">"Rooms"</string>
-    <string name="fab_menu_create_chat">"Direct Messages"</string>
+    <string name="fab_menu_create_room">"New room/forum"</string> <!-- Tchap: custom string -->
+    <string name="fab_menu_create_chat">"New Direct Messages"</string> <!-- Tchap: custom string -->
 
     <!-- Create room screen -->
     <string name="create_room_action_create">"CREATE"</string>
@@ -2808,6 +2809,7 @@
 
     <string name="a11y_screenshot">Screenshot</string>
     <string name="a11y_open_widget">Open widgets</string>
+    <string name="a11y_open_settings">Open settings</string>
     <string name="a11y_import_key_from_file">Import key from file</string>
     <string name="a11y_image">Image</string>
     <string name="a11y_change_avatar">Change avatar</string>
@@ -3018,7 +3020,7 @@
     <string name="voice_message_reply_content">Voice Message (%1$s)</string>
 
     <string name="a11y_audio_message_item">%1$s, %2$s, %3$s</string> <!-- filename, duration, file size -->
-    <string name="a11y_audio_playback_duration">%1$d minutes %2$d seconds</string>
+    <string name="a11y_audio_playback_duration" tools:ignore="PluralsCandidate">%1$d minutes %2$d seconds</string>
     <string name="a11y_play_audio_message">Play %1$s</string>
     <string name="a11y_pause_audio_message">Pause %1$s</string>
     <string name="error_audio_message_unable_to_play">Unable to play %1$s</string>
@@ -3112,6 +3114,7 @@
     <string name="location_not_available_dialog_content">${app_name} could not access your location. Please try again later.</string>
     <string name="location_share_external">Open with</string>
     <string name="location_timeline_failed_to_load_map">Failed to load map</string>
+    <string name="location_share_loading_map_error">Unable to load map\nThis home server may not be configured to display maps.</string>
     <string name="location_share_live_enabled">Live location enabled</string>
     <string name="location_share_live_started">Loading live location…</string>
     <string name="location_share_live_ended">Live location ended</string>
diff --git a/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt b/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt
new file mode 100644
index 0000000000..36d372cfac
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/SpaceStateHandlerImplTest.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app
+
+import im.vector.app.test.fakes.FakeActiveSessionDataSource
+import im.vector.app.test.fakes.FakeActiveSessionHolder
+import im.vector.app.test.fakes.FakeAnalyticsTracker
+import im.vector.app.test.fakes.FakeSession
+import im.vector.app.test.fakes.FakeUiStateRepository
+import im.vector.app.test.fixtures.RoomSummaryFixture.aRoomSummary
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.Test
+
+internal class SpaceStateHandlerImplTest {
+
+    private val spaceId = "spaceId"
+    private val spaceSummary = aRoomSummary(spaceId)
+    private val session = FakeSession.withRoomSummary(spaceSummary)
+
+    private val sessionDataSource = FakeActiveSessionDataSource()
+    private val uiStateRepository = FakeUiStateRepository()
+    private val activeSessionHolder = FakeActiveSessionHolder(session)
+    private val analyticsTracker = FakeAnalyticsTracker()
+
+    private val spaceStateHandler = SpaceStateHandlerImpl(
+            sessionDataSource.instance,
+            uiStateRepository,
+            activeSessionHolder.instance,
+            analyticsTracker,
+    )
+
+    @Test
+    fun `given selected space doesn't exist, when getCurrentSpace, then return null`() {
+        val currentSpace = spaceStateHandler.getCurrentSpace()
+
+        currentSpace shouldBe null
+    }
+
+    @Test
+    fun `given selected space exists, when getCurrentSpace, then return selected space`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session)
+
+        val currentSpace = spaceStateHandler.getCurrentSpace()
+
+        currentSpace shouldBe spaceSummary
+    }
+
+    @Test
+    fun `given persistNow is true, when setCurrentSpace, then immediately persist to ui state`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session, persistNow = true)
+
+        uiStateRepository.verifyStoreSelectedSpace(spaceId, session)
+    }
+
+    @Test
+    fun `given persistNow is false, when setCurrentSpace, then don't immediately persist to ui state`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session, persistNow = false)
+
+        uiStateRepository.verifyStoreSelectedSpace(spaceId, session, inverse = true)
+    }
+
+    @Test
+    fun `given is forward navigation and no current space, when setCurrentSpace, then null added to backstack`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = true)
+
+        val backstack = spaceStateHandler.getSpaceBackstack()
+
+        backstack.size shouldBe 1
+        backstack.first() shouldBe null
+    }
+
+    @Test
+    fun `given is forward navigation and is in space, when setCurrentSpace, then previous space added to backstack`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = true)
+        spaceStateHandler.setCurrentSpace("secondSpaceId", session, isForwardNavigation = true)
+
+        val backstack = spaceStateHandler.getSpaceBackstack()
+
+        backstack.size shouldBe 2
+        backstack shouldBeEqualTo listOf(null, spaceId)
+    }
+
+    @Test
+    fun `given is not forward navigation, when setCurrentSpace, then previous space not added to backstack`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session, isForwardNavigation = false)
+
+        val backstack = spaceStateHandler.getSpaceBackstack()
+
+        backstack.size shouldBe 0
+    }
+
+    @Test
+    fun `when setCurrentSpace, then space is emitted to selectedSpaceFlow`() = runTest {
+        spaceStateHandler.setCurrentSpace(spaceId, session)
+
+        val currentSpace = spaceStateHandler.getSelectedSpaceFlow().first().orNull()
+
+        currentSpace shouldBeEqualTo spaceSummary
+    }
+
+    @Test
+    fun `given current space exists, when getSafeActiveSpaceId, then return current space id`() {
+        spaceStateHandler.setCurrentSpace(spaceId, session)
+
+        val activeSpaceId = spaceStateHandler.getSafeActiveSpaceId()
+
+        activeSpaceId shouldBeEqualTo spaceId
+    }
+
+    @Test
+    fun `given current space doesn't exist, when getSafeActiveSpaceId, then return current null`() {
+        val activeSpaceId = spaceStateHandler.getSafeActiveSpaceId()
+
+        activeSpaceId shouldBe null
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/features/location/LocationTrackerTest.kt b/vector/src/test/java/im/vector/app/features/location/LocationTrackerTest.kt
index 454a73cd70..ebb7419ddc 100644
--- a/vector/src/test/java/im/vector/app/features/location/LocationTrackerTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/LocationTrackerTest.kt
@@ -23,6 +23,7 @@ import im.vector.app.features.session.coroutineScope
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeContext
 import im.vector.app.test.fakes.FakeLocationManager
+import im.vector.app.test.fixtures.aBuildMeta
 import im.vector.app.test.test
 import io.mockk.every
 import io.mockk.just
@@ -56,7 +57,7 @@ class LocationTrackerTest {
     @Before
     fun setUp() {
         mockkStatic("im.vector.app.features.session.SessionCoroutineScopesKt")
-        locationTracker = LocationTracker(fakeContext.instance, fakeActiveSessionHolder.instance)
+        locationTracker = LocationTracker(fakeContext.instance, fakeActiveSessionHolder.instance, aBuildMeta())
         fakeLocationManager.givenRemoveUpdates(locationTracker)
     }
 
@@ -75,19 +76,19 @@ class LocationTrackerTest {
         verifyOrder {
             fakeLocationManager.instance.requestLocationUpdates(
                     LocationManager.FUSED_PROVIDER,
-                    MIN_TIME_TO_UPDATE_LOCATION_MILLIS,
+                    locationTracker.minDurationToUpdateLocationMillis,
                     MIN_DISTANCE_TO_UPDATE_LOCATION_METERS,
                     locationTracker
             )
             fakeLocationManager.instance.requestLocationUpdates(
                     LocationManager.GPS_PROVIDER,
-                    MIN_TIME_TO_UPDATE_LOCATION_MILLIS,
+                    locationTracker.minDurationToUpdateLocationMillis,
                     MIN_DISTANCE_TO_UPDATE_LOCATION_METERS,
                     locationTracker
             )
             fakeLocationManager.instance.requestLocationUpdates(
                     LocationManager.NETWORK_PROVIDER,
-                    MIN_TIME_TO_UPDATE_LOCATION_MILLIS,
+                    locationTracker.minDurationToUpdateLocationMillis,
                     MIN_DISTANCE_TO_UPDATE_LOCATION_METERS,
                     locationTracker
             )
@@ -154,7 +155,7 @@ class LocationTrackerTest {
         locationTracker.onLocationChanged(fusedLocation)
         locationTracker.onLocationChanged(gpsLocation)
         locationTracker.onLocationChanged(networkLocation)
-        advanceTimeBy(MIN_TIME_TO_UPDATE_LOCATION_MILLIS + 1)
+        advanceTimeBy(locationTracker.minDurationToUpdateLocationMillis + 1)
 
         val expectedLocationData = LocationData(
                 latitude = 1.0,
@@ -188,7 +189,7 @@ class LocationTrackerTest {
 
         locationTracker.onLocationChanged(gpsLocation)
         locationTracker.onLocationChanged(networkLocation)
-        advanceTimeBy(MIN_TIME_TO_UPDATE_LOCATION_MILLIS + 1)
+        advanceTimeBy(locationTracker.minDurationToUpdateLocationMillis + 1)
 
         val expectedLocationData = LocationData(
                 latitude = 1.0,
@@ -217,7 +218,7 @@ class LocationTrackerTest {
         val resultUpdates = locationTracker.locations.test(this)
 
         locationTracker.onLocationChanged(networkLocation)
-        advanceTimeBy(MIN_TIME_TO_UPDATE_LOCATION_MILLIS + 1)
+        advanceTimeBy(locationTracker.minDurationToUpdateLocationMillis + 1)
 
         val expectedLocationData = LocationData(
                 latitude = 1.0,
@@ -243,7 +244,7 @@ class LocationTrackerTest {
         val resultUpdates = locationTracker.locations.test(this)
 
         locationTracker.requestLastKnownLocation()
-        advanceTimeBy(MIN_TIME_TO_UPDATE_LOCATION_MILLIS + 1)
+        advanceTimeBy(locationTracker.minDurationToUpdateLocationMillis + 1)
 
         val expectedLocationData = LocationData(
                 latitude = A_LATITUDE,
diff --git a/vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt b/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
similarity index 90%
rename from vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt
rename to vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
index dd1a894a28..fca5db14cc 100644
--- a/vector/src/test/java/im/vector/app/features/location/live/map/LocationLiveMapViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/location/live/map/LiveLocationMapViewModelTest.kt
@@ -34,20 +34,20 @@ import org.matrix.android.sdk.api.util.MatrixItem
 
 private const val A_ROOM_ID = "room_id"
 
-class LocationLiveMapViewModelTest {
+class LiveLocationMapViewModelTest {
 
     @get:Rule
     val mvRxTestRule = MvRxTestRule(testDispatcher = UnconfinedTestDispatcher())
 
-    private val args = LocationLiveMapViewArgs(roomId = A_ROOM_ID)
+    private val args = LiveLocationMapViewArgs(roomId = A_ROOM_ID)
 
     private val getListOfUserLiveLocationUseCase = mockk<GetListOfUserLiveLocationUseCase>()
     private val locationServiceConnection = FakeLocationSharingServiceConnection()
     private val stopLiveLocationShareUseCase = mockk<StopLiveLocationShareUseCase>()
 
-    private fun createViewModel(): LocationLiveMapViewModel {
-        return LocationLiveMapViewModel(
-                LocationLiveMapViewState(args),
+    private fun createViewModel(): LiveLocationMapViewModel {
+        return LiveLocationMapViewModel(
+                LiveLocationMapViewState(args),
                 getListOfUserLiveLocationUseCase,
                 locationServiceConnection.instance,
                 stopLiveLocationShareUseCase
@@ -78,7 +78,7 @@ class LocationLiveMapViewModelTest {
         viewModel
                 .test()
                 .assertState(
-                        LocationLiveMapViewState(args).copy(
+                        LiveLocationMapViewState(args).copy(
                                 userLocations = userLocations
                         )
                 )
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
index a9bbb3eb07..b505d05944 100644
--- a/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/onboarding/OnboardingViewModelTest.kt
@@ -17,13 +17,17 @@
 package im.vector.app.features.onboarding
 
 import android.net.Uri
+import android.os.Build
 import com.airbnb.mvrx.test.MvRxTestRule
 import im.vector.app.R
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login.LoginMode
 import im.vector.app.features.login.ReAuthHelper
+import im.vector.app.features.login.ServerType
 import im.vector.app.features.login.SignMode
+import im.vector.app.features.onboarding.RegistrationStateFixture.aRegistrationState
 import im.vector.app.features.onboarding.StartAuthenticationFlowUseCase.StartAuthenticationResult
+import im.vector.app.test.TestBuildVersionSdkIntProvider
 import im.vector.app.test.fakes.FakeActiveSessionHolder
 import im.vector.app.test.fakes.FakeAnalyticsTracker
 import im.vector.app.test.fakes.FakeAuthenticationService
@@ -43,14 +47,15 @@ import im.vector.app.test.fakes.FakeVectorFeatures
 import im.vector.app.test.fakes.FakeVectorOverrides
 import im.vector.app.test.fakes.toTestString
 import im.vector.app.test.fixtures.a401ServerError
-import im.vector.app.test.fixtures.aBuildMeta
 import im.vector.app.test.fixtures.aHomeServerCapabilities
 import im.vector.app.test.test
 import kotlinx.coroutines.test.runTest
+import org.amshove.kluent.shouldBeEqualTo
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.matrix.android.sdk.api.auth.data.HomeServerConnectionConfig
+import org.matrix.android.sdk.api.auth.data.SsoIdentityProvider
 import org.matrix.android.sdk.api.auth.registration.Stage
 import org.matrix.android.sdk.api.failure.Failure
 import org.matrix.android.sdk.api.session.Session
@@ -67,13 +72,22 @@ private val A_HOMESERVER_CAPABILITIES = aHomeServerCapabilities(canChangeDisplay
 private val ANY_CONTINUING_REGISTRATION_RESULT = RegistrationActionHandler.Result.NextStage(Stage.Dummy(mandatory = true))
 private val A_DIRECT_LOGIN = OnboardingAction.AuthenticateAction.LoginDirect("@a-user:id.org", "a-password", "a-device-name")
 private const val A_HOMESERVER_URL = "https://edited-homeserver.org"
+private val A_DEFAULT_HOMESERVER_URL = "${R.string.matrix_org_server_url.toTestString()}/"
 private val A_HOMESERVER_CONFIG = HomeServerConnectionConfig(FakeUri().instance)
 private val SELECTED_HOMESERVER_STATE = SelectedHomeserverState(preferredLoginMode = LoginMode.Password, userFacingUrl = A_HOMESERVER_URL)
 private val SELECTED_HOMESERVER_STATE_SUPPORTED_LOGOUT_DEVICES = SelectedHomeserverState(isLogoutDevicesSupported = true)
+private val DEFAULT_SELECTED_HOMESERVER_STATE = SELECTED_HOMESERVER_STATE.copy(userFacingUrl = A_DEFAULT_HOMESERVER_URL)
 private const val AN_EMAIL = "hello@example.com"
 private const val A_PASSWORD = "a-password"
 private const val A_USERNAME = "hello-world"
+private const val A_DEVICE_NAME = "a-device-name"
 private const val A_MATRIX_ID = "@$A_USERNAME:matrix.org"
+private const val A_LOGIN_TOKEN = "a-login-token"
+private val A_REGISTRATION_STATE = aRegistrationState(email = AN_EMAIL)
+private const val A_SSO_URL = "https://a-sso.url"
+private const val A_REDIRECT_URI = "https://a-redirect.uri"
+private const val A_DEVICE_ID = "a-device-id"
+private val SSO_REGISTRATION_DESCRIPTION = AuthenticationDescription.Register(AuthenticationDescription.AuthenticationType.SSO)
 
 class OnboardingViewModelTest {
 
@@ -102,6 +116,81 @@ class OnboardingViewModelTest {
         viewModelWith(initialState)
     }
 
+    @Test
+    fun `given usecase screen enabled, when handling sign up splash action, then emits OpenUseCaseSelection`() = runTest {
+        val test = viewModel.test()
+        fakeVectorFeatures.givenOnboardingUseCaseEnabled()
+
+        viewModel.handle(OnboardingAction.SplashAction.OnGetStarted(OnboardingFlow.SignUp))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(onboardingFlow = OnboardingFlow.SignUp) }
+                )
+                .assertEvents(OnboardingViewEvents.OpenUseCaseSelection)
+                .finish()
+    }
+
+    @Test
+    fun `given combined login enabled, when handling sign in splash action, then emits OpenCombinedLogin with default homeserver`() = runTest {
+        val test = viewModel.test()
+        fakeVectorFeatures.givenCombinedLoginEnabled()
+        givenCanSuccessfullyUpdateHomeserver(A_DEFAULT_HOMESERVER_URL, DEFAULT_SELECTED_HOMESERVER_STATE)
+
+        viewModel.handle(OnboardingAction.SplashAction.OnIAlreadyHaveAnAccount(OnboardingFlow.SignIn))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(onboardingFlow = OnboardingFlow.SignIn) },
+                        { copy(isLoading = true) },
+                        { copy(selectedHomeserver = DEFAULT_SELECTED_HOMESERVER_STATE) },
+                        { copy(signMode = SignMode.SignIn) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.OpenCombinedLogin)
+                .finish()
+    }
+
+    @Test
+    fun `given can successfully login in with token, when logging in with token, then emits AccountSignedIn`() = runTest {
+        val test = viewModel.test()
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+        fakeLoginWizard.givenLoginWithTokenResult(A_LOGIN_TOKEN, fakeSession)
+        givenInitialisesSession(fakeSession)
+
+        viewModel.handle(OnboardingAction.LoginWithToken(A_LOGIN_TOKEN))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
+                .finish()
+    }
+
+    @Test
+    fun `given can login with username and password, when logging in, then emits AccountSignedIn`() = runTest {
+        val test = viewModel.test()
+        fakeAuthenticationService.givenLoginWizard(fakeLoginWizard)
+        fakeLoginWizard.givenLoginSuccess(A_USERNAME, A_PASSWORD, A_DEVICE_NAME, fakeSession)
+        givenInitialisesSession(fakeSession)
+
+        viewModel.handle(OnboardingAction.AuthenticateAction.Login(A_USERNAME, A_PASSWORD, A_DEVICE_NAME))
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = true) },
+                        { copy(isLoading = false) }
+                )
+                .assertEvents(OnboardingViewEvents.OnAccountSignedIn)
+                .finish()
+    }
+
     @Test
     fun `given registration started with currentThreePid, when handling InitWith, then emits restored session OnSendEmailSuccess`() = runTest {
         val test = viewModel.test()
@@ -389,6 +478,20 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given available username throws, when a register username is entered, then emits error`() = runTest {
+        viewModelWith(initialRegistrationState(A_HOMESERVER_URL))
+        fakeAuthenticationService.givenRegistrationWizard(FakeRegistrationWizard().also { it.givenUserNameIsAvailableThrows(A_USERNAME, AN_ERROR) })
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.UserNameEnteredAction.Registration(A_USERNAME))
+
+        test
+                .assertStates(initialState)
+                .assertEvents(OnboardingViewEvents.Failure(AN_ERROR))
+                .finish()
+    }
+
     @Test
     fun `given available username, when a register username is entered, then emits available registration state`() = runTest {
         viewModelWith(initialRegistrationState(A_HOMESERVER_URL))
@@ -703,6 +806,123 @@ class OnboardingViewModelTest {
                 .finish()
     }
 
+    @Test
+    fun `given homeserver state, when resetting homeserver url, then resets auth service and state`() = runTest {
+        viewModelWith(initialState.copy(isLoading = true, selectedHomeserver = SELECTED_HOMESERVER_STATE))
+        val test = viewModel.test()
+        fakeAuthenticationService.expectReset()
+
+        viewModel.handle(OnboardingAction.ResetHomeServerUrl)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = false, selectedHomeserver = SelectedHomeserverState()) },
+                )
+                .assertNoEvents()
+                .finish()
+        fakeAuthenticationService.verifyReset()
+    }
+
+    @Test
+    fun `given server type, when resetting homeserver type, then resets state`() = runTest {
+        viewModelWith(initialState.copy(serverType = ServerType.EMS))
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.ResetHomeServerType)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(serverType = ServerType.Unknown) },
+                )
+                .assertNoEvents()
+                .finish()
+    }
+
+    @Test
+    fun `given sign mode, when resetting sign mode, then resets state`() = runTest {
+        viewModelWith(initialState.copy(isLoading = true, signMode = SignMode.SignIn))
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.ResetSignMode)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = false, signMode = SignMode.Unknown) },
+                )
+                .assertNoEvents()
+                .finish()
+    }
+
+    @Test
+    fun `given registration state, when resetting authentication attempt, then cancels pending logic or registration and resets state`() = runTest {
+        viewModelWith(initialState.copy(isLoading = true, registrationState = A_REGISTRATION_STATE))
+        val test = viewModel.test()
+        fakeAuthenticationService.expectedCancelsPendingLogin()
+
+        viewModel.handle(OnboardingAction.ResetAuthenticationAttempt)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = false, registrationState = RegistrationState()) },
+                )
+                .assertNoEvents()
+                .finish()
+        fakeAuthenticationService.verifyCancelsPendingLogin()
+    }
+
+    @Test
+    fun `given reset state, when resetting reset state, then resets state`() = runTest {
+        viewModelWith(initialState.copy(isLoading = true, resetState = ResetState(AN_EMAIL)))
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.ResetResetPassword)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(isLoading = false, resetState = ResetState()) },
+                )
+                .assertNoEvents()
+                .finish()
+    }
+
+    @Test
+    fun `given registration state, when resetting user name, then resets state`() = runTest {
+        viewModelWith(initialState.copy(registrationState = A_REGISTRATION_STATE))
+        val test = viewModel.test()
+
+        viewModel.handle(OnboardingAction.ResetSelectedRegistrationUserName)
+
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(registrationState = RegistrationState()) },
+                )
+                .assertNoEvents()
+                .finish()
+    }
+
+    @Test
+    fun `given returns Sso url, when fetching Sso url, then updates authentication state and returns supplied Sso url`() = runTest {
+        val test = viewModel.test()
+        val provider = SsoIdentityProvider(id = "provider_id", null, null, null)
+        fakeAuthenticationService.givenSsoUrl(A_REDIRECT_URI, A_DEVICE_ID, provider.id, result = A_SSO_URL)
+
+        val result = viewModel.fetchSsoUrl(A_REDIRECT_URI, A_DEVICE_ID, provider)
+
+        result shouldBeEqualTo A_SSO_URL
+        test
+                .assertStatesChanges(
+                        initialState,
+                        { copy(selectedAuthenticationState = SelectedAuthenticationState(SSO_REGISTRATION_DESCRIPTION)) }
+                )
+                .finish()
+    }
+
     private fun viewModelWith(state: OnboardingViewState) {
         OnboardingViewModel(
                 state,
@@ -720,7 +940,7 @@ class OnboardingViewModelTest {
                 fakeStartAuthenticationFlowUseCase.instance,
                 FakeVectorOverrides(),
                 fakeRegistrationActionHandler.instance,
-                aBuildMeta(),
+                TestBuildVersionSdkIntProvider().also { it.value = Build.VERSION_CODES.O },
         ).also {
             viewModel = it
             initialState = state
diff --git a/vector/src/test/java/im/vector/app/features/onboarding/RegistrationStateFixture.kt b/vector/src/test/java/im/vector/app/features/onboarding/RegistrationStateFixture.kt
new file mode 100644
index 0000000000..bb7711a5bc
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/features/onboarding/RegistrationStateFixture.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.onboarding
+
+object RegistrationStateFixture {
+
+    fun aRegistrationState(
+            email: String? = null,
+            isUserNameAvailable: Boolean = false,
+            selectedMatrixId: String? = null,
+    ) = RegistrationState(email, isUserNameAvailable, selectedMatrixId)
+}
diff --git a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenTestMigratorTests.kt b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenKeysMigratorTests.kt
similarity index 94%
rename from vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenTestMigratorTests.kt
rename to vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenKeysMigratorTests.kt
index 73f71dbf2b..588fb12382 100644
--- a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenTestMigratorTests.kt
+++ b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/LockScreenKeysMigratorTests.kt
@@ -26,7 +26,7 @@ import io.mockk.verify
 import kotlinx.coroutines.runBlocking
 import org.junit.Test
 
-class LockScreenTestMigratorTests {
+class LockScreenKeysMigratorTests {
 
     private val legacyPinCodeMigrator = mockk<LegacyPinCodeMigrator>(relaxed = true)
     private val missingSystemKeyMigrator = mockk<MissingSystemKeyMigrator>(relaxed = true)
@@ -42,7 +42,7 @@ class LockScreenTestMigratorTests {
         runBlocking { migrator.migrateIfNeeded() }
 
         coVerify(exactly = 0) { legacyPinCodeMigrator.migrate() }
-        verify(exactly = 0) { missingSystemKeyMigrator.migrate() }
+        verify(exactly = 0) { missingSystemKeyMigrator.migrateIfNeeded() }
 
         // When migration is needed
         every { legacyPinCodeMigrator.isMigrationNeeded() } returns true
@@ -50,7 +50,7 @@ class LockScreenTestMigratorTests {
         runBlocking { migrator.migrateIfNeeded() }
 
         coVerify { legacyPinCodeMigrator.migrate() }
-        verify { missingSystemKeyMigrator.migrate() }
+        verify { missingSystemKeyMigrator.migrateIfNeeded() }
     }
 
     @Test
diff --git a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigratorTests.kt b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigratorTests.kt
index d65c3da2d2..e211fc8a0e 100644
--- a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigratorTests.kt
+++ b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/MissingSystemKeyMigratorTests.kt
@@ -18,6 +18,7 @@ package im.vector.app.features.pin.lockscreen.crypto.migrations
 
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
+import android.security.keystore.UserNotAuthenticatedException
 import im.vector.app.features.pin.lockscreen.crypto.KeyStoreCrypto
 import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.test.TestBuildVersionSdkIntProvider
@@ -43,7 +44,7 @@ class MissingSystemKeyMigratorTests {
         every { keyStoreCryptoFactory.provide(any(), any()) } returns keyStoreCryptoMock
         every { vectorPreferences.useBiometricsToUnlock() } returns true
 
-        missingSystemKeyMigrator.migrate()
+        missingSystemKeyMigrator.migrateIfNeeded()
 
         verify { keyStoreCryptoMock.ensureKey() }
     }
@@ -56,7 +57,18 @@ class MissingSystemKeyMigratorTests {
         every { keyStoreCryptoFactory.provide(any(), any()) } returns keyStoreCryptoMock
         every { vectorPreferences.useBiometricsToUnlock() } returns true
 
-        invoking { missingSystemKeyMigrator.migrate() } shouldNotThrow KeyPermanentlyInvalidatedException::class
+        invoking { missingSystemKeyMigrator.migrateIfNeeded() } shouldNotThrow KeyPermanentlyInvalidatedException::class
+    }
+
+    @Test
+    fun migrateHandlesUserNotAuthenticatedExceptions() {
+        val keyStoreCryptoMock = mockk<KeyStoreCrypto> {
+            every { ensureKey() } throws UserNotAuthenticatedException()
+        }
+        every { keyStoreCryptoFactory.provide(any(), any()) } returns keyStoreCryptoMock
+        every { vectorPreferences.useBiometricsToUnlock() } returns true
+
+        invoking { missingSystemKeyMigrator.migrateIfNeeded() } shouldNotThrow UserNotAuthenticatedException::class
     }
 
     @Test
@@ -67,7 +79,7 @@ class MissingSystemKeyMigratorTests {
         every { keyStoreCryptoFactory.provide(any(), any()) } returns keyStoreCryptoMock
         every { vectorPreferences.useBiometricsToUnlock() } returns false
 
-        missingSystemKeyMigrator.migrate()
+        missingSystemKeyMigrator.migrateIfNeeded()
 
         verify(exactly = 0) { keyStoreCryptoMock.ensureKey() }
     }
@@ -81,7 +93,7 @@ class MissingSystemKeyMigratorTests {
         every { keyStoreCryptoFactory.provide(any(), any()) } returns keyStoreCryptoMock
         every { vectorPreferences.useBiometricsToUnlock() } returns false
 
-        missingSystemKeyMigrator.migrate()
+        missingSystemKeyMigrator.migrateIfNeeded()
 
         verify(exactly = 0) { keyStoreCryptoMock.ensureKey() }
     }
diff --git a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1MigratorTests.kt b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1MigratorTests.kt
index a519251398..825b251f3e 100644
--- a/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1MigratorTests.kt
+++ b/vector/src/test/java/im/vector/app/features/pin/lockscreen/crypto/migrations/SystemKeyV1MigratorTests.kt
@@ -16,11 +16,15 @@
 
 package im.vector.app.features.pin.lockscreen.crypto.migrations
 
+import android.security.keystore.UserNotAuthenticatedException
 import im.vector.app.features.pin.lockscreen.crypto.KeyStoreCrypto
+import im.vector.app.features.settings.VectorPreferences
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
+import org.amshove.kluent.invoking
 import org.amshove.kluent.shouldBe
+import org.amshove.kluent.shouldNotThrow
 import org.junit.Test
 import java.security.KeyStore
 
@@ -28,7 +32,8 @@ class SystemKeyV1MigratorTests {
 
     private val keyStoreCryptoFactory = mockk<KeyStoreCrypto.Factory>()
     private val keyStore = mockk<KeyStore>(relaxed = true)
-    private val systemKeyV1Migrator = SystemKeyV1Migrator("vector.system_new", keyStore, keyStoreCryptoFactory)
+    private val vectorPreferences = mockk<VectorPreferences>(relaxed = true)
+    private val systemKeyV1Migrator = SystemKeyV1Migrator("vector.system_new", keyStore, keyStoreCryptoFactory, vectorPreferences)
 
     @Test
     fun isMigrationNeededReturnsTrueIfV1KeyExists() {
@@ -39,6 +44,19 @@ class SystemKeyV1MigratorTests {
         systemKeyV1Migrator.isMigrationNeeded() shouldBe false
     }
 
+    @Test
+    fun migrateHandlesUserNotAuthenticatedException() {
+        val keyStoreCryptoMock = mockk<KeyStoreCrypto> {
+            every { ensureKey() } throws UserNotAuthenticatedException()
+        }
+        every { keyStoreCryptoFactory.provide("vector.system_new", any()) } returns keyStoreCryptoMock
+
+        invoking { systemKeyV1Migrator.migrate() } shouldNotThrow UserNotAuthenticatedException::class
+
+        verify { keyStore.deleteEntry(SystemKeyV1Migrator.SYSTEM_KEY_ALIAS_V1) }
+        verify { keyStoreCryptoMock.ensureKey() }
+    }
+
     @Test
     fun migrateDeletesOldEntryAndEnsuresNewKey() {
         val keyStoreCryptoMock = mockk<KeyStoreCrypto> {
diff --git a/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt b/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
index 9e80bb490b..18dfdf9145 100644
--- a/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
+++ b/vector/src/test/java/im/vector/app/features/pin/lockscreen/fragment/LockScreenViewModelTests.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.pin.lockscreen.fragment
 
+import android.app.KeyguardManager
 import android.os.Build
 import android.security.keystore.KeyPermanentlyInvalidatedException
 import androidx.fragment.app.FragmentActivity
@@ -23,7 +24,6 @@ import com.airbnb.mvrx.test.MvRxTestRule
 import com.airbnb.mvrx.withState
 import im.vector.app.features.pin.lockscreen.biometrics.BiometricHelper
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguration
-import im.vector.app.features.pin.lockscreen.configuration.LockScreenConfiguratorProvider
 import im.vector.app.features.pin.lockscreen.configuration.LockScreenMode
 import im.vector.app.features.pin.lockscreen.crypto.LockScreenKeysMigrator
 import im.vector.app.features.pin.lockscreen.pincode.PinCodeHelper
@@ -42,6 +42,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest
 import org.amshove.kluent.shouldBeEqualTo
 import org.amshove.kluent.shouldBeFalse
@@ -57,7 +58,15 @@ class LockScreenViewModelTests {
 
     private val pinCodeHelper = mockk<PinCodeHelper>(relaxed = true)
     private val biometricHelper = mockk<BiometricHelper>(relaxed = true)
+    private val biometricHelperFactory = object : BiometricHelper.BiometricHelperFactory {
+        override fun create(configuration: LockScreenConfiguration): BiometricHelper {
+            return biometricHelper
+        }
+    }
     private val keysMigrator = mockk<LockScreenKeysMigrator>(relaxed = true)
+    private val keyguardManager = mockk<KeyguardManager>(relaxed = true) {
+        every { isDeviceLocked } returns false
+    }
     private val versionProvider = TestBuildVersionSdkIntProvider()
 
     @Before
@@ -68,19 +77,36 @@ class LockScreenViewModelTests {
     @Test
     fun `init migrates old keys to new ones if needed`() {
         val initialState = createViewState()
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
-        LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
 
         coVerify { keysMigrator.migrateIfNeeded() }
     }
 
+    @Test
+    fun `init updates the initial state with biometric info`() = runTest {
+        every { biometricHelper.isSystemAuthEnabledAndValid } returns true
+        val initialState = createViewState()
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
+        advanceUntilIdle()
+        val newState = viewModel.awaitState()
+        newState shouldNotBeEqualTo initialState
+    }
+
+    @Test
+    fun `Updating the initial state with biometric info waits until device is unlocked on Android 12+`() = runTest {
+        val initialState = createViewState()
+        versionProvider.value = Build.VERSION_CODES.S
+        LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
+        advanceUntilIdle()
+        verify { keyguardManager.isDeviceLocked }
+    }
+
     @Test
     fun `when ViewModel is instantiated initialState is updated with biometric info`() {
         val initialState = createViewState()
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
         // This should set canUseBiometricAuth to true
         every { biometricHelper.isSystemAuthEnabledAndValid } returns true
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
         val newState = withState(viewModel) { it }
         initialState shouldNotBeEqualTo newState
     }
@@ -88,8 +114,7 @@ class LockScreenViewModelTests {
     @Test
     fun `when onPinCodeEntered is called in VERIFY mode, the code is verified and the result is emitted as a ViewEvent`() = runTest {
         val initialState = createViewState()
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
         coEvery { pinCodeHelper.verifyPinCode(any()) } returns true
 
         val events = viewModel.test().viewEvents
@@ -113,8 +138,7 @@ class LockScreenViewModelTests {
     fun `when onPinCodeEntered is called in CREATE mode with no confirmation needed it creates the pin code`() = runTest {
         val configuration = createDefaultConfiguration(mode = LockScreenMode.CREATE, needsNewCodeValidation = false)
         val initialState = createViewState(lockScreenConfiguration = configuration)
-        val configProvider = LockScreenConfiguratorProvider(configuration)
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
 
         val events = viewModel.test().viewEvents
         events.assertNoValues()
@@ -128,9 +152,8 @@ class LockScreenViewModelTests {
     @Test
     fun `when onPinCodeEntered is called twice in CREATE mode with confirmation needed it verifies and creates the pin code`() = runTest {
         val configuration = createDefaultConfiguration(mode = LockScreenMode.CREATE, needsNewCodeValidation = true)
-        val configProvider = LockScreenConfiguratorProvider(configuration)
         val initialState = createViewState(lockScreenConfiguration = configuration)
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
 
         val events = viewModel.test().viewEvents
         events.assertNoValues()
@@ -149,8 +172,7 @@ class LockScreenViewModelTests {
     fun `when onPinCodeEntered is called in CREATE mode with incorrect confirmation it clears the pin code`() = runTest {
         val configuration = createDefaultConfiguration(mode = LockScreenMode.CREATE, needsNewCodeValidation = true)
         val initialState = createViewState(lockScreenConfiguration = configuration)
-        val configProvider = LockScreenConfiguratorProvider(configuration)
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
 
         val events = viewModel.test().viewEvents
         events.assertNoValues()
@@ -170,8 +192,7 @@ class LockScreenViewModelTests {
     @Test
     fun `onPinCodeEntered handles exceptions`() = runTest {
         val initialState = createViewState()
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
         val exception = IllegalStateException("Something went wrong")
         coEvery { pinCodeHelper.verifyPinCode(any()) } throws exception
 
@@ -187,39 +208,34 @@ class LockScreenViewModelTests {
     fun `when showBiometricPrompt catches a KeyPermanentlyInvalidatedException it disables biometric authentication`() = runTest {
         versionProvider.value = Build.VERSION_CODES.M
 
-        every { biometricHelper.isSystemAuthEnabledAndValid } returns true
-        every { biometricHelper.isSystemKeyValid } returns true
+        every { biometricHelper.isSystemKeyValid } returns false
         val exception = KeyPermanentlyInvalidatedException()
         coEvery { biometricHelper.authenticate(any<FragmentActivity>()) } throws exception
-        coEvery { biometricHelper.disableAuthentication() } coAnswers {
-            every { biometricHelper.isSystemAuthEnabledAndValid } returns false
-        }
         val configuration = createDefaultConfiguration(mode = LockScreenMode.VERIFY, needsNewCodeValidation = true, isBiometricsEnabled = true)
-        val configProvider = LockScreenConfiguratorProvider(configuration)
         val initialState = createViewState(
                 canUseBiometricAuth = true,
                 isBiometricKeyInvalidated = false,
                 lockScreenConfiguration = configuration
         )
-        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(initialState, pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
 
         val events = viewModel.test().viewEvents
         events.assertNoValues()
 
         viewModel.handle(LockScreenAction.ShowBiometricPrompt(mockk()))
 
-        events.assertValues(LockScreenViewEvent.AuthError(AuthMethod.BIOMETRICS, exception))
+        events.assertValues(LockScreenViewEvent.ShowBiometricKeyInvalidatedMessage)
         verify { biometricHelper.disableAuthentication() }
 
         // System key was deleted, biometric auth should be disabled
+        every { biometricHelper.isSystemAuthEnabledAndValid } returns false
         val newState = viewModel.awaitState()
         newState.canUseBiometricAuth.shouldBeFalse()
     }
 
     @Test
     fun `when showBiometricPrompt receives an event it propagates it as a ViewEvent`() = runTest {
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
-        val viewModel = LockScreenViewModel(createViewState(), pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(createViewState(), pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
         coEvery { biometricHelper.authenticate(any<FragmentActivity>()) } returns flowOf(false, true)
 
         val events = viewModel.test().viewEvents
@@ -232,8 +248,7 @@ class LockScreenViewModelTests {
 
     @Test
     fun `showBiometricPrompt handles exceptions`() = runTest {
-        val configProvider = LockScreenConfiguratorProvider(createDefaultConfiguration())
-        val viewModel = LockScreenViewModel(createViewState(), pinCodeHelper, biometricHelper, keysMigrator, configProvider, versionProvider)
+        val viewModel = LockScreenViewModel(createViewState(), pinCodeHelper, biometricHelperFactory, keysMigrator, versionProvider, keyguardManager)
         val exception = IllegalStateException("Something went wrong")
         coEvery { biometricHelper.authenticate(any<FragmentActivity>()) } throws exception
 
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
index cc606497f5..af53913169 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeAuthenticationService.kt
@@ -18,6 +18,7 @@ package im.vector.app.test.fakes
 
 import io.mockk.coEvery
 import io.mockk.coJustRun
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.AuthenticationService
@@ -68,4 +69,16 @@ class FakeAuthenticationService : AuthenticationService by mockk() {
     fun givenDirectAuthenticationThrows(config: HomeServerConnectionConfig, matrixId: String, password: String, deviceName: String, cause: Throwable) {
         coEvery { directAuthentication(config, matrixId, password, deviceName) } throws cause
     }
+
+    fun verifyReset() {
+        coVerify { reset() }
+    }
+
+    fun verifyCancelsPendingLogin() {
+        coVerify { cancelPendingLoginOrRegistration() }
+    }
+
+    fun givenSsoUrl(redirectUri: String, deviceId: String, providerId: String, result: String) {
+        coEvery { getSsoUrl(redirectUri, deviceId, providerId) } returns result
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingServiceConnection.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingServiceConnection.kt
index db27a894f9..a42ce78b15 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingServiceConnection.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLocationSharingServiceConnection.kt
@@ -16,7 +16,7 @@
 
 package im.vector.app.test.fakes
 
-import im.vector.app.features.location.LocationSharingServiceConnection
+import im.vector.app.features.location.live.tracking.LocationSharingServiceConnection
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
index 07577ed61c..ba702a324c 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeLoginWizard.kt
@@ -16,10 +16,12 @@
 
 package im.vector.app.test.fakes
 
+import io.mockk.coEvery
 import io.mockk.coJustRun
 import io.mockk.coVerify
 import io.mockk.mockk
 import org.matrix.android.sdk.api.auth.login.LoginWizard
+import org.matrix.android.sdk.api.session.Session
 
 class FakeLoginWizard : LoginWizard by mockk() {
 
@@ -27,6 +29,14 @@ class FakeLoginWizard : LoginWizard by mockk() {
         coJustRun { resetPassword(email) }
     }
 
+    fun givenLoginWithTokenResult(token: String, result: Session) {
+        coEvery { loginWithToken(token) } returns result
+    }
+
+    fun givenLoginSuccess(username: String, password: String, deviceName: String, result: Session) {
+        coEvery { login(username, password, deviceName) } returns result
+    }
+
     fun givenConfirmResetPasswordSuccess(password: String) {
         coJustRun { resetPasswordMailConfirmed(password) }
     }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt
index 4f0b1fe083..6cacd6c1e5 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeRegistrationWizard.kt
@@ -57,6 +57,10 @@ class FakeRegistrationWizard : RegistrationWizard by mockk(relaxed = false) {
         coEvery { registrationAvailable(userName) } returns RegistrationAvailability.Available
     }
 
+    fun givenUserNameIsAvailableThrows(userName: String, cause: Throwable) {
+        coEvery { registrationAvailable(userName) } throws cause
+    }
+
     fun givenUserNameIsUnavailable(userName: String, failure: Failure.ServerError) {
         coEvery { registrationAvailable(userName) } returns RegistrationAvailability.NotAvailable(failure)
     }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
index 65295af3dd..18af88ba0f 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeSession.kt
@@ -23,11 +23,14 @@ import im.vector.app.features.session.VectorSessionStore
 import im.vector.app.test.testCoroutineDispatchers
 import io.mockk.coEvery
 import io.mockk.coJustRun
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkStatic
 import org.matrix.android.sdk.api.session.Session
+import org.matrix.android.sdk.api.session.getRoomSummary
 import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
 import org.matrix.android.sdk.api.session.profile.ProfileService
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
 
 class FakeSession(
         val fakeCryptoService: FakeCryptoService = FakeCryptoService(),
@@ -67,4 +70,11 @@ class FakeSession(
             this@FakeSession.startSyncing(any())
         }
     }
+
+    companion object {
+
+        fun withRoomSummary(roomSummary: RoomSummary) = FakeSession().apply {
+            every { getRoomSummary(any()) } returns roomSummary
+        }
+    }
 }
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeUiStateRepository.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeUiStateRepository.kt
new file mode 100644
index 0000000000..4e8af9042c
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeUiStateRepository.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fakes
+
+import im.vector.app.features.ui.UiStateRepository
+import io.mockk.justRun
+import io.mockk.mockk
+import io.mockk.verify
+import org.matrix.android.sdk.api.session.Session
+
+class FakeUiStateRepository : UiStateRepository by mockk() {
+
+    init {
+        justRun { storeSelectedSpace(any(), any()) }
+    }
+
+    fun verifyStoreSelectedSpace(roomId: String, session: Session, inverse: Boolean = false) {
+        verify(inverse = inverse) { storeSelectedSpace(roomId, session.sessionId) }
+    }
+}
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
index 18d7355aeb..4e6b4fc3df 100644
--- a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
@@ -35,6 +35,10 @@ class FakeVectorFeatures : VectorFeatures by spyk<DefaultVectorFeatures>() {
         every { isOnboardingCombinedLoginEnabled() } returns true
     }
 
+    fun givenOnboardingUseCaseEnabled() {
+        every { isOnboardingUseCaseEnabled() } returns true
+    }
+
     fun givenCombinedLoginDisabled() {
         every { isOnboardingCombinedLoginEnabled() } returns false
     }
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
index 5fbcdd98d1..ea1769ecb2 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/AnalyticsConfigFixture.kt
@@ -24,10 +24,5 @@ object AnalyticsConfigFixture {
             postHogHost: String = "http://posthog.url",
             postHogApiKey: String = "api-key",
             policyLink: String = "http://policy.link"
-    ) = object : AnalyticsConfig {
-        override val isEnabled: Boolean = isEnabled
-        override val postHogHost = postHogHost
-        override val postHogApiKey = postHogApiKey
-        override val policyLink = policyLink
-    }
+    ) = AnalyticsConfig(isEnabled, postHogHost, postHogApiKey, policyLink)
 }
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
index b0e6b1dd51..4f4649106d 100644
--- a/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
+++ b/vector/src/test/java/im/vector/app/test/fixtures/BuildMetaFixture.kt
@@ -16,7 +16,17 @@
 
 package im.vector.app.test.fixtures
 
-import android.os.Build
 import im.vector.app.core.resources.BuildMeta
 
-fun aBuildMeta() = BuildMeta(Build.VERSION_CODES.O)
+fun aBuildMeta() = BuildMeta(
+        isDebug = false,
+        applicationId = "im.vector",
+        lowPrivacyLoggingEnabled = false,
+        versionName = "app-version-name",
+        gitRevision = "abcdef",
+        gitRevisionDate = "01-01-01",
+        gitBranchName = "a-branch-name",
+        buildNumber = "100",
+        flavorDescription = "Gplay",
+        flavorShortDescription = "",
+)
diff --git a/vector/src/test/java/im/vector/app/test/fixtures/RoomSummaryFixture.kt b/vector/src/test/java/im/vector/app/test/fixtures/RoomSummaryFixture.kt
new file mode 100644
index 0000000000..ee37dac618
--- /dev/null
+++ b/vector/src/test/java/im/vector/app/test/fixtures/RoomSummaryFixture.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.test.fixtures
+
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+object RoomSummaryFixture {
+
+    fun aRoomSummary(roomId: String) = RoomSummary(
+            roomId,
+            isEncrypted = false,
+            encryptionEventTs = 0,
+            typingUsers = emptyList(),
+    )
+}
diff --git a/vector/src/withvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt b/vector/src/withvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
index b35ab774be..074779c6cc 100644
--- a/vector/src/withvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
+++ b/vector/src/withvoip/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import im.vector.app.ActiveSessionDataSource
-import im.vector.app.BuildConfig
 import im.vector.app.core.pushers.UnifiedPushHelper
 import im.vector.app.core.services.CallAndroidService
 import im.vector.app.features.analytics.AnalyticsTracker
@@ -74,6 +73,7 @@ class WebRtcCallManager @Inject constructor(
         private val activeSessionDataSource: ActiveSessionDataSource,
         private val analyticsTracker: AnalyticsTracker,
         private val unifiedPushHelper: UnifiedPushHelper,
+        private val voipConfig: VoipConfig,
 ) : CallListener,
         DefaultLifecycleObserver {
 
@@ -444,7 +444,7 @@ class WebRtcCallManager @Inject constructor(
     }
 
     override fun onCallAssertedIdentityReceived(callAssertedIdentityContent: CallAssertedIdentityContent) {
-        if (!BuildConfig.handleCallAssertedIdentityEvents) {
+        if (!voipConfig.handleCallAssertedIdentityEvents) {
             return
         }
         val call = callsByCallId[callAssertedIdentityContent.callId]