From cc615fbf870bcd2ee0fba9e9f38f103f909d6266 Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Fri, 16 Aug 2024 12:27:19 -0400
Subject: [PATCH] Fix showing banners in conversation view.

---
 .../securesms/conversation/v2/ConversationViewModel.kt    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
index 780b4fd27d..623d7209b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
@@ -293,7 +293,11 @@ class ConversationViewModel(
       .flatMapMaybe { groupRecord -> repository.getReminder(groupRecord.orNull()) }
       .observeOn(AndroidSchedulers.mainThread())
 
-    groupRecordFlow = recipientRepository.groupRecord.subscribeOn(Schedulers.io()).asFlow().mapNotNull { it.orNull() }
+    groupRecordFlow = recipientRepository.groupRecord
+      .subscribeOn(Schedulers.io())
+      .observeOn(AndroidSchedulers.mainThread())
+      .asFlow()
+      .mapNotNull { it.orNull() }
 
     Observable.combineLatest(
       refreshIdentityRecords.startWithItem(Unit).observeOn(Schedulers.io()),
@@ -329,7 +333,7 @@ class ConversationViewModel(
 
     val groupV1SuggestionsFlow = merge(
       flow {
-        GroupsV1MigrationSuggestionsBanner(0, {}, {})
+        emit(GroupsV1MigrationSuggestionsBanner(0, {}, {}))
       },
       groupRecordFlow.flatMapConcat { GroupsV1MigrationSuggestionsBanner.createFlow(it.gv1MigrationSuggestions.size, onAddMembers, onNoThanks) }
     )