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

[trello.com/c/aZtAfZ44] fix replace message

Author: vovameister

Adamant/Modules/Chat/View/ChatViewController.swift

@@ -164,10 +164,8 @@ final class ChatViewController: MessagesViewController {
         super.viewDidAppear(animated)
         defer {
             state.isFirstTimeViewAppeared = true
-            if state.isViewDissappeared == true {
-                state.isViewDissappeared.toggle()
-                updateUnreadMessages()
-            }
+            state.isViewDissappeared = false
+            updateUnreadMessages()
         }
         inputBar.isUserInteractionEnabled = true
         chatMessagesCollectionView.fixedBottomOffset = nil

Adamant/Modules/Chat/ViewModel/ChatViewModel.swift

@@ -538,6 +538,12 @@ final class ChatViewModel: NSObject {
 
     func scroll(to messageId: String) {
         guard let partnerAddress = chatroom?.partner?.address else { return }
+        if let chatroom,
+           let messageIdToShow {
+            Task(priority: .high) {
+                await chatsProvider.markMessageAsRead(chatroom: chatroom, message: messageIdToShow)
+            }
+        }
         messageIdToShow = nil
 
         Task {
@@ -556,9 +562,6 @@ final class ChatViewModel: NSObject {
                         recipient: partnerAddress
                     )
                 }
-                if let chatroom {
-                    await chatsProvider.markMessageAsRead(chatroom: chatroom, message: messageId)
-                }
 
                 await waitForMessage(withId: messageId)
                 scrollToId = messageId

NotificationServiceExtension/NotificationService.swift

@@ -337,9 +337,11 @@ class NotificationService: UNNotificationServiceExtension {
         var badgeValue = (Int(SecureStore.get(StoreKey.notificationsService.customBadgeNumber) ?? "0") ?? 0)
         if !shouldIgnoreNotification {
             badgeValue += 1
-            bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
+        } else {
+            bestAttemptContent.body = ""
         }
 
+        bestAttemptContent.userInfo[AdamantNotificationUserInfoKeys.decodedMessage] = decodedMessage
         bestAttemptContent.badge = NSNumber(value: badgeValue)
         SecureStore.set(String(badgeValue), for: StoreKey.notificationsService.customBadgeNumber)