From 72979888da80a1ebec0caba39ea2ff655ea8ad2a Mon Sep 17 00:00:00 2001
From: Garth Vander Houwen <garthvh@yahoo.com>
Date: Fri, 11 Jul 2025 20:09:19 -0700
Subject: [PATCH] Close location view hack

---
 .../Views/Onboarding/DeviceOnboarding.swift   | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/Meshtastic/Views/Onboarding/DeviceOnboarding.swift b/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
index f48d1af7..7c4e58ed 100644
--- a/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
+++ b/Meshtastic/Views/Onboarding/DeviceOnboarding.swift
@@ -171,33 +171,21 @@ struct DeviceOnboarding: View {
 			}
 			.padding()
 			Spacer()
-			if locationStatus == .notDetermined {
-				Button {
-					Task {
-						locationStatus = await LocationsHandler.shared.requestLocationAlwaysPermissions() // LocationsHandler.shared.requestLocationAlwaysPermissions()
-					}
-				} label: {
-					Text("Configure Location Permissions")
-						.frame(maxWidth: .infinity)
+			Button {
+				Task {
+					await requestLocationPermissions()
+					await goToNextStep(after: .location)
 				}
-				.padding()
-				.buttonBorderShape(.capsule)
-				.controlSize(.large)
-				.padding()
-				.buttonStyle(.borderedProminent)
-			} else {
-				Button {
-					dismiss()
-				} label: {
-					Text("Finish")
-						.frame(maxWidth: .infinity)
-				}
-				.padding()
-				.buttonBorderShape(.capsule)
-				.controlSize(.large)
-				.padding()
-				.buttonStyle(.borderedProminent)
+				dismiss()
+			} label: {
+				Text("Configure Location Permissions")
+					.frame(maxWidth: .infinity)
 			}
+			.padding()
+			.buttonBorderShape(.capsule)
+			.controlSize(.large)
+			.padding()
+			.buttonStyle(.borderedProminent)
 		}
 	}
 
@@ -285,4 +273,13 @@ struct DeviceOnboarding: View {
 			Logger.services.error("Notification permissions error: \(error.localizedDescription)")
 		}
 	}
+
+	func requestLocationPermissions() async {
+		locationStatus = await LocationsHandler.shared.requestLocationAlwaysPermissions()
+		if locationStatus != .notDetermined {
+			Logger.services.info("Notification permissions are enabled")
+		} else {
+			Logger.services.info("Notification permissions denied")
+		}
+	}
 }