Commit `6887325f24`

6887325f24a4bd1a261c68f0adce77cf86290a02

parent: 29b32e9056

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-22 23:23 UTC

admin: read the admin flag on the My Profile tab, not in the toolbar

AccountMenu's label can render as a native bar button, which iOS never
runs a .task on, so the admin read could silently never fire. Read
whoami once on ProfileView's .task on the My Profile tab instead and
pass the result into AccountMenu as a plain property.

Layout: unified · split

gitbay/ContentView.swift +9 −1

     @State private var selectedTab = Tabs.dashboard
     @State private var dashboardPath = NavigationPath()
+    /// whoami's admin flag, read on the My Profile tab, decides whether
+    /// the account menu offers Admin.
+    @State private var isAdmin = false
     /// Which account `dashboardPath`'s routes were resolved against.
     ///
     /// `.id(account.id)` sits on the `TabView`, not on `ContentView`, so
                     NavigationStack {
                         ProfileView(client: client, name: account.username,
                                     title: "My Profile")
-                            .toolbar { AccountMenu() }
+                            .toolbar { AccountMenu(isAdmin: isAdmin) }
+                            .task {
+                                isAdmin = false
+                                isAdmin = await AdminCheck.isAdmin(client)
+                            }
                             .navigationDestinations(client: client)
                     }
                 }

gitbay/Views/Repos/RepoListView.swift +3 −10

     @Environment(SessionStore.self) private var session
-    /// Read from `whoami` when the menu appears and on an account switch.
+    /// Whether the signed-in account is an instance admin, read from
-    /// The menu has no model; this is the one read that reaches it.
+    /// `whoami` on the My Profile tab and passed in.
-    @State private var isAdmin = false
+    let isAdmin: Bool
     var body: some ToolbarContent {
         ToolbarItem(placement: .topBarTrailing) {
                 }
             } label: {
                 Image(systemName: "person.crop.circle")
-                    // ToolbarContent takes no .task; the label is a view.
-                    .task(id: session.current?.id) {
-                        isAdmin = false
-                        if let client = session.client {
-                            isAdmin = await AdminCheck.isAdmin(client)
-                        }
-                    }
             }
             .accessibilityIdentifier("account-menu")
         }

Commit 6887325f24

Commit `6887325f24`