From ed4d1e8611edaa70e73ba99bd8014ebbc200eff6 Mon Sep 17 00:00:00 2001
From: SwiftlyNoah <devnoahapps@gmail.com>
Date: Tue, 22 Aug 2023 20:54:53 -0400
Subject: [PATCH] Override warning fix

---
 Loop/View Models/CarbEntryViewModel.swift | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Loop/View Models/CarbEntryViewModel.swift b/Loop/View Models/CarbEntryViewModel.swift
index d04ddba78e..f271793d1c 100644
--- a/Loop/View Models/CarbEntryViewModel.swift	
+++ b/Loop/View Models/CarbEntryViewModel.swift	
@@ -290,13 +290,14 @@ final class CarbEntryViewModel: ObservableObject {
     }
     
     private func checkIfOverrideEnabled() {
-        if let managerSettings = delegate?.settings {
-            if let overrideSettings = managerSettings.scheduleOverride?.settings, overrideSettings.effectiveInsulinNeedsScaleFactor != 1.0 {
-                self.warnings.insert(.overrideInProgress)
-            }
-            else {
-                self.warnings.remove(.overrideInProgress)
-            }
+        if let managerSettings = delegate?.settings,
+           managerSettings.scheduleOverrideEnabled(at: Date()),
+           let overrideSettings = managerSettings.scheduleOverride?.settings,
+           overrideSettings.effectiveInsulinNeedsScaleFactor != 1.0 {
+            self.warnings.insert(.overrideInProgress)
+        }
+        else {
+            self.warnings.remove(.overrideInProgress)
         }
     }