Skip to content

Commit 62b673b

Browse files
authored
[PAL-236] when bolus amount exceeds max, display warning (#608)
1 parent 9ccb7dd commit 62b673b

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

Loop/View Models/BolusEntryViewModel.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,16 @@ final class BolusEntryViewModel: ObservableObject {
340340
assertionFailure("Missing BolusEntryViewModelDelegate")
341341
return false
342342
}
343+
344+
guard let maximumBolus = maximumBolus else {
345+
presentAlert(.noMaxBolusConfigured)
346+
return false
347+
}
348+
349+
guard enteredBolusAmount <= maximumBolus.doubleValue(for: .internationalUnit()) else {
350+
presentAlert(.maxBolusExceeded)
351+
return false
352+
}
343353

344354
let amountToDeliver = delegate.roundBolusVolume(units: enteredBolusAmount)
345355
guard enteredBolusAmount == 0 || amountToDeliver > 0 else {
@@ -352,16 +362,6 @@ final class BolusEntryViewModel: ObservableObject {
352362
let manualGlucoseSample = manualGlucoseSample
353363
let potentialCarbEntry = potentialCarbEntry
354364

355-
guard let maximumBolus = maximumBolus else {
356-
presentAlert(.noMaxBolusConfigured)
357-
return false
358-
}
359-
360-
guard amountToDeliver <= maximumBolus.doubleValue(for: .internationalUnit()) else {
361-
presentAlert(.maxBolusExceeded)
362-
return false
363-
}
364-
365365
if let manualGlucoseSample = manualGlucoseSample {
366366
guard LoopConstants.validManualGlucoseEntryRange.contains(manualGlucoseSample.quantity) else {
367367
presentAlert(.manualGlucoseEntryOutOfAcceptableRange)

0 commit comments

Comments
 (0)