From 3bd3fab49878af2c72b4e06c4fdfb62ce17351f6 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Sat, 18 Apr 2026 10:49:39 -0700
Subject: [PATCH] Catalyst fixes

---
 Meshtastic/Views/Connect/Connect.swift             |  2 ++
 Meshtastic/Views/Nodes/Helpers/Map/MapLegend.swift | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/Meshtastic/Views/Connect/Connect.swift b/Meshtastic/Views/Connect/Connect.swift
index 47ade677..d72cc5c0 100644
--- a/Meshtastic/Views/Connect/Connect.swift
+++ b/Meshtastic/Views/Connect/Connect.swift
@@ -26,7 +26,9 @@ struct Connect: View {
 	@State var isUnsetRegion = false
 	@State var invalidFirmwareVersion = false
 	@State var showSecurityVersionNag = false
+#if !targetEnvironment(macCatalyst)
 	@State var liveActivityStarted = false
+#endif
 	@ObservedObject var manualConnections = ManualConnectionList.shared
 	
 	var body: some View {
diff --git a/Meshtastic/Views/Nodes/Helpers/Map/MapLegend.swift b/Meshtastic/Views/Nodes/Helpers/Map/MapLegend.swift
index fd142007..2d04e861 100644
--- a/Meshtastic/Views/Nodes/Helpers/Map/MapLegend.swift
+++ b/Meshtastic/Views/Nodes/Helpers/Map/MapLegend.swift
@@ -61,6 +61,18 @@ struct MapLegend: View {
 			.navigationTitle("Map Legend")
 			.navigationBarTitleDisplayMode(.inline)
 		}
+#if targetEnvironment(macCatalyst)
+		Spacer()
+		Button {
+			dismiss()
+		} label: {
+			Label("Close", systemImage: "xmark")
+		}
+		.buttonStyle(.bordered)
+		.buttonBorderShape(.capsule)
+		.controlSize(.large)
+		.padding(.bottom)
+#endif
 	}
 
 	// MARK: - Sections