Use 'Dismiss' to close pinned identity changes, instead of 'Ok' (#4454)

andybalaam · web-flow · commit f969dcf42ecd · 2025-03-25T10:57:51.000+01:00
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateView.kt
@@ -43,7 +43,7 @@ fun IdentityChangeStateView(
             onLinkClick = onLinkClick,
             textId = CommonStrings.crypto_identity_change_pin_violation_new,
             isCritical = false,
-            submitTextId = CommonStrings.action_ok,
+            submitTextId = CommonStrings.action_dismiss,
             onSubmitClick = { state.eventSink(IdentityChangeEvent.PinIdentity(identityChangeViolation.identityRoomMember.userId)) },
             modifier = modifier,
         )
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt
@@ -48,7 +48,7 @@ class IdentityChangeStateViewTest {
         rule.onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")
         rule.onNodeWithText("Alice", substring = true).assertExists("should display user displayname")
 
-        rule.clickOn(res = CommonStrings.action_ok)
+        rule.clickOn(res = CommonStrings.action_dismiss)
         eventsRecorder.assertSingle(IdentityChangeEvent.PinIdentity(UserId("@alice:localhost")))
     }
 
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_IdentityChangeStateView_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e698ec3ede72636c649e44c656cf67d16b5531629b336f7ed101a9a34f99ec3
-size 22739
+oid sha256:e83fdb82f802f77ed962957c059a027ab6c1aba43a996fda824c188ea26e136a
+size 23662
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_IdentityChangeStateView_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4b706779cd3294a3bb7e879fad3f0d2c914466408c27f8bb3096123e4201dc4
-size 25730
+oid sha256:2d3c8f5951f9a447f5f35912ca8ed4c7c845bc4f51d628c6238e61bcc0c3c56e
+size 26479
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Day_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31879b7c77e3c72b48a59e8ec00381fdffd3e7a973ac42eb868a860aaf7b17c7
-size 62628
+oid sha256:61fb04355b0984f6a2b2cae6bb415936f9144993d988cea55c4db4f25efddb0c
+size 63502
diff --git a/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png b/tests/uitests/src/test/snapshots/images/features.messages.impl.crypto.identity_MessagesViewWithIdentityChange_Night_1_en.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d67caef0dc744e636f8ee67fa9388ddb6a2f2f4cc53a37c682f831e3c96d5b30
-size 66555
+oid sha256:c82612aeb3d83ea4e619e0fbec4bffcbea4589d4af362028caef23346293beea
+size 67399

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ fun IdentityChangeStateView(`
`43`	`43`	`onLinkClick = onLinkClick,`
`44`	`44`	`textId = CommonStrings.crypto_identity_change_pin_violation_new,`
`45`	`45`	`isCritical = false,`
`46`		`- submitTextId = CommonStrings.action_ok,`
	`46`	`+ submitTextId = CommonStrings.action_dismiss,`
`47`	`47`	`onSubmitClick = { state.eventSink(IdentityChangeEvent.PinIdentity(identityChangeViolation.identityRoomMember.userId)) },`
`48`	`48`	`modifier = modifier,`
`49`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class IdentityChangeStateViewTest {`
`48`	`48`	`rule.onNodeWithText("@alice:localhost", substring = true).assertExists("should display user mxid")`
`49`	`49`	`rule.onNodeWithText("Alice", substring = true).assertExists("should display user displayname")`
`50`	`50`
`51`		`- rule.clickOn(res = CommonStrings.action_ok)`
	`51`	`+ rule.clickOn(res = CommonStrings.action_dismiss)`
`52`	`52`	`eventsRecorder.assertSingle(IdentityChangeEvent.PinIdentity(UserId("@alice:localhost")))`
`53`	`53`	`}`
`54`	`54`