From f540c5a79a760c00377f28665490664300f30b16 Mon Sep 17 00:00:00 2001 From: Aaron Thornburgh <112560169+americanrefugee@users.noreply.github.com> Date: Fri, 17 Apr 2026 17:14:17 +0200 Subject: [PATCH] Replace the Cancel button with a Close button on the Space Filters screen. (#5408) * Updated placement and type of button Moved the "X"/Close button from the left to the right, and made it a primary action. * Update snapshots. --------- Co-authored-by: Doug --- .../View/ChatsSpaceFiltersScreen.swift | 4 ++-- .../PreviewTests/chatsSpaceFiltersScreen.iPad-en-GB-0.png | 4 ++-- .../PreviewTests/chatsSpaceFiltersScreen.iPad-pseudo-0.png | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFiltersScreen.swift b/ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFiltersScreen.swift index ecedb9090..056d1f095 100644 --- a/ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFiltersScreen.swift +++ b/ElementX/Sources/Screens/ChatsSpaceFiltersScreen/View/ChatsSpaceFiltersScreen.swift @@ -35,8 +35,8 @@ struct ChatsSpaceFiltersScreen: View { @ToolbarContentBuilder private var toolbar: some ToolbarContent { - ToolbarItem(placement: .cancellationAction) { - ToolbarButton(role: .cancel) { + ToolbarItem(placement: .primaryAction) { + ToolbarButton(role: .close) { context.send(viewAction: .cancel) } } diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-en-GB-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-en-GB-0.png index f49895fd6..194afbc7f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-en-GB-0.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-en-GB-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b54f25f2260800a34f4869fbe8771d5443b18de4de6c1250498aaab259808ae -size 160972 +oid sha256:1041d59efcac45da3a17e59629a51f59a2fcc9116b9868c7fe776d7d08736e2e +size 161018 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-pseudo-0.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-pseudo-0.png index f49895fd6..194afbc7f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-pseudo-0.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/chatsSpaceFiltersScreen.iPad-pseudo-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b54f25f2260800a34f4869fbe8771d5443b18de4de6c1250498aaab259808ae -size 160972 +oid sha256:1041d59efcac45da3a17e59629a51f59a2fcc9116b9868c7fe776d7d08736e2e +size 161018