From 3a9cd4424769fa4f4befb970fd5e844b345b27f3 Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Thu, 17 Apr 2025 15:18:37 +0200
Subject: [PATCH] support for UI tests on Xcode 16.3

---
 ElementX.xcodeproj/project.pbxproj            | 24 +++++++++++--------
 .../xcshareddata/swiftpm/Package.resolved     |  7 +++---
 PreviewTests/Sources/PreviewTests.swift       |  2 +-
 UITests/Sources/Application.swift             |  4 ++--
 ...k.testFlowDisabled-iPad-18-4-en-GB-99.png} |  0
 ...testFlowDisabled-iPhone-18-4-en-GB-99.png} |  0
 ...Lock.testFlowEnabled-iPad-18-1-en-GB-0.png |  3 ---
 ...Lock.testFlowEnabled-iPad-18-4-en-GB-0.png |  3 +++
 ...ock.testFlowEnabled-iPad-18-4-en-GB-1.png} |  0
 ...ck.testFlowEnabled-iPad-18-4-en-GB-99.png} |  0
 ...ck.testFlowEnabled-iPhone-18-1-en-GB-0.png |  3 ---
 ...ck.testFlowEnabled-iPhone-18-4-en-GB-0.png |  3 +++
 ...k.testFlowEnabled-iPhone-18-4-en-GB-1.png} |  0
 ....testFlowEnabled-iPhone-18-4-en-GB-99.png} |  0
 ...ock.testResignActive-iPad-18-1-en-GB-0.png |  3 ---
 ...ock.testResignActive-iPad-18-4-en-GB-0.png |  3 +++
 ...k.testResignActive-iPad-18-4-en-GB-99.png} |  0
 ...k.testResignActive-iPhone-18-1-en-GB-0.png |  3 ---
 ...k.testResignActive-iPhone-18-4-en-GB-0.png |  3 +++
 ...testResignActive-iPhone-18-4-en-GB-99.png} |  0
 ...ppLock.testWrongPIN-iPad-18-4-en-GB-1.png} |  0
 ...ppLock.testWrongPIN-iPad-18-4-en-GB-2.png} |  0
 ...ppLock.testWrongPIN-iPad-18-4-en-GB-3.png} |  0
 ...ppLock.testWrongPIN-iPad-18-4-en-GB-4.png} |  0
 ...pLock.testWrongPIN-iPad-18-4-en-GB-99.png} |  0
 ...Lock.testWrongPIN-iPhone-18-4-en-GB-1.png} |  0
 ...Lock.testWrongPIN-iPhone-18-4-en-GB-2.png} |  0
 ...Lock.testWrongPIN-iPhone-18-4-en-GB-3.png} |  0
 ...Lock.testWrongPIN-iPhone-18-4-en-GB-4.png} |  0
 ...ock.testWrongPIN-iPhone-18-4-en-GB-99.png} |  0
 ...ppLockSetup.testCancel-iPad-18-1-en-GB.png |  3 ---
 ...ckSetup.testCancel-iPad-18-4-en-GB-99.png} |  0
 ...ppLockSetup.testCancel-iPad-18-4-en-GB.png |  3 +++
 ...LockSetup.testCancel-iPhone-18-1-en-GB.png |  3 ---
 ...Setup.testCancel-iPhone-18-4-en-GB-99.png} |  0
 ...LockSetup.testCancel-iPhone-18-4-en-GB.png |  3 +++
 ...etup.testCreateFlow-iPad-18-4-en-GB-0.png} |  0
 ...etup.testCreateFlow-iPad-18-4-en-GB-1.png} |  0
 ...etup.testCreateFlow-iPad-18-4-en-GB-2.png} |  0
 ...etup.testCreateFlow-iPad-18-4-en-GB-3.png} |  0
 ...etup.testCreateFlow-iPad-18-4-en-GB-4.png} |  0
 ...etup.testCreateFlow-iPad-18-4-en-GB-5.png} |  0
 ...tup.testCreateFlow-iPad-18-4-en-GB-99.png} |  0
 ...up.testCreateFlow-iPhone-18-4-en-GB-0.png} |  0
 ...up.testCreateFlow-iPhone-18-4-en-GB-1.png} |  0
 ...up.testCreateFlow-iPhone-18-4-en-GB-2.png} |  0
 ...up.testCreateFlow-iPhone-18-4-en-GB-3.png} |  0
 ...p.testCreateFlow-iPhone-18-4-en-GB-99.png} |  0
 ...MandatoryCreateFlow-iPad-18-4-en-GB-0.png} |  0
 ...MandatoryCreateFlow-iPad-18-4-en-GB-1.png} |  0
 ...MandatoryCreateFlow-iPad-18-4-en-GB-2.png} |  0
 ...ndatoryCreateFlow-iPhone-18-4-en-GB-0.png} |  0
 ...ndatoryCreateFlow-iPhone-18-4-en-GB-1.png} |  0
 ...ndatoryCreateFlow-iPhone-18-4-en-GB-2.png} |  0
 ...ckSetup.testUnlockFlow-iPad-18-1-en-GB.png |  3 ---
 ...etup.testUnlockFlow-iPad-18-4-en-GB-3.png} |  0
 ...tup.testUnlockFlow-iPad-18-4-en-GB-99.png} |  0
 ...ckSetup.testUnlockFlow-iPad-18-4-en-GB.png |  3 +++
 ...Setup.testUnlockFlow-iPhone-18-1-en-GB.png |  3 ---
 ...up.testUnlockFlow-iPhone-18-4-en-GB-3.png} |  0
 ...p.testUnlockFlow-iPhone-18-4-en-GB-99.png} |  0
 ...Setup.testUnlockFlow-iPhone-18-4-en-GB.png |  3 +++
 ....testLoginWithPassword-iPad-18-1-en-GB.png |  3 ---
 ....testLoginWithPassword-iPad-18-4-en-GB.png |  3 +++
 ...estLoginWithPassword-iPhone-18-1-en-GB.png |  3 ---
 ...estLoginWithPassword-iPhone-18-4-en-GB.png |  3 +++
 ...nWithUnsupportedUserID-iPad-18-1-en-GB.png |  3 ---
 ...nWithUnsupportedUserID-iPad-18-4-en-GB.png |  3 +++
 ...ithUnsupportedUserID-iPhone-18-1-en-GB.png |  3 ---
 ...ithUnsupportedUserID-iPhone-18-4-en-GB.png |  3 +++
 ...nitialStateComponents-iPad-18-4-en-GB.png} |  0
 ...tialStateComponents-iPhone-18-4-en-GB.png} |  0
 ...Report.testReportText-iPad-18-4-en-GB.png} |  0
 ...eport.testReportText-iPhone-18-1-en-GB.png |  3 ---
 ...eport.testReportText-iPhone-18-4-en-GB.png |  3 +++
 ...oomScreen.testLanding-iPad-18-4-en-GB.png} |  0
 ...omScreen.testLanding-iPhone-18-1-en-GB.png |  3 ---
 ...omScreen.testLanding-iPhone-18-4-en-GB.png |  3 +++
 ...estLandingWithoutUsers-iPad-18-1-en-GB.png |  3 ---
 ...estLandingWithoutUsers-iPad-18-4-en-GB.png |  3 +++
 ...LandingWithoutUsers-iPhone-18-4-en-GB.png} |  0
 ...testLongInputNameText-iPad-18-4-en-GB.png} |  0
 ...stLongInputNameText-iPhone-18-4-en-GB.png} |  0
 ...set.testPasswordFlow-iPad-18-1-en-GB-2.png |  3 ---
 ...et.testPasswordFlow-iPad-18-4-en-GB-0.png} |  0
 ...et.testPasswordFlow-iPad-18-4-en-GB-1.png} |  0
 ...set.testPasswordFlow-iPad-18-4-en-GB-2.png |  3 +++
 ....testPasswordFlow-iPhone-18-4-en-GB-0.png} |  0
 ....testPasswordFlow-iPhone-18-4-en-GB-1.png} |  0
 ....testPasswordFlow-iPhone-18-4-en-GB-2.png} |  0
 ...ionSettings.testFlow-iPad-18-1-en-GB-1.png |  3 ---
 ...onSettings.testFlow-iPad-18-4-en-GB-0.png} |  0
 ...ionSettings.testFlow-iPad-18-4-en-GB-1.png |  3 +++
 ...onSettings.testFlow-iPad-18-4-en-GB-2.png} |  0
 ...onSettings.testFlow-iPad-18-4-en-GB-3.png} |  0
 ...onSettings.testFlow-iPad-18-4-en-GB-4.png} |  0
 ...Settings.testFlow-iPhone-18-4-en-GB-0.png} |  0
 ...Settings.testFlow-iPhone-18-4-en-GB-1.png} |  0
 ...Settings.testFlow-iPhone-18-4-en-GB-2.png} |  0
 ...Settings.testFlow-iPhone-18-4-en-GB-3.png} |  0
 ...Settings.testFlow-iPhone-18-4-en-GB-4.png} |  0
 ...s.testOutOfSyncFlow-iPad-18-4-en-GB-0.png} |  0
 ...s.testOutOfSyncFlow-iPad-18-4-en-GB-5.png} |  0
 ...s.testOutOfSyncFlow-iPad-18-4-en-GB-6.png} |  0
 ...testOutOfSyncFlow-iPhone-18-4-en-GB-0.png} |  0
 ...testOutOfSyncFlow-iPhone-18-4-en-GB-5.png} |  0
 ...testOutOfSyncFlow-iPhone-18-4-en-GB-6.png} |  0
 ...creen.testEmptyScreen-iPad-18-4-en-GB.png} |  0
 ...een.testEmptyScreen-iPhone-18-4-en-GB.png} |  0
 ...Screen.testFilledPoll-iPad-18-4-en-GB.png} |  0
 ...reen.testFilledPoll-iPhone-18-4-en-GB.png} |  0
 ...Screen.testMaxOptions-iPad-18-4-en-GB.png} |  0
 ...reen.testMaxOptions-iPhone-18-4-en-GB.png} |  0
 ...inedAndInvitedMembers-iPad-18-4-en-GB.png} |  0
 ...edAndInvitedMembers-iPhone-18-4-en-GB.png} |  0
 ...stSearchInvitedMember-iPad-18-4-en-GB.png} |  0
 ...SearchInvitedMember-iPhone-18-4-en-GB.png} |  0
 ...estSearchJoinedMember-iPad-18-4-en-GB.png} |  0
 ...tSearchJoinedMember-iPhone-18-4-en-GB.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-0.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-1.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-2.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-3.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-4.png} |  0
 ...ermissions.testFlow-iPad-18-4-en-GB-5.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-0.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-1.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-2.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-3.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-4.png} |  0
 ...missions.testFlow-iPhone-18-4-en-GB-5.png} |  0
 ...reen.testPlainNoAvatar-iPad-18-1-en-GB.png |  3 ---
 ...reen.testPlainNoAvatar-iPad-18-4-en-GB.png |  3 +++
 ...en.testPlainNoAvatar-iPhone-18-1-en-GB.png |  3 ---
 ...en.testPlainNoAvatar-iPhone-18-4-en-GB.png |  3 +++
 ...estSmallTimelineLayout-iPad-18-1-en-GB.png |  3 ---
 ...estSmallTimelineLayout-iPad-18-4-en-GB.png |  3 +++
 ...SmallTimelineLayout-iPhone-18-4-en-GB.png} |  0
 ...IncomingAndPagination-iPad-18-4-en-GB.png} |  0
 ...comingAndPagination-iPhone-18-4-en-GB.png} |  0
 ...neWithLargePagination-iPad-18-4-en-GB.png} |  0
 ...WithLargePagination-iPhone-18-4-en-GB.png} |  0
 ...imelineDisclosedPolls-iPad-18-4-en-GB.png} |  0
 ...elineDisclosedPolls-iPhone-18-4-en-GB.png} |  0
 ...elineLayoutAtBottom-iPad-18-4-en-GB-0.png} |  0
 ...elineLayoutAtBottom-iPad-18-4-en-GB-1.png} |  0
 ...lineLayoutAtBottom-iPhone-18-1-en-GB-1.png |  3 ---
 ...ineLayoutAtBottom-iPhone-18-4-en-GB-0.png} |  0
 ...lineLayoutAtBottom-iPhone-18-4-en-GB-1.png |  3 +++
 ...estTimelineLayoutAtTop-iPad-18-1-en-GB.png |  3 ---
 ...estTimelineLayoutAtTop-iPad-18-4-en-GB.png |  3 +++
 ...tTimelineLayoutAtTop-iPhone-18-1-en-GB.png |  3 ---
 ...tTimelineLayoutAtTop-iPhone-18-4-en-GB.png |  3 +++
 ...youtHighlightExisting-iPad-18-4-en-GB.png} |  0
 ...outHighlightExisting-iPhone-18-1-en-GB.png |  3 ---
 ...outHighlightExisting-iPhone-18-4-en-GB.png |  3 +++
 ...TimelineOutgoingPolls-iPad-18-4-en-GB.png} |  0
 ...melineOutgoingPolls-iPhone-18-4-en-GB.png} |  0
 ...stTimelineReadReceipts-iPad-18-1-en-GB.png |  3 ---
 ...stTimelineReadReceipts-iPad-18-4-en-GB.png |  3 +++
 ...imelineReadReceipts-iPhone-18-4-en-GB.png} |  0
 ...elineUndisclosedPolls-iPad-18-4-en-GB.png} |  0
 ...ineUndisclosedPolls-iPhone-18-4-en-GB.png} |  0
 ...tion.testEmptyAddress-iPad-18-4-en-GB.png} |  0
 ...ion.testEmptyAddress-iPhone-18-1-en-GB.png |  3 ---
 ...ion.testEmptyAddress-iPhone-18-4-en-GB.png |  3 +++
 ...on.testInvalidAddress-iPad-18-4-en-GB.png} |  0
 ....testInvalidAddress-iPhone-18-4-en-GB.png} |  0
 ...ction.testNormalState-iPad-18-4-en-GB.png} |  0
 ...ion.testNormalState-iPhone-18-4-en-GB.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-0.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-1.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-2.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-3.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-4.png} |  0
 ...allengeDoesNotMatch-iPad-18-4-en-GB-7.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-0.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-1.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-2.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-3.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-4.png} |  0
 ...lengeDoesNotMatch-iPhone-18-4-en-GB-7.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-0.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-1.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-2.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-3.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-4.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-5.png} |  0
 ...estChallengeMatches-iPad-18-4-en-GB-6.png} |  0
 ...stChallengeMatches-iPhone-18-1-en-GB-4.png |  3 ---
 ...tChallengeMatches-iPhone-18-4-en-GB-0.png} |  0
 ...tChallengeMatches-iPhone-18-4-en-GB-1.png} |  0
 ...tChallengeMatches-iPhone-18-4-en-GB-2.png} |  0
 ...tChallengeMatches-iPhone-18-4-en-GB-3.png} |  0
 ...stChallengeMatches-iPhone-18-4-en-GB-4.png |  3 +++
 ...tChallengeMatches-iPhone-18-4-en-GB-5.png} |  0
 ...tChallengeMatches-iPhone-18-4-en-GB-6.png} |  0
 ...ficationCancelation-iPad-18-4-en-GB-0.png} |  0
 ...ficationCancelation-iPad-18-4-en-GB-1.png} |  0
 ...ficationCancelation-iPad-18-4-en-GB-2.png} |  0
 ...ficationCancelation-iPad-18-4-en-GB-3.png} |  0
 ...ficationCancelation-iPad-18-4-en-GB-4.png} |  0
 ...icationCancelation-iPhone-18-1-en-GB-4.png |  3 ---
 ...cationCancelation-iPhone-18-4-en-GB-0.png} |  0
 ...cationCancelation-iPhone-18-4-en-GB-1.png} |  0
 ...cationCancelation-iPhone-18-4-en-GB-2.png} |  0
 ...cationCancelation-iPhone-18-4-en-GB-3.png} |  0
 ...icationCancelation-iPhone-18-4-en-GB-4.png |  3 +++
 ...hatScreen.testLanding-iPad-18-4-en-GB.png} |  0
 ...tScreen.testLanding-iPhone-18-4-en-GB.png} |  0
 ...stSearchWithNoResults-iPad-18-4-en-GB.png} |  0
 ...SearchWithNoResults-iPhone-18-4-en-GB.png} |  0
 ...testSearchWithResults-iPad-18-4-en-GB.png} |  0
 ...stSearchWithResults-iPhone-18-4-en-GB.png} |  0
 ...lateScreen.testScreen-iPad-18-4-en-GB.png} |  0
 ...ateScreen.testScreen-iPhone-18-1-en-GB.png |  3 ---
 ...ateScreen.testScreen-iPhone-18-4-en-GB.png |  3 +++
 ...testUserSessionFlows-iPad-18-1-en-GB-1.png |  3 ---
 ...testUserSessionFlows-iPad-18-1-en-GB-2.png |  3 ---
 ...testUserSessionFlows-iPad-18-1-en-GB-3.png |  3 ---
 ...testUserSessionFlows-iPad-18-4-en-GB-1.png |  3 +++
 ...testUserSessionFlows-iPad-18-4-en-GB-2.png |  3 +++
 ...testUserSessionFlows-iPad-18-4-en-GB-3.png |  3 +++
 ...stUserSessionFlows-iPhone-18-1-en-GB-1.png |  3 ---
 ...stUserSessionFlows-iPhone-18-4-en-GB-1.png |  3 +++
 ...tUserSessionFlows-iPhone-18-4-en-GB-2.png} |  0
 ...tUserSessionFlows-iPhone-18-4-en-GB-3.png} |  0
 ...n.testUserSessionReply-iPad-18-1-en-GB.png |  3 ---
 ...n.testUserSessionReply-iPad-18-4-en-GB.png |  3 +++
 ...testUserSessionReply-iPhone-18-1-en-GB.png |  3 ---
 ...testUserSessionReply-iPhone-18-4-en-GB.png |  3 +++
 UITests/SupportingFiles/target.yml            |  2 ++
 project.yml                                   |  2 +-
 233 files changed, 128 insertions(+), 123 deletions(-)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowDisabled-iPad-18-1-en-GB-99.png => appLock.testFlowDisabled-iPad-18-4-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png => appLock.testFlowDisabled-iPhone-18-4-en-GB-99.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-0.png
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowEnabled-iPad-18-1-en-GB-1.png => appLock.testFlowEnabled-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowEnabled-iPad-18-1-en-GB-99.png => appLock.testFlowEnabled-iPad-18-4-en-GB-99.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-0.png
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png => appLock.testFlowEnabled-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png => appLock.testFlowEnabled-iPhone-18-4-en-GB-99.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-en-GB-0.png
 rename UITests/Sources/__Snapshots__/Application/{appLock.testResignActive-iPad-18-1-en-GB-99.png => appLock.testResignActive-iPad-18-4-en-GB-99.png} (100%)
 delete 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-4-en-GB-0.png
 rename UITests/Sources/__Snapshots__/Application/{appLock.testResignActive-iPhone-18-1-en-GB-99.png => appLock.testResignActive-iPhone-18-4-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPad-18-1-en-GB-1.png => appLock.testWrongPIN-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPad-18-1-en-GB-2.png => appLock.testWrongPIN-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPad-18-1-en-GB-3.png => appLock.testWrongPIN-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPad-18-1-en-GB-4.png => appLock.testWrongPIN-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPad-18-1-en-GB-99.png => appLock.testWrongPIN-iPad-18-4-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPhone-18-1-en-GB-1.png => appLock.testWrongPIN-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPhone-18-1-en-GB-2.png => appLock.testWrongPIN-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPhone-18-1-en-GB-3.png => appLock.testWrongPIN-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPhone-18-1-en-GB-4.png => appLock.testWrongPIN-iPhone-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLock.testWrongPIN-iPhone-18-1-en-GB-99.png => appLock.testWrongPIN-iPhone-18-4-en-GB-99.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCancel-iPad-18-1-en-GB-99.png => appLockSetup.testCancel-iPad-18-4-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCancel-iPhone-18-1-en-GB-99.png => appLockSetup.testCancel-iPhone-18-4-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png => appLockSetup.testCreateFlow-iPad-18-4-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png => appLockSetup.testCreateFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png => appLockSetup.testCreateFlow-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png => appLockSetup.testCreateFlow-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png => appLockSetup.testCreateFlow-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png => appLockSetup.testCreateFlow-iPhone-18-4-en-GB-99.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png => appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png => appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png => appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png => appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png => appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png => appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-2.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png => appLockSetup.testUnlockFlow-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png => appLockSetup.testUnlockFlow-iPad-18-4-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png => appLockSetup.testUnlockFlow-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png => appLockSetup.testUnlockFlow-iPhone-18-4-en-GB-99.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{bugReport.testInitialStateComponents-iPad-18-1-en-GB.png => bugReport.testInitialStateComponents-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png => bugReport.testInitialStateComponents-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{bugReport.testReportText-iPad-18-1-en-GB.png => bugReport.testReportText-iPad-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{createRoomScreen.testLanding-iPad-18-1-en-GB.png => createRoomScreen.testLanding-iPad-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png => createRoomScreen.testLandingWithoutUsers-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png => createRoomScreen.testLongInputNameText-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png => createRoomScreen.testLongInputNameText-iPhone-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png => encryptionReset.testPasswordFlow-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png => encryptionReset.testPasswordFlow-iPad-18-4-en-GB-1.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-2.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png => encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png => encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png => encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-2.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPad-18-1-en-GB-0.png => encryptionSettings.testFlow-iPad-18-4-en-GB-0.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPad-18-1-en-GB-2.png => encryptionSettings.testFlow-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPad-18-1-en-GB-3.png => encryptionSettings.testFlow-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPad-18-1-en-GB-4.png => encryptionSettings.testFlow-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png => encryptionSettings.testFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png => encryptionSettings.testFlow-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png => encryptionSettings.testFlow-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png => encryptionSettings.testFlow-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png => encryptionSettings.testFlow-iPhone-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png => encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png => encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png => encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-6.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png => encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png => encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png => encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-6.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png => pollFormScreen.testEmptyScreen-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png => pollFormScreen.testEmptyScreen-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png => pollFormScreen.testFilledPoll-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png => pollFormScreen.testFilledPoll-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png => pollFormScreen.testMaxOptions-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png => pollFormScreen.testMaxOptions-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png => roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png => roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png => roomMembersListScreen.testSearchInvitedMember-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png => roomMembersListScreen.testSearchInvitedMember-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png => roomMembersListScreen.testSearchJoinedMember-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png => roomMembersListScreen.testSearchJoinedMember-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png => roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png => roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-5.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png => roomScreen.testSmallTimelineLayout-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png => roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png => roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png => roomScreen.testSmallTimelineWithLargePagination-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png => roomScreen.testSmallTimelineWithLargePagination-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png => roomScreen.testTimelineDisclosedPolls-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png => roomScreen.testTimelineDisclosedPolls-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png => roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png => roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-1.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png => roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-0.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-1.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png => roomScreen.testTimelineLayoutHighlightExisting-iPad-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png => roomScreen.testTimelineOutgoingPolls-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png => roomScreen.testTimelineOutgoingPolls-iPhone-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png => roomScreen.testTimelineReadReceipts-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png => roomScreen.testTimelineUndisclosedPolls-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png => roomScreen.testTimelineUndisclosedPolls-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{serverSelection.testEmptyAddress-iPad-18-1-en-GB.png => serverSelection.testEmptyAddress-iPad-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-4-en-GB.png
 rename UITests/Sources/__Snapshots__/Application/{serverSelection.testInvalidAddress-iPad-18-1-en-GB.png => serverSelection.testInvalidAddress-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png => serverSelection.testInvalidAddress-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{serverSelection.testNormalState-iPad-18-1-en-GB.png => serverSelection.testNormalState-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{serverSelection.testNormalState-iPhone-18-1-en-GB.png => serverSelection.testNormalState-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png => sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-7.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png => sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-7.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-4.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png => sessionVerification.testChallengeMatches-iPad-18-4-en-GB-6.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-4.png
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-5.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png => sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-6.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png => sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png => sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png => sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png => sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-3.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png => sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-4.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png => sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-0.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png => sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-1.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png => sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png => sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-3.png} (100%)
 create mode 100644 UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-4.png
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testLanding-iPad-18-1-en-GB.png => startChatScreen.testLanding-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testLanding-iPhone-18-1-en-GB.png => startChatScreen.testLanding-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png => startChatScreen.testSearchWithNoResults-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png => startChatScreen.testSearchWithNoResults-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png => startChatScreen.testSearchWithResults-iPad-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png => startChatScreen.testSearchWithResults-iPhone-18-4-en-GB.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{templateScreen.testScreen-iPad-18-1-en-GB.png => templateScreen.testScreen-iPad-18-4-en-GB.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png => userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-2.png} (100%)
 rename UITests/Sources/__Snapshots__/Application/{userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png => userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-3.png} (100%)
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
 delete mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png
 create mode 100644 UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png

diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index ddd3d3d5e..b30a85836 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -16,6 +16,8 @@
 			dependencies = (
 			);
 			name = Periphery;
+			packageProductDependencies = (
+			);
 			productName = Periphery;
 		};
 /* End PBXAggregateTarget section */
@@ -1207,7 +1209,7 @@
 		F08F7BC07CA9AEF5CD157918 /* Snapshotting.swift in Sources */ = {isa = PBXBuildFile; fileRef = DF17EA323AD0205A6AB621AA /* Snapshotting.swift */; };
 		F0A26CD502C3A5868353B0FA /* ServerConfirmationScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24DEE0682C95F897B6C7CB0D /* ServerConfirmationScreenViewModel.swift */; };
 		F0DACC95F24128A54CD537E4 /* GlobalSearchScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24B8177BD2AF45A286F5DA31 /* GlobalSearchScreen.swift */; };
-		F0F82C3C848C865C3098AA52 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 21C83087604B154AA30E9A8F /* SnapshotTesting */; };
+		F0F82C3C848C865C3098AA52 /* SnapshotUITesting in Frameworks */ = {isa = PBXBuildFile; productRef = 4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */; };
 		F103924DED414ADFE398CE99 /* RoomPollsHistoryScreenViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A130A2251A15A7AACC84FD37 /* RoomPollsHistoryScreenViewModelProtocol.swift */; };
 		F118DD449066E594F63C697D /* RoomMemberProxyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B5E17028C02DFA7DDA3931 /* RoomMemberProxyProtocol.swift */; };
 		F12F6BED7B6D7EE4BEE55039 /* PlainMentionBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AE78FA0011E07920AE83135 /* PlainMentionBuilder.swift */; };
@@ -2665,7 +2667,7 @@
 				29EE1791E0AFA1ABB7F23D2F /* SwiftState in Frameworks */,
 				33CAC1226DFB8B5D8447D286 /* GZIP in Frameworks */,
 				492274DA6691EE985C2FCCAA /* Sentry in Frameworks */,
-				F0F82C3C848C865C3098AA52 /* SnapshotTesting in Frameworks */,
+				F0F82C3C848C865C3098AA52 /* SnapshotUITesting in Frameworks */,
 				3A64A93A651A3CB8774ADE8E /* Collections in Frameworks */,
 				3F327A62D233933F54F0F33A /* SwiftOGG in Frameworks */,
 			);
@@ -6148,7 +6150,7 @@
 				3853B78FB8531B83936C5DA6 /* SwiftState */,
 				1BCD21310B997A6837B854D6 /* GZIP */,
 				67E7A6F388D3BF85767609D9 /* Sentry */,
-				21C83087604B154AA30E9A8F /* SnapshotTesting */,
+				4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */,
 				BA93CD75CCE486660C9040BD /* Collections */,
 				3FE40E79C36E7903121E6E3B /* SwiftOGG */,
 			);
@@ -6409,6 +6411,7 @@
 				"zh-Hant-TW",
 			);
 			mainGroup = 405B00F139AEE3994601B36A;
