From e0f1e243a62de2972a6f27c8fc7e0dc952d8384e Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Mon, 13 Mar 2023 19:27:36 -0700 Subject: [PATCH] fix dumb disabled logic on telemetry config --- Meshtastic/Views/Nodes/NodeDetail.swift | 3 +-- Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Meshtastic/Views/Nodes/NodeDetail.swift b/Meshtastic/Views/Nodes/NodeDetail.swift index c095fd4d..d5495f6a 100644 --- a/Meshtastic/Views/Nodes/NodeDetail.swift +++ b/Meshtastic/Views/Nodes/NodeDetail.swift @@ -393,12 +393,11 @@ struct NodeDetail: View { HStack { let connectedNode = getNodeInfo(id: bleManager.connectedPeripheral?.num ?? -1, context: context) - if node.metadata?.canShutdown ?? false || hwModelString == "RAK4631" {// node.metadata?.hwModel ?? "UNSET" == "RAK4631" { + if node.metadata?.canShutdown ?? false { Button(action: { showingShutdownConfirm = true }) { - Label("Power Off", systemImage: "power") } .buttonStyle(.bordered) diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index 389f37de..757400d1 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -84,7 +84,7 @@ struct TelemetryConfig: View { .toggleStyle(SwitchToggleStyle(tint: .accentColor)) } } - .disabled(self.bleManager.connectedPeripheral == nil || node?.positionConfig == nil) + .disabled(self.bleManager.connectedPeripheral == nil || node?.telemetryConfig == nil) Button { isPresentingSaveConfirm = true } label: {