Przeglądaj źródła

Remove leftover ack button from testing

dnzxy 2 dni temu
rodzic
commit
49460f79d5

+ 1 - 0
Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -28474,6 +28474,7 @@
       }
     },
     "Acknowledge all alerts" : {
+      "extractionState" : "stale",
       "localizations" : {
         "bg" : {
           "stringUnit" : {

+ 0 - 8
Trio/Sources/Modules/PumpConfig/PumpConfigProvider.swift

@@ -25,13 +25,5 @@ extension PumpConfig {
                 ?? PumpSettings(from: OpenAPS.defaults(for: OpenAPS.Settings.settings))
                 ?? PumpSettings(insulinActionCurve: 10, maxBolus: 10, maxBasal: 2)
         }
-
-        var unacknowledgedAlertsPublisher: AnyPublisher<Bool, Never> {
-            deviceManager.alertHistoryStorage.unacknowledgedAlertsPublisher.eraseToAnyPublisher()
-        }
-
-        func hasInitialUnacknowledgedAlerts() -> Bool {
-            deviceManager.alertHistoryStorage.unacknowledgedAlertsWithinLast24Hours().isNotEmpty
-        }
     }
 }

+ 0 - 12
Trio/Sources/Modules/PumpConfig/PumpConfigStateModel.swift

@@ -10,7 +10,6 @@ extension PumpConfig {
         private(set) var setupPumpType: PumpType = .minimed
         @Published var pumpState: PumpDisplayState?
         private(set) var initialSettings: PumpInitialSettings = .default
-        @Published var hasUnacknowledgedAlert: Bool = false
         @Injected() var bluetoothManager: BluetoothStateManager!
         @Injected() var trioAlertManager: TrioAlertManager!
 
@@ -19,13 +18,6 @@ extension PumpConfig {
                 .receive(on: DispatchQueue.main)
                 .assign(to: \.pumpState, on: self)
                 .store(in: &lifetime)
-
-            hasUnacknowledgedAlert = provider.hasInitialUnacknowledgedAlerts()
-            provider.unacknowledgedAlertsPublisher
-                .receive(on: DispatchQueue.main)
-                .assign(to: \.hasUnacknowledgedAlert, on: self)
-                .store(in: &lifetime)
-
             Task {
                 let basalSchedule = BasalRateSchedule(
                     dailyItems: await provider.getBasalProfile().map {
@@ -49,10 +41,6 @@ extension PumpConfig {
             setupPumpType = type
             setupPump = true
         }
-
-        func ack() {
-            trioAlertManager.acknowledgeAllOutstanding()
-        }
     }
 }
 

+ 0 - 4
Trio/Sources/Modules/PumpConfig/View/PumpConfigRootView.swift

@@ -44,10 +44,6 @@ extension PumpConfig {
                                     .frame(maxWidth: .infinity, minHeight: 50, alignment: .center)
                                     .font(.title2)
                                 }.padding()
-                                if state.hasUnacknowledgedAlert {
-                                    Spacer()
-                                    Button("Acknowledge all alerts") { state.ack() }
-                                }
                                 Spacer()
                             } else {
                                 VStack {