Merge branch 'fix/MAILIOS-4230' into 'release/4.13.0'

MAILIOS-4230, Empty sender image on drafts with no recipient address See merge request ProtonMail/protonmail-ios!4012
ProtonMail · Mar 4, 2024 · a846875 · a846875
2 parents 55fd5a3 + 8779f18
commit a846875
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/...llers/APP/Mailbox/MailboxViewController/MailboxViewController+BuildMessageViewModel.swift b/...llers/APP/Mailbox/MailboxViewController/MailboxViewController+BuildMessageViewModel.swift
@@ -42,15 +42,18 @@ extension MailboxViewController {
         let labelId = viewModel.labelID
         let isSelected = self.viewModel.selectionContains(id: message.messageID.rawValue)
         let contactGroups = viewModel.contactGroups()
-        let senderRowComponents = mailboxMessageCellHelper.senderRowComponents(
+        var senderRowComponents = mailboxMessageCellHelper.senderRowComponents(
             for: message,
             basedOn: replacingEmailsMap,
             groupContacts: contactGroups,
             shouldReplaceSenderWithRecipients: true
         )
+        if senderRowComponents.isEmpty {
+            senderRowComponents = [.string("")]
+        }
         let isSending = viewModel.messageService.isMessageBeingSent(id: message.messageID)
 
-        var initial = ""
+        var initial = "?"
         if let firstSenderRowComponent = senderRowComponents.first {
             initial = [firstSenderRowComponent].initials()
         }

diff --git a/ProtonMail/ProtonMail/ViewControllers/APP/Search/SearchViewModel.swift b/ProtonMail/ProtonMail/ViewControllers/APP/Search/SearchViewModel.swift
@@ -171,12 +171,15 @@ extension SearchViewModel {
 
     func getMessageCellViewModel(message: MessageEntity) -> NewMailboxMessageViewModel {
         let contactGroups = user.contactGroupService.getAllContactGroupVOs()
-        let senderRowComponents = dependencies.mailboxMessageCellHelper.senderRowComponents(
+        var senderRowComponents = dependencies.mailboxMessageCellHelper.senderRowComponents(
             for: message,
             basedOn: sharedReplacingEmailsMap,
             groupContacts: contactGroups,
             shouldReplaceSenderWithRecipients: true
         )
+        if senderRowComponents.isEmpty {
+            senderRowComponents = [.string("")]
+        }
         let weekStart = user.userInfo.weekStartValue
         let customFolderLabels = user.labelService.getAllLabels(of: .folder)
         let isSelected = self.selectedMessages.contains(message)

diff --git a/ProtonMail/ProtonMailUITests/Robots/Mailbox/Drafts/DraftsRobot.swift b/ProtonMail/ProtonMailUITests/Robots/Mailbox/Drafts/DraftsRobot.swift
@@ -8,6 +8,7 @@
 
 import XCTest
 import fusion
+@testable import ProtonMail
 
 fileprivate struct id {
     static let messageTitleLabelIdentifier = "mailboxMessageCell.titleLabel"
@@ -20,7 +21,8 @@ fileprivate struct id {
  * contains actions and verifications for Drafts composer functionality.
  */
 class DraftsRobot: MailboxRobotInterface {
-
+    static let noRecipientText = "(\(L11n.MailBox.noRecipient))"
+
     var verify = Verify()
 
     override func searchBar() -> SearchRobot {
@@ -61,6 +63,14 @@ class DraftsRobot: MailboxRobotInterface {
                 .waitUntilExists()
                 .checkExists()
         }
+
+        func messageWithSubjectAndRecipientAndInitialsExists(subject: String, to: String, initials: String) {
+            let messageCell = cell("NewMailboxMessageCell.\(subject)")
+                .waitUntilExists()
+                .checkExists()
+            let isCorrect = messageCell.label()?.hasPrefix("\(initials), \(subject), \(to),") ?? false
+            XCTAssertTrue(isCorrect)
+        }
     }
 }
 
diff --git a/ProtonMail/ProtonMailUITests/Tests/Drafts/DraftsTests.swift b/ProtonMail/ProtonMailUITests/Tests/Drafts/DraftsTests.swift
@@ -35,6 +35,22 @@ class DraftsTests: FixtureAuthenticatedTestCase {
         }
     }
 
+    func testSaveEmptyRecipientDraft() {
+        runTestWithScenario(.qaMail001) {
+            InboxRobot()
+                .compose()
+                .draftSubjectBody(subject, body)
+                .tapCancel()
+                .menuDrawer()
+                .drafts()
+                .verify.messageWithSubjectAndRecipientAndInitialsExists(
+                subject: subject,
+                to: DraftsRobot.noRecipientText,
+                initials: "?"
+            )
+        }
+    }
+
     func testSaveDraftWithAttachment() {
         runTestWithScenario(.qaMail001) {
             InboxRobot()