remove inadvertent carbohydrate changes

Author: marionbarker

live_activity/live_activity.patch

@@ -1641,82 +1641,6 @@ index 2319f4ec..8a728813 100644
              }
 
              // Invalidate cached effects affected by the override
-@@ -992,7 +1009,7 @@ extension LoopDataManager {
- 
-         let retrospectiveStart = lastGlucoseDate.addingTimeInterval(-type(of: retrospectiveCorrection).retrospectionInterval)
- 
--        let earliestEffectDate = Date(timeInterval: .hours(-24), since: now())
-+        let earliestEffectDate = Date(timeInterval: .days(-2), since: now())
-         let nextCounteractionEffectDate = insulinCounteractionEffects.last?.endDate ?? earliestEffectDate
-         let insulinEffectStartDate = nextCounteractionEffectDate.addingTimeInterval(.minutes(-5))
- 
-diff --git a/Loop/Loop/View Controllers/CarbAbsorptionViewController.swift b/Loop/Loop/View Controllers/CarbAbsorptionViewController.swift
-index fc770192..45e031a7 100644
---- a/Loop/Loop/View Controllers/CarbAbsorptionViewController.swift	
-+++ b/Loop/Loop/View Controllers/CarbAbsorptionViewController.swift	
-@@ -139,7 +139,7 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
-         charts.updateEndDate(chartStartDate.addingTimeInterval(.hours(totalHours+1))) // When there is no data, this allows presenting current hour + 1
- 
-         let midnight = Calendar.current.startOfDay(for: Date())
--        let listStart = min(midnight, chartStartDate, Date(timeIntervalSinceNow: -deviceManager.carbStore.maximumAbsorptionTimeInterval))
-+        let previousMidnight = midnight - .days(1)
- 
-         let reloadGroup = DispatchGroup()
-         let shouldUpdateGlucose = currentContext.contains(.glucose)
-@@ -157,12 +157,20 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
-             if shouldUpdateGlucose || shouldUpdateCarbs {
-                 let allInsulinCounteractionEffects = state.insulinCounteractionEffects
-                 insulinCounteractionEffects = allInsulinCounteractionEffects.filterDateRange(chartStartDate, nil)
-+                
-+                let earliestCounteractionEffect = allInsulinCounteractionEffects.first?.startDate ?? Date()
-+                // Show carb entries as far back as previous midnight, or only as far back as counteraction effects are available
-+                let boundOnCarbList = max(previousMidnight, earliestCounteractionEffect)
-+                // If counteraction effects are missing, at least show all the entries for today and those on the chart
-+                let displayListStart = min(boundOnCarbList, midnight, chartStartDate)
-+                // To estimate dynamic carb absorption for the entry at the start of the list, we need to fetch samples that might still be absorbing
-+                let fetchEntriesStart = displayListStart.addingTimeInterval(-self.deviceManager.carbStore.maximumAbsorptionTimeInterval)
- 
-                 reloadGroup.enter()
--                self.deviceManager.carbStore.getCarbStatus(start: listStart, end: nil, effectVelocities: allInsulinCounteractionEffects) { (result) in
-+                self.deviceManager.carbStore.getCarbStatus(start: fetchEntriesStart, end: nil, effectVelocities: allInsulinCounteractionEffects) { (result) in
-                     switch result {
-                     case .success(let status):
--                        carbStatuses = status
-+                        carbStatuses = status.filterDateRange(displayListStart, nil)
-                         carbsOnBoard = status.getClampedCarbsOnBoard()
-                     case .failure(let error):
-                         self.log.error("CarbStore failed to get carbStatus: %{public}@", String(describing: error))
-@@ -286,6 +294,14 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
-         formatter.timeStyle = .short
-         return formatter
-     }()
-+    
-+    private lazy var relativeTimeFormatter: DateFormatter = {
-+        let formatter = DateFormatter()
-+        formatter.dateStyle = .medium
-+        formatter.doesRelativeDateFormatting = true
-+        formatter.timeStyle = .short
-+        return formatter
-+    }()
- 
-     override func numberOfSections(in tableView: UITableView) -> Int {
-         return Section.count
-@@ -343,7 +359,14 @@ final class CarbAbsorptionViewController: LoopChartsTableViewController, Identif
-             }
- 
-             // Entry time
--            let startTime = timeFormatter.string(from: status.entry.startDate)
-+            let startTime: String
-+            // Indicate if an entry is from the previous day to avoid potential confusion
-+            let midnight = Calendar.current.startOfDay(for: Date())
-+            if status.entry.startDate < midnight {
-+                startTime = relativeTimeFormatter.string(from: status.entry.startDate)
-+            } else {
-+                startTime = timeFormatter.string(from: status.entry.startDate)
-+            }
-             if  let absorptionTime = status.entry.absorptionTime,
-                 let duration = absorptionFormatter.string(from: absorptionTime)
-             {
 diff --git a/Loop/Loop/Views/AlertManagementView.swift b/Loop/Loop/Views/AlertManagementView.swift
 index e9a38e72..94e542a6 100644
 --- a/Loop/Loop/Views/AlertManagementView.swift
@@ -2154,19 +2078,6 @@ index 00000000..02a3fbb2
 +        self.bottomRowConfiguration = BottomRowConfiguration.defaults
 +    }
 +}
-diff --git a/Loop/LoopCore/LoopCoreConstants.swift b/Loop/LoopCore/LoopCoreConstants.swift
-index d56f2ab9..42e9dfa3 100644
---- a/Loop/LoopCore/LoopCoreConstants.swift
-+++ b/Loop/LoopCore/LoopCoreConstants.swift
-@@ -16,7 +16,7 @@ public enum LoopCoreConstants {
-     /// The amount of time in the future a glucose value should be considered valid
-     public static let futureGlucoseDataInterval = TimeInterval(minutes: 5)
- 
--    public static let defaultCarbAbsorptionTimes: CarbStore.DefaultAbsorptionTimes = (fast: .minutes(30), medium: .hours(3), slow: .hours(5))
-+    public static let defaultCarbAbsorptionTimes: CarbStore.DefaultAbsorptionTimes = (fast: .hours(2), medium: .hours(3), slow: .hours(5))
- 
-     /// How much historical glucose to include in a dosing decision
-     /// Somewhat arbitrary, but typical maximum visible in bolus glucose preview
 diff --git a/Loop/LoopCore/NSUserDefaults.swift b/Loop/LoopCore/NSUserDefaults.swift
 index 93fa7e17..dacf2ecd 100644
 --- a/Loop/LoopCore/NSUserDefaults.swift