From 24777184ef04fbc2c371a1151972b0933c84f1a8 Mon Sep 17 00:00:00 2001
From: Andy Balaam <andy.balaam@matrix.org>
Date: Tue, 25 Mar 2025 10:36:34 +0000
Subject: [PATCH] Use 'Dismiss' to close pinned identity changes, instead of
 'Ok' (#3936)

* Use 'Dismiss' to close pinned identity changes, instead of 'Ok'

* Update snapshots.
---
 .../Screens/RoomScreen/View/RoomScreenFooterView.swift        | 2 +-
 .../roomScreenFooterView.With-displayname-iPad-en-GB.png      | 4 ++--
 .../roomScreenFooterView.With-displayname-iPad-pseudo.png     | 4 ++--
 .../roomScreenFooterView.With-displayname-iPhone-16-en-GB.png | 4 ++--
 ...roomScreenFooterView.With-displayname-iPhone-16-pseudo.png | 4 ++--
 .../roomScreenFooterView.Without-displayname-iPad-en-GB.png   | 4 ++--
 .../roomScreenFooterView.Without-displayname-iPad-pseudo.png  | 4 ++--
 ...omScreenFooterView.Without-displayname-iPhone-16-en-GB.png | 4 ++--
 ...mScreenFooterView.Without-displayname-iPhone-16-pseudo.png | 4 ++--
 9 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
index 85ca6e67d..dd8bda710 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreenFooterView.swift
@@ -58,7 +58,7 @@ struct RoomScreenFooterView: View {
                     .foregroundColor(.compound.textPrimary)
             }
             
-            Button(L10n.actionOk) {
+            Button(L10n.actionDismiss) {
                 callback(.resolvePinViolation(userID: member.userID))
             }
             .buttonStyle(.compound(.primary, size: .medium))
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png
index 1ba669bf5..087552673 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8961d8b31627ff16902b9cd5990171b605ef25a02fcdb72c4ab1bf05d39bed1
-size 154719
+oid sha256:1d1309e076e8f25731a16abfb8037fb2ec98f8b1b733025dd9a3fa2269b8065e
+size 155253
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png
index d32bbf17a..40e150199 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9bc578aff36b840121bae1e44056b6e5052c2319c8f80e62f1f8e6d62ecfb428
-size 164654
+oid sha256:d10922442758895f5d5eac889212a278352a84747f705aa0d356b379c54a0610
+size 165267
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-en-GB.png
index 528c3908e..4332a02d1 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ebf33dc9c9b8881926fa6cc7a2bcaa27c53140f49545e6d29f92bcd585e03ec5
-size 75656
+oid sha256:9b3033094c6ecda918e0939ff52f9fe98bc9239449b1c89ef792afc439e0c1c9
+size 76280
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-pseudo.png
index 3fd598bf4..46b5b522c 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.With-displayname-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:350c3ae69d02eda573760754d555707a93acfb3f44b33f346441ef698d13a24f
-size 90614
+oid sha256:fd9ed4ba10291097a333c3e09997955091f9cdff554a455d1cac156643939083
+size 90977
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png
index 8c9f9fbaf..6899c3bbc 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f46ea56d60de4f2a57b32f642d3015d5d20389c68190db9de8bb5fc2bf77fe19
-size 156857
+oid sha256:08b12ec4c036b7683b4610ce284a8efefa092e665442d8b26759433c59d3b89a
+size 157396
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png
index 45be9ee4c..d3dbb7183 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPad-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df3c532c70c9957693da024fda42c39fcb5b74bedf62b2ac23f40104a68dd932
-size 167317
+oid sha256:7bd8c6a443578e81f19502e0dfb80be449b0d15485aa32ee159b9d9c4c435206
+size 167933
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-en-GB.png
index 2f70bc152..dae05bc9a 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-en-GB.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-en-GB.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:335ef9f0580c6f4c84e69a76412bafdd42d58d26e9b8b307622f9881348461c6
-size 77700
+oid sha256:937d9277e06dbdcc4a4a4b5088b56462e115bf20486029079635a02a6362bc83
+size 78180
diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-pseudo.png
index 29bcdb0bf..c9c13e2ec 100644
--- a/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-pseudo.png
+++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/roomScreenFooterView.Without-displayname-iPhone-16-pseudo.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f134ff16c4a67c64d284de18bde918f9689eff3dddafc4f2b5916d3e628bd10
-size 101518
+oid sha256:a6a32e114015a01c5a6fdbef1239bf6ef7adc3e676428bbfc5760df79a4c102b
+size 101973
-- 
GitLab