Merge pull request #868 from Adamant-im/trello.com/c/aZtAfZ44

[trello.com/c/aZtAfZ44] fix select row when we enter the chat via popup

Author: vovameister

Adamant/Modules/ChatsList/ChatListViewController.swift

@@ -1002,6 +1002,7 @@ extension ChatListViewController {
 
     @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)
 
@@ -1625,14 +1626,6 @@ extension ChatListViewController: UISearchBarDelegate, UISearchResultsUpdating,
                 return
             }
 
-            if let indexPath = tableView.indexPathForSelectedRow {
-                tableView.deselectRow(at: indexPath, animated: true)
-            }
-
-            if let indexPath = self?.chatsController?.indexPath(forObject: chatroom) {
-                tableView.selectRow(at: indexPath, animated: true, scrollPosition: .none)
-            }
-
             presenter.presentChatroom(chatroom, with: message.transactionId)
         }
     }
@@ -1643,14 +1636,6 @@ extension ChatListViewController: UISearchBarDelegate, UISearchResultsUpdating,
                 return
             }
 
-            if let indexPath = tableView.indexPathForSelectedRow {
-                tableView.deselectRow(at: indexPath, animated: true)
-            }
-
-            if let indexPath = self?.chatsController?.indexPath(forObject: chatroom) {
-                tableView.selectRow(at: indexPath, animated: true, scrollPosition: .none)
-            }
-
             presenter.presentChatroom(chatroom)
         }
     }
@@ -1659,6 +1644,15 @@ extension ChatListViewController: UISearchBarDelegate, UISearchResultsUpdating,
         account.chatroom?.isForcedVisible = true
         newChatController(didSelectAccount: account, preMessage: nil, name: nil)
     }
+    
+    func updateSelectedRow(chatroom: Chatroom) {
+        if let indexPath = tableView.indexPathForSelectedRow {
+            tableView.deselectRow(at: indexPath, animated: true)
+        }
+        if let indexPath = self.chatsController?.indexPath(forObject: chatroom) {
+            tableView.selectRow(at: indexPath, animated: true, scrollPosition: .none)
+        }
+    }
 }
 
 // MARK: Mac OS HotKeys