Git: ignore build-watch output

siri: drop generic shortcut and broaden fuel-word phrases
Siri was hit-and-miss on 'unleaded near me' (\u2018can't do that, searching in app\u2019 fallback). The generic parameterized AppShortcut ('cheapest ${fuel}') competed with the fixed-fuel literal-word shortcuts for the same intent, degrading NLU ranking; it was already documented as flaky. Remove it (now 9 shortcuts, under the 10 cap) and add natural phrase variants for unleaded/petrol ('What's the cheapest unleaded near me', 'Cheapest unleaded near me', 'Where's the cheapest petrol'). All phrases keep .applicationName per the iOS 26 metadata requirement. Build-verified in extract.actionsdata: generic gone, new phrases registered.
2026-08-28 16:35:32 +01:00 · 2026-08-20 19:27:34 +01:00 · 2026-08-20 18:49:54 +01:00 · 2026-08-20 18:40:09 +01:00 · 2026-08-20 17:54:55 +01:00 · 2026-08-20 17:26:33 +01:00
50 changed files with 1468 additions and 218 deletions
@@ -1,6 +1,7 @@
 build/
 build-release/
 build-sim/
 build-watch/
 .DS_Store
 *.xcuserstate
 xcuserdata/
@@ -106,6 +106,19 @@ Status: TODO / IN PROGRESS / DONE / BLOCKED.
  scene (CPListTemplate) for navigation deep-links.
 - [ ] **Alert region tuning** — make alert trigger radius + dedup window
  user-configurable (currently fixed 300 m trigger / 1 per station per hour).
 - [ ] **Price-drop alerts: threshold control + Check now** — keep the current
  cache-first / 12 h refresh policy, but add a per-alert sensitivity control
  for favourite price-drop alerts instead of a fetch-frequency slider. Scope:
  `Minimum change` picker (e.g. 0.5p / 1.0p / 2.0p), plus a `Check now`
  action in the Alerts tab that forces a fetch and immediately re-evaluates the
  cheapest-favourite alert. Copy should set expectation honestly: standard
  mode checks when FuelBoard refreshes prices (up to twice daily).
 - [ ] **Price-drop alerts: optional frequent-check mode** — if the app ever
  relaxes the current "twice daily max" data policy, expose this as a clearly
  separate mode rather than a freeform frequency slider. Example framing:
  `Standard` (current behaviour) vs `Frequent` (best-effort extra checks),
  with conservative caps (e.g. every 4–6 h, not hourly) and copy that does not
  promise exact timing under iOS background scheduling.
 - [ ] **Pull-to-refresh spinner state** — surface refresh in-flight state
  (currently `refreshable` fires but no visible progress in the row list).
 - [x] **Offline first-run** — bundled REAL 8,022-station dump (`FuelBoardDump`,
@@ -131,13 +144,50 @@ Status: TODO / IN PROGRESS / DONE / BLOCKED.
  separate phase. Backlog ancestry: this was the original "relay could keep a
  rolling archive" idea — the archive is now P0 and the Trends graph (P1) is its
  visible half.
 - [ ] **Foresight Live Activity (heading-aware next station)** — investigate a
  driving-time surface that predicts the likely next station ahead of the user
  from cached data only (no extra source-data refresh on motion). Best v1 shape:
  Live Activity option, not widget-first, because widget space/refresh budgets
  are tight and the lock-screen/CarPlay compact slot better matches the use case.
  Prefer ONE FuelBoard Live Activity with a mode selector (e.g. `Nearby cheapest`
  vs `Foresight / next ahead`) rather than trying to run two simultaneous
  FuelBoard activities; iOS can support multiple activities, but FuelBoard's
  current implementation is single-activity and the compact surfaces are too
  constrained for two competing driving modes anyway. Viable MVP: infer heading
  from recent motion/course, keep only stations in a forward cone, score
  candidates by forward distance + lateral offset, and show the next-ahead
  station with all three fuel prices or a compact rotating/focused fuel
  treatment if space allows. Key caveat: heading is not full route awareness,
  so avoid overpromising "the next station you will reach" on motorways/opposite
  carriageways; frame as "next ahead" / "likely next stop" unless route-quality
  heuristics improve. Must include hysteresis/speed thresholds to avoid flapping,
  and should be tested specifically against compact Live Activity/CarPlay layouts
  where space is extremely limited.
 - [ ] **Widget sparkline** — medium-widget mini sparkline of a favourite's 30-day
  trend, after the Trends UI lands (one-kind rule preserved).
 - [ ] **Price alerts for a specific station** — notify when a starred station's
  price drops below a user threshold.
 - [ ] **Price-drop alerts: mode = Cheapest favourite / All favourites** — keep
  `Cheapest favourite` as the default low-noise mode, but explore an optional
  `All favourites` mode for one fuel. Guardrails if built: threshold required,
  per-station dedupe based on last-alerted price (not just time), and combine
  multiple drops from one refresh into a single summary notification rather
  than one alert per station.
 - [ ] **Share sheet** — share "Cheapest Unleaded near me" as text/image card.
- [ ] **Watch app** — glanceable cheapest-price complication (WatchKit + shared
+- [ ] **Watch app v1 — favourites + Check now** — small Apple Watch companion,
-  app-group store; watch target would need to be added to the project).
+  not a phone-app clone. Favourites-first home screen: fuel picker, `Cheapest
  favourite` summary card, top few favourites for that fuel, last-updated time,
  and a prominent `Check now` action that forces a refresh + re-evaluates
  favourite prices. Keep the watch UX pull-based and glanceable; avoid implying
  high-frequency background refresh. Shared-store architecture preferred over a
  second watch-only data model.
 - [ ] **Watch complications / Smart Stack** — complication/widget surfaces for
  the same watch concept: show the cheapest favourite price, fuel, and short
  station name at a glance. Keep copy minimal and honest about freshness.
 - [ ] **Watch app v2 — favourite detail + handoff** — tap a favourite row for a
  detail screen (station, brand, price, last updated) with actions like
  `Directions` and `Open on iPhone`. Reuse existing maps handoff patterns where
  possible instead of inventing watch-only navigation logic.
 - [ ] **App Clip** — 10 MB budget for "find cheapest fuel nearby" without install.
 - [ ] **Widget picker: dual-unit distance labels** — the Edit-Widget Distance row
  label is cached by the system at sheet-render time and only re-resolves on
@@ -12,6 +12,8 @@ struct AlertsView: View {
    @Binding var enabled: Bool
    @Binding var radius: Double   // stored in km (monitor + storage)
    @Binding var fuel: FuelType   // the fuel alerts monitor for
    @Binding var favouriteDropEnabled: Bool
    @Binding var favouriteDropFuel: FuelType
    /// Whether alerts mirror the Stations-tab search distance (capped at 8 mi).
    @Binding var followsSearch: Bool
    /// Whether the "cheapest nearby" Live Activity is shown on the Lock Screen
@@ -30,6 +32,7 @@ struct AlertsView: View {
    let distanceUnit: DistanceUnit
    let monitoredCount: Int
    let lastAlert: String?
    let onCheckFavouriteDropNow: () -> Void
    /// The Stations-tab search distance shown in the user's unit, e.g.
    /// "5 miles" or "8 km" — for the "Follow search" rows.
@@ -131,7 +134,22 @@ struct AlertsView: View {
        NavigationStack {
            List {
                Section {
-                    Toggle("Cheapest-station alerts", isOn: $enabled)
+                    Toggle("Cheapest favourite", isOn: $favouriteDropEnabled)
                    Picker("Fuel", selection: $favouriteDropFuel) {
                        ForEach(FuelType.allCases) { fuel in
                            Text(fuel.displayName).tag(fuel)
                        }
                    }
                    Button("Check now", action: onCheckFavouriteDropNow)
                        .disabled(!favouriteDropEnabled)
                } header: {
                    Text("Price-drop alerts")
                } footer: {
                    Text("Watches your cheapest saved favourite for the fuel you pick here. FuelBoard alerts when a different favourite becomes the cheapest, or when your current cheapest favourite drops by at least 1.0p. This is separate from the nearby-geofence alert, so you can monitor favourites without extra location noise.")
                }
                Section {
                    Toggle("Cheapest station", isOn: $enabled)
                    Picker("Fuel", selection: $fuel) {
                        ForEach(FuelType.allCases) { fuel in
                            Text(fuel.displayName).tag(fuel)
@@ -152,7 +170,7 @@ struct AlertsView: View {
                            .foregroundStyle(.secondary)
                    }
                } header: {
-                    Text("Cheapest-station alerts")
+                    Text("Proximity alerts")
                } footer: {
                    Text("When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling \(fuel.displayName.lowercased()) are watched — favourites get priority — and each station alerts at most once per hour. Follow search mirrors the Stations-tab distance, capped at 8 miles for reliable geofencing. Smaller radii ping more often but later; larger radii ping rarely in town but earlier from afar.")
                }
@@ -165,7 +183,7 @@ struct AlertsView: View {
                }
                Section {
-                    Toggle("Live Activity", isOn: $liveActivityEnabled)
+                    Toggle("Cheapest station", isOn: $liveActivityEnabled)
                    Picker("Fuel", selection: $liveActivityFuel) {
                        ForEach(FuelType.allCases) { fuel in
                            Text(fuel.displayName).tag(fuel)
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_circle_k_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_circle_k_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_essar_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_essar_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_gleaner_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_gleaner_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_highland_fuels_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_highland_fuels_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_maxol_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_maxol_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_murco_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_murco_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_spar_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_spar_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_the_co_operative_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_the_co_operative_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_valero_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_valero_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -0,0 +1,18 @@
 {
  "images": [
    {
      "filename": "brand_welcome_break_2x.png",
      "idiom": "universal",
      "scale": "2x"
    },
    {
      "filename": "brand_welcome_break_3x.png",
      "idiom": "universal",
      "scale": "3x"
    }
  ],
  "info": {
    "author": "xcode",
    "version": 1
  }
 }
@@ -2,6 +2,15 @@ import SwiftUI
 import CoreLocation
 import WidgetKit
 /// The single floating notification banner. Network/offline state and tip
 /// outcomes all funnel through ONE style and render via the same chrome in
 /// ContentView — never pushing layout, always overlaid.
 enum AppBanner: Hashable {
    case offlineDump(date: String)
    case connectionProblem
    case tip(TipStore.TipOutcome)
 }
 struct ContentView: View {
    @Environment(\.scenePhase) private var scenePhase
@@ -15,6 +24,8 @@ struct ContentView: View {
    @State private var alertsEnabled: Bool = FuelStore.loadAlertsEnabled()
    @State private var alertsRadius: Double = FuelStore.loadAlertsRadius()
    @State private var alertsFuel: FuelType = FuelStore.loadAlertsFuel()
    @State private var favouriteDropAlertsEnabled: Bool = FuelStore.loadFavouriteDropAlertsEnabled()
    @State private var favouriteDropAlertsFuel: FuelType = FuelStore.loadFavouriteDropAlertsFuel()
    @State private var alertsFollowsSearch: Bool = FuelStore.loadAlertsFollowsSearch()
    @State private var liveActivityEnabled: Bool = FuelStore.loadLiveActivityEnabled()
    @State private var liveActivityFuel: FuelType = FuelStore.loadLiveActivityFuel()
@@ -30,6 +41,41 @@ struct ContentView: View {
    private var effectiveAlertsRadiusKM: Double {
        FuelStore.effectiveAlertsRadiusKM(followsSearch: alertsFollowsSearch, manualKM: alertsRadius)
    }
    private func installLocationUpdateHook() {
        locationManager.onLocationUpdate = { [weak monitor] in
            monitor?.update(stations: stations, favourites: refreshedFavourites,
                            fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
            // The Live Activity follows the same wake-ups — this hook
            // fires on every fix incl. background significant-change
            // wake-ups, so the Lock Screen pill stays live while driving.
            updateLiveActivity()
            refreshRoadDistancesIfNeeded()
        }
    }
    /// Kicks off a (throttled) Apple-Maps road-distance recompute for the
    /// stations around the current fix. The app owns routing — the widget and
    /// Live Activity only read the cached result. Falls back to the last saved
    /// location so it can run before the first fresh GPS fix arrives.
    private func refreshRoadDistancesIfNeeded() {
        let origin = location ?? FuelStore.loadLocation()
        guard let origin else { return }
        Task {
            await RoadDistanceService.refreshIfNeeded(
                stations: stations,
                lat: origin.lat,
                lng: origin.lng
            )
        }
    }
    private func ensureBackgroundMotionTrackingIfNeeded() {
        if alertsEnabled || liveActivityEnabled {
            locationManager.startBackgroundTracking()
        }
    }
    @State private var isLoading = false
    @State private var statusMessage = ""
    /// What data is on screen, driving which (if any) status banner shows
@@ -50,6 +96,20 @@ struct ContentView: View {
    @State private var selectedTab = 0
    @State private var locationManager = LocationManager()
    @StateObject private var monitor = ProximityMonitor()
    /// Owns tip purchases; the single instance is shared down to Settings.
    /// Its transient outcome rides the SAME status-banner chrome as the
    /// network/offline strip (ContentView renders it above the tabs).
    @StateObject private var tipStore = TipStore()
    // --- Explicit banner animation state (robust fade-out) ---
    // SwiftUI's removal transition for the banner proved unreliable here
    // (the tip faded to nothing only in the cross-nil case, and even then
    // inconsistently). Drive opacity/offset explicitly instead so a
    // dismissal ALWAYS fades + slides up on ANY banner change.
    @State private var currentBanner: AppBanner?
    @State private var bannerOpacity: Double = 0
    @State private var bannerOffset: CGFloat = 0
    @State private var bannerClearTask: Task<Void, Never>?
    /// The pool the list draws from. In Cheapest mode the chosen miles radius
    /// bounds it ("best price within X miles"); in Closest mode the radius is
@@ -152,71 +212,34 @@ struct ContentView: View {
    }
    var body: some View {
-        VStack(spacing: 0) {
+        configuredContent
-            switch dataStatus {
+    }
            case .offlineDump(let date):
                let title = offlineTitle(date: date)
                statusBanner(
                    icon: "wifi.slash",
                    tint: .orange,
                    title: title,
                    subtitle: NSLocalizedString("Pull to refresh on the Stations tab", comment: ""),
                    accessibilityLabel: date.isEmpty
                        ? NSLocalizedString("Offline data. Pull to refresh on the Stations tab", comment: "")
                        : String(format: NSLocalizedString("Offline data from %@. Pull to refresh on the Stations tab", comment: ""), date)
                )
            case .connectionProblem:
                statusBanner(
                    icon: "wifi.exclamationmark",
                    tint: .red,
                    title: NSLocalizedString("Check your internet connection", comment: ""),
                    subtitle: NSLocalizedString("Tap to try again", comment: ""),
                    accessibilityLabel: NSLocalizedString("Check your internet connection. Tap to try again", comment: "")
                )
            case .live:
                EmptyView()
            }
            TabView(selection: $selectedTab) {
            stationsTab
                .tabItem { Label("Stations", systemImage: "fuelpump.fill") }
                .tag(0)
-            favouritesTab
+    private var configuredContent: AnyView {
-                .tabItem { Label("Favourites", systemImage: "star.fill") }
+        interactionObservedContent
-                .tag(1)
+    }
-            AlertsView(
+    private var presentedContent: AnyView {
-                enabled: $alertsEnabled,
+        AnyView(
-                radius: $alertsRadius,
+            mainContent
-                fuel: $alertsFuel,
+                .fullScreenCover(isPresented: $showOnboarding) {
-                followsSearch: $alertsFollowsSearch,
+                    OnboardingView {
-                liveActivityEnabled: $liveActivityEnabled,
+                        showOnboarding = false
-                liveActivityFuel: $liveActivityFuel,
+                    }
-                liveActivityRadiusMiles: $liveActivityRadiusMiles,
+                }
-                liveActivityFollowsSearch: $liveActivityFollowsSearch,
+                .fullScreenCover(isPresented: $showWidgetMock) {
-                stationLimit: stationLimit,
+                    WidgetMockScreen()
-                distanceUnit: distanceUnit,
+                }
-                monitoredCount: monitor.monitoredStationIDs.count,
+                .sheet(item: $monitor.pendingStationMap) { request in
-                lastAlert: monitor.lastAlert
+                    StationMapView(request: request)
-            )
+                }
-            .tabItem { Label("Alerts", systemImage: "bell.fill") }
+        )
-            .tag(2)
+    }
-            settingsTab
+    private var lifecycleObservedContent: AnyView {
-                .tag(3)
+        AnyView(
-        }
+            presentedContent
-        .fullScreenCover(isPresented: $showOnboarding) {
+                .onAppear {
            OnboardingView {
                showOnboarding = false
            }
        }
        .fullScreenCover(isPresented: $showWidgetMock) {
            WidgetMockScreen()
        }
        .sheet(item: $monitor.pendingStationMap) { request in
            StationMapView(request: request)
        }
        .onAppear {
            // Launch-arg hooks for the screenshot/UI-test harness (same
            // pattern as StationsView's `-showKeySheet`): `-tab <name>`
            // opens the given tab; `-skipOnboarding` skips onboarding
@@ -298,27 +321,23 @@ struct ContentView: View {
 #else
            let shouldSkipOnboarding = false
 #endif
-            if FuelStore.loadHasCompletedOnboarding()
+            if !FuelStore.shouldShowOnboarding()
                || shouldSkipOnboarding {
                locationManager.startForegroundTracking()
-                // Geofences must follow the user even in the background:
+                // Geofences and the Live Activity must follow the user even in
-                // wire the delegate hook (fires on every fix incl. background
+                // the background: wire the delegate hook (fires on every fix
-                // significant-change wake-ups) to re-register the region
+                // incl. background significant-change wake-ups) so SwiftUI's
-                // window around the new position. SwiftUI onChange alone
+                // foreground-only onChange isn't the only update path.
-                // never runs while suspended, so alerts would otherwise stay
+                installLocationUpdateHook()
-                // frozen around the last foreground fix.
+                ensureBackgroundMotionTrackingIfNeeded()
                locationManager.onLocationUpdate = { [weak monitor] in
                    monitor?.update(stations: stations, favourites: refreshedFavourites,
                                    fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                    // The Live Activity follows the same wake-ups — this hook
                    // fires on every fix incl. background significant-change
                    // wake-ups, so the Lock Screen pill stays live while driving.
                    updateLiveActivity()
                }
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                monitor.setEnabled(alertsEnabled)
                updateLiveActivity()
                // Compute road distances early (throttled; falls back to the
                // last saved location) so distance surfaces are road-matched
                // as soon as stations are available.
                refreshRoadDistancesIfNeeded()
                // Refresh only when the cache is stale (twice-a-day policy).
                // Skipped under the force-* hooks so the banner stays up.
 #if DEBUG
@@ -345,6 +364,8 @@ struct ContentView: View {
            // empty on a brand-new install.
            if !showing, FuelStore.loadHasCompletedOnboarding() {
                locationManager.startForegroundTracking()
                installLocationUpdateHook()
                ensureBackgroundMotionTrackingIfNeeded()
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                updateLiveActivity()
@@ -362,6 +383,7 @@ struct ContentView: View {
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                updateLiveActivity()
                refreshRoadDistancesIfNeeded()
                // No network fetch on foreground — pull-to-refresh is the override.
            } else {
                locationManager.stopForegroundTracking()
@@ -377,9 +399,16 @@ struct ContentView: View {
                monitor.update(stations: stations, favourites: refreshedFavourites,
                               fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
                updateLiveActivity()
                refreshRoadDistancesIfNeeded()
            }
        }
-        .onChange(of: selectedFuel) { _, _ in
+        )
    }
    private var interactionObservedContent: AnyView {
        AnyView(
            lifecycleObservedContent
                .onChange(of: selectedFuel) { _, _ in
            // No re-fetch needed — one response carries E5/E10/DIESEL prices.
            WidgetCenter.shared.reloadAllTimelines()
        }
@@ -402,9 +431,7 @@ struct ContentView: View {
            monitor.setEnabled(newValue)
            monitor.update(stations: stations, favourites: refreshedFavourites,
                           fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
-            if newValue {
+            ensureBackgroundMotionTrackingIfNeeded()
                locationManager.startBackgroundTracking()
            }
        }
        .onChange(of: alertsRadius) { _, newValue in
            FuelStore.saveAlertsRadius(newValue)
@@ -425,10 +452,17 @@ struct ContentView: View {
            monitor.update(stations: stations, favourites: refreshedFavourites,
                           fuel: alertsFuel, radiusKM: effectiveAlertsRadiusKM)
        }
        .onChange(of: favouriteDropAlertsEnabled) { _, newValue in
            FuelStore.saveFavouriteDropAlertsEnabled(newValue)
        }
        .onChange(of: favouriteDropAlertsFuel) { _, newValue in
            FuelStore.saveFavouriteDropAlertsFuel(newValue)
        }
        .onChange(of: liveActivityEnabled) { _, newValue in
            // Toggling the Live Activity on starts it with the current best
            // station; toggling off ends any running activity.
            FuelStore.saveLiveActivityEnabled(newValue)
            ensureBackgroundMotionTrackingIfNeeded()
            updateLiveActivity()
        }
        .onChange(of: liveActivityFuel) { _, newValue in
@@ -464,8 +498,114 @@ struct ContentView: View {
            // so reading storage here could push the OLD style.
            updateLiveActivity(priceDisplayStyleOverride: newValue)
        }
-        }  // VStack: status banner + TabView
+        )
-        .animation(.spring(response: 0.3, dampingFraction: 0.8), value: dataStatus)
+    }
    /// The one banner to show right now. Network/offline and tip outcomes all
    /// funnel here and render through the SAME floating chrome. A transient
    /// tip (auto-dismissed by TipStore) takes precedence over the persistent
    /// network state for its ~3.5 s.
    private var activeBanner: AppBanner? {
        if let outcome = tipStore.outcome { return .tip(outcome) }
        switch dataStatus {
        case .live: return nil
        case .offlineDump(let date): return .offlineDump(date: date)
        case .connectionProblem: return .connectionProblem
        }
    }
    private var mainContent: some View {
        GeometryReader { geo in
            ZStack(alignment: .top) {
                rootTabView
                if let banner = currentBanner {
                    // Floating near the top of the screen, over the nav area —
                    // overlays content (never pushes it) and sits above the
                    // main content so it doesn't cover or block the list/pill
                    // beneath it. Opacity/offset are driven explicitly by
                    // reflectBanner so the fade-out reliably animates.
                    floatingBanner(banner)
                        .padding(.top, geo.safeAreaInsets.top + 10)
                        .opacity(bannerOpacity)
                        .offset(y: bannerOffset)
                }
            }
        }
        .task(id: activeBanner) {
            // Fires on launch with the current banner AND whenever it changes —
            // unlike onChange(computed) which can miss the first non-nil value
            // when dataStatus is set slightly after the view appears.
            reflectBanner(activeBanner)
        }
    }
    /// Explicitly animates the banner in/out — a robust replacement for the
    /// SwiftUI removal transition (which was silently not firing). Handles:
    ///  - first appearance → fade + settle down from slightly above
    ///  - any content change (tip→network, new tip) → fade the old out, then
    ///    fade the new in — so a tip ALWAYS visibly fades away
    ///  - dismissal → fade out + slide up, then clear after the fade
    private func reflectBanner(_ newBanner: AppBanner?) {
        guard newBanner != currentBanner else { return }
        bannerClearTask?.cancel()
        if let newBanner {
            if currentBanner == nil {
                present(newBanner)
            } else {
                // Crossfade: slide+fade the current out, then present the new.
                withAnimation(.easeOut(duration: 0.2)) {
                    bannerOpacity = 0
                    bannerOffset = -28
                }
                bannerClearTask = Task { @MainActor in
                    try? await Task.sleep(nanoseconds: 250_000_000)
                    guard !Task.isCancelled else { return }
                    present(newBanner)
                }
            }
        } else {
            withAnimation(.easeOut(duration: 0.35)) {
                bannerOpacity = 0
                bannerOffset = -28
            }
            bannerClearTask = Task { @MainActor in
                try? await Task.sleep(nanoseconds: 350_000_000)
                guard !Task.isCancelled else { return }
                currentBanner = nil
                bannerOpacity = 0
                bannerOffset = 0
            }
        }
    }
    /// Fade a banner in from slightly above and settle it into place.
    private func present(_ banner: AppBanner) {
        currentBanner = banner
        bannerOpacity = 0
        bannerOffset = -16
        withAnimation(.easeOut(duration: 0.3)) {
            bannerOpacity = 1
            bannerOffset = 0
        }
    }
    private var rootTabView: some View {
        TabView(selection: $selectedTab) {
            stationsTab
                .tabItem { Label("Stations", systemImage: "fuelpump.fill") }
                .tag(0)
            favouritesTab
                .tabItem { Label("Favourites", systemImage: "star.fill") }
                .tag(1)
            alertsTab
                .tabItem { Label("Alerts", systemImage: "bell.fill") }
                .tag(2)
            settingsTab
                .tag(3)
        }
    }
    /// The banner title for the bundled-snapshot case: date when the stamp
@@ -476,13 +616,51 @@ struct ContentView: View {
            : String(format: NSLocalizedString("Offline data from %@", comment: ""), date)
    }
-    /// Shared status-strip chrome: a tappable card pinned above the tabs.
+    /// ONE floating banner style for all notifications. Network/offline and
-    /// Tapping retries the live fetch from ANY screen — no pull gesture
+    /// tip outcomes share the same chrome; only the tap action differs —
-    /// needed, so the offline banner isn't trapped on the Stations tab.
+    /// network → retry the fetch, tip → dismiss (TipStore auto-dismisses too).
-    private func statusBanner(icon: String, tint: Color, title: String, subtitle: String, accessibilityLabel: String) -> some View {
+    @ViewBuilder
-        Button {
+    private func floatingBanner(_ banner: AppBanner) -> some View {
-            Task { await refresh(force: true) }
+        switch banner {
-        } label: {
+        case .offlineDump(let date):
            let title = offlineTitle(date: date)
            statusBannerCard(
                icon: "wifi.slash", tint: .orange, title: title,
                subtitle: NSLocalizedString("Pull to refresh on the Stations tab", comment: ""),
                trailingIcon: "arrow.clockwise",
                accessibilityLabel: date.isEmpty
                    ? NSLocalizedString("Offline data. Pull to refresh on the Stations tab", comment: "")
                    : String(format: NSLocalizedString("Offline data from %@. Pull to refresh on the Stations tab", comment: ""), date)
            ) {
                Task { await refresh(force: true) }
            }
        case .connectionProblem:
            statusBannerCard(
                icon: "wifi.exclamationmark", tint: .red,
                title: NSLocalizedString("Check your internet connection", comment: ""),
                subtitle: NSLocalizedString("Tap to try again", comment: ""),
                trailingIcon: "arrow.clockwise",
                accessibilityLabel: NSLocalizedString("Check your internet connection. Tap to try again", comment: "")
            ) {
                Task { await refresh(force: true) }
            }
        case .tip(let outcome):
            statusBannerCard(
                icon: outcome.icon, tint: outcome.tint, title: outcome.message, subtitle: nil,
                trailingIcon: "xmark", accessibilityLabel: outcome.message
            ) {
                withAnimation(.easeOut(duration: 0.2)) { tipStore.dismissOutcome() }
            }
        }
    }
    /// The single floating-banner chrome shared by every notification
    /// (network/offline + tip). Overlaid — never in flow — so it never moves
    /// the content beneath it.
    private func statusBannerCard(icon: String, tint: Color, title: String, subtitle: String?,
                                  trailingIcon: String, accessibilityLabel: String,
                                  action: @escaping () -> Void) -> some View {
        Button(action: action) {
            HStack(spacing: 10) {
                Image(systemName: icon)
                    .font(.system(size: 17, weight: .semibold))
@@ -492,12 +670,14 @@ struct ContentView: View {
                    Text(title)
                        .font(.subheadline.weight(.semibold))
                        .foregroundStyle(.primary)
-                    Text(subtitle)
+                    if let subtitle {
-                        .font(.caption)
+                        Text(subtitle)
-                        .foregroundStyle(.secondary)
+                            .font(.caption)
                            .foregroundStyle(.secondary)
                    }
                }
                Spacer()
-                Image(systemName: "arrow.clockwise")
+                Image(systemName: trailingIcon)
                    .font(.system(size: 14, weight: .semibold))
                    .foregroundStyle(tint)
            }
@@ -510,13 +690,13 @@ struct ContentView: View {
                        RoundedRectangle(cornerRadius: 12, style: .continuous)
                            .stroke(tint.opacity(0.35), lineWidth: 1)
                    )
                    .shadow(color: .black.opacity(0.08), radius: 8, y: 3)
            )
            .padding(.horizontal, 12)
            .padding(.bottom, 6)
        }
        .contentShape(Rectangle())
        .buttonStyle(.plain)
        .accessibilityLabel(accessibilityLabel)
        .transition(.move(edge: .top).combined(with: .opacity))
    }
    /// Pushes the current best-in-radius station into the Live Activity.
@@ -576,10 +756,35 @@ struct ContentView: View {
        )
    }
    /// The Alerts tab, extracted from `body` so the TabView expression stays
    /// within the compiler's type-check budget.
    private var alertsTab: some View {
        AlertsView(
            enabled: $alertsEnabled,
            radius: $alertsRadius,
            fuel: $alertsFuel,
            favouriteDropEnabled: $favouriteDropAlertsEnabled,
            favouriteDropFuel: $favouriteDropAlertsFuel,
            followsSearch: $alertsFollowsSearch,
            liveActivityEnabled: $liveActivityEnabled,
            liveActivityFuel: $liveActivityFuel,
            liveActivityRadiusMiles: $liveActivityRadiusMiles,
            liveActivityFollowsSearch: $liveActivityFollowsSearch,
            stationLimit: stationLimit,
            distanceUnit: distanceUnit,
            monitoredCount: monitor.monitoredStationIDs.count,
            lastAlert: monitor.lastAlert,
            onCheckFavouriteDropNow: {
                Task { await refresh(force: true) }
            }
        )
    }
    /// The Settings tab, extracted from `body` so the TabView expression stays
    /// within the compiler's type-check budget.
    private var settingsTab: some View {
        SettingsView(
            tipStore: tipStore,
            distanceUnit: $distanceUnit,
            priceDisplayStyle: $priceDisplayStyle,
            alertsFuel: alertsFuel,
@@ -635,6 +840,7 @@ struct ContentView: View {
        isLoading = true
        defer { isLoading = false }
        do {
            let previousFavouriteSnapshots = FuelStore.loadFavouriteAlertSnapshots()
            let fetched = try await FuelPriceProvider.active.fetchStations(
                near: location?.lat, lng: location?.lng,
                fuel: selectedFuel,
@@ -654,6 +860,12 @@ struct ContentView: View {
            // channel shared on SideStore free), so stale star-time snapshots
            // would otherwise show old prices.
            FuelStore.saveFavourites(refreshedFavourites)
            monitor.evaluateFavouritePriceDropAlert(
                favourites: refreshedFavourites,
                previousSnapshots: previousFavouriteSnapshots,
                monitoredFuel: favouriteDropAlertsFuel,
                enabled: favouriteDropAlertsEnabled
            )
            WidgetCenter.shared.reloadAllTimelines()
            statusMessage = "Loaded \(fetched.count) stations · \(Date().formatted(date: .omitted, time: .shortened))"
            // Live data restored — any status banner no longer applies.
@@ -728,14 +940,14 @@ struct StationRow: View {
                        .padding(5)
                } else {
                    Image(systemName: "fuelpump.fill")
-                        .font(.system(size: 22))
+                        .font(.system(size: 22, weight: .semibold))
-                        .foregroundStyle(.white)
+                        .foregroundStyle(Color.black.opacity(0.82))
                }
            }
            .frame(width: 46, height: 46)
-            .background(Circle().fill(.white))
+            .background(Circle().fill(Color.white))
            .clipShape(Circle())
-            .overlay(Circle().stroke(Color.primary.opacity(0.08), lineWidth: 1))
+            .overlay(Circle().stroke(Color.primary.opacity(0.10), lineWidth: 1))
            .shadow(color: .black.opacity(0.08), radius: 2, y: 1)
            // MIDDLE — name, full address, distance
@@ -760,7 +972,7 @@ struct StationRow: View {
                    .lineLimit(1)
                    .truncationMode(.tail)
                if let location {
-                    Text(distanceUnit.format(station.distanceKM(to: location.lat, lng2: location.lng)))
+                    Text(distanceUnit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)))
                        .font(.caption2)
                        .foregroundStyle(.secondary)
                        .monospacedDigit()
@@ -1,7 +1,22 @@
 import ActivityKit
 import SwiftUI
@main
 struct FuelBoardApp: App {
    init() {
        #if DEBUG
        // QA hook (Debug builds only): `-qaLiveActivity e10|e5|diesel` starts a
        // Live Activity with a long station name so the Lock Screen / island
        // layout can be rendered in the Simulator for visual QA.
        let args = ProcessInfo.processInfo.arguments
        if let idx = args.firstIndex(of: "-qaLiveActivity"),
           args.indices.contains(idx + 1),
           let fuel = FuelType(rawValue: args[idx + 1]) {
            startQALiveActivity(fuel: fuel)
        }
        #endif
    }
    var body: some Scene {
        WindowGroup {
            ContentView()
@@ -9,6 +24,34 @@ struct FuelBoardApp: App {
        }
    }
    #if DEBUG
    private func startQALiveActivity(fuel: FuelType) {
        let state = FuelBoardLiveActivityAttributes.ContentState(
            fuel: fuel,
            stationID: "qa-phoenix",
            stationName: "Phoenix Filling Stations",
            brand: "Phoenix",
            pricePence: 1499,
            priceDisplayStyle: FuelStore.loadPriceDisplayStyle(),
            distanceKM: 8.0,
            lat: 51.5,
            lng: -0.12,
            updatedAt: Date()
        )
        let attrs = FuelBoardLiveActivityAttributes()
        do {
            let activity = try Activity.request(
                attributes: attrs,
                content: .init(state: state, staleDate: nil),
                pushType: nil
            )
            print("QA-LIVE-ACTIVITY STARTED id=\(activity.id)")
        } catch {
            print("QA-LIVE-ACTIVITY FAILED: \(error)")
        }
    }
    #endif
    /// Handles deep links that end up in the app. Widget taps arrive here in
    /// two cases:
    ///   - legacy/cached widget timelines using the `fuelboard://` relay, or
@@ -57,7 +57,7 @@ enum LiveActivityManager {
            brand: best.brand,
            pricePence: price,
            priceDisplayStyle: priceDisplayStyle ?? FuelStore.loadPriceDisplayStyle(),
-            distanceKM: best.distanceKM(to: location.lat, lng2: location.lng),
+            distanceKM: FuelStore.displayDistanceKM(station: best, userLat: location.lat, userLng: location.lng),
            lat: best.lat,
            lng: best.lng,
            updatedAt: Date()
@@ -85,7 +85,7 @@ struct OnboardingView: View {
    private var welcomePage: some View {
        VStack(spacing: 0) {
            Spacer()
-            ZStack {
+            AnimatedOnboardingIcon(tint: .accentColor) {
                // The app icon itself, with the standard iOS rounded-corner
                // treatment (~22% of the size), so onboarding matches the
                // Home Screen.
@@ -122,8 +122,7 @@ struct OnboardingView: View {
    private var locationPage: some View {
        VStack(spacing: 0) {
            Spacer()
-            ZStack {
+            AnimatedOnboardingIcon(tint: .blue, motion: .locationArrow) {
                Circle().fill(Color.blue.opacity(0.12)).frame(width: 96, height: 96)
                Image(systemName: "location.fill")
                    .font(.system(size: 40, weight: .semibold))
                    .foregroundStyle(.blue)
@@ -154,8 +153,7 @@ struct OnboardingView: View {
    private var notificationsPage: some View {
        VStack(spacing: 0) {
            Spacer()
-            ZStack {
+            AnimatedOnboardingIcon(tint: .orange, motion: .alarmBell) {
                Circle().fill(Color.orange.opacity(0.12)).frame(width: 96, height: 96)
                Image(systemName: "bell.badge.fill")
                    .font(.system(size: 40, weight: .semibold))
                    .foregroundStyle(.orange)
@@ -186,8 +184,7 @@ struct OnboardingView: View {
    private var dataPage: some View {
        VStack(spacing: 0) {
            Spacer()
-            ZStack {
+            AnimatedOnboardingIcon(tint: .teal, motion: .downloadArrow) {
                Circle().fill(Color.teal.opacity(0.12)).frame(width: 96, height: 96)
                Image(systemName: "arrow.down.circle.fill")
                    .font(.system(size: 40, weight: .semibold))
                    .foregroundStyle(.teal)
@@ -248,19 +245,27 @@ struct OnboardingView: View {
            ) {
                if prompter.locationDenied {
                    openSettings()
                } else if prompter.locationGranted {
                    page = 2  // already decided — just move on
                } else {
-                    // The prompt fires on LEAVING this page (onChange(of:
+                    // Fire the system prompt NOW, while this page is still on
-                    // page), forward advance only) — the description is on
+                    // screen (after it's been read) and BEFORE advancing — so
-                    // screen until the user moves on.
+                    // the prompt never covers the next page's animation. Auto-
-                    page = 2
+                    // advance on grant moves us on once the user responds;
                    // denying leaves the page's "Open Settings" path.
                    prompter.requestLocation()
                }
            }
        case 2:
            primaryButton(
                prompter.notificationsDenied ? "Continue without alerts" : (prompter.notificationsGranted ? "Continue" : "Allow Notifications")
            ) {
-                // Prompt fires on leaving this page (same rule as Location).
+                if prompter.notificationsDenied || prompter.notificationsGranted {
-                page = 3
+                    page = 3  // decided either way — move on
                } else {
                    // Same rule as Location: prompt now, before advancing.
                    prompter.requestNotifications()
                }
            }
        case 3:
            // No permission on this page — prices need none. Straight on.
@@ -326,6 +331,99 @@ struct OnboardingView: View {
    }
 }
 private struct AnimatedOnboardingIcon<Content: View>: View {
    enum Motion {
        case gentle
        case locationArrow
        case alarmBell
        case downloadArrow
    }
    let tint: Color
    var motion: Motion = .gentle
    @ViewBuilder var content: Content
    @State private var settled = false
    @State private var iconRotation: Double = 0
    @State private var iconOffsetY: CGFloat = 0
    @State private var iconScale: CGFloat = 0.92
    var body: some View {
        ZStack {
            Circle()
                .fill(tint.opacity(0.10))
                .frame(width: 108, height: 108)
                .scaleEffect(settled ? 1.0 : 0.94)
            Circle()
                .stroke(tint.opacity(0.18), lineWidth: 1)
                .frame(width: 118, height: 118)
                .scaleEffect(settled ? 1.03 : 0.97)
                .opacity(settled ? 1.0 : 0.55)
            content
                .scaleEffect(iconScale)
                .rotationEffect(.degrees(iconRotation))
                .offset(y: iconOffsetY)
        }
        .shadow(color: tint.opacity(0.12), radius: settled ? 12 : 4, y: settled ? 6 : 2)
        .animation(.spring(response: 0.55, dampingFraction: 0.82), value: settled)
        .onAppear {
            playAnimation()
        }
    }
    private func playAnimation() {
        settled = false
        iconRotation = 0
        iconOffsetY = 4
        iconScale = 0.92
        switch motion {
        case .gentle:
            withAnimation(.spring(response: 0.55, dampingFraction: 0.82)) {
                settled = true
                iconOffsetY = 0
                iconScale = 1.0
            }
        case .locationArrow:
            iconRotation = -120
            withAnimation(.linear(duration: 0.45)) {
                settled = true
                iconRotation = 24
                iconOffsetY = 0
                iconScale = 1.02
            }
            withAnimation(.spring(response: 0.45, dampingFraction: 0.62).delay(0.45)) {
                iconRotation = 0
                iconScale = 1.0
            }
        case .alarmBell:
            settled = true
            iconOffsetY = 0
            iconScale = 1.0
            withAnimation(.linear(duration: 0.10)) { iconRotation = -14 }
            withAnimation(.linear(duration: 0.10).delay(0.10)) { iconRotation = 14 }
            withAnimation(.linear(duration: 0.10).delay(0.20)) { iconRotation = -10 }
            withAnimation(.linear(duration: 0.10).delay(0.30)) { iconRotation = 10 }
            withAnimation(.spring(response: 0.34, dampingFraction: 0.72).delay(0.40)) { iconRotation = 0 }
        case .downloadArrow:
            iconOffsetY = -22
            withAnimation(.easeIn(duration: 0.22)) {
                settled = true
                iconScale = 1.0
                iconOffsetY = 8
            }
            withAnimation(.spring(response: 0.42, dampingFraction: 0.62).delay(0.22)) {
                iconOffsetY = 0
            }
        }
    }
 }
 /// Owns the system permission requests during onboarding and publishes
 /// their outcomes so the pages can reflect them live.
@MainActor
@@ -79,6 +79,7 @@ struct TieChoice {
 /// entering the winner's circle — not at the forecourt.
@MainActor
 final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLocationManagerDelegate, UNUserNotificationCenterDelegate {
    private static let favouriteDropThresholdPence: Double = 1.0
    @Published var monitoredStationIDs: [String] = []
    @Published var lastAlert: String?
    @Published private(set) var lastTestResult: String?
@@ -218,6 +219,46 @@ final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLoca
    var isEnabled: Bool { enabled }
    /// Compares the latest refreshed favourites against the persisted cheapest-
    /// favourite baseline for one fuel and schedules a notification when the
    /// winner changes or the current winner drops by a meaningful amount.
    func evaluateFavouritePriceDropAlert(
        favourites: [FavouriteEntry],
        previousSnapshots: [FuelType: FavouriteAlertSnapshot],
        monitoredFuel: FuelType,
        enabled: Bool
    ) {
        var snapshots = previousSnapshots
        guard let current = FuelStore.cheapestFavourite(in: favourites, fuel: monitoredFuel),
              let currentPrice = current.station.prices[monitoredFuel] else {
            snapshots.removeValue(forKey: monitoredFuel)
            FuelStore.saveFavouriteAlertSnapshots(snapshots)
            return
        }
        let currentSnapshot = FavouriteAlertSnapshot(
            fuel: monitoredFuel,
            stationID: current.station.id,
            stationName: current.station.name,
            price: currentPrice
        )
        defer {
            snapshots[monitoredFuel] = currentSnapshot
            FuelStore.saveFavouriteAlertSnapshots(snapshots)
        }
        guard enabled else { return }
        guard let previous = previousSnapshots[monitoredFuel] else { return }
        let winnerChanged = previous.stationID != currentSnapshot.stationID
        let priceDropped = previous.stationID == currentSnapshot.stationID
            && currentSnapshot.price <= previous.price - Self.favouriteDropThresholdPence
        guard winnerChanged || priceDropped else { return }
        fireFavouriteDropAlert(current: current, previous: previous, price: currentPrice, winnerChanged: winnerChanged)
    }
    /// Records a stage in the live alert trace, newest first, capped at 8.
    private func logAlert(_ kind: AlertLogEntry.Kind, _ text: String) {
        alertLog.insert(AlertLogEntry(date: Date(), kind: kind, text: text), at: 0)
@@ -452,6 +493,31 @@ final class ProximityMonitor: NSObject, ObservableObject, @preconcurrency CLLoca
        lastAlert = "\(brand) · \(String(format: "%.1fp", price)) · \(distanceText) away"
    }
    private func fireFavouriteDropAlert(
        current: FavouriteEntry,
        previous: FavouriteAlertSnapshot,
        price: Double,
        winnerChanged: Bool
    ) {
        let content = UNMutableNotificationContent()
        content.sound = .default
        let fuel = current.fuel
        let previousPriceText = String(format: "%.1fp", previous.price)
        let currentPriceText = String(format: "%.1fp", price)
        if winnerChanged {
            content.title = "New cheapest \(fuel.displayName.lowercased()) favourite"
            content.body = "\(current.station.name) is now your cheapest favourite at \(currentPriceText), ahead of \(previous.stationName)."
        } else {
            content.title = "Cheapest favourite just dropped"
            content.body = "\(current.station.name) fell from \(previousPriceText) to \(currentPriceText) for \(fuel.displayName.lowercased())."
        }
        addAlertRequest(content: content, station: current.station)
        logAlert(.fired, "favourite alert scheduled — \(current.station.name) · \(currentPriceText)")
        lastAlert = "Favourite · \(current.station.name) · \(currentPriceText)"
    }
    /// Adds a notification whose tap opens directions to `station`. The
    /// station's coordinates ride in `userInfo` so the tap handler can route
    /// to Apple Maps (or an in-app fallback), and a map snapshot with a pin is
@@ -0,0 +1,98 @@
 // RoadDistanceService.swift — computes Apple-Maps-matched ROAD distances for
 // nearby stations and caches them (keychain) so widgets + Live Activity can
 // show real driving distance instead of straight-line haversine.
 //
 // Runs only in the APP: MKDirections is network-bound and the widget extension
 // has a tiny execution budget + a ~40-70/day refresh budget, so routing belongs
 // here, not in the widget. The widget/Live Activity just read the cache.
 //
 // Throttling: recompute at most every `throttleMinutes`, or when the user has
 // moved `moveThresholdMeters` from where the cache was built. Bounded to the
 // `candidatesPerPass` nearest stations so a pass stays a handful of route calls.
 import Foundation
 import MapKit
 import WidgetKit
 enum RoadDistanceService {
    /// Upper bound on stations routed per pass, so a pass stays a bounded set of
    /// route calls. Raised from 12 so stations past the old nearest-12 cutoff
    /// still get real road distances instead of a straight-line fallback.
    static let candidatesPerPass = 40
    /// Only route stations within this straight-line radius (km). Covers the
    /// largest search radius the UI exposes (15 mi ≈ 24.1 km) plus margin, so
    /// every station a widget/Live Activity/list can actually show gets routed.
    static let maxRadiusKM: Double = 25
    /// Don't route again more often than this (minutes).
    static let throttleMinutes: Double = 10
    /// Recompute when the user moves more than this (metres) from the last
    /// source location.
    static let moveThresholdMeters: Double = 400
    /// Refreshes the cached road distances for the in-radius stations around
    /// `lat`/`lng`. Throttled by time + distance; safe to call on every fix.
    static func refreshIfNeeded(stations: [FuelStation], lat: Double, lng: Double) async {
        guard !stations.isEmpty else { return }
        // Throttle: keep cached values when fresh and the user hasn't moved far.
        if let cache = FuelStore.loadRoadDistances() {
            let elapsed = Date().timeIntervalSince1970 - cache.updatedAt
            let movedMeters = haversineMeters(cache.sourceLat, cache.sourceLng, lat, lng)
            if elapsed < throttleMinutes * 60 && movedMeters < moveThresholdMeters {
                return
            }
        }
        // Candidate stations: the nearest-by-straight-line subset that the UI
        // could actually display, capped so a pass stays bounded.
        let nearest = stations
            .sorted { $0.distanceKM(to: lat, lng2: lng) < $1.distanceKM(to: lat, lng2: lng) }
            .prefix(candidatesPerPass)
            .filter { $0.distanceKM(to: lat, lng2: lng) <= maxRadiusKM }
        let origin = CLLocationCoordinate2D(latitude: lat, longitude: lng)
        var entries: [String: CachedRoadDistance] = [:]
        for station in nearest {
            let dest = CLLocationCoordinate2D(latitude: station.lat, longitude: station.lng)
            if let meters = await roadMeters(from: origin, to: dest) {
                // Store the exact pin that was routed so the display layer can
                // refuse to serve this value if the station later appears with
                // a different coordinate (corrected pin / other data source).
                entries[station.id] = CachedRoadDistance(meters: meters,
                                                         lat: station.lat,
                                                         lng: station.lng)
            }
        }
        guard !entries.isEmpty else { return }
        FuelStore.saveRoadDistances(sourceLat: lat, sourceLng: lng, entries: entries)
        // Wake the widgets so the new road distances surface immediately.
        WidgetCenter.shared.reloadAllTimelines()
    }
    /// Driving distance (metres) between two coordinates via Apple Maps routing.
    private static func roadMeters(from: CLLocationCoordinate2D, to: CLLocationCoordinate2D) async -> Double? {
        let request = MKDirections.Request()
        request.source = MKMapItem(placemark: MKPlacemark(coordinate: from))
        request.destination = MKMapItem(placemark: MKPlacemark(coordinate: to))
        request.transportType = .automobile
        request.requestsAlternateRoutes = false
        do {
            let response = try await MKDirections(request: request).calculate()
            return response.routes.first?.distance
        } catch {
            return nil
        }
    }
    /// Straight-line haversine distance between two coordinates, in metres.
    private static func haversineMeters(_ lat1: Double, _ lng1: Double, _ lat2: Double, _ lng2: Double) -> Double {
        let r = 6371000.0
        let dLat = (lat2 - lat1) * .pi / 180
        let dLng = (lng2 - lng1) * .pi / 180
        let a = sin(dLat / 2) * sin(dLat / 2) +
                cos(lat1 * .pi / 180) * cos(lat2 * .pi / 180) *
                sin(dLng / 2) * sin(dLng / 2)
        return r * 2 * atan2(sqrt(a), sqrt(1 - a))
    }
 }
@@ -13,6 +13,9 @@ import WidgetKit
 /// freshness) is debug-only too — moved here so release builds don't expose
 /// relay plumbing.
 struct SettingsView: View {
    /// Shared tip-purchase store — owned by ContentView so its outcome can
    /// ride the app-wide status banner (above the tabs), not a local card.
    @ObservedObject var tipStore: TipStore
    @Binding var distanceUnit: DistanceUnit
    @Binding var priceDisplayStyle: PriceDisplayStyle
    /// The fuel + radius currently configured for alerts (mirrors the Alerts
@@ -53,9 +56,6 @@ struct SettingsView: View {
    /// Clears the armed fence (monitor.clearDebugFence).
    var onClearDebugFence: () -> Void = {}
    @StateObject private var tipStore = TipStore()
    @State private var showTipAlert = false
    @State private var tipAlertMessage = ""
    @State private var testAlertMessage: String?
    /// Hidden developer flag — the Debug section only appears when on. Toggled
    /// by tapping the About → Version row five times (NOT a user-facing switch).
@@ -359,13 +359,6 @@ struct SettingsView: View {
                    Text("About")
                }
                if let message = tipStore.message {
                    Section {
                        Text(message)
                            .font(.footnote)
                            .foregroundStyle(.secondary)
                    }
                }
            }
            .navigationTitle("Settings")
            .onAppear {
@@ -610,9 +603,19 @@ final class TipStore: ObservableObject {
                accent: Color(red: 1.0, green: 0.84, blue: 0.04)),    // #FFD60A
    ]
    /// A banner outcome: the exact copy to show plus its icon + tint.
    struct TipOutcome: Hashable {
        let message: String
        let icon: String
        let tint: Color
    }
    @Published private(set) var products: [String: Product] = [:]
    @Published private(set) var purchaseInProgress = false
-    @Published private(set) var message: String?
+    @Published private(set) var outcome: TipOutcome?
    /// Auto-dismiss timer for the outcome banner (replaced on each new outcome).
    private var dismissTask: Task<Void, Never>?
    /// Listens for transactions that complete OUTSIDE the direct purchase()
    /// call — Ask to Buy approvals, payments finished on another device
@@ -630,6 +633,7 @@ final class TipStore: ObservableObject {
    deinit {
        updatesTask?.cancel()
        dismissTask?.cancel()
    }
    private func handle(_ update: VerificationResult<StoreKit.Transaction>) async {
@@ -638,7 +642,30 @@ final class TipStore: ObservableObject {
        // Only acknowledge our own consumables (future products get their own).
        guard Self.tiers.contains(where: { $0.id == transaction.productID }) else { return }
        await transaction.finish()
-        message = NSLocalizedString("Thank you! Your tip has been received. ⛽", comment: "")
+        showOutcome(
            NSLocalizedString("Thank you! Your tip has been received. ⛽", comment: ""),
            icon: "checkmark.circle.fill",
            tint: Color(red: 0.19, green: 0.82, blue: 0.35)      // #30D158
        )
    }
    /// Sets the banner outcome and schedules its auto-dismiss (~3.5 s).
    /// Re-triggering cancels the previous timer so rapid taps don't collide.
    private func showOutcome(_ message: String, icon: String, tint: Color) {
        dismissTask?.cancel()
        outcome = TipOutcome(message: message, icon: icon, tint: tint)
        dismissTask = Task { [weak self] in
            try? await Task.sleep(nanoseconds: 3_500_000_000)
            guard !Task.isCancelled else { return }
            withAnimation(.easeOut(duration: 0.25)) { self?.outcome = nil }
        }
    }
    /// Tap-to-dismiss — clears the banner and cancels the pending auto-dismiss.
    func dismissOutcome() {
        dismissTask?.cancel()
        dismissTask = nil
        withAnimation(.easeOut(duration: 0.2)) { outcome = nil }
    }
    func displayPrice(for tier: TipTier) -> String {
@@ -667,7 +694,11 @@ final class TipStore: ObservableObject {
        // Connect yet), still allow the attempt so the user sees a clear
        // outcome rather than a dead button.
        guard let product = products[tier.id] else {
-            message = NSLocalizedString("The tip isn't available in this build yet — check back after an App Store release.", comment: "")
+            showOutcome(
                NSLocalizedString("The tip isn't available in this build yet — check back after an App Store release.", comment: ""),
                icon: "info.circle.fill",
                tint: Color(.secondaryLabel)
            )
            return
        }
@@ -680,19 +711,35 @@ final class TipStore: ObservableObject {
                    // Consume the consumable — otherwise StoreKit re-delivers
                    // it through Transaction.updates on every launch.
                    await transaction.finish()
-                    message = NSLocalizedString("Thank you! Your tip has been received. ⛽", comment: "")
+                    showOutcome(
                        NSLocalizedString("Thank you! Your tip has been received. ⛽", comment: ""),
                        icon: "checkmark.circle.fill",
                        tint: Color(red: 0.19, green: 0.82, blue: 0.35)      // #30D158
                    )
                case .unverified:
-                    message = NSLocalizedString("The purchase couldn't be verified. Please try again.", comment: "")
+                    showOutcome(
                        NSLocalizedString("The purchase couldn't be verified. Please try again.", comment: ""),
                        icon: "exclamationmark.triangle.fill",
                        tint: .orange
                    )
                }
            case .userCancelled:
-                message = nil   // silent — the user just closed the sheet
+                dismissOutcome()   // silent — the user just closed the sheet
            case .pending:
-                message = NSLocalizedString("Your tip is pending approval. It'll finish automatically.", comment: "")
+                showOutcome(
                    NSLocalizedString("Your tip is pending approval. It'll finish automatically.", comment: ""),
                    icon: "hourglass",
                    tint: Color(red: 0.39, green: 0.82, blue: 1.0)           // #64D2FF
                )
            @unknown default:
-                message = nil
+                dismissOutcome()
            }
        } catch {
-            message = String(format: NSLocalizedString("The tip couldn't be completed: %@", comment: ""), error.localizedDescription)
+            showOutcome(
                String(format: NSLocalizedString("The tip couldn't be completed: %@", comment: ""), error.localizedDescription),
                icon: "xmark.circle.fill",
                tint: .red
            )
        }
    }
 }
@@ -489,19 +489,14 @@ struct FuelMessageSnippetIntent: SnippetIntent {
 struct FuelBoardShortcuts: AppShortcutsProvider {
    static var appShortcuts: [AppShortcut] {
-        // Generic parameterized shortcut — matches whatever fuel word Siri
+        // NOTE (2026-08-20): the generic parameterized shortcut ("cheapest
-        // resolves. Parameter resolution is flaky on-device ("cheapest diesel"
+        // ${fuel}") was REMOVED. It competed with the fixed-fuel literal-word
-        // matched, "cheapest unleaded" didn't), which is why the fixed-fuel
+        // shortcuts for the same intent (parameter resolution was already flaky
-        // entries below carry the fuel word as LITERAL phrase text.
+        // on-device), which degraded Siri's NLU ranking and caused the
-        AppShortcut(
+        // hit-and-miss "can't do that, searching in app" fallback. Now Siri
-            intent: CheapestFuelIntent(),
+        // routes on literal fuel words only, and the freed slot keeps us under
-            phrases: [
+        // the 10-shortcut cap. Every phrase carries .applicationName (iOS 26
-                "Ask \(.applicationName) what's the cheapest \(\.$fuel) near me",
+        // metadata-processor requirement) and mirrors how people actually ask.
            ],
            shortTitle: "Cheapest Fuel",
            systemImageName: "fuelpump"
        )
        AppShortcut(
            intent: CheapestFuelIntent(fuel: .e10),
            phrases: [
@@ -509,6 +504,10 @@ struct FuelBoardShortcuts: AppShortcutsProvider {
                "Ask \(.applicationName) for the cheapest petrol near me",
                "Find the cheapest petrol near me \(.applicationName)",
                "Find the cheapest unleaded near me \(.applicationName)",
                "What's the cheapest unleaded near me \(.applicationName)",
                "What's the cheapest petrol near me \(.applicationName)",
                "Cheapest unleaded near me \(.applicationName)",
                "Where's the cheapest petrol \(.applicationName)",
            ],
            shortTitle: "Cheapest Unleaded",
            systemImageName: "fuelpump"
@@ -317,17 +317,6 @@ extension FuelType {
        case .diesel: return "Diesel"
        }
    }
    /// Fuel colour wheel (user-chosen palette): green = unleaded (#30D158),
    /// yellow = premium (#FFD60A), cyan = diesel (#64D2FF). Used for the
    /// fuel-type tab icons and the title icon.
    var tintColor: Color {
        switch self {
        case .e10: return Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0)      // #30D158
        case .e5: return Color(red: 255/255.0, green: 214/255.0, blue: 10/255.0)      // #FFD60A
        case .diesel: return Color(red: 100/255.0, green: 210/255.0, blue: 255/255.0) // #64D2FF
        }
    }
 }
 /// Fuel-type selector styled like a segmented control, with a coloured pump
@@ -342,20 +331,26 @@ struct FuelTypeSegmentedPicker: View {
    var fuels: [FuelType] = FuelType.allCases
    var onSelect: (FuelType) -> Void = { _ in }
    @Namespace private var selectionSlider
    var body: some View {
        HStack(spacing: 3) {
            ForEach(fuels) { fuel in
                let isSelected = fuel == selection
                Button {
-                    selection = fuel
+                    withAnimation(.spring(response: 0.42, dampingFraction: 0.78)) {
                        selection = fuel
                    }
                    onSelect(fuel)
                } label: {
                    HStack(spacing: 5) {
                        Image(systemName: "fuelpump.fill")
                            .font(.caption2)
                            .foregroundStyle(fuel.tintColor)
                            .scaleEffect(isSelected ? 1.08 : 0.94)
                        Text(fuel.shortName)
                            .font(.subheadline.weight(isSelected ? .semibold : .regular))
                            .contentTransition(.opacity)
                    }
                    .foregroundStyle(isSelected ? Color.primary : Color.secondary)
                    .frame(maxWidth: .infinity)
@@ -364,14 +359,29 @@ struct FuelTypeSegmentedPicker: View {
                        if isSelected {
                            Capsule()
                                .fill(Color(UIColor.systemBackground))
-                                .shadow(color: .black.opacity(0.08), radius: 1, y: 0.5)
+                                .overlay {
                                    Capsule()
                                        .stroke(fuel.tintColor.opacity(0.28), lineWidth: 1)
                                }
                                .shadow(color: fuel.tintColor.opacity(0.16), radius: 6, y: 2)
                                .matchedGeometryEffect(id: "fuelSelectionSlider", in: selectionSlider)
                        }
                    }
                    .scaleEffect(isSelected ? 1.02 : 0.98)
                    .contentShape(Capsule())
                }
                .buttonStyle(.plain)
            }
        }
        .padding(3)
        .background(Capsule().fill(Color(.secondarySystemBackground)))
        .animation(.spring(response: 0.42, dampingFraction: 0.78), value: selection)
    }
 }
 #Preview("Fuel Picker") {
    @Previewable @State var selectedFuel: FuelType = .e10
    FuelTypeSegmentedPicker(selection: $selectedFuel)
        .padding()
        .background(Color(.systemGroupedBackground))
 }
@@ -25,6 +25,7 @@ struct TrendsView: View {
    var onHistoryRecovered: (() -> Void)? = nil
    @Environment(\.dismiss) private var dismiss
    @Environment(\.accessibilityReduceMotion) private var reduceMotion
    @State private var fuel: FuelType = .e10
    @State private var rangeDays: Int = 30
@@ -34,6 +35,13 @@ struct TrendsView: View {
    @State private var loadFailed = false
    @State private var firstSnapshot: String?
    /// Per-series draw-in waterline: maps stationID → how many leading points
    /// are revealed, so each line traces left→right on first appearance.
    /// Series reveal in a short staggered cascade so the draw is clearly
    /// visible even with only 2 points per line. Stays full after the first
    /// reveal so range/mode switches morph instead of re-tracing.
    @State private var revealed: [String: Int] = [:]
    /// Seeded from `selectedFuel` (the fuel the tab was on) so the sheet
    /// opens where the user was — same pattern as FavouritesView.
    init(favourites: [FavouriteEntry],
@@ -157,7 +165,13 @@ struct TrendsView: View {
            // pointer probe already done above.
            loadFailed = firstSnapshot == nil
        }
        // Always redraw the lines on a selection change. `.task(id:)` fires on
        // the initial appear and on every fuel/range switch (there's no
        // periodic refetch in this sheet), so a staggered per-series draw-in
        // replays exactly when the user picks 7/30/90 (or switches fuel) while
        // a width-stable morph keeps the x-axis/y-range from jumping abruptly.
        series = fetched
        revealSeries(fetched)
        // A failure with no data IS a connection problem — raise the global
        // banner so the user isn't stuck with a silent retry state. Success
        // clears it (only if the banner is the connection banner).
@@ -168,6 +182,32 @@ struct TrendsView: View {
        }
    }
    /// Replays the staggered per-series draw-in for the given histories:
    /// resets the waterline, then cascades each station's line left→right,
    /// 0.18s apart, on every range/fuel selection. Reduce Motion jump-cuts
    /// straight to the full state.
    private func revealSeries(_ histories: [StationHistory]) {
        let hasPoints = histories.contains { !$0.points.isEmpty }
        guard hasPoints else { return }
        if reduceMotion {
            revealed = histories.reduce(into: [:]) { $0[$1.stationID] = $1.points.count }
            return
        }
        revealed = [:]
        let cascadeNS = UInt64(0.18 * 1_000_000_000)
        for (i, h) in histories.enumerated() {
            let sid = h.stationID
            let total = h.points.count
            Task {
                try? await Task.sleep(nanoseconds: UInt64(i) * cascadeNS)
                guard !Task.isCancelled else { return }
                withAnimation(.easeOut(duration: 0.5)) {
                    revealed[sid] = total
                }
            }
        }
    }
    private func yLabel(_ pence: Double) -> String {
        switch mode {
        case .price:
@@ -330,6 +370,9 @@ struct TrendsView: View {
                    .font(.system(size: 30, weight: .bold, design: .default))
                    .monospacedDigit()
                    .foregroundStyle(.primary)
                    // Roll the digits to the new figure on range/mode change
                    // (fires inside the animated transaction above).
                    .contentTransition(.numericText(value: headAvg))
                if let delta = headlineDelta, delta != 0 {
                    Label(
                        "\(deltaIsGood ? "−" : "+")\(abs(delta), specifier: "%.1f")p",
@@ -389,13 +432,13 @@ struct TrendsView: View {
        // type-checker's budget.)
        Chart {
            ForEach(displaySeries) { history in
-                ForEach(history.points) { point in
+                ForEach(history.points.prefix(revealed[history.stationID] ?? 0)) { point in
                    areaMark(point, series: history.name,
                             color: seriesColor(index(of: history.stationID)))
                }
            }
            ForEach(displaySeries) { history in
-                ForEach(history.points) { point in
+                ForEach(history.points.prefix(revealed[history.stationID] ?? 0)) { point in
                    lineMark(point, series: history.name,
                             color: seriesColor(index(of: history.stationID)))
                }
@@ -424,6 +467,9 @@ struct TrendsView: View {
            }
        }
        .frame(height: 190)
        // Price ↔ vs-cheapest is a pure view toggle (no network): animate the
        // lines + axis gliding to the rebased series.
        .animation(.easeInOut(duration: 0.35), value: mode)
    }
    /// One gradient-filled area band under a single point of a series.
@@ -233,11 +233,25 @@ final class BrandTests: XCTestCase {
        XCTAssertEqual(station(brand: "JET").brandImageName, "brand_jet")
        XCTAssertEqual(station(brand: "TEXACO").brandImageName, "brand_texaco")
        XCTAssertEqual(station(brand: "APPLEGREEN").brandImageName, "brand_applegreen")
        XCTAssertEqual(station(brand: "VALERO").brandImageName, "brand_valero")
        XCTAssertEqual(station(brand: "WELCOME BREAK").brandImageName, "brand_welcome_break")
        XCTAssertEqual(station(brand: "THE CO-OPERATIVE").brandImageName, "brand_the_co_operative")
        XCTAssertEqual(station(brand: "CO-OP").brandImageName, "brand_the_co_operative")
        XCTAssertEqual(station(brand: "MURCO").brandImageName, "brand_murco")
        XCTAssertEqual(station(brand: "GLEANER").brandImageName, "brand_gleaner")
        XCTAssertEqual(station(brand: "HIGHLAND FUELS").brandImageName, "brand_highland_fuels")
        XCTAssertEqual(station(brand: "CIRCLE K").brandImageName, "brand_circle_k")
        XCTAssertEqual(station(brand: "MAXOL").brandImageName, "brand_maxol")
        XCTAssertEqual(station(brand: "SPAR").brandImageName, "brand_spar")
        XCTAssertEqual(station(brand: "ESSAR").brandImageName, "brand_essar")
        XCTAssertEqual(station(brand: "EG ON THE MOVE").brandImageName, "brand_esso")
        XCTAssertEqual(station(brand: "GO FORECOURT").brandImageName, "brand_gulf")
    }
-    func testUnknownBrand() {
+    func testUnknownBrandUsesGenericFuelPumpFallbackInUI() {
-        XCTAssertNil(station(brand: "WELCOME BREAK").brandImageName)
+        XCTAssertNil(station(brand: "TOTAL HARVEST ENERGY").brandImageName)
-        XCTAssertNil(station(brand: "VALERO").brandImageName)
+        XCTAssertNil(station(brand: "SOLO").brandImageName)
        XCTAssertNil(station(brand: "PACE").brandImageName)
        XCTAssertNil(station(brand: "").brandImageName)
    }
 }
@@ -606,3 +620,82 @@ final class OfflineDataLabelTests: XCTestCase {
        XCTAssertNil(FuelStore.offlineDataLabel(from: "not-a-date"))
    }
 }
 // MARK: - Road distance cache
 final class RoadDistanceCacheTests: XCTestCase {
    override func setUp() {
        super.setUp()
        // Keychain persists across invocations, so a cache left by an earlier
        // test or run would pollute these. Overwrite with an empty, far-away
        // cache (source at (0,0)) so every test starts from a clean slate.
        FuelStore.saveRoadDistances(sourceLat: 0, sourceLng: 0, entries: [:])
    }
    private func station(_ id: String, _ lat: Double, _ lng: Double) -> FuelStation {
        FuelStation(id: id, name: id, brand: "X", address: "", postcode: "",
                    lat: lat, lng: lng, prices: [:], priceUpdated: nil)
    }
    func testDisplayDistanceFallsBackToStraightLineWhenNoCache() {
        // London user, station ~ London -> no cache -> straight-line haversine.
        let s = station("a", 51.5074, -0.1278)
        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
        XCTAssertEqual(km, s.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001)
    }
    func testRoadDistanceUsedWhenCachedNear() {
        let s = station("a", 51.5074, -0.1278)
        // Cache a road distance of 3.2 km for this station from the user's fix.
        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
        XCTAssertEqual(km, 3.2, accuracy: 0.0001)
    }
    func testRoadDistanceNilWhenOriginFar() {
        let s = station("a", 51.5074, -0.1278)
        // Cache built in London, but the user is now ~200 km away -> stale.
        FuelStore.saveRoadDistances(sourceLat: 51.5074, sourceLng: -0.1278,
                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
        let meters = FuelStore.roadDistanceMeters(for: s, userLat: 53.4808, userLng: -2.2426)
        XCTAssertNil(meters)
        // And display falls back to straight-line.
        let km = FuelStore.displayDistanceKM(station: s, userLat: 53.4808, userLng: -2.2426)
        XCTAssertEqual(km, s.distanceKM(to: 53.4808, lng2: -2.2426), accuracy: 0.0001)
    }
    func testRoadDistanceUsedForOtherStationNotFound() {
        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
        // A station that isn't in the cache falls back to straight-line.
        let s = station("z", 51.51, -0.13)
        let km = FuelStore.displayDistanceKM(station: s, userLat: 51.6, userLng: -0.1)
        XCTAssertEqual(km, s.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001)
    }
    func testRoadDistanceNotServedWhenStationPinDiffers() {
        // Route a road distance to station "a" at pin P1.
        FuelStore.saveRoadDistances(sourceLat: 51.6, sourceLng: -0.1,
                                    entries: ["a": .init(meters: 3200, lat: 51.5074, lng: -0.1278)])
        // The SAME station id appears with a moved pin (corrected coordinate /
        // different embedded vs live source): the cached route to P1 must NOT
        // be served — it belongs to a different location.
        let moved = station("a", 51.5400, -0.1600)
        let km = FuelStore.displayDistanceKM(station: moved, userLat: 51.6, userLng: -0.1)
        XCTAssertEqual(km, moved.distanceKM(to: 51.6, lng2: -0.1), accuracy: 0.0001,
                       "road value routed to the old pin leaked onto a different coordinate")
    }
 }
 // MARK: - Install identity
 final class InstallIdentityTests: XCTestCase {
    func testFreshInstallIsStableAfterFirstCall() {
        // The first call seeds the common install id (local == keychain), so
        // any subsequent call in the same process must report NOT-fresh. This
        // holds regardless of persisted keychain/defaults state from prior runs.
        _ = FuelStore.isFreshInstall()
        XCTAssertFalse(FuelStore.isFreshInstall())
    }
 }
@@ -4,27 +4,25 @@
 // Shows the cheapest station for the pinned fuel within the app's chosen
 // radius. Tapping anywhere opens Apple Maps directions to that station.
 //
-// ADAPTIVE LAYOUT: ActivityConfiguration shares ONE content view across the
+// ADAPTIVE LAYOUT: the Lock Screen body provides two layouts and lets
-// Lock Screen, banner, and the CarPlay small slot — there is no per-platform
+// ViewThatFits pick by available width, but the narrow `.small` family is NOT
-// closure. So this view provides two layouts and lets ViewThatFits pick by
+// declared (see note on the config), so iPhone/iPad always render the full
-// available width:
+// three-column card (`richBody`) with proper text sizes. `compactBody` is kept
-//   • richBody  — the full three-column design (glyph · fuel+station · price),
+// as a safety fallback should any surface ever hand this view a narrow width.
-//                 wins wherever there's Lock Screen width (it carries an
+//
-//                 explicit minWidth so it can never be squeezed into the car).
+// IMPORTANT: `.supplementalActivityFamilies([.small])` is deliberately absent —
-//   • compactBody — a minimal price-strip (glyph+fuel+price, station caption
+// it made iOS render the squeezed `.small` card on the iPhone Lock Screen.
-//                 below) that wins in the CarPlay/Apple Watch Smart Stack
+// CarPlay's small form comes from the Dynamic Island compact closures.
 //                 small slot.
 import ActivityKit
 import SwiftUI
 import WidgetKit
 /// The Live Activity itself — registered in the widget bundle alongside the
-/// regular price widget. No CarPlay entitlement involved: this renders on the
+/// regular price widget. No CarPlay entitlement involved: renders on the
-/// Lock Screen, Dynamic Island, and the car display (CarPlay Ultra, iOS 26+).
+/// Lock Screen (full-width card on iPhone/iPad) and the Dynamic Island
-/// `.supplementalActivityFamilies([.small])` makes it eligible for the car's
+/// (incl. the island's compact form used in the car, display-only — FuelBoard
-/// small Live Activity slot — display-only there (FuelBoard is not a
+/// is not a CarPlay-enabled app, so car-side taps can't launch anything).
 /// CarPlay-enabled app, so car-side taps can't launch anything).
 struct FuelBoardLiveActivity: Widget {
    var body: some WidgetConfiguration {
        ActivityConfiguration(for: FuelBoardLiveActivityAttributes.self) { context in
@@ -43,7 +41,7 @@ struct FuelBoardLiveActivity: Widget {
                }
            } compactLeading: {
                Image(systemName: "fuelpump.fill")
-                    .foregroundStyle(.green)
+                    .foregroundStyle(context.state.fuel.tintColor)
            } compactTrailing: {
                FuelBoardLiveActivityPriceView(context: context)
            } minimal: {
@@ -52,6 +50,14 @@ struct FuelBoardLiveActivity: Widget {
            }
        }
        .supplementalActivityFamilies([.small])
        // Why `.small` is kept: it lets the SHARED body render a compact form
        // in genuinely small slots (CarPlay small / Apple Watch smart stack)
        // instead of falling back to the Dynamic Island compact closure —
        // which could NOT show the station distance the user wants on CarPlay.
        // The full-width iPhone/iPad card is protected by the `richMinWidth`
        // gate on `richBody` + its flexible, truncating middle column, so
        // iPhone/iPad still get the full card; only truly small space picks
        // the compact strip below.
    }
 }
@@ -59,27 +65,59 @@ struct FuelBoardLiveActivity: Widget {
 private struct FuelBoardLiveActivityView: View {
    let context: ActivityViewContext<FuelBoardLiveActivityAttributes>
    /// Below this ACTUAL proposed width we show the compact strip (CarPlay
    /// small / Watch smart stack); at/above it we show the full card. The
    /// decision is made from the real width the system hands the body, read
    /// via a background GeometryReader — NOT ViewThatFits ideal-width
    /// measurement (that's broken for truncating text: a long station name
    /// inflated the "ideal" width past the iPhone Lock Screen and collapsed
    /// the full card).
    private let compactWidthThreshold: CGFloat = 280
    /// Measured slot width (drives the rich-vs-compact branch). Measured in a
    /// background GeometryReader so it does NOT act as the layout container:
    /// a GeometryReader root pins content top-left, and forcing a
    /// maxHeight:.infinity frame on it over-claims the whole proposed height,
    /// centring the content below true vertical centre (bigger gap above) on
    /// the Lock Screen. Measuring behind the scenes keeps the content
    /// intrinsic-sized so the system vertically centres it itself.
    @State private var slotWidth: CGFloat = 400
    var body: some View {
        Link(destination: context.state.mapsURL) {
-            ViewThatFits(in: .horizontal) {
+            Group {
-                // rich first — wins on full-width Lock Screen / banner
+                // Branch on the ACTUAL proposed width. iPhone/iPad offer the
-                richBody
+                // full Lock Screen width (>= threshold) → rich card, no matter
-                    // CarPlay / Watch small slot is far narrower than this,
+                // how long the station name is. Truly small slots (CarPlay /
-                    // so ViewThatFits reliably falls through to compactBody.
+                // Watch) offer much less → compact strip.
-                    .frame(minWidth: 280)
+                if slotWidth >= compactWidthThreshold {
-                // compact fallback — the car's small supplemental slot
+                    richBody
-                compactBody
+                } else {
                    compactBody
                }
            }
            // Fill the card width so the background measure reads the real
            // slot, not the intrinsic content width.
            .frame(maxWidth: .infinity)
            // Side-channel width measurement — never the layout container.
            .background(
                GeometryReader { geo in
                    Color.clear
                        .onAppear { slotWidth = geo.size.width }
                        .onChange(of: geo.size.width) { _, w in slotWidth = w }
                }
            )
        }
    }
    /// Full three-column design (unchanged): brand glyph · fuel+station · price.
    private var richBody: some View {
        HStack(spacing: 12) {
-            // LEFT — station brand glyph
+            // LEFT — station brand glyph: the fuel-tinted pump on its own. No
-            Image(systemName: "fuelpump.circle.fill")
+            // background circle behind it (user request).
-                .font(.system(size: 32))
+            Image(systemName: "fuelpump.fill")
-                .foregroundStyle(.green, .white)
+                .font(.system(size: 28, weight: .semibold))
                .foregroundStyle(context.state.fuel.tintColor)
                .frame(width: 40, height: 40)
            // MIDDLE — fuel + station
@@ -90,6 +128,8 @@ private struct FuelBoardLiveActivityView: View {
                    .font(.subheadline)
                    .foregroundStyle(.secondary)
                    .lineLimit(1)
                    .minimumScaleFactor(0.75)
                    .truncationMode(.tail)
            }
            .frame(maxWidth: .infinity, alignment: .leading)
@@ -106,16 +146,15 @@ private struct FuelBoardLiveActivityView: View {
        .padding()
    }
-    /// Minimal strip for the small CarPlay / Watch Smart Stack slot:
+    /// Minimal strip for small space (CarPlay small / Watch smart stack):
-    /// glyph + fuel left, bold price right, truncated station below.
+    /// fuel type + bold price on one line, station · distance below.
    /// Deliberately no app name and no "Tap for directions" — CarPlay is
    /// display-only, and the user's asks here are just fuel + price + distance.
    private var compactBody: some View {
        VStack(alignment: .leading, spacing: 3) {
            HStack(spacing: 5) {
                Image(systemName: "fuelpump.fill")
                    .font(.caption2)
                    .foregroundStyle(.green)
                Text(context.state.fuel.displayName)
-                    .font(.caption2.weight(.semibold))
+                    .font(.caption.bold())
                    .lineLimit(1)
                Spacer(minLength: 4)
                FuelStore.priceTextAttributed(context.state.pricePence,
@@ -123,10 +162,12 @@ private struct FuelBoardLiveActivityView: View {
                                               size: 15, weight: .bold)
                    .lineLimit(1)
            }
-            Text(context.state.stationName)
+            Text("\(context.state.stationName) · \(context.state.distanceText)")
                .font(.system(size: 9))
                .foregroundStyle(.secondary)
                .lineLimit(1)
                .minimumScaleFactor(0.7)
                .truncationMode(.tail)
        }
        .padding(8)
    }
@@ -216,10 +216,18 @@ enum FuelHistoryStore {
    // MARK: Network
    /// The mirror pointer — used for the empty-state hint ("first snapshot
-    /// landed …"). Non-fatal: nil just means no hint.
+    /// landed …"). Non-fatal: nil just means no hint. Deliberately bypasses
-    static func fetchLatest(base: URL = mirrorBase,
+    /// the HTTP cache (reloadIgnoringLocalCacheData) so an OFFLINE fetch
    /// really fails instead of silently re-serving a cached pointer as a
    /// success — otherwise "no network" would look like fresh data and the
    /// offline banner would never fire. A short timeout surfaces the failure
    /// (and the banner) quickly on a connected-but-dead network.
    static func fetchLatest(base: URL = mirrorBase, timeout: TimeInterval = 10,
                            session: URLSession = .shared) async -> MirrorLatest? {
-        guard let (data, response) = try? await session.data(from: latestFileURL(base: base)),
+        var req = URLRequest(url: latestFileURL(base: base))
        req.cachePolicy = .reloadIgnoringLocalCacheData
        req.timeoutInterval = timeout
        guard let (data, response) = try? await session.data(for: req),
              (response as? HTTPURLResponse)?.statusCode == 200,
              let latest = try? JSONDecoder().decode(MirrorLatest.self, from: data) else {
            return nil
@@ -89,7 +89,7 @@ struct FuelPriceWidgetContent: View {
                FuelStore.priceTextAttributed(price, size: 26, weight: .bold, color: .green)
            }
            if let location = entry.location {
-                Text(entry.unit.format(station.distanceKM(to: location.lat, lng2: location.lng)) + " away")
+                Text(entry.unit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)) + " away")
                    .font(.caption2)
                    .foregroundStyle(.secondary)
            } else {
@@ -148,7 +148,7 @@ struct FuelPriceWidgetContent: View {
                .font(.caption.weight(.semibold))
                .lineLimit(1)
            if let location = entry.location {
-                Text(entry.unit.format(station.distanceKM(to: location.lat, lng2: location.lng)))
+                Text(entry.unit.format(FuelStore.displayDistanceKM(station: station, userLat: location.lat, userLng: location.lng)))
                    .font(.caption2)
                    .foregroundStyle(.secondary)
            }
@@ -8,6 +8,7 @@
 //   keychain → app-group defaults → fallback.
 import Foundation
 import SwiftUI
 import Security
 #if canImport(AppIntents)
 import AppIntents
@@ -31,6 +32,16 @@ struct FavouriteEntry: Identifiable, Codable, Equatable {
    var id: String { "\(fuel.rawValue)|\(station.id)" }
 }
 /// Persisted baseline for the per-fuel cheapest-favourite price-drop alert.
 /// Stored separately from the favourites list so refresh-time comparison can
 /// survive app relaunches without immediately alerting on first fetch.
 struct FavouriteAlertSnapshot: Codable, Equatable {
    let fuel: FuelType
    let stationID: String
    let stationName: String
    let price: Double
 }
 enum SortMode: String, Codable, CaseIterable, Identifiable {
    case cheapest
    case closest
@@ -89,6 +100,20 @@ enum FuelType: String, Codable, CaseIterable, Identifiable {
    }
 }
 /// Fuel colour wheel (user-chosen palette): green = unleaded (#30D158),
 /// yellow = premium (#FFD60A), cyan = diesel (#64D2FF). Lives here in Shared
 /// so the app, widget, and Live Activity all tint the pump/fuel glyphs from one
 /// definition.
 extension FuelType {
    var tintColor: Color {
        switch self {
        case .e10: return Color(red: 48/255.0, green: 209/255.0, blue: 88/255.0)      // #30D158
        case .e5: return Color(red: 255/255.0, green: 214/255.0, blue: 10/255.0)      // #FFD60A
        case .diesel: return Color(red: 100/255.0, green: 210/255.0, blue: 255/255.0) // #64D2FF
        }
    }
 }
 #if canImport(AppIntents)
 extension FuelType: AppEnum {}
 #endif
@@ -232,21 +257,37 @@ struct FuelStation: Identifiable, Codable, Equatable {
    var brandImageName: String? {
        let raw = brand.uppercased()
        let known: [(String, String)] = [
            ("CIRCLE K", "brand_circle_k"),
            ("MAXOL", "brand_maxol"),
            ("SPAR", "brand_spar"),
            ("SHELL", "brand_shell"),
            ("SAINSBURY", "brand_sainsburys"),
            ("MORRISONS", "brand_morrisons"),
            ("APPLEGREEN", "brand_applegreen"),
            ("TESCO", "brand_tesco"),
            ("TEXACO", "brand_texaco"),
            ("ESSAR", "brand_essar"),
            ("ESSO", "brand_esso"),
            ("ASDA", "brand_asda"),
            ("GULF", "brand_gulf"),
            ("VALERO", "brand_valero"),
            ("WELCOME BREAK", "brand_welcome_break"),
            ("THE CO-OPERATIVE", "brand_the_co_operative"),
            ("CO-OPERATIVE", "brand_the_co_operative"),
            ("CO OPERATIVE", "brand_the_co_operative"),
            ("CO-OP", "brand_the_co_operative"),
            ("CO OP", "brand_the_co_operative"),
            ("MURCO", "brand_murco"),
            ("GLEANER", "brand_gleaner"),
            ("HIGHLAND FUELS", "brand_highland_fuels"),
            ("BP", "brand_bp"),
            ("JET", "brand_jet"),
        ]
        for (needle, asset) in known where raw.contains(needle) {
            return asset
        }
        if raw.contains("EG ON THE MOVE") { return "brand_esso" }
        if raw == "GO" || raw.contains("GO FORECOURT") || raw.contains("GO FUEL") { return "brand_gulf" }
        return nil
    }
 }
@@ -318,6 +359,9 @@ struct FuelStore {
    static let alertsRadiusKey = "fuelboard.alertsRadius"   // Double km
    static let alertsFuelKey = "fuelboard.alertsFuel"       // FuelType raw value
    static let alertsFollowSearchKey = "fuelboard.alertsFollowSearch"  // Bool — alerts mirror the Stations-tab distance
    static let favouriteDropAlertsEnabledKey = "fuelboard.favouriteDropAlertsEnabled" // Bool
    static let favouriteDropAlertsFuelKey = "fuelboard.favouriteDropAlertsFuel" // FuelType raw value
    static let favouriteAlertSnapshotsKey = "fuelboard.favouriteAlertSnapshots" // [fuel: FavouriteAlertSnapshot] JSON
    static let liveActivityFollowSearchKey = "fuelboard.liveActivityFollowSearch" // Bool — Live Activity mirrors the Stations-tab distance
    static let debugModeKey = "fuelboard.debugMode"         // Bool — hidden dev flag
    static let relayFallbackKey = "fuelboard.relayFallback" // Bool — dev-only relay fallback
@@ -627,6 +671,24 @@ struct FuelStore {
        }
    }
    /// The cheapest favourite for one fuel, preserving the user's stored order
    /// on price ties. Used by the favourite price-drop alert so a tie does not
    /// flap between equally-priced favourites.
    static func cheapestFavourite(in favourites: [FavouriteEntry], fuel: FuelType) -> FavouriteEntry? {
        var best: FavouriteEntry?
        for entry in favourites where entry.fuel == fuel {
            guard let price = entry.station.prices[fuel] else { continue }
            guard let current = best, let currentPrice = current.station.prices[fuel] else {
                best = entry
                continue
            }
            if price < currentPrice {
                best = entry
            }
        }
        return best
    }
    /// Reorders ONE fuel's favourites within the global array (drag-and-drop in
    /// the Favourites tab). The moved fuel's block stays at its original
    /// position in the array; other fuels keep their relative order. The array
@@ -710,6 +772,48 @@ struct FuelStore {
        saveString(enabled ? "1" : "0", service: alertsFollowSearchKey)
    }
    // MARK: Favourite price-drop alerts
    static func loadFavouriteDropAlertsEnabled() -> Bool {
        loadString(service: favouriteDropAlertsEnabledKey) == "1"
    }
    static func saveFavouriteDropAlertsEnabled(_ enabled: Bool) {
        saveString(enabled ? "1" : "0", service: favouriteDropAlertsEnabledKey)
    }
    static func loadFavouriteDropAlertsFuel() -> FuelType {
        if let raw = loadString(service: favouriteDropAlertsFuelKey), let fuel = FuelType(rawValue: raw) {
            return fuel
        }
        return .e10
    }
    static func saveFavouriteDropAlertsFuel(_ fuel: FuelType) {
        saveString(fuel.rawValue, service: favouriteDropAlertsFuelKey)
    }
    static func loadFavouriteAlertSnapshots() -> [FuelType: FavouriteAlertSnapshot] {
        if let data = keychainData(service: favouriteAlertSnapshotsKey),
           let stored = try? JSONDecoder().decode([String: FavouriteAlertSnapshot].self, from: data) {
            var result: [FuelType: FavouriteAlertSnapshot] = [:]
            for (key, value) in stored {
                if let fuel = FuelType(rawValue: key) {
                    result[fuel] = value
                }
            }
            return result
        }
        return [:]
    }
    static func saveFavouriteAlertSnapshots(_ snapshots: [FuelType: FavouriteAlertSnapshot]) {
        let keyed = Dictionary(uniqueKeysWithValues: snapshots.map { ($0.key.rawValue, $0.value) })
        if let data = try? JSONEncoder().encode(keyed) {
            writeKeychain(data: data, service: favouriteAlertSnapshotsKey)
        }
    }
    // MARK: Live Activity
    static func loadLiveActivityEnabled() -> Bool {
@@ -830,15 +934,127 @@ struct FuelStore {
    }
    // MARK: Onboarding — the app shows the intro screen on first launch only
-    // (a test button in the Alerts tab re-opens it). Stored in the app group
+    // (a test button in the Alerts tab re-opens it). Stored KEYCHAIN-FIRST
-    // so the widget can see it too if ever needed.
+    // (with an app-group mirror) for the same reason as favourites/distance
    // unit: free SideStore accounts don't provision the app-group container,
    // so an app-group-only flag silently fails to save AND reloads as false,
    // making onboarding re-appear on every launch. Keychain survives reinstall
    // and is shared with the extension.
    static func loadHasCompletedOnboarding() -> Bool {
-        UserDefaults(suiteName: appGroupSuite)?.bool(forKey: onboardingCompletedKey) ?? false
+        (loadString(service: onboardingCompletedKey) ?? "0") == "1"
    }
    static func saveHasCompletedOnboarding(_ completed: Bool) {
-        UserDefaults(suiteName: appGroupSuite)?.set(completed, forKey: onboardingCompletedKey)
+        saveString(completed ? "1" : "0", service: onboardingCompletedKey)
    }
    // MARK: Install identity — distinguish a genuinely fresh install (where
    // onboarding should replay) from later launches of the same install.
    /// Keychain copy of the install id (survives reinstall).
    private static let installIDKey = "fuelboard.installID"
    /// Local (app-own container) copy — wiped on reinstall, persists across
    /// normal launches. Free SideStore accounts have no app-group container,
    /// so this app-own defaults domain is the reliable "same install" signal.
    private static let localInstallIDKey = "fuelboard.installID.local"
    /// True when this is a first-ever install OR the app was just reinstalled
    /// (local install id missing/different from the keychain id). Seeds a fresh
    /// id into both stores so the next launch within the same install is not a
    /// "fresh install" any more.
    static func isFreshInstall() -> Bool {
        let local = UserDefaults.standard.string(forKey: localInstallIDKey)
        let remote = loadString(service: installIDKey)
        if let local, let remote, local == remote { return false }
        // Fresh / mismatched install (or first launch). Pattern a common id so
        // subsequent launches of this install are recognised as the same one.
        let id = UUID().uuidString
        UserDefaults.standard.set(id, forKey: localInstallIDKey)
        saveString(id, service: installIDKey)
        return true
    }
    /// Onboarding should present when it hasn't been completed in this install
    /// OR this is a freshly-installed app (so the walkthrough replays on a new
    /// install, e.g. after a SideStore reinstall, without re-showing on every
    /// ordinary launch). The install check always runs (it seeds the id) rather
    /// than short-circuiting, so a brand-new install is recorded before the
    /// user ever fills in onboarding.
    static func shouldShowOnboarding() -> Bool {
        let fresh = isFreshInstall()
        return !loadHasCompletedOnboarding() || fresh
    }
    // MARK: Road distances (Apple-Maps-matched, computed by the app)
    /// Cached road/routed distances (metres) keyed by station ID, computed by
    /// the app via MapKit `MKDirections`. Stored in KEYCHAIN (survives on free
    /// SideStore accounts where the app-group container isn't provisioned) so
    /// the widget extension can read it too. Widget + Live Activity prefer
    /// these over straight-line haversine for the displayed distance.
    static let roadDistancesKey = "fuelboard.roadDistances"
    /// How far (metres) the cache's source location may be from the current
    /// user position before a cached road distance is treated as stale.
    static let roadDistanceOriginToleranceMeters: Double = 600
    /// How far (degrees) a station's stored coordinate may drift from the pin
    /// a road distance was actually routed to before that cached value is
    /// treated as belonging to a different station. Guards against one data
    /// source (live fetch, bundled offline dump, or a corrected pin) serving a
    /// road distance that was computed for a different coordinate under the
    /// same station ID. ~1e-4 deg ≈ 11 m — tolerates float/rounding jitter but
    /// catches any real pin change.
    static let roadDistancePinToleranceDegrees: Double = 1e-4
    static func saveRoadDistances(sourceLat: Double, sourceLng: Double, entries: [String: CachedRoadDistance]) {
        let cache = RoadDistanceCache(sourceLat: sourceLat, sourceLng: sourceLng,
                                      updatedAt: Date().timeIntervalSince1970, entries: entries)
        if let data = try? JSONEncoder().encode(cache) {
            saveString(data.base64EncodedString(), service: roadDistancesKey)
        }
    }
    static func loadRoadDistances() -> RoadDistanceCache? {
        guard let raw = loadString(service: roadDistancesKey),
              let data = Data(base64Encoded: raw),
              let cache = try? JSONDecoder().decode(RoadDistanceCache.self, from: data)
        else { return nil }
        return cache
    }
    /// Cached road distance (metres) to a station from the user's location, or
    /// nil when not cached / the cache was built too far from where the user
    /// is now / the station's own pin doesn't match the coordinate that was
    /// routed.
    static func roadDistanceMeters(for station: FuelStation, userLat: Double, userLng: Double) -> Double? {
        guard let cache = loadRoadDistances(),
              let entry = cache.entries[station.id] else { return nil }
        // The cache is only valid near the location it was built from.
        let dLat = (userLat - cache.sourceLat) * .pi / 180
        let dLng = (userLng - cache.sourceLng) * .pi / 180
        let r = 6371000.0
        let a = sin(dLat / 2) * sin(dLat / 2) +
                cos(cache.sourceLat * .pi / 180) * cos(userLat * .pi / 180) *
                sin(dLng / 2) * sin(dLng / 2)
        let originDistanceMeters = r * 2 * atan2(sqrt(a), sqrt(1 - a))
        guard originDistanceMeters <= roadDistanceOriginToleranceMeters else { return nil }
        // Pin fingerprint: never serve a routed value for a coordinate we
        // didn't actually route to. This is the guard that keeps embedded /
        // live / cached station sets from injecting each other's road metres.
        guard abs(entry.lat - station.lat) <= roadDistancePinToleranceDegrees,
              abs(entry.lng - station.lng) <= roadDistancePinToleranceDegrees else { return nil }
        return entry.meters
    }
    /// Distance (km) to display for a station: cached ROAD distance when
    /// available (matches Apple Maps), else straight-line haversine.
    static func displayDistanceKM(station: FuelStation, userLat: Double, userLng: Double) -> Double {
        if let meters = roadDistanceMeters(for: station, userLat: userLat, userLng: userLng) {
            return meters / 1000.0
        }
        return station.distanceKM(to: userLat, lng2: userLng)
    }
    // MARK: Low-level keychain helpers
@@ -900,3 +1116,23 @@ struct FuelStore {
        loadString(service: "widget.diag.\(intentType)")
    }
 }
 /// Cached Apple-Maps road distances for nearby stations (see
 /// A single cached road distance plus the station pin it was routed to. Keeping
 /// the pin lets `roadDistanceMeters` refuse to serve a route computed for a
 /// *different* coordinate under the same ID — the guard that stops embedded /
 /// live / cached station sets cross-contaminating the distance display.
 struct CachedRoadDistance: Codable {
    let meters: Double
    let lat: Double
    let lng: Double
 }
 /// `FuelStore.roadDistancesKey`). `entries` maps stationID → road metres +
 /// the routed pin.
 struct RoadDistanceCache: Codable {
    let sourceLat: Double
    let sourceLng: Double
    let updatedAt: TimeInterval
    let entries: [String: CachedRoadDistance]
 }
@@ -96,9 +96,13 @@ struct MirrorFuelProvider: FuelPriceProviding {
        if Self.canReuseCache(cachedDay: cache?.day, latestDay: day), let cached = cache?.data {
            data = cached
        } else {
-            let (fetched, response) = try await URLSession.shared.data(
+            // Bypass the HTTP cache + short timeout: an offline refresh must
-                from: FuelHistoryStore.historyFileURL(day: day, base: baseURL)
+            // FAIL (→ offline banner), never re-serve a stale cached dump as
-            )
+            // a "successful" live fetch.
            var req = URLRequest(url: FuelHistoryStore.historyFileURL(day: day, base: baseURL))
            req.cachePolicy = .reloadIgnoringLocalCacheData
            req.timeoutInterval = 10
            let (fetched, response) = try await URLSession.shared.data(for: req)
            guard (response as? HTTPURLResponse)?.statusCode == 200 else {
                throw FuelProviderError.mirrorUnavailable
            }
Author	SHA1	Message	Date
FuelBoard Contributor	98cf3a5736	Git: ignore build-watch output	2026-08-28 16:35:32 +01:00
FuelBoard Contributor	ed41df46de	siri: drop generic shortcut and broaden fuel-word phrases Siri was hit-and-miss on 'unleaded near me' (\u2018can't do that, searching in app\u2019 fallback). The generic parameterized AppShortcut ('cheapest ${fuel}') competed with the fixed-fuel literal-word shortcuts for the same intent, degrading NLU ranking; it was already documented as flaky. Remove it (now 9 shortcuts, under the 10 cap) and add natural phrase variants for unleaded/petrol ('What's the cheapest unleaded near me', 'Cheapest unleaded near me', 'Where's the cheapest petrol'). All phrases keep .applicationName per the iOS 26 metadata requirement. Build-verified in extract.actionsdata: generic gone, new phrases registered.	2026-08-20 19:27:34 +01:00
FuelBoard Contributor	9342ccc7c9	trends: redraw lines on 7/30/90 selection Callers previously morphed the existing lines on a reload, so picking a new range only glided in place. Now every range/fuel selection (the only reloads; the sheet has no periodic refetch) replays the staggered per-series draw-in via revealSeries(), so the lines visibly redraw left->right when the user switches 7/30/90. Price<->vs-cheapest still morphs (pure view toggle, no reload). Reduce Motion jump-cuts.	2026-08-20 18:49:54 +01:00
FuelBoard Contributor	508ccc3802	trends: staggered per-series line draw-in The single-waterline trace-in was invisible with sparse data (2 points draw in one step). Replace it with a per-series waterline: each station's line now traces left->right on first appearance, series revealed 0.18s apart in a cascade so the draw is clearly visible. Newly-added favourites get a full reveal immediately on reload; Reduce Motion still jump-cuts. Range/mode morphs and numeric headline transition unchanged.	2026-08-20 18:40:09 +01:00
FuelBoard Contributor	69c3c17606	trends: animate the price-history lines (subtle, Reduce-Motion aware) - Reloads (range/fuel switch, Price<->vs-cheapest) now glide the existing lines + y-axis to the new data via withAnimation/.animation(value: mode) instead of snapping. - One-time left->right trace-in on first data appearance by revealing an increasing prefix of each series' points (area + line stay in sync); later switches morph rather than re-trace. - Headline average rolls its digits with .contentTransition(.numericText). - All animation honours .accessibilityReduceMotion (jump-cut to final state). Kept two-pass area/line ordering, explicit series:, bounded fill bands, and tight chartYScale unchanged.	2026-08-20 17:54:55 +01:00
FuelBoard Contributor	0b27d3d4f6	road distance: pin-fingerprint guard so embedded/live/cached never cross-pollute The road-distance cache was keyed purely by station ID with no coordinate, so a value routed to one pin could be served for a same-ID station whose stored coordinate came from a different source (live fetch vs bundled offline dump vs a corrected pin), reproducing Maps mismatches. - RoadDistanceCache now stores each routed pin (CachedRoadDistance{meters, lat, lng}) and roadDistanceMeters() only serves a value when the displayed station's coordinate matches the pinned one (within ~11 m). - Kept the existing origin-distance staleness guard. - Verified embedded sample data (ids y1/se1/...) never collides with real relay IDs, and the widget STRICT radius filter drops far-offline samples, so no actual leak existed in practice — this closes the theoretical stale-pin channel and future-proofs against coordinate fixes.	2026-08-20 17:26:33 +01:00
FuelBoard Contributor	01517ba687	onboarding: replay on a fresh/reinstalled install, not every launch The keychain-first completed flag persists across reinstalls (same bundle id), so a new install was treated as already-completed and onboarding silently skipped while permissions still prompted. Add install identity: - Store an install id in BOTH the app-own container defaults (wiped on reinstall, persists across launches) and keychain (survives reinstall). - isFreshInstall() is true on first-ever launch or when the local id is missing/different from keychain (i.e. reinstalled); it seeds a fresh common id so the next launch of the same install is not 'fresh' again. - shouldShowOnboarding() = not completed \|\| fresh install -> onboarding now replays once per fresh/reinstall, never on ordinary launches. Works on free SideStore (no app-group), using the app's own defaults domain as the same-install signal.	2026-08-20 13:12:53 +01:00
FuelBoard Contributor	d73a64023f	road distance: trigger at launch + foreground, fall back to saved location Road-distance routing previously only fired once a fresh GPS fix arrived via the location hook/onChange. A returning user on a cold launch waited for that fix, and if onboarding/flag issues kept tracking from starting, distances stayed straight-line. Now: - refreshRoadDistancesIfNeeded() uses the last saved location when the live fix isn't set yet, so it can run immediately. - It's called explicitly on launch (already-onboarded branch), on foreground activation, and on the existing location paths.	2026-08-20 12:56:16 +01:00
FuelBoard Contributor	dc6d1fd724	Merge branch 'fix/onboarding-persistence' into test/road-onboarding	2026-08-20 12:50:38 +01:00
FuelBoard Contributor	10e3b54d0c	onboarding: persist completed flag keychain-first so it doesn't re-show The completed flag lived only in app-group UserDefaults (UserDefaults(suiteName: appGroupSuite)). On free SideStore accounts the app-group container isn't provisioned, so the suite read as nil: save was a silent no-op and load always returned false -> onboarding re-appeared on every launch even after finishing and granting all permissions. Switch to saveString/loadString (keychain-first, app-group mirror) under onboardingCompletedKey, matching favourites/distance-unit persistence which survives reinstall and works without a provisioning group. loadString falls back to the app-group mirror, so anyone who previously completed on a provisioned group keeps their flag; users on unprovisioned groups complete once more and then it sticks.	2026-08-20 12:27:09 +01:00
FuelBoard Contributor	90fb3b7385	road distance: cover all in-radius stations, not just nearest 12 Stations past the nearest-12 cutoff silently fell back to straight-line, which explained the remaining app-vs-Apple-Maps gaps (e.g. 3.5 straight-line vs 5.9 road). Raise the per-pass cap to 40 and route every station within a 25 km straight-line radius (covers the 15 mi max search window) so any station the widget/Live Activity/list can show gets a real road distance. Also harden the new cache tests against persistent keychain state across invocations (reset in setUp) so they pass deterministically.	2026-08-20 11:54:23 +01:00
FuelBoard Contributor	64ef260959	widget + live activity: prefer Apple-Maps road distance, computed by the app The widget/Live Activity showed straight-line haversine distance (0.8 mi) while Apple Maps routes 1.8 mi. Road routing is too heavy for the widget execution + ~40-70/day refresh budget, so the APP now computes it: - New RoadDistanceService (app target): for the nearest 12 stations each pass, calls MapKit MKDirections (free, no API key, matches Apple Maps) and caches metres keyed by station ID. - Cache stored in KEYCHAIN (fuelboard.roadDistances) so the widget reads it even on free SideStore accounts with no app-group container; only valid within 600 m of the location it was built from. - Throttled: recompute max every 10 min, or when the user moves > 400 m; wired into the location-update hook + location onChange. - Widget face, app station rows + Live Activity show the cached road distance, falling back to straight-line when absent. - 4 new cache tests (105 total).	2026-08-20 11:33:47 +01:00
FuelBoard Contributor	28bb245c93	live activity: fix vertical centering on lock screen GeometryReader as the layout root pinned content top-left, and forcing maxHeight:.infinity over-claimed the whole proposed height, centring the content below true vertical centre (bigger gap above) on the Lock Screen. Demote GeometryReader to a background side-channel that only measures the slot width for the rich-vs-compact branch; the content stays intrinsic-sized so the system vertically centres it itself.	2026-08-20 10:16:21 +01:00
FuelBoard Contributor	d8412c132a	live activity: remove the white/grey background circle behind the pump User: 'Remove the white background circle from the live activity'. Drop the explicit Circle badge and render the fuel-tinted fuelpump.fill on its own (sized up 19 -> 28 since it no longer sits inside a disc).	2026-08-19 22:52:50 +01:00
FuelBoard Contributor	1d62204a7a	live activity: explicit badge (dark circle + bright pump); fix alignment look fuelpump.circle.fill's first hierarchical style hits the PUMP, not the circle, so the earlier darkened colour landed on the pump and the circle stayed white (user: 'I didn't want the fuel pump darker I wanted the white circle darker'). Rebuild the brand glyph from two explicit shapes: a light-grey (.86) Circle badge + a bright fuel-tinted fuelpump.fill, so circle vs pump colours are unambiguous and the badge centres cleanly with the two-line text block. Add a DEBUG-only -qaLiveActivity <fuel> launch hook that starts a Live Activity with a long station name so the Lock Screen can be rendered in the Simulator and verified by pixels (pump bright green 43,193,81; badge grey 202,201,202).	2026-08-19 22:46:57 +01:00
FuelBoard Contributor	bdfbbc605f	live activity: centre content vertically + darken pump circle A GeometryReader hands its content the full proposed frame and pins it top-left, so the Lock Screen card sat high instead of vertically centred when the activity container offered extra height. Wrap the branch in .frame(maxWidth:.infinity, maxHeight:.infinity, alignment:.center). Also darken the pump circle to 82% of the raw fuel tint (mix 18% black) so the white pump symbol keeps contrast against bright Lock Screen/card, esp. for the light yellow premium / cyan diesel palette colours.	2026-08-19 22:26:37 +01:00
FuelBoard Contributor	2c6e63f6b1	live activity: tint pump glyph by monitored fuel Move FuelType.tintColor (green=unleaded #30D158, yellow=premium #FFD60A, cyan=diesel #64D2FF) into Shared/FuelStore.swift so the app, widget, and Live Activity all read one definition (was app-only in StationsView, so the widget couldn't see it). Tint the Live Activity rich card pump icon and the Dynamic Island compactLeading pump by context.state.fuel.tintColor.	2026-08-19 22:18:56 +01:00
FuelBoard Contributor	a6620d36f7	live activity: select rich vs compact by actual GeometryReader width ViewThatFits measures each child's IDEAL (untruncated) width to decide fit, and a flexible .frame(maxWidth:.infinity) middle column does not cap that ideal — so a long station name (e.g. 5-mi Phoenix Filling Stations) inflated richBody's ideal past the iPhone Lock Screen width and fell back to the compact strip. Replace the ViewThatFits branch with a GeometryReader that reads the ACTUAL proposed width and shows the full three-column card at/above 280pt, compact below. Content-independent, so a long name can no longer collapse the iPhone card.	2026-08-19 22:08:07 +01:00
FuelBoard Contributor	227cce4aa6	live activity: fix compact strip string interpolation (double backslash) The compact CarPlay/Watch strip's second line had escaped interpolation (\\( instead of \\() so it rendered the literal placeholder text "context.state.stationName · context.state.distanceText" instead of the actual station name and distance. Normalize to single-backslash interpolation.	2026-08-19 20:01:14 +01:00
FuelBoard Contributor	01bb3ba905	live activity: compact CarPlay strip shows fuel + price + station distance Restore .supplementalActivityFamilies([.small]) + a ViewThatFits compact fallback so CarPlay's small slot renders our shared compact strip (fuel type, bold price, station · distance) instead of falling back to the Dynamic Island compact closure, which showed the app name and omitted the distance the user wants. Full iPhone/iPad card is preserved via the richMinWidth gate on richBody plus its flexible, truncating middle column (long names can no longer collapse it).	2026-08-19 18:31:36 +01:00
FuelBoard Contributor	5d26509034	live activity: always render full card (drop compact fallback) Long station names inflated richBody's IDEAL width, so ViewThatFits (which measures ideal, untruncated text) decided 'rich doesn't fit' and fell back to the compact strip — that's why 5-mi / long-named activities rendered small while 10-15-mi / short names stayed full. With .supplementalActivityFamilies already removed, the body is only ever Lock-Screen width, so drop ViewThatFits and compactBody entirely and always render the full three-column card; the station caption line-limits + scale-downs + tail-truncates in place.	2026-08-19 16:39:49 +01:00
FuelBoard Contributor	221b96097d	live activity: drop .small family so iPhone/iPad show full-width card The active activity was rendering the narrow .small form on the iPhone Lock Screen (squeezed, small text) because .supplementalActivityFamilies([.small]) made iOS eligible to present it that way. Remove it so iPhone/iPad always get the full three-column card; CarPlay's small form still comes from the Dynamic Island compact closures. Keep compactBody as a narrow-width safety fallback.	2026-08-19 16:09:02 +01:00
FuelBoard Contributor	b012232012	live activity: robust full-vs-compact split; scale long station names The adaptive layout picks the full three-column view when there's Lock Screen width and a compact price strip in the small CarPlay/Watch slot. Tighten the discriminant (rich ≥290pt, compact ≤220pt) so iPhone/iPad always get the full view and only genuinely small slots get the compact strip. Long station names used to clip at inconsistent points across the rich/compact/Dynamic Island views; both bodies now scale + tail- truncate so the caption stays consistent regardless of station name.	2026-08-19 13:58:54 +01:00
FuelBoard Contributor	727ef6e58f	banner: explicit opacity fade (transitions were unreliable) SwiftUI's removal transition never actually played despite .id keying — the tip banner vanished instantly on dismiss. Replace it with explicit opacity/ offset driven by withAnimation in reflectBanner (gated by a .task(id: activeBanner) so presentation is reliable and prompt): a dismissal now fades out + slides up over 0.35s, and a tip→network swap crossfades. Uses the same state-driven pattern that fixed the HermesCall ticker fades.	2026-08-19 11:57:32 +01:00
FuelBoard Contributor	4c222cdf55	banner: key by value so tip fades out on dismiss The banner sits in a single if-let slot; without an identity key, clearing a tip that was covering a network/offline banner swapped content in place with no transition (instantly vanishing). Keying the banner by its value (.id) makes every change — tip→network or tip→nil — run the shared removal transition, so the tip slides up and fades out when it auto-dismisses or is tapped.	2026-08-19 11:10:29 +01:00
FuelBoard Contributor	cfd435d12a	banner: top-floating; fix offline-trigger cache; onboarding prompt timing - Banner floats at the very top (over the nav/title area), never pushing the content below and staying clear of the list/pill. - Offline banner now fires on refresh in airplane mode / no data: the mirror live chain bypassed the HTTP cache (+10s timeout) so an offline fetch really fails instead of silently re-serving a cached pointer+dump as a 'success' (which kept dataStatus .live and hid the banner). - Onboarding permissions fire at the Continue/Allow tap BEFORE advancing, so the system prompt appears after the page is read and never covers the next page's animation (grant auto-advances).	2026-08-19 10:17:24 +01:00
FuelBoard Contributor	8936643e0e	banner: float below nav bar (no glass pass-through) + slide-up dismiss Position the floating banner just below the nav bar so it no longer overlays the iOS 26 Liquid Glass back/toolbar chrome behind it — tapping retry can no longer also select the control beneath. Banner now slides up + fades on dismiss/timeout (one style for all notifications); full-rect contentShape for a solid tap target.	2026-08-19 08:43:35 +01:00
FuelBoard Contributor	ba83f9e1c0	banner: unify network+tip into ONE floating overlay (never layout-shifting) Extract AppBanner; render offline/connection/tip through the single statusBannerCard chrome as a ZStack top overlay so it floats over content instead of shifting layout. Tip (auto-dismiss ~3.5s) takes precedence over network state.	2026-08-19 08:17:50 +01:00
FuelBoard Contributor	57dffb6c5e	tip: show outcome in the shared status banner (auto-dismiss) Tip purchase results now ride the SAME banner chrome as the network/offline strip above the tabs instead of a hard-to-see Settings footnote. TipStore is lifted to ContentView (the banner owner) and shared down to Settings. Each outcome maps to an icon/tint; auto-dismisses after ~3.5 s; tap to dismiss. Renderer refactored into a shared statusBannerCard(icon:tint:title:subtitle: trailingIcon:action:) used by both the network strip (retry) and tips (x).	2026-08-19 07:48:10 +01:00
FuelBoard Contributor	2205a585f1	onboarding: animated feature icons	2026-08-19 07:09:54 +01:00
FuelBoard Contributor	f9b70dbb9d	anim: consistent bold crossfade in fuel-type picker	2026-08-19 07:09:54 +01:00
FuelBoard Contributor	e00e3ff365	backlog: refine foresight live activity notes	2026-08-18 19:33:54 +01:00
FuelBoard Contributor	4f8bf96ca2	backlog: add foresight live activity investigation	2026-08-18 18:15:33 +01:00
FuelBoard Contributor	8945190da5	fix: keep live activity in sync with motion	2026-08-18 17:59:03 +01:00
FuelBoard Contributor	2e23dcb9ae	ui: keep station brand badges white	2026-08-18 12:56:49 +01:00
FuelBoard Contributor	db916cafcb	ui: fix fallback station badge visibility	2026-08-18 12:47:49 +01:00
FuelBoard Contributor	1dd7836b8b	assets: expand station brand icon coverage	2026-08-18 12:35:03 +01:00
FuelBoard Contributor	e512cec958	data: refresh bundled fuel dump	2026-08-18 11:05:09 +01:00
FuelBoard Contributor	dcd5517825	Live Activity: add distance to compact CarPlay layout	2026-08-18 10:00:19 +01:00
FuelBoard Contributor	cd2632377a	Expand watch app backlog	2026-08-17 20:23:20 +01:00
FuelBoard Contributor	f1c5923c88	Add favourite price-drop Check now action	2026-08-17 19:59:45 +01:00
FuelBoard Contributor	276e0ff99e	Swap Live Activity header and toggle labels	2026-08-17 17:28:14 +01:00
FuelBoard Contributor	bed39956a3	Move cheapest station label to Live Activity header	2026-08-17 17:21:31 +01:00
FuelBoard Contributor	b24b59df6f	Rename Live Activity fuel label	2026-08-17 17:14:51 +01:00
FuelBoard Contributor	2495c7e47e	Finalize alerts tab labels	2026-08-17 16:58:23 +01:00
FuelBoard Contributor	923209b933	Reorder alerts sections and refine labels	2026-08-17 16:53:26 +01:00
FuelBoard Contributor	02ac8540f3	Tweak alerts tab copy	2026-08-17 16:45:55 +01:00
FuelBoard Contributor	6f0fc43085	Add cheapest-favourite price-drop alerts	2026-08-17 16:33:46 +01:00