nik/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-09-19 05:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide the mesh plaintext banner while the timeline is empty

Browse Source 
The empty-state hint already occupies that space; showing both at once
is two security lectures before anyone has sent a message.
This commit is contained in:
Taksh 2026-09-11 07:23:05 +05:30
parent 7522c25316
commit ad5a5d5f1d
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitchat/Services/MeshPlaintextNoticeSettings.swift
View File

@ -32,6 +32,12 @@ enum MeshPlaintextNoticeSettings {
defaults.removeObject(forKey: dismissedKey)
NotificationCenter.default.post(name: .meshPlaintextNoticeSettingsChanged, object: nil)
}
/// Visible on the public mesh composer once there is a live timeline.
/// An empty mesh already has the empty-state hint; don't stack both.
static func shouldShow(dismissed: Bool, isPublicMesh: Bool, timelineEmpty: Bool) -> Bool {
!dismissed && isPublicMesh && !timelineEmpty
}
}
extension Notification.Name {

17
bitchat/Views/ContentComposerView.swift
View File

@ -10,6 +10,7 @@ struct ContentComposerView: View {
@EnvironmentObject private var conversationUIModel: ConversationUIModel
@EnvironmentObject private var privateConversationModel: PrivateConversationModel
@EnvironmentObject private var locationChannelsModel: LocationChannelsModel
@EnvironmentObject private var publicChatModel: PublicChatModel
@ObservedObject private var bridgeService = BridgeService.shared
@Environment(\.appTheme) private var theme
@ThemedPalette private var palette
@ -162,12 +163,18 @@ struct ContentComposerView: View {
private extension ContentComposerView {
var showsMeshPlaintextNotice: Bool {
guard !meshPlaintextNoticeDismissed,
privateConversationModel.selectedHeaderState == nil,
case .mesh = locationChannelsModel.selectedChannel else {
return false
let onPublicMesh: Bool
if privateConversationModel.selectedHeaderState == nil,
case .mesh = locationChannelsModel.selectedChannel {
onPublicMesh = true
} else {
onPublicMesh = false
}
return true
return MeshPlaintextNoticeSettings.shouldShow(
dismissed: meshPlaintextNoticeDismissed,
isPublicMesh: onPublicMesh,
timelineEmpty: publicChatModel.messages.isEmpty
)
}
/// The nearby-only scope toggle appears only where it means something:

7
bitchatTests/Services/MeshPlaintextNoticeSettingsTests.swift
View File

@ -42,4 +42,11 @@ struct MeshPlaintextNoticeSettingsTests {
#expect(received)
#expect(!MeshPlaintextNoticeSettings.isDismissed(in: defaults))
}
@Test func hiddenOnAnEmptyMeshTimeline() {
#expect(MeshPlaintextNoticeSettings.shouldShow(dismissed: false, isPublicMesh: true, timelineEmpty: true) == false)
#expect(MeshPlaintextNoticeSettings.shouldShow(dismissed: false, isPublicMesh: true, timelineEmpty: false) == true)
#expect(MeshPlaintextNoticeSettings.shouldShow(dismissed: true, isPublicMesh: true, timelineEmpty: false) == false)
#expect(MeshPlaintextNoticeSettings.shouldShow(dismissed: false, isPublicMesh: false, timelineEmpty: false) == false)
}
}