Commit aa9836da authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk
Browse files

fix: check contact status



-When checking if contact accept the invitation conversation ringId was 
used and that caused error when conversation is not exists. This patch 
fix it by using recepient ringID.
-Conversation View Model is creating two times for each conversation. 
One when creating SmartList and then when conversation is celected. 
This patch use existing view model to present cinversation.

Change-Id: I67cb334efc61017b5b1f26573879b736a83b0fa3
Reviewed-by: Andreas Traczyk's avatarAndreas Traczyk <andreas.traczyk@savoirfairelinux.com>
parent 4a15c69e
...@@ -87,7 +87,7 @@ class ConversationViewModel: ViewModel { ...@@ -87,7 +87,7 @@ class ConversationViewModel: ViewModel {
self.inviteButtonIsAvailable.onNext(!contact.confirmed) self.inviteButtonIsAvailable.onNext(!contact.confirmed)
} }
self.contactsService.contactStatus.filter({ cont in self.contactsService.contactStatus.filter({ cont in
return cont.ringId == contact?.ringId return cont.ringId == contactRingId
}) })
.subscribe(onNext: { [unowned self] cont in .subscribe(onNext: { [unowned self] cont in
......
...@@ -64,7 +64,7 @@ class ConversationsCoordinator: Coordinator, StateableResponsive { ...@@ -64,7 +64,7 @@ class ConversationsCoordinator: Coordinator, StateableResponsive {
private func showConversation (withConversationViewModel conversationViewModel: ConversationViewModel) { private func showConversation (withConversationViewModel conversationViewModel: ConversationViewModel) {
let conversationViewController = ConversationViewController.instantiate(with: self.injectionBag) let conversationViewController = ConversationViewController.instantiate(with: self.injectionBag)
conversationViewController.viewModel.conversation = conversationViewModel.conversation conversationViewController.viewModel = conversationViewModel
self.present(viewController: conversationViewController, withStyle: .show, withAnimation: true) self.present(viewController: conversationViewController, withStyle: .show, withAnimation: true)
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment