From ffafca6d643667d07c370c7db4b1008716db634e Mon Sep 17 00:00:00 2001
From: Stefan Ceriu <stefanc@matrix.org>
Date: Tue, 4 Mar 2025 17:17:52 +0200
Subject: [PATCH] Revamp the UI test snapshot naming convention to make them
 easier to organize and find.

---
 ElementX.xcodeproj/project.pbxproj            | 176 +++++++++---------
 ...ITests.swift => TemplateScreenTests.swift} |   2 +-
 ...pUITests.swift => AppLockSetupTests.swift} |  34 ++--
 ...ppLockUITests.swift => AppLockTests.swift} |  30 +--
 UITests/Sources/Application.swift             |  35 ++--
 ... AuthenticationFlowCoordinatorTests.swift} |   4 +-
 ...portUITests.swift => BugReportTests.swift} |   6 +-
 ...ests.swift => CreateRoomScreenTests.swift} |   6 +-
 ...Tests.swift => EncryptionResetTests.swift} |   6 +-
 ...ts.swift => EncryptionSettingsTests.swift} |  20 +-
 ...ITests.swift => PollFormScreenTests.swift} |   6 +-
 ...swift => RoomMembersListScreenTests.swift} |   6 +-
 ...ift => RoomRolesAndPermissionsTests.swift} |  12 +-
 ...eenUITests.swift => RoomScreenTests.swift} |  28 +--
 ...Tests.swift => ServerSelectionTests.swift} |   6 +-
 ...s.swift => SessionVerificationTests.swift} |  36 ++--
 ...Tests.swift => StartChatScreenTests.swift} |   6 +-
 UITests/Sources/UserSessionScreenTests.swift  |   8 +-
 ...ck.testFlowDisabled-iPad-18-1-en-GB-99.png |   3 +
 ...testFlowDisabled-iPhone-18-1-en-GB-99.png} |   0
 ...ock.testFlowEnabled-iPad-18-1-en-GB-0.png} |   0
 ...Lock.testFlowEnabled-iPad-18-1-en-GB-1.png |   3 +
 ...ck.testFlowEnabled-iPad-18-1-en-GB-99.png} |   0
 ...k.testFlowEnabled-iPhone-18-1-en-GB-0.png} |   0
 ...ck.testFlowEnabled-iPhone-18-1-en-GB-1.png |   3 +
 ...k.testFlowEnabled-iPhone-18-1-en-GB-99.png |   3 +
 ...ock.testResignActive-iPad-18-1-en-GB-0.png |   3 +
 ...k.testResignActive-iPad-18-1-en-GB-99.png} |   0
 ...k.testResignActive-iPhone-18-1-en-GB-0.png |   3 +
 ....testResignActive-iPhone-18-1-en-GB-99.png |   3 +
 ...appLock.testWrongPIN-iPad-18-1-en-GB-1.png |   3 +
 ...appLock.testWrongPIN-iPad-18-1-en-GB-2.png |   3 +
 ...appLock.testWrongPIN-iPad-18-1-en-GB-3.png |   3 +
 ...appLock.testWrongPIN-iPad-18-1-en-GB-4.png |   3 +
 ...ppLock.testWrongPIN-iPad-18-1-en-GB-99.png |   3 +
 ...pLock.testWrongPIN-iPhone-18-1-en-GB-1.png |   3 +
 ...pLock.testWrongPIN-iPhone-18-1-en-GB-2.png |   3 +
 ...pLock.testWrongPIN-iPhone-18-1-en-GB-3.png |   3 +
 ...pLock.testWrongPIN-iPhone-18-1-en-GB-4.png |   3 +
 ...Lock.testWrongPIN-iPhone-18-1-en-GB-99.png |   3 +
 .../appLockFlow-1-iPad-18-1-en-GB.UI.png      |   3 -
 .../appLockFlow-1-iPhone-18-1-en-GB.UI.png    |   3 -
 .../appLockFlow-2-iPad-18-1-en-GB.UI.png      |   3 -
 .../appLockFlow-2-iPhone-18-1-en-GB.UI.png    |   3 -
 .../appLockFlow-3-iPad-18-1-en-GB.UI.png      |   3 -
 .../appLockFlow-3-iPhone-18-1-en-GB.UI.png    |   3 -
 .../appLockFlow-4-iPad-18-1-en-GB.UI.png      |   3 -
 .../appLockFlow-4-iPhone-18-1-en-GB.UI.png    |   3 -
 ...ockSetup.testCancel-iPad-18-1-en-GB-99.png |   3 +
 ...ppLockSetup.testCancel-iPad-18-1-en-GB.png |   3 +
 ...Setup.testCancel-iPhone-18-1-en-GB-99.png} |   0
 ...LockSetup.testCancel-iPhone-18-1-en-GB.png |   3 +
 ...Setup.testCreateFlow-iPad-18-1-en-GB-0.png |   3 +
 ...Setup.testCreateFlow-iPad-18-1-en-GB-1.png |   3 +
 ...etup.testCreateFlow-iPad-18-1-en-GB-2.png} |   0
 ...Setup.testCreateFlow-iPad-18-1-en-GB-3.png |   3 +
 ...Setup.testCreateFlow-iPad-18-1-en-GB-4.png |   3 +
 ...Setup.testCreateFlow-iPad-18-1-en-GB-5.png |   3 +
 ...etup.testCreateFlow-iPad-18-1-en-GB-99.png |   3 +
 ...tup.testCreateFlow-iPhone-18-1-en-GB-0.png |   3 +
 ...tup.testCreateFlow-iPhone-18-1-en-GB-1.png |   3 +
 ...up.testCreateFlow-iPhone-18-1-en-GB-2.png} |   0
 ...tup.testCreateFlow-iPhone-18-1-en-GB-3.png |   3 +
 ...up.testCreateFlow-iPhone-18-1-en-GB-99.png |   3 +
 ...tMandatoryCreateFlow-iPad-18-1-en-GB-0.png |   3 +
 ...tMandatoryCreateFlow-iPad-18-1-en-GB-1.png |   3 +
 ...MandatoryCreateFlow-iPad-18-1-en-GB-2.png} |   0
 ...andatoryCreateFlow-iPhone-18-1-en-GB-0.png |   3 +
 ...andatoryCreateFlow-iPhone-18-1-en-GB-1.png |   3 +
 ...ndatoryCreateFlow-iPhone-18-1-en-GB-2.png} |   0
 ...etup.testUnlockFlow-iPad-18-1-en-GB-3.png} |   0
 ...etup.testUnlockFlow-iPad-18-1-en-GB-99.png |   3 +
 ...ckSetup.testUnlockFlow-iPad-18-1-en-GB.png |   3 +
 ...up.testUnlockFlow-iPhone-18-1-en-GB-3.png} |   0
 ...up.testUnlockFlow-iPhone-18-1-en-GB-99.png |   3 +
 ...Setup.testUnlockFlow-iPhone-18-1-en-GB.png |   3 +
 .../appLockSetupFlow-0-iPad-18-1-en-GB.UI.png |   3 -
 ...ppLockSetupFlow-0-iPhone-18-1-en-GB.UI.png |   3 -
 .../appLockSetupFlow-1-iPad-18-1-en-GB.UI.png |   3 -
 ...ppLockSetupFlow-1-iPhone-18-1-en-GB.UI.png |   3 -
 .../appLockSetupFlow-4-iPad-18-1-en-GB.UI.png |   3 -
 .../appLockSetupFlow-5-iPad-18-1-en-GB.UI.png |   3 -
 ...etupFlowMandatory-0-iPad-18-1-en-GB.UI.png |   3 -
 ...upFlowMandatory-0-iPhone-18-1-en-GB.UI.png |   3 -
 ...etupFlowMandatory-1-iPad-18-1-en-GB.UI.png |   3 -
 ...upFlowMandatory-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...LockSetupFlowUnlock-iPad-18-1-en-GB.UI.png |   3 -
 ...ckSetupFlowUnlock-iPhone-18-1-en-GB.UI.png |   3 -
 ...uthenticationFlow-1-iPad-18-1-en-GB.UI.png |   3 -
 ...uthenticationFlow-1-iPhone-15-en-GB.UI.png |   3 -
 ...henticationFlow-1-iPhone-18-1-en-GB.UI.png |   3 -
 .../authenticationFlow-iPad-18-1-en-GB.UI.png |   3 -
 ...uthenticationFlow-iPhone-18-1-en-GB.UI.png |   3 -
 ....testLoginWithPassword-iPad-18-1-en-GB.png |   3 +
 ...estLoginWithPassword-iPhone-18-1-en-GB.png |   3 +
 ...nWithUnsupportedUserID-iPad-18-1-en-GB.png |   3 +
 ...ithUnsupportedUserID-iPhone-18-1-en-GB.png |   3 +
 .../bugReport-0-iPad-18-1-en-GB.UI.png        |   3 -
 .../bugReport-0-iPhone-18-1-en-GB.UI.png      |   3 -
 .../bugReport-2-iPad-18-1-en-GB.UI.png        |   3 -
 .../bugReport-2-iPhone-18-1-en-GB.UI.png      |   3 -
 .../bugReport-3-iPad-18-1-en-GB.UI.png        |   3 -
 .../bugReport-3-iPhone-18-1-en-GB.UI.png      |   3 -
 ...InitialStateComponents-iPad-18-1-en-GB.png |   3 +
 ...itialStateComponents-iPhone-18-1-en-GB.png |   3 +
 ...gReport.testReportText-iPad-18-1-en-GB.png |   3 +
 ...eport.testReportText-iPhone-18-1-en-GB.png |   3 +
 .../createPoll-1-iPhone-18-1-en-GB.UI.png     |   3 -
 .../createPoll-2-iPhone-18-1-en-GB.UI.png     |   3 -
 .../createPoll-iPhone-18-1-en-GB.UI.png       |   3 -
 .../createRoom-1-iPad-18-1-en-GB.UI.png       |   3 -
 .../createRoom-1-iPhone-18-1-en-GB.UI.png     |   3 -
 .../createRoom-iPad-18-1-en-GB.UI.png         |   3 -
 .../createRoom-iPhone-18-1-en-GB.UI.png       |   3 -
 .../createRoomNoUsers-iPad-18-1-en-GB.UI.png  |   3 -
 ...createRoomNoUsers-iPhone-18-1-en-GB.UI.png |   3 -
 ...RoomScreen.testLanding-iPad-18-1-en-GB.png |   3 +
 ...omScreen.testLanding-iPhone-18-1-en-GB.png |   3 +
 ...estLandingWithoutUsers-iPad-18-1-en-GB.png |   3 +
 ...tLandingWithoutUsers-iPhone-18-1-en-GB.png |   3 +
 ....testLongInputNameText-iPad-18-1-en-GB.png |   3 +
 ...estLongInputNameText-iPhone-18-1-en-GB.png |   3 +
 .../encryptionReset-0-iPad-18-1-en-GB.UI.png  |   3 -
 ...encryptionReset-0-iPhone-18-1-en-GB.UI.png |   3 -
 .../encryptionReset-1-iPad-18-1-en-GB.UI.png  |   3 -
 ...encryptionReset-1-iPhone-18-1-en-GB.UI.png |   3 -
 .../encryptionReset-2-iPad-18-1-en-GB.UI.png  |   3 -
 ...encryptionReset-2-iPhone-18-1-en-GB.UI.png |   3 -
 ...set.testPasswordFlow-iPad-18-1-en-GB-0.png |   3 +
 ...set.testPasswordFlow-iPad-18-1-en-GB-1.png |   3 +
 ...set.testPasswordFlow-iPad-18-1-en-GB-2.png |   3 +
 ...t.testPasswordFlow-iPhone-18-1-en-GB-0.png |   3 +
 ...t.testPasswordFlow-iPhone-18-1-en-GB-1.png |   3 +
 ...t.testPasswordFlow-iPhone-18-1-en-GB-2.png |   3 +
 ...ncryptionSettings-0-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-0-iPhone-18-1-en-GB.UI.png |   3 -
 ...ncryptionSettings-1-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...ncryptionSettings-3-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-3-iPhone-18-1-en-GB.UI.png |   3 -
 ...ncryptionSettings-4-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-4-iPhone-18-1-en-GB.UI.png |   3 -
 ...ncryptionSettings-5-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-5-iPhone-18-1-en-GB.UI.png |   3 -
 ...ncryptionSettings-6-iPad-18-1-en-GB.UI.png |   3 -
 ...ryptionSettings-6-iPhone-18-1-en-GB.UI.png |   3 -
 ...ionSettings.testFlow-iPad-18-1-en-GB-0.png |   3 +
 ...ionSettings.testFlow-iPad-18-1-en-GB-1.png |   3 +
 ...onSettings.testFlow-iPad-18-1-en-GB-2.png} |   0
 ...ionSettings.testFlow-iPad-18-1-en-GB-3.png |   3 +
 ...ionSettings.testFlow-iPad-18-1-en-GB-4.png |   3 +
 ...nSettings.testFlow-iPhone-18-1-en-GB-0.png |   3 +
 ...nSettings.testFlow-iPhone-18-1-en-GB-1.png |   3 +
 ...Settings.testFlow-iPhone-18-1-en-GB-2.png} |   0
 ...nSettings.testFlow-iPhone-18-1-en-GB-3.png |   3 +
 ...nSettings.testFlow-iPhone-18-1-en-GB-4.png |   3 +
 ...gs.testOutOfSyncFlow-iPad-18-1-en-GB-0.png |   3 +
 ...gs.testOutOfSyncFlow-iPad-18-1-en-GB-5.png |   3 +
 ...gs.testOutOfSyncFlow-iPad-18-1-en-GB-6.png |   3 +
 ....testOutOfSyncFlow-iPhone-18-1-en-GB-0.png |   3 +
 ....testOutOfSyncFlow-iPhone-18-1-en-GB-5.png |   3 +
 ....testOutOfSyncFlow-iPhone-18-1-en-GB-6.png |   3 +
 ...creen.testEmptyScreen-iPad-18-1-en-GB.png} |   0
 ...reen.testEmptyScreen-iPhone-18-1-en-GB.png |   3 +
 ...Screen.testFilledPoll-iPad-18-1-en-GB.png} |   0
 ...creen.testFilledPoll-iPhone-18-1-en-GB.png |   3 +
 ...Screen.testMaxOptions-iPad-18-1-en-GB.png} |   0
 ...creen.testMaxOptions-iPhone-18-1-en-GB.png |   3 +
 ...oomLayoutBottom-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...inedAndInvitedMembers-iPad-18-1-en-GB.png} |   0
 ...edAndInvitedMembers-iPhone-18-1-en-GB.png} |   0
 ...stSearchInvitedMember-iPad-18-1-en-GB.png} |   0
 ...SearchInvitedMember-iPhone-18-1-en-GB.png} |   0
 ...estSearchJoinedMember-iPad-18-1-en-GB.png} |   0
 ...tSearchJoinedMember-iPhone-18-1-en-GB.png} |   0
 .../roomPlainNoAvatar-iPad-18-1-en-GB.UI.png  |   3 -
 ...roomPlainNoAvatar-iPhone-18-1-en-GB.UI.png |   3 -
 ...Permissions.testFlow-iPad-18-1-en-GB-0.png |   3 +
 ...Permissions.testFlow-iPad-18-1-en-GB-1.png |   3 +
 ...Permissions.testFlow-iPad-18-1-en-GB-2.png |   3 +
 ...Permissions.testFlow-iPad-18-1-en-GB-3.png |   3 +
 ...Permissions.testFlow-iPad-18-1-en-GB-4.png |   3 +
 ...Permissions.testFlow-iPad-18-1-en-GB-5.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-0.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-1.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-2.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-3.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-4.png |   3 +
 ...rmissions.testFlow-iPhone-18-1-en-GB-5.png |   3 +
 ...ndPermissionsFlow-0-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-0-iPhone-18-1-en-GB.UI.png |   3 -
 ...ndPermissionsFlow-1-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...ndPermissionsFlow-2-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-2-iPhone-18-1-en-GB.UI.png |   3 -
 ...ndPermissionsFlow-3-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-3-iPhone-18-1-en-GB.UI.png |   3 -
 ...ndPermissionsFlow-4-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-4-iPhone-18-1-en-GB.UI.png |   3 -
 ...ndPermissionsFlow-5-iPad-18-1-en-GB.UI.png |   3 -
 ...PermissionsFlow-5-iPhone-18-1-en-GB.UI.png |   3 -
 ...reen.testPlainNoAvatar-iPad-18-1-en-GB.png |   3 +
 ...en.testPlainNoAvatar-iPhone-18-1-en-GB.png |   3 +
 ...estSmallTimelineLayout-iPad-18-1-en-GB.png |   3 +
 ...SmallTimelineLayout-iPhone-18-1-en-GB.png} |   0
 ...IncomingAndPagination-iPad-18-1-en-GB.png} |   0
 ...comingAndPagination-iPhone-18-1-en-GB.png} |   0
 ...neWithLargePagination-iPad-18-1-en-GB.png} |   0
 ...WithLargePagination-iPhone-18-1-en-GB.png} |   0
 ...imelineDisclosedPolls-iPad-18-1-en-GB.png} |   0
 ...elineDisclosedPolls-iPhone-18-1-en-GB.png} |   0
 ...elineLayoutAtBottom-iPad-18-1-en-GB-0.png} |   0
 ...elineLayoutAtBottom-iPad-18-1-en-GB-1.png} |   0
 ...ineLayoutAtBottom-iPhone-18-1-en-GB-0.png} |   0
 ...lineLayoutAtBottom-iPhone-18-1-en-GB-1.png |   3 +
 ...stTimelineLayoutAtTop-iPad-18-1-en-GB.png} |   0
 ...TimelineLayoutAtTop-iPhone-18-1-en-GB.png} |   0
 ...youtHighlightExisting-iPad-18-1-en-GB.png} |   0
 ...utHighlightExisting-iPhone-18-1-en-GB.png} |   0
 ...TimelineOutgoingPolls-iPad-18-1-en-GB.png} |   0
 ...melineOutgoingPolls-iPhone-18-1-en-GB.png} |   0
 ...stTimelineReadReceipts-iPad-18-1-en-GB.png |   3 +
 ...imelineReadReceipts-iPhone-18-1-en-GB.png} |   0
 ...elineUndisclosedPolls-iPad-18-1-en-GB.png} |   0
 ...ineUndisclosedPolls-iPhone-18-1-en-GB.png} |   0
 .../roomSmallTimeline-iPad-18-1-en-GB.UI.png  |   3 -
 ...ineWithReadReceipts-iPad-18-1-en-GB.UI.png |   3 -
 .../serverSelection-0-iPad-18-1-en-GB.UI.png  |   3 -
 ...serverSelection-0-iPhone-18-1-en-GB.UI.png |   3 -
 .../serverSelection-1-iPad-18-1-en-GB.UI.png  |   3 -
 ...serverSelection-1-iPhone-18-1-en-GB.UI.png |   3 -
 .../serverSelection-2-iPad-18-1-en-GB.UI.png  |   3 -
 ...serverSelection-2-iPhone-18-1-en-GB.UI.png |   3 -
 ...ction.testEmptyAddress-iPad-18-1-en-GB.png |   3 +
 ...ion.testEmptyAddress-iPhone-18-1-en-GB.png |   3 +
 ...ion.testInvalidAddress-iPad-18-1-en-GB.png |   3 +
 ...n.testInvalidAddress-iPhone-18-1-en-GB.png |   3 +
 ...ection.testNormalState-iPad-18-1-en-GB.png |   3 +
 ...tion.testNormalState-iPhone-18-1-en-GB.png |   3 +
 ...ssionVerification-0-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-0-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-1-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-2-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-2-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-3-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-3-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-4-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-4-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-5-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-5-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-6-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-6-iPhone-18-1-en-GB.UI.png |   3 -
 ...ssionVerification-7-iPad-18-1-en-GB.UI.png |   3 -
 ...ionVerification-7-iPhone-18-1-en-GB.UI.png |   3 -
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-0.png |   3 +
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-1.png |   3 +
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-2.png |   3 +
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-3.png |   3 +
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-4.png |   3 +
 ...hallengeDoesNotMatch-iPad-18-1-en-GB-7.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-0.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-1.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-2.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-3.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-4.png |   3 +
 ...llengeDoesNotMatch-iPhone-18-1-en-GB-7.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-0.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-1.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-2.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-3.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-4.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-5.png |   3 +
 ...testChallengeMatches-iPad-18-1-en-GB-6.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-0.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-1.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-2.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-3.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-4.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-5.png |   3 +
 ...stChallengeMatches-iPhone-18-1-en-GB-6.png |   3 +
 ...ificationCancelation-iPad-18-1-en-GB-0.png |   3 +
 ...ificationCancelation-iPad-18-1-en-GB-1.png |   3 +
 ...ificationCancelation-iPad-18-1-en-GB-2.png |   3 +
 ...ificationCancelation-iPad-18-1-en-GB-3.png |   3 +
 ...ificationCancelation-iPad-18-1-en-GB-4.png |   3 +
 ...icationCancelation-iPhone-18-1-en-GB-0.png |   3 +
 ...icationCancelation-iPhone-18-1-en-GB-1.png |   3 +
 ...icationCancelation-iPhone-18-1-en-GB-2.png |   3 +
 ...icationCancelation-iPhone-18-1-en-GB-3.png |   3 +
 ...icationCancelation-iPhone-18-1-en-GB-4.png |   3 +
 .../startChat-iPad-18-1-en-GB.UI.png          |   3 -
 .../startChat-iPhone-18-1-en-GB.UI.png        |   3 -
 ...ChatScreen.testLanding-iPad-18-1-en-GB.png |   3 +
 ...atScreen.testLanding-iPhone-18-1-en-GB.png |   3 +
 ...stSearchWithNoResults-iPad-18-1-en-GB.png} |   0
 ...SearchWithNoResults-iPhone-18-1-en-GB.png} |   0
 ...testSearchWithResults-iPad-18-1-en-GB.png} |   0
 ...stSearchWithResults-iPhone-18-1-en-GB.png} |   0
 .../templateScreen-iPhone-18-1-en-GB.UI.png   |   3 -
 ...lateScreen.testScreen-iPad-18-1-en-GB.png} |   0
 ...ateScreen.testScreen-iPhone-18-1-en-GB.png |   3 +
 ...erSessionScreen-1-iPhone-18-1-en-GB.UI.png |   3 -
 ...estUserSessionFlows-iPad-18-1-en-GB-1.png} |   0
 ...estUserSessionFlows-iPad-18-1-en-GB-2.png} |   0
 ...estUserSessionFlows-iPad-18-1-en-GB-3.png} |   0
 ...stUserSessionFlows-iPhone-18-1-en-GB-1.png |   3 +
 ...tUserSessionFlows-iPhone-18-1-en-GB-2.png} |   0
 ...tUserSessionFlows-iPhone-18-1-en-GB-3.png} |   0
 ...n.testUserSessionReply-iPad-18-1-en-GB.png |   3 +
 ...testUserSessionReply-iPhone-18-1-en-GB.png |   3 +
 ...rSessionScreenReply-iPad-18-1-en-GB.UI.png |   3 -
 ...essionScreenReply-iPhone-18-1-en-GB.UI.png |   3 -
 313 files changed, 636 insertions(+), 520 deletions(-)
 rename Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/{TemplateScreenUITests.swift => TemplateScreenTests.swift} (89%)
 rename UITests/Sources/{AppLockSetupUITests.swift => AppLockSetupTests.swift} (74%)
 rename UITests/Sources/{AppLockUITests.swift => AppLockTests.swift} (79%)
 rename UITests/Sources/{AuthenticationFlowCoordinatorUITests.swift => AuthenticationFlowCoordinatorTests.swift} (97%)
 rename UITests/Sources/{BugReportUITests.swift => BugReportTests.swift} (88%)
 rename UITests/Sources/{CreateRoomScreenUITests.swift => CreateRoomScreenTests.swift} (85%)
 rename UITests/Sources/{EncryptionResetUITests.swift => EncryptionResetTests.swift} (81%)
 rename UITests/Sources/{EncryptionSettingsUITests.swift => EncryptionSettingsTests.swift} (75%)
 rename UITests/Sources/{PollFormScreenUITests.swift => PollFormScreenTests.swift} (90%)
 rename UITests/Sources/{RoomMembersListScreenUITests.swift => RoomMembersListScreenTests.swift} (76%)
 rename UITests/Sources/{RoomRolesAndPermissionsUITests.swift => RoomRolesAndPermissionsTests.swift} (70%)
 rename UITests/Sources/{RoomScreenUITests.swift => RoomScreenTests.swift} (81%)
 rename UITests/Sources/{ServerSelectionUITests.swift => ServerSelectionTests.swift} (86%)
 rename UITests/Sources/{SessionVerificationUITests.swift => SessionVerificationTests.swift} (62%)
 rename UITests/Sources/{StartChatScreenUITests.swift => StartChatScreenTests.swift} (83%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-1-en-GB-99.png
 rename UITests/Sources/__Snapshots__/Application/{appLockFlow-99-iPhone-18-1-en-GB.UI.png => appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockFlow-0-iPad-18-1-en-GB.UI.png => appLock.testFlowEnabled-iPad-18-1-en-GB-0.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{appLockFlow-99-iPad-18-1-en-GB.UI.png => appLock.testFlowEnabled-iPad-18-1-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockFlow-0-iPhone-18-1-en-GB.UI.png => appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-99-iPad-18-1-en-GB.UI.png => appLock.testResignActive-iPad-18-1-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-99.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-99-iPhone-18-1-en-GB.UI.png => appLockSetup.testCancel-iPhone-18-1-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-2-iPad-18-1-en-GB.UI.png => appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-2-iPhone-18-1-en-GB.UI.png => appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlowMandatory-2-iPad-18-1-en-GB.UI.png => appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlowMandatory-2-iPhone-18-1-en-GB.UI.png => appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-3-iPad-18-1-en-GB.UI.png => appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetupFlow-3-iPhone-18-1-en-GB.UI.png => appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-4-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlow-5-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-15-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlow-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlow-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-2-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-3-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport-3-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createPoll-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createPoll-2-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createPoll-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoom-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoom-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoom-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoom-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings-2-iPad-18-1-en-GB.UI.png => encryptionSettings.testFlow-iPad-18-1-en-GB-2.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings-2-iPhone-18-1-en-GB.UI.png => encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png
 rename UITests/Sources/__Snapshots__/Application/{createPoll-iPad-18-1-en-GB.UI.png => pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{createPoll-1-iPad-18-1-en-GB.UI.png => pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{createPoll-2-iPad-18-1-en-GB.UI.png => pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPhone-18-1-en-GB.UI.png
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-iPad-18-1-en-GB.UI.png => roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-iPhone-18-1-en-GB.UI.png => roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-1-iPad-18-1-en-GB.UI.png => roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-1-iPhone-18-1-en-GB.UI.png => roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-2-iPad-18-1-en-GB.UI.png => roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreenPendingInvites-2-iPhone-18-1-en-GB.UI.png => roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimeline-iPhone-18-1-en-GB.UI.png => roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimelineIncomingAndSmallPagination-iPad-18-1-en-GB.UI.png => roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimelineIncomingAndSmallPagination-iPhone-18-1-en-GB.UI.png => roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimelineLargePagination-iPad-18-1-en-GB.UI.png => roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimelineLargePagination-iPhone-18-1-en-GB.UI.png => roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithDisclosedPolls-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithDisclosedPolls-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutBottom-0-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutBottom-1-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutBottom-0-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutTop-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutTop-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutHighlight-0-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomLayoutHighlight-0-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithOutgoingPolls-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithOutgoingPolls-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomSmallTimelineWithReadReceipts-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithUndisclosedPolls-iPad-18-1-en-GB.UI.png => roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomWithUndisclosedPolls-iPhone-18-1-en-GB.UI.png => roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection-2-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPhone-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/startChat-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/startChat-iPhone-18-1-en-GB.UI.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{startChat-1-iPad-18-1-en-GB.UI.png => startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChat-1-iPhone-18-1-en-GB.UI.png => startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChat-2-iPad-18-1-en-GB.UI.png => startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChat-2-iPhone-18-1-en-GB.UI.png => startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/templateScreen-iPhone-18-1-en-GB.UI.png
 rename UITests/Sources/__Snapshots__/Application/{templateScreen-iPad-18-1-en-GB.UI.png => templateScreen.testScreen-iPad-18-1-en-GB.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPhone-18-1-en-GB.UI.png
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen-1-iPad-18-1-en-GB.UI.png => userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen-2-iPad-18-1-en-GB.UI.png => userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen-3-iPad-18-1-en-GB.UI.png => userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen-2-iPhone-18-1-en-GB.UI.png => userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen-3-iPhone-18-1-en-GB.UI.png => userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPad-18-1-en-GB.UI.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPhone-18-1-en-GB.UI.png

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 5e1d2e0c9..3d71ce6b6 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXAggregateTarget section */
@@ -43,9 +43,10 @@
 		053B8BD2496207838878C6C9 /* PinnedItemsBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60C9BAE9F9436B14E4E22E8F /* PinnedItemsBannerView.swift */; };
 		059173B3C77056C406906B6D /* target.yml in Resources */ = {isa = PBXBuildFile; fileRef = D4DA544B2520BFA65D6DB4BB /* target.yml */; };
 		05BAB510CBC2ED35C154ADD0 /* AnalyticsPromptScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7AFD012C3A9F5EF276DDD4AA /* AnalyticsPromptScreenViewModelProtocol.swift */; };
-		05EC896A4B9AF4A56670C0BB /* SessionVerificationUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4777F0142E330A75C46FE4 /* SessionVerificationUITests.swift */; };
+		05E797C4E0048BB487E5C4D6 /* AppLockTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8495F37D6245AD0CFA1F60B /* AppLockTests.swift */; };
 		05FF0CD80EDAB3A7C0D4700A /* InfoPlistReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A580295A56B55A856CC4084 /* InfoPlistReader.swift */; };
 		0638CBDE3098B1C3F23AFCFA /* MXLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 111B698739E3410E2CDB7144 /* MXLog.swift */; };
+		065EAB39F3F3AB4F6BD2A362 /* AppLockSetupTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DD166C3625EE426203FA29 /* AppLockSetupTests.swift */; };
 		066A1E9B94723EE9F3038044 /* Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EBB5D698CE9A25BB553A2D /* Strings.swift */; };
 		06B31F84CE52A7A7C271267C /* SecureBackupRecoveryKeyScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FF08D0BD7D0B4B6877AB7D /* SecureBackupRecoveryKeyScreenViewModelTests.swift */; };
 		06B55882911B4BF5B14E9851 /* URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 227AC5D71A4CE43512062243 /* URL.swift */; };
