From cad644a2a6eb996b4ae883e9a34c9528669d0a30 Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Fri, 17 Apr 2026 21:17:48 -0700
Subject: [PATCH] Move tools to developer menu while being tested

---
 Meshtastic/Views/Settings/Settings.swift | 37 +++++++++++-------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/Meshtastic/Views/Settings/Settings.swift b/Meshtastic/Views/Settings/Settings.swift
index c57f0b3d..32e59df3 100644
--- a/Meshtastic/Views/Settings/Settings.swift
+++ b/Meshtastic/Views/Settings/Settings.swift
@@ -300,6 +300,14 @@ struct Settings: View {
 				}
 			}
 
+			NavigationLink(value: SettingsNavigationState.tak) {
+				Label {
+					Text("TAK Server")
+				} icon: {
+					Image(systemName: "target")
+				}
+			}
+
 			if isModuleSupported(.telemetryConfig) {
 				NavigationLink(value: SettingsNavigationState.telemetry) {
 					Label {
@@ -310,16 +318,6 @@ struct Settings: View {
 				}
 			}
 
-			if isTAKModuleSupported() {
-				NavigationLink(value: SettingsNavigationState.takConfig) {
-					Label {
-						Text("TAK")
-					} icon: {
-						Image(systemName: "shield.checkered")
-					}
-				}
-			}
-
 			if !showsAnyModuleConfiguration {
 				Text("This node does not support any configurable modules.")
 					.foregroundColor(.secondary)
@@ -350,6 +348,15 @@ struct Settings: View {
 					Image(systemName: "folder")
 				}
 			}
+			if #available(iOS 18, *) {
+				NavigationLink(value: SettingsNavigationState.tools) {
+					Label {
+						Text("Tools")
+					} icon: {
+						Image(systemName: "hammer")
+					}
+				}
+			}
 		}
 	}
 
@@ -406,15 +413,6 @@ struct Settings: View {
 						Image(systemName: "gearshape")
 					}
 				}
-				if #available(iOS 18, *) {
-					NavigationLink(value: SettingsNavigationState.tools) {
-						Label {
-							Text("Tools")
-						} icon: {
-							Image(systemName: "hammer")
-						}
-					}
-				}
 				NavigationLink(value: SettingsNavigationState.routes) {
 					Label {
 						Text("Routes")
@@ -518,7 +516,6 @@ struct Settings: View {
 					developersSection
 #endif
 					firmwareSection
-					takSection
 				}
 			}
 			.navigationDestination(for: SettingsNavigationState.self) { destination in