From 81d4cad0306019ced43b7eaaa197c7aa810aa2c7 Mon Sep 17 00:00:00 2001
From: Schwifty <schwifty@payfrit.com>
Date: Sun, 22 Mar 2026 21:47:45 +0000
Subject: [PATCH] fix: back button bounces user right back into selected
 business
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When tapping Back from ScanView, BusinessListView remounts and .task fires
loadBusinesses() which sees AppPrefs.lastBusinessId still set — immediately
re-navigating into the same business. Fix: clear lastBusinessId on back,
and add skipAutoNav flag to also prevent single-business auto-select from
firing when user explicitly navigated back.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 PayfritBeacon/App/AppState.swift           |  5 +++++
 PayfritBeacon/Views/BusinessListView.swift | 24 +++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/PayfritBeacon/App/AppState.swift b/PayfritBeacon/App/AppState.swift
index 72db257..c88a246 100644
--- a/PayfritBeacon/App/AppState.swift
+++ b/PayfritBeacon/App/AppState.swift
@@ -14,6 +14,9 @@ final class AppState: ObservableObject {
     @Published var token: String?
     @Published var userId: String?
 
+    /// When true, skip auto-navigation in BusinessListView (user explicitly went back)
+    var skipAutoNav = false
+
     init() {
         // Restore saved session
         if let saved = SecureStorage.loadSession() {
@@ -36,6 +39,8 @@ final class AppState: ObservableObject {
     }
 
     func backToBusinessList() {
+        AppPrefs.lastBusinessId = nil
+        skipAutoNav = true
         currentScreen = .businessList
     }
 
diff --git a/PayfritBeacon/Views/BusinessListView.swift b/PayfritBeacon/Views/BusinessListView.swift
index 74efd03..21658c9 100644
--- a/PayfritBeacon/Views/BusinessListView.swift
+++ b/PayfritBeacon/Views/BusinessListView.swift
@@ -94,18 +94,22 @@ struct BusinessListView: View {
             let list = try await APIClient.shared.listBusinesses(token: token)
             businesses = list
 
-            // Auto-navigate if only one business (like Android)
-            if list.count == 1, let only = list.first {
-                appState.selectBusiness(only)
-                return
-            }
+            // Skip auto-navigation if user explicitly tapped Back
+            if !appState.skipAutoNav {
+                // Auto-navigate if only one business (like Android)
+                if list.count == 1, let only = list.first {
+                    appState.selectBusiness(only)
+                    return
+                }
 
-            // Auto-navigate to last used business
-            if let lastId = AppPrefs.lastBusinessId,
-               let last = list.first(where: { $0.id == lastId }) {
-                appState.selectBusiness(last)
-                return
+                // Auto-navigate to last used business
+                if let lastId = AppPrefs.lastBusinessId,
+                   let last = list.first(where: { $0.id == lastId }) {
+                    appState.selectBusiness(last)
+                    return
+                }
             }
+            appState.skipAutoNav = false
         } catch let e as APIError where e.errorDescription == APIError.unauthorized.errorDescription {
             appState.logout()
         } catch {