Merge pull request #662 from Inhishonor/conversation-loading

Fix compose activity infinitely loading
This commit is contained in:
octoshrimpy
2026-01-11 12:31:40 -05:00
committed by GitHub
3 changed files with 47 additions and 5 deletions
@@ -178,10 +178,15 @@ class ComposeViewModel @Inject constructor(
// monitors convos and triggers when wanted convo is present
conversationRepo.getConversations(false)
.asObservable()
.filter { conversations -> conversations.isLoaded }
.filter { conversations -> conversations.isLoaded && conversations.isValid}
.mapNotNull { conversationRepo.getConversation(addresses) }
.doOnNext { newState { copy(loading = false) } }
}
}
.doOnError { e ->
Timber.e(e, "Error while resolving conversation")
newState { copy(loading = false) }
}
// Merges two potential conversation sources (constructor threadId and contact selection)
// into a single stream of conversations. If the conversation was deleted, notify the