Skip to content

fix(ui): move location notes button from #mesh to location channels #917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
malkovitc wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(ui): move location notes button from #mesh to location channels #917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e75eb8
fix(ui): move location notes button from #mesh to location channels
Dec 8, 2025
c320ad2
fix: preserve selected geohash when notes sheet is open
Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions bitchat/Views/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,14 +1282,12 @@ struct ContentView: View {
String(localized: "content.accessibility.open_unread_private_chat", comment: "Accessibility label for the unread private chat button")
)
}
// Notes icon (mesh only and when location is authorized), to the left of #mesh
if case .mesh = locationManager.selectedChannel, locationManager.permissionState == .authorized {
// Bookmark toggle and notes icon (geochats only): to the left of #geohash
// Notes post to Nostr (internet), so they belong in location channels, not #mesh
if case .location(let ch) = locationManager.selectedChannel {
// Notes icon - posts permanent notes to Nostr for this location
Button(action: {
// Kick a one-shot refresh and show the sheet immediately.
LocationChannelManager.shared.enableLocationChannels()
LocationChannelManager.shared.refreshChannels()
// If we already have a block geohash, pass it; otherwise wait in the sheet.
notesGeohash = LocationChannelManager.shared.availableChannels.first(where: { $0.level == .building })?.geohash
notesGeohash = ch.geohash
showLocationNotes = true
Comment on lines +1287 to 1291
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Dec 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Keep location notes geohash at building precision

Selecting a non‑building location channel (e.g., city/province) and tapping the notes icon now passes the channel’s geohash straight into LocationNotesView (notesGeohash = ch.geohash). LocationNotesManager is explicitly scoped to 8‑character building geohashes (LocationNotesManager.swift lines 46–112 use Geohash.isValidBuildingGeohash to validate them), so shorter hashes produce warnings and the manager refuses later updates, leaving the sheet subscribing/posting under an invalid scope (often showing no notes). Before this change the button always used the building‑level geohash from availableChannels, so this regression affects anyone opening notes while on a higher‑level geo channel.

Useful? React with 👍 / 👎.

}) {
HStack(alignment: .center, spacing: 4) {
Expand All @@ -1304,10 +1302,6 @@ struct ContentView: View {
.accessibilityLabel(
String(localized: "content.accessibility.location_notes", comment: "Accessibility label for location notes button")
)
}

// Bookmark toggle (geochats): to the left of #geohash
if case .location(let ch) = locationManager.selectedChannel {
Button(action: { GeohashBookmarksStore.shared.toggle(ch.geohash) }) {
Image(systemName: GeohashBookmarksStore.shared.isBookmarked(ch.geohash) ? "bookmark.fill" : "bookmark")
.font(.bitchatSystem(size: 12))
Expand Down Expand Up @@ -1442,6 +1436,9 @@ struct ContentView: View {
LocationChannelManager.shared.endLiveRefresh()
}
.onChange(of: locationManager.availableChannels) { channels in
// Only auto-update notesGeohash if sheet is not already open
// (user may have selected a specific channel's geohash)
guard !showLocationNotes else { return }
if let current = channels.first(where: { $0.level == .building })?.geohash,
notesGeohash != current {
notesGeohash = current
Expand Down