refactor: Fix the shouldAddUserProposal

Infomaniak · Jan 13, 2025 · e7aac2a · e7aac2a
1 parent 1168ce4
commit e7aac2a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Mail/Views/New Message/AutocompletionCell.swift b/Mail/Views/New Message/AutocompletionCell.swift
@@ -80,9 +80,10 @@ struct AutocompletionCell: View {
     ) {
         self.addRecipient = { addRecipient($0 as! MergedContact) }
         self.autocompletion = autocompletion
+        self.highlight = highlight
         self.alreadyAppend = alreadyAppend
         self.unknownRecipient = unknownRecipient
-        title = autocompletion.name
+        title = autocompletion.email
         subtitle = autocompletion.email
     }
 
@@ -97,6 +98,7 @@ struct AutocompletionCell: View {
     ) {
         self.addRecipient = { addRecipient($0 as! GroupContact) }
         self.autocompletion = autocompletion
+        self.highlight = highlight
         self.alreadyAppend = alreadyAppend
         self.unknownRecipient = unknownRecipient
         self.title = title

diff --git a/Mail/Views/New Message/AutocompletionView.swift b/Mail/Views/New Message/AutocompletionView.swift
@@ -131,17 +131,19 @@ struct AutocompletionView: View {
 
             shouldAddUserProposal = !(realResults.count == 1 && realResults.first?.autocompletableName == textDebounce.text)
 
-            if shouldAddUserProposal {
-                combinedResults.append(MergedContact(email: textDebounce.text, local: nil, remote: nil))
-            }
-
             combinedResults.sort { lhs, rhs in
                 guard let lhsContact = lhs as? MergedContact,
                       let rhsContact = rhs as? MergedContact else { return false }
                 return sortByRemoteAndName(lhs: lhsContact, rhs: rhsContact)
             }
 
-            let result = combinedResults.prefix(10)
+            var result = combinedResults.prefix(10)
+
+            if shouldAddUserProposal {
+                let mergedContact = MergedContact(email: textDebounce.text, local: nil, remote: nil)
+                mergedContact.name = textDebounce.text
+                result.append(mergedContact)
+            }
 
             autocompletion = Array(result)
         }