diff --git a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift index b9f9eab5d3668efbeeccfb8f20dbac3fddf61721..d9b548037da0946c82e39b46b391adf1c8af6c86 100644 --- a/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift +++ b/Ring/Ring/Features/Conversations/Conversation/ConversationViewModel.swift @@ -87,7 +87,7 @@ class ConversationViewModel: ViewModel { self.inviteButtonIsAvailable.onNext(!contact.confirmed) } self.contactsService.contactStatus.filter({ cont in - return cont.ringId == contact?.ringId + return cont.ringId == contactRingId }) .subscribe(onNext: { [unowned self] cont in diff --git a/Ring/Ring/Features/Conversations/ConversationsCoordinator.swift b/Ring/Ring/Features/Conversations/ConversationsCoordinator.swift index 21499653c297003277a75114431e15612697d795..b879486321aeaec8232d8f52e302633c60544bee 100644 --- a/Ring/Ring/Features/Conversations/ConversationsCoordinator.swift +++ b/Ring/Ring/Features/Conversations/ConversationsCoordinator.swift @@ -64,7 +64,7 @@ class ConversationsCoordinator: Coordinator, StateableResponsive { private func showConversation (withConversationViewModel conversationViewModel: ConversationViewModel) { let conversationViewController = ConversationViewController.instantiate(with: self.injectionBag) - conversationViewController.viewModel.conversation = conversationViewModel.conversation + conversationViewController.viewModel = conversationViewModel self.present(viewController: conversationViewController, withStyle: .show, withAnimation: true) } }