Merge pull request #1722 from MixinNetwork/bugfix/transfer

Show identity number in transfer receiver selector
MixinNetwork · Jan 11, 2025 · 86f0ce4 · 86f0ce4
2 parents 7a207bd + 7ec7c39
commit 86f0ce4
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/Mixin/Service/Storage/Search Result/SearchResult.swift b/Mixin/Service/Storage/Search Result/SearchResult.swift
@@ -74,19 +74,26 @@ extension SearchResult {
 
     static func description(identityNumber: String?, phoneNumber: String?, keyword: String) -> NSAttributedString? {
         if let identityNumber = identityNumber, identityNumber.contains(keyword) {
-            let text = R.string.localizable.contact_mixin_id(identityNumber)
-            return SearchResult.attributedText(text: text,
-                                               textAttributes: SearchResult.normalDescriptionAttributes,
-                                               keyword: keyword,
-                                               keywordAttributes: SearchResult.highlightedNormalDescriptionAttributes)
+            SearchResult.attributedText(
+                text: R.string.localizable.contact_mixin_id(identityNumber),
+                textAttributes: SearchResult.normalDescriptionAttributes,
+                keyword: keyword,
+                keywordAttributes: SearchResult.highlightedNormalDescriptionAttributes
+            )
         } else if let phoneNumber = phoneNumber, phoneNumber.contains(keyword) {
-            let text = R.string.localizable.search_result_prefix_phone() + phoneNumber
-            return SearchResult.attributedText(text: text,
-                                               textAttributes: SearchResult.normalDescriptionAttributes,
-                                               keyword: keyword,
-                                               keywordAttributes: SearchResult.highlightedNormalDescriptionAttributes)
+            SearchResult.attributedText(
+                text: R.string.localizable.search_result_prefix_phone() + phoneNumber,
+                textAttributes: SearchResult.normalDescriptionAttributes,
+                keyword: keyword,
+                keywordAttributes: SearchResult.highlightedNormalDescriptionAttributes
+            )
+        } else if let identityNumber = identityNumber {
+            NSAttributedString(
+                string: identityNumber,
+                attributes: SearchResult.normalDescriptionAttributes
+            )
         } else {
-            return nil
+            nil
         }
     }