LOOP-1489: use InsulinModelSettings with TherapySettings instead of S…

…toredSettings.InsulinModel (#176)
LoopKit · Jul 28, 2020 · 1fae2c9 · 1fae2c9
1 parent 4e97766
commit 1fae2c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
@@ -1767,6 +1767,6 @@ extension LoopDataManager {
                         insulinSensitivitySchedule: insulinSensitivitySchedule,
                         carbRatioSchedule: carbRatioSchedule,
                         basalRateSchedule: basalRateSchedule,
-                        insulinModel: insulinModelSettings.map { StoredSettings.InsulinModel($0) })
+                        insulinModel: insulinModelSettings)
     }
 }
diff --git a/Loop/Managers/ServicesManager.swift b/Loop/Managers/ServicesManager.swift
@@ -125,6 +125,7 @@ class ServicesManager {
         loopDataManager?.insulinSensitivitySchedule = settings.insulinSensitivitySchedule
         loopDataManager?.carbRatioSchedule = settings.carbRatioSchedule
         loopDataManager?.basalRateSchedule = settings.basalRateSchedule
+        loopDataManager?.insulinModelSettings = settings.insulinModel
     }
 
     private func restoreState() {

diff --git a/Loop/View Controllers/SettingsTableViewController.swift b/Loop/View Controllers/SettingsTableViewController.swift
@@ -519,7 +519,8 @@ final class SettingsTableViewController: UITableViewController, IdentifiableClas
                     viewModel: viewModel,
                     glucoseUnit: glucoseUnit,
                     supportedModelSettings: SupportedInsulinModelSettings(fiaspModelEnabled: FeatureFlags.fiaspInsulinModelEnabled, walshModelEnabled: FeatureFlags.walshInsulinModelEnabled),
-                    appName: appName
+                    appName: appName,
+                    mode: .settings
                 )
 
                 let hostingController = DismissibleHostingController(rootView: modelSelectionView, onDisappear: {
@@ -802,10 +803,7 @@ final class SettingsTableViewController: UITableViewController, IdentifiableClas
             dataManager?.loopManager.settings.maximumBasalRatePerHour = therapySettings.maximumBasalRatePerHour
             dataManager?.loopManager.settings.maximumBolus = therapySettings.maximumBolus
         case .insulinModel:
-            if let insulinModel = therapySettings.insulinModel {
-                // TODO: Unify InsulinModelSettings and SettingsStore.InsulinModel
-                dataManager?.loopManager.insulinModelSettings = InsulinModelSettings(from: insulinModel)
-            }
+            dataManager?.loopManager.insulinModelSettings = therapySettings.insulinModel
         case .carbRatio:
             dataManager?.loopManager.carbRatioSchedule = therapySettings.carbRatioSchedule
             dataManager?.analyticsServicesManager.didChangeCarbRatioSchedule()