Merge remote-tracking branch 'upstream/main' into gallery_alternative_version

amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -119,7 +119,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flattenMerge
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
@@ -481,10 +481,9 @@ class Account(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     private val liveNotificationList: Flow<ListNameNotePair> by lazy {
-        defaultNotificationFollowList
-            .transformLatest { listName ->
-                emit(loadPeopleListFlowFromListName(listName))
-            }.flattenMerge()
+        defaultNotificationFollowList.flatMapLatest { listName ->
+            loadPeopleListFlowFromListName(listName)
+        }
     }
 
     val liveNotificationFollowLists: StateFlow<LiveFollowLists?> by lazy {
@@ -494,10 +493,9 @@ class Account(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     private val liveStoriesList: Flow<ListNameNotePair> by lazy {
-        defaultStoriesFollowList
-            .transformLatest { listName ->
-                emit(loadPeopleListFlowFromListName(listName))
-            }.flattenMerge()
+        defaultStoriesFollowList.flatMapLatest { listName ->
+            loadPeopleListFlowFromListName(listName)
+        }
     }
 
     val liveStoriesFollowLists: StateFlow<LiveFollowLists?> by lazy {
@@ -507,10 +505,9 @@ class Account(
 
     @OptIn(ExperimentalCoroutinesApi::class)
     private val liveDiscoveryList: Flow<ListNameNotePair> by lazy {
-        defaultDiscoveryFollowList
-            .transformLatest { listName ->
-                emit(loadPeopleListFlowFromListName(listName))
-            }.flattenMerge()
+        defaultDiscoveryFollowList.flatMapLatest { listName ->
+            loadPeopleListFlowFromListName(listName)
+        }
     }
 
     val liveDiscoveryFollowLists: StateFlow<LiveFollowLists?> by lazy {