Ensure AccountExpiryInAppNotification has initial emission

mullvad · Oct 16, 2024 · 90cbd8c · 90cbd8c
1 parent 029510a
commit 90cbd8c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...p/src/main/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCase.kt b/...p/src/main/kotlin/net/mullvad/mullvadvpn/usecase/AccountExpiryInAppNotificationUseCase.kt
@@ -1,8 +1,9 @@
 package net.mullvad.mullvadvpn.usecase
 
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import net.mullvad.mullvadvpn.lib.shared.AccountRepository
@@ -25,9 +26,10 @@ class AccountExpiryInAppNotificationUseCase(private val accountRepository: Accou
                         )
                         .map { expiresInPeriod -> InAppNotification.AccountExpiry(expiresInPeriod) }
                 } else {
-                    emptyFlow<InAppNotification.AccountExpiry?>()
+                    flowOf(null)
                 }
             }
-            .onStart { emit(null) }
             .map(::listOfNotNull)
+            .onStart { emit(emptyList()) }
+            .distinctUntilChanged()
 }