Merge branch 'core-data-sync-trio' of github.com:dnzxy/Trio-dev into add-watch-contact

FreeAPS/Resources/Info.plist

@@ -103,6 +103,7 @@
 		<string>bluetooth-peripheral</string>
 		<string>fetch</string>
 		<string>processing</string>
+                <string>remote-notification</string>
 	</array>
 	<key>UIFileSharingEnabled</key>
 	<true/>

FreeAPS/Sources/Modules/Home/View/Chart/ChartElements/SelectionPopoverView.swift

@@ -70,9 +70,7 @@ struct SelectionPopoverView: ChartContent {
             .font(.body).padding(.bottom, 5)
 
             HStack {
-                Text(units == .mgdL ? glucoseToDisplay.description : glucoseToDisplay.formattedAsMmolL)
-                    .bold()
-                    + Text(" \(units.rawValue)")
+                Text(glucoseToDisplay.description).bold() + Text(" \(units.rawValue)")
             }
             .foregroundStyle(pointMarkColor)
             .font(.body)