From 3f3c7321ad1569f94cdefcfd94c7727bb9624914 Mon Sep 17 00:00:00 2001 From: Ryan ZHAO <> Date: Wed, 12 Jun 2024 12:17:38 +1000 Subject: [PATCH] fix contacts sorting issue in global search --- .../GlobalSearch/GlobalSearchViewController.swift | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Session/Home/GlobalSearch/GlobalSearchViewController.swift b/Session/Home/GlobalSearch/GlobalSearchViewController.swift index f89273b44..421e13fad 100644 --- a/Session/Home/GlobalSearch/GlobalSearchViewController.swift +++ b/Session/Home/GlobalSearch/GlobalSearchViewController.swift @@ -46,7 +46,12 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI try SessionThreadViewModel .defaultContactsQuery(userPublicKey: getUserHexEncodedPublicKey(db)) .fetchAll(db) - }.defaulting(to: []) + } + .defaulting(to: []) + .sorted { + $0.displayName.lowercased() < $1.displayName.lowercased() + } + var groupedContacts: [String: SectionModel] = [:] contacts.forEach { contactViewModel in guard !contactViewModel.threadIsNoteToSelf else { @@ -78,13 +83,13 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI return SearchResultData( state: .defaultContacts, data: groupedContacts.values.sorted { sectionModel0, sectionModel1 in - let title0 = { + let title0: String = { switch sectionModel0.model { case .groupedContacts(let title): return title default: return "" } }() - let title1 = { + let title1: String = { switch sectionModel1.model { case .groupedContacts(let title): return title default: return ""