From 5bb287f2581a947804cf60318a5901182244dfaa Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Tue, 26 Apr 2022 10:51:59 +1000 Subject: [PATCH] fix an issue where rejected message requests will come back on linked devices --- Session/Conversations/ConversationVC+Interaction.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index e8d77f76e..965f25572 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -1249,12 +1249,16 @@ extension ConversationVC { // Delete all thread content self?.thread.removeAllThreadInteractions(with: transaction) - self?.thread.remove(with: transaction) }, completion: { [weak self] in // Force a config sync and pop to the previous screen MessageSender.syncConfiguration(forceSyncNow: true).retainUntilComplete() + // Remove the thread after the config message is sent. + // Otherwise the blocked user won't be included in the + // config message. + self?.thread.remove() + DispatchQueue.main.async { self?.navigationController?.popViewController(animated: true) }