merge conflicts, fix editing tt

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

@@ -10,6 +10,9 @@ extension Home {
 
         @State var state = StateModel()
         @State var isStatusPopupPresented = false
+        @State var showCancelAlert = false
+        @State var showCancelConfirmDialog = false
+        @State var isConfirmStopOverrideShown = false
         @State var isConfirmStopOverridePresented = false
         @State var isConfirmStopTempTargetShown = false
         @State var isMenuPresented = false

FreeAPS/Sources/Modules/OverrideConfig/OverrideStateModel.swift

@@ -170,13 +170,7 @@ extension OverrideConfig {
         func isInputInvalid(target: Decimal) -> Bool {
             guard target != 0 else { return false }
 
-            if units == .mgdL,
-               target < 80 || target > 270 // in oref min lowTT = 80!
-            {
-                showInvalidTargetAlert = true
-                return true
-            } else if units == .mmolL,
-                      target < 4.4 || target > 15 // in oref min lowTT = 80!
+            if target < 80 || target > 270 // in oref min lowTT = 80!
             {
                 showInvalidTargetAlert = true
                 return true

FreeAPS/Sources/Modules/OverrideConfig/View/AddOverrideForm.swift

@@ -3,6 +3,8 @@ import SwiftUI
 
 struct AddOverrideForm: View {
     @Environment(\.presentationMode) var presentationMode
+    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.dismiss) var dismiss
     @Bindable var state: OverrideConfig.StateModel
     @State private var selectedIsfCrOption: IsfAndOrCrOptions = .isfAndCr
     @State private var selectedDisableSmbOption: DisableSmbOptions = .dontDisable
@@ -19,15 +21,16 @@ struct AddOverrideForm: View {
     @State private var didPressSave = false
 
     var color: LinearGradient {
-        colorScheme == .dark ? LinearGradient(
-            gradient: Gradient(colors: [
-                Color.bgDarkBlue,
-                Color.bgDarkerDarkBlue
-            ]),
-            startPoint: .top,
-            endPoint: .bottom
-        ) :
-            LinearGradient(
+        colorScheme == .dark
+            ? LinearGradient(
+                gradient: Gradient(colors: [
+                    Color.bgDarkBlue,
+                    Color.bgDarkerDarkBlue
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+            : LinearGradient(
                 gradient: Gradient(colors: [Color.gray.opacity(0.1)]),
                 startPoint: .top,
                 endPoint: .bottom

FreeAPS/Sources/Modules/OverrideConfig/View/OverrideRootView.swift

@@ -322,7 +322,7 @@ extension OverrideConfig {
                             Button(role: .none) {
                                 Task {
                                     selectedTempTarget = preset
-                                    isConfirmDeleteShown = true
+                                    isConfirmDeletePresented = true
                                 }
                             } label: {
                                 Label("Delete", systemImage: "trash")
@@ -341,7 +341,7 @@ extension OverrideConfig {
                 .onMove(perform: state.reorderTempTargets)
                 .confirmationDialog(
                     "Delete the Temp Target Preset \"\(selectedTempTarget?.name ?? "")\"?",
-                    isPresented: $isConfirmDeleteShown,
+                    isPresented: $isConfirmDeletePresented,
                     titleVisibility: .visible
                 ) {
                     if let itemToDelete = selectedTempTarget {