Merge pull request #650 from Adamant-im/trello.com/c/QCnKo03A

Added a time correction. Presenting an error on message send failure. Refactoring

Author: PingPongEzZ

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -1424,7 +1424,9 @@ private extension ChatViewModel {
                 dialog.send(.freeTokenAlert)
                 return
             }
-        case .accountNotFound, .accountNotInitiated, .dependencyError, .internalError, .networkError, .notLogged, .requestCancelled, .serverError, .transactionNotFound, .invalidTransactionStatus, .none:
+        case .serverError:
+            dialog.send(.richError(error))
+        case .accountNotFound, .accountNotInitiated, .dependencyError, .internalError, .networkError, .notLogged, .requestCancelled, .transactionNotFound, .invalidTransactionStatus, .none:
             break
         }
     }

Adamant/Modules/Wallets/Adamant/AdmWalletService+DynamicConstants.swift

@@ -18,6 +18,10 @@ extension AdmWalletService {
         crucialServiceUpdateInterval: 30,
         onScreenServiceUpdateInterval: 10
     )
+    
+    static var adamantTimestampCorrection: TimeInterval {
+        0.5
+    }
 
     static var newPendingInterval: Int {
         4000

Adamant/ServiceProtocols/DataProviders/ChatsProvider.swift

@@ -257,9 +257,6 @@ protocol ChatsProvider: DataProvider, Actor {
     // MARK: - Unconfirmed Transaction
     func addUnconfirmed(transactionId: UInt64, managedObjectId: NSManagedObjectID)
 
-    // MARK: - Fake messages
-    func fakeSent(message: AdamantMessage, recipientId: String, date: Date, status: MessageStatus, showsChatroom: Bool, completion: @escaping (ChatsProviderResultWithTransaction) -> Void)
-    
     func fakeReceived(
         message: AdamantMessage,
         senderId: String,
@@ -269,8 +266,6 @@ protocol ChatsProvider: DataProvider, Actor {
         showsChatroom: Bool
     ) async throws -> ChatTransaction
 
-    func fakeUpdate(status: MessageStatus, forTransactionId id: String, completion: @escaping (ChatsProviderResult) -> Void)
-    
     // MARK: - Search
     func getMessages(containing text: String, in chatroom: Chatroom?) -> [MessageTransaction]?
     func isTransactionUnique(_ transaction: RichMessageTransaction) -> Bool

Adamant/Services/DataProviders/AdamantChatsProvider+fakeMessages.swift

@@ -128,42 +128,6 @@ extension AdamantChatsProvider {
         }
     }
 
-    func fakeUpdate(status: MessageStatus, forTransactionId id: String, completion: @escaping (ChatsProviderResult) -> Void) {
-        // MARK: 1. Get transaction
-        let request = NSFetchRequest<MessageTransaction>(entityName: MessageTransaction.entityName)
-        request.predicate = NSPredicate(format: "transactionId == %@", id)
-        request.fetchLimit = 1
-        
-        guard let transaction = (try? stack.container.viewContext.fetch(request))?.first else {
-            completion(.failure(.transactionNotFound(id: id)))
-            return
-        }
-        
-        // MARK: 2. Update transaction in private context
-        let privateContext = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
-        privateContext.parent = stack.container.viewContext
-        
-        if let trs = privateContext.object(with: transaction.objectID) as? MessageTransaction {
-            trs.date = Date() as NSDate
-            trs.status = status.rawValue
-        } else {
-            completion(.failure(.internalError(AdamantError(message: "CoreData changed"))))
-            return
-        }
-        
-        // MARK: 3. Save changes
-        if privateContext.hasChanges {
-            do {
-                try privateContext.save()
-                completion(.success)
-            } catch {
-                completion(.failure(.internalError(error)))
-            }
-        } else {
-            completion(.success)
-        }
-    }
-    
     // MARK: - Logic
 
     private func fakeSent(text: String, loggedAddress: String, recipient: CoreDataAccount, date: Date, status: MessageStatus, markdown: Bool, showsChatroom: Bool, completion: @escaping (ChatsProviderResultWithTransaction) -> Void) {

Adamant/Services/DataProviders/AdamantChatsProvider.swift

@@ -306,20 +306,6 @@ extension AdamantChatsProvider {
         securedStore.remove(StoreKey.chatProvider.receivedLastHeight)
         securedStore.remove(StoreKey.chatProvider.readedLastHeight)
 
-        // Drop CoreData
-//        let context = NSManagedObjectContext(concurrencyType: .privateQueueConcurrencyType)
-//        context.parent = stack.container.viewContext
-//
-//        let trs = NSFetchRequest<ChatTransaction>(entityName: "ChatTransaction")
-//
-//        if let results = try? context.fetch(trs) {
-//            for obj in results {
-//                context.delete(obj)
-//            }
-//
-//            try! context.save()
-//        }
-        
         // Set State
         setState(.empty, previous: prevState, notify: notify)
     }
@@ -1115,7 +1101,10 @@ extension AdamantChatsProvider {
             }
 
             // MARK: 3. Prepare transaction
-            
+            if var correctedDate = transaction.date as? Date {
+                correctedDate -= AdmWalletService.adamantTimestampCorrection
+                transaction.date = correctedDate as NSDate
+            }
             transaction.statusEnum = MessageStatus.pending
             transaction.partner = context.object(with: recipientAccount.objectID) as? BaseAccount