+			minimizedProjectReferenceProxies = 1;
 			packageReferences = (
 				E025F19D013D9BA6C58B37F4 /* XCRemoteSwiftPackageReference "swift-algorithms" */,
 				AC3475112CA40C2C6E78D1EB /* XCRemoteSwiftPackageReference "matrix-analytics-events" */,
@@ -6435,6 +6438,7 @@
 				EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */,
 				EE40B0E16A55BD23ECBFFD22 /* XCRemoteSwiftPackageReference "matrix-rich-text-editor-swift" */,
 			);
+			preferredProjectObjectVersion = 54;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -8758,8 +8762,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing";
 			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 1.18.3;
+				kind = revision;
+				revision = b467f413c83e2ceba59ba798583a1c57db9700cb;
 			};
 		};
 		EC6D0C817B1C21D9D096505A /* XCRemoteSwiftPackageReference "Version" */ = {
@@ -8832,11 +8836,6 @@
 			package = 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */;
 			productName = GZIP;
 		};
-		21C83087604B154AA30E9A8F /* SnapshotTesting */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
-			productName = SnapshotTesting;
-		};
 		290FDEDA4D764B9F7EBE55A9 /* Algorithms */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = E025F19D013D9BA6C58B37F4 /* XCRemoteSwiftPackageReference "swift-algorithms" */;
