From 4c827a12aabed432fdf7e76f764f53ce044b2ae8 Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Thu, 24 Nov 2022 10:35:00 +0200
Subject: [PATCH] UI test fixes (#335)

* Remove status bars when running UITests
* Remove simulator OS versions from screenshot names, be less lenient with image diffing
* Rename UITests splash screen to onboarding
* Switch tests to Xcode 14.1, remove version names for used simulators and switched from iPhone 13 Pro Max to iPhone 14
* Fix ServiceLocator and fallbackLaguage for UI tests
* Drop snapshot diffing precision to 0.99 as 0.999 triggers false negatives
* Fix server selection UI tests after exposing the sliding sync proxy configuration
* Update reference screenshots
---
 .gitignore                                    | 12 ++--
 ElementX.xcodeproj/project.pbxproj            | 64 ++++---------------
 .../Sources/Application/AppCoordinator.swift  | 15 +----
 .../Sources/Application/Application.swift     |  5 ++
 .../Sources/Application/ServiceLocator.swift  | 29 +++++++++
 .../UITests/UITestScreenIdentifier.swift      |  2 +-
 .../UITests/UITestsAppCoordinator.swift       | 13 +++-
 IntegrationTests/SupportingFiles/target.yml   |  9 ---
 Tools/Scripts/bootTestSimulator.py            | 52 ---------------
 UITests/Sources/Application.swift             |  4 +-
 UITests/Sources/OnboardingUITests.swift       |  6 +-
 UITests/Sources/ServerSelectionUITests.swift  | 22 +++----
 ...DE-iPad-9th-generation.analyticsPrompt.png |  3 -
 ...iPad-9th-generation.authenticationFlow.png |  3 -
 ...-0-de-DE-iPad-9th-generation.bugReport.png |  3 -
 ...9th-generation.bugReportWithScreenshot.png |  3 -
 .../16-0-de-DE-iPad-9th-generation.home.png   |  3 -
 .../16-0-de-DE-iPad-9th-generation.login.png  |  3 -
 ...9th-generation.roomEncryptedWithAvatar.png |  3 -
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 -
 ...DE-iPad-9th-generation.serverSelection.png |  3 -
 ...9th-generation.serverSelectionNonModal.png |  3 -
 ...Pad-9th-generation.sessionVerification.png |  3 -
 ...6-0-de-DE-iPad-9th-generation.settings.png |  3 -
 ...e-DE-iPad-9th-generation.simpleRegular.png |  3 -
 ...e-DE-iPad-9th-generation.simpleUpgrade.png |  3 -
 ...0-de-DE-iPad-9th-generation.softLogout.png |  3 -
 .../16-0-de-DE-iPad-9th-generation.splash.png |  3 -
 ...e-DE-iPhone-13-Pro-Max.analyticsPrompt.png |  3 -
 ...E-iPhone-13-Pro-Max.authenticationFlow.png |  3 -
 ...16-0-de-DE-iPhone-13-Pro-Max.bugReport.png |  3 -
 ...one-13-Pro-Max.bugReportWithScreenshot.png |  3 -
 .../16-0-de-DE-iPhone-13-Pro-Max.home.png     |  3 -
 .../16-0-de-DE-iPhone-13-Pro-Max.login.png    |  3 -
 ...one-13-Pro-Max.roomEncryptedWithAvatar.png |  3 -
 ...DE-iPhone-13-Pro-Max.roomPlainNoAvatar.png |  3 -
 ...e-DE-iPhone-13-Pro-Max.serverSelection.png |  3 -
 ...one-13-Pro-Max.serverSelectionNonModal.png |  3 -
 ...-iPhone-13-Pro-Max.sessionVerification.png |  3 -
 .../16-0-de-DE-iPhone-13-Pro-Max.settings.png |  3 -
 ...-de-DE-iPhone-13-Pro-Max.simpleRegular.png |  3 -
 ...-de-DE-iPhone-13-Pro-Max.simpleUpgrade.png |  3 -
 ...6-0-de-DE-iPhone-13-Pro-Max.softLogout.png |  3 -
 .../16-0-de-DE-iPhone-13-Pro-Max.splash.png   |  3 -
 ...GB-iPad-9th-generation.analyticsPrompt.png |  3 -
 ...iPad-9th-generation.authenticationFlow.png |  3 -
 ...-0-en-GB-iPad-9th-generation.bugReport.png |  3 -
 ...9th-generation.bugReportWithScreenshot.png |  3 -
 .../16-0-en-GB-iPad-9th-generation.home.png   |  3 -
 .../16-0-en-GB-iPad-9th-generation.login.png  |  3 -
 ...9th-generation.roomEncryptedWithAvatar.png |  3 -
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 -
 ...GB-iPad-9th-generation.serverSelection.png |  3 -
 ...9th-generation.serverSelectionNonModal.png |  3 -
 ...Pad-9th-generation.sessionVerification.png |  3 -
 ...6-0-en-GB-iPad-9th-generation.settings.png |  3 -
 ...n-GB-iPad-9th-generation.simpleRegular.png |  3 -
 ...n-GB-iPad-9th-generation.simpleUpgrade.png |  3 -
 ...0-en-GB-iPad-9th-generation.softLogout.png |  3 -
 .../16-0-en-GB-iPad-9th-generation.splash.png |  3 -
 ...n-GB-iPhone-13-Pro-Max.analyticsPrompt.png |  3 -
 ...B-iPhone-13-Pro-Max.authenticationFlow.png |  3 -
 ...16-0-en-GB-iPhone-13-Pro-Max.bugReport.png |  3 -
 ...one-13-Pro-Max.bugReportWithScreenshot.png |  3 -
 .../16-0-en-GB-iPhone-13-Pro-Max.home.png     |  3 -
 .../16-0-en-GB-iPhone-13-Pro-Max.login.png    |  3 -
 ...one-13-Pro-Max.roomEncryptedWithAvatar.png |  3 -
 ...GB-iPhone-13-Pro-Max.roomPlainNoAvatar.png |  3 -
 ...n-GB-iPhone-13-Pro-Max.serverSelection.png |  3 -
 ...one-13-Pro-Max.serverSelectionNonModal.png |  3 -
 ...-iPhone-13-Pro-Max.sessionVerification.png |  3 -
 .../16-0-en-GB-iPhone-13-Pro-Max.settings.png |  3 -
 ...-en-GB-iPhone-13-Pro-Max.simpleRegular.png |  3 -
 ...-en-GB-iPhone-13-Pro-Max.simpleUpgrade.png |  3 -
 ...6-0-en-GB-iPhone-13-Pro-Max.softLogout.png |  3 -
 .../16-0-en-GB-iPhone-13-Pro-Max.splash.png   |  3 -
 ...FR-iPad-9th-generation.analyticsPrompt.png |  3 -
 ...iPad-9th-generation.authenticationFlow.png |  3 -
 ...-0-fr-FR-iPad-9th-generation.bugReport.png |  3 -
 ...9th-generation.bugReportWithScreenshot.png |  3 -
 .../16-0-fr-FR-iPad-9th-generation.home.png   |  3 -
 .../16-0-fr-FR-iPad-9th-generation.login.png  |  3 -
 ...9th-generation.roomEncryptedWithAvatar.png |  3 -
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 -
 ...FR-iPad-9th-generation.serverSelection.png |  3 -
 ...9th-generation.serverSelectionNonModal.png |  3 -
 ...Pad-9th-generation.sessionVerification.png |  3 -
 ...6-0-fr-FR-iPad-9th-generation.settings.png |  3 -
 ...r-FR-iPad-9th-generation.simpleRegular.png |  3 -
 ...r-FR-iPad-9th-generation.simpleUpgrade.png |  3 -
 ...0-fr-FR-iPad-9th-generation.softLogout.png |  3 -
 .../16-0-fr-FR-iPad-9th-generation.splash.png |  3 -
 ...r-FR-iPhone-13-Pro-Max.analyticsPrompt.png |  3 -
 ...R-iPhone-13-Pro-Max.authenticationFlow.png |  3 -
 ...16-0-fr-FR-iPhone-13-Pro-Max.bugReport.png |  3 -
 ...one-13-Pro-Max.bugReportWithScreenshot.png |  3 -
 .../16-0-fr-FR-iPhone-13-Pro-Max.home.png     |  3 -
 .../16-0-fr-FR-iPhone-13-Pro-Max.login.png    |  3 -
 ...one-13-Pro-Max.roomEncryptedWithAvatar.png |  3 -
 ...FR-iPhone-13-Pro-Max.roomPlainNoAvatar.png |  3 -
 ...r-FR-iPhone-13-Pro-Max.serverSelection.png |  3 -
 ...one-13-Pro-Max.serverSelectionNonModal.png |  3 -
 ...-iPhone-13-Pro-Max.sessionVerification.png |  3 -
 .../16-0-fr-FR-iPhone-13-Pro-Max.settings.png |  3 -
 ...-fr-FR-iPhone-13-Pro-Max.simpleRegular.png |  3 -
 ...-fr-FR-iPhone-13-Pro-Max.simpleUpgrade.png |  3 -
 ...6-0-fr-FR-iPhone-13-Pro-Max.softLogout.png |  3 -
 .../16-0-fr-FR-iPhone-13-Pro-Max.splash.png   |  3 -
 ...DE-iPad-9th-generation.analyticsPrompt.png |  3 +
 ...iPad-9th-generation.authenticationFlow.png |  3 +
 .../de-DE-iPad-9th-generation.bugReport.png   |  3 +
 ...9th-generation.bugReportWithScreenshot.png |  3 +
 .../de-DE-iPad-9th-generation.home.png        |  3 +
 .../de-DE-iPad-9th-generation.login.png       |  3 +
 .../de-DE-iPad-9th-generation.onboarding.png  |  3 +
 ...9th-generation.roomEncryptedWithAvatar.png |  3 +
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 +
 ...DE-iPad-9th-generation.serverSelection.png |  3 +
 ...9th-generation.serverSelectionNonModal.png |  3 +
 ...Pad-9th-generation.sessionVerification.png |  3 +
 .../de-DE-iPad-9th-generation.settings.png    |  3 +
 ...e-DE-iPad-9th-generation.simpleRegular.png |  3 +
 ...e-DE-iPad-9th-generation.simpleUpgrade.png |  3 +
 .../de-DE-iPad-9th-generation.softLogout.png  |  3 +
 .../de-DE-iPhone-14.analyticsPrompt.png       |  3 +
 .../de-DE-iPhone-14.authenticationFlow.png    |  3 +
 .../Application/de-DE-iPhone-14.bugReport.png |  3 +
 ...e-DE-iPhone-14.bugReportWithScreenshot.png |  3 +
 .../Application/de-DE-iPhone-14.home.png      |  3 +
 .../Application/de-DE-iPhone-14.login.png     |  3 +
 .../de-DE-iPhone-14.onboarding.png            |  3 +
 ...e-DE-iPhone-14.roomEncryptedWithAvatar.png |  3 +
 .../de-DE-iPhone-14.roomPlainNoAvatar.png     |  3 +
 .../de-DE-iPhone-14.serverSelection.png       |  3 +
 ...e-DE-iPhone-14.serverSelectionNonModal.png |  3 +
 .../de-DE-iPhone-14.sessionVerification.png   |  3 +
 .../Application/de-DE-iPhone-14.settings.png  |  3 +
 .../de-DE-iPhone-14.simpleRegular.png         |  3 +
 .../de-DE-iPhone-14.simpleUpgrade.png         |  3 +
 .../de-DE-iPhone-14.softLogout.png            |  3 +
 ...GB-iPad-9th-generation.analyticsPrompt.png |  3 +
 ...iPad-9th-generation.authenticationFlow.png |  3 +
 .../en-GB-iPad-9th-generation.bugReport.png   |  3 +
 ...9th-generation.bugReportWithScreenshot.png |  3 +
 .../en-GB-iPad-9th-generation.home.png        |  3 +
 .../en-GB-iPad-9th-generation.login.png       |  3 +
 .../en-GB-iPad-9th-generation.onboarding.png  |  3 +
 ...9th-generation.roomEncryptedWithAvatar.png |  3 +
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 +
 ...GB-iPad-9th-generation.serverSelection.png |  3 +
 ...9th-generation.serverSelectionNonModal.png |  3 +
 ...Pad-9th-generation.sessionVerification.png |  3 +
 .../en-GB-iPad-9th-generation.settings.png    |  3 +
 ...n-GB-iPad-9th-generation.simpleRegular.png |  3 +
 ...n-GB-iPad-9th-generation.simpleUpgrade.png |  3 +
 .../en-GB-iPad-9th-generation.softLogout.png  |  3 +
 .../en-GB-iPhone-14.analyticsPrompt.png       |  3 +
 .../en-GB-iPhone-14.authenticationFlow.png    |  3 +
 .../Application/en-GB-iPhone-14.bugReport.png |  3 +
 ...n-GB-iPhone-14.bugReportWithScreenshot.png |  3 +
 .../Application/en-GB-iPhone-14.home.png      |  3 +
 .../Application/en-GB-iPhone-14.login.png     |  3 +
 .../en-GB-iPhone-14.onboarding.png            |  3 +
 ...n-GB-iPhone-14.roomEncryptedWithAvatar.png |  3 +
 .../en-GB-iPhone-14.roomPlainNoAvatar.png     |  3 +
 .../en-GB-iPhone-14.serverSelection.png       |  3 +
 ...n-GB-iPhone-14.serverSelectionNonModal.png |  3 +
 .../en-GB-iPhone-14.sessionVerification.png   |  3 +
 .../Application/en-GB-iPhone-14.settings.png  |  3 +
 .../en-GB-iPhone-14.simpleRegular.png         |  3 +
 .../en-GB-iPhone-14.simpleUpgrade.png         |  3 +
 .../en-GB-iPhone-14.softLogout.png            |  3 +
 ...FR-iPad-9th-generation.analyticsPrompt.png |  3 +
 ...iPad-9th-generation.authenticationFlow.png |  3 +
 .../fr-FR-iPad-9th-generation.bugReport.png   |  3 +
 ...9th-generation.bugReportWithScreenshot.png |  3 +
 .../fr-FR-iPad-9th-generation.home.png        |  3 +
 .../fr-FR-iPad-9th-generation.login.png       |  3 +
 .../fr-FR-iPad-9th-generation.onboarding.png  |  3 +
 ...9th-generation.roomEncryptedWithAvatar.png |  3 +
 ...-iPad-9th-generation.roomPlainNoAvatar.png |  3 +
 ...FR-iPad-9th-generation.serverSelection.png |  3 +
 ...9th-generation.serverSelectionNonModal.png |  3 +
 ...Pad-9th-generation.sessionVerification.png |  3 +
 .../fr-FR-iPad-9th-generation.settings.png    |  3 +
 ...r-FR-iPad-9th-generation.simpleRegular.png |  3 +
 ...r-FR-iPad-9th-generation.simpleUpgrade.png |  3 +
 .../fr-FR-iPad-9th-generation.softLogout.png  |  3 +
 .../fr-FR-iPhone-14.analyticsPrompt.png       |  3 +
 .../fr-FR-iPhone-14.authenticationFlow.png    |  3 +
 .../Application/fr-FR-iPhone-14.bugReport.png |  3 +
 ...r-FR-iPhone-14.bugReportWithScreenshot.png |  3 +
 .../Application/fr-FR-iPhone-14.home.png      |  3 +
 .../Application/fr-FR-iPhone-14.login.png     |  3 +
 .../fr-FR-iPhone-14.onboarding.png            |  3 +
 ...r-FR-iPhone-14.roomEncryptedWithAvatar.png |  3 +
 .../fr-FR-iPhone-14.roomPlainNoAvatar.png     |  3 +
 .../fr-FR-iPhone-14.serverSelection.png       |  3 +
 ...r-FR-iPhone-14.serverSelectionNonModal.png |  3 +
 .../fr-FR-iPhone-14.sessionVerification.png   |  3 +
 .../Application/fr-FR-iPhone-14.settings.png  |  3 +
 .../fr-FR-iPhone-14.simpleRegular.png         |  3 +
 .../fr-FR-iPhone-14.simpleUpgrade.png         |  3 +
 .../fr-FR-iPhone-14.softLogout.png            |  3 +
 UITests/SupportingFiles/target.yml            | 22 -------
 fastlane/Fastfile                             |  4 +-
 206 files changed, 368 insertions(+), 467 deletions(-)
 create mode 100644 ElementX/Sources/Application/ServiceLocator.swift
 delete mode 100755 Tools/Scripts/bootTestSimulator.py
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.splash.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.splash.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.splash.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.splash.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.splash.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.analyticsPrompt.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.authenticationFlow.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReport.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReportWithScreenshot.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.home.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.login.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomPlainNoAvatar.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelection.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelectionNonModal.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.sessionVerification.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.settings.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleRegular.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleUpgrade.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.softLogout.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.splash.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.softLogout.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.softLogout.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.softLogout.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.analyticsPrompt.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.authenticationFlow.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReport.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReportWithScreenshot.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.home.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.login.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.onboarding.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomEncryptedWithAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomPlainNoAvatar.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelection.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelectionNonModal.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.sessionVerification.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.settings.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleRegular.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleUpgrade.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.softLogout.png

diff --git a/.gitignore b/.gitignore
index 24c57c8d0..f21d63ace 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,9 +44,9 @@ Tools/Scripts/element-android
 # ignore all
 /UITests/Sources/__Snapshots__/Application/*
 # but keep the references
-!/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.*.png
-!/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.*.png
-!/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.*.png
-!/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.*.png
-!/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.*.png
-!/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.*.png
+!/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.*.png
+!/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.*.png
+!/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.*.png
+!/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.*.png
+!/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.*.png
+!/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.*.png
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 5a3169b3e..25b8692d4 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -95,6 +95,7 @@
 		323F36D880363C473B81A9EA /* MediaProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC3D31C2DA6910AA0079678A /* MediaProxyProtocol.swift */; };
 		3274219F7F26A5C6C2C55630 /* FilePreviewViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3F652E88106B855A2A55ADE /* FilePreviewViewModelProtocol.swift */; };
 		32BA37B01B05261FCF2D4B45 /* WeakDictionaryKeyReference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 090CA61A835C151CEDF8F372 /* WeakDictionaryKeyReference.swift */; };
