[trello.com/c/aZtAfZ44]

Author: vovameister

Adamant/Modules/ChatsList/ChatListViewController.swift

@@ -973,14 +973,14 @@ extension ChatListViewController {
             ) { [weak self] in
                 guard let self else { return }
 
-                self.updateSelectedRow(chatroom: chatroom)
                 self.presentChatroom(chatroom, with: transaction.chatMessageId)
             }
         }
     }
 
     @MainActor
     func presentChatroom(_ chatroom: Chatroom, with message: String? = nil) {
+        defer { updateSelectedRow(chatroom: chatroom) }
         // MARK: 1. Create and config ViewController
         let vc = chatViewController(for: chatroom, with: message)
 
@@ -1603,8 +1603,6 @@ extension ChatListViewController: UISearchBarDelegate, UISearchResultsUpdating,
                 return
             }
 
-            self?.updateSelectedRow(chatroom: chatroom)
-
             presenter.presentChatroom(chatroom, with: message.transactionId)
         }
     }
@@ -1615,8 +1613,6 @@ extension ChatListViewController: UISearchBarDelegate, UISearchResultsUpdating,
                 return
             }
 
-            self?.updateSelectedRow(chatroom: chatroom)
-
             presenter.presentChatroom(chatroom)
         }
     }