@@ -83,7 +84,6 @@
 		0C797CD650DFD2876BEC5173 /* CollapsibleReactionLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F7C6DDBB5D12F6EF6A3D6E1 /* CollapsibleReactionLayout.swift */; };
 		0C88044649BAEE6C49BFC43A /* SecureBackupControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C21A715237F2B6D6E80998C /* SecureBackupControllerProtocol.swift */; };
 		0C932A5158C1D0604DFC5750 /* ComposerToolbarViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA29952595B804DA221A0C1D /* ComposerToolbarViewModelTests.swift */; };
-		0CF81807BE5FBFC9E2BBCECF /* PollFormScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3368395F06AA180138E185B6 /* PollFormScreenUITests.swift */; };
 		0D4EB2ABAA5FE8CB10FDBCB8 /* TimelineItemFactoryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AA3AF94A06D319BB37E52DA /* TimelineItemFactoryTests.swift */; };
 		0D617A152D099D94271D3BA8 /* SecurityAndPrivacyScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = D046ABB22E680F7C5054441B /* SecurityAndPrivacyScreenViewModelProtocol.swift */; };
 		0DC815CA24E1BD7F408F37D3 /* CollapsibleTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7C4EA55DA62F9D0F984A2AE /* CollapsibleTimelineItem.swift */; };
@@ -182,7 +182,6 @@
 		22882C710BC99EC34A5024A0 /* UITestsScreenIdentifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CEBE5EA91E8691EDF364EC2 /* UITestsScreenIdentifier.swift */; };
 		22B380C579C148BA0BFB5952 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3557ACB95D0F666EF5AF0CE /* Secrets.swift */; };
 		22C5483D01EEB290B8339817 /* HomeScreenInviteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8FC33C3F6BF597E095CE9FA /* HomeScreenInviteCell.swift */; };
-		230981086F0199F913434D6B /* EncryptionSettingsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BF8E5D4C95974B96A18C80E /* EncryptionSettingsUITests.swift */; };
 		2335D1AB954C151FD8779F45 /* RoomPermissionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0096BC5DA86AF6B6E5742AC /* RoomPermissionsTests.swift */; };
 		23701DE32ACD6FD40AA992C3 /* MediaUploadingPreprocessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AE203026B9AD3DB412439866 /* MediaUploadingPreprocessorTests.swift */; };
 		237FC70AA257B935F53316BA /* SessionVerificationControllerProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C55D7E514F9DE4E3D72FDCAD /* SessionVerificationControllerProxy.swift */; };
@@ -211,6 +210,7 @@
 		27FEF0F40750465195C9D6D6 /* RoomSelectionScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B9D191A81FFB0C72CE73E77 /* RoomSelectionScreenModels.swift */; };
 		281BED345D59A9A6A99E9D98 /* UNNotificationContent.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE148A4FFEE853C5A281500C /* UNNotificationContent.swift */; };
 		2835FD52F3F618D07F799B3D /* Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7310D8DFE01AF45F0689C3AA /* Publisher.swift */; };
+		28AB1614E749D1147A2AC6C2 /* CreateRoomScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2214C32EA81FA9168D923D4C /* CreateRoomScreenTests.swift */; };
 		290FDB0FFDC2F1DDF660343E /* TestMeasurementParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C4048041C1A6B20CB97FD18 /* TestMeasurementParser.swift */; };
 		292827744227DF61C930BDDB /* CreateRoomScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB0D6CB491777E7FC6B5BA12 /* CreateRoomScreen.swift */; };
 		29491EE7AE37E239E839C5A3 /* LocationSharingScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BEBF0E59F25E842EDB6FD11 /* LocationSharingScreenModels.swift */; };
@@ -218,7 +218,6 @@
 		298F9EC30E918F12AB7F1EE8 /* TypingIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81F0325E252B057FAEEE1B2D /* TypingIndicatorView.swift */; };
 		29EE1791E0AFA1ABB7F23D2F /* SwiftState in Frameworks */ = {isa = PBXBuildFile; productRef = 3853B78FB8531B83936C5DA6 /* SwiftState */; };
 		2A56B00B070F83E0FE571193 /* TimelineMediaPreviewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B18A454132A5A5247802821E /* TimelineMediaPreviewDataSource.swift */; };
-		2A864BB12A8501B47805D828 /* AuthenticationFlowCoordinatorUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 295E28C3B9EAADF519BF2F44 /* AuthenticationFlowCoordinatorUITests.swift */; };
 		2AAB2A77F1762A2648078A30 /* InteractiveQuickLook.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A81B97D51591D0FCFA598 /* InteractiveQuickLook.swift */; };
 		2AB9D4146C8748CF1D007B67 /* test_pdf.pdf in Resources */ = {isa = PBXBuildFile; fileRef = BE98688578F8B0541D853695 /* test_pdf.pdf */; };
 		2AED12987603157C32C2114D /* TimelineBubbleLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5D8FEB1FED10E995CB002F7 /* TimelineBubbleLayout.swift */; };
@@ -243,7 +242,6 @@
 		2E43A3D221BE9587BC19C3F1 /* MatrixEntityRegexTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F31F59030205A6F65B057E1A /* MatrixEntityRegexTests.swift */; };
 		2E8C6672D0EE7D5B1BEDB8E2 /* ServerConfirmationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7478623CECC9438014244BA /* ServerConfirmationScreen.swift */; };
 		2F09DF0CB213CAE86A3E3B67 /* EventTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B10423B9102086A2D9BFCBA /* EventTimelineItem.swift */; };
-		2F1CF90A3460C153154427F0 /* RoomScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 086B997409328F091EBA43CE /* RoomScreenUITests.swift */; };
 		2F2906AE9BC3D0E79A6F98F8 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E89E530A8E92EC44301CA1 /* Bundle.swift */; };
 		2F6207CB5C4715FE313B1E95 /* TimelineViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6509708F54FC883604DFDC95 /* TimelineViewModelTests.swift */; };
 		2F623DA1122140A987B34D08 /* NotificationSettingsEditScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA7BB497B2F539C17E88F6B7 /* NotificationSettingsEditScreenViewModelProtocol.swift */; };
@@ -339,10 +337,8 @@
 		43F06DF42EC00B3CE2B020A4 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC3F82523D6F48B926D6AF68 /* AppSettings.swift */; };
 		43F35A7E5703D64DB0519C59 /* ServerSelectionScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD469F7513574341181F7EAA /* ServerSelectionScreen.swift */; };
 		440123E29E2F9B001A775BBE /* TimelineItemProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D505843AB66822EB91F0DF0 /* TimelineItemProxy.swift */; };
-		44121202B4A260C98BF615A7 /* RoomMembersListScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5B7A755E985FA14469E86B2 /* RoomMembersListScreenUITests.swift */; };
 		446BCD2D0AE27E0CFD1BDC8F /* ImageMediaEventsTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FF584D757E768EA7776A532 /* ImageMediaEventsTimelineView.swift */; };
 		44BDD670FF9095ACE240A3A2 /* VoiceMessageMediaManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC4F10BDD56FA77FEC742333 /* VoiceMessageMediaManagerTests.swift */; };
-		44DA28B1E1F9C97C5795F7B3 /* AppLockSetupUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8A1BBEF7318CA6B6ACCF4AE /* AppLockSetupUITests.swift */; };
 		44F0E1B576C7599DF8022071 /* WysiwygComposer in Frameworks */ = {isa = PBXBuildFile; productRef = CA07D57389DACE18AEB6A5E2 /* WysiwygComposer */; };
 		454311EAC17D778E19F46592 /* NotificationPermissionsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91868EB98818044E6FEBE532 /* NotificationPermissionsScreenCoordinator.swift */; };
 		454F8DDC4442C0DE54094902 /* LABiometryType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3F219838588C62198E726E3 /* LABiometryType.swift */; };
@@ -485,7 +481,6 @@
 		601AB75BD52B0B4276CEB84A /* SessionVerificationScreenStateMachine.swift in Sources */ = {isa = PBXBuildFile; fileRef = 161CD412E75F4086F422AE39 /* SessionVerificationScreenStateMachine.swift */; };
 		60ED66E63A169E47489348A8 /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 886A0A498FA01E8EDD451D05 /* Sentry */; };
 		611BEE29B8B622204E1E6B04 /* SecurityAndPrivacyScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97F2F6B6E56055EF173A2DD3 /* SecurityAndPrivacyScreenCoordinator.swift */; };
-		6146996D5C4DDD5DA816FC87 /* ElementTextFieldStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCACD75595C40EACD6AD4A74 /* ElementTextFieldStyle.swift */; };
 		617624A97BDBB75ED3DD8156 /* RoomScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A00C7A331B72C0F05C00392F /* RoomScreenViewModelProtocol.swift */; };
 		6189B4ABD535CE526FA1107B /* StartChatViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DF438EAFC732D2D95D34BF6 /* StartChatViewModelTests.swift */; };
 		61941DEE5F3834765770BE01 /* InviteUsersScreenSelectedItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10F32E0B4B83D2A11EE8D011 /* InviteUsersScreenSelectedItem.swift */; };
@@ -598,14 +593,12 @@
 		7691233E3572A9173FD96CB3 /* SecureBackupKeyBackupScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E88534A39781D76487D59DF /* SecureBackupKeyBackupScreenViewModelTests.swift */; };
 		76C874243A8C440D6CF7B344 /* ProcessInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 077B01C13BBA2996272C5FB5 /* ProcessInfo.swift */; };
 		7708976CEE6AFB5CFAEFBA68 /* PillTextAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9CF1EE0AA78470C674554262 /* PillTextAttachment.swift */; };
-		7756C4E90CABE6F14F7920A0 /* BugReportUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6FEA87EA3752203065ECE27 /* BugReportUITests.swift */; };
 		77574A519A4E484880053EAD /* IdentityConfirmationScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7FDF541AE914059942B575B4 /* IdentityConfirmationScreenModels.swift */; };
 		77693820498ABF3508814D49 /* AppLockServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD97F9661ABF08CE002054A2 /* AppLockServiceTests.swift */; };
 		77920AFA8091AC6B9F190C90 /* Signposter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752A0EB49BF5BCEA37EDF7A3 /* Signposter.swift */; };
 		77BB228AEA861E50FFD6A228 /* HomeScreenEmptyStateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0FEA560929DD73FFEF8C3DF /* HomeScreenEmptyStateView.swift */; };
 		77C1A2F49CD90D3EFDF376E5 /* MapTilerURLBuildersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 376D941BF8BB294389C0DE24 /* MapTilerURLBuildersTests.swift */; };
 		77E33FF0E4A50B555BF3A8AA /* AudioFileEventsTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC9044BE0E4A66F5B963E834 /* AudioFileEventsTimelineView.swift */; };
-		77FACC29F98FE2E65BBB6A5F /* ServerSelectionUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 054F469E433864CC6FE6EE8E /* ServerSelectionUITests.swift */; };
 		77FB08C303F4C74C0E8577E2 /* TimelineMediaPreviewModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A2BB38DF61F5100B8723112 /* TimelineMediaPreviewModels.swift */; };
 		7807B1DEE32617896886A8E5 /* FormattingToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE1E6FAA3719E9B7A2D5510B /* FormattingToolbar.swift */; };
 		784592335560C2E91D32D177 /* DeveloperOptionsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 06B098A612DCB5A7358EECD5 /* DeveloperOptionsScreenModels.swift */; };
@@ -726,6 +719,7 @@
 		8C91D242BEEC657FABCC0B95 /* BlockedUsersScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8642512079EEFD622E3AA66B /* BlockedUsersScreenModels.swift */; };
 		8CC12086CBF91A7E10CDC205 /* HomeScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D653265D006E708E4E51AD64 /* HomeScreenCoordinator.swift */; };
 		8CFDA5F1562479CB3A34D277 /* RedactedRoomTimelineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91C8BD78F7B9247AC57FA1A3 /* RedactedRoomTimelineView.swift */; };
+		8D24671992A1C1753B211221 /* EncryptionResetTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89BB11A792EF6F70B95B467E /* EncryptionResetTests.swift */; };
 		8D3E1FADD78E72504DE0E402 /* UserAgentBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB3B237387B8288A5A938F1B /* UserAgentBuilderTests.swift */; };
 		8D71E5E53F372202379BECCE /* BugReportScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 303FCADE77DF1F3670C086ED /* BugReportScreenViewModel.swift */; };
 		8DC176CC5ABA24138EB443DD /* RoomMemberDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = C55679AF67545EF8087E47BE /* RoomMemberDetails.swift */; };
@@ -762,6 +756,7 @@
 		94A65DD8A353DF112EBEF67A /* SessionVerificationControllerProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D56469A9EE0CFA2B7BA9760 /* SessionVerificationControllerProxyProtocol.swift */; };
 		94D0F36A87E596A93C0C178A /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B6E89E530A8E92EC44301CA1 /* Bundle.swift */; };
 		94E15D018D70563FA4AB4E5A /* ComposerToolbarModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D3A7375AB22721C436EB056 /* ComposerToolbarModels.swift */; };
+		94EB81606839C175CA6C2ADB /* RoomScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97A4E73EA97CA08D2BB9806 /* RoomScreenTests.swift */; };
 		94F0B78928E952689ACDB271 /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D67E616BCA82D8A1258D488 /* NetworkMonitor.swift */; };
 		95690DDD9D547D3D842ACBE3 /* AnalyticsSettingsScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BD371B60E07A5324B9507EF /* AnalyticsSettingsScreenCoordinator.swift */; };
 		9586E90A447C4896C0CA3A8E /* TimelineItemReplyDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE89A8BD65CCE3FCC925CA14 /* TimelineItemReplyDetails.swift */; };
@@ -806,9 +801,9 @@
 		9E838A62918E47BC72D6640D /* UserIndicatorPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AB54B4F94686CCF0289B72F /* UserIndicatorPresenter.swift */; };
 		9EBDC79CAC9B63A0D626E333 /* LegalInformationScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EB2CAA266B921D128C35710 /* LegalInformationScreenCoordinator.swift */; };
 		9EE71509E6E7519A2B2388B3 /* KnockRequestsListScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BD9C9A31D9AB3B6D8128E69 /* KnockRequestsListScreenModels.swift */; };
+		9EF72884B74BC39B01640098 /* BugReportTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27DF257F5D968E5DD719583C /* BugReportTests.swift */; };
 		9F11B9F347F9E2D236799FB3 /* ElementCallServiceConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 406C90AF8C3E98DF5D4E5430 /* ElementCallServiceConstants.swift */; };
 		9F11E743EA01482E78A438B0 /* GlobalSearchScreenCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22DB19219E6CC4D002E15D48 /* GlobalSearchScreenCell.swift */; };
-		9F19096BFA629C0AC282B1E4 /* CreateRoomScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8CEB4634C0DD7779C4AB504 /* CreateRoomScreenUITests.swift */; };
 		9FB41B0E8B2AA9B404E52C8B /* AppLockSetupBiometricsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CCC6C31102E1D8B9106DEDE /* AppLockSetupBiometricsScreenViewModelProtocol.swift */; };
 		9FBE1FB20171012260A32492 /* TimelineSenderAvatarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D53FCCE44F96E0BC411A6CF0 /* TimelineSenderAvatarView.swift */; };
 		9FC820C410ED733CE6FC6616 /* WebRegistrationScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6702BC84D3CC2421D78CD4E /* WebRegistrationScreenViewModel.swift */; };
@@ -858,12 +853,13 @@
 		A722F426FD81FC67706BB1E0 /* CustomLayoutLabelStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42236480CF0431535EBE8387 /* CustomLayoutLabelStyle.swift */; };
 		A74438ED16F8683A4B793E6A /* AnalyticsSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BCE3FAF40932AC7C7639AC4 /* AnalyticsSettingsScreenViewModel.swift */; };
 		A7D48E44D485B143AADDB77D /* Strings+Untranslated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A18F6CE4D694D21E4EA9B25 /* Strings+Untranslated.swift */; };
-		A7F55DC52D6F5CEC00CE60E9 /* JoinRoomByAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F55DC42D6F5CCF00CE60E9 /* JoinRoomByAddressView.swift */; };
 		A808DC3F72D15C6C5A52317E /* TimelineItemDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCDA016D05107DED3B9495CB /* TimelineItemDebugView.swift */; };
 		A816F7087C495D85048AC50E /* RoomMemberDetailsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B6E30BB748F3F480F077969 /* RoomMemberDetailsScreenModels.swift */; };
 		A851635B3255C6DC07034A12 /* RoomScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8108C8F0ACF6A7EB72D0117 /* RoomScreenCoordinator.swift */; };
+		A87DC550659C5176AC1829DE /* ElementTextFieldStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */; };
 		A8FA7671948E3DF27F320026 /* BugReportFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7367B3B9A8CAF902220F31D1 /* BugReportFlowCoordinator.swift */; };
 		A93661C962B12942C08864B6 /* SwiftOGG in Frameworks */ = {isa = PBXBuildFile; productRef = 391D11F92DFC91666AA1503F /* SwiftOGG */; };
+		A950C95855C474F75B30CA7B /* PollFormScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCDAB580109C09A6AA97AF7E /* PollFormScreenTests.swift */; };
 		A969147E0EEE0E27EE226570 /* MediaUploadPreviewScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F29139BC2A804CE5E0757E /* MediaUploadPreviewScreenViewModel.swift */; };
 		A975D60EA49F6AF73308809F /* RoomMembersListScreenMemberCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC03209FDE8CE0810617BFFF /* RoomMembersListScreenMemberCell.swift */; };
 		A9A5801D5EE3D4D91F6DDADB /* AnalyticsSettingsScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 58C2527813FDAE23E72A9063 /* AnalyticsSettingsScreenViewModelTests.swift */; };
@@ -914,6 +910,7 @@
 		B5479997ECC516C121E6625E /* LocationMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFECCE59967018204876D0A5 /* LocationMarkerView.swift */; };
 		B5618E3C948584E5C1F67033 /* DTHTMLElement+AttributedStringBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E508AB0EDEE017FF4F6F8D1 /* DTHTMLElement+AttributedStringBuilder.swift */; };
 		B5899F18AD6C56CE08FE532B /* RoomSummaryProviderMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC83F47D2173B7538AA72E0E /* RoomSummaryProviderMock.swift */; };
+		B5BCE012F9E7C45D1C76108E /* RoomMembersListScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2520C4F33AA0C061D209C28 /* RoomMembersListScreenTests.swift */; };
 		B5E455C9689EA600EDB3E9E0 /* NavigationRootCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA28F29C9F93E93CC3C2C715 /* NavigationRootCoordinator.swift */; };
 		B6048166B4AA4CEFEA9B77A6 /* InfoPlistReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A580295A56B55A856CC4084 /* InfoPlistReader.swift */; };
 		B6064D82FCDCB829601C1F59 /* SecureBackupLogoutConfirmationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37FEE10AB666891E6A675E5E /* SecureBackupLogoutConfirmationScreen.swift */; };
@@ -931,6 +928,7 @@
 		B855AF29D7D8FC8DAAA73D4A /* test_voice_message.m4a in Resources */ = {isa = PBXBuildFile; fileRef = DCA2D836BD10303F37FAAEED /* test_voice_message.m4a */; };
 		B879446FD8E65A711EF8F9F7 /* AdvancedSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */; };
 		B89990DD875B0B603D4D4332 /* NotificationItemProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B927CF5EF7FCCDA5EDC474B /* NotificationItemProxyProtocol.swift */; };
+		B8D9960F77B213FD1B0B0FD3 /* JoinRoomByAddressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A13364350970987B93F6018 /* JoinRoomByAddressView.swift */; };
 		B8EC8A544162B0A41B9AB339 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC3F82523D6F48B926D6AF68 /* AppSettings.swift */; };
 		B93D7CE520088AD53FA6D53C /* SettingsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9B663BE498BB39EADC24025D /* SettingsScreenModels.swift */; };
 		B93FA0DA1504B301CAEE141B /* NotificationSettingsProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E6F5D66F158A6662F953733E /* NotificationSettingsProxy.swift */; };
@@ -942,7 +940,6 @@
 		BA43D782BE85C7F5F20C624A /* AttributedStringBuilderProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72F37B5DA798C9AE436F2C2C /* AttributedStringBuilderProtocol.swift */; };
 		BA48D6AFF6421D199148C0A1 /* KnockRequestsListScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9AC2CC94FA06F728883B694 /* KnockRequestsListScreenViewModelTests.swift */; };
 		BA4C9049BC96DED3A2F3B82E /* RoomNotificationSettingsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03DD998E523D4EC93C7ED703 /* RoomNotificationSettingsScreenViewModelProtocol.swift */; };
-		BAC845780F17CCFBC5A9CA37 /* AppLockUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F733F135E6D67BBBEB76CC30 /* AppLockUITests.swift */; };
 		BB04B1D8E7401C90506D401E /* QRCodeLoginServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 536C0E2178949B290776EA4E /* QRCodeLoginServiceProtocol.swift */; };
 		BB6BF528BC7F5B87E08C4F18 /* CameraPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8A3B7637DDBD6AA97AC2545 /* CameraPicker.swift */; };
 		BB784A02BADB03C820617A46 /* TextRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90A55430639712CFACA34F43 /* TextRoomTimelineItem.swift */; };
@@ -982,7 +979,6 @@
 		C405528EB4BBEA93579050EE /* VoiceMessageRecordingButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46A2AD86F7E618F468F6FAF5 /* VoiceMessageRecordingButton.swift */; };
 		C4078364FD9FA00EA9D00A15 /* RoomMembersListScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45CDF9A107BFE6C79B58D6B5 /* RoomMembersListScreenViewModelProtocol.swift */; };
 		C413D36D44F89DE63D3ADFA4 /* ReportContentScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = A433BE28B40D418237BE37B5 /* ReportContentScreen.swift */; };
-		C4180F418235DAD9DD173951 /* TemplateScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9873076F224E4CE09D8BD47D /* TemplateScreenUITests.swift */; };
 		C49FCC766673006B6D299F1C /* RoomDetailsEditScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DF8F7A3AD83D04C08D75E01 /* RoomDetailsEditScreenViewModelProtocol.swift */; };
 		C4D2BCAA54E2C62B94B24AF4 /* InviteUsersScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2E9B841EE4878283ECDB554 /* InviteUsersScreen.swift */; };
 		C4E0D03DF88242697545A9B7 /* UserIndicatorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD1275D9CE0FFBA6E8E85426 /* UserIndicatorController.swift */; };
@@ -1014,14 +1010,13 @@
 		C9C562D85999E436C7265AF1 /* MatrixRustSDK in Embed Frameworks */ = {isa = PBXBuildFile; productRef = A678E40E917620059695F067 /* MatrixRustSDK */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		C9F5B48D15B9BCAE1F8D564E /* RoomNotificationModeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1511766C534367700C8DD75 /* RoomNotificationModeProxy.swift */; };
 		CA12AE0DCD57D49CD96C699A /* WaveformCursorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB9EABCA9348DFA27439A809 /* WaveformCursorView.swift */; };
-		CACD1352927336F01FC76612 /* EncryptionResetUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE4C76F31A382B8E4DD07583 /* EncryptionResetUITests.swift */; };
+		CB07184D37D5D65327A5A693 /* AuthenticationFlowCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37F46CC4FD89ECF4CF26391A /* AuthenticationFlowCoordinatorTests.swift */; };
 		CB137BFB3E083C33E398A6CB /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = 020597E28A4BC8E1BE8EDF6E /* KeychainAccess */; };
 		CB498F4E27AA0545DCEF0F6F /* DTCoreText in Frameworks */ = {isa = PBXBuildFile; productRef = 36B7FC232711031AA2B0D188 /* DTCoreText */; };
 		CB6956565D858C523E3E3B16 /* ComposerDraftServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7E37072597F67C4DD8CC2DB /* ComposerDraftServiceProtocol.swift */; };
 		CB6BCBF28E4B76EA08C2926D /* StateRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B16048D30F0438731C41F775 /* StateRoomTimelineItem.swift */; };
 		CB99B0FA38A4AC596F38CC13 /* KeychainControllerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5E94DCFEE803E5ABAE8ACCE /* KeychainControllerProtocol.swift */; };
 		CB9FB2BEF313072C705AC9B5 /* SecurityAndPrivacyScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0315C328FF40F84276364E66 /* SecurityAndPrivacyScreenViewModelTests.swift */; };
-		CBA9EDF305036039166E76FF /* StartChatScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA2AEC1AB349A341FE13DEC1 /* StartChatScreenUITests.swift */; };
 		CBD2ABE4C1A47ECD99E1488E /* NotificationSettingsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 421FA93BCC2840E66E4F306F /* NotificationSettingsScreenViewModelProtocol.swift */; };
 		CC0D088F505F33A20DC5590F /* RoomStateEventStringBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEEAFB646E583655652C3D04 /* RoomStateEventStringBuilderTests.swift */; };
 		CC1C948F67A5510A340FD7F0 /* SessionDirectoriesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0825EAFD47332DD459DE893F /* SessionDirectoriesTests.swift */; };
@@ -1031,6 +1026,7 @@
 		CD6A72B65D3B6076F4045C30 /* PHGPostHogConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6B891A6DA826E2461DBB40F /* PHGPostHogConfiguration.swift */; };
 		CDAE3A37D4DF136F9D07DB61 /* RoomChangeRolesScreenSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF710CB1C31F8938EAA3A7D /* RoomChangeRolesScreenSection.swift */; };
 		CDCA8A559E098503DDE29477 /* AttributedStringBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5C6FBF97B6EED3D4FA5EFF /* AttributedStringBuilder.swift */; };
+		CDE21091BB1272C088509F59 /* TemplateScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B287771477D9A0D94AAC1CE /* TemplateScreenTests.swift */; };
 		CE1694C7BB93C3311524EF28 /* Untranslated.strings in Resources */ = {isa = PBXBuildFile; fileRef = D2F7194F440375338F8E2487 /* Untranslated.strings */; };
 		CE3B7FC34FB2C279AAA5EA01 /* AVMetadataMachineReadableCodeObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3339B1DDB1341E833D2555BC /* AVMetadataMachineReadableCodeObject.swift */; };
 		CE6F237360875D3D573FD0B2 /* RoomNotificationSettingsProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD6B522BD637845AB9570B10 /* RoomNotificationSettingsProxy.swift */; };
@@ -1054,7 +1050,6 @@
 		D2466C6BC8CAD8FADD7BF89B /* RoomPreviewProxyMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6695C64F066628411EAD21E9 /* RoomPreviewProxyMock.swift */; };
 		D26093BB80B69092B0E9AC7C /* PinnedItemsIndicatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E66763BD54A3A1D9C6E6F2F1 /* PinnedItemsIndicatorView.swift */; };
 		D2825E013A8ECFB66D9A1DE6 /* RoomChangeRolesScreenViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8F841F219ACDFC1D3F42FEFB /* RoomChangeRolesScreenViewModelTests.swift */; };
-		D29E046C1E3045E0346C479D /* RoomRolesAndPermissionsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45571C2EBD98ED7E0CEA7AF7 /* RoomRolesAndPermissionsUITests.swift */; };
 		D2D70B5DB1A5E4AF0CD88330 /* target.yml in Resources */ = {isa = PBXBuildFile; fileRef = 033DB41C51865A2E83174E87 /* target.yml */; };
 		D31B34B3902BC597593F3ABB /* preview_image.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 200626E8353AB2729444F991 /* preview_image.jpg */; };
 		D33AC79A50DFC26D2498DD28 /* FileRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5098DA7799946A61E34A2373 /* FileRoomTimelineItem.swift */; };
@@ -1068,6 +1063,7 @@
 		D55AF9B5B55FEED04771A461 /* RoomFlowCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A008E57D52B07B78DFAD1BB /* RoomFlowCoordinator.swift */; };
 		D5681C80D8281560AACE0035 /* Label.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045253F9967A535EE5B16691 /* Label.swift */; };
 		D5B1531A72387D432939D4E0 /* RoomDirectorySearchProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0516C69708D5CBDE1A8E77EC /* RoomDirectorySearchProxyProtocol.swift */; };
+		D5C2DA52162A978743A183F2 /* SessionVerificationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8AA084E10B80D64449C02A9 /* SessionVerificationTests.swift */; };
 		D5E771132BB36240DE38102F /* RoomMessageEventStringBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E815FF3CC5E5A355E3A25E /* RoomMessageEventStringBuilder.swift */; };
 		D5E8EE8A288EFCCF646860EA /* KnockRequestsBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47F441A78A5CAA9E2937E463 /* KnockRequestsBannerView.swift */; };
 		D5FE90A6AF5FD5AE91BD37C7 /* NotificationSettingsEditScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780258F1B9D15E30549FF4BE /* NotificationSettingsEditScreenViewModel.swift */; };
@@ -1088,6 +1084,7 @@
 		DAF63A9CF9932CA8F6830F11 /* ShareExtensionModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAC01A97A43BE07B9E94E43 /* ShareExtensionModels.swift */; };
 		DB079D1929B5A5F52D207C83 /* RoomDetailsScreenModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = 466C71A0FED9BFF287613C82 /* RoomDetailsScreenModels.swift */; };
 		DB65401349C143DFF883E2B0 /* AnalyticsPromptScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C8EC6EA7EDFCE46710DA306 /* AnalyticsPromptScreenViewModel.swift */; };
+		DBC3FDE1540B39702A117D8E /* RoomRolesAndPermissionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44DDC82DB6A84E700CD5DEC0 /* RoomRolesAndPermissionsTests.swift */; };
 		DBC8D1DBFE9F9CA7662BC8AA /* RoomPermissions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 974AEAF3FE0C577A6C04AD6E /* RoomPermissions.swift */; };
 		DC08ADC41E792086A340A8B3 /* AccessibilityIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BB8DDE245ED86C489BA983 /* AccessibilityIdentifiers.swift */; };
 		DC68E866D6E664B0D2B06E74 /* MockImageCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC1DA29A5A041CC0BACA7CB0 /* MockImageCache.swift */; };
@@ -1134,6 +1131,7 @@
 		E4F924DECC66389C1C810550 /* AuthenticationStartScreenBackgroundImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50D685B4DB38BB5BD87C956A /* AuthenticationStartScreenBackgroundImage.swift */; };
 		E58F1F3276E98A93F7D39219 /* RoomPollsHistoryScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1D8479BB704B7EF696F8ABE /* RoomPollsHistoryScreenCoordinator.swift */; };
 		E5AB28123E2488F97E953AC0 /* CallNotificationRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1ED17433ADC77287F8904F9 /* CallNotificationRoomTimelineItem.swift */; };
+		E5E43A0CA99AF5BA11B194A2 /* EncryptionSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57AD14D3ADADE8F6A10F9E88 /* EncryptionSettingsTests.swift */; };
 		E5F4C992845388B50BABACAA /* ServerSelectionScreenCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB8BC4C791D0E88CFCF4E5DF /* ServerSelectionScreenCoordinator.swift */; };
 		E67418DACEDBC29E988E6ACD /* message.caf in Resources */ = {isa = PBXBuildFile; fileRef = ED482057AE39D5C6D9C5F3D8 /* message.caf */; };
 		E6FA87F773424B27614B23E9 /* TimelineItemAccessibilityModifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1DA7E93C2E148B96EF6A8500 /* TimelineItemAccessibilityModifier.swift */; };
@@ -1150,6 +1148,7 @@
 		E9347F56CF0683208F4D9249 /* RoomNotificationSettingsScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A9B5225D0881CEFA2CF7C9 /* RoomNotificationSettingsScreenViewModel.swift */; };
 		E9560744F7B0292E20ECE5F2 /* RoomDetailsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E8A1E8EE094F570573B6E8 /* RoomDetailsScreenViewModelProtocol.swift */; };
 		E96005321849DBD7C72A28F2 /* UITestsAppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46C208DA43CE25D13E670F40 /* UITestsAppCoordinator.swift */; };
+		E9985DCD1B0D026D7E8BF809 /* ServerSelectionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6640DB5B9171D163E6742639 /* ServerSelectionTests.swift */; };
 		E9D2ED1C4186931E3D5FDA4E /* QRCodeLoginScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 718D8767035D37E2DB5CC550 /* QRCodeLoginScreenViewModelProtocol.swift */; };
 		EA01A06EEDFEF4AE7652E5F3 /* NSRegularExpresion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95BAC0F6C9644336E9567EE6 /* NSRegularExpresion.swift */; };
 		EA6613B29BA671F39CE1B1D2 /* ConfirmationDialog.swift in Sources */ = {isa = PBXBuildFile; fileRef = B383DCD3DCB19E00FD478A5F /* ConfirmationDialog.swift */; };
@@ -1234,6 +1233,7 @@
 		F8C87130FD999F7F1076208C /* RoomChangePermissionsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 89AAEA70CFF3284920811941 /* RoomChangePermissionsScreen.swift */; };
 		F8E725D42023ECA091349245 /* AudioRoomTimelineItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57EAAF82432B0B53881CF826 /* AudioRoomTimelineItem.swift */; };
 		F8F47CE757EE656905F01F2C /* RoomRolesAndPermissionsScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90DFF217B3D9D0941283278C /* RoomRolesAndPermissionsScreenViewModelProtocol.swift */; };
+		F9788AE0B9EA19F1190ED14F /* StartChatScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B927A399A5418DA40A5CA15 /* StartChatScreenTests.swift */; };
 		F9842667B68DC6FA1F9ECCBB /* NSItemProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = F72EFC8C634469F9262659C7 /* NSItemProvider.swift */; };
 		F99FB21EFC6D99D247FE7CBE /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = DE8DC9B3FBA402117DC4C49F /* Kingfisher */; };
 		F9EA79092C18A8CFE4922DD2 /* PollFormScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F64A8582F65567AC38C2976A /* PollFormScreenViewModel.swift */; };