+		33665CE55037D029ED7D867E /* TimelineScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A627CE1429374617334FA5E9 /* TimelineScrollView.swift */; };
 		33CAC1226DFB8B5D8447D286 /* SwiftState in Frameworks */ = {isa = PBXBuildFile; productRef = 3853B78FB8531B83936C5DA6 /* SwiftState */; };
 		33D630461FC4562CC767EE9F /* FileCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5B0B1226DA8DB55918B34CD /* FileCache.swift */; };
 		34966D4C1C2C6D37FE3F7F50 /* SettingsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3DD2D50A7EAA4FC78417730E /* SettingsCoordinator.swift */; };
@@ -338,8 +339,8 @@
 		BB01CC19C3D3322308D1B2CF /* ServerSelectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 167521635A1CC27624FCEB7F /* ServerSelectionViewModel.swift */; };
 		BB6B0B91CE11E06330017000 /* SessionVerificationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC1A01C3A745BDF1D3697D3 /* SessionVerificationScreen.swift */; };
 		BCEC41FB1F2BB663183863E4 /* LoginServerInfoSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7D379E13DD9D987470A3C70C /* LoginServerInfoSection.swift */; };
+		BD782053BE4C3D2F0BDE5699 /* ServiceLocator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F95CADD0A5DBD76B990FCB /* ServiceLocator.swift */; };
 		BFB534E338A3D949944FB2F5 /* NotificationServiceProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B490675B8E31423AF116BDA /* NotificationServiceProxy.swift */; };
-		BFD1AC03B6F8C5F5897D5B55 /* TimelineScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2DE30233B57761F8AFEB415 /* TimelineScrollView.swift */; };
 		C3522917C0C367C403429EEC /* CoordinatorProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = B251F5B4511D1CA0BA8361FE /* CoordinatorProtocol.swift */; };
 		C35CF4DAB1467FE1BBDC204B /* MessageTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEAF1C75771D9DC75877F4B4 /* MessageTimelineItem.swift */; };
 		C4180F418235DAD9DD173951 /* TemplateScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9873076F224E4CE09D8BD47D /* TemplateScreenUITests.swift */; };
