Merge remote-tracking branch 'ivalkou/dev' into Crowdin

FreeAPS/Sources/Models/Suggestion.swift

@@ -16,7 +16,6 @@ struct Suggestion: JSON, Equatable {
     let temp: TempType?
     let bg: Decimal?
     let reservoir: Decimal?
-    let isf: Decimal?
     var timestamp: Date?
     var recieved: Bool?
 }
@@ -47,7 +46,6 @@ extension Suggestion {
         case reservoir
         case timestamp
         case recieved
-        case isf = "ISF"
     }
 }
 

FreeAPS/Sources/Modules/NotificationsConfig/View/NotificationsConfigRootView.swift

@@ -52,7 +52,7 @@ extension NotificationsConfig {
                         Text("Carbs Required Threshold")
                         Spacer()
                         DecimalTextField("0", value: $state.carbsRequiredThreshold, formatter: carbsFormatter)
-                        Text("г").foregroundColor(.secondary)
+                        Text("g").foregroundColor(.secondary)
                     }
                 }
             }