@@ -8912,6 +8911,11 @@
 			package = 96495DD8554E2F39D3954354 /* XCRemoteSwiftPackageReference "posthog-ios" */;
 			productName = PostHog;
 		};
+		4D8A8AC5F38942DAD76E02A3 /* SnapshotUITesting */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = E9C4F3A12AA1F65C13A8C8EB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
+			productName = SnapshotUITesting;
+		};
 		50009897F60FAE7D63EF5E5B /* Kingfisher */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = D283517192CAC3E2E6920765 /* XCRemoteSwiftPackageReference "Kingfisher" */;
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 007af5a19..0a5e7eaf5 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -257,8 +257,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "1be8144023c367c5de701a6313ed29a3a10bf59b",
-        "version" : "1.18.3"
+        "revision" : "b467f413c83e2ceba59ba798583a1c57db9700cb"
       }
     },
     {
@@ -302,8 +301,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "39de59b2d47f7ef3ca88a039dff3084688fe27f4",
-        "version" : "1.5.2"
+        "branch" : "test-traits",
+        "revision" : "ccc75ae935e2fee1b2c7d8040c21538def4310d8"
       }
     }
   ],
diff --git a/PreviewTests/Sources/PreviewTests.swift b/PreviewTests/Sources/PreviewTests.swift
index c51bb3cab..a1e53a784 100644
--- a/PreviewTests/Sources/PreviewTests.swift
+++ b/PreviewTests/Sources/PreviewTests.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import XCTest
 
 @testable import ElementX