@@ -1364,13 +1364,12 @@
 		044E501B8331B339874D1B96 /* CompoundIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompoundIcon.swift; sourceTree = "<group>"; };
 		045253F9967A535EE5B16691 /* Label.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Label.swift; sourceTree = "<group>"; };
 		046C0D3F53B0B5EF0A1F5BEA /* RoomSummaryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryTests.swift; sourceTree = "<group>"; };
-		048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		048A21188AB19349D026BECD /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		04BB8DDE245ED86C489BA983 /* AccessibilityIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityIdentifiers.swift; sourceTree = "<group>"; };
 		04DF593C3F7AF4B2FBAEB05D /* FileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileManager.swift; sourceTree = "<group>"; };
 		0516C69708D5CBDE1A8E77EC /* RoomDirectorySearchProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchProxyProtocol.swift; sourceTree = "<group>"; };
 		052B2F924572AFD70B5F500E /* StartChatScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreenViewModel.swift; sourceTree = "<group>"; };
 		0545AC444BEEA89FF8C509FD /* zh-Hant-TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant-TW"; path = "zh-Hant-TW.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		054F469E433864CC6FE6EE8E /* ServerSelectionUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionUITests.swift; sourceTree = "<group>"; };
 		05512FB13987D221B7205DE0 /* HomeScreenRecoveryKeyConfirmationBanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenRecoveryKeyConfirmationBanner.swift; sourceTree = "<group>"; };
 		0554FEA301486A8CFA475D5A /* AuthenticationClientBuilderFactoryMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationClientBuilderFactoryMock.swift; sourceTree = "<group>"; };
 		05596E4A11A8C9346E9E54AE /* SoftLogoutScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoftLogoutScreenCoordinator.swift; sourceTree = "<group>"; };
@@ -1391,7 +1390,6 @@
 		0825EAFD47332DD459DE893F /* SessionDirectoriesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionDirectoriesTests.swift; sourceTree = "<group>"; };
 		08283301736A6FE9D558B2CB /* AppLockScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		0833F51229E166BCA141D004 /* RoomRolesAndPermissionsFlowCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomRolesAndPermissionsFlowCoordinator.swift; sourceTree = "<group>"; };
-		086B997409328F091EBA43CE /* RoomScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomScreenUITests.swift; sourceTree = "<group>"; };
 		086C19086DD16E9B38E25954 /* ReportContentViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportContentViewModelTests.swift; sourceTree = "<group>"; };
 		099F2D36C141D845A445B1E6 /* EmojiProviderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmojiProviderTests.swift; sourceTree = "<group>"; };
 		0A3E77399BD262D301451BF2 /* RoomDetailsEditScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetailsEditScreenCoordinator.swift; sourceTree = "<group>"; };
@@ -1436,7 +1434,7 @@
 		128501375217576AF0FE3E92 /* RoomAttachmentPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomAttachmentPicker.swift; sourceTree = "<group>"; };
 		12B09A94C519227264A41208 /* RoomMembershipDetailsProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembershipDetailsProxy.swift; sourceTree = "<group>"; };
 		12FD5280AF55AB7F50F8E47D /* preview_avatar_room.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = preview_avatar_room.jpg; sourceTree = "<group>"; };
-		1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = IntegrationTests.xctestplan; sourceTree = "<group>"; };
+		1304D9191300873EADA52D6E /* IntegrationTests.xctestplan */ = {isa = PBXFileReference; path = IntegrationTests.xctestplan; sourceTree = "<group>"; };
 		130ED565A078F7E0B59D9D25 /* UNTextInputNotificationResponse+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNTextInputNotificationResponse+Creator.swift"; sourceTree = "<group>"; };
 		136F80A613B55BDD071DCEA5 /* JoinRoomScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomScreenModels.swift; sourceTree = "<group>"; };
 		13802897C7AFA360EA74C0B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -1460,8 +1458,10 @@
 		18F2958E6D247AE2516BEEE8 /* ClientProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientProxy.swift; sourceTree = "<group>"; };
 		190EC7285D3CFEF0D3011BCF /* GeoURI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoURI.swift; sourceTree = "<group>"; };
 		196004E7695FBA292A7944AF /* ScreenTrackerViewModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenTrackerViewModifier.swift; sourceTree = "<group>"; };
+		19DD166C3625EE426203FA29 /* AppLockSetupTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupTests.swift; sourceTree = "<group>"; };
 		1A02406480C351B8C6E0682C /* MediaLoaderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaLoaderProtocol.swift; sourceTree = "<group>"; };
 		1A1265FAF2C0AF1C30605BE7 /* SessionVerificationRequestDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationRequestDetailsView.swift; sourceTree = "<group>"; };
+		1A13364350970987B93F6018 /* JoinRoomByAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomByAddressView.swift; sourceTree = "<group>"; };
 		1A18F6CE4D694D21E4EA9B25 /* Strings+Untranslated.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Strings+Untranslated.swift"; sourceTree = "<group>"; };
 		1A4D29F2683F5772AC72406F /* MapTilerStaticMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTilerStaticMap.swift; sourceTree = "<group>"; };
 		1A7ED2EF5BDBAD2A7DBC4636 /* GeoURITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoURITests.swift; sourceTree = "<group>"; };
@@ -1511,6 +1511,7 @@
 		218AB05B4E3889731959C5F1 /* EventBasedTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EventBasedTimelineItemProtocol.swift; sourceTree = "<group>"; };
 		21BA866267F84BF4350B0CB7 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "pt-BR"; path = "pt-BR.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
 		21DD8599815136EFF5B73F38 /* UserFlowTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserFlowTests.swift; sourceTree = "<group>"; };
+		2214C32EA81FA9168D923D4C /* CreateRoomScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomScreenTests.swift; sourceTree = "<group>"; };
 		225EFCA26877E75CDFE7F48D /* MapTilerStyleBuilderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTilerStyleBuilderProtocol.swift; sourceTree = "<group>"; };
 		22730A30C50AC2E3D5BA8642 /* InviteUsersScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteUsersScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		227AC5D71A4CE43512062243 /* URL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
@@ -1537,7 +1538,7 @@
 		25F7FE40EF7490A7E09D7BE6 /* NotificationItemProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationItemProxy.swift; sourceTree = "<group>"; };
 		25F8664F1FB95AF3C4202478 /* PollFormScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenCoordinator.swift; sourceTree = "<group>"; };
 		260004737C573A56FA01E86E /* Encodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encodable.swift; sourceTree = "<group>"; };
-		267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = PreviewTests.xctestplan; sourceTree = "<group>"; };
+		267BB1D5B08A9511F894CB57 /* PreviewTests.xctestplan */ = {isa = PBXFileReference; path = PreviewTests.xctestplan; sourceTree = "<group>"; };
 		26B0A96B8FE4849227945067 /* VoiceMessageRecorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorder.swift; sourceTree = "<group>"; };
 		26EAAB54C6CE91D64B69A9F8 /* AppLockServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockServiceProtocol.swift; sourceTree = "<group>"; };
 		2711E5996016ABD6EAAEB58A /* LogLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogLevel.swift; sourceTree = "<group>"; };
@@ -1547,6 +1548,7 @@
 		27A1AD6389A4659AF0CEAE62 /* NotificationServiceExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationServiceExtension.swift; sourceTree = "<group>"; };
 		27A9E3FBE8A66B5A17AD7F74 /* AppRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppRoutes.swift; sourceTree = "<group>"; };
 		27D0EA07BD545CC9F234DB8D /* UserDetailsEditScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDetailsEditScreenModels.swift; sourceTree = "<group>"; };
+		27DF257F5D968E5DD719583C /* BugReportTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportTests.swift; sourceTree = "<group>"; };
 		28146817C61423CACCF942F5 /* CallScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallScreenModels.swift; sourceTree = "<group>"; };
 		283974987DA7EC61D2AB57D9 /* VoiceMessageCacheTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageCacheTests.swift; sourceTree = "<group>"; };
 		284FEEB0789B8894E52A7F34 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -1555,7 +1557,6 @@
 		28C202C1C7E330F124981A31 /* GenericCallLinkWidgetDriver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericCallLinkWidgetDriver.swift; sourceTree = "<group>"; };
 		28EA8BE9EEDBD17555141C7E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = el; path = el.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		2910422CB628D3B2BBE47449 /* SeparatorRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorRoomTimelineView.swift; sourceTree = "<group>"; };
-		295E28C3B9EAADF519BF2F44 /* AuthenticationFlowCoordinatorUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationFlowCoordinatorUITests.swift; sourceTree = "<group>"; };
 		29A953B6C0C431DBF4DD00B4 /* RoomSummary.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummary.swift; sourceTree = "<group>"; };
 		2A2BB38DF61F5100B8723112 /* TimelineMediaPreviewModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineMediaPreviewModels.swift; sourceTree = "<group>"; };
 		2A5C6FBF97B6EED3D4FA5EFF /* AttributedStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringBuilder.swift; sourceTree = "<group>"; };
@@ -1599,7 +1600,6 @@
 		33035418BB35754232985871 /* TimelineReadReceiptsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineReadReceiptsView.swift; sourceTree = "<group>"; };
 		330AF4D121C3396F7A14B21D /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/SAS.strings; sourceTree = "<group>"; };
 		3339B1DDB1341E833D2555BC /* AVMetadataMachineReadableCodeObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVMetadataMachineReadableCodeObject.swift; sourceTree = "<group>"; };
-		3368395F06AA180138E185B6 /* PollFormScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenUITests.swift; sourceTree = "<group>"; };
 		33AE897D86784CCA5E4E9227 /* ElementCallService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementCallService.swift; sourceTree = "<group>"; };
 		33E49C5C6F802B4D94CA78D1 /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = "<group>"; };
 		340179A0FC1AD4AEDA7FC134 /* CreateRoomViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -1611,12 +1611,13 @@
 		3558A15CFB934F9229301527 /* RestorationToken.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RestorationToken.swift; sourceTree = "<group>"; };
 		35AFCF4C05DEED04E3DB1A16 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		35FA991289149D31F4286747 /* UserPreference.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserPreference.swift; sourceTree = "<group>"; };
-		36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
+		36DA824791172B9821EACBED /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		36FD673E24FBFCFDF398716A /* RoomMemberProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMemberProxyMock.swift; sourceTree = "<group>"; };
 		371B248460BD1A3F20318137 /* TimelineProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineProvider.swift; sourceTree = "<group>"; };
 		376D941BF8BB294389C0DE24 /* MapTilerURLBuildersTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTilerURLBuildersTests.swift; sourceTree = "<group>"; };
 		37A63A59BFDDC494B1C20119 /* CallScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallScreenViewModel.swift; sourceTree = "<group>"; };
 		37CA26F55123E36B50DB0B3A /* AttributedStringTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttributedStringTests.swift; sourceTree = "<group>"; };
+		37F46CC4FD89ECF4CF26391A /* AuthenticationFlowCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationFlowCoordinatorTests.swift; sourceTree = "<group>"; };
 		37FEE10AB666891E6A675E5E /* SecureBackupLogoutConfirmationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupLogoutConfirmationScreen.swift; sourceTree = "<group>"; };
 		382B50F7E379B3DBBD174364 /* NotificationSettingsProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsProxyMock.swift; sourceTree = "<group>"; };
 		38345442415E07A931197C55 /* AppLockScreenPINKeypad.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockScreenPINKeypad.swift; sourceTree = "<group>"; };
@@ -1630,10 +1631,10 @@
 		3A21027F05874B1BCC3E452B /* InvitedRoomProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvitedRoomProxyMock.swift; sourceTree = "<group>"; };
 		3AD253E7EFF88F308D644272 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/SAS.strings"; sourceTree = "<group>"; };
 		3B5E97E9615A158C76B2AB77 /* DateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateTests.swift; sourceTree = "<group>"; };
+		3B927A399A5418DA40A5CA15 /* StartChatScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreenTests.swift; sourceTree = "<group>"; };
 		3BAC027034248429A438886B /* AppMediatorMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMediatorMock.swift; sourceTree = "<group>"; };
 		3BC1B7CB061C9865B2B91B56 /* QRCodeLoginScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeLoginScreenViewModel.swift; sourceTree = "<group>"; };
 		3BDCCD2F6B405C14B9BCE94E /* JoinRoomScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomScreenCoordinator.swift; sourceTree = "<group>"; };
-		3BF8E5D4C95974B96A18C80E /* EncryptionSettingsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionSettingsUITests.swift; sourceTree = "<group>"; };
 		3C368CAB3063EF275357ECD4 /* LoginScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginScreenViewModel.swift; sourceTree = "<group>"; };
 		3C3ADF21BE301D0DA48F2A7E /* ShareExtensionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionView.swift; sourceTree = "<group>"; };
 		3C3E67E09FE5A35D73818C39 /* AppLockScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockScreenModels.swift; sourceTree = "<group>"; };
@@ -1683,12 +1684,12 @@
 		44ABA63DBE7F76C58260B43B /* EmoteRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineView.swift; sourceTree = "<group>"; };
 		44B71F6D9062E8EB8929BB97 /* KnockRequestCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KnockRequestCell.swift; sourceTree = "<group>"; };
 		44C314C00533E2C297796B60 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		44DDC82DB6A84E700CD5DEC0 /* RoomRolesAndPermissionsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomRolesAndPermissionsTests.swift; sourceTree = "<group>"; };
 		44ECC9D66400727DFFEE12E8 /* TimelineStartRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStartRoomTimelineView.swift; sourceTree = "<group>"; };
 		450E04B2A976CC4C8CC1807C /* EmoteRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItem.swift; sourceTree = "<group>"; };
 		4525E8C0FBDD27D1ACE90952 /* SecureBackupKeyBackupScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupKeyBackupScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		4549FCB53F43DB0B278374BC /* TemplateScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateScreen.swift; sourceTree = "<group>"; };
 		4552D3466B1453F287223ADA /* SwipeRightAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeRightAction.swift; sourceTree = "<group>"; };
-		45571C2EBD98ED7E0CEA7AF7 /* RoomRolesAndPermissionsUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomRolesAndPermissionsUITests.swift; sourceTree = "<group>"; };
 		45A4B934BA41D6C255900265 /* preview_video.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = preview_video.jpg; sourceTree = "<group>"; };
 		45CDF9A107BFE6C79B58D6B5 /* RoomMembersListScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		45D8149FDDA0315CDC553B4B /* UserNotificationCenterProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserNotificationCenterProtocol.swift; sourceTree = "<group>"; };
@@ -1774,6 +1775,7 @@
 		57084488B03BDB33C7B7CA0E /* ResolveVerifiedUserSendFailureScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolveVerifiedUserSendFailureScreenViewModelTests.swift; sourceTree = "<group>"; };
 		574CB70E82D7EAEA538E4135 /* ResolveVerifiedUserSendFailureScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolveVerifiedUserSendFailureScreenViewModel.swift; sourceTree = "<group>"; };
 		57916A1578D8043BB0795441 /* GeneratedMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneratedMocks.swift; sourceTree = "<group>"; };
+		57AD14D3ADADE8F6A10F9E88 /* EncryptionSettingsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionSettingsTests.swift; sourceTree = "<group>"; };
 		57B6B383F1FD04CC0E7B60C6 /* AnalyticsConsentState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsConsentState.swift; sourceTree = "<group>"; };
 		57EAAF82432B0B53881CF826 /* AudioRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRoomTimelineItem.swift; sourceTree = "<group>"; };
 		57F95CADD0A5DBD76B990FCB /* ServiceLocator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServiceLocator.swift; sourceTree = "<group>"; };
@@ -1830,6 +1832,7 @@
 		653610CB5F9776EAAAB98155 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		6569593FA36B22259E806A67 /* AudioRecorderState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRecorderState.swift; sourceTree = "<group>"; };
 		65AAD845E53B0C8B5E0812C2 /* UserDiscoveryService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoveryService.swift; sourceTree = "<group>"; };
+		6640DB5B9171D163E6742639 /* ServerSelectionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionTests.swift; sourceTree = "<group>"; };
 		664ABD745A746C45CB842158 /* CallInviteRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallInviteRoomTimelineView.swift; sourceTree = "<group>"; };
 		6654859746B0BE9611459391 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		6663BFB9FDB8752562CD12CA /* AuthenticationStartScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationStartScreenCoordinator.swift; sourceTree = "<group>"; };
@@ -1858,7 +1861,6 @@
 		6CD4823EAB4B4E8BAB4F6B8C /* TimelineStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStyle.swift; sourceTree = "<group>"; };
 		6CEBE5EA91E8691EDF364EC2 /* UITestsScreenIdentifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITestsScreenIdentifier.swift; sourceTree = "<group>"; };
 		6D0A27607AB09784C8501B5C /* DeveloperOptionsScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeveloperOptionsScreenViewModelTests.swift; sourceTree = "<group>"; };
-		6D4777F0142E330A75C46FE4 /* SessionVerificationUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationUITests.swift; sourceTree = "<group>"; };
 		6DF438EAFC732D2D95D34BF6 /* StartChatViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatViewModelTests.swift; sourceTree = "<group>"; };
 		6E5725BC6C63604CB769145B /* LegalInformationScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegalInformationScreenViewModelTests.swift; sourceTree = "<group>"; };
 		6E5E9C044BEB7C70B1378E91 /* UserSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSession.swift; sourceTree = "<group>"; };
@@ -1919,6 +1921,7 @@
 		7B04BD3874D736127A8156B8 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
 		7B19B2BCC779ED934E0BBC2A /* AudioPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioPlayer.swift; sourceTree = "<group>"; };
 		7B25F959A434BB9923A3223F /* ExpiringTaskRunner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpiringTaskRunner.swift; sourceTree = "<group>"; };
+		7B287771477D9A0D94AAC1CE /* TemplateScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateScreenTests.swift; sourceTree = "<group>"; };
 		7B3D16709ADD4F4BCC710B1E /* SecureBackupScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupScreenModels.swift; sourceTree = "<group>"; };
 		7B849D2FF2CC12BA411A1651 /* CreateRoomModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomModels.swift; sourceTree = "<group>"; };
 		7B9FCA1CFD07B8CF9BD21266 /* FlowCoordinatorProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlowCoordinatorProtocol.swift; sourceTree = "<group>"; };
@@ -1998,6 +2001,7 @@
 		8977176AB534AA41630395BC /* LegalInformationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegalInformationScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		897DF5E9A70CE05A632FC8AF /* UTType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UTType.swift; sourceTree = "<group>"; };
 		89AAEA70CFF3284920811941 /* RoomChangePermissionsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangePermissionsScreen.swift; sourceTree = "<group>"; };
+		89BB11A792EF6F70B95B467E /* EncryptionResetTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetTests.swift; sourceTree = "<group>"; };
 		89FBFC09F9DAFF1E4BA97849 /* FormButtonStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormButtonStyles.swift; sourceTree = "<group>"; };
 		8A1009E4A78F86DA42E1EAF0 /* DeactivateAccountScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenCoordinator.swift; sourceTree = "<group>"; };
 		8A9AE4967817E9608E22EB44 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -2015,7 +2019,7 @@
 		8D55702474F279D910D2D162 /* RoomStateEventStringBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomStateEventStringBuilder.swift; sourceTree = "<group>"; };
 		8D8169443E5AC5FF71BFB3DB /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
 		8DA1E8F287680C8ED25EDBAC /* NetworkMonitorMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitorMock.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>"; };
 		8E1584F8BCF407BB94F48F04 /* EncryptionResetPasswordScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetPasswordScreen.swift; sourceTree = "<group>"; };
 		8EAF4A49F3ACD8BB8B0D2371 /* ClientSDKMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientSDKMock.swift; sourceTree = "<group>"; };
 		8F062DD2CCD95DC33528A16F /* KnockRequestProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KnockRequestProxy.swift; sourceTree = "<group>"; };
@@ -2066,7 +2070,6 @@
 		97CE98208321C4D66E363612 /* ShimmerModifier.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShimmerModifier.swift; sourceTree = "<group>"; };
 		97F2F6B6E56055EF173A2DD3 /* SecurityAndPrivacyScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityAndPrivacyScreenCoordinator.swift; sourceTree = "<group>"; };
 		981663D961C94270FA035FD0 /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = "<group>"; };
-		9873076F224E4CE09D8BD47D /* TemplateScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateScreenUITests.swift; sourceTree = "<group>"; };
 		989D7380D9C86B3A10D30B13 /* AppLockSetupPINScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupPINScreenViewModelTests.swift; sourceTree = "<group>"; };
 		989FC684408B31A677F5538B /* CompletionSuggestionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompletionSuggestionView.swift; sourceTree = "<group>"; };
 		997BF045585AF6DB2EBC5755 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -2133,7 +2136,6 @@
 		A7C4EA55DA62F9D0F984A2AE /* CollapsibleTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollapsibleTimelineItem.swift; sourceTree = "<group>"; };
 		A7D452AF7B5F7E3A0A7DB54C /* SessionVerificationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		A7E37072597F67C4DD8CC2DB /* ComposerDraftServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerDraftServiceProtocol.swift; sourceTree = "<group>"; };
-		A7F55DC42D6F5CCF00CE60E9 /* JoinRoomByAddressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoinRoomByAddressView.swift; sourceTree = "<group>"; };
 		A84D413BF49F0E980F010A6B /* LogViewerScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogViewerScreenCoordinator.swift; sourceTree = "<group>"; };
 		A8558D41DD4B553A752C868A /* StackedAvatarsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackedAvatarsView.swift; sourceTree = "<group>"; };
 		A861DA5932B128FE1DCB5CE2 /* InviteUsersScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InviteUsersScreenCoordinator.swift; sourceTree = "<group>"; };
@@ -2210,7 +2212,7 @@
 		B50F03079F6B5EF9CA005F14 /* TimelineProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineProxyProtocol.swift; sourceTree = "<group>"; };
 		B53AC78E49A297AC1D72A7CF /* AppMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppMediator.swift; sourceTree = "<group>"; };
 		B590BD4507D4F0A377FDE01A /* LoadableAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadableAvatarImage.swift; sourceTree = "<group>"; };
-		B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = ConfettiScene.scn; sourceTree = "<group>"; };
+		B61C339A2FDDBD067FF6635C /* ConfettiScene.scn */ = {isa = PBXFileReference; path = ConfettiScene.scn; sourceTree = "<group>"; };
 		B63B69F9A2BC74DD40DC75C8 /* AdvancedSettingsScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdvancedSettingsScreenViewModel.swift; sourceTree = "<group>"; };
 		B6404166CBF5CC88673FF9E2 /* RoomDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetails.swift; sourceTree = "<group>"; };
 		B655A536341D2695158C6664 /* AuthenticationClientBuilderFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationClientBuilderFactory.swift; sourceTree = "<group>"; };
@@ -2237,7 +2239,7 @@
 		BA40B98B098B6F0371B750B3 /* TemplateScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TemplateScreenModels.swift; sourceTree = "<group>"; };
 		BA919F521E9F0EE3638AFC85 /* BugReportScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportScreen.swift; sourceTree = "<group>"; };
 		BB284643AF7AB131E307DCE0 /* AudioSessionProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioSessionProtocol.swift; sourceTree = "<group>"; };
-		BB576F4118C35E6B5124FA22 /* test_apple_image.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_apple_image.heic; sourceTree = "<group>"; };
+		BB576F4118C35E6B5124FA22 /* test_apple_image.heic */ = {isa = PBXFileReference; path = test_apple_image.heic; sourceTree = "<group>"; };
 		BB5B00A014307CE37B2812CD /* TimelineViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewModelProtocol.swift; sourceTree = "<group>"; };
 		BB8BC4C791D0E88CFCF4E5DF /* ServerSelectionScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionScreenCoordinator.swift; sourceTree = "<group>"; };
 		BBEC57C204D77908E355EF42 /* AudioRecorderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRecorderProtocol.swift; sourceTree = "<group>"; };
@@ -2245,7 +2247,6 @@
 		BC8AA23D4F37CC26564F63C5 /* LayoutMocks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutMocks.swift; sourceTree = "<group>"; };
 		BCDA016D05107DED3B9495CB /* TimelineItemDebugView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemDebugView.swift; sourceTree = "<group>"; };
 		BE148A4FFEE853C5A281500C /* UNNotificationContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UNNotificationContent.swift; sourceTree = "<group>"; };
-		BE4C76F31A382B8E4DD07583 /* EncryptionResetUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionResetUITests.swift; sourceTree = "<group>"; };
 		BE78CAD0B964C66FD06EF83E /* DeactivateAccountScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenModels.swift; sourceTree = "<group>"; };
 		BE89A8BD65CCE3FCC925CA14 /* TimelineItemReplyDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineItemReplyDetails.swift; sourceTree = "<group>"; };
 		BE98688578F8B0541D853695 /* test_pdf.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = test_pdf.pdf; sourceTree = "<group>"; };
@@ -2290,13 +2291,11 @@
 		C55CC239AE12339C565F6C9A /* AudioRecorderStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioRecorderStateTests.swift; sourceTree = "<group>"; };
 		C55D7E514F9DE4E3D72FDCAD /* SessionVerificationControllerProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationControllerProxy.swift; sourceTree = "<group>"; };
 		C5AEB5907E24092D741718AF /* ResolveVerifiedUserSendFailureScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResolveVerifiedUserSendFailureScreenCoordinator.swift; sourceTree = "<group>"; };
-		C5B7A755E985FA14469E86B2 /* RoomMembersListScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenUITests.swift; sourceTree = "<group>"; };
 		C5F06F2F09B2EDD067DC2174 /* NotificationSettingsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsScreen.swift; sourceTree = "<group>"; };
 		C616D90B1E2F033CAA325439 /* StaticLocationScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StaticLocationScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		C618CA2B6C8758B06C88013C /* CreateRoomCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomCoordinator.swift; sourceTree = "<group>"; };
 		C687844F60BFF532D49A994C /* AnalyticsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsTests.swift; sourceTree = "<group>"; };
 		C6A9F49B3EE59147AF2F70BB /* SeparatorRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SeparatorRoomTimelineItem.swift; sourceTree = "<group>"; };
-		C6FEA87EA3752203065ECE27 /* BugReportUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportUITests.swift; sourceTree = "<group>"; };
 		C705E605EF57C19DBE86FFA1 /* PlaceholderAvatarImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceholderAvatarImage.swift; sourceTree = "<group>"; };
 		C715CFE00686DACA59D836EA /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/SAS.strings; sourceTree = "<group>"; };
 		C729D95CB4588D4D9AAC3DFA /* RoomChangePermissionsScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomChangePermissionsScreenModels.swift; sourceTree = "<group>"; };
@@ -2330,14 +2329,13 @@
 		CC437C491EA6996513B1CEAB /* ElementCallConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementCallConfiguration.swift; sourceTree = "<group>"; };
 		CC680E0E79D818706CB28CF8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CC743C7A85E3171BCBF0A653 /* AvatarHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvatarHeaderView.swift; sourceTree = "<group>"; };
-		CCACD75595C40EACD6AD4A74 /* ElementTextFieldStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementTextFieldStyle.swift; sourceTree = "<group>"; };
 		CCF71646898A2F720C5BFDF5 /* RoomDirectorySearchScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDirectorySearchScreenViewModel.swift; sourceTree = "<group>"; };
 		CD469F7513574341181F7EAA /* ServerSelectionScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerSelectionScreen.swift; sourceTree = "<group>"; };
 		CD6613DE16AD26B3A74DA1F5 /* LocationRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationRoomTimelineItemContent.swift; sourceTree = "<group>"; };
 		CDB3227C7A74B734924942E9 /* RoomSummaryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSummaryProvider.swift; sourceTree = "<group>"; };
 		CDE3F3911FF7CC639BDE5844 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CEE20623EB4A9B88FB29F2BA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SAS.strings; sourceTree = "<group>"; };
-		CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = UnitTests.xctestplan; sourceTree = "<group>"; };
+		CEE41494C837AA403A06A5D9 /* UnitTests.xctestplan */ = {isa = PBXFileReference; path = UnitTests.xctestplan; sourceTree = "<group>"; };
 		D01FD1171FF40E34D707FD00 /* BigIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigIcon.swift; sourceTree = "<group>"; };
 		D046ABB22E680F7C5054441B /* SecurityAndPrivacyScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityAndPrivacyScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		D071F86CD47582B9196C9D16 /* UserDiscoverySection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDiscoverySection.swift; sourceTree = "<group>"; };
@@ -2372,6 +2370,7 @@
 		D653265D006E708E4E51AD64 /* HomeScreenCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenCoordinator.swift; sourceTree = "<group>"; };
 		D66B5D86A9AB95E0E01BED82 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		D6DC38E64A5ED3FDB201029A /* BugReportService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BugReportService.swift; sourceTree = "<group>"; };
+		D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ElementTextFieldStyle.swift; sourceTree = "<group>"; };
 		D77B3D4950F1707E66E4A45A /* AnalyticsConfiguration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsConfiguration.swift; sourceTree = "<group>"; };
 		D77F75B3E9F99864048A422A /* DeactivateAccountScreenViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeactivateAccountScreenViewModelTests.swift; sourceTree = "<group>"; };
 		D79BB714D28C9F588DD69353 /* SecureBackupScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -2379,13 +2378,14 @@
 		D7BB243B26D54EF1A0C422C0 /* NotificationContentBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationContentBuilder.swift; sourceTree = "<group>"; };
 		D7BEB970F500BFB248443FA1 /* BloomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BloomView.swift; sourceTree = "<group>"; };
 		D879DC5515B1D42577F96C94 /* RoomSelectionScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSelectionScreen.swift; sourceTree = "<group>"; };
+		D8AA084E10B80D64449C02A9 /* SessionVerificationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationTests.swift; sourceTree = "<group>"; };
 		D8E60332509665C00179ACF6 /* MessageForwardingScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageForwardingScreenViewModel.swift; sourceTree = "<group>"; };
 		D8F5F9E02B1AB5350B1815E7 /* TimelineStartRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineStartRoomTimelineItem.swift; sourceTree = "<group>"; };
 		D8FC33C3F6BF597E095CE9FA /* HomeScreenInviteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreenInviteCell.swift; sourceTree = "<group>"; };
 		D93C94C30E3135BC9290DE13 /* VoiceMessageRecorderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageRecorderTests.swift; sourceTree = "<group>"; };
 		D95E8C0EFEC0C6F96EDAA71A /* PreviewTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = PreviewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		D97A4E73EA97CA08D2BB9806 /* RoomScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomScreenTests.swift; sourceTree = "<group>"; };
 		DA14564EE143F73F7E4D1F79 /* RoomNotificationSettingsScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsScreenModels.swift; sourceTree = "<group>"; };
-		DA2AEC1AB349A341FE13DEC1 /* StartChatScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartChatScreenUITests.swift; sourceTree = "<group>"; };
 		DA3D82522494E78746B2214E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SAS.strings; sourceTree = "<group>"; };
 		DAB8D7926A5684E18196B538 /* VoiceMessageCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VoiceMessageCache.swift; sourceTree = "<group>"; };
 		DADECBBB672497BCD4822468 /* Result.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
@@ -2394,8 +2394,9 @@
 		DC0AEA686E425F86F6BA0404 /* UNNotification+Creator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UNNotification+Creator.swift"; sourceTree = "<group>"; };
 		DC10CCC8D68B863E20660DBC /* MessageForwardingScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageForwardingScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		DC528B3764E3CF7FCFEF40E7 /* PollInteractionHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollInteractionHandler.swift; sourceTree = "<group>"; };
-		DCA2D836BD10303F37FAAEED /* test_voice_message.m4a */ = {isa = PBXFileReference; lastKnownFileType = file; path = test_voice_message.m4a; sourceTree = "<group>"; };
+		DCA2D836BD10303F37FAAEED /* test_voice_message.m4a */ = {isa = PBXFileReference; path = test_voice_message.m4a; sourceTree = "<group>"; };
 		DCAC01A97A43BE07B9E94E43 /* ShareExtensionModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareExtensionModels.swift; sourceTree = "<group>"; };
+		DCDAB580109C09A6AA97AF7E /* PollFormScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenTests.swift; sourceTree = "<group>"; };
 		DCF239C619971FDE48132550 /* SecureBackupLogoutConfirmationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureBackupLogoutConfirmationScreenModels.swift; sourceTree = "<group>"; };
 		DD8C9BBB729C941BEE0E2A63 /* TimelineProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineProviderProtocol.swift; sourceTree = "<group>"; };
 		DD955A0380C287C418F1A74D /* PhotoLibraryManagerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoLibraryManagerMock.swift; sourceTree = "<group>"; };
@@ -2417,6 +2418,7 @@
 		E1A5FEF17ED7E6176D922D4F /* RoomDetailsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomDetailsScreen.swift; sourceTree = "<group>"; };
 		E1E0B4A34E69BD2132BEC521 /* MessageText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageText.swift; sourceTree = "<group>"; };
 		E1ED17433ADC77287F8904F9 /* CallNotificationRoomTimelineItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallNotificationRoomTimelineItem.swift; sourceTree = "<group>"; };
+		E2520C4F33AA0C061D209C28 /* RoomMembersListScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomMembersListScreenTests.swift; sourceTree = "<group>"; };
 		E2776E63E02719B20758EB78 /* EditRoomAddressListRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditRoomAddressListRow.swift; sourceTree = "<group>"; };
 		E2B1CC9AA154F4D5435BF60A /* Comparable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Comparable.swift; sourceTree = "<group>"; };
 		E2F96CCBEAAA7F2185BFA354 /* ClientProxyMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientProxyMock.swift; sourceTree = "<group>"; };
@@ -2435,7 +2437,7 @@
 		E5272BC4A60B6AD7553BACA1 /* BlurHashDecode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlurHashDecode.swift; sourceTree = "<group>"; };
 		E53BFB7E4F329621C844E8C3 /* AnalyticsPromptScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsPromptScreen.swift; sourceTree = "<group>"; };
 		E55B5EA766E89FF1F87C3ACB /* RoomNotificationSettingsProxyProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomNotificationSettingsProxyProtocol.swift; sourceTree = "<group>"; };
-		E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = portrait_test_video.mp4; sourceTree = "<group>"; };
+		E5E7D4EE7CA295E5039FDA21 /* portrait_test_video.mp4 */ = {isa = PBXFileReference; path = portrait_test_video.mp4; sourceTree = "<group>"; };
 		E5E94DCFEE803E5ABAE8ACCE /* KeychainControllerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainControllerProtocol.swift; sourceTree = "<group>"; };
 		E5F2B6443D1ED8602F328539 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ru; path = ru.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		E5FDFAA04174CC99FB66391C /* EditRoomAddressScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditRoomAddressScreenViewModel.swift; sourceTree = "<group>"; };
@@ -2449,8 +2451,8 @@
 		E76A706B3EEA32B882DA5E2D /* BlockedUsersScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockedUsersScreenViewModelProtocol.swift; sourceTree = "<group>"; };
 		E78FC546F28E045A560F2963 /* EncryptionKeyProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionKeyProviderProtocol.swift; sourceTree = "<group>"; };
 		E8294DB9E95C0C0630418466 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
+		E8495F37D6245AD0CFA1F60B /* AppLockTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockTests.swift; sourceTree = "<group>"; };
 		E8774CF614849664B5B3C2A1 /* UserSessionFlowCoordinatorStateMachine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionFlowCoordinatorStateMachine.swift; sourceTree = "<group>"; };
-		E8A1BBEF7318CA6B6ACCF4AE /* AppLockSetupUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupUITests.swift; sourceTree = "<group>"; };
 		E8A1F98AE670377B20679FF5 /* MediaPlayerProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlayerProvider.swift; sourceTree = "<group>"; };
 		E8AE4B3273BA189FDCD4055C /* UserIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserIndicator.swift; sourceTree = "<group>"; };
 		E8CA187FE656EE5A3F6C7DE5 /* UIFont+AttributedStringBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIFont+AttributedStringBuilder.m"; sourceTree = "<group>"; };
@@ -2477,7 +2479,7 @@
 		ED0CBEAB5F796BEFBAF7BB6A /* VideoRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoRoomTimelineView.swift; sourceTree = "<group>"; };
 		ED1D792EB82506A19A72C8DE /* RoomTimelineItemProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomTimelineItemProtocol.swift; sourceTree = "<group>"; };
 		ED33988DA4FD4FC666800106 /* SessionVerificationScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionVerificationScreenViewModel.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>"; };
 		ED49073BB1C1FC649DAC2CCD /* LocationRoomTimelineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationRoomTimelineView.swift; sourceTree = "<group>"; };
 		ED60E4D2CD678E1EBF16F77A /* BlockedUsersScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockedUsersScreen.swift; sourceTree = "<group>"; };
 		EE378083653EF0C9B5E9D580 /* EmoteRoomTimelineItemContent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmoteRoomTimelineItemContent.swift; sourceTree = "<group>"; };
@@ -2523,13 +2525,11 @@
 		F5E23D8EE6CBACF32F1EC874 /* MediaPlayerProviderProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaPlayerProviderProtocol.swift; sourceTree = "<group>"; };
 		F64A8582F65567AC38C2976A /* PollFormScreenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PollFormScreenViewModel.swift; sourceTree = "<group>"; };
 		F72EFC8C634469F9262659C7 /* NSItemProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSItemProvider.swift; sourceTree = "<group>"; };
-		F733F135E6D67BBBEB76CC30 /* AppLockUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockUITests.swift; sourceTree = "<group>"; };
 		F7478623CECC9438014244BA /* ServerConfirmationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServerConfirmationScreen.swift; sourceTree = "<group>"; };
 		F7C161B06F417CA5D1F1E088 /* WebRegistrationScreenModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebRegistrationScreenModels.swift; sourceTree = "<group>"; };
 		F875D71347DC81EAE7687446 /* NavigationRootCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationRootCoordinatorTests.swift; sourceTree = "<group>"; };
 		F899D02CF26EA7675EEBE74C /* UserSessionScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserSessionScreenTests.swift; sourceTree = "<group>"; };
 		F8CCF9A924521DECA44778C4 /* AppLockSetupBiometricsScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLockSetupBiometricsScreen.swift; sourceTree = "<group>"; };
-		F8CEB4634C0DD7779C4AB504 /* CreateRoomScreenUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateRoomScreenUITests.swift; sourceTree = "<group>"; };
 		F9E543072DE58E751F028998 /* TimelineProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineProxy.swift; sourceTree = "<group>"; };
 		FA3EB5B1848CF4F64E63C6B7 /* PermalinkTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermalinkTests.swift; sourceTree = "<group>"; };
 		FA7BB497B2F539C17E88F6B7 /* NotificationSettingsEditScreenViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsEditScreenViewModelProtocol.swift; sourceTree = "<group>"; };
@@ -4819,20 +4819,20 @@
 			isa = PBXGroup;
 			children = (
 				7D0CBC76C80E04345E11F2DB /* Application.swift */,
