From 40a47611f2edbd1e98e347ca7c7f9f15982f3e09 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 3 Mar 2023 16:41:10 -0800 Subject: [PATCH 1/3] Use secondary button for Deactivate on Insert Failure --- OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift b/OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift index e603a030..bf625b04 100644 --- a/OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift +++ b/OmniBLE/PumpManagerUI/Views/InsertCannulaView.swift @@ -59,7 +59,7 @@ struct InsertCannulaView: View { }) { Text(LocalizedString("Deactivate Pod", comment: "Button text for deactivate pod button")) .accessibility(identifier: "button_deactivate_pod") - .actionButtonStyle(.destructive) + .actionButtonStyle(.secondary) } .disabled(self.viewModel.state.isProcessing) } From 5e82ad27c92f325d640921919e7ec2bcef3b0d3e Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 3 Mar 2023 16:42:13 -0800 Subject: [PATCH 2/3] Add check bluetooth to several DASH messages --- OmniBLE/PumpManager/PodCommsSession.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE/PumpManager/PodCommsSession.swift b/OmniBLE/PumpManager/PodCommsSession.swift index 27b50dd5..e8926cf5 100644 --- a/OmniBLE/PumpManager/PodCommsSession.swift +++ b/OmniBLE/PumpManager/PodCommsSession.swift @@ -48,7 +48,7 @@ extension PodCommsError: LocalizedError { case .invalidData: return nil case .noResponse: - return LocalizedString("No response from pod", comment: "Error message shown when no response from pod was received") + return LocalizedString("No response from pod; check Bluetooth", comment: "Error message shown when no response from DASH pod was received") case .emptyResponse: return LocalizedString("Empty response from pod", comment: "Error message shown when empty response from pod was received") case .podAckedInsteadOfReturningResponse: @@ -60,7 +60,7 @@ extension PodCommsError: LocalizedError { case .invalidAddress(address: let address, expectedAddress: let expectedAddress): return String(format: LocalizedString("Invalid address 0x%x. Expected 0x%x", comment: "Error message for when unexpected address is received (1: received address) (2: expected address)"), address, expectedAddress) case .podNotConnected: - return LocalizedString("Pod not connected", comment: "Error message shown when the pod is not connected.") + return LocalizedString("Pod not connected; check Bluetooth", comment: "Error message shown when the pod is not connected.") case .unfinalizedBolus: return LocalizedString("Bolus in progress", comment: "Error message shown when operation could not be completed due to existing bolus in progress") case .unfinalizedTempBasal: From 06b4dde5a626d428de3776241fa9d05332551f55 Mon Sep 17 00:00:00 2001 From: marionbarker Date: Fri, 10 Mar 2023 14:44:17 -0800 Subject: [PATCH 3/3] Restore PodCommsSession.swift to dev version --- OmniBLE/PumpManager/PodCommsSession.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE/PumpManager/PodCommsSession.swift b/OmniBLE/PumpManager/PodCommsSession.swift index e8926cf5..27b50dd5 100644 --- a/OmniBLE/PumpManager/PodCommsSession.swift +++ b/OmniBLE/PumpManager/PodCommsSession.swift @@ -48,7 +48,7 @@ extension PodCommsError: LocalizedError { case .invalidData: return nil case .noResponse: - return LocalizedString("No response from pod; check Bluetooth", comment: "Error message shown when no response from DASH pod was received") + return LocalizedString("No response from pod", comment: "Error message shown when no response from pod was received") case .emptyResponse: return LocalizedString("Empty response from pod", comment: "Error message shown when empty response from pod was received") case .podAckedInsteadOfReturningResponse: @@ -60,7 +60,7 @@ extension PodCommsError: LocalizedError { case .invalidAddress(address: let address, expectedAddress: let expectedAddress): return String(format: LocalizedString("Invalid address 0x%x. Expected 0x%x", comment: "Error message for when unexpected address is received (1: received address) (2: expected address)"), address, expectedAddress) case .podNotConnected: - return LocalizedString("Pod not connected; check Bluetooth", comment: "Error message shown when the pod is not connected.") + return LocalizedString("Pod not connected", comment: "Error message shown when the pod is not connected.") case .unfinalizedBolus: return LocalizedString("Bolus in progress", comment: "Error message shown when operation could not be completed due to existing bolus in progress") case .unfinalizedTempBasal: