Merge branch 'feat/favorites-consent' into feat/app-lock

This commit is contained in:
jack 2026-08-11 11:09:53 +02:00
commit 3c0a2bbaab
2 changed files with 1 additions and 2 deletions

View File

@ -24,7 +24,6 @@ struct MeshPeerList: View {
static let reachable = String(localized: "content.accessibility.reachable_mesh", comment: "Accessibility label for mesh-reachable peer indicator")
static let nostr = String(localized: "content.accessibility.available_nostr", comment: "Accessibility label for Nostr-available peer indicator")
static let offline = String(localized: "mesh_peers.state.offline", comment: "State label for a peer that is not currently reachable")
static let favorite = String(localized: "mesh_peers.state.favorite", comment: "State label for a favorited peer")
static let unread = String(localized: "mesh_peers.state.unread", comment: "State label for a peer with unread private messages")
static let blocked = String(localized: "mesh_peers.state.blocked", comment: "State label for a blocked peer")
static let vouched = String(localized: "mesh_peers.state.vouched", comment: "State label for a peer vouched for by someone the user verified")

View File

@ -287,7 +287,7 @@ struct CommandProcessorTests {
}
switch blockResult {
case .success(let message):
#expect(message == "blocked carol in geohash chats")
#expect(message == "blocked carol in this geohash channel — in other geohash channels they appear as someone new, so block them there too if needed")
default:
Issue.record("Expected success result")
}