fix: correct banner filtering logic for networks and screens

Author: nomanr

common/src/commonMain/kotlin/com/blockstream/domain/banner/GetBannerUseCase.kt

@@ -12,24 +12,24 @@ class GetBannerUseCase() {
     ): Banner? {
 
         return withContext(context = Dispatchers.Default) {
-            banners?.filterNot {
-                // Filter closed banners
+            val afterExcludedFilter = banners?.filterNot {
                 excludedBanners.contains(it)
-            }?.filterNot {
-                // Filter networks (get networks from all accounts to also match greenlight)
-                (!it.hasNetworks || ((it.networks ?: listOf()).intersect(
-                    sessionOrNull?.allAccounts?.value?.map { it.networkId }?.toSet() ?: emptySet()
-                ).isNotEmpty()))
-            }?.filterNot {
-                // Filter based on screen name
-                (it.screens?.contains(screenName) == true || it.screens?.contains("*") == true)
-            }?.filter {
-                // Filter based on screen name
-                (it.screens?.contains(screenName) == true || it.screens?.contains("*") == true)
-            }?.shuffled()?.let {
-                // Search for the already displayed banner, else give priority to those with screen name, else "*"
+            }
+
+            val activeNetworks = sessionOrNull?.activeSessions?.map { it.network }?.toMutableList() ?: mutableListOf()
+            sessionOrNull?.lightning?.network?.also { activeNetworks.add(it) }
+
+            val afterNetworkFilter = afterExcludedFilter?.filter { banner ->
+                !banner.hasNetworks || ((banner.networks ?: listOf()).intersect(activeNetworks.toSet()).isNotEmpty())
+            }
+
+            val afterScreenFilter = afterNetworkFilter?.filter { banner ->
+                (banner.screens?.contains(screenName) == true || banner.screens?.contains("*") == true)
+            }
+
+            afterScreenFilter?.shuffled()?.let {
                 it.find { it == previousBanner } ?: it.find { it.screens?.contains(screenName) == true } ?: it.firstOrNull()
             }
         }
     }
-}
+}