Merge pull request #721 from Adamant-im/trello.com/c/B9LfGpfD

[trello.com/c/B9LfGpfD] Spinner retrieved back

Author: PingPongEzZ

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -478,24 +478,28 @@ private extension ChatViewController {
                 self?.didTapSelectText(text: text)
             }
             .store(in: &subscriptions)
+        
         viewModel.$unreadMesaggesIndexes
             .removeDuplicates()
             .sink { [weak self] _ in
                 self?.updateUnreadMessages()
             }
             .store(in: &subscriptions)
+        
         viewModel.$unreadMessagesIds
             .removeDuplicates()
             .sink { _ in
                 self.updateScrollDownButtonVisibility()
             }
             .store(in: &subscriptions)
+        
         viewModel.$messagesWithUnredReactionsIds
             .removeDuplicates()
             .sink { [weak self] _ in
                 self?.updateScrollToUnreadButtonVisibility()
             }
             .store(in: &subscriptions)
+        
         viewModel.showBuyAndSell
             .sink { [weak self] in
                 self?.presentBuyAndSell()

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -271,8 +271,9 @@ final class ChatViewModel: NSObject {
                 return
             }
 
-            let isChatLoaded = await chatsProvider.isChatLoaded(with: address)
-            let isChatLoading = await chatsProvider.isChatLoading(with: address)
+            async let chatLoadingState = (chatsProvider.isChatLoaded(with: address), chatsProvider.isChatLoading(with: address))
+            
+            let (isChatLoaded, isChatLoading) = await chatLoadingState
 
             guard !isChatLoading else {
                 await waitForChatLoading(with: address)
@@ -1149,7 +1150,7 @@ private extension ChatViewModel {
             await chatsProvider.stateObserver
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self] state in
-                    self?.isHeaderLoading = state == .updating ? true : false
+                    self?.isHeaderLoading = state.isUpdating
                 }
                 .store(in: &subscriptions)
         }.stored(in: tasksStorage)

Adamant/Modules/ChatsList/ChatListViewController.swift

@@ -1589,15 +1589,6 @@ extension ChatListViewController {
     }
 }
 
-private extension DataProviderState {
-    var isUpdating: Bool {
-        switch self {
-        case .updating: true
-        case .failedToUpdate, .upToDate, .empty: false
-        }
-    }
-}
-
 private extension UITableView {
     func reloadRowsAndPreserveSelection(at indexPaths: [IndexPath]) {
         let selectedRowIndexPath = indexPathForSelectedRow

Adamant/ServiceProtocols/DataProviders/DataProvider.swift

@@ -14,6 +14,13 @@ enum DataProviderState {
     case updating
     case upToDate
     case failedToUpdate(Error)
+    
+    var isUpdating: Bool {
+        switch self {
+        case .updating: true
+        case .failedToUpdate, .upToDate, .empty: false
+        }
+    }
 }
 
 protocol DataProvider: AnyObject, Actor {