Fix merge issues

ps2 · ps2 · commit 617968874c9d · 2023-04-25T07:49:13.000-05:00
diff --git a/Loop/Managers/LoopAppManager.swift b/Loop/Managers/LoopAppManager.swift
@@ -198,7 +198,7 @@ class LoopAppManager: NSObject {
                                               analyticsServicesManager: analyticsServicesManager,
                                               bluetoothProvider: bluetoothStateManager,
                                               alertPresenter: self,
-                                              closedLoopStatus: closedLoopStatus,
+                                              automaticDosingStatus: automaticDosingStatus,
                                               cacheStore: cacheStore,
                                               localCacheDuration: localCacheDuration,
                                               overrideHistory: overrideHistory,
diff --git a/Loop/View Models/VersionUpdateViewModel.swift b/Loop/View Models/VersionUpdateViewModel.swift
@@ -74,11 +74,8 @@ public class VersionUpdateViewModel: ObservableObject {
     }
     
     public func update() {
-        supportManager?.checkVersion { [weak self] versionUpdate in
-            DispatchQueue.main.async {
-                self?.versionUpdate = versionUpdate
-            }
+        Task { @MainActor in
+            versionUpdate = await supportManager?.checkVersion()
         }
     }
-    
 }
diff --git a/Loop/Views/BolusEntryView.swift b/Loop/Views/BolusEntryView.swift
@@ -68,7 +68,7 @@ struct BolusEntryView: View {
                     if amount == 0 {
                         newEnteredBolusString = ""
                     } else {
-                        newEnteredBolusString = Self.doseAmountFormatter.string(from: amount) ?? String(amount)
+                        newEnteredBolusString = viewModel.formatBolusAmount(amount)
                     }
                     enteredBolusStringBinding.wrappedValue = newEnteredBolusString
                 }
diff --git a/LoopCore/NSUserDefaults.swift b/LoopCore/NSUserDefaults.swift
@@ -22,6 +22,7 @@ extension UserDefaults {
         case allowSimulators = "com.loopkit.Loop.allowSimulators"
         case resetLoop = "com.loopkit.Loop.resetLoop"
         case LastMissedMealNotification = "com.loopkit.Loop.lastMissedMealNotification"
+        case studyProductSelection = "com.loopkit.Loop.studyProductSelection"
     }
 
     public static let appGroup = UserDefaults(suiteName: Bundle.main.appGroupSuiteName)

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,8 @@ public class VersionUpdateViewModel: ObservableObject {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public func update() {`
`77`		`- supportManager?.checkVersion { [weak self] versionUpdate in`
`78`		`- DispatchQueue.main.async {`
`79`		`- self?.versionUpdate = versionUpdate`
`80`		`- }`
	`77`	`+ Task { @MainActor in`
	`78`	`+ versionUpdate = await supportManager?.checkVersion()`
`81`	`79`	`}`
`82`	`80`	`}`
`83`		`-`
`84`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ struct BolusEntryView: View {`
`68`	`68`	`if amount == 0 {`
`69`	`69`	`newEnteredBolusString = ""`
`70`	`70`	`} else {`
`71`		`- newEnteredBolusString = Self.doseAmountFormatter.string(from: amount) ?? String(amount)`
	`71`	`+ newEnteredBolusString = viewModel.formatBolusAmount(amount)`
`72`	`72`	`}`
`73`	`73`	`enteredBolusStringBinding.wrappedValue = newEnteredBolusString`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ extension UserDefaults {`
`22`	`22`	`case allowSimulators = "com.loopkit.Loop.allowSimulators"`
`23`	`23`	`case resetLoop = "com.loopkit.Loop.resetLoop"`
`24`	`24`	`case LastMissedMealNotification = "com.loopkit.Loop.lastMissedMealNotification"`
	`25`	`+ case studyProductSelection = "com.loopkit.Loop.studyProductSelection"`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`public static let appGroup = UserDefaults(suiteName: Bundle.main.appGroupSuiteName)`