@@ -658,6 +659,7 @@
 		56C1BCB9E83B09A45387FCA2 /* EncryptedRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptedRoomTimelineView.swift; sourceTree = "<group>"; };
 		5741CD0691019B32FE74CE9E /* UNMutableNotificationContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UNMutableNotificationContent.swift; sourceTree = "<group>"; };
 		5773C86AF04AEF26515AD00C /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Localizable.strings; sourceTree = "<group>"; };
+		57F95CADD0A5DBD76B990FCB /* ServiceLocator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceLocator.swift; sourceTree = "<group>"; };
 		5B2F9D5C39A4494D19F33E38 /* SettingsViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewModelProtocol.swift; sourceTree = "<group>"; };
 		5D26A086A8278D39B5756D6F /* project.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = project.yml; sourceTree = "<group>"; };
 		5D2D0A6F1ABC99D29462FB84 /* AuthenticationCoordinatorUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationCoordinatorUITests.swift; sourceTree = "<group>"; };
@@ -730,12 +732,12 @@
 		892E29C98C4E8182C9037F84 /* TimelineStyler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyler.swift; sourceTree = "<group>"; };
 		8A9AE4967817E9608E22EB44 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		8AC1A01C3A745BDF1D3697D3 /* SessionVerificationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreen.swift; sourceTree = "<group>"; };
-		8B9A55AC2FB0FE0AEAA3DF1F /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+		8B9A55AC2FB0FE0AEAA3DF1F /* LICENSE */ = {isa = PBXFileReference; path = LICENSE; sourceTree = "<group>"; };
 		8C0AA893D6F8A2F563E01BB9 /* in */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = in; path = in.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		8D6094DEAAEB388E1AE118C6 /* MockRoomTimelineProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomTimelineProvider.swift; sourceTree = "<group>"; };
 		8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		8DC2C9E0E15C79BBDA80F0A2 /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = "<group>"; };
-		8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UITests.xctestplan; sourceTree = "<group>"; };
+		8E088F2A1B9EC529D3221931 /* UITests.xctestplan */ = {isa = PBXFileReference; path = UITests.xctestplan; sourceTree = "<group>"; };
 		8ED2D2F6A137A95EA50413BE /* UserNotificationControllerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationControllerProtocol.swift; sourceTree = "<group>"; };
 		8F7D42E66E939B709C1EC390 /* MockRoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockRoomSummaryProvider.swift; sourceTree = "<group>"; };
 		8FC803282F9268D49F4ABF14 /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
@@ -786,6 +788,7 @@
 		A4756C5A8C8649AD6C10C615 /* MockUserSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUserSession.swift; sourceTree = "<group>"; };
 		A4B5B19A10D3F7C2BC5315DF /* VideoRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineItem.swift; sourceTree = "<group>"; };
 		A5B0B1226DA8DB55918B34CD /* FileCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileCache.swift; sourceTree = "<group>"; };
+		A627CE1429374617334FA5E9 /* TimelineScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineScrollView.swift; sourceTree = "<group>"; };
 		A64F0DB78E0AC23C91AD89EF /* mk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mk; path = mk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A65F140F9FE5E8D4DAEFF354 /* RoomProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomProxy.swift; sourceTree = "<group>"; };
 		A6B891A6DA826E2461DBB40F /* PHGPostHogConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PHGPostHogConfiguration.swift; sourceTree = "<group>"; };
@@ -844,7 +847,6 @@
 		C070FD43DC6BF4E50217965A /* LocalizationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizationTests.swift; sourceTree = "<group>"; };
 		C1198B925F4A88DA74083662 /* OnboardingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewModel.swift; sourceTree = "<group>"; };
 		C2886615BEBAE33A0AA4D5F8 /* RoomScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomScreenModels.swift; sourceTree = "<group>"; };
-		C2DE30233B57761F8AFEB415 /* TimelineScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineScrollView.swift; sourceTree = "<group>"; };
 		C3F652E88106B855A2A55ADE /* FilePreviewViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilePreviewViewModelProtocol.swift; sourceTree = "<group>"; };
 		C444092DB0E4AB393067AC36 /* MediaPlayerViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlayerViewModelTests.swift; sourceTree = "<group>"; };
 		C483956FA3D665E3842E319A /* SettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsScreen.swift; sourceTree = "<group>"; };
@@ -928,7 +930,7 @@
 		EBE5502760CF6CA2D7201883 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ja; path = ja.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		ED044D00F2176681CC02CD54 /* HomeScreenRoomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRoomCell.swift; sourceTree = "<group>"; };
 		ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = "<group>"; };
-		ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; lastKnownFileType = file; path = message.caf; sourceTree = "<group>"; };
+		ED482057AE39D5C6D9C5F3D8 /* message.caf */ = {isa = PBXFileReference; path = message.caf; sourceTree = "<group>"; };
 		EDAA4472821985BF868CC21C /* ServerSelectionViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionViewModelTests.swift; sourceTree = "<group>"; };
 		EDB6E40BAD4504D899FAAC9A /* TemplateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateViewModel.swift; sourceTree = "<group>"; };
 		EE8BCD14EFED23459A43FDFF /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1627,9 +1629,9 @@
 				5221DFDF809142A2D6AC82B9 /* RoomScreen.swift */,
 				B43AF03660F5FD4FFFA7F1CE /* TimelineItemContextMenu.swift */,
 				804F9B0FABE093C7284CD09B /* TimelineItemList.swift */,
+				A627CE1429374617334FA5E9 /* TimelineScrollView.swift */,
 				0BC588051E6572A1AF51D738 /* TimelineSenderAvatarView.swift */,
 				874A1842477895F199567BD7 /* TimelineView.swift */,
-				C2DE30233B57761F8AFEB415 /* TimelineScrollView.swift */,
 				A312471EA62EFB0FD94E60DC /* Style */,
 				CCD48459CA34A1928EC7A26A /* Supplementary */,
 				B7D3886505ECC85A06DA8258 /* Timeline */,
@@ -1884,6 +1886,7 @@
 				263B3B811C2B900F12C6F695 /* BuildSettings.swift */,
 				B251F5B4511D1CA0BA8361FE /* CoordinatorProtocol.swift */,
 				495D3EC4972639C1A87DDF8E /* NavigationController.swift */,
+				57F95CADD0A5DBD76B990FCB /* ServiceLocator.swift */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -1916,14 +1919,6 @@
 			path = NSE;
 			sourceTree = "<group>";
 		};
-		B3E78735F63FA93FAAAF700A /* MockUserNotificationController.swift~refs */ = {
-			isa = PBXGroup;
-			children = (
-				F798CDE87F83A94B8BC2E18A /* remotes */,
-			);
-			path = "MockUserNotificationController.swift~refs";
-			sourceTree = "<group>";
-		};
 		B442FCF47E0A6F28D7D50A4D /* FilePreview */ = {
 			isa = PBXGroup;
 			children = (
@@ -2010,13 +2005,6 @@
 			path = UITests;
 			sourceTree = "<group>";
 		};
-		C5A8A8B1C16BBFEA4B9D5988 /* origin */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = origin;
-			sourceTree = "<group>";
-		};
 		CA555F7C7CA382ACACF0D82B /* Keychain */ = {
 			isa = PBXGroup;
 			children = (
@@ -2109,7 +2097,6 @@
 				CD80F22830C2360F3F39DDCE /* UserNotificationModalView.swift */,
 				649759084B0C9FE1F8DF8D17 /* UserNotificationPresenter.swift */,
 				F31A4E5941ACBA4BB9FEF94C /* UserNotificationToastView.swift */,
-				B3E78735F63FA93FAAAF700A /* MockUserNotificationController.swift~refs */,
 			);
 			path = UserNotifications;
 			sourceTree = "<group>";
@@ -2208,14 +2195,6 @@
 			path = Background;
 			sourceTree = "<group>";
 		};
