From 9079825f816427c7254e5c1b3fe905cf5ca4d52f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 7 Jul 2023 10:08:26 +0200
Subject: [PATCH] Display the "verification success" Snackbar only when the
 state is `VerificationFlowState.Finished`. Apply the same fix for
 `displayLeftRoomMessage`

---
 .../android/appnav/LoggedInEventProcessor.kt        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
index 3a8b243be6..64c9ec7c4f 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInEventProcessor.kt
@@ -24,7 +24,7 @@ import io.element.android.libraries.matrix.api.verification.VerificationFlowStat
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -47,12 +47,15 @@ class LoggedInEventProcessor @Inject constructor(
 
     fun observeEvents(coroutineScope: CoroutineScope) {
         observingJob = coroutineScope.launch {
-            displayLeftRoomMessage.onEach {
-                displayMessage(CommonStrings.common_current_user_left_room)
-            }.launchIn(this)
+            displayLeftRoomMessage
+                .filter { it }
+                .onEach {
+                    displayMessage(CommonStrings.common_current_user_left_room)
+                }
+                .launchIn(this)
 
             displayVerificationSuccessfulMessage
-                .drop(1)
+                .filter { it }
                 .onEach {
                     displayMessage(CommonStrings.common_verification_complete)
                 }.launchIn(this)