Revert "preliminary fix for bolus string issue in bolus progress view"

This reverts commit a7fc186645562562c3491443087c67d55e2fa33f.

move progress bar to bottom

FreeAPS/Sources/APS/APSManager.swift

@@ -21,7 +21,6 @@ protocol APSManager {
     var lastLoopDate: Date { get }
     var lastLoopDateSubject: PassthroughSubject<Date, Never> { get }
     var bolusProgress: CurrentValueSubject<Decimal?, Never> { get }
-    var bolusAmount: CurrentValueSubject<Decimal?, Never> { get }
     var pumpExpiresAtDate: CurrentValueSubject<Date?, Never> { get }
     var isManualTempBasal: Bool { get }
     func enactTempBasal(rate: Double, duration: TimeInterval)
@@ -103,7 +102,6 @@ final class BaseAPSManager: APSManager, Injectable {
     let lastError = CurrentValueSubject<Error?, Never>(nil)
 
     let bolusProgress = CurrentValueSubject<Decimal?, Never>(nil)
-    let bolusAmount = CurrentValueSubject<Decimal?, Never>(nil)
 
     var pumpDisplayState: CurrentValueSubject<PumpDisplayState?, Never> {
         deviceDataManager.pumpDisplayState
@@ -451,7 +449,6 @@ final class BaseAPSManager: APSManager, Injectable {
                     self.determineBasal().sink { _ in }.store(in: &self.lifetime)
                 }
                 self.bolusProgress.send(0)
-                self.bolusAmount.send(Decimal(roundedAmout))
             }
         } receiveValue: { _ in }
             .store(in: &lifetime)
@@ -562,7 +559,6 @@ final class BaseAPSManager: APSManager, Injectable {
                     debug(.apsManager, "Announcement Bolus succeeded")
                     self.announcementsStorage.storeAnnouncements([announcement], enacted: true)
                     self.bolusProgress.send(0)
-                    self.bolusAmount.send(Decimal(roundedAmount))
                 }
             }
         case let .pump(pumpAction):
@@ -697,7 +693,6 @@ final class BaseAPSManager: APSManager, Injectable {
             }
             return pump.enactBolus(units: Double(units), automatic: true).map { _ in
                 self.bolusProgress.send(0)
-                self.bolusAmount.send(units)
                 return ()
             }
             .eraseToAnyPublisher()

FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -43,7 +43,6 @@ extension Home {
         @Published var errorMessage: String? = nil
         @Published var errorDate: Date? = nil
         @Published var bolusProgress: Decimal?
-        @Published var bolusAmount: Decimal?
         @Published var eventualBG: Int?
         @Published var carbsRequired: Decimal?
         @Published var allowManualTemp = false
@@ -170,11 +169,6 @@ extension Home {
                 .weakAssign(to: \.bolusProgress, on: self)
                 .store(in: &lifetime)
 
-            apsManager.bolusAmount
-                          .receive(on: DispatchQueue.main)
-                          .weakAssign(to: \.bolusAmount, on: self)
-                          .store(in: &lifetime)
-            
             apsManager.pumpDisplayState
                 .receive(on: DispatchQueue.main)
                 .sink { [weak self] state in

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -598,11 +598,11 @@ extension Home {
 
             let colorIcon = (colorScheme == .dark ? Color.white : Color.black).opacity(0.9)
 
-            let bolusTotal = state.bolusAmount ?? 0
+            let bolusTotal = state.boluses.last?.amount ?? 0
             let bolusFraction = progress * bolusTotal
 
             let bolusString =
-                (numberFormatter.string(from: bolusFraction as NSNumber) ?? "0")
+                (bolusProgressFormatter.string(from: bolusFraction as NSNumber) ?? "0")
                     + " of " +
                     (numberFormatter.string(from: bolusTotal as NSNumber) ?? "0")
                     + NSLocalizedString(" U", comment: "Insulin unit")