Resolve merge conflicts with main, re-apply measurement fixes to refactored NodeDetail

Co-authored-by: garthvh <1795163+garthvh@users.noreply.github.com>

Author: Copilot

Meshtastic/CarPlay/CarPlaySceneDelegate.swift

@@ -182,11 +182,13 @@ class CarPlaySceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate, CPI
 
 	private func fetchFavoriteContactItems() -> [CPMessageListItem] {
 		do {
-			let descriptor = FetchDescriptor<NodeInfoEntity>(
+			let activeNum = Int64(AccessoryManager.shared.activeDeviceNum ?? 0)
+			var descriptor = FetchDescriptor<NodeInfoEntity>(
+				predicate: #Predicate<NodeInfoEntity> { $0.favorite == true && $0.num != activeNum },
 				sortBy: [SortDescriptor(\.lastHeard, order: .reverse)]
 			)
-			let activeNum = AccessoryManager.shared.activeDeviceNum ?? 0
-			let nodes = try context.fetch(descriptor).filter { $0.favorite && $0.num != activeNum }
+			descriptor.fetchLimit = 50
+			let nodes = try context.fetch(descriptor)
 			let nodeNums = nodes.compactMap { $0.user != nil ? $0.num : nil as Int64? }
 			let unreadCounts = fetchUnreadCountsForDMs(nodeNums: nodeNums)
 			let now = Date()

Meshtastic/Helpers/TAK/CoTMessage.swift

@@ -282,16 +282,17 @@ struct CoTMessage: Identifiable, Sendable {
 	// MARK: - XML Generation
 
 	/// Generate CoT XML string for transmission to TAK clients
+	private static let xmlDateFormatStyle = Date.ISO8601FormatStyle(includingFractionalSeconds: true, timeZone: TimeZone(secondsFromGMT: 0)!)
+
 	func toXML() -> String {
-		let dateFormatter = ISO8601DateFormatter()
-		dateFormatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+		let dateFormatter = Self.xmlDateFormatStyle
 
 		var cot = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>"
 		cot += "<event version='2.0' uid='\(uid.xmlEscaped)' "
 		cot += "type='\(type)' "
-		cot += "time='\(dateFormatter.string(from: time))' "
-		cot += "start='\(dateFormatter.string(from: start))' "
-		cot += "stale='\(dateFormatter.string(from: stale))' "
+		cot += "time='\(time.formatted(dateFormatter))' "
+		cot += "start='\(start.formatted(dateFormatter))' "
+		cot += "stale='\(stale.formatted(dateFormatter))' "
 		cot += "how='\(how)'>"
 		cot += "<point lat='\(latitude)' lon='\(longitude)' "
 		cot += "hae='\(hae)' ce='\(ce)' le='\(le)'/>"
@@ -352,7 +353,7 @@ struct CoTMessage: Identifiable, Sendable {
 			cot += "<__serverdestination destinations='0.0.0.0:4242:tcp:\(senderUid.xmlEscaped)'/>"
 			cot += "<remarks source='BAO.F.ATAK.\(senderUid.xmlEscaped)' "
 			cot += "to='\(chat.chatroom.xmlEscaped)' "
-			cot += "time='\(dateFormatter.string(from: time))'>"
+			cot += "time='\(time.formatted(dateFormatter))'>"
 			cot += "\(chat.message.xmlEscaped)</remarks>"
 		} else if let remarks, !remarks.isEmpty {
 			cot += "<remarks>\(remarks.xmlEscaped)</remarks>"