-		F798CDE87F83A94B8BC2E18A /* remotes */ = {
-			isa = PBXGroup;
-			children = (
-				C5A8A8B1C16BBFEA4B9D5988 /* origin */,
-			);
-			path = remotes;
-			sourceTree = "<group>";
-		};
 		FCDF06BDB123505F0334B4F9 /* Timeline */ = {
 			isa = PBXGroup;
 			children = (
@@ -2239,7 +2218,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = F1B67CF63C1231AEB14D70E6 /* Build configuration list for PBXNativeTarget "UITests" */;
 			buildPhases = (
-				17364E8B37FC780E07DDEAF7 /* Override Simulator Status Bars */,
 				BAD5CD7BE53A7C832569B67A /* Sources */,
 				86982BD498105258F3778110 /* Resources */,
 				CD30252A70288BD4BF476ED7 /* Frameworks */,
@@ -2578,25 +2556,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		17364E8B37FC780E07DDEAF7 /* Override Simulator Status Bars */ = {
-			isa = PBXShellScriptBuildPhase;
-			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-			);
-			name = "Override Simulator Status Bars";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "python3 $PROJECT_DIR/Tools/Scripts/bootTestSimulator.py --name 'iPhone 13 Pro Max' --version 'iOS.16.1'\npython3 $PROJECT_DIR/Tools/Scripts/bootTestSimulator.py --name 'iPad (9th generation)' --version 'iOS.16.1'\n";
-		};
 		98CA896D84BFD53B2554E891 /* ⚠️ SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -2889,7 +2848,6 @@
 				00EA14F62DCEF62CDE4808D6 /* RedactedRoomTimelineItem.swift in Sources */,
 				13853973A5E24374FCEDE8A3 /* RedactedRoomTimelineView.swift in Sources */,
 				A494741843F087881299ACF0 /* RestorationToken.swift in Sources */,
-				BFD1AC03B6F8C5F5897D5B55 /* TimelineScrollView.swift in Sources */,
 				04A16B45228F7678A027C079 /* RoomHeaderView.swift in Sources */,
 				FE79E2BCCF69E8BF4D21E15A /* RoomMessageFactory.swift in Sources */,
 				8D9F646387DF656EF91EE4CB /* RoomMessageFactoryProtocol.swift in Sources */,
@@ -2924,6 +2882,7 @@
 				388FD50AC66E9E684DDFA9D8 /* ServerSelectionScreen.swift in Sources */,
 				BB01CC19C3D3322308D1B2CF /* ServerSelectionViewModel.swift in Sources */,
 				19839F3526CE8C35AAF241AD /* ServerSelectionViewModelProtocol.swift in Sources */,
+				BD782053BE4C3D2F0BDE5699 /* ServiceLocator.swift in Sources */,
 				237FC70AA257B935F53316BA /* SessionVerificationControllerProxy.swift in Sources */,
 				94A65DD8A353DF112EBEF67A /* SessionVerificationControllerProxyProtocol.swift in Sources */,
 				E5895C74615CBE8462FB840F /* SessionVerificationCoordinator.swift in Sources */,
@@ -2964,6 +2923,7 @@
 				F508683B76EF7B23BB2CBD6D /* TimelineItemPlainStylerView.swift in Sources */,
 				440123E29E2F9B001A775BBE /* TimelineItemProxy.swift in Sources */,
 				9B582B3EEFEA615D4A6FBF1A /* TimelineReactionsView.swift in Sources */,
+				33665CE55037D029ED7D867E /* TimelineScrollView.swift in Sources */,
 				ABF3FAB234AD3565B214309B /* TimelineSenderAvatarView.swift in Sources */,
 				69BCBB4FB2DC3D61A28D3FD8 /* TimelineStyle.swift in Sources */,
 				FFD3E4FF948E06C7585317FC /* TimelineStyler.swift in Sources */,
diff --git a/ElementX/Sources/Application/AppCoordinator.swift b/ElementX/Sources/Application/AppCoordinator.swift
index 42bd7a8b0..22b07d8ad 100644
--- a/ElementX/Sources/Application/AppCoordinator.swift
+++ b/ElementX/Sources/Application/AppCoordinator.swift
@@ -18,19 +18,6 @@ import Combine
 import MatrixRustSDK
 import SwiftUI
 
-struct ServiceLocator {
-    fileprivate static var serviceLocator: ServiceLocator?
-    static var shared: ServiceLocator {
-        guard let serviceLocator else {
-            fatalError("The service locator should be setup at this point")
-        }
-        
-        return serviceLocator
-    }
-    
-    let userNotificationController: UserNotificationControllerProtocol
-}
-
 class AppCoordinator: AppCoordinatorProtocol {
     private let stateMachine: AppCoordinatorStateMachine
     private let navigationController: NavigationController
@@ -63,7 +50,7 @@ class AppCoordinator: AppCoordinatorProtocol {
 
         navigationController.setRootCoordinator(SplashScreenCoordinator())
 
-        ServiceLocator.serviceLocator = ServiceLocator(userNotificationController: UserNotificationController(rootCoordinator: navigationController))
+        ServiceLocator.shared.register(userNotificationController: UserNotificationController(rootCoordinator: navigationController))
 
         backgroundTaskService = UIKitBackgroundTaskService(withApplication: UIApplication.shared)
 
diff --git a/ElementX/Sources/Application/Application.swift b/ElementX/Sources/Application/Application.swift
index b8ba696b5..a3918f747 100644
--- a/ElementX/Sources/Application/Application.swift
+++ b/ElementX/Sources/Application/Application.swift
@@ -39,7 +39,12 @@ struct Application: App {
                     .task {
                         applicationCoordinator.start()
                     }
+                    .statusBarHidden(shouldHideStatusBar)
             }
         }
     }
+    
+    private var shouldHideStatusBar: Bool {
+        Tests.isRunningUITests
+    }
 }
diff --git a/ElementX/Sources/Application/ServiceLocator.swift b/ElementX/Sources/Application/ServiceLocator.swift
new file mode 100644
index 000000000..d3dbf8f8b
--- /dev/null
+++ b/ElementX/Sources/Application/ServiceLocator.swift
@@ -0,0 +1,29 @@
+//
+// 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.
+//
+
+import Foundation
+
+class ServiceLocator {
+    private(set) static var shared = ServiceLocator()
+    
+    private init() { }
+    
+    private(set) var userNotificationController: UserNotificationControllerProtocol!
+    
+    func register(userNotificationController: UserNotificationControllerProtocol) {
+        self.userNotificationController = userNotificationController
+    }
+}
diff --git a/ElementX/Sources/UITests/UITestScreenIdentifier.swift b/ElementX/Sources/UITests/UITestScreenIdentifier.swift
index 35480ec7d..77bc43a7d 100644
--- a/ElementX/Sources/UITests/UITestScreenIdentifier.swift
+++ b/ElementX/Sources/UITests/UITestScreenIdentifier.swift
@@ -29,7 +29,7 @@ enum UITestScreenIdentifier: String {
     case settings
     case bugReport
     case bugReportWithScreenshot
-    case splash
+    case onboarding
     case roomPlainNoAvatar
     case roomEncryptedWithAvatar
     case sessionVerification
diff --git a/ElementX/Sources/UITests/UITestsAppCoordinator.swift b/ElementX/Sources/UITests/UITestsAppCoordinator.swift
index cf1ea69ba..e10bce5e6 100644
--- a/ElementX/Sources/UITests/UITestsAppCoordinator.swift
+++ b/ElementX/Sources/UITests/UITestsAppCoordinator.swift
@@ -18,11 +18,14 @@ import SwiftUI
 import UIKit
 
 class UITestsAppCoordinator: AppCoordinatorProtocol {
+    private var currentRootCoordinator: CoordinatorProtocol?
     private let navigationController: NavigationController
     let notificationManager: NotificationManagerProtocol? = nil
     
     init() {
         navigationController = NavigationController()
+        
+        ServiceLocator.shared.register(userNotificationController: MockUserNotificationController())
     }
     
     func start() {
@@ -31,11 +34,17 @@ class UITestsAppCoordinator: AppCoordinatorProtocol {
             guard let screen = screens.first(where: { $0.id == id }) else {
                 fatalError()
             }
-
+            
+            // Store the initial coordinator so that it stays alive if drops it
+            // For example when replacing the root in the authentication flows
+            self.currentRootCoordinator = screen.coordinator
+            
             self.navigationController.setRootCoordinator(screen.coordinator)
         }
         
         navigationController.setRootCoordinator(rootCoordinator)
+        
+        Bundle.elementFallbackLanguage = "en"
     }
         
     func toPresentable() -> AnyView {
@@ -105,7 +114,7 @@ class MockScreen: Identifiable {
                                                           userNotificationController: MockUserNotificationController(),
                                                           screenshot: Asset.Images.appLogo.image,
                                                           isModallyPresented: false))
-        case .splash:
+        case .onboarding:
             return OnboardingCoordinator()
         case .roomPlainNoAvatar:
             let parameters = RoomScreenCoordinatorParameters(navigationController: navigationController,
diff --git a/IntegrationTests/SupportingFiles/target.yml b/IntegrationTests/SupportingFiles/target.yml
index 6bc33de72..3dfcad503 100644
--- a/IntegrationTests/SupportingFiles/target.yml
+++ b/IntegrationTests/SupportingFiles/target.yml
@@ -8,23 +8,14 @@ targets:
     dependencies:
     - target: ElementX
     - package: MatrixRustSDK
-      linkType: static
     - package: DeviceKit
-      linkType: static
     - package: DTCoreText
-      linkType: static
     - package: KeychainAccess
-      linkType: static
     - package: Kingfisher
-      linkType: static
     - package: SwiftyBeaver
-      linkType: static
     - package: SwiftState
-      linkType: static
     - package: GZIP
-      linkType: static
     - package: Sentry
-      linkType: static
 
     info:
       path: ../SupportingFiles/Info.plist
diff --git a/Tools/Scripts/bootTestSimulator.py b/Tools/Scripts/bootTestSimulator.py
deleted file mode 100755
index 5956752d3..000000000
--- a/Tools/Scripts/bootTestSimulator.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/python3
-
-from encodings import utf_8
-import os
-import subprocess
-import json
-import argparse
-from datetime import datetime
-
-RUNTIME_PREFIX = 'com.apple.CoreSimulator.SimRuntime.'
-
-def device_name(device):
-    return device['name']
-def runtime_name(runtime):
-    return runtime.replace(RUNTIME_PREFIX, '').replace('-', '.')
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--name', type=str, help='Simulator name (like \'iPhone 13 Pro Max\')', required=True)
-parser.add_argument('--version', type=str, default='iOS.16.0', help='OS version (defaults to \'iOS.16.0\')', required=False)
-
-args = vars(parser.parse_args())
-
-simulator_name = args['name']
-os_version = args['version'].replace('.', '-')
-
-runtimes_map = subprocess.check_output("/usr/bin/xcrun simctl list --json devices available", shell=True)
-runtime = RUNTIME_PREFIX + os_version
-json_object = json.loads(runtimes_map)
-if runtime in json_object['devices']:
-    devices = json_object['devices'][runtime]
-
-    device_found=False
-    for device in devices:
-        if device_name(device) == simulator_name:
-            UDID=device['udid']
-            print("Found device UDID: " + UDID)
-
-            dirname = os.path.dirname(os.path.abspath(__file__))
-            overridden_time = datetime(2007, 1, 9, 9, 41, 0).astimezone().isoformat()
-            print("Will override simulator with time: " + overridden_time)
-            os.system("/usr/bin/xcrun simctl boot '" + UDID + "' > /dev/null 2>&1")
-            os.system("/usr/bin/xcrun simctl status_bar '" + UDID + "' override --time '" + overridden_time + "' --dataNetwork 'wifi' --wifiMode 'active' --wifiBars 3 --cellularMode 'active' --cellularBars 4 --batteryState 'charged' --batteryLevel 100 > /dev/null 2>&1")
-            print("Simulator booted and status bar overriden")
-            device_found=True
-            break
-    
-    if device_found == False:
-        print("Device could not be found. \n\nAvailable devices: " + ', '.join(map(device_name, devices)))
-        exit(1)
-else:
-    print("Runtime could not be found. \n\nAvailable runtimes: " + ', '.join(map(runtime_name, json_object['devices'].keys())))
-    exit(1)
diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift
index 633f5686a..570717e19 100644
--- a/UITests/Sources/Application.swift
+++ b/UITests/Sources/Application.swift
@@ -43,7 +43,7 @@ extension XCUIApplication {
     /// - Parameter identifier: Identifier of the UI test screen
     func assertScreenshot(_ identifier: UITestScreenIdentifier) {
         let failure = verifySnapshot(matching: screenshot().image,
-                                     as: .image(precision: 0.98, perceptualPrecision: 0.98, scale: nil),
+                                     as: .image(precision: 0.99, perceptualPrecision: 0.98, scale: nil),
                                      named: identifier.rawValue,
                                      testName: testName)
 
@@ -55,7 +55,7 @@ extension XCUIApplication {
     }
 
     private var testName: String {
-        osVersion + "-" + languageCode + "-" + regionCode + "-" + deviceName
+        languageCode + "-" + regionCode + "-" + deviceName
     }
 
     private var deviceName: String {
diff --git a/UITests/Sources/OnboardingUITests.swift b/UITests/Sources/OnboardingUITests.swift
index bdb6003c3..f0a873c0a 100644
--- a/UITests/Sources/OnboardingUITests.swift
+++ b/UITests/Sources/OnboardingUITests.swift
@@ -20,18 +20,18 @@ import XCTest
 class OnboardingUITests: XCTestCase {
     func testInitialStateComponents() {
         let app = Application.launch()
-        app.goToScreenWithIdentifier(.splash)
+        app.goToScreenWithIdentifier(.onboarding)
         
         let getStartedButton = app.buttons["getStartedButton"]
         XCTAssertTrue(getStartedButton.exists, "The primary action button should be shown.")
         XCTAssertEqual(getStartedButton.label, ElementL10n.loginSplashSubmit)
 
-        app.assertScreenshot(.splash)
+        app.assertScreenshot(.onboarding)
     }
     
     func testSwipingBetweenPages() {
         let app = Application.launch()
-        app.goToScreenWithIdentifier(.splash)
+        app.goToScreenWithIdentifier(.onboarding)
         
         // Given the splash screen in its initial state.
         let page1TitleText = app.staticTexts[ElementL10n.ftueAuthCarouselSecureTitle]
diff --git a/UITests/Sources/ServerSelectionUITests.swift b/UITests/Sources/ServerSelectionUITests.swift
index 45a13c855..df351d1eb 100644
--- a/UITests/Sources/ServerSelectionUITests.swift
+++ b/UITests/Sources/ServerSelectionUITests.swift
@@ -27,7 +27,7 @@ class ServerSelectionUITests: XCTestCase {
         app.goToScreenWithIdentifier(.serverSelection)
         
         // Then it should be configured for matrix.org and with a cancel button
-        let serverTextField = app.textFields.element
+        let serverTextField = app.textFields[textFieldIdentifier]
         XCTAssertEqual(serverTextField.value as? String, "matrix.org", "The server shown should be matrix.org with the https scheme hidden.")
 
         let confirmButton = app.buttons["confirmButton"]
@@ -35,9 +35,7 @@ class ServerSelectionUITests: XCTestCase {
         XCTAssertTrue(confirmButton.exists, "The confirm button should always be shown.")
         XCTAssertTrue(confirmButton.isEnabled, "The confirm button should be enabled when there is an address.")
 
-        let textFieldFooter = app.staticTexts[textFieldIdentifier]
-        XCTAssertTrue(textFieldFooter.exists)
-        XCTAssertEqual(textFieldFooter.label, ElementL10n.serverSelectionServerFooter)
+        XCTAssertTrue(app.staticTexts[ElementL10n.serverSelectionServerFooter].exists)
 
         let dismissButton = app.buttons["dismissButton"]
         XCTAssertTrue(dismissButton.exists, "The dismiss button should be shown during modal presentation.")
@@ -51,12 +49,11 @@ class ServerSelectionUITests: XCTestCase {
         app.goToScreenWithIdentifier(.serverSelection)
         
         // When clearing the server address text field.
-        app.textFields.element.tap()
-        app.textFields.element.buttons.element.tap()
+        app.textFields[textFieldIdentifier].tap()
+        app.textFields[textFieldIdentifier].buttons.element.tap()
         
         // Then the screen should not allow the user to continue.
-        let serverTextField = app.textFields.element
-        XCTAssertEqual(serverTextField.value as? String, ElementL10n.ftueAuthChooseServerEntryHint, "The text field should show placeholder text in this state.")
+        XCTAssertEqual(app.textFields[textFieldIdentifier].value as? String, ElementL10n.ftueAuthChooseServerEntryHint, "The text field should show placeholder text in this state.")
 
         let confirmButton = app.buttons["confirmButton"]
         XCTAssertTrue(confirmButton.exists, "The confirm button should always be shown.")
@@ -69,21 +66,18 @@ class ServerSelectionUITests: XCTestCase {
         app.goToScreenWithIdentifier(.serverSelection)
         
         // When typing in an invalid homeserver
-        app.textFields.element.tap()
+        app.textFields[textFieldIdentifier].tap()
         app.textFields.element.buttons.element.tap()
         app.typeText("thisisbad\n") // The tests only accept an address from LoginHomeserver.mockXYZ
         
         // Then an error should be shown and the confirmation button disabled.
-        let serverTextField = app.textFields.element
-        XCTAssertEqual(serverTextField.value as? String, "thisisbad", "The text field should show the entered server.")
+        XCTAssertEqual(app.textFields[textFieldIdentifier].value as? String, "thisisbad", "The text field should show the entered server.")
 
         let confirmButton = app.buttons["confirmButton"]
         XCTAssertTrue(confirmButton.exists, "The confirm button should always be shown.")
         XCTAssertFalse(confirmButton.isEnabled, "The confirm button should be disabled when there is an error.")
 
-        let textFieldFooter = app.staticTexts[textFieldIdentifier]
-        XCTAssertTrue(textFieldFooter.exists)
-        XCTAssertEqual(textFieldFooter.label, ElementL10n.loginErrorHomeserverNotFound)
+        XCTAssertTrue(app.staticTexts[ElementL10n.loginErrorHomeserverNotFound].exists)
     }
 
     func testNonModalPresentation() {
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.analyticsPrompt.png
deleted file mode 100644
index e797132b4..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1f6e3ade2b485726aa7543c0fb89dd175c0f885d131ccd79126fc518ec8532f
-size 151971
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.authenticationFlow.png
deleted file mode 100644
index 4ff205a30..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f50d65aac7311b56442b40f9a1b727fa504a8239a9eb46703b2a923fff209ea3
-size 91183
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReport.png
deleted file mode 100644
index 59142431e..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aaa767d2608f006b934ea158d6f9af3558ae3dc93c4e27755339aa0b9eff0cf6
-size 130231
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReportWithScreenshot.png
deleted file mode 100644
index 9a1434178..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:933fb31039308e36bbb73657bf353239b1b82cf11b2fa9d8c9c3126224dafb2d
-size 138795
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.home.png
deleted file mode 100644
index 702554466..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fe7dad4ce902782da61cc8fab9398d34e859b42734cab3f40b796a09e73f7f0
-size 86828
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.login.png
deleted file mode 100644
index cf229f077..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf76a5b41d5db7251b58b866393fc7f8de74d16caf1bde15b7da69cc321eaeb0
-size 97446
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
deleted file mode 100644
index e7d161f2b..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d1d53975d6cfc7c68b95b6d024c6b0f480aca79b44b0f1342463e06e3b94729
-size 216546
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomPlainNoAvatar.png
deleted file mode 100644
index bc0ff1a4c..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0a8577d6de5d143144c005f534aea08d234d83b4c5eafd2132eb846c234816b8
-size 216004
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelection.png
deleted file mode 100644
index 90fabb13e..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6953c1d7aef468e97ffe28313395cce7c85aa4478c9cb7f46ee4583a6b8e8983
-size 100874
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelectionNonModal.png
deleted file mode 100644
index 4cc9c86e0..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b8d2e534718157551e4e59f2503f807331e840df7a05eddcd3cfa23fee3a5e3
-size 97775
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.sessionVerification.png
deleted file mode 100644
index 08b9a2989..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:840aab831e255fac4ba71439caabd904a04720216894cf0a847588251e1ade23
-size 92912
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.settings.png
deleted file mode 100644
index 568937905..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b623b3822b6a4a0d4ab747d62b58e73a2e14c0bb7a4da0b312dcf4464b723dd3
-size 106110
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleRegular.png
deleted file mode 100644
index 184ca7746..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40c0eb8c2d32c964cda64cfcdf599aefe9c248f878a13b55748adfe9ed5b00d9
-size 87373
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleUpgrade.png
deleted file mode 100644
index aea555104..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:019cec404a88a8f0ab500ba3d495dc7141d48bf16b7cf89c8ce3799082146330
-size 84001
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.softLogout.png
deleted file mode 100644
index 0d08d3f6b..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab277ca0a8842aaafe4b51ecc2d88a4d739f58a0531f48801d63608ad9490765
-size 141162
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.splash.png
deleted file mode 100644
index 33b063ef8..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPad-9th-generation.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7462be5375e9458245c524aca718c9e4a08759821aba28cc54aefdfbca5a3fb7
-size 175837
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.analyticsPrompt.png
deleted file mode 100644
index 7f2e037c8..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3054001c41c0e9c1f96a6123e6a17850a4b81010fc0e478c9c44966aa8a24dfb
-size 209595
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.authenticationFlow.png
deleted file mode 100644
index 1c1f75687..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6721cf0b19febe7ef65fb2118ddb2ad370e20a1bfb35a7d12b24218a60d5f097
-size 109992
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReport.png
deleted file mode 100644
index 3ecaf4038..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:120a42b7ac3865811312246d5c4d0aa18e4eda2cf4ee14b58eda33a026782080
-size 185599
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReportWithScreenshot.png
deleted file mode 100644
index 9f5624a55..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a447206e6610071763bc14abb979a106ecc0c01fdd6eab15e5452d556d5439f
-size 190546
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.home.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.home.png
deleted file mode 100644
index 17474d468..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b44361b93d8df9112b9beec3c7877ffac2c3f450807195f3f997904c1a29a5de
-size 106026
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.login.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.login.png
deleted file mode 100644
index 6b46c39b7..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d086a6a5b17e7368514e7ca815ed87b37cc7989ad76d3fea26565479f10ea06b
-size 117476
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
deleted file mode 100644
index dcff80694..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32f822ba57bc9cd647cd69b87bb83a006dcb197fdd88fb578e1f6f81426afb05
-size 338934
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomPlainNoAvatar.png
deleted file mode 100644
index 21ab2766d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:662fed51cbd268deb7a855747deac79eab7fc778ac82d1674b454b6856d4742e
-size 337968
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelection.png
deleted file mode 100644
index ac889e87f..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:127f56da957668e114d5bc2ff08b5bd2f92facf4c96ee24796a9c4dd62b1fce5
-size 122890
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelectionNonModal.png
deleted file mode 100644
index ddda32a5d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eacffc71c0c86b121c2ef9068a842a1cc3f1a1e39fa4daa0efc8558b7ac7f84a
-size 117684
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.sessionVerification.png
deleted file mode 100644
index 9bc79fae8..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67a7e97e02a9f79b81012a5acfcc6d3d2a88f0aeb6a8ffccf655ca155c228ed8
-size 118441
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.settings.png
deleted file mode 100644
index 441c07d90..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4cef72a882391e6ae3b1fb7a7a2e8831ecc5876b323b0ac250e872de6d746de
-size 136546
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleRegular.png
deleted file mode 100644
index 1d8c8580c..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f553f4fec8c2634b70726c6f4ef79e68328e0654156947e617b7dc578de103d
-size 106604
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleUpgrade.png
deleted file mode 100644
index d70a63878..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e82d5f9eb1d4bddc4fb7045acc3d47de650fc8c19e76bbd072b0fbf0b85d27e9
-size 101650
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.softLogout.png
deleted file mode 100644
index a10cba2f3..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f1926bc2d942004777dc999954579c7660a2834beb43d3c83c73702761c84f8
-size 191772
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.splash.png
deleted file mode 100644
index 91f079229..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-de-DE-iPhone-13-Pro-Max.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:973b7eab05cec065e1f6f3a1166353a92ef41c396da5cea5df21063c53b11398
-size 256994
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.analyticsPrompt.png
deleted file mode 100644
index 388109efe..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f80f06b22aaef2deb56a001683e36448140fe4ea9fb1c8258e5b362d6add32e
-size 139709
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.authenticationFlow.png
deleted file mode 100644
index 7f8885008..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:78ce18bd8ea7a8d1aa4e0a3343c187183b3584385bab54cd52369ae41e126d1d
-size 88806
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReport.png
deleted file mode 100644
index 8dd38763e..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:97050c5e4e001c5c2f255398f50c032577d0ec99d1c09ba55948fc41ee8d95f2
-size 119651
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReportWithScreenshot.png
deleted file mode 100644
index d86e120a0..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9323af8660ea8fa3eb8be32881bdfaeba0791dd43a3eb238d6907a9bb19e3e43
-size 128570
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.home.png
deleted file mode 100644
index 1af878dae..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1d21ffa3f6cce084de9c36345d2a5fad9e45b3eb990af8f0bfc16d9b4a51378
-size 86858
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.login.png
deleted file mode 100644
index dcea9c5a5..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b773235c656d79328282510443e8cecb4775c4f279651b4b886f9ef395e63dc5
-size 92452
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
deleted file mode 100644
index 81a264cd9..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee83194ea859411d87380b49ad0c5aed1f3d3b8e626f7457617cc4b602de3d36
-size 216068
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomPlainNoAvatar.png
deleted file mode 100644
index 7ce635f31..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:693d769b352ae53ce9adae602a0cf73a4cbc5b02aee49027408c00413c358ce6
-size 215524
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelection.png
deleted file mode 100644
index 12d16da13..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01493f209b49f85a82c14767e681ef11ffe942ead65b835fa16d4375a5ee9b8c
-size 96068
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelectionNonModal.png
deleted file mode 100644
index 380a028d0..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b3a960ee76526c7b9dbcf89f8d509f018cc6655a2bf148ad4ceba50eeb8b0c4
-size 93211
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.sessionVerification.png
deleted file mode 100644
index a9247128b..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00ccc67d88a152aa2ee4b7814e420706a90f34a6d488c84fcbc4fb14708d0a34
-size 86658
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.settings.png
deleted file mode 100644
index cbd75a104..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9935ca485da7cba8d43d415fc622638dc8ef9043dcd17423342995f07746790d
-size 106827
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleRegular.png
deleted file mode 100644
index 184ca7746..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40c0eb8c2d32c964cda64cfcdf599aefe9c248f878a13b55748adfe9ed5b00d9
-size 87373
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleUpgrade.png
deleted file mode 100644
index aea555104..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:019cec404a88a8f0ab500ba3d495dc7141d48bf16b7cf89c8ce3799082146330
-size 84001
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.softLogout.png
deleted file mode 100644
index 3f8b01e82..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9dc719221789b6c0c8c3488d9ffea34dd300e0be22ab3d0b8099930229a39b49
-size 126699
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.splash.png
deleted file mode 100644
index 6d6c769d4..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPad-9th-generation.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5736044bbde29059e1334240db2055088552b6c3e9290b4f75aad874fc036263
-size 170712
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.analyticsPrompt.png
deleted file mode 100644
index 6a372c499..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:32cc123c9bafbf477c4b1e6dd561233f2193ca321934f6068fb641dd46e70098
-size 187495
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.authenticationFlow.png
deleted file mode 100644
index c4854f56a..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4a4ade72e7c962ab1a986c2b46b5f40ef2dc6f8c9eab28257e17b559c59f4c9e
-size 105645
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReport.png
deleted file mode 100644
index a2245fc71..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:70ad8c98f2cc65b20db79560b61395175d8f52b8d8511dccd5cecc3586f7e006
-size 165916
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReportWithScreenshot.png
deleted file mode 100644
index 083dce29a..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58eaa48da13b8e3f07b8b0cd96209f396c2d08ef105d1cdf31057a788db76910
-size 175641
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.home.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.home.png
deleted file mode 100644
index 880f76a28..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d1b0905b8141bb2faae942f2072024ac05a32153d634b323c655abcdee1a99b
-size 106024
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.login.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.login.png
deleted file mode 100644
index f380e5b70..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:43c9374dd27b1177277e6fb3d3b9ebed902ad36277bdece10e9d5efe76f3ab98
-size 110127
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
deleted file mode 100644
index 1a7afcf20..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2929105c6f1ef9d48c5a64be125065737f16177e34012522ad3b12e61339785a
-size 338054
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomPlainNoAvatar.png
deleted file mode 100644
index 17b9d8534..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0430659782fbf9efe771af9a9cdb19a866deaede615fc7e4dcb8b235265e8c5e
-size 337106
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelection.png
deleted file mode 100644
index 06e066279..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83c2a451b9d214187f39d4bee8f97f09707091dda7e3cd8056248e879c92a7cc
-size 118565
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelectionNonModal.png
deleted file mode 100644
index b5550f686..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bb75de7f979d2643cccf9d52d555c36800cf02034568e5405d3288a08fd9f18
-size 113979
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.sessionVerification.png
deleted file mode 100644
index fb10198e7..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4111fd6a524d93658574f7ce6fc1039d0bc4f8b54fa4746443cca034cf2e5981
-size 109311
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.settings.png
deleted file mode 100644
index 062fb02c6..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b65e635bcaa70eca69e6f0a1a183e028064b9ca251d6065613adcd02736b5a18
-size 136596
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleRegular.png
deleted file mode 100644
index 1d8c8580c..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f553f4fec8c2634b70726c6f4ef79e68328e0654156947e617b7dc578de103d
-size 106604
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleUpgrade.png
deleted file mode 100644
index d70a63878..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e82d5f9eb1d4bddc4fb7045acc3d47de650fc8c19e76bbd072b0fbf0b85d27e9
-size 101650
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.softLogout.png
deleted file mode 100644
index fc4fc72ed..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:541272c5d33b33a6781f93c2e12173764a780c6ee122398c9f217db796378545
-size 163117
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.splash.png
deleted file mode 100644
index 5668e864f..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-en-GB-iPhone-13-Pro-Max.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ce2ce2087131a0e528a591eda67c0a31fe7def19cb7e810a8ad3052bacf38d5
-size 248888
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.analyticsPrompt.png
deleted file mode 100644
index cfe526a38..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46b230a82a457cbbabc160dae3347ce717911395864628224a32d5c746a5f738
-size 154222
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.authenticationFlow.png
deleted file mode 100644
index a2030ec88..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30e2adeebbad6d99195ab5b9e11e6596bc029f0dc73c445c09310f4838c679a9
-size 91210
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReport.png
deleted file mode 100644
index 240a14454..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89c0c10c22be5bb997a3938046aed4120065ce6ea3918aca1155e9463f5af8ad
-size 128844
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
deleted file mode 100644
index dfec1ef3f..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6742dd34300bb28a92f9c65be9bd30b2775affdce6b63f2bdf36746ff78b5861
-size 137525
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.home.png
deleted file mode 100644
index 9cbc56f84..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:77814c5fae9308c316583dab73cfbc7b1d248052bb0a3211f9432ad3349af211
-size 89410
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.login.png
deleted file mode 100644
index 8a47fbd30..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e3a17c13aaaffdd11d2f30acd5bf06467e393bb683492ce84b33780cecff489
-size 96843
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
deleted file mode 100644
index 141a2388d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81864c996f8e9db70238258589b763bc3bca7ab3773e2597d1f631fa8e93a965
-size 216288
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
deleted file mode 100644
index 32bce0e44..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6dbffa0936e8743bcd59849354e9a04d00333d403f764a37c185c9d2dea5478b
-size 215741
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelection.png
deleted file mode 100644
index ef82c096a..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24231b27994b3b9183c52203bc5f2e4c74750f5782270fe86847334d9456d47e
-size 99866
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelectionNonModal.png
deleted file mode 100644
index bc757601a..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b061bad459e2f0c244273ffde69a7da4d6757333eb55004e12377a574c8614f7
-size 98294
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.sessionVerification.png
deleted file mode 100644
index 09774307d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ef677e97cc471c6ce525d87084b1eb595dde704d6e181eb831220aadd7846cc
-size 91710
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.settings.png
deleted file mode 100644
index 3697c6d8d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbdc9a67eacf93f5c6e023dc29ad19440d5463142ec6695c2505145695fa2e56
-size 107221
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleRegular.png
deleted file mode 100644
index 184ca7746..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:40c0eb8c2d32c964cda64cfcdf599aefe9c248f878a13b55748adfe9ed5b00d9
-size 87373
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleUpgrade.png
deleted file mode 100644
index aea555104..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:019cec404a88a8f0ab500ba3d495dc7141d48bf16b7cf89c8ce3799082146330
-size 84001
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.softLogout.png
deleted file mode 100644
index 39872d0eb..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d3121984c83fdb1d21ea0733f9cdd4674bf810b6cfed0d0dd4187d79603253c
-size 134963
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.splash.png
deleted file mode 100644
index 24b9f76e0..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPad-9th-generation.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d352034fff1dbc22feb0eabebb77896adab900f9ec8638173e611deafac5396
-size 169516
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.analyticsPrompt.png
deleted file mode 100644
index 5f8a02fa4..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.analyticsPrompt.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1441ecb238973572ec9d8b44c8ec956dd619137fb0734bf923ef99c14ddd83fc
-size 210941
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.authenticationFlow.png
deleted file mode 100644
index 446c6385b..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.authenticationFlow.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64afe93ba5547c6a1451f6be4cb4897df27fca20ed410820b77b6790e68c358e
-size 109131
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReport.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReport.png
deleted file mode 100644
index 087bab2df..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReport.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e94535ec311ef618ae487e4efae3c4db761e1dabcc3481ef639c10573e152399
-size 183120
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReportWithScreenshot.png
deleted file mode 100644
index 854911af2..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.bugReportWithScreenshot.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e35a3c14db962aa4a4647371ce7bc244c479d4050de78364a7bc4579caf994d
-size 190270
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.home.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.home.png
deleted file mode 100644
index 803b239f9..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.home.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5139c184a81f3a3bc5fab165d6d47a124d90925f5f98ebd6d5ba3621bb8ac3af
-size 110670
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.login.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.login.png
deleted file mode 100644
index c9f5ec008..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.login.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:969e848b922962fd3c68a93637a7df9d5132230a75f41f6e5cf3e16c4280bd0c
-size 116290
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
deleted file mode 100644
index 884382fdd..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomEncryptedWithAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0feeaf604db54d94e49d4524f47f916b401a4b0e32321824e4208511e79d6a07
-size 338399
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomPlainNoAvatar.png
deleted file mode 100644
index e20d84b3e..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.roomPlainNoAvatar.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8aafeb1da477f7e35ed5720108d2068c24a2954248bc3390d79c86f5bc7a8a69
-size 337444
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelection.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelection.png
deleted file mode 100644
index 7715a7b66..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelection.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cdef68316144fb3aa7d8d132fd6d173fe88ef8313a7381caa1168dcc6c932b95
-size 121155
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelectionNonModal.png
deleted file mode 100644
index 38171d4b6..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.serverSelectionNonModal.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:99dd021dacef84c618b5c8046f6b6cdcf7f324fd7c9ee50b657037ebe116a616
-size 118075
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.sessionVerification.png
deleted file mode 100644
index bc7dc90eb..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.sessionVerification.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cbe98cfd062e2577627b2697b1c381459cad3d914db3dc7859f1cc13d6e100e7
-size 116080
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.settings.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.settings.png
deleted file mode 100644
index f9f2388d7..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.settings.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0403e0fc1e95c2ecc5a7fce17845504704b086762fba5d333f9249c776bb5ecd
-size 138320
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleRegular.png
deleted file mode 100644
index 1d8c8580c..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleRegular.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9f553f4fec8c2634b70726c6f4ef79e68328e0654156947e617b7dc578de103d
-size 106604
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleUpgrade.png
deleted file mode 100644
index d70a63878..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.simpleUpgrade.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e82d5f9eb1d4bddc4fb7045acc3d47de650fc8c19e76bbd072b0fbf0b85d27e9
-size 101650
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.softLogout.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.softLogout.png
deleted file mode 100644
index ab37ab08d..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.softLogout.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8f4eb4feaeef79ca2f624dbe21a538d40183d178bcb6ed2c445de542cb2e042
-size 179641
diff --git a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.splash.png b/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.splash.png
deleted file mode 100644
index df07690e4..000000000
--- a/UITests/Sources/__Snapshots__/Application/16-0-fr-FR-iPhone-13-Pro-Max.splash.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f4b3dd4ef44ec349fdf5722439feacff192754aa67022025f64693cdb690788
-size 246498
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.analyticsPrompt.png
new file mode 100644
index 000000000..902bdd119
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef1a784afc00ceabab3bfa313034818d6b7d0a8be76f19e00381fc815a60b5d4
+size 147357
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.authenticationFlow.png
new file mode 100644
index 000000000..7b51e2073
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e3edbda082d2708de03ca541e7fff618bf9efd177673f9da1a5ae26fc56e284
+size 89473
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReport.png
new file mode 100644
index 000000000..b92c7c793
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ff37bd482c03c38978fccca4d2811469b4d8db9ff911ec8c5a3f46ae6fcf67a
+size 129975
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReportWithScreenshot.png
new file mode 100644
index 000000000..c67b7514b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d793b87e60ad95afa3e584237e34ba54ba5b9bd401d10058cfc10278d2b820f8
+size 138809
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.home.png
new file mode 100644
index 000000000..8755795a8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9427f2e142bcfeae39c253a2ef620263e8ece317d317868198a0077c66d61996
+size 78625
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.login.png
new file mode 100644
index 000000000..98390eb0e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c527ad80bd198c70e84e79b242d5ea2e2032d39027444e19676d5ef393684ddd
+size 92787
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.onboarding.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.onboarding.png
new file mode 100644
index 000000000..7a26f8f4c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:829bf2dfcbc5ea3f9e7d52745a71f743f84bf8f624bb8ffa4fb5b259c73f6020
+size 172204
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..42b48c81e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b5fb88d76d9d6b0c2ab6f9f96d80cac1cb41cfa7e938b2cf9746553c7ef55fc
+size 208681
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomPlainNoAvatar.png
new file mode 100644
index 000000000..95609c29b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce6df94c886ae302976ab1748fc000fdaf535a8178b5415f9e44f87f2c5677a7
+size 208028
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelection.png
new file mode 100644
index 000000000..975d5584d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d7ae4bba47eb08236cf28cc79ee12873a9fa1f9d9994315046298f3fe5aa12e
+size 116458
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelectionNonModal.png
new file mode 100644
index 000000000..d69d33dc1
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71943bd9a2087bfdfa6cee4d250664f9ca8bc791c671dde9787dfe6895f44643
+size 113783
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.sessionVerification.png
new file mode 100644
index 000000000..9f3570762
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a14dd96e7402a860daf289e66f47e3576775a27af5a2423e1d6fecfe99caa9e
+size 86648
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.settings.png
new file mode 100644
index 000000000..7bf103de9
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c957491840909920efbb8b445cecb039e0cfe50127918bace68d34bcf1b0501
+size 101235
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleRegular.png
new file mode 100644
index 000000000..b8c6f5a7c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247a5f18ee289b1343a1648f8a5b7f3400891514032cc0f2065e3a64da3c97bb
+size 83087
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleUpgrade.png
new file mode 100644
index 000000000..52525104e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cd654b15d352e959b581c117e787919258c535099e480c99cdbb72fa2f7f2fd
+size 77679
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.softLogout.png
new file mode 100644
index 000000000..86098886b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPad-9th-generation.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6aa904999e1e46ed25d5adabe9026a757dc2ab7203fab5560409a4bf03a6c44
+size 134768
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.analyticsPrompt.png
new file mode 100644
index 000000000..f9e04c9ce
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60541a81761da790812559755f85ff201d393ba9ac76507f0e3f7b855a4e2091
+size 193940
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.authenticationFlow.png
new file mode 100644
index 000000000..f18a0a121
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdd091e931e4eb0f7ec52107bddde230731148567f1e2f09bd9751fe9815ad7f
+size 100425
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReport.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReport.png
new file mode 100644
index 000000000..916563631
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2464432716ef48240002d5cdedd10e81d5a966d7dc593713ced422bb09bb4c83
+size 171718
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReportWithScreenshot.png
new file mode 100644
index 000000000..916563631
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2464432716ef48240002d5cdedd10e81d5a966d7dc593713ced422bb09bb4c83
+size 171718
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.home.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.home.png
new file mode 100644
index 000000000..80e05b5bc
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87283d139b1810b7b675ec2b5c659ec01e20438d88dc047d5d6262ee923144dd
+size 87188
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.login.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.login.png
new file mode 100644
index 000000000..e0ec1facf
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59b5f7b444255df8dfa064567e63fbbad4dff501f364fd5675b8a401bef68f2f
+size 103405
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.onboarding.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.onboarding.png
new file mode 100644
index 000000000..c7719aec1
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2093b68ad7b33841be7d634c13eb9cdae6df3cfa7ccbd93c1f787ed47b69a667
+size 245859
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..da2f26eb8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0305582dd212396d3443d10e675a5e2dcb9e964e6543acb0033d4f58e3c66be6
+size 296035
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomPlainNoAvatar.png
new file mode 100644
index 000000000..1f801f0fe
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5beeaa7dea7a8d7cc8e6acb8928dd2b72fda9caa8a03e79d230e8a31392be58c
+size 295025
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelection.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelection.png
new file mode 100644
index 000000000..5c788345e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ee002ac22903da282c9005828ba167dd03296acd4b5edca0da97e452465d724
+size 136734
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelectionNonModal.png
new file mode 100644
index 000000000..59711a998
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:95826295eca8f7c8984183a1662784f64389f914c2ec432673e67a4825dd46c8
+size 132860
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.sessionVerification.png
new file mode 100644
index 000000000..b414bb87c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63878149e636bf6df109dd3689e8be0c35b83d8bbf39208e362c6938e0c8311f
+size 105717
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.settings.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.settings.png
new file mode 100644
index 000000000..e055cdcee
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed05c76fb48fb1440ae419caed6833c3d25858513b85417d19921cac444cc781
+size 125722
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleRegular.png
new file mode 100644
index 000000000..d95dee542
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15b94ec3bf3863ebf6e82295899b623b1c29dceeb99a0d1073555aaa3ca46405
+size 94755
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleUpgrade.png
new file mode 100644
index 000000000..f50de40ff
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2dd1bb2e8d6d2b9f7f4c049bd2337224f963c845efb0ed81b19000d652698b6
+size 87699
diff --git a/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.softLogout.png b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.softLogout.png
new file mode 100644
index 000000000..f9d40958a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/de-DE-iPhone-14.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:464e4cadb82e91d37564989379d1be21b16ca6f665d918cecc267b0e7bc0dcff
+size 177470
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.analyticsPrompt.png
new file mode 100644
index 000000000..d99f6a0ba
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67b5e3652af586ba4478c79cdb1bf2f6f952ef93065c18aa4b30622f7644a20b
+size 135323
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png
new file mode 100644
index 000000000..d9fcf1e93
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:842fd6e19c0395b5f893073ae954501a9a5130aa0d94af2509334900ad33dd03
+size 87222
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReport.png
new file mode 100644
index 000000000..e4f9e96ca
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c10aec0ca3e1d656407f8b564fc9ea178828169e6d4d68b147130833c5f93b3
+size 121876
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReportWithScreenshot.png
new file mode 100644
index 000000000..826833ae8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:660c8e7d4b308cff8e5bcf8ccd8a8027ce39aa44d73fe64ab09496c90f2f12bf
+size 130690
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.home.png
new file mode 100644
index 000000000..8755795a8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9427f2e142bcfeae39c253a2ef620263e8ece317d317868198a0077c66d61996
+size 78625
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png
new file mode 100644
index 000000000..8031ca856
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e9ff2966d30ddceeb541281efd67eba3aeebd9764d3d3f1ba13a9aa82a8d4b1
+size 88087
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.onboarding.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.onboarding.png
new file mode 100644
index 000000000..5068fc0d4
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bba4baac9310c201fa317dcb54682b9359b218d12059f78d722c29bcc342c2f8
+size 167276
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..3ccf4d741
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba9218275999d949200c620d5019bb03e99935081a70c6e7151217b1787e9ccb
+size 207960
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
new file mode 100644
index 000000000..5e22c20d5
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82b057602fc6b76294eed9232a9fa9f5b9f8348bff50ba5cdd05a9299674b1dc
+size 207307
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection.png
new file mode 100644
index 000000000..6c85b5d7b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8abedcc2cf0409e7ff57b43accf74f32225bb1fdd2e06c3697ad516086345cd
+size 111480
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png
new file mode 100644
index 000000000..ec358aa2d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e57977f3994ae60219ea36b2a042e78125ee1ccec2d5e8ab9500d10e630eebb
+size 109036
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.sessionVerification.png
new file mode 100644
index 000000000..da2d08690
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:338f590aa8ec5d2db4e9cc9fcd1974e39b4f71c55cc5ac471e72d78ecc1ddb83
+size 80562
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
new file mode 100644
index 000000000..590d16461
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5bafccc43ded94082a5182afe1af60e3a17f0d943ac981c704f313914eaa640
+size 101898
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleRegular.png
new file mode 100644
index 000000000..b8c6f5a7c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247a5f18ee289b1343a1648f8a5b7f3400891514032cc0f2065e3a64da3c97bb
+size 83087
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleUpgrade.png
new file mode 100644
index 000000000..52525104e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cd654b15d352e959b581c117e787919258c535099e480c99cdbb72fa2f7f2fd
+size 77679
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png
new file mode 100644
index 000000000..f03afa91e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPad-9th-generation.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba32ef1a73c560d8b56bd258f1daf60e0ca010c9714f8731e2a67a0d138aa11c
+size 120401
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.analyticsPrompt.png
new file mode 100644
index 000000000..5868657dd
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8de3da3a1a00435a6c0536d97f8b78239b46133996fda11274d1a07e66b7891c
+size 180985
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png
new file mode 100644
index 000000000..237ebe6c7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38b75812e0b2ec7e08697d5afde8ee813b2512f2b1cc0d1af53b894399eb37ef
+size 96001
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReport.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReport.png
new file mode 100644
index 000000000..ec6ea41d2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:853a61f1c30715abe2570b269726d650313ee19801dd06b6cc7084e89eaad983
+size 165777
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReportWithScreenshot.png
new file mode 100644
index 000000000..ec6ea41d2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:853a61f1c30715abe2570b269726d650313ee19801dd06b6cc7084e89eaad983
+size 165777
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.home.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.home.png
new file mode 100644
index 000000000..80e05b5bc
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87283d139b1810b7b675ec2b5c659ec01e20438d88dc047d5d6262ee923144dd
+size 87188
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png
new file mode 100644
index 000000000..aa3aca916
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8583add88da4bdd665d0ff72e877b87f6736683d07f894ec8153f3c7620705d9
+size 95561
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
new file mode 100644
index 000000000..5965c5fc1
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9cc4d5f0056e46c5620b03194b643e27c3d56fa207355242808ef03d0647ebc
+size 235328
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..42033d798
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74b59a7a3f639eefa579333d77e301c4fb417889846b82c828242bcb87822ecc
+size 295099
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
new file mode 100644
index 000000000..83766882b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ade4638eba012fdae7d0b60dd92b634a2dce225f4e24d52e53abf7617838a9ef
+size 294155
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection.png
new file mode 100644
index 000000000..15e7bdbb8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c9b4a07acac5bde9206d2d9afc137b129e5e13a09349c805739f719a5d8d215
+size 132275
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png
new file mode 100644
index 000000000..da1969c07
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4296152af97a7bfae9cf4d16caa388612d316ce094b97aa8ae2e8c77327e15c6
+size 128455
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.sessionVerification.png
new file mode 100644
index 000000000..bfa72bc09
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1574e7cecdc0e408fccf01a21eee41a9f5870826417da153aec8353f3d47af15
+size 95696
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
new file mode 100644
index 000000000..5350f3cc8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fdad77450c1fdf345f2c8f94fd36148f984819bb5e99f0079e72d9efaa03e34
+size 125447
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleRegular.png
new file mode 100644
index 000000000..d95dee542
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15b94ec3bf3863ebf6e82295899b623b1c29dceeb99a0d1073555aaa3ca46405
+size 94755
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleUpgrade.png
new file mode 100644
index 000000000..f50de40ff
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2dd1bb2e8d6d2b9f7f4c049bd2337224f963c845efb0ed81b19000d652698b6
+size 87699
diff --git a/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png
new file mode 100644
index 000000000..af3a749ff
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/en-GB-iPhone-14.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a1278e8dab1bfecc09656119989938056c73720b63936a2fe3c3e48d9708ebd
+size 153464
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.analyticsPrompt.png
new file mode 100644
index 000000000..2b7cb6c9a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3159b0b8e2af2f320f3236f554b4e024defdb3ec67cd7d71c1f9c35bedf9fd61
+size 149242
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.authenticationFlow.png
new file mode 100644
index 000000000..da73f9417
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49e3cc414dd6e5945e5d2108d47b1a644b575c980262c962fc9c532fe74437c4
+size 89949
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReport.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReport.png
new file mode 100644
index 000000000..b2b429e5c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:494f646a54bbe6b6b3f628450b9926a834de1d1d29ed6ff107f5b711fb2a36d8
+size 130148
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
new file mode 100644
index 000000000..55f95cbcc
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f474ddbf0ab8e25749056fbc96cbc62ca3bda18139aced62e308939b1874f6e6
+size 139269
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.home.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.home.png
new file mode 100644
index 000000000..975649845
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:195f174a64e283590bf33b01b7c68d1ffc451c010ca2c84aa284237c834eb84a
+size 81589
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.login.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.login.png
new file mode 100644
index 000000000..7ea4c16a2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eab7813acc6b63270e8ca073d668107b9b72e27489178c6e316f9230122a0b23
+size 92480
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.onboarding.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.onboarding.png
new file mode 100644
index 000000000..90ec6a371
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32988bf2b524a9d015dc349b5703164c44df1a6bde0f3fbf6c25d3fa5f83f159
+size 165962
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..b98a57234
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df627a68a56f879f53298d8af24e6c66cf8cbf77745c94a50e365fce7f1f8922
+size 208173
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
new file mode 100644
index 000000000..3f6c7cffa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58ac026654258e9713f5f5877f35de33e117c54405ec40aa90c4328414eeac79
+size 207519
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelection.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelection.png
new file mode 100644
index 000000000..c5a883caa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:318120bfe01078b4199dfb08d69066add96f47483df23320e8f933ea81cbf5bd
+size 116594
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelectionNonModal.png
new file mode 100644
index 000000000..0edb1725c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00a97ea74613cef3e108b3588154e60ca962d868216e6f9d52a75ca605716097
+size 115187
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.sessionVerification.png
new file mode 100644
index 000000000..77bc3929a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b17081aae8c3f967f3117b36b5e5e21cc56f711df3c03461089863d3c7f1bac0
+size 85600
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.settings.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.settings.png
new file mode 100644
index 000000000..5d0c14902
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c20831ac18ee32022faf98abe3866d67581a3b466ed9eb7ceaa20bff6dfc9ec5
+size 102302
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleRegular.png
new file mode 100644
index 000000000..b8c6f5a7c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247a5f18ee289b1343a1648f8a5b7f3400891514032cc0f2065e3a64da3c97bb
+size 83087
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleUpgrade.png
new file mode 100644
index 000000000..52525104e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1cd654b15d352e959b581c117e787919258c535099e480c99cdbb72fa2f7f2fd
+size 77679
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.softLogout.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.softLogout.png
new file mode 100644
index 000000000..f070ca5de
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPad-9th-generation.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:206605f4d779b9859dac064a0b5906a8ff08e278836827a2d186ae6e61fe8735
+size 128489
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.analyticsPrompt.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.analyticsPrompt.png
new file mode 100644
index 000000000..cfa7933d6
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.analyticsPrompt.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:716d60d7f8b4ba37f041523edfadbeb55d68badfcbf42117d8e0e44dbffbe571
+size 190875
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.authenticationFlow.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.authenticationFlow.png
new file mode 100644
index 000000000..1e650e392
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.authenticationFlow.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ae88c4da5e4c4f7cf8b3a8a3c6537cd9488945c4deaea5b484cddae6cb77cae
+size 99910
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReport.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReport.png
new file mode 100644
index 000000000..b9f3a6946
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReport.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9a3f1bb8d1eab797c05c061d3aecd93e4401f320fa62a518c984cfbabf80fdd
+size 171135
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReportWithScreenshot.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReportWithScreenshot.png
new file mode 100644
index 000000000..7d781f021
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.bugReportWithScreenshot.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fa4faabf0fd49a2c6fb3e4181434ad6c69ccdd43016f92c4d2feb4387c0cd76
+size 172489
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.home.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.home.png
new file mode 100644
index 000000000..adda79caa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.home.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c55f625d45ecc9cf2269c6651b4b8f45d4f347c1739e229f688cede381e4831d
+size 91970
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.login.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.login.png
new file mode 100644
index 000000000..6ebd6eb9f
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.login.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4c63b01860db5167f7365749fefb60037d8f6c55689a9a17e22e00d9b6eae8d
+size 102206
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.onboarding.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.onboarding.png
new file mode 100644
index 000000000..148485dfb
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.onboarding.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f86caca327f8f7a9d1e70b3b1c002682988e175ef800986124e0e05b568b4c3
+size 233578
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomEncryptedWithAvatar.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomEncryptedWithAvatar.png
new file mode 100644
index 000000000..129c11175
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomEncryptedWithAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6170f6628637496185cd3d89509735bd91ecc9a00e6e9e449e79d4f09f19fc96
+size 295475
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomPlainNoAvatar.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomPlainNoAvatar.png
new file mode 100644
index 000000000..df11747a8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.roomPlainNoAvatar.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4da4a01c13823486548c8e24926e7cae5f3e779597c39aaaddd57393c743c7a
+size 294447
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelection.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelection.png
new file mode 100644
index 000000000..d13cbe2eb
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelection.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1631a82d713274c09df3a6797bab91a834ab1f845d2bc42c5e3900e28a6c538e
+size 135979
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelectionNonModal.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelectionNonModal.png
new file mode 100644
index 000000000..f701b0e77
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.serverSelectionNonModal.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e6dccc10cb773f1a79f71f0bd3b5b128641a660e373fda25e527cf362ffa699
+size 133912
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.sessionVerification.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.sessionVerification.png
new file mode 100644
index 000000000..bf06ae4b6
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.sessionVerification.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cf781c7631a0448f96ca5a6a6940a2387b52fe6f6221c7d342b09f1ca111e8
+size 102925
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.settings.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.settings.png
new file mode 100644
index 000000000..56aa42009
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.settings.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b643263191776badaf326c825ed53af855836443b9ec9dbede5e9ee6063bafac
+size 127431
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleRegular.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleRegular.png
new file mode 100644
index 000000000..d95dee542
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleRegular.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15b94ec3bf3863ebf6e82295899b623b1c29dceeb99a0d1073555aaa3ca46405
+size 94755
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleUpgrade.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleUpgrade.png
new file mode 100644
index 000000000..f50de40ff
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.simpleUpgrade.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2dd1bb2e8d6d2b9f7f4c049bd2337224f963c845efb0ed81b19000d652698b6
+size 87699
diff --git a/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.softLogout.png b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.softLogout.png
new file mode 100644
index 000000000..b3292c8b1
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/fr-FR-iPhone-14.softLogout.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:634e0b0d477c51ed989ae202d3edfa9e064c648cdf7630248723186181ba079d
+size 169289
diff --git a/UITests/SupportingFiles/target.yml b/UITests/SupportingFiles/target.yml
index 561254e3e..f95fbf0a9 100644
--- a/UITests/SupportingFiles/target.yml
+++ b/UITests/SupportingFiles/target.yml
@@ -28,31 +28,18 @@ targets:
     dependencies:
     - target: ElementX
     - package: MatrixRustSDK
-      linkType: static
     - package: AnalyticsEvents
-      linkType: static
     - package: AppAuth
-      linkType: static
     - package: DeviceKit
-      linkType: static
     - package: DTCoreText
-      linkType: static
     - package: KeychainAccess
-      linkType: static
     - package: Kingfisher
-      linkType: static
     - package: PostHog
-      linkType: static
     - package: SwiftyBeaver
-      linkType: static
     - package: SwiftState
-      linkType: static
     - package: GZIP
-      linkType: static
     - package: Sentry
-      linkType: static
     - package: SnapshotTesting
-      linkType: static
 
     info:
       path: ../SupportingFiles/Info.plist
@@ -64,15 +51,6 @@ targets:
       debug:
       release:
 
-    preBuildScripts:
-      - name: Override Simulator Status Bars
-        runOnlyWhenInstalling: false
-        basedOnDependencyAnalysis: false
-        shell: /bin/sh
-        script: |
-          python3 $PROJECT_DIR/Tools/Scripts/bootTestSimulator.py --name 'iPhone 13 Pro Max' --version 'iOS.16.1'
-          python3 $PROJECT_DIR/Tools/Scripts/bootTestSimulator.py --name 'iPad (9th generation)' --version 'iOS.16.1'
-
     sources:
     - path: ../Sources
       excludes:
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index fdc82afd9..958a504b6 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -2,7 +2,7 @@ require 'yaml'
 require_relative 'changelog'
 
 before_all do
-  xcversion(version: "~> 14.0.1")
+  xcversion(version: "~> 14.1")
 end
 
 lane :alpha do
@@ -106,7 +106,7 @@ end
 lane :ui_tests do 
   run_tests(
     scheme: "UITests",
-    devices: ["iPhone 13 Pro Max (16.0)", "iPad (9th generation) (16.0)"],
+    devices: ["iPhone 14", "iPad (9th generation)"],
     ensure_devices_found: true,
     prelaunch_simulator: true,
     result_bundle: true