diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
index d381d17de9..50ca0d7e3a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateProvider.kt
@@ -47,9 +47,10 @@ internal fun aRoomMemberIdentityStateChange(
 
 internal fun anIdentityChangeState(
     roomMemberIdentityStateChanges: List<RoomMemberIdentityStateChange> = emptyList(),
+    eventSink: (IdentityChangeEvent) -> Unit = {}
 ) = IdentityChangeState(
     roomMemberIdentityStateChanges = roomMemberIdentityStateChanges.toImmutableList(),
-    eventSink = {},
+    eventSink,
 )
 
 internal fun anIdentityRoomMember(
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
new file mode 100644
index 0000000000..3642fcd3c9
--- /dev/null
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/crypto/identity/IdentityChangeStateViewTest.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.messages.impl.crypto.identity
+
+import androidx.activity.ComponentActivity
+import androidx.compose.ui.test.junit4.AndroidComposeTestRule
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.element.android.libraries.designsystem.components.avatar.anAvatarData
+import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
+import io.element.android.libraries.ui.strings.CommonStrings
+import io.element.android.tests.testutils.EventsRecorder
+import io.element.android.tests.testutils.clickOn
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class IdentityChangeStateViewTest {
+    @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
+
+    @Test
+    fun `show and resolve pin violation`() {
+        val eventsRecorder = EventsRecorder<IdentityChangeEvent>()
+        rule.setIdentityChangeStateView(
+            state = anIdentityChangeState(
+                listOf(
+                    RoomMemberIdentityStateChange(
+                        identityRoomMember = IdentityRoomMember(UserId("@alice:localhost"), "Alice", anAvatarData()),
+                        identityState = IdentityState.PinViolation
+                    )
+                ),
+                eventsRecorder
+            ),
+        )
+
+        rule.onNodeWithText("identity appears to have changed", substring = true).assertExists("should display pin violation warning")
+        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)
+        eventsRecorder.assertSingle(IdentityChangeEvent.PinViolation(UserId("@alice:localhost")))
+    }
+
+    @Test
+    fun `show and resolve verification violation`() {
+        val eventsRecorder = EventsRecorder<IdentityChangeEvent>()
+        rule.setIdentityChangeStateView(
+            state = anIdentityChangeState(
+                listOf(
+                    RoomMemberIdentityStateChange(
+                        identityRoomMember = IdentityRoomMember(UserId("@alice:localhost"), "Alice", anAvatarData()),
+                        identityState = IdentityState.VerificationViolation
+                    )
+                ),
+                eventsRecorder
+            ),
+        )
+
+        rule.onNodeWithText("verified identity has changed", substring = true).assertExists("should display verification violation warning")
+        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.crypto_identity_change_withdraw_verification_action)
+        eventsRecorder.assertSingle(IdentityChangeEvent.VerificationViolation(UserId("@alice:localhost")))
+    }
+
+    @Test
+    fun `Should not show any banner if no violations`() {
+        rule.setIdentityChangeStateView(
+            state = anIdentityChangeState(
+                listOf(
+                    RoomMemberIdentityStateChange(
+                        identityRoomMember = IdentityRoomMember(UserId("@alice:localhost"), "Alice", anAvatarData()),
+                        identityState = IdentityState.Verified
+                    ),
+                    RoomMemberIdentityStateChange(
+                        identityRoomMember = IdentityRoomMember(UserId("@bob:localhost"), "Bob", anAvatarData()),
+                        identityState = IdentityState.Pinned
+                    )
+                ),
+            ),
+        )
+
+        rule.onNodeWithText("identity appears to have changed", substring = true).assertDoesNotExist()
+        rule.onNodeWithText("verified identity has changed", substring = true).assertDoesNotExist()
+    }
+
+    private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setIdentityChangeStateView(
+        state: IdentityChangeState,
+    ) {
+        setContent {
+            IdentityChangeStateView(
+                state = state,
+                onLinkClick = {},
+            )
+        }
+    }
+}