From d6b8616543583865f07f0f00fbdf64f066db5cc7 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Wed, 19 Jun 2024 14:15:18 +1000
Subject: [PATCH] further fix for global search sorting

---
 Session/Home/GlobalSearch/GlobalSearchViewController.swift | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Session/Home/GlobalSearch/GlobalSearchViewController.swift b/Session/Home/GlobalSearch/GlobalSearchViewController.swift
index 54e0899e1..ab681d332 100644
--- a/Session/Home/GlobalSearch/GlobalSearchViewController.swift
+++ b/Session/Home/GlobalSearch/GlobalSearchViewController.swift
@@ -42,6 +42,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
     // MARK: - Variables
     
     private lazy var defaultSearchResults: SearchResultData = {
+        let nonalphabeticNameTitle: String = "#"
         let contacts: [SessionThreadViewModel] = Storage.shared.read { db -> [SessionThreadViewModel]? in
             try SessionThreadViewModel
                 .defaultContactsQuery(userPublicKey: getUserHexEncodedPublicKey(db))
@@ -69,7 +70,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
             let initialCharacter: String = (displayName.length > 0 ? displayName.substring(to: 1) : "")
             let section: String = initialCharacter.capitalized.isSingleAlphabet ?
                 initialCharacter.capitalized :
-                "#"
+                nonalphabeticNameTitle
                 
             if groupedContacts[section] == nil {
                 groupedContacts[section] = SectionModel(
@@ -96,11 +97,11 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
                     }
                 }()
                 
-                if title0.isAlphabetic && title1.isAlphabetic {
+                if ![title0, title1].contains(nonalphabeticNameTitle) {
                     return title0 < title1
                 }
                 
-                return title1 == "#"
+                return title1 == nonalphabeticNameTitle
             }
         )
     }()