From 35c943aa68b1be10ff6fbbc0410983c8a44ae0ca Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 26 Mar 2024 14:01:59 -0700 Subject: [PATCH] Fix text search not running if there was not a filter set, fix typo on pax counter settings localized string --- Meshtastic/Views/Nodes/NodeList.swift | 2 +- Meshtastic/Views/Settings/Settings.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift index 0ab993c7..2e8bda18 100644 --- a/Meshtastic/Views/Nodes/NodeList.swift +++ b/Meshtastic/Views/Nodes/NodeList.swift @@ -316,7 +316,7 @@ struct NodeList: View { } } - if predicates.count > 0 { + if predicates.count > 0 || !searchText.isEmpty { if !searchText.isEmpty { let filterPredicates = NSCompoundPredicate(type: .and, subpredicates: predicates) diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift index b1883c1c..f0b221aa 100644 --- a/Meshtastic/Views/Settings/Settings.swift +++ b/Meshtastic/Views/Settings/Settings.swift @@ -333,7 +333,7 @@ struct Settings: View { PaxCounterConfig(node: nodes.first(where: { $0.num == selectedNode })) } label: { Label { - Text("config.module.paxcounter.setting") + Text("config.module.paxcounter.settings") } icon: { Image(systemName: "figure.walk.motion") }