From ac1fc2d6c13413c0e3338d626770b2d52bcb21c1 Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Tue, 13 Oct 2026 12:35:12 +0000
Subject: [PATCH] review: round 1 fixes

R1-1 New chat clears its online results on a profile switch, as the chat list does
R1-3 the search spinner follows its two flags through property observers
R1-4 the join verb keeps one line, so the name truncates instead

Run: 002-ios-directory-search-ui, review round 1
---
 .../Shared/Views/ChatList/DirectorySearchView.swift  | 12 ++++--------
 .../ios/Shared/Views/NewChat/NewChatMenuButton.swift |  3 +++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/ios/Shared/Views/ChatList/DirectorySearchView.swift b/apps/ios/Shared/Views/ChatList/DirectorySearchView.swift
index d033fff14f..71f3183cf0 100644
--- a/apps/ios/Shared/Views/ChatList/DirectorySearchView.swift
+++ b/apps/ios/Shared/Views/ChatList/DirectorySearchView.swift
@@ -18,8 +18,8 @@ enum DirectoryFooter {
 class OnlineSearchModel: ObservableObject {
     @Published private(set) var names: [NameSearchResult] = []
     @Published private(set) var directory: [DirectoryResult] = []
-    @Published private(set) var loading = false
-    @Published private(set) var resolvingNames = false
+    @Published private(set) var loading = false { didSet { updateSpinner() } }
+    @Published private(set) var resolvingNames = false { didSet { updateSpinner() } }
     @Published private(set) var failed = false
     // tells "nothing searched yet" apart from "searched and found nothing"
     @Published private(set) var searched = false
@@ -44,7 +44,6 @@ class OnlineSearchModel: ObservableObject {
         failed = false
         searched = false
         searchedText = ""
-        updateSpinner()
     }
 
     // a way out of the wait, not out of the results: what is already shown stays
@@ -52,7 +51,6 @@ class OnlineSearchModel: ObservableObject {
         generation += 1
         loading = false
         resolvingNames = false
-        updateSpinner()
     }
 
     func search(_ text: String, name: String?) async {
@@ -62,7 +60,6 @@ class OnlineSearchModel: ObservableObject {
         searchedText = text
         if let name {
             resolvingNames = true
-            updateSpinner()
             // captured here: the async let initializer runs later, in the child task, possibly after a reset
             let gen = generation
             async let resolution: Void = resolveNames(name, generation: gen)
@@ -130,7 +127,6 @@ class OnlineSearchModel: ObservableObject {
         }
         guard gen == generation else { return }
         resolvingNames = false
-        updateSpinner()
         names = results
     }
 
@@ -138,7 +134,6 @@ class OnlineSearchModel: ObservableObject {
         let gen = generation
         loading = true
         failed = false
-        updateSpinner()
         let r = await apiSearchDirectory(searchedText, cursor: cursor)
         var page: [DirectoryResult] = []
         if let r {
@@ -152,7 +147,6 @@ class OnlineSearchModel: ObservableObject {
         guard gen == generation else { return }
         loading = false
         searched = true
-        updateSpinner()
         guard let r else {
             failed = true
             return
@@ -232,6 +226,8 @@ struct DirectorySearchRow: View {
             Spacer()
             Text(isChannel ? "Join channel" : "Join group")
                 .foregroundColor(theme.colors.primary)
+                .lineLimit(1)
+                .fixedSize()
         }
         .frame(maxWidth: .infinity, alignment: .leading)
         .contentShape(Rectangle())
diff --git a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
index b34ce883db..f36f9dfaba 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatMenuButton.swift
@@ -187,6 +187,9 @@ struct NewChatSheet: View {
         .onChange(of: searchText) { _ in
             onlineSearch.reset()
         }
+        .onChange(of: chatModel.currentUser?.userId) { _ in
+            onlineSearch.reset()
+        }
     }
 
     @ViewBuilder private func onlineSearchSections(_ rows: OnlineSearchRows) -> some View {