-@testable import SnapshotTesting
+@testable import SnapshotTestingCore
 
 @MainActor
 class PreviewTests: XCTestCase {
diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift
index 27dba3f69..56ebb0add 100644
--- a/UITests/Sources/Application.swift
+++ b/UITests/Sources/Application.swift
@@ -5,7 +5,7 @@
 // Please see LICENSE files in the repository root for full details.
 //
 
-import SnapshotTesting
+import SnapshotUITesting
 import XCTest
 
 enum Application {
@@ -47,7 +47,7 @@ enum Application {
         guard deviceModel == requirediPhoneSimulator || deviceModel == requirediPadSimulator else {
             fatalError("Running on \(deviceModel) but we only support \(requirediPhoneSimulator) and \(requirediPadSimulator).")
         }
-        guard UIDevice.current.snapshotName == "iPhone-18.1" || UIDevice.current.snapshotName == "iPad-18.1" else {
+        guard UIDevice.current.snapshotName == "iPhone-18.4" || UIDevice.current.snapshotName == "iPad-18.4" else {
             fatalError("Running on a simulator that hasn't been renamed to match the expected snapshot filenames.")
         }
     }
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPad-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowDisabled-iPhone-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png
deleted file mode 100644
index 582315f4a..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67c559de04b481b370c3f02e4ad737403f393691cef4cb5ef9362a2946bc8adb
-size 1298585
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-0.png
new file mode 100644
index 000000000..638709c86
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dd48f840328c7e711b5c8bc749de2a5846ddefeee2805d17e7317cb6c04b3f2
+size 1381038
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPad-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png
deleted file mode 100644
index f9c2a670c..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2129e9965746b2c46997831bfccfaf2ccc95d0a5a0087c14520cd33d910972c5
-size 948014
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-0.png
new file mode 100644
index 000000000..c3b6dc301
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39d24a63499d5230527abae3671cb640570a361f43dfd19f2244c43e8d48a980
+size 1106309
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-1.png
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testFlowEnabled-iPhone-18-4-en-GB-99.png
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
deleted file mode 100644
index 582315f4a..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67c559de04b481b370c3f02e4ad737403f393691cef4cb5ef9362a2946bc8adb
-size 1298585
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-en-GB-0.png
new file mode 100644
index 000000000..638709c86
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dd48f840328c7e711b5c8bc749de2a5846ddefeee2805d17e7317cb6c04b3f2
+size 1381038
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPad-18-4-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
deleted file mode 100644
index f9c2a670c..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-0.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2129e9965746b2c46997831bfccfaf2ccc95d0a5a0087c14520cd33d910972c5
-size 948014
diff --git a/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-4-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-4-en-GB-0.png
new file mode 100644
index 000000000..c3b6dc301
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-4-en-GB-0.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39d24a63499d5230527abae3671cb640570a361f43dfd19f2244c43e8d48a980
+size 1106309
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testResignActive-iPhone-18-4-en-GB-99.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-4-en-GB-4.png
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPad-18-4-en-GB-99.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-4-en-GB-4.png
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLock.testWrongPIN-iPhone-18-4-en-GB-99.png
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
deleted file mode 100644
index 8bf144187..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:befa476bc2cf2c6b8e3e7670fa9c0a8eb672f8b91301e1bdb1e84634af41e1cb
-size 139690
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..fbccd1277
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08bd938da6ac04092d0845cfd5a68091097612b9905647c8aecda3f07c734532
+size 139697
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
deleted file mode 100644
index f4bc160c7..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f3aa49a3e21a62edf61d697972b7d40ccf987198ea5047ecb7635d8c3932b69
-size 82727
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB-99.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..40287468a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCancel-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fcf767875b6a67989634e7830ed8badecf5c2673aa5714b965f5a544273c5d7
+size 82724
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-4.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-5.png
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPad-18-4-en-GB-99.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-en-GB-3.png
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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testCreateFlow-iPhone-18-4-en-GB-99.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPad-18-4-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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testMandatoryCreateFlow-iPhone-18-4-en-GB-2.png
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
deleted file mode 100644
index 8bf144187..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:befa476bc2cf2c6b8e3e7670fa9c0a8eb672f8b91301e1bdb1e84634af41e1cb
-size 139690
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..fbccd1277
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08bd938da6ac04092d0845cfd5a68091097612b9905647c8aecda3f07c734532
+size 139697
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
deleted file mode 100644
index f4bc160c7..000000000
--- a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4f3aa49a3e21a62edf61d697972b7d40ccf987198ea5047ecb7635d8c3932b69
-size 82727
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-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-4-en-GB-99.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-1-en-GB-99.png
rename to UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB-99.png
diff --git a/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..40287468a
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/appLockSetup.testUnlockFlow-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fcf767875b6a67989634e7830ed8badecf5c2673aa5714b965f5a544273c5d7
+size 82724
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
deleted file mode 100644
index 86d865781..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:835678f4881b61cc57a2695b9e55c401bf2f95adcfdc94c1448438ec4f2fd01e
-size 84623
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..05b9b9539
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e32040efebca36f15b7036cefc12d13181f0b2000da70336a0a5467dba9ae43c
+size 85746
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
deleted file mode 100644
index 8b4acc17e..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44652302192e3e5877eb731b05f710ce32663854f9eb6ba6a36ad2e0a0860b02
-size 87758
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..26a2c50e0
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithPassword-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e838ae4fdb30c47a9000d12919f506a186cfa3076105ba1c91193cca3851c774
+size 89386
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
deleted file mode 100644
index 599c52443..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca45475a92f7cf7e058e9e6aec7c1b8d71d2e5ec01304fa17c64a10fc9ece387
-size 167076
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..dde2c2acd
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c924623bddea7a119af06f6f23d02d0bde6d8f985beef112d472b3ba9442a6c4
+size 169766
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
deleted file mode 100644
index 12898b6f9..000000000
--- a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b4b5b0b562fd610b3de3c7949ec39e28b1078ce59e54b515f256547386dcf48
-size 266822
diff --git a/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..f4698f517
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/authenticationFlowCoordinator.testLoginWithUnsupportedUserID-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:279eeb4da25b02a5b7fa92ee00607b1bbc71f38ac4d5bd5f52f5b11ace8fa215
+size 268283
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/bugReport.testInitialStateComponents-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPad-18-4-en-GB.png
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
deleted file mode 100644
index c75ddc344..000000000
--- a/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a1e03d4f18b9c73c44b3ad75ee99bf8e66812b50f838abd4615dbca83552f859
-size 198664
diff --git a/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..f5edb4ba4
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/bugReport.testReportText-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1fbd75e8de7ff04d33cb312ddf6e5a84de3ab4e2a512b765985a7f7481383f41
+size 203560
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPad-18-4-en-GB.png
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
deleted file mode 100644
index e13392cf2..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4da56c6c60ba51cda29575222681b5224f757834cc7d732f28d8549dbbe7bf08
-size 174980
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..c337df907
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLanding-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f27cdb8ab8f2a414ee5550a55cb83bcb8d34d16bab56ea945fe9dbf127a6ed1
+size 173967
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
deleted file mode 100644
index 357edb79b..000000000
--- a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:252cc8fb0047c1848348e064d6f0489737ac43abdc72ecc7a65bc95a75a0725d
-size 122294
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..2de5f3992
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e55c9f614b20a8c9b30a7765de9a25241ff5272e5f8c4ba03df2a2b80c5402a0
+size 120873
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/createRoomScreen.testLandingWithoutUsers-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/createRoomScreen.testLongInputNameText-iPhone-18-4-en-GB.png
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
deleted file mode 100644
index 6ca24d996..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ea17d2f1bf968752ee2d68a758aae96f3acde1dc1c7fd0d7882be69716e133e
-size 139195
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-2.png
new file mode 100644
index 000000000..5df0cb72f
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPad-18-4-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bef920b5e0192451300e0016cfdb0e8f83fca56b524f13fd23a198d2f9d0d90
+size 139194
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/encryptionReset.testPasswordFlow-iPhone-18-4-en-GB-2.png
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
deleted file mode 100644
index a8c731203..000000000
--- a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eea2417904e097aa9335bccbaefd6997072b2522e96b8bd4805f67da6246c31a
-size 233050
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-1.png
new file mode 100644
index 000000000..de19528b8
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fecf32d396f817f6ce23b6ad6bd9f79125f18f763b3aae384b8772349d16fd78
+size 233050
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPad-18-4-en-GB-4.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-en-GB-1.png
diff --git a/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testFlow-iPhone-18-4-en-GB-4.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-0.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-5.png
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-4-en-GB-6.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-1-en-GB-6.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPad-18-4-en-GB-6.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-5.png
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-4-en-GB-6.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-1-en-GB-6.png
rename to UITests/Sources/__Snapshots__/Application/encryptionSettings.testOutOfSyncFlow-iPhone-18-4-en-GB-6.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPad-18-4-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-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testEmptyScreen-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPad-18-4-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-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testFilledPoll-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPad-18-4-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-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/pollFormScreen.testMaxOptions-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testJoinedAndInvitedMembers-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchInvitedMember-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomMembersListScreen.testSearchJoinedMember-iPhone-18-4-en-GB.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-4.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPad-18-4-en-GB-5.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-4.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/roomRolesAndPermissions.testFlow-iPhone-18-4-en-GB-5.png
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
deleted file mode 100644
index a60f31721..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1aafa809e1b0ec5df83ceadfa940b8158ae49892110cb21dda2e8ec9504a38a2
-size 294306
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..3431ce2e3
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b23b63f0062303dd67aa232733dca8e024b2daa32feab5e17decfa607da5452a
+size 295070
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
deleted file mode 100644
index 357e81226..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:834411d997ba0b0270c0c8d3ed814d3580513539509a8aa1267d89a287364dae
-size 372292
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..c9827b66b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testPlainNoAvatar-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:290f3b8bf9b450c0638599856647c0afef4357d06fe6e76d8cb2ddf72f985545
+size 372884
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
deleted file mode 100644
index 0e8df1020..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a46dbb4147f89cd58a4eb26255571f1c19c2d03d506493cf5035924d375978ab
-size 113657
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..0117d37bc
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cda1f1fd762b3d6b182efbcb6fa760cf2bfd6bfe4c4407137ec5509ccb23de11
+size 112646
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineLayout-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithIncomingAndPagination-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testSmallTimelineWithLargePagination-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineDisclosedPolls-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPad-18-4-en-GB-1.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
deleted file mode 100644
index d67454d51..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4755408ff1a9b9c6b05b17d303564ae6cda15c5e5daac18fd9ad03d01acf5043
-size 320796
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-0.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-1.png
new file mode 100644
index 000000000..c52a0c788
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtBottom-iPhone-18-4-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3a4bfa8fa4b14aef06ea789b9810b6bbc2c1727060667834761234eece187f1
+size 324409
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png
deleted file mode 100644
index 4f4849ad9..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3248cd5339241604fd9812841bb82d9f78b0e4f267673ced23bdcaeb33f24f7c
-size 328469
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..52e897517
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5d4782fa65fa0bd61d5249b92f22fc17d9a186be92bae47f175131f72a9da8a
+size 329630
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png
deleted file mode 100644
index 5a0278086..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5f85d7ed5577edf82386fe5afa183c2bc6127993f6337dfa4a8bbd10e0626e7
-size 353653
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..0d2af8cdb
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutAtTop-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3921e40c6aeb314dd27dc75ee4ddfe428f64959394c48f2a7e4001ee141ab58
+size 356688
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png
deleted file mode 100644
index 7a7312ea9..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fb72a8c98c7baf8bf91fa287dbf14b471894ba510c2081e8e407231e9168d02a
-size 317864
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..8b95ca314
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineLayoutHighlightExisting-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67c40a897fda84a678ad2207ff9c6e0f3d3fb4c9b9b3893f71e1e91bd31f89ef
+size 320322
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineOutgoingPolls-iPhone-18-4-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
deleted file mode 100644
index 12bce5a98..000000000
--- a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b195ac908292788b6b9d79219abfbb464c4e86053bcb9a9e96d237df4e3ba6f
-size 134597
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..8808dc926
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6700421a685dd6f74c123fb479061405ea1c9d29cc65ee737d125f2ce2c1f6e
+size 133653
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineReadReceipts-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/roomScreen.testTimelineUndisclosedPolls-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPad-18-4-en-GB.png
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
deleted file mode 100644
index 34bc9a574..000000000
--- a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67bca18c2fb1fd5752fccaa87395b38a26335bedda4632a38dd1537a836234c7
-size 181198
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..62b18fdf6
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/serverSelection.testEmptyAddress-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2622cc5aa6802a0b33ac982b327a1cfeb51f082509188316801526a5bd3b144f
+size 185421
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/serverSelection.testInvalidAddress-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/serverSelection.testNormalState-iPhone-18-4-en-GB.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-4.png
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-4-en-GB-7.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-1-en-GB-7.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPad-18-4-en-GB-7.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-4.png
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-4-en-GB-7.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-1-en-GB-7.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeDoesNotMatch-iPhone-18-4-en-GB-7.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-4.png
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-5.png
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-4-en-GB-6.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-1-en-GB-6.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPad-18-4-en-GB-6.png
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
deleted file mode 100644
index 0cf0ce13c..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e01a3132257562fa83a437c9817ba7e0c4b8022dbb5614e1ab6fc5dc01a378c8
-size 199088
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-4.png
new file mode 100644
index 000000000..e25799b4b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cf6022ffeae85c62ceca1cba94182d8817294e07749b3a89698bfc17e28cbd
+size 199538
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-4-en-GB-5.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-5.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-5.png
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-4-en-GB-6.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-1-en-GB-6.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testChallengeMatches-iPhone-18-4-en-GB-6.png
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-3.png
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-4-en-GB-4.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-1-en-GB-4.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPad-18-4-en-GB-4.png
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
deleted file mode 100644
index 0cf0ce13c..000000000
--- a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-4.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e01a3132257562fa83a437c9817ba7e0c4b8022dbb5614e1ab6fc5dc01a378c8
-size 199088
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-4-en-GB-0.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-0.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-0.png
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-4-en-GB-1.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-1.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-1.png
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-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-2.png
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-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-3.png
diff --git a/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-4.png b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-4.png
new file mode 100644
index 000000000..e25799b4b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/sessionVerification.testSessionVerificationCancelation-iPhone-18-4-en-GB-4.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0cf6022ffeae85c62ceca1cba94182d8817294e07749b3a89698bfc17e28cbd
+size 199538
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testLanding-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithNoResults-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPad-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/startChatScreen.testSearchWithResults-iPhone-18-4-en-GB.png
diff --git a/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-1-en-GB.png b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-4-en-GB.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-1-en-GB.png
rename to UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPad-18-4-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
deleted file mode 100644
index dee224e6d..000000000
--- a/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:776c5c9af75e1ea9b0edd8a5f9f0944c946d617bc44b2d4ce2d248f01bc29ff5
-size 69497
diff --git a/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..c193b9c37
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/templateScreen.testScreen-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:569e5ddc8cc188045103a62124f65f1ad550ee8b52b9d0f56b3692d00497dca3
+size 70422
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png
deleted file mode 100644
index aec9c4abb..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:185bcd92e836edd73001143ff86c8cc69c2bf1b63f6cd8643d9c7b5c981d9b06
-size 326958
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png
deleted file mode 100644
index d37cd0c2f..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-2.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3cfb6262b71be34c8ed13ae95cff85f56376804f6b059e35c0a06586708e8037
-size 464169
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png
deleted file mode 100644
index c0791bef0..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-1-en-GB-3.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df1c3b6b3998a7c7faaf905ce7f6774c436e8e4669d1c6653142d80692e337d3
-size 748646
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
new file mode 100644
index 000000000..75096223b
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:641fcfd9cb6f688aee22aebcd7401e371c8136c93ae01c7f9cf599889e7edac0
+size 403620
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
new file mode 100644
index 000000000..eb6555479
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df1b0d57a7c3e2094cb506f0d4e296bc948fc722ed88fd237fe94e241d811475
+size 467930
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
new file mode 100644
index 000000000..3fda282b2
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPad-18-4-en-GB-3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd9df05fe2b178e18c8ccceb1f81c9f247b6a210be3d427a734d0f290a77ba6c
+size 752407
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
deleted file mode 100644
index 602f0e2b3..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-1.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72590d5d8758de4c124191eeabe0dbee3c65e952c030c86846ba975756fce495
-size 324937
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
new file mode 100644
index 000000000..474329324
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:efed1ac06f38b65d4985f5c8e0b6496d1365519f5ac30c04696d170ad5a0eaf1
+size 333024
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-2.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-2.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-2.png
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-en-GB-3.png
similarity index 100%
rename from UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-1-en-GB-3.png
rename to UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionFlows-iPhone-18-4-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
deleted file mode 100644
index 05bb3942d..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bab66d287859cbaa4b6568d6e9c33189e33e1ba3f3abd2732a9d82739b4f398
-size 466841
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
new file mode 100644
index 000000000..01c7da9e6
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPad-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fef8349d83cd4670207d898e3703052ee2a7df726fb9d35920e65a080f0d1fc
+size 470214
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
deleted file mode 100644
index 4c1d5c3ca..000000000
--- a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-1-en-GB.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de4f02172d9ccbab9c4a62531b25c1acde1913d2968a75e119e37b7a7dc162fa
-size 331122
diff --git a/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png
new file mode 100644
index 000000000..800ce620d
--- /dev/null
+++ b/UITests/Sources/__Snapshots__/Application/userSessionScreen.testUserSessionReply-iPhone-18-4-en-GB.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cc5de6816de5e73c3e3741c360149922fe64c4a23b1f500a9c30b606ffc7ee3
+size 335716
diff --git a/UITests/SupportingFiles/target.yml b/UITests/SupportingFiles/target.yml
index 87258e17d..3dcf23dd9 100644
--- a/UITests/SupportingFiles/target.yml
+++ b/UITests/SupportingFiles/target.yml
@@ -39,6 +39,8 @@ targets:
     - package: GZIP
     - package: Sentry
     - package: SnapshotTesting
+      products:
+        - SnapshotUITesting
     - package: Collections
     - package: SwiftOGG
 
diff --git a/project.yml b/project.yml
index 09373305e..7947d5dd7 100644
--- a/project.yml
+++ b/project.yml
@@ -130,7 +130,7 @@ packages:
     minorVersion: 8.35.1
   SnapshotTesting:
     url: https://github.com/pointfreeco/swift-snapshot-testing
-    minorVersion: 1.18.3
+    revision: b467f413c83e2ceba59ba798583a1c57db9700cb
   SwiftState:
     url: https://github.com/ReactKit/SwiftState
     minorVersion: 6.0.0