-				E8A1BBEF7318CA6B6ACCF4AE /* AppLockSetupUITests.swift */,
-				F733F135E6D67BBBEB76CC30 /* AppLockUITests.swift */,
-				295E28C3B9EAADF519BF2F44 /* AuthenticationFlowCoordinatorUITests.swift */,
-				C6FEA87EA3752203065ECE27 /* BugReportUITests.swift */,
-				F8CEB4634C0DD7779C4AB504 /* CreateRoomScreenUITests.swift */,
-				BE4C76F31A382B8E4DD07583 /* EncryptionResetUITests.swift */,
-				3BF8E5D4C95974B96A18C80E /* EncryptionSettingsUITests.swift */,
-				3368395F06AA180138E185B6 /* PollFormScreenUITests.swift */,
-				C5B7A755E985FA14469E86B2 /* RoomMembersListScreenUITests.swift */,
-				45571C2EBD98ED7E0CEA7AF7 /* RoomRolesAndPermissionsUITests.swift */,
-				086B997409328F091EBA43CE /* RoomScreenUITests.swift */,
-				054F469E433864CC6FE6EE8E /* ServerSelectionUITests.swift */,
-				6D4777F0142E330A75C46FE4 /* SessionVerificationUITests.swift */,
-				DA2AEC1AB349A341FE13DEC1 /* StartChatScreenUITests.swift */,
+				19DD166C3625EE426203FA29 /* AppLockSetupTests.swift */,
+				E8495F37D6245AD0CFA1F60B /* AppLockTests.swift */,
+				37F46CC4FD89ECF4CF26391A /* AuthenticationFlowCoordinatorTests.swift */,
+				27DF257F5D968E5DD719583C /* BugReportTests.swift */,
+				2214C32EA81FA9168D923D4C /* CreateRoomScreenTests.swift */,
+				89BB11A792EF6F70B95B467E /* EncryptionResetTests.swift */,
+				57AD14D3ADADE8F6A10F9E88 /* EncryptionSettingsTests.swift */,
+				DCDAB580109C09A6AA97AF7E /* PollFormScreenTests.swift */,
+				E2520C4F33AA0C061D209C28 /* RoomMembersListScreenTests.swift */,
+				44DDC82DB6A84E700CD5DEC0 /* RoomRolesAndPermissionsTests.swift */,
+				D97A4E73EA97CA08D2BB9806 /* RoomScreenTests.swift */,
+				6640DB5B9171D163E6742639 /* ServerSelectionTests.swift */,
+				D8AA084E10B80D64449C02A9 /* SessionVerificationTests.swift */,
+				3B927A399A5418DA40A5CA15 /* StartChatScreenTests.swift */,
 				F899D02CF26EA7675EEBE74C /* UserSessionScreenTests.swift */,
 			);
 			path = Sources;
@@ -5062,7 +5062,7 @@
 		A7F3784CAF9F4CF654BC52CD /* View */ = {
 			isa = PBXGroup;
 			children = (
-				A7F55DC42D6F5CCF00CE60E9 /* JoinRoomByAddressView.swift */,
+				1A13364350970987B93F6018 /* JoinRoomByAddressView.swift */,
 				F276F31C1AEC19E52B951B62 /* SendInviteConfirmationView.swift */,
 				6861FE915C7B5466E6962BBA /* StartChatScreen.swift */,
 			);
@@ -5109,7 +5109,7 @@
 		AD5FCF9340D670C526AD17E4 /* UI */ = {
 			isa = PBXGroup;
 			children = (
-				9873076F224E4CE09D8BD47D /* TemplateScreenUITests.swift */,
+				7B287771477D9A0D94AAC1CE /* TemplateScreenTests.swift */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -5763,7 +5763,7 @@
 		E6E1D07163F8752D62DA4A93 /* Styles */ = {
 			isa = PBXGroup;
 			children = (
-				CCACD75595C40EACD6AD4A74 /* ElementTextFieldStyle.swift */,
+				D7673F2B0B038FAB2A8D16AD /* ElementTextFieldStyle.swift */,
 				89FBFC09F9DAFF1E4BA97849 /* FormButtonStyles.swift */,
 			);
 			path = Styles;
@@ -6911,7 +6911,6 @@
 				0E3A2787C6AEC761A81A938A /* AuthenticationStartScreenModels.swift in Sources */,
 				E79B247A6DD28759636317EA /* AuthenticationStartScreenViewModel.swift in Sources */,
 				874FEFB9D4A4AF447E0E086E /* AuthenticationStartScreenViewModelProtocol.swift in Sources */,
-				6146996D5C4DDD5DA816FC87 /* ElementTextFieldStyle.swift in Sources */,
 				4AAA8606FBA290E23D15422E /* AvatarHeaderView.swift in Sources */,
 				1621BF6316FFFEF5AE067C77 /* Avatars.swift in Sources */,
 				7A25D6926A2C01DB8D0D67A5 /* BadgeLabel.swift in Sources */,
@@ -7021,6 +7020,7 @@
 				48416BBEB8DDF3E4DED0EDB6 /* ElementCallServiceProtocol.swift in Sources */,
 				07CC13C5729C24255348CBBD /* ElementCallWidgetDriver.swift in Sources */,
 				370AF5BFCD4384DD455479B6 /* ElementCallWidgetDriverProtocol.swift in Sources */,
+				A87DC550659C5176AC1829DE /* ElementTextFieldStyle.swift in Sources */,
 				3F997171C3C79A45E92BF9EF /* ElementWellKnown.swift in Sources */,
 				7C1A7B594B2F8143F0DD0005 /* ElementXAttributeScope.swift in Sources */,
 				3A08584ECDD4A4541DBF21F8 /* EmojiLoaderProtocol.swift in Sources */,
@@ -7118,6 +7118,7 @@
 				A17FAD2EBC53E17B5FD384DB /* InviteUsersScreenViewModelProtocol.swift in Sources */,
 				89B909AC66B96FA054EF3C14 /* InvitedRoomProxy.swift in Sources */,
 				07376A5274822EB45CC320C7 /* InvitedRoomProxyMock.swift in Sources */,
+				B8D9960F77B213FD1B0B0FD3 /* JoinRoomByAddressView.swift in Sources */,
 				6A54F52443EC52AC5CD772C0 /* JoinRoomScreen.swift in Sources */,
 				AFE2AB612A1460E49578D746 /* JoinRoomScreenCoordinator.swift in Sources */,
 				DEDBD3E9CFCC9F20CAC79881 /* JoinRoomScreenModels.swift in Sources */,
@@ -7514,7 +7515,6 @@
 				5710AAB27D5D866292C1FE06 /* SessionVerificationScreenModels.swift in Sources */,
 				601AB75BD52B0B4276CEB84A /* SessionVerificationScreenStateMachine.swift in Sources */,
 				4A8287E5281B44A8754BE509 /* SessionVerificationScreenViewModel.swift in Sources */,
-				A7F55DC52D6F5CEC00CE60E9 /* JoinRoomByAddressView.swift in Sources */,
 				762DB0973865293F0C3D3D7B /* SessionVerificationScreenViewModelProtocol.swift in Sources */,
 				755395927DDD6EBDDA5E217A /* SettingsFlowCoordinator.swift in Sources */,
 				34F1261CEF6D6A00D559B520 /* SettingsScreen.swift in Sources */,
@@ -7715,23 +7715,23 @@
 			buildActionMask = 2147483647;
 			files = (
 				795A854F63301DC6B46217B9 /* AccessibilityIdentifiers.swift in Sources */,
-				44DA28B1E1F9C97C5795F7B3 /* AppLockSetupUITests.swift in Sources */,
-				BAC845780F17CCFBC5A9CA37 /* AppLockUITests.swift in Sources */,
+				065EAB39F3F3AB4F6BD2A362 /* AppLockSetupTests.swift in Sources */,
+				05E797C4E0048BB487E5C4D6 /* AppLockTests.swift in Sources */,
 				7405B4824D45BA7C3D943E76 /* Application.swift in Sources */,
-				2A864BB12A8501B47805D828 /* AuthenticationFlowCoordinatorUITests.swift in Sources */,
-				7756C4E90CABE6F14F7920A0 /* BugReportUITests.swift in Sources */,
+				CB07184D37D5D65327A5A693 /* AuthenticationFlowCoordinatorTests.swift in Sources */,
+				9EF72884B74BC39B01640098 /* BugReportTests.swift in Sources */,
 				94D0F36A87E596A93C0C178A /* Bundle.swift in Sources */,
-				9F19096BFA629C0AC282B1E4 /* CreateRoomScreenUITests.swift in Sources */,
-				CACD1352927336F01FC76612 /* EncryptionResetUITests.swift in Sources */,
-				230981086F0199F913434D6B /* EncryptionSettingsUITests.swift in Sources */,
-				0CF81807BE5FBFC9E2BBCECF /* PollFormScreenUITests.swift in Sources */,
-				44121202B4A260C98BF615A7 /* RoomMembersListScreenUITests.swift in Sources */,
-				D29E046C1E3045E0346C479D /* RoomRolesAndPermissionsUITests.swift in Sources */,
-				2F1CF90A3460C153154427F0 /* RoomScreenUITests.swift in Sources */,
-				77FACC29F98FE2E65BBB6A5F /* ServerSelectionUITests.swift in Sources */,
-				05EC896A4B9AF4A56670C0BB /* SessionVerificationUITests.swift in Sources */,
-				CBA9EDF305036039166E76FF /* StartChatScreenUITests.swift in Sources */,
-				C4180F418235DAD9DD173951 /* TemplateScreenUITests.swift in Sources */,
+				28AB1614E749D1147A2AC6C2 /* CreateRoomScreenTests.swift in Sources */,
+				8D24671992A1C1753B211221 /* EncryptionResetTests.swift in Sources */,
+				E5E43A0CA99AF5BA11B194A2 /* EncryptionSettingsTests.swift in Sources */,
+				A950C95855C474F75B30CA7B /* PollFormScreenTests.swift in Sources */,
+				B5BCE012F9E7C45D1C76108E /* RoomMembersListScreenTests.swift in Sources */,
+				DBC3FDE1540B39702A117D8E /* RoomRolesAndPermissionsTests.swift in Sources */,
+				94EB81606839C175CA6C2ADB /* RoomScreenTests.swift in Sources */,
+				E9985DCD1B0D026D7E8BF809 /* ServerSelectionTests.swift in Sources */,
+				D5C2DA52162A978743A183F2 /* SessionVerificationTests.swift in Sources */,
+				F9788AE0B9EA19F1190ED14F /* StartChatScreenTests.swift in Sources */,
+				CDE21091BB1272C088509F59 /* TemplateScreenTests.swift in Sources */,
 				54AE8860D668AFD96E7E177B /* UITestsScreenIdentifier.swift in Sources */,
 				84EFCB95F9DA2979C8042B26 /* UITestsSignalling.swift in Sources */,
 				B22D857D1E8FCA6DD74A58E3 /* UserSessionScreenTests.swift in Sources */,
@@ -7956,7 +7956,9 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = "$(MARKETING_VERSION)";
-				OTHER_SWIFT_FLAGS = "-DIS_NSE";
+				OTHER_SWIFT_FLAGS = (
+					"-DIS_NSE",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse";
 				PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
 				PRODUCT_NAME = NSE;
@@ -8005,7 +8007,9 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = "$(MARKETING_VERSION)";
-				OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP";
+				OTHER_SWIFT_FLAGS = (
+					"-DIS_MAIN_APP",
+				);
 				PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(APP_NAME)";
@@ -8031,7 +8035,9 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = "$(MARKETING_VERSION)";
-				OTHER_SWIFT_FLAGS = "-DIS_MAIN_APP";
+				OTHER_SWIFT_FLAGS = (
+					"-DIS_MAIN_APP",
+				);
 				PILLS_UT_TYPE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER).pills";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(BASE_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(APP_NAME)";
@@ -8295,7 +8301,9 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = "$(MARKETING_VERSION)";
-				OTHER_SWIFT_FLAGS = "-DIS_NSE";
+				OTHER_SWIFT_FLAGS = (
+					"-DIS_NSE",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = "${BASE_BUNDLE_IDENTIFIER}.nse";
 				PRODUCT_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
 				PRODUCT_NAME = NSE;
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift b/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenTests.swift
similarity index 89%
rename from Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift
rename to Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenTests.swift
index 9f73ee1ee..62d82b812 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenTests.swift
@@ -15,6 +15,6 @@ class TemplateScreenUITests: XCTestCase {
         let title = app.staticTexts["Template title"]
         XCTAssert(title.exists)
 
-        try await app.assertScreenshot(.templateScreen)
+        try await app.assertScreenshot()
     }
 }
diff --git a/UITests/Sources/AppLockSetupUITests.swift b/UITests/Sources/AppLockSetupTests.swift
similarity index 74%
rename from UITests/Sources/AppLockSetupUITests.swift
rename to UITests/Sources/AppLockSetupTests.swift
index bcd212322..2a174dc90 100644
--- a/UITests/Sources/AppLockSetupUITests.swift
+++ b/UITests/Sources/AppLockSetupTests.swift
@@ -35,85 +35,85 @@ class AppLockSetupUITests: XCTestCase {
         try await Task.sleep(for: .seconds(0.5))
         
         // Create PIN screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.createPIN, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.createPIN)
         
         enterPIN()
         
         // Confirm PIN screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.confirmPIN)
+        try await app.assertScreenshot(step: Step.confirmPIN)
         
         enterPIN()
         
         // Setup biometrics screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.setupBiometrics)
+        try await app.assertScreenshot(step: Step.setupBiometrics)
         
         app.buttons[A11yIdentifiers.appLockSetupBiometricsScreen.allow].tap()
         
         // Settings screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.settings)
+        try await app.assertScreenshot(step: Step.settings)
         
         app.buttons[A11yIdentifiers.appLockSetupSettingsScreen.changePIN].tap()
         
         // Change PIN (create).
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.changePIN)
+        try await app.assertScreenshot(step: Step.changePIN)
         
         enterDifferentPIN()
         
         // Change PIN (confirm).
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.confirmChangePIN)
+        try await app.assertScreenshot(step: Step.confirmChangePIN)
         
         enterDifferentPIN()
         
         // Settings screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.settings)
+        try await app.assertScreenshot(step: Step.settings)
         
         app.buttons[A11yIdentifiers.appLockSetupSettingsScreen.removePIN].tap()
         app.alerts.element.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
         
         // Pop the stack returning to whatever was last presented.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.clearedStack)
+        try await app.assertScreenshot(step: Step.clearedStack)
     }
     
     func testMandatoryCreateFlow() async throws {
         app = Application.launch(.appLockSetupFlowMandatory)
         
         // Create PIN screen (non-modal and no cancellation button).
-        try await app.assertScreenshot(.appLockSetupFlowMandatory, step: Step.createPIN)
+        try await app.assertScreenshot(step: Step.createPIN)
         
         enterPIN()
         
         // Confirm PIN screen (non-modal and no cancellation button).
-        try await app.assertScreenshot(.appLockSetupFlowMandatory, step: Step.confirmPIN)
+        try await app.assertScreenshot(step: Step.confirmPIN)
         
         enterPIN()
         
         // Setup biometrics screen (non-modal).
-        try await app.assertScreenshot(.appLockSetupFlowMandatory, step: Step.setupBiometrics)
+        try await app.assertScreenshot(step: Step.setupBiometrics)
         
         let allowButton = app.buttons[A11yIdentifiers.appLockSetupBiometricsScreen.allow]
         XCTAssertTrue(allowButton.exists, "The biometrics screen should be shown.")
         allowButton.tap()
         
         // The stack should remain on biometrics for the presenting flow to take over navigation.
-        try await app.assertScreenshot(.appLockSetupFlowMandatory, step: Step.setupBiometrics)
+        try await app.assertScreenshot(step: Step.setupBiometrics)
     }
     
     func testUnlockFlow() async throws {
         app = Application.launch(.appLockSetupFlowUnlock)
         
         // Create PIN screen.
-        try await app.assertScreenshot(.appLockSetupFlowUnlock)
+        try await app.assertScreenshot()
         
         enterPIN()
         
         // Settings screen.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.settings, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.settings)
         
         app.buttons[A11yIdentifiers.appLockSetupSettingsScreen.removePIN].tap()
         app.alerts.element.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
         
         // Pop the stack returning to whatever was last presented.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.clearedStack)
+        try await app.assertScreenshot(step: Step.clearedStack)
     }
     
     func testCancel() async throws {
@@ -122,12 +122,12 @@ class AppLockSetupUITests: XCTestCase {
         app.showKeyboardIfNeeded() // The secure text field is focussed automatically
         
         // Create PIN screen.
-        try await app.assertScreenshot(.appLockSetupFlowUnlock)
+        try await app.assertScreenshot()
         
         app.buttons[A11yIdentifiers.appLockSetupPINScreen.cancel].tap()
         
         // Return to whatever was last presented.
-        try await app.assertScreenshot(.appLockSetupFlow, step: Step.clearedStack)
+        try await app.assertScreenshot(step: Step.clearedStack)
     }
     
     // MARK: - Helpers
diff --git a/UITests/Sources/AppLockUITests.swift b/UITests/Sources/AppLockTests.swift
similarity index 79%
rename from UITests/Sources/AppLockUITests.swift
rename to UITests/Sources/AppLockTests.swift
index 5c7370692..22c07cdd7 100644
--- a/UITests/Sources/AppLockUITests.swift
+++ b/UITests/Sources/AppLockTests.swift
@@ -27,13 +27,13 @@ class AppLockUITests: XCTestCase {
         await client.waitForApp()
         
         // Blank form representing an unlocked app.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked)
+        try await app.assertScreenshot(step: Step.unlocked)
         
         // When backgrounding the app.
         try client.send(.notification(name: UIApplication.didEnterBackgroundNotification))
         
         // Then the placeholder screen should obscure the content.
-        try await app.assertScreenshot(.appLockFlow, step: Step.placeholder)
+        try await app.assertScreenshot(step: Step.placeholder)
         
         // When foregrounding the app.
         try client.send(.notification(name: UIApplication.willEnterForegroundNotification))
@@ -41,13 +41,13 @@ class AppLockUITests: XCTestCase {
         try client.send(.notification(name: UIApplication.didBecomeActiveNotification))
         
         // Then the Lock Screen should be shown to enter a PIN.
-        try await app.assertScreenshot(.appLockFlow, step: Step.lockScreen)
+        try await app.assertScreenshot(step: Step.lockScreen)
         
         // When entering a PIN
         enterPIN()
         
         // Then the app should be unlocked again.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked)
+        try await app.assertScreenshot(step: Step.unlocked)
     }
     
     func testFlowDisabled() async throws {
@@ -57,13 +57,13 @@ class AppLockUITests: XCTestCase {
         await client.waitForApp()
         
         // Blank form representing an unlocked app.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.unlocked)
         
         // When backgrounding the app.
         try client.send(.notification(name: UIApplication.didEnterBackgroundNotification))
         
         // Then the app should remain unlocked.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.unlocked)
         
         // When foregrounding the app.
         try client.send(.notification(name: UIApplication.willEnterForegroundNotification))
@@ -71,7 +71,7 @@ class AppLockUITests: XCTestCase {
         try client.send(.notification(name: UIApplication.didBecomeActiveNotification))
         
         // Then the app should still remain unlocked.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.unlocked)
     }
     
     func testWrongPIN() async throws {
@@ -80,7 +80,7 @@ class AppLockUITests: XCTestCase {
         app = Application.launch(.appLockFlow)
         await client.waitForApp()
         
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.unlocked)
         try client.send(.notification(name: UIApplication.didEnterBackgroundNotification))
         try await Task.sleep(for: .milliseconds(500)) // Don't overwrite the previous signal immediately.
         
@@ -88,22 +88,22 @@ class AppLockUITests: XCTestCase {
         try? await Task.sleep(for: .milliseconds(100))
         try client.send(.notification(name: UIApplication.didBecomeActiveNotification))
         
-        try await app.assertScreenshot(.appLockFlow, step: Step.lockScreen, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.lockScreen)
         
         // When entering an incorrect PIN
         enterWrongPIN()
         
         // Then the app should remain locked with a warning.
-        try await app.assertScreenshot(.appLockFlow, step: Step.failedUnlock, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.failedUnlock)
         
         // When entering it incorrectly twice more.
         enterWrongPIN()
         enterWrongPIN()
         
         // Then then the app should sign the user out.
-        try await app.assertScreenshot(.appLockFlow, step: Step.logoutAlert, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.logoutAlert)
         app.alerts.element.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
-        try await app.assertScreenshot(.appLockFlow, step: Step.forcedLogout, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.forcedLogout)
     }
     
     func testResignActive() async throws {
@@ -113,13 +113,13 @@ class AppLockUITests: XCTestCase {
         await client.waitForApp()
         
         // Blank form representing an unlocked app.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked)
+        try await app.assertScreenshot(step: Step.unlocked)
         
         // When the app resigns active but doesn't enter the background.
         try client.send(.notification(name: UIApplication.willResignActiveNotification))
         
         // Then the placeholder screen should obscure the content.
-        try await app.assertScreenshot(.appLockFlow, step: Step.placeholder)
+        try await app.assertScreenshot(step: Step.placeholder)
         
         // When the app becomes active again.
         try client.send(.notification(name: UIApplication.willEnterForegroundNotification))
@@ -127,7 +127,7 @@ class AppLockUITests: XCTestCase {
         try client.send(.notification(name: UIApplication.didBecomeActiveNotification))
         
         // Then the app should not have become unlock.
-        try await app.assertScreenshot(.appLockFlow, step: Step.unlocked)
+        try await app.assertScreenshot(step: Step.unlocked)
     }
     
     // MARK: - Helpers
diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift
index 358bcd8d0..27dba3f69 100644
--- a/UITests/Sources/Application.swift
+++ b/UITests/Sources/Application.swift
@@ -57,35 +57,32 @@ extension XCUIApplication {
     static var recordMode: SnapshotTestingConfiguration.Record = .missing
     
     /// Assert screenshot for a screen with the given identifier. Does not fail if a screenshot is newly created.
-    /// - Parameter identifier: Identifier of the UI test screen
-    /// - Parameter step: An optional integer that can be used to take multiple snapshots per test identifier.
-    /// - Parameter insets: Optional insets with which to crop the image by.
+    /// - Parameter testName: The current test name, first part of the resulting snapshot filename.
+    /// - Parameter step: An optional integer that can be used to take multiple snapshots per test identifier
+    /// - Parameter delay: How much to wait before taking the snapshot
     @MainActor
-    func assertScreenshot(_ identifier: UITestsScreenIdentifier, step: Int? = nil, insets: UIEdgeInsets? = nil, delay: Duration = .seconds(1), precision: Float = 0.99) async throws {
-        var snapshotName = identifier.rawValue
-        if let step {
-            snapshotName += "-\(step)"
-        }
-        
-        snapshotName += "-\(deviceName)-\(localeCode)"
-
+    func assertScreenshot(fileName: String = #file, testName: String = #function, step: Int? = nil, delay: Duration = .seconds(0.5)) async throws {
         // Sometimes the CI might be too slow to load the content so let's wait the delay time
         try await Task.sleep(for: delay)
         
-        var snapshot = screenshot().image
+        let snapshot = screenshot().image
         
-        if let insets {
-            snapshot = snapshot.inset(by: insets)
+        var sanitizedSuiteName = String(fileName.prefix(fileName.count - "Tests.swift".count))
+        sanitizedSuiteName = (sanitizedSuiteName as NSString).lastPathComponent
+        sanitizedSuiteName = sanitizedSuiteName.prefix(1).lowercased() + sanitizedSuiteName.dropFirst()
+        
+        var testName = "\(testName.dropLast(2))-\(deviceName)-\(localeCode)"
+        if let step {
+            testName += "-\(step)"
         }
-
+        
         let failure = withSnapshotTesting(record: Self.recordMode) {
             verifySnapshot(of: snapshot,
-                           as: .image(precision: precision,
+                           as: .image(precision: 0.99,
                                       perceptualPrecision: 0.98,
                                       scale: nil),
-                           // use any kind of suffix here to snapshot the same file multiple times and avoid countering on the library side
-                           named: "UI",
-                           testName: snapshotName)
+                           named: testName,
+                           testName: sanitizedSuiteName)
         }
         
         if let failure {
diff --git a/UITests/Sources/AuthenticationFlowCoordinatorUITests.swift b/UITests/Sources/AuthenticationFlowCoordinatorTests.swift
similarity index 97%
rename from UITests/Sources/AuthenticationFlowCoordinatorUITests.swift
rename to UITests/Sources/AuthenticationFlowCoordinatorTests.swift
index 5c7ab3dde..94d136664 100644
--- a/UITests/Sources/AuthenticationFlowCoordinatorUITests.swift
+++ b/UITests/Sources/AuthenticationFlowCoordinatorTests.swift
@@ -27,7 +27,7 @@ class AuthenticationFlowCoordinatorUITests: XCTestCase {
         app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("alice\n", app: app)
         app.secureTextFields[A11yIdentifiers.loginScreen.password].clearAndTypeText("12345678", app: app)
 
-        try await app.assertScreenshot(.authenticationFlow)
+        try await app.assertScreenshot()
         
         // Login Screen: Tap next
         app.buttons[A11yIdentifiers.loginScreen.continue].tap()
@@ -77,7 +77,7 @@ class AuthenticationFlowCoordinatorUITests: XCTestCase {
         app.textFields[A11yIdentifiers.loginScreen.emailUsername].clearAndTypeText("@test:server.net\n", app: app)
         
         // Then the screen should not allow login to continue.
-        try await app.assertScreenshot(.authenticationFlow, step: 1)
+        try await app.assertScreenshot()
     }
     
     func testSelectingOIDCServer() {
diff --git a/UITests/Sources/BugReportUITests.swift b/UITests/Sources/BugReportTests.swift
similarity index 88%
rename from UITests/Sources/BugReportUITests.swift
rename to UITests/Sources/BugReportTests.swift
index 6e7393131..910ecb5bf 100644
--- a/UITests/Sources/BugReportUITests.swift
+++ b/UITests/Sources/BugReportTests.swift
@@ -13,7 +13,7 @@ class BugReportUITests: XCTestCase {
         let app = Application.launch(.bugReport)
         
         // Initial state without a screenshot attached.
-        try await app.assertScreenshot(.bugReport, step: 0)
+        try await app.assertScreenshot()
     }
     
     func testReportText() async throws {
@@ -23,13 +23,13 @@ class BugReportUITests: XCTestCase {
         app.textFields[A11yIdentifiers.bugReportScreen.report].clearAndTypeText("Text", app: app)
         XCTAssert(app.switches[A11yIdentifiers.bugReportScreen.sendLogs].isOn)
         XCTAssert(!app.switches[A11yIdentifiers.bugReportScreen.canContact].isOn)
-        try await app.assertScreenshot(.bugReport, step: 2)
+        try await app.assertScreenshot()
         
         // Type more than 4 characters and send the button should become enabled.
         app.textFields[A11yIdentifiers.bugReportScreen.report].clearAndTypeText("Longer text", app: app)
         XCTAssert(app.switches[A11yIdentifiers.bugReportScreen.sendLogs].isOn)
         XCTAssert(!app.switches[A11yIdentifiers.bugReportScreen.canContact].isOn)
-        try await app.assertScreenshot(.bugReport, step: 3)
+        try await app.assertScreenshot()
     }
 }
 
diff --git a/UITests/Sources/CreateRoomScreenUITests.swift b/UITests/Sources/CreateRoomScreenTests.swift
similarity index 85%
rename from UITests/Sources/CreateRoomScreenUITests.swift
rename to UITests/Sources/CreateRoomScreenTests.swift
index 8bbefb907..96c959c6e 100644
--- a/UITests/Sources/CreateRoomScreenUITests.swift
+++ b/UITests/Sources/CreateRoomScreenTests.swift
@@ -11,12 +11,12 @@ import XCTest
 class CreateRoomScreenUITests: XCTestCase {
     func testLanding() async throws {
         let app = Application.launch(.createRoom)
-        try await app.assertScreenshot(.createRoom)
+        try await app.assertScreenshot()
     }
 
     func testLandingWithoutUsers() async throws {
         let app = Application.launch(.createRoomNoUsers)
-        try await app.assertScreenshot(.createRoomNoUsers)
+        try await app.assertScreenshot()
     }
     
     func testLongInputNameText() async throws {
@@ -27,6 +27,6 @@ class CreateRoomScreenUITests: XCTestCase {
         app.textFields[A11yIdentifiers.createRoomScreen.roomName].tap()
         app.textFields[A11yIdentifiers.createRoomScreen.roomName].typeText(.init(repeating: "x", count: 200))
         app.textFields[A11yIdentifiers.createRoomScreen.roomName].typeText("\n")
-        try await app.assertScreenshot(.createRoom, step: 1)
+        try await app.assertScreenshot()
     }
 }
diff --git a/UITests/Sources/EncryptionResetUITests.swift b/UITests/Sources/EncryptionResetTests.swift
similarity index 81%
rename from UITests/Sources/EncryptionResetUITests.swift
rename to UITests/Sources/EncryptionResetTests.swift
index fa1317cce..5cf59a4aa 100644
--- a/UITests/Sources/EncryptionResetUITests.swift
+++ b/UITests/Sources/EncryptionResetTests.swift
@@ -21,7 +21,7 @@ class EncryptionResetUITests: XCTestCase {
         app = Application.launch(.encryptionReset)
         
         // Starting with the root screen.
-        try await app.assertScreenshot(.encryptionReset, step: Step.resetScreen)
+        try await app.assertScreenshot(step: Step.resetScreen)
         
         // Confirm the intent to reset.
         app.buttons[A11yIdentifiers.encryptionResetScreen.continueReset].tap()
@@ -29,12 +29,12 @@ class EncryptionResetUITests: XCTestCase {
         
         try await Task.sleep(for: .seconds(2.0))
         
-        try await app.assertScreenshot(.encryptionReset, step: Step.passwordScreen)
+        try await app.assertScreenshot(step: Step.passwordScreen)
         
         // Enter the password and submit.
         let passwordField = app.secureTextFields[A11yIdentifiers.encryptionResetPasswordScreen.passwordField]
         passwordField.clearAndTypeText("supersecurepassword", app: app)
         app.buttons[A11yIdentifiers.encryptionResetPasswordScreen.submit].tap()
-        try await app.assertScreenshot(.encryptionReset, step: Step.resetingEncryption, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: Step.resetingEncryption)
     }
 }
diff --git a/UITests/Sources/EncryptionSettingsUITests.swift b/UITests/Sources/EncryptionSettingsTests.swift
similarity index 75%
rename from UITests/Sources/EncryptionSettingsUITests.swift
rename to UITests/Sources/EncryptionSettingsTests.swift
index 59e729da9..ea2125e78 100644
--- a/UITests/Sources/EncryptionSettingsUITests.swift
+++ b/UITests/Sources/EncryptionSettingsTests.swift
@@ -26,55 +26,55 @@ class EncryptionSettingsUITests: XCTestCase {
         app = Application.launch(.encryptionSettings)
         
         // Starting with key storage and recovery enabled.
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenSetUp)
+        try await app.assertScreenshot(step: Step.secureBackupScreenSetUp)
         
         // Toggle key storage off.
         app.switches[A11yIdentifiers.secureBackupScreen.keyStorage].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.keyBackupScreen)
+        try await app.assertScreenshot(step: Step.keyBackupScreen)
         
         // Confirm deletion of keys.
         app.buttons[A11yIdentifiers.secureBackupKeyBackupScreen.deleteKeyStorage].tap()
         app.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenDisabled)
+        try await app.assertScreenshot(step: Step.secureBackupScreenDisabled)
         
         // Toggle key storage back on and set up recovery.
         app.switches[A11yIdentifiers.secureBackupScreen.keyStorage].tap()
         app.buttons[A11yIdentifiers.secureBackupScreen.recoveryKey].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.setUpRecovery)
+        try await app.assertScreenshot(step: Step.setUpRecovery)
         
         // Generate and copy a new recovery key.
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.generateRecoveryKey].tap()
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.copyRecoveryKey].tap()
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.done].tap()
         app.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenSetUp)
+        try await app.assertScreenshot(step: Step.secureBackupScreenSetUp)
         
         // Change the recovery key.
         app.buttons[A11yIdentifiers.secureBackupScreen.recoveryKey].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.changeRecovery)
+        try await app.assertScreenshot(step: Step.changeRecovery)
         
         // Generate and copy the updated recovery key.
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.generateRecoveryKey].tap()
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.copyRecoveryKey].tap()
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.done].tap()
         app.buttons[A11yIdentifiers.alertInfo.primaryButton].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenSetUp)
+        try await app.assertScreenshot(step: Step.secureBackupScreenSetUp)
     }
     
     func testOutOfSyncFlow() async throws {
         app = Application.launch(.encryptionSettingsOutOfSync)
         
         // Starting with key storage and recovery enabled.
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenOutOfSync)
+        try await app.assertScreenshot(step: Step.secureBackupScreenOutOfSync)
         
         // Confirm the recovery key.
         app.buttons[A11yIdentifiers.secureBackupScreen.recoveryKey].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.confirmRecovery)
+        try await app.assertScreenshot(step: Step.confirmRecovery)
         
         // Enter the recovery key and submit.
         let recoveryKeyField = app.secureTextFields[A11yIdentifiers.secureBackupRecoveryKeyScreen.recoveryKeyField]
         recoveryKeyField.clearAndTypeText("sUpe RSec rEtR Ecov ERYk Ey12", app: app)
         app.buttons[A11yIdentifiers.secureBackupRecoveryKeyScreen.confirm].tap()
-        try await app.assertScreenshot(.encryptionSettings, step: Step.secureBackupScreenSetUp)
+        try await app.assertScreenshot(step: Step.secureBackupScreenSetUp)
     }
 }
diff --git a/UITests/Sources/PollFormScreenUITests.swift b/UITests/Sources/PollFormScreenTests.swift
similarity index 90%
rename from UITests/Sources/PollFormScreenUITests.swift
rename to UITests/Sources/PollFormScreenTests.swift
index 069a73d37..055f74926 100644
--- a/UITests/Sources/PollFormScreenUITests.swift
+++ b/UITests/Sources/PollFormScreenTests.swift
@@ -11,7 +11,7 @@ import XCTest
 class PollFormScreenUITests: XCTestCase {
     func testEmptyScreen() async throws {
         let app = Application.launch(.createPoll)
-        try await app.assertScreenshot(.createPoll)
+        try await app.assertScreenshot()
     }
 
     func testFilledPoll() async throws {
@@ -34,7 +34,7 @@ class PollFormScreenUITests: XCTestCase {
         let createButton = app.buttons[A11yIdentifiers.pollFormScreen.submit]
         XCTAssertTrue(createButton.isEnabled)
 
-        try await app.assertScreenshot(.createPoll, step: 1, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 
     func testMaxOptions() async throws {
@@ -57,6 +57,6 @@ class PollFormScreenUITests: XCTestCase {
         XCTAssertFalse(addOption.exists)
         XCTAssertFalse(createButton.isEnabled)
 
-        try await app.assertScreenshot(.createPoll, step: 2, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 }
diff --git a/UITests/Sources/RoomMembersListScreenUITests.swift b/UITests/Sources/RoomMembersListScreenTests.swift
similarity index 76%
rename from UITests/Sources/RoomMembersListScreenUITests.swift
rename to UITests/Sources/RoomMembersListScreenTests.swift
index c38c58a57..2fdb6aba1 100644
--- a/UITests/Sources/RoomMembersListScreenUITests.swift
+++ b/UITests/Sources/RoomMembersListScreenTests.swift
@@ -12,7 +12,7 @@ class RoomMembersListScreenUITests: XCTestCase {
     func testJoinedAndInvitedMembers() async throws {
         let app = Application.launch(.roomMembersListScreenPendingInvites)
         
-        try await app.assertScreenshot(.roomMembersListScreenPendingInvites)
+        try await app.assertScreenshot()
     }
     
     func testSearchInvitedMember() async throws {
@@ -21,7 +21,7 @@ class RoomMembersListScreenUITests: XCTestCase {
         let searchBar = app.searchFields.firstMatch
         searchBar.clearAndTypeText("alice\n", app: app)
         
-        try await app.assertScreenshot(.roomMembersListScreenPendingInvites, step: 1, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testSearchJoinedMember() async throws {
@@ -30,6 +30,6 @@ class RoomMembersListScreenUITests: XCTestCase {
         let searchBar = app.searchFields.firstMatch
         searchBar.clearAndTypeText("bob\n", app: app)
         
-        try await app.assertScreenshot(.roomMembersListScreenPendingInvites, step: 2, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 }
diff --git a/UITests/Sources/RoomRolesAndPermissionsUITests.swift b/UITests/Sources/RoomRolesAndPermissionsTests.swift
similarity index 70%
rename from UITests/Sources/RoomRolesAndPermissionsUITests.swift
rename to UITests/Sources/RoomRolesAndPermissionsTests.swift
index 1c0e77cab..32eec7fc0 100644
--- a/UITests/Sources/RoomRolesAndPermissionsUITests.swift
+++ b/UITests/Sources/RoomRolesAndPermissionsTests.swift
@@ -23,25 +23,25 @@ class RoomRolesAndPermissionsUITests: XCTestCase {
     func testFlow() async throws {
         app = Application.launch(.roomRolesAndPermissionsFlow)
         
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.rolesAndPermissions)
+        try await app.assertScreenshot(step: Step.rolesAndPermissions)
         
         app.buttons[A11yIdentifiers.roomRolesAndPermissionsScreen.administrators].tap()
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.administratorsRole)
+        try await app.assertScreenshot(step: Step.administratorsRole)
         app.navigationBars.buttons.element(boundBy: 0).tap()
         
         app.buttons[A11yIdentifiers.roomRolesAndPermissionsScreen.moderators].tap()
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.moderatorsRole)
+        try await app.assertScreenshot(step: Step.moderatorsRole)
         app.navigationBars.buttons.element(boundBy: 0).tap()
         
         app.buttons[A11yIdentifiers.roomRolesAndPermissionsScreen.roomDetails].tap()
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.roomDetailsPermissions)
+        try await app.assertScreenshot(step: Step.roomDetailsPermissions)
         app.navigationBars.buttons.element(boundBy: 0).tap()
         
         app.buttons[A11yIdentifiers.roomRolesAndPermissionsScreen.messagesAndContent].tap()
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.messagesAndContentPermissions)
+        try await app.assertScreenshot(step: Step.messagesAndContentPermissions)
         app.navigationBars.buttons.element(boundBy: 0).tap()
         
         app.buttons[A11yIdentifiers.roomRolesAndPermissionsScreen.memberModeration].tap()
-        try await app.assertScreenshot(.roomRolesAndPermissionsFlow, step: Step.memberModerationPermissions)
+        try await app.assertScreenshot(step: Step.memberModerationPermissions)
     }
 }
diff --git a/UITests/Sources/RoomScreenUITests.swift b/UITests/Sources/RoomScreenTests.swift
similarity index 81%
rename from UITests/Sources/RoomScreenUITests.swift
rename to UITests/Sources/RoomScreenTests.swift
index e9097f137..c29306441 100644
--- a/UITests/Sources/RoomScreenUITests.swift
+++ b/UITests/Sources/RoomScreenTests.swift
@@ -15,14 +15,14 @@ class RoomScreenUITests: XCTestCase {
         XCTAssert(app.staticTexts[A11yIdentifiers.roomScreen.name].exists)
         XCTAssert(app.staticTexts[A11yIdentifiers.roomScreen.avatar].exists)
 
-        try await app.assertScreenshot(.roomPlainNoAvatar, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testSmallTimelineLayout() async throws {
         let app = Application.launch(.roomSmallTimeline)
         
         // The messages should be bottom aligned.
-        try await app.assertScreenshot(.roomSmallTimeline, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testSmallTimelineWithIncomingAndPagination() async throws {
@@ -38,7 +38,7 @@ class RoomScreenUITests: XCTestCase {
         try await performOperation(.paginate, using: client)
 
         // Then the 4 visible messages should stay aligned to the bottom.
-        try await app.assertScreenshot(.roomSmallTimelineIncomingAndSmallPagination, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testSmallTimelineWithLargePagination() async throws {
@@ -53,7 +53,7 @@ class RoomScreenUITests: XCTestCase {
         try await performOperation(.paginate, using: client)
 
         // The bottom of the timeline should remain visible with more items added above.
-        try await app.assertScreenshot(.roomSmallTimelineLargePagination, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testTimelineLayoutAtTop() async throws {
@@ -68,13 +68,13 @@ class RoomScreenUITests: XCTestCase {
         for _ in 0...5 {
             app.swipeDown()
         }
-        try await app.assertScreenshot(.roomLayoutTop, delay: .seconds(0.5)) // Assert initial state for comparison.
+        try await app.assertScreenshot() // Assert initial state for comparison.
         
         // When a back pagination occurs.
         try await performOperation(.paginate, using: client)
 
         // Then the bottom of the timeline should remain unchanged (with new items having been added above).
-        try await app.assertScreenshot(.roomLayoutTop, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 
     func testTimelineLayoutAtBottom() async throws {
@@ -93,12 +93,12 @@ class RoomScreenUITests: XCTestCase {
         try await Task.sleep(for: .seconds(1))
         
         // Then the timeline should scroll down to reveal the message.
-        try await app.assertScreenshot(.roomLayoutBottom, step: 0, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: 0)
         
         // When the keyboard appears for the message composer.
         try await tapMessageComposer(in: app)
         
-        try await app.assertScreenshot(.roomLayoutBottom, step: 1, delay: .seconds(0.5))
+        try await app.assertScreenshot(step: 1)
     }
     
     func testTimelineLayoutHighlightExisting() async throws {
@@ -113,7 +113,7 @@ class RoomScreenUITests: XCTestCase {
         try await performOperation(.focusOnEvent("$5"), using: client)
         
         // Then the item should become highlighted.
-        try await app.assertScreenshot(.roomLayoutHighlight, step: 0, delay: .seconds(0.5))
+        try await app.assertScreenshot()
         
         guard UIDevice.current.userInterfaceIdiom == .phone else { return }
         
@@ -123,32 +123,32 @@ class RoomScreenUITests: XCTestCase {
         try await performOperation(.focusOnEvent("$5"), using: client)
         
         // Then the item should also be highlighted and scrolled to in the same state as before.
-        try await app.assertScreenshot(.roomLayoutHighlight, step: 0)
+        try await app.assertScreenshot()
     }
 
     func testTimelineReadReceipts() async throws {
         let app = Application.launch(.roomSmallTimelineWithReadReceipts)
 
         // The messages should be bottom aligned.
-        try await app.assertScreenshot(.roomSmallTimelineWithReadReceipts, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 
     func testTimelineDisclosedPolls() async throws {
         let app = Application.launch(.roomWithDisclosedPolls)
 
-        try await app.assertScreenshot(.roomWithDisclosedPolls)
+        try await app.assertScreenshot()
     }
 
     func testTimelineUndisclosedPolls() async throws {
         let app = Application.launch(.roomWithUndisclosedPolls)
 
-        try await app.assertScreenshot(.roomWithUndisclosedPolls)
+        try await app.assertScreenshot()
     }
 
     func testTimelineOutgoingPolls() async throws {
         let app = Application.launch(.roomWithOutgoingPolls)
 
-        try await app.assertScreenshot(.roomWithOutgoingPolls)
+        try await app.assertScreenshot()
     }
 
     // MARK: - Helper Methods
diff --git a/UITests/Sources/ServerSelectionUITests.swift b/UITests/Sources/ServerSelectionTests.swift
similarity index 86%
rename from UITests/Sources/ServerSelectionUITests.swift
rename to UITests/Sources/ServerSelectionTests.swift
index 67fdb867a..24a3adb59 100644
--- a/UITests/Sources/ServerSelectionUITests.swift
+++ b/UITests/Sources/ServerSelectionTests.swift
@@ -14,7 +14,7 @@ class ServerSelectionUITests: XCTestCase {
         let app = Application.launch(.serverSelection)
         
         // Then it should be configured for matrix.org
-        try await app.assertScreenshot(.serverSelection, step: 0)
+        try await app.assertScreenshot()
     }
 
     func testEmptyAddress() async throws {
@@ -26,7 +26,7 @@ class ServerSelectionUITests: XCTestCase {
         app.textFields[A11yIdentifiers.changeServerScreen.server].buttons.element.tap()
         
         // Then the screen should not allow the user to continue.
-        try await app.assertScreenshot(.serverSelection, step: 1, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 
     func testInvalidAddress() async throws {
@@ -37,7 +37,7 @@ class ServerSelectionUITests: XCTestCase {
         app.textFields[A11yIdentifiers.changeServerScreen.server].clearAndTypeText("thisisbad\n", app: app) // The tests only accept an address from LoginHomeserver.mockXYZ
         
         // Then an error should be shown and the confirmation button disabled.
-        try await app.assertScreenshot(.serverSelection, step: 2, delay: .seconds(0.5))
+        try await app.assertScreenshot()
         XCTAssertFalse(app.buttons[A11yIdentifiers.changeServerScreen.continue].isEnabled, "The continue button should be disabled when there is an error.")
     }
 }
diff --git a/UITests/Sources/SessionVerificationUITests.swift b/UITests/Sources/SessionVerificationTests.swift
similarity index 62%
rename from UITests/Sources/SessionVerificationUITests.swift
rename to UITests/Sources/SessionVerificationTests.swift
index de33b48db..dae55daec 100644
--- a/UITests/Sources/SessionVerificationUITests.swift
+++ b/UITests/Sources/SessionVerificationTests.swift
@@ -23,61 +23,61 @@ class SessionVerificationUITests: XCTestCase {
     
     func testChallengeMatches() async throws {
         let app = Application.launch(.sessionVerification)
-        try await app.assertScreenshot(.sessionVerification, step: Step.initialState)
+        try await app.assertScreenshot(step: Step.initialState)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.requestVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForOtherDevice)
+        try await app.assertScreenshot(step: Step.waitingForOtherDevice)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.useEmojiComparisonPrompt)
+        try await app.assertScreenshot(step: Step.useEmojiComparisonPrompt)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForEmojis)
+        try await app.assertScreenshot(step: Step.waitingForEmojis)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.acceptChallenge].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.compareEmojis)
+        try await app.assertScreenshot(step: Step.compareEmojis)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.acceptChallenge].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.acceptingEmojis)
+        try await app.assertScreenshot(step: Step.acceptingEmojis)
         
         XCTAssert(app.staticTexts[A11yIdentifiers.sessionVerificationScreen.verificationComplete].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.verificationComplete)
+        try await app.assertScreenshot(step: Step.verificationComplete)
     }
     
     func testChallengeDoesNotMatch() async throws {
         let app = Application.launch(.sessionVerification)
-        try await app.assertScreenshot(.sessionVerification, step: Step.initialState)
+        try await app.assertScreenshot(step: Step.initialState)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.requestVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForOtherDevice)
+        try await app.assertScreenshot(step: Step.waitingForOtherDevice)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.useEmojiComparisonPrompt)
+        try await app.assertScreenshot(step: Step.useEmojiComparisonPrompt)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForEmojis)
+        try await app.assertScreenshot(step: Step.waitingForEmojis)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.acceptChallenge].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.compareEmojis)
+        try await app.assertScreenshot(step: Step.compareEmojis)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.declineChallenge].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.verificationCancelled)
+        try await app.assertScreenshot(step: Step.verificationCancelled)
     }
     
     func testSessionVerificationCancelation() async throws {
         let app = Application.launch(.sessionVerification)
-        try await app.assertScreenshot(.sessionVerification, step: Step.initialState)
+        try await app.assertScreenshot(step: Step.initialState)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.requestVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForOtherDevice)
+        try await app.assertScreenshot(step: Step.waitingForOtherDevice)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.useEmojiComparisonPrompt)
+        try await app.assertScreenshot(step: Step.useEmojiComparisonPrompt)
         
         app.buttons[A11yIdentifiers.sessionVerificationScreen.startSasVerification].tap()
-        try await app.assertScreenshot(.sessionVerification, step: Step.waitingForEmojis)
+        try await app.assertScreenshot(step: Step.waitingForEmojis)
         
         XCTAssert(app.buttons[A11yIdentifiers.sessionVerificationScreen.acceptChallenge].waitForExistence(timeout: 10.0))
-        try await app.assertScreenshot(.sessionVerification, step: Step.compareEmojis)
+        try await app.assertScreenshot(step: Step.compareEmojis)
     }
 }
diff --git a/UITests/Sources/StartChatScreenUITests.swift b/UITests/Sources/StartChatScreenTests.swift
similarity index 83%
rename from UITests/Sources/StartChatScreenUITests.swift
rename to UITests/Sources/StartChatScreenTests.swift
index 08ed8fb90..c707079f7 100644
--- a/UITests/Sources/StartChatScreenUITests.swift
+++ b/UITests/Sources/StartChatScreenTests.swift
@@ -11,7 +11,7 @@ import XCTest
 class StartChatScreenUITests: XCTestCase {
     func testLanding() async throws {
         let app = Application.launch(.startChat)
-        try await app.assertScreenshot(.startChat)
+        try await app.assertScreenshot()
     }
     
     func testSearchWithNoResults() async throws {
@@ -19,7 +19,7 @@ class StartChatScreenUITests: XCTestCase {
         let searchField = app.searchFields.firstMatch
         searchField.clearAndTypeText("None\n", app: app)
         XCTAssert(app.staticTexts[A11yIdentifiers.startChatScreen.searchNoResults].waitForExistence(timeout: 1.0))
-        try await app.assertScreenshot(.startChat, step: 1, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
     
     func testSearchWithResults() async throws {
@@ -28,6 +28,6 @@ class StartChatScreenUITests: XCTestCase {
         searchField.clearAndTypeText("Bob\n", app: app)
         XCTAssertFalse(app.staticTexts[A11yIdentifiers.startChatScreen.searchNoResults].waitForExistence(timeout: 1.0))
         XCTAssertEqual(app.collectionViews.firstMatch.cells.count, 2)
-        try await app.assertScreenshot(.startChat, step: 2, delay: .seconds(0.5))
+        try await app.assertScreenshot()
     }
 }
diff --git a/UITests/Sources/UserSessionScreenTests.swift b/UITests/Sources/UserSessionScreenTests.swift
index 0686e13e5..dbf76c337 100644
--- a/UITests/Sources/UserSessionScreenTests.swift
+++ b/UITests/Sources/UserSessionScreenTests.swift
@@ -16,15 +16,15 @@ class UserSessionScreenTests: XCTestCase {
         
         app.swipeDown() // Make sure the header shows a large title
         
-        try await app.assertScreenshot(.userSessionScreen, step: 1)
+        try await app.assertScreenshot(step: 1)
 
         app.buttons[A11yIdentifiers.homeScreen.roomName(firstRoomName)].tap()
         XCTAssert(app.staticTexts[firstRoomName].waitForExistence(timeout: 5.0))
         try await Task.sleep(for: .seconds(1))
-        try await app.assertScreenshot(.userSessionScreen, step: 2)
+        try await app.assertScreenshot(step: 2)
 
         app.buttons[A11yIdentifiers.roomScreen.composerToolbar.openComposeOptions].tapCenter()
-        try await app.assertScreenshot(.userSessionScreen, step: 3)
+        try await app.assertScreenshot(step: 3)
     }
 
     func testUserSessionReply() async throws {
@@ -36,7 +36,7 @@ class UserSessionScreenTests: XCTestCase {
         let cell = app.cells.element(boundBy: 1) // Skip the typing indicator cell
         cell.swipeRight(velocity: .fast)
 
-        try await app.assertScreenshot(.userSessionScreenReply)
+        try await app.assertScreenshot()
     }
 
     func testElementCall() async throws {
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-1-en-GB-99.png
new file mode 100644
index 000000000..565c1905d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:180743191fcf9af0de19525e3fa649e89cb24c9e5be1cd77b6da96272c71aa14
+size 66254
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-99-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockFlow-99-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockFlow-0-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..ffc1dc29e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f17a493508ec7c8d7a3608e1dc17a134bc20d3e891b7d386e3a989175850bf04
+size 107079
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-99-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockFlow-99-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockFlow-0-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..96c52fc36
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba85903b9410ef1799d981b18354474f265b23ada14c616402d7c777e7054bbe
+size 119199
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png
new file mode 100644
index 000000000..7a1721a54
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff7b6a42a6a36f2f9f717bc967bfd78d758fb3ce8b4a3d16220a2211fd24f61b
+size 57129
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..582315f4a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67c559de04b481b370c3f02e4ad737403f393691cef4cb5ef9362a2946bc8adb
+size 1298585
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-99-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-99-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..f9c2a670c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2129e9965746b2c46997831bfccfaf2ccc95d0a5a0087c14520cd33d910972c5
+size 948014
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-99.png
new file mode 100644
index 000000000..7a1721a54
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff7b6a42a6a36f2f9f717bc967bfd78d758fb3ce8b4a3d16220a2211fd24f61b
+size 57129
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..ffc1dc29e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f17a493508ec7c8d7a3608e1dc17a134bc20d3e891b7d386e3a989175850bf04
+size 107079
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..c3c948811
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93e676ab4e92ce0e3e74053bc92a1d40f21bf838f61b65d85870f358169e1a02
+size 108229
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..10a00f87e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb5fe2b3a34ccae29a0edca430d4309375c6afcc783c07eec045ed999476e9dd
+size 245978
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..b594aa726
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ac4dcb7cd838276d22502d7b3bdf2c656e8ec18cfa49f58b8e360147200b8c8
+size 119260
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-99.png
new file mode 100644
index 000000000..83ca611ef
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1246f8b0f5a56918a8a0dc11436fc44f981eece24b8876ebce1ef9922fd93d67
+size 64833
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..96c52fc36
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba85903b9410ef1799d981b18354474f265b23ada14c616402d7c777e7054bbe
+size 119199
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..f8131beb3
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c12efc3f647aad33d2acf44902f418d2defbc03f67bf07a15ffdc2438e60dcf
+size 120307
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..0a5363ed6
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10f6f648ae629a8b2b6b5f957a71a34debbfbe89327637dbddbdd76c9a79b69f
+size 387060
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..af1d28341
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2372478a7214c51d2d8cd632a50069946fb596760edb579c8c806f07faec041
+size 134539
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-99.png
new file mode 100644
index 000000000..7a1721a54
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff7b6a42a6a36f2f9f717bc967bfd78d758fb3ce8b4a3d16220a2211fd24f61b
+size 57129
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 34d4bd11b..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b16d8bffe575dbb20cd9ec78ef4750edcbbe75f7e9726771584b272935a1eff
-size 107103
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index fb3006121..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b32ae450f9873664aa7010f14bc5c32f764e7d8f2c8fb29c61b08342668ec820
-size 119196
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 6e8844768..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ece1e4397aca92f8394aafdf7495ffeaaec3621bb31cc49cd5645e0b134f11f
-size 108257
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index f4641cde6..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6eb0c25cd2a799a253b92f1b04b2a7b9cf7a734dc0f8b8610ad427d7b25ef48d
-size 120307
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8e2cc629d..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:907d3be4bef23d70e41249c6b73006309822a8fb4a67e3b06382d2ee803392f3
-size 245970
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index a8449e1f7..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-3-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:991a0c6281fd3a7a280fb842b0adbcab4879a9bdbbdfba77d31dd6d751dafc49
-size 387057
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index b0a875906..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:318cf076f437c24e2a878fcc4b5db1effb6f77c6ebe8a6a21e73657ef9315a0f
-size 119247
diff --git a/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 8a1bdafe2..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockFlow-4-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d38fd4080538033e0e56889cf375584b77e6045bb665f4db55362161b46f3af4
-size 134555
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB-99.png
new file mode 100644
index 000000000..83ca611ef
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1246f8b0f5a56918a8a0dc11436fc44f981eece24b8876ebce1ef9922fd93d67
+size 64833
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..8bf144187
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:befa476bc2cf2c6b8e3e7670fa9c0a8eb672f8b91301e1bdb1e84634af41e1cb
+size 139690
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-99-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-99-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..f4bc160c7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f3aa49a3e21a62edf61d697972b7d40ccf987198ea5047ecb7635d8c3932b69
+size 82727
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..ec1ee5d17
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ebecc8c5bf382df5bcb4750a96f93fd1de093b4dab507ee65c3e440e5b6c2ed
+size 152097
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..0b32d3ca3
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f8b736dc8897b992a197f3ce235ac4cc1f63f36b45bfa63561118b8714f2637
+size 151743
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..029a8b6f8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef84d325ff4f091c6e136f16416d90c3542ad358a70f08e4436ffd9946f5a999
+size 82486
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..cfb6b742c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e31ec858ed724977857addd0a65170740ae58b547afa81b56b13748b4937d3c
+size 172259
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png
new file mode 100644
index 000000000..6fd5f6089
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83f6b63c31a8b2ca26a058872291774392a01890616dcc2fd2f675077c06c89a
+size 171851
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png
new file mode 100644
index 000000000..83ca611ef
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1246f8b0f5a56918a8a0dc11436fc44f981eece24b8876ebce1ef9922fd93d67
+size 64833
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..96e91fd92
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ba80ae09fb465a5abc014de375094527aaf931b1a69aa3f7764815e09ca064b
+size 95827
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..b942277b1
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48fa8f1042d17890ff132fdbe07841e58fe70909ed83360a0a1ab5dbc9dbc104
+size 95522
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..758394a12
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7378f5adfd525aaee8a4ab42f2ed0cc98c54ca0a1c87faa9c61c5d1f824f960
+size 83655
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png
new file mode 100644
index 000000000..e1178f661
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3648ac4fc1c98576a3516afdf280a37c00e44d0c4ee1519b849291c34660aef9
+size 56204
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..1e2f8ad84
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:006f005339c2a986769038d2f015a2e9dc2285fb80cff0ac38eddda842a2f4c5
+size 89868
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..300ce3e7e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37a1b6e23665ab8f0363f2c572c72aed075891cc9e636197b4952579897820e8
+size 89485
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..082000a19
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad1a00cf2c8eb6508cf9c170a5c014d51ea69b14de9b90d9dfee0fbd47ad7e0e
+size 90752
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..4f36ca342
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cc2812541983bf300e6e62315a5401ce66ad29fc2bd05e605d4ff4c8163d6ca
+size 90433
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-3-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png
new file mode 100644
index 000000000..83ca611ef
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1246f8b0f5a56918a8a0dc11436fc44f981eece24b8876ebce1ef9922fd93d67
+size 64833
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..8bf144187
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:befa476bc2cf2c6b8e3e7670fa9c0a8eb672f8b91301e1bdb1e84634af41e1cb
+size 139690
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetupFlow-3-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png
new file mode 100644
index 000000000..e1178f661
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3648ac4fc1c98576a3516afdf280a37c00e44d0c4ee1519b849291c34660aef9
+size 56204
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..f4bc160c7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f3aa49a3e21a62edf61d697972b7d40ccf987198ea5047ecb7635d8c3932b69
+size 82727
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8e24d84d4..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a9088fb4b320bdae5714e27ce37246287314086513751e4e295258110b7ef3a
-size 152117
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 68f9ef1b0..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b84b3822271da60548b5377a15b691f29fe0342bdb1832ec2ca625e063f70fe
-size 95862
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 7bd4df4f5..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3feacce0433a2c01983cece54991e07f900d4fcd1204293b7fbf086493744749
-size 151761
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 4b543334a..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69be9ad1028840f0647dd3bdf145792af5c71016083662954800660d9f705618
-size 95557
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-4-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-4-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index fcee35198..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-4-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45c4fe3dea366978d7f5f2b2fdec5f4adc2b77eec2d9a06909aa93e0f9bdac98
-size 172282
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-5-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-5-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 091c79e6f..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlow-5-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca28b102ed02b26d6136f28165d5859879a8def084c3e9312dfa6c80b63b20e8
-size 171874
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index d74f5b63f..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:29451cacdf506cf7fcb458bdb9dcc922bded3b655ad35a7334579d0477d92a48
-size 89891
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 7062050fa..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d385efc1e1bc3e2353a172a370e5c8d7c24016af24b657f1528b091593abc000
-size 90772
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 7fdcb524e..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc04a1b65075e130ea2334746496f1547188b3e84c14608877aa6217f2a2d2d5
-size 89507
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 6fb1ea53b..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowMandatory-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e28519408070f07c0812f419476c56fe440c8effd9b9e5c491092259a29292b
-size 90458
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 3edccb798..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a54d207472a94758bc5fb6c98dc99593176f6593c6ba8ae33890d8ba4b50507e
-size 139710
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 8d12c66ca..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetupFlowUnlock-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79c998e7c0d5ce6fe9eb5c4040a0a59b0a0806a2ab710173db4c4785946076d6
-size 82753
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index cc6eef7a2..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eca0528523edae6dfae1cb8087c1aeb12224102c26b0fa7db99a17729fb22740
-size 167101
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-15-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-15-en-GB.UI.png
deleted file mode 100644
index 5de379a22..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-15-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58bcbecf677ba5b1ce9fc86a541e1df0389464677b882d34903be09512c65f46
-size 94767
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index fa53f300f..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlow-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4c1065c8cbd078860b9a8ab1c8579e48488794c23c6c1895c5b275c9c0ba0b6
-size 266840
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 772589b52..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef5e6b24ab13e84fd763387cdeeb60255d4acd37daf1b34d01c7a706139dff6f
-size 84644
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 14920505f..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlow-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cb6285b10fe064ea7ab09df509044ace622f9c5be87bc6fe59205a0b1f08aef
-size 87787
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..86d865781
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:835678f4881b61cc57a2695b9e55c401bf2f95adcfdc94c1448438ec4f2fd01e
+size 84623
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..8b4acc17e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44652302192e3e5877eb731b05f710ce32663854f9eb6ba6a36ad2e0a0860b02
+size 87758
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..599c52443
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca45475a92f7cf7e058e9e6aec7c1b8d71d2e5ec01304fa17c64a10fc9ece387
+size 167076
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..12898b6f9
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b4b5b0b562fd610b3de3c7949ec39e28b1078ce59e54b515f256547386dcf48
+size 266822
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 2d7bf98c5..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9a40262e1c2588be6f35f09c6e1974fc925f9edf899be056e45ffcdf5e2ac71
-size 137444
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index d4bf4f06b..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bf80e63f574f22ddfe4f045c0a0a57b67ef4ababefafe4be8820ae59f35ce8e
-size 172930
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8521f366e..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7b14d8fc973cf920445b2dbcda93908ced0bf2cd4ac4135e133a6bb6fbee7f00
-size 204746
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 346596755..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27f6ae4c920ade62e2c6078d16d3f6cf6c2988f76869a413d2b92a2a6ec0d497
-size 198666
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-3-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8a86d5a17..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-3-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56860531fa683fe7be9e90a2a4c41ffc3e207b7bb1ad7d993ae5c1a3e7442fd5
-size 208800
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/bugReport-3-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 785f0f2e1..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport-3-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a20a079f678aceeaa514b478a6222a03722047658c109a5a9a60e02477c9d7a
-size 204134
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..0c9d6d860
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e422a0fcb71bc3976d29fa94b1baa6c94982ea10b3d647829e7f3ed4ea6743a4
+size 138851
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..24f2289e7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73da7f39ec610d1c83c6dba5ee11e2ac5abf48f0902b56001938d1e29c3827ce
+size 172921
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..0d90bed5c
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e2ab570b42fd68b0a6c1f9214586fc70991dd98b91c2e2cbb177b81584615e7
+size 204731
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..c75ddc344
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1e03d4f18b9c73c44b3ad75ee99bf8e66812b50f838abd4615dbca83552f859
+size 198664
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createPoll-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 7954a1a9a..000000000
--- a/UITests/Sources/__Snapshots__/Application/createPoll-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4fc263b4a8b497c869c6d16b98da492d1d51e30e7588144c9091279ae00b7cc
-size 103936
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createPoll-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index bdcf74032..000000000
--- a/UITests/Sources/__Snapshots__/Application/createPoll-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4e8333429b76cc93561150b4c604214bbccfd283c4305ad32b00a7263249494
-size 299629
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createPoll-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 90d551b2b..000000000
--- a/UITests/Sources/__Snapshots__/Application/createPoll-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1ebd8664d4f9e7342b3de70d28c6910aabd712a26f57eeaa230b34232e4620f2
-size 114467
diff --git a/UITests/Sources/__Snapshots__/Application/createRoom-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoom-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index de46c5bc5..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoom-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ea454317e445b45d5b53b80df27a340c2e688aa05b980f516ae63f13cb390117
-size 137394
diff --git a/UITests/Sources/__Snapshots__/Application/createRoom-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoom-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index de65c3365..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoom-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6601de73bb862d6bc7884454f0a5c5853af52508fccb34e9e3fa594a20ac8e76
-size 169179
diff --git a/UITests/Sources/__Snapshots__/Application/createRoom-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoom-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 0cbf83aec..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoom-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c4b4403f6788ebb6d758b2dfd9888446b71062c0aeee3457ff43e191f50a5b67
-size 140119
diff --git a/UITests/Sources/__Snapshots__/Application/createRoom-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoom-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index b506b02a8..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoom-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aba0836ae9da833a01cb5e2a63667a526a9780dd04a2070380674c6871a1e9f5
-size 174946
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8bb960908..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72fdd9d0401b35474fd19dd4d019b7ab859804eb2da7d9d4e45e13d130dffb66
-size 120870
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index d6f69b749..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoomNoUsers-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19b5bfccc057323b2cbb8cec0e991f99cc4164b46001b075438fcaee7d9b40b9
-size 147319
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..61e9284b4
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3486ce5d6c7e0e93f0488dfb6d43ee5fe70abeb730424a071e6166433681f6ea
+size 140127
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..e13392cf2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4da56c6c60ba51cda29575222681b5224f757834cc7d732f28d8549dbbe7bf08
+size 174980
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..357edb79b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:252cc8fb0047c1848348e064d6f0489737ac43abdc72ecc7a65bc95a75a0725d
+size 122294
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..f679339a5
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff3ade887ac3035a620439595c181b9be5c52e7bf3fad06e4793b467109d66c9
+size 147351
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..0f6a563f8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ff6492aaa8483cdceb4880cfe5e328317adea3f5a9557d7e78ac6950b780799
+size 137374
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..a330f78aa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d90cb28c13fddc32e70fcce26af2e640e6bd540cf6ecc59162b888d4178eeb49
+size 169185
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 5281d148e..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bfdbc7569c8045b560d285cbaf7c5f8cbf5ad272cf31f8ae2990a39c80e4b420
-size 130974
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 980a5a856..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c679f265a0fc89823e374af49a3f86ed43687d568dddc195e3fdfc4ba32f8830
-size 162260
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index c06d19dde..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9720f0cd45534c9699eef06f8a2afd1504d5b51a8773b2b76585002b23d67b77
-size 92574
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 5b9cf6bc8..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7170468705d17c9ba1c6062524d2ccc4cbbd54fd45f1056e53921b20fb6756f9
-size 98637
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 509abe7e6..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:84bef70566c8c096ff09fb170bef8c290dc42dc9616d061822182c5ce400977a
-size 139156
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 101c1bc86..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9964a91c6beafb9109c237af60a6c0035e0b024a01a13ec5183a8a0a11cec55e
-size 175528
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..3d1b0b942
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ccdb9e7ae4f8f99921b5d6dbaa3c3a51d9e98aede1a769d0b87c874182c23cb
+size 130994
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..96ecb0294
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98ee4691c0fcaac1d54287193ed0a57824fd07d336ec13f2ef180d5f33769810
+size 92555
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..6ca24d996
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ea17d2f1bf968752ee2d68a758aae96f3acde1dc1c7fd0d7882be69716e133e
+size 139195
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..561355593
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c9fedfc8a81a691195ae499c18010424555bdd966404585731e516c7c708d8c
+size 161880
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..65722c8f8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0a25be97935a6aa88f0c70ec55244baa331674e4226bc49aa1788351d36e9ce
+size 98618
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..34a45fe6a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08a7eb4c805da580d7e5da3a2b624d6427d85fa38d86e778b2fb1836f3ffebf5
+size 175576
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 12ec2feb4..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28d3ae3eb6b7ed45c41e1381c052a080906ff767aad74562e09b34b432ba1f06
-size 119892
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 72cb8d502..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7753ecb9a032c14ac1b53ec94dfaf055da89c3d053b0dd095b15b291129730
-size 141912
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index f1d54f65d..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8e4ec5fbc01dde26736b82548979d9f4a79d43af909866273bc5ac4b13d655c3
-size 232964
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 6927910c3..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:80aba66c07ef703d8ce57bd40d4a607b8a3773a507d25033f4cdb5a4cb6f56a8
-size 157260
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index b4c4af124..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9690d135c26b3bef7c9e1ecd25fe5a45605bf1838f5f3d22f34ef4cc47cf59dc
-size 211322
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 73c8e1b27..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-3-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01ad1f5b3472beca2c2239e843b4494cabdd2ba96c5c7b28237b1b8a0e1e03c4
-size 122266
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 7c9179123..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1bfdba161a6e974df12efd09a48cd905d8162c828c2e6af99eaed74a8631891b
-size 210352
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index f01bfd51d..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-4-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b4369b466a845da162589487608c50c6375016517a20ddbdb9211524e35d266
-size 120271
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 681c5958c..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59b95216f4ee18fa2b5c35fa237caf58ac7a976ef70c2a52c6a95ada9966c9c1
-size 76515
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 41ff76b1d..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-5-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:745a30111d340511f2be87af6df4ce85ec00baa7d1b085b1082c922337c59ca2
-size 72736
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index ed948b291..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca24039f2eacc6517cb7131cfba469fc3db152e7fa28e63307047b170344c17b
-size 165666
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 4e4744115..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings-6-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b12eda65d7c9b472d156e7a964d6bf962810e881d5310bf04932a05a74a2443
-size 100696
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..53699b679
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83b7d7d2be3117fd1ea2c22609a469c321477fa011cb756a0714e6593a6fd4d1
+size 119891
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..a8c731203
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eea2417904e097aa9335bccbaefd6997072b2522e96b8bd4805f67da6246c31a
+size 233050
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..88e7ad574
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b7f9e823701d9c5e7787d58434c59b363542b8cd094d3621fbc5075d8596037
+size 211400
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..10db1b3a3
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2898bc603c36b6006d2d0fd0035cf962f549bbc5f62fa8164551f35580ade04d
+size 210396
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..ffe34a8f2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8abd9025e4df120f0c0cbb642006cbd0a4424a7277ddf3efb71a69d974424c76
+size 141916
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..03ff41d8d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:153fc7f22df5d775c384750d674a9168a6bb4635a02d1c9928f00d7f2246bef9
+size 157271
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..58a32deb7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ef99497f06885298e89f91e962d695f3c99c94993be7843db3d56a4cd5520be
+size 122320
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..9f154ce7f
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:852de4fa108919701709e11d7c595cbadb57fe8ffeaefb56a904c7ca1bd257fa
+size 120323
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..53699b679
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83b7d7d2be3117fd1ea2c22609a469c321477fa011cb756a0714e6593a6fd4d1
+size 119891
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png
new file mode 100644
index 000000000..cd6031615
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:007e5dc4a14f2a0ffdffa0bfcc874215d0bc2b740451fb97eb9a636caec9e3f3
+size 76512
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png
new file mode 100644
index 000000000..3d7b47d51
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72d0f661be918bb2a96ca5c80e2d418e52c026e61b631054ca483df132c3e23c
+size 165652
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..ffe34a8f2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8abd9025e4df120f0c0cbb642006cbd0a4424a7277ddf3efb71a69d974424c76
+size 141916
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png
new file mode 100644
index 000000000..bfdeeee35
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e795ca6840b61d4f620d21d47419f2bb43983991f7cbd61f9ba019c25a614aec
+size 73655
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png
new file mode 100644
index 000000000..78a534d3d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78e3f1182c9c8812b683a0ababc0a2b881babf07eadaec1883eb7d6cc92bc4a2
+size 100755
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createPoll-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..c60e2afb2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b1a834aae79a2d4bda5d0e82db18f562dc1419d781769c87451ac9aed8b3da0
+size 113413
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createPoll-1-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..9e0428917
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3306cfa95d7498f1b9b51601fc4850726fe9a069becfff80b5d6bc08df284df
+size 103915
diff --git a/UITests/Sources/__Snapshots__/Application/createPoll-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createPoll-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..42707f410
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:860ce4ca442b8c5b5936aa0da77d9efa885e1ec86f9e12f02c4d828e918e8f47
+size 299469
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 96b6df0ef..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33c0d502069e71ec96cadcf902183b40104f35a0604917d705d3e24ba52769ce
-size 320629
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-1-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-1-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreenPendingInvites-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 1a3ec4c23..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5eac87f902045f987c427439e2e209ec7c05cf0b377e028b6c7193e445d2df32
-size 294459
diff --git a/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 0d7bdfb67..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomPlainNoAvatar-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04963d47842e5e0ecab7014c881a922971597ab9efa1a275d095e368576ef089
-size 372770
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..759c2c566
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ebb044bda47c1bbe131067e1e10a0245d4c6dd972621370cd90539ba523d220
+size 113591
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..d6c1f733b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd246a868a1fcc858ffe70b1025c82070c3026406dbcef30101998764319bb7a
+size 226371
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..6c7d36593
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1b4649fcece1c1ae5c7ab9e5f73c34533dbde046e575eb9073fdb2ac14a2eab
+size 203091
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..5e886988f
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:393300eb377fc1b839b6c5c16449eb5052b58fc10b6eef72ce837e010c1a7ab8
+size 119859
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..ca02274cf
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15b1734ebec92dfd54ec0c9e0e484518c52dea75184fe7b3d5804f2661867041
+size 101618
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png
new file mode 100644
index 000000000..753642aa5
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e67363313218e85edae0114d7509123106b18dba87ddeaf7b1c79f7116d255df
+size 125290
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..f78a30258
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2ce8e1ddfd01854d8cc71ff979c545761c00687cc3afbbea5629e1869232ad9
+size 132108
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..dc7058179
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb893ce3689be8818a7a3984a6b38b237f560148184b240a37be7a90a2739de1
+size 291508
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..928a58532
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9df4fe228cfaaad395ce544b68e721f5f35f5edb7a0a89c70e92c287f6077897
+size 220310
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..0af9a2f73
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3ce247fb74acbd4c353912709899e5d9d33b1e94e9acd5c477b48688b59c2c3c
+size 135893
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..720a5e7ee
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02921ff5c369d733defcb34fdd5469be3d92b240077effdd40dad1bdf33cc0ea
+size 111038
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png
new file mode 100644
index 000000000..a86c5fdc7
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0355e9f43e348aa1da737a0372b10c5b6b972275fc58125f60664ebc7418382
+size 142652
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 20a5793ed..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e015006857411aae9ba920db2297bfd789d2edc6b7303ac0d11d513fd7eb494b
-size 113558
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 8474c40e3..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5cba14eb68f298db207b5d2cd860669878ba39672a3c64fe888d5dbf8306dbff
-size 133186
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index d754df7c6..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60abef035883455cdf9d1ee512796dbe4e6e7c2effe0b53c829ffb883d94f285
-size 226180
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index b6c404a92..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36846bc59861797b6d6ef3e8625a3811279834906b400910c3d799936e7748d9
-size 291536
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index bd1bed51b..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:076b09d9ec5349510cb05ea6554efd6bb323543cc0a1b1ae34fbdbd9d1f218d3
-size 202922
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 9cd9d2804..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9addc9f2047d66989f692b642fc4151132987e64fc30e549d08da7c9906a51d5
-size 219967
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 3d6d49c3f..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fb3c0ae057a6d0d93aeff3e545d507c02e00c7a48ff91662e1a2b962346f047
-size 119860
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 05c64f2f6..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-3-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7dbf4941aa6cfd1f434dcea77c909f8371518c1fa6d9a57220137612efe5102f
-size 135878
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 1c0f38251..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e95ecb045b7e88a1598fde5acce674d52f33ac6f76f9453959c230d479fb980
-size 101618
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 2b8bd25a9..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-4-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7186a444f24f39e56a6479635c52b02583e69f871f395f3c7c5bdc2b621ff65
-size 111038
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index e2927f3e9..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0635788a5a2d6cffb1d4e17245c3931a8f5bf5af59e9412827e5c223b0af9861
-size 125291
diff --git a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 5bbf91fca..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomRolesAndPermissionsFlow-5-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:daf0d5eac16eaddd33b6cfcc5e4395c6331cc714c19482f8701e2852d532c72a
-size 142645
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..a60f31721
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1aafa809e1b0ec5df83ceadfa940b8158ae49892110cb21dda2e8ec9504a38a2
+size 294306
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..357e81226
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:834411d997ba0b0270c0c8d3ed814d3580513539509a8aa1267d89a287364dae
+size 372292
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..0e8df1020
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a46dbb4147f89cd58a4eb26255571f1c19c2d03d506493cf5035924d375978ab
+size 113657
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineIncomingAndSmallPagination-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimelineIncomingAndSmallPagination-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineIncomingAndSmallPagination-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimelineIncomingAndSmallPagination-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineLargePagination-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimelineLargePagination-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineLargePagination-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimelineLargePagination-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithDisclosedPolls-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithDisclosedPolls-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithDisclosedPolls-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithDisclosedPolls-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutBottom-0-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutBottom-1-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutBottom-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutBottom-0-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..d67454d51
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4755408ff1a9b9c6b05b17d303564ae6cda15c5e5daac18fd9ad03d01acf5043
+size 320796
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutTop-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutTop-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutTop-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutTop-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutHighlight-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutHighlight-0-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomLayoutHighlight-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomLayoutHighlight-0-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithOutgoingPolls-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithOutgoingPolls-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithOutgoingPolls-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithOutgoingPolls-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..12bce5a98
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b195ac908292788b6b9d79219abfbb464c4e86053bcb9a9e96d237df4e3ba6f
+size 134597
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithUndisclosedPolls-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithUndisclosedPolls-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomWithUndisclosedPolls-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomWithUndisclosedPolls-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 0117d37bc..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomSmallTimeline-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cda1f1fd762b3d6b182efbcb6fa760cf2bfd6bfe4c4407137ec5509ccb23de11
-size 112646
diff --git a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 8808dc926..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomSmallTimelineWithReadReceipts-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6700421a685dd6f74c123fb479061405ea1c9d29cc65ee737d125f2ce2c1f6e
-size 133653
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index dc09fb8c8..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56c5eef68d4fbc9ff878efb77940dbdf6d088b117a4902f23c997bac4dc3eeda
-size 103993
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 3e73a3fa9..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd188ec0392974182bbc70d28da656ab1805c7923ea6080b798f2abd25c99e4d
-size 114316
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index e61deb2e7..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:572548ef639288f82b2b9060e96daa6522226587d097329364bdb3f424accaa3
-size 176934
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index d6d59f9c0..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:745c02e081ef546ac0c918fc80b80f701ccde6d54beba8527a2086f5655bc621
-size 179836
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index a10bec947..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fde296f3bd2dc09a59cb74d536adfea8e4ef07fe613e78394af7aaf0bdf202c8
-size 107255
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index a22acf28a..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa40ed612a5ee08b7602fd08203c6984031a489cadd1b70b0b761e2e8b3f6815
-size 120501
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..209a0509f
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f41fca4268f52cffb50d6611762b3afe15074d56edd4dcc169dc48d4f4703aa
+size 178019
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..34bc9a574
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67bca18c2fb1fd5752fccaa87395b38a26335bedda4632a38dd1537a836234c7
+size 181198
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..6c2620668
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29c0083e880c7afd74ca25ca9bf4a65997bd459be0c9ac6f57041109df51dd50
+size 110788
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..09b973242
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48a7b39fbd7e10d4d0348f62eba5255082941883281cbd077804870bc5f3f001
+size 124205
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..1d1429288
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03ec96c3117b93b21537a3e6a64f0b609722820d0fb967056adf2d4fabd6d0bb
+size 104825
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..312ee375e
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17c71fda8d1494f7fc67b51b304f77f53eba92ca19153aff3a4468f3fa6add80
+size 116342
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 3e66ca2c5..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e99fc8db5cc8c6b19986913f62b22479ce8279d5822c16d51eeb0de07d37fd6c
-size 91224
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 72cadef05..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-0-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b1e81541dbc3fadce76438542cc6f49b8315b0c5e66e60d435ecdc0deccd24a
-size 94106
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 127c6a21f..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b65d28599a6cdfd5591978c35851f9b5a4b39c2a6e06813a477f302d1e9e8321
-size 77889
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 9be30d2ae..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4fd53ac11a8171b3e733d0c169f5c5e6f2fb575480f4fde70ab0a61bccde755
-size 77529
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index caa1abedb..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8dcd756e7e80c4a8d49f542083b672a713068fdc12914d923fc10bb7d936aa4b
-size 83046
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 50591c6d3..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-2-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26f50b02c39447b506edcceaa7cfba115bc594a727e3d51e600859f6d6f6e248
-size 82600
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 127c6a21f..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b65d28599a6cdfd5591978c35851f9b5a4b39c2a6e06813a477f302d1e9e8321
-size 77889
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 9be30d2ae..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-3-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4fd53ac11a8171b3e733d0c169f5c5e6f2fb575480f4fde70ab0a61bccde755
-size 77529
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 69dadd20f..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f7377e97c8da85ed52887c06816fb0ae445a241c89bf857fe92b40546533f8bd
-size 146619
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 5eb62cb39..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-4-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3c5b416699192346ab3a9c1d03e44eeacd06f52d277e6a36730a5adba604559
-size 199057
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 0c69082bf..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb70c367e82a5afa8373994e499484939d25d506900d68024f674185ab63dccd
-size 137090
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 0901de4f0..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-5-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb3ecd35097b6109a76eaba61fc6036b8bd9b8b066d78a6aab5250d95cc30003
-size 184492
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index fb240151e..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:49d13da337dc0375468cf3f265dcb468d8605b1f5f06d2cc3ed092f0b32441a4
-size 84097
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 4593e46a3..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-6-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8aa9b54c86da44cb8b7e0b86f7cdca862b7bfadb1c05e10ae8c2385e20a46b6
-size 84619
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index cd665be75..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4f60780487823206ce8749b6594e245d81d2996c609872c8b5829df6a364fc2
-size 84901
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index ce3c4e2d9..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification-7-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:04d11a84c66697b8ce469ef1b8032e409015c844e1b5ed1e5e9ee5e457e0d1e3
-size 85177
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..43f37cd6d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68ef5081e83fcd3196364b00b21171f52cc3f9d2a2439e8da06b098c8cef1850
+size 91213
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..4b9d295f0
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36a59d5da19ecf1dbb23cad71e79ea71392b005516a4eaa4d389224d2917b9f5
+size 83050
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..63c044efa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8507cd5c449fa547e9f09abb21a4d90e8b4dd65a2fcf68cd797ff9c415490c8
+size 146625
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png
new file mode 100644
index 000000000..7dd7f6156
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23806a1eebe317b688efa2d0b155af7c59d796f2dfc450502d6881bfd05e62db
+size 84918
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..45b0e4e38
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6280ff0ba4a95d4424c7dcb5787e2e6dbe2840d1aa169c015819dc6c636ea6a0
+size 94489
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..dc04e9327
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df3a67c34c4f7b7a6f39bb0b2b6547025152672f7deea9808bf91f100214145a
+size 82980
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..7e292ebac
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e99bcc07009d39037bf855b4f6bee392a8e38edd6710577d7b7963c949dbae82
+size 199532
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png
new file mode 100644
index 000000000..22f9b641a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a963f21c020edc3d4874513877dec872d3f9ad36c586fbe92535b85fdb77aa84
+size 85555
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..43f37cd6d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68ef5081e83fcd3196364b00b21171f52cc3f9d2a2439e8da06b098c8cef1850
+size 91213
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..4b9d295f0
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36a59d5da19ecf1dbb23cad71e79ea71392b005516a4eaa4d389224d2917b9f5
+size 83050
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..63c044efa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8507cd5c449fa547e9f09abb21a4d90e8b4dd65a2fcf68cd797ff9c415490c8
+size 146625
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png
new file mode 100644
index 000000000..949cd890a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52951006d4ac5fece76d4ebe0d57c82f6d6fff8966f7bf0411eab2861b53cfe3
+size 137096
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png
new file mode 100644
index 000000000..18bd2bcdb
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d867a82e19069f24b0037db1c733994cadd3b4e9294db73da07dac6204b61ec9
+size 84131
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..45b0e4e38
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6280ff0ba4a95d4424c7dcb5787e2e6dbe2840d1aa169c015819dc6c636ea6a0
+size 94489
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..dc04e9327
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df3a67c34c4f7b7a6f39bb0b2b6547025152672f7deea9808bf91f100214145a
+size 82980
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..7e292ebac
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e99bcc07009d39037bf855b4f6bee392a8e38edd6710577d7b7963c949dbae82
+size 199532
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png
new file mode 100644
index 000000000..278577a04
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1d66425a4a7ea7d512fb879aa0eacb5d74a3c734eb12576a0fd9e588c9c4e484
+size 184989
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png
new file mode 100644
index 000000000..595b172e8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26f6b2016c40e39448700c9a61b90140142b0b8f907b1241ff946dc254b5f366
+size 85039
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png
new file mode 100644
index 000000000..43f37cd6d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68ef5081e83fcd3196364b00b21171f52cc3f9d2a2439e8da06b098c8cef1850
+size 91213
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png
new file mode 100644
index 000000000..4b9d295f0
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36a59d5da19ecf1dbb23cad71e79ea71392b005516a4eaa4d389224d2917b9f5
+size 83050
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png
new file mode 100644
index 000000000..9f37179d8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:908b4f4996ea1ef2e1b8771a062232886abb7256101958a2ea9387d11ab2f009
+size 77879
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png
new file mode 100644
index 000000000..63c044efa
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8507cd5c449fa547e9f09abb21a4d90e8b4dd65a2fcf68cd797ff9c415490c8
+size 146625
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png
new file mode 100644
index 000000000..45b0e4e38
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6280ff0ba4a95d4424c7dcb5787e2e6dbe2840d1aa169c015819dc6c636ea6a0
+size 94489
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png
new file mode 100644
index 000000000..dc04e9327
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df3a67c34c4f7b7a6f39bb0b2b6547025152672f7deea9808bf91f100214145a
+size 82980
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png
new file mode 100644
index 000000000..62586da23
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37d53a1fb39c279e88cc9c1ac731ef7d1b8d364bfd331efde1474a8739c00bdf
+size 77952
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png
new file mode 100644
index 000000000..7e292ebac
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e99bcc07009d39037bf855b4f6bee392a8e38edd6710577d7b7963c949dbae82
+size 199532
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChat-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index cb877ecad..000000000
--- a/UITests/Sources/__Snapshots__/Application/startChat-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36a6971acfde6818d37be61a0cbfa844ee45c947802c5209e60317e2b8942b9f
-size 82156
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChat-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index b97df79ed..000000000
--- a/UITests/Sources/__Snapshots__/Application/startChat-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55552bb8b0c7b89c1446789915f397b0e6f0a5da5fb20e286108dced387f50c7
-size 83422
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..3b623a5df
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9be3686d47c60cbb5bc9a3f0cd6f195684eac639156415b6ec3199791437f5c
+size 89179
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..5555b9f7a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dba6666f2c362ad26520209d90ed46f59f31c8aac16d1402c0f3bd105d1c8268
+size 94376
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChat-1-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChat-1-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChat-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChat-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChat-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/templateScreen-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/templateScreen-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index c193b9c37..000000000
--- a/UITests/Sources/__Snapshots__/Application/templateScreen-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:569e5ddc8cc188045103a62124f65f1ad550ee8b52b9d0f56b3692d00497dca3
-size 70422
diff --git a/UITests/Sources/__Snapshots__/Application/templateScreen-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-1-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/templateScreen-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-1-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..dee224e6d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:776c5c9af75e1ea9b0edd8a5f9f0944c946d617bc44b2d4ce2d248f01bc29ff5
+size 69497
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 83d89912d..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4fea984b486de560cdf0d463106db413c27e98dcbe6a1e2c12f503fec6125140
-size 323553
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen-1-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-2-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen-2-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPad-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png
new file mode 100644
index 000000000..602f0e2b3
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72590d5d8758de4c124191eeabe0dbee3c65e952c030c86846ba975756fce495
+size 324937
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-2-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen-2-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen-3-iPhone-18-1-en-GB.UI.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png
new file mode 100644
index 000000000..05bb3942d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bab66d287859cbaa4b6568d6e9c33189e33e1ba3f3abd2732a9d82739b4f398
+size 466841
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png
new file mode 100644
index 000000000..4c1d5c3ca
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de4f02172d9ccbab9c4a62531b25c1acde1913d2968a75e119e37b7a7dc162fa
+size 331122
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPad-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPad-18-1-en-GB.UI.png
deleted file mode 100644
index 067ab914f..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPad-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dc2b5650e19d012c5e85d6216823a19803f22e58c8776cc90654eb9b9b5f438e
-size 465174
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPhone-18-1-en-GB.UI.png b/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPhone-18-1-en-GB.UI.png
deleted file mode 100644
index 34fb0c3b6..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreenReply-iPhone-18-1-en-GB.UI.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abe323ed4325fa376cfb5d3384c430e2654f85d4589dfe7a9722939ea5e0b387
-size 331236