Merge branch 'main' into dev

FreeAPS/Sources/Modules/AddCarbs/View/AddCarbsRootView.swift

@@ -194,6 +194,7 @@ extension AddCarbs {
 
                         state.removePresetFromNewMeal()
                         if state.carbs == 0, state.fat == 0, state.protein == 0 { state.summation = [] }
+
                     }
                     label: { Text("[ -1 ]") }
                         .disabled(

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

@@ -272,7 +272,7 @@ extension Home {
                 }
 
                 Spacer()
-
+                
                 if let overrideString = overrideString {
                     Text(overrideString)
                         .font(.system(size: 12))