Bump the build number to 30

29 was used for two different binaries during the listing refinement, so
the next install would have been indistinguishable from the last one.
Raised in all eight configurations — app, widget, watch app and watch
extension, Debug and Release — so the whole bundle reports one number.

BACKLOG.md

@@ -106,6 +106,24 @@ 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).
+- [ ] **Restore Best Value proximity alerts after fixing evaluation parity** —
+  the option is intentionally removed from the Alerts tab and legacy selections
+  fall back to `Cheapest station` until this is implemented. Root cause: the live
+  geofence path calculates journeys from the entered station, making that station
+  its own zero-saving baseline and therefore unable to clear any positive minimum
+  saving, while Test alert calculates from the user's location and can pass.
+  Future implementation must obtain a fresh user fix on region entry; fetch,
+  radius-filter, choose the closest eligible baseline and calculate every journey
+  from that user location; then notify only when the entered station is the best
+  qualifying candidate. Real and Test alerts must call one shared pure evaluator.
+  Apply one disclosed qualification rule everywhere (real alert, Test alert and
+  BEST VALUE badge): remove the live path's hidden extra £0.50 estimate margin,
+  compare the same penny-rounded amount shown to the user while retaining raw
+  precision for ranking, and pass the current threshold explicitly into station
+  rows instead of reading persistence per row. Regression coverage: entered
+  station can qualify, a better nearby candidate blocks it, real/Test parity,
+  exact and display-rounding boundaries, estimated/confirmed parity, immediate
+  threshold changes, and below-threshold rejection.
 - [ ] **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:

FuelBoard.xcodeproj/project.pbxproj

@@ -533,7 +533,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/WatchApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -599,7 +599,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/WatchApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -663,7 +663,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -728,7 +728,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -826,7 +826,7 @@
 				CODE_SIGN_ENTITLEMENTS = Config/App.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/App-Info.plist";
@@ -851,7 +851,7 @@
 				CODE_SIGN_ENTITLEMENTS = Config/App.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/App-Info.plist";
@@ -875,7 +875,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/Widget-Info.plist";
@@ -900,7 +900,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CODE_SIGN_ENTITLEMENTS = Config/Widget.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 30;
 				DEVELOPMENT_TEAM = F3BE6NE7U3;
 				GENERATE_INFOPLIST_FILE = NO;
 				INFOPLIST_FILE = "Config/Widget-Info.plist";

FuelBoard/AlertsView.swift

@@ -6,18 +6,12 @@ import SwiftUI
 /// versa). The Live Activity section also lives here — it mirrors this page's
 /// shape (toggle + fuel + distance) so the two "notify me while driving"
 /// surfaces sit together. Geofence plumbing (count, 18-limit) lives in
-/// Settings → Debug; the user-facing page keeps a plain-language explainer
+/// Settings → Debug; the user-facing page keeps short descriptions of the
-/// plus a 0-stations hint.
+/// cheapest-station rule and radius, plus a 0-stations hint.
 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 alertMode: AlertMode
-    /// Read-only here: the threshold is edited in Settings → Fuel Savings, where
-    /// the fill size and MPG that decide the saving live. Read back so the
-    /// alert's own rule is visible without leaving the tab.
-    let bestValueThresholdGBP: Double
-    let bestValueConfigured: Bool
     @Binding var favouriteDropEnabled: Bool
     @Binding var favouriteDropFuel: FuelType
     /// Whether alerts mirror the Stations-tab search distance (capped at 8 mi).
@@ -55,31 +49,29 @@ struct AlertsView: View {
         return String(format: String(localized: "%lld %@", comment: "Distance label"), shown, distanceUnit.label(for: Double(shown)))
     }
 
-    /// Situational guidance for the currently-selected alert radius, shown
+    /// The distance the geofence actually caps "Follow search" at, in miles
-    /// under the picker so users know what each choice is best for. Labels
+    /// (FuelStore stores the cap in km so the monitor and storage are unit-free).
-    /// mirror the picker row text (unit-aware) and explain the trade-off:
+    private var followSearchCapMiles: Int {
-    /// smaller radii ping more often but later; larger radii ping rarely in
+        Int((FuelStore.alertFollowCapKM / FuelSavingsCalculator.kilometresPerMile).rounded())
-    /// town but earlier from afar.
+    }
-    private var alertRadiusGuidance: String {
+
+    /// The radius the selected option really monitors, stated in the user's
+    /// unit — e.g. "Get alerts when you're within 2 miles of a matching
+    /// station." "Follow search" mirrors the Stations-tab distance, which the
+    /// geofence caps; said plainly, and only when the search distance really
+    /// exceeds the cap, so the sentence never contradicts the picker row.
+    private var alertRadiusDescription: String {
         switch alertChoice.wrappedValue {
         case .followSearch:
-            return String(localized: "Set-and-forget: alerts behave exactly like the Stations-tab search distance (capped at 8 miles for reliable geofencing).", comment: "Alert radius guidance for following search distance")
+            let capped = stationLimit > followSearchCapMiles
-        case .fixed(let value):
+            let label = distanceLabel(forMiles: capped ? followSearchCapMiles : stationLimit)
-            let optionLabel = String(format: String(localized: "%lld %@", comment: "Distance label"), value, distanceUnit.label(for: Double(value)))
+            if capped {
-            let body: String
+                return String(format: String(localized: "Get alerts when you're within %@ of a matching station (your search distance is capped for reliable alerts).", comment: "Proximity alert radius description, follow search capped"), label)
-            switch value {
-            case 1:
-                body = String(localized: "Town driving. Fires most often — you're rarely inside the circle for long, so pings are meaningful. Best for stop-start local trips.", comment: "Alert radius guidance")
-            case 2:
-                body = String(localized: "City or suburb commute. Slightly earlier heads-up than the smallest option; still fires regularly around town.", comment: "Alert radius guidance")
-            case 3:
-                body = String(localized: "Mixed driving. Middle ground: heads-up a few minutes out, still works in most towns.", comment: "Alert radius guidance")
-            case 5:
-                body = String(localized: "A-roads and motorway exits. Wide early warning for longer trips — but in town it rarely fires, because you're usually already inside the circle.", comment: "Alert radius guidance")
-            default:
-                body = String(localized: "Long-distance journeys. Maximum reach: a ping when a cheap station is coming up from far out. In town this essentially never fires.", comment: "Alert radius guidance")
             }
-            return String(format: String(localized: "%@ — %@", comment: "Alert radius guidance with option label"), optionLabel, body)
+            return String(format: String(localized: "Get alerts when you're within %@ of a matching station.", comment: "Proximity alert radius description"), label)
+        case .fixed(let value):
+            let label = String(format: String(localized: "%lld %@", comment: "Distance label"), value, distanceUnit.label(for: Double(value)))
+            return String(format: String(localized: "Get alerts when you're within %@ of a matching station.", comment: "Proximity alert radius description"), label)
         }
     }
 
@@ -136,71 +128,110 @@ struct AlertsView: View {
         )
     }
 
+    /// The radius currently selected, in the user's unit — shown by the disabled
+    /// row in place of the picker.
+    private var alertRadiusValueLabel: String {
+        switch alertChoice.wrappedValue {
+        case .followSearch:
+            return String(format: String(localized: "Follow search (%@)", comment: "Follow current station search distance option"), searchInUnitLabel)
+        case .fixed(let value):
+            return String(format: String(localized: "%lld %@", comment: "Distance label"), value, distanceUnit.label(for: Double(value)))
+        }
+    }
+
+    private var laDistanceValueLabel: String {
+        switch laChoice.wrappedValue {
+        case .followSearch:
+            return String(format: String(localized: "Follow search (%@)", comment: "Follow current station search distance option"), searchInUnitLabel)
+        case .fixed(let miles):
+            return distanceLabel(forMiles: miles)
+        }
+    }
+
+    /// An option row that belongs to a toggle. When the toggle is off the control
+    /// is replaced by a static value row. The enclosing dependent group applies
+    /// FuelBoard's shared disabled interaction and appearance once.
+    @ViewBuilder
+    private func optionRow<Content: View>(_ title: String,
+                                          value: String,
+                                          isEnabled: Bool,
+                                          @ViewBuilder picker: () -> Content) -> some View {
+        if isEnabled {
+            picker()
+        } else {
+            HStack {
+                Text(title)
+                Spacer()
+                Text(value)
+            }
+        }
+    }
+
     var body: some View {
         NavigationStack {
             List {
                 Section {
                     Toggle(String(localized: "Cheapest favourite", comment: "Favourite price-drop alert toggle"), isOn: $favouriteDropEnabled)
+                    Group {
+                        optionRow(String(localized: "Fuel", comment: "Fuel picker title"),
+                                  value: favouriteDropFuel.displayName,
+                                  isEnabled: favouriteDropEnabled) {
                             Picker(String(localized: "Fuel", comment: "Fuel picker title"), selection: $favouriteDropFuel) {
                                 ForEach(FuelType.allCases) { fuel in
                                     Text(fuel.displayName).tag(fuel)
                                 }
                             }
+                        }
                         Button(String(localized: "Check now", comment: "Manual favourite price-drop check button"), action: onCheckFavouriteDropNow)
-                        .disabled(!favouriteDropEnabled)
+                        Text(String(localized: "Get notified when a different favourite becomes the cheapest, or your cheapest favourite drops in price.", comment: "Favourite price alerts section description"))
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                    }
+                    .fuelBoardDisabledState(isEnabled: favouriteDropEnabled)
                 } header: {
-                    Text(String(localized: "Price-drop alerts", comment: "Favourite price-drop alerts section title"))
+                    Text(String(localized: "Favourite price alerts", comment: "Favourite price alerts section title"))
-                } footer: {
-                    Text(String(localized: "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.", comment: "Favourite price-drop alerts section footer"))
                 }
 
                 Section {
                     Toggle(String(localized: "Cheapest station", comment: "Proximity alert toggle"), isOn: $enabled)
-                    Picker(String(localized: "Alert type", comment: "Proximity alert type picker title"), selection: $alertMode) {
+                    Group {
-                        ForEach(AlertMode.allCases.filter { mode in mode != .bestValue || bestValueConfigured }) { mode in
+                        Text(String(localized: "Get notified when you're near one of the cheapest stations for your chosen fuel.", comment: "Cheapest station proximity alert description"))
-                            Text(mode.displayName).tag(mode)
+                            .font(.footnote)
-                        }
-                    }
-                    if !bestValueConfigured {
-                        Text(String(localized: "Set up Best Value first so Best Value alerts can account for your fill size, MPG and travel cost.", comment: "Best Value alert unavailable hint"))
-                            .font(.caption)
                             .foregroundStyle(.secondary)
-                    }
+                        optionRow(String(localized: "Fuel", comment: "Fuel picker title"),
+                                  value: fuel.displayName,
+                                  isEnabled: enabled) {
                             Picker(String(localized: "Fuel", comment: "Fuel picker title"), selection: $fuel) {
                                 ForEach(FuelType.allCases) { fuel in
                                     Text(fuel.displayName).tag(fuel)
                                 }
                             }
+                        }
+                    optionRow(String(localized: "Radius", comment: "Alert radius picker title"),
+                              value: alertRadiusValueLabel,
+                              isEnabled: enabled) {
                         Picker(String(localized: "Radius", comment: "Alert radius picker title"), selection: alertChoice) {
                             Text(String(format: String(localized: "Follow search (%@)", comment: "Follow current station search distance option"), searchInUnitLabel)).tag(AlertRadiusChoice.followSearch)
                             ForEach(FuelStore.alertRadiusOptions, id: \.self) { value in
                                 Text(String(format: String(localized: "%lld %@", comment: "Distance label"), value, distanceUnit.label(for: Double(value)))).tag(AlertRadiusChoice.fixed(value))
                             }
                         }
-                    Text(alertRadiusGuidance)
-                        .font(.caption)
-                        .foregroundStyle(.secondary)
-                    if alertMode == .bestValue {
-                        // The threshold is edited in Settings → Fuel Savings: it
-                        // labels station rows BEST VALUE as well as gating this
-                        // alert, so it lives with the fill size and MPG that
-                        // produce the saving. Read back here, not offered twice.
-                        Text(String(format: String(localized: "Minimum saving %@ — change in Settings, Fuel Savings.", comment: "Best Value alert threshold read-back"), FuelSavingsFormat.money(bestValueThresholdGBP)))
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
                     }
+                    Text(alertRadiusDescription)
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                     if enabled && monitoredCount == 0 {
                         Text(String(localized: "No stations monitored yet — open the Stations tab to load prices first.", comment: "No monitored stations hint"))
-                            .font(.caption)
+                            .font(.footnote)
                             .foregroundStyle(.secondary)
                     }
+                        Text(String(localized: "Background alerts depend on when your iPhone allows them; each station alerts at most once an hour.", comment: "Proximity alerts background limitation note"))
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                    }
+                    .fuelBoardDisabledState(isEnabled: enabled)
                 } header: {
                     Text(String(localized: "Proximity alerts", comment: "Proximity alerts section title"))
-                } footer: {
-                    let modeDescription = alertMode == .bestValue
-                        ? String(format: String(localized: "When you approach the Best Value station within the radius, FuelBoard sends a notification if it could leave you at least %@ better off after extra return travel. Nearby stations selling %@ are watched — favourites get priority — and each station alerts at most once per hour.", comment: "Best Value proximity alerts section footer"), FuelSavingsFormat.money(bestValueThresholdGBP), fuel.displayName.lowercased())
-                        : String(format: String(localized: "When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling %@ 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.", comment: "Proximity alerts section footer"), fuel.displayName.lowercased())
-                    Text(modeDescription)
                 }
 
                 if enabled, let lastAlert {
@@ -212,21 +243,38 @@ struct AlertsView: View {
 
                 Section {
                     Toggle(String(localized: "Cheapest station", comment: "Live Activity toggle"), isOn: $liveActivityEnabled)
+                    Group {
+                        optionRow(String(localized: "Fuel", comment: "Fuel picker title"),
+                              value: liveActivityFuel.displayName,
+                              isEnabled: liveActivityEnabled) {
                         Picker(String(localized: "Fuel", comment: "Fuel picker title"), selection: $liveActivityFuel) {
                             ForEach(FuelType.allCases) { fuel in
                                 Text(fuel.displayName).tag(fuel)
                             }
                         }
+                    }
+                    optionRow(String(localized: "Distance", comment: "Distance picker title"),
+                              value: laDistanceValueLabel,
+                              isEnabled: liveActivityEnabled) {
                         Picker(String(localized: "Distance", comment: "Distance picker title"), selection: laChoice) {
                             Text(String(format: String(localized: "Follow search (%@)", comment: "Follow current station search distance option"), searchInUnitLabel)).tag(LADistanceChoice.followSearch)
                             ForEach(FuelStore.stationRadiusOptions, id: \.self) { miles in
                                 Text(distanceLabel(forMiles: miles)).tag(LADistanceChoice.fixed(miles))
                             }
                         }
+                    }
+                    if liveActivityFollowsSearch {
+                        Text(String(localized: "Uses the same distance as your station search.", comment: "Live Activity distance description, follow search"))
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                    }
+                        Text(String(localized: "See the cheapest nearby station on your Lock Screen and Dynamic Island, with updates as you travel.", comment: "Live Activity section description"))
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                    }
+                    .fuelBoardDisabledState(isEnabled: liveActivityEnabled)
                 } header: {
                     Text(String(localized: "Live Activity", comment: "Live Activity section title"))
-                } footer: {
-                    Text(String(localized: "Shows the cheapest station for the fuel and distance you pick here on the Lock Screen and Dynamic Island — independent of the Stations tab (choose Follow search to mirror its distance instead). Updates as you drive; tap to open directions. Live Activities can be disabled in System Settings → Live Activities.", comment: "Live Activity section footer"))
                 }
             }
             .navigationTitle(String(localized: "Alerts", comment: "Alerts tab title"))

FuelBoard/BestValueIntroView.swift

@@ -83,7 +83,7 @@ struct BestValueIntroContent: View {
                 .pickerStyle(.segmented)
 
                 slider(
-                    title: String(localized: "Typical fill-up", comment: "Best Value fill-up slider label"),
+                    title: String(localized: "Fill-up amount", comment: "Best Value fill-up slider label"),
                     readOut: fillUpText,
                     value: amountBinding,
                     range: FuelSavingsCalculator.fillAmountSliderRange(for: settings.preferredAmount.unit),

FuelBoard/ContentView.swift

@@ -31,13 +31,12 @@ struct ContentView: View {
     @State private var distanceUnit: DistanceUnit = FuelStore.loadDistanceUnit()
     @State private var priceDisplayStyle: PriceDisplayStyle = ContentView.qaPriceStyleOverride(default: FuelStore.loadPriceDisplayStyle())
     @State private var stationTapAction: StationTapAction = FuelStore.loadStationTapAction()
-    @State private var fuelSavingsSettings: FuelSavingsSettings = FuelStore.loadFuelSavingsSettings()
+    @State private var fuelSavingsSettings: FuelSavingsSettings = ContentView.qaSavingsSettingsOverride(default: FuelStore.loadFuelSavingsSettings())
-    @State private var sessionFuelSavingsAmount: FuelSavingsFillAmount = FuelStore.loadFuelSavingsSettings().preferredAmount
+    @State private var sessionFuelSavingsAmount: FuelSavingsFillAmount = ContentView.qaSavingsSettingsOverride(default: FuelStore.loadFuelSavingsSettings()).preferredAmount
     @State private var favourites: [FavouriteEntry] = FuelStore.loadFavourites()
     @State private var alertsEnabled: Bool = FuelStore.loadAlertsEnabled()
     @State private var alertsRadius: Double = FuelStore.loadAlertsRadius()
     @State private var alertsFuel: FuelType = FuelStore.loadAlertsFuel()
-    @State private var alertsMode: AlertMode = FuelStore.loadAlertsMode()
     @State private var alertsBestValueThresholdGBP: Double = FuelStore.loadAlertsBestValueThresholdGBP()
     @State private var favouriteDropAlertsEnabled: Bool = FuelStore.loadFavouriteDropAlertsEnabled()
     @State private var favouriteDropAlertsFuel: FuelType = FuelStore.loadFavouriteDropAlertsFuel()
@@ -152,29 +151,40 @@ struct ContentView: View {
         FuelStore.effectiveAlertsRadiusKM(followsSearch: alertsFollowsSearch, manualKM: alertsRadius)
     }
 
-    private var effectiveAlertsMode: AlertMode {
-        (alertsMode == .bestValue && !fuelSavingsSettings.isConfigured) ? .cheapest : alertsMode
-    }
-
-    private func ensureBestValueAlertModeIsAvailable() {
-        guard alertsMode == .bestValue, !fuelSavingsSettings.isConfigured else { return }
-        alertsMode = .cheapest
-        FuelStore.saveAlertsMode(.cheapest)
-    }
-
     private func updateAlertMonitor(fuel overrideFuel: FuelType? = nil) {
         monitor.update(
             stations: stations,
             favourites: refreshedFavourites,
             fuel: overrideFuel ?? alertsFuel,
             radiusKM: effectiveAlertsRadiusKM,
-            alertMode: effectiveAlertsMode,
+            alertMode: .cheapest,
             bestValueThresholdGBP: alertsBestValueThresholdGBP,
             fuelSavingsSettings: fuelSavingsSettings,
             fuelSavingsAmount: sessionFuelSavingsAmount
         )
     }
 
+    /// QA hook: `-qaConfigureSavings` configures the Fuel Savings feature for the
+    /// session (the sheet's Best Value card, the Worth the Drive sort and the
+    /// Key sheet's Best Value row are ALL gated on `settings.isConfigured`), so
+    /// they can be screenshotted without walking Settings. It writes through the
+    /// store exactly as the Settings screen does and returns what it wrote, so
+    /// the app runs on the same stored values — not a stubbed, parallel one.
+    static func qaSavingsSettingsOverride(default value: FuelSavingsSettings) -> FuelSavingsSettings {
+#if DEBUG
+        guard ProcessInfo.processInfo.arguments.contains("-qaConfigureSavings") else { return value }
+        let seeded = FuelSavingsSettings(
+            enabled: true,
+            mpg: value.mpg,
+            preferredAmount: FuelSavingsFillAmount(value: 60, unit: .pounds)
+        )
+        FuelStore.saveFuelSavingsSettings(seeded)
+        return seeded
+#else
+        return value
+#endif
+    }
+
     private func installLocationUpdateHook() {
         locationManager.onLocationUpdate = {
             self.updateAlertMonitor()
@@ -814,6 +824,7 @@ struct ContentView: View {
                         station: station,
                         location: location,
                         distanceUnit: distanceUnit,
+                        priceStyle: priceDisplayStyle,
                         fuelSavings: savingsLookup(baseline: scaffold.baseline,
                                                    journeys: scaffold.journeys)(station),
                         fuelSavingsAmount: sessionFuelSavingsAmount,
@@ -843,6 +854,15 @@ struct ContentView: View {
                 .onReceive(NotificationCenter.default.publisher(for: .fuelBoardRoadDistanceDebugUpdated)) { _ in
                     roadDistanceDebugStatus = RoadDistanceService.currentDebugStatus()
                 }
+                .onReceive(NotificationCenter.default.publisher(for: .fuelBoardOpenBestValueSettings)) { _ in
+                    // "Setup Best Value" in the How Best Value works sheet: close
+                    // the More info sheet it was opened from (nil dismisses it —
+                    // the sheet is item-driven) and switch to Settings. Tag 3 is
+                    // the Settings tab; its Best Value section is the first item
+                    // in the list, so the controls are on screen on arrival.
+                    monitor.pendingDetailStation = nil
+                    selectedTab = 3
+                }
                 .onReceive(NotificationCenter.default.publisher(for: .fuelBoardShowStationDetail)) { note in
                     let info = note.userInfo ?? [:]
                     if let id = info["stationID"] as? String,
@@ -1123,7 +1143,6 @@ struct ContentView: View {
                 // or the choice wouldn't take effect until the next launch.
                 fuelSavingsSettings = FuelStore.loadFuelSavingsSettings()
                 sessionFuelSavingsAmount = fuelSavingsSettings.preferredAmount
-                ensureBestValueAlertModeIsAvailable()
                 locationManager.startForegroundTracking()
                 installLocationUpdateHook()
                 ensureBackgroundMotionTrackingIfNeeded()
@@ -1143,7 +1162,6 @@ struct ContentView: View {
 #if DEBUG
             print("FB-SAVINGS settings changed: enabled=\(old.enabled)->\(new.enabled) configured=\(new.isConfigured)")
 #endif
-            ensureBestValueAlertModeIsAvailable()
             updateAlertMonitor()
         }
         .onChange(of: sessionFuelSavingsAmount) { _, _ in
@@ -1226,16 +1244,6 @@ struct ContentView: View {
             FuelStore.saveAlertsFuel(newValue)
             updateAlertMonitor(fuel: newValue)
         }
-        .onChange(of: alertsMode) { _, newValue in
-            if newValue == .bestValue, !fuelSavingsSettings.isConfigured {
-                alertsMode = .cheapest
-                FuelStore.saveAlertsMode(.cheapest)
-                updateAlertMonitor()
-                return
-            }
-            FuelStore.saveAlertsMode(newValue)
-            updateAlertMonitor()
-        }
         .onChange(of: alertsBestValueThresholdGBP) { _, newValue in
             FuelStore.saveAlertsBestValueThresholdGBP(newValue)
             updateAlertMonitor()
@@ -1578,9 +1586,6 @@ struct ContentView: View {
             enabled: $alertsEnabled,
             radius: $alertsRadius,
             fuel: $alertsFuel,
-            alertMode: $alertsMode,
-            bestValueThresholdGBP: alertsBestValueThresholdGBP,
-            bestValueConfigured: fuelSavingsSettings.isConfigured,
             favouriteDropEnabled: $favouriteDropAlertsEnabled,
             favouriteDropFuel: $favouriteDropAlertsFuel,
             followsSearch: $alertsFollowsSearch,
@@ -1815,8 +1820,8 @@ struct StationRow: View {
     /// styles. The mockup's divider sits at ~53% of its row; this is that ratio,
     /// held per row rather than derived from the row's text — the point is that
     /// the hairline, the price axis and the star cannot move as the list scrolls.
-    /// The price column takes the remainder, and its savings capsule scales down
+    /// The price column takes the remainder, and its listing verdict wraps
-    /// instead of widening the column and dragging the hairline with it.
+    /// vertically instead of widening the column and dragging the hairline.
     ///
     /// One value for both price styles: the star used to sit at the end of the
     /// price line and hold ~28pt of the price column, so the wide form `£1.58⁷/L`
@@ -1826,11 +1831,6 @@ struct StationRow: View {
     /// in pounds & pence, and names keep the same room in both styles.
     private static let leftSectionShare: CGFloat = 0.52
 
-    /// The comparison label sits beside the capsule only where the row is wide
-    /// enough for both (regular width). On an iPhone the mockup's canvas is
-    /// wider than the whole screen, so the label drops under the capsule rather
-    /// than starving the station name.
-    @Environment(\.horizontalSizeClass) private var sizeClass
 
     private var ragColor: Color {
         guard let price = station.prices[fuel], let baselinePrice else { return .gray }
@@ -1941,14 +1941,18 @@ struct StationRow: View {
 
                 // Name, full address, distance
                 VStack(alignment: .leading, spacing: 2) {
-                    // The name WRAPS instead of truncating: the row is tall
+                    // The name wraps, capped at THREE lines. The row is tall
-                    // enough now, and a name cut to "Z A Service Stat…" cannot
+                    // enough for a two-line name, but an unbounded wrap let one
-                    // be told apart from the station next door. Baseline
+                    // very long forecourt name set the height of the whole row —
-                    // alignment keeps the notice symbols on the name's FIRST
+                    // the excessive row heights this refinement removes. Past
-                    // line instead of floating beside a two-line name.
+                    // three lines the name ellipsises; the full name is always
+                    // in Station Details. Baseline alignment keeps the notice
+                    // symbols on the name's FIRST line instead of floating
+                    // beside a two-line name.
                     HStack(alignment: .firstTextBaseline, spacing: 6) {
                         Text(station.name)
                             .font(.headline)
+                            .lineLimit(3)
                             .multilineTextAlignment(.leading)
                             .fixedSize(horizontal: false, vertical: true)
                         ForEach(StationNotice.notices(for: station)) { notice in
@@ -2019,17 +2023,20 @@ struct StationRow: View {
                 if let badge = recommendationBadge {
                     badgeCapsule(badge)
                 }
-                // Price line: the status dot and the price, leading-aligned on
+                // The price and its verdict capsule are ONE vertically grouped
-                // the column's one axis. The star no longer ends this line — it
+                // element: 5pt binds them as "this price, this outcome", while
-                // sits under the station logo — so this whole column width now
+                // the badge keeps the column's full 12pt above so the three
-                // belongs to the price, which is what lets the wide pounds &
+                // lines do not read as equals.
-                // pence form (£1.58⁷/L) render at full size rather than being
+                VStack(alignment: .leading, spacing: 5) {
-                // scaled down or truncated.
+                    // Price line: the status dot and the price, leading-aligned
+                    // on the column's one axis. The star no longer ends this
+                    // line — it sits under the station logo — so this whole
+                    // column width now belongs to the price, which is what lets
+                    // the wide pounds & pence form (£1.58⁷/L) render at full
+                    // size rather than being scaled down or truncated.
                     if let price = station.prices[fuel] {
                         HStack(spacing: 5) {
-                        Circle()
+                            PriceRatingDot(color: ragColor)
-                            .fill(ragColor)
-                            .frame(width: 8, height: 8)
                             FuelStore.priceTextAttributed(price, style: priceDisplayStyle,
                                                          size: priceSize, weight: .bold)
                                 .lineLimit(1)
@@ -2044,6 +2051,7 @@ struct StationRow: View {
                         savingsCapsule(result)
                     }
                 }
+            }
             .frame(maxWidth: .infinity, alignment: .leading)
             // The spec's ~20-24pt of air between the divider and the price
             // column: the row's own 12pt spacing plus this 10pt.
@@ -2062,51 +2070,27 @@ struct StationRow: View {
         Button {
             onToggleFavourite()
         } label: {
-            Image(systemName: isFavourite ? "star.fill" : "star")
+            FavouriteStarGlyph(isFavourite: isFavourite)
-                .foregroundStyle(isFavourite ? .yellow : .secondary)
         }
         .buttonStyle(.borderless)
     }
 
-    /// The savings capsule plus the comparison it is measured against. The
+    /// The listing's verdict capsule — ONE component for every status, so the
-    /// capsule itself is the shared verdict view, so a row, the detail sheet and
+    /// baseline's "Closest station" pill carries the same soft blue fill, white
-    /// the compact summary cannot drift apart. The comparison label sits beside
+    /// text and shape rules as Saves, Costs and Break even. The detail sheet
-    /// the capsule only where there is width for both.
+    /// keeps `FuelSavingsCapsule` to itself, unchanged.
-    @ViewBuilder
     private func savingsCapsule(_ result: FuelSavingsResult) -> some View {
-        let comparison = Text(FuelSavingsFormat.comparisonLabel(status: result.status))
+        ListingFuelSavingsCapsule(result: result)
-            .font(.caption2)
-            .foregroundStyle(.secondary)
-            .lineLimit(1)
-            // Same narrow column as the capsule above it, so the same floor:
-            // scaled copy, not a trimmed "vs closest st…".
-            .minimumScaleFactor(0.7)
-        if sizeClass == .regular {
-            HStack(spacing: 8) {
-                FuelSavingsCapsule(result: result)
-                comparison
-            }
-        } else {
-            VStack(alignment: .leading, spacing: 2) {
-                FuelSavingsCapsule(result: result)
-                comparison
-            }
-        }
     }
 
-    /// One recommendation badge, above the price it annotates. Tinted rather
+    /// One recommendation badge, above the price it annotates. Badges stay
-    /// than the mockup's solid fill, like every other badge and capsule in the
+    /// TINTED with coloured text — unlike the verdict capsules, which are filled
-    /// app: coloured text keeps its contrast in both appearances, at every
+    /// with white text: a badge annotates the price rather than reporting an
-    /// Dynamic Type size, without introducing a colour outside the palette.
+    /// outcome, so it should stay quieter than the pill beneath it. Tinted text
+    /// also keeps its contrast in both appearances at every Dynamic Type size
+    /// without introducing a colour outside the palette.
     private func badgeCapsule(_ badge: StationRecommendationBadge) -> some View {
-        Text(badge.title)
+        StationLabelBadge(label: badge.title, color: badge.tint)
-            .font(.caption2.bold())
-            .foregroundStyle(badge.tint)
-            .padding(.horizontal, 7)
-            .padding(.vertical, 3)
-            .background(Capsule().fill(badge.tint.opacity(0.15)))
-            .lineLimit(1)
-            .fixedSize()
     }
 }
 

FuelBoard/FavouritesView.swift

@@ -48,6 +48,14 @@ struct FavouritesView: View {
     /// Trends sheet (price history chart) presentation state.
     @State private var showTrends = false
 
+    /// The Key (legend) sheet — the same sheet the Stations tab presents, opened
+    /// from the info button beside Edit.
+    @State private var showKey = false
+    /// The Key sheet's two nested sheets, owned here because its rows set them
+    /// (same arrangement as StationsView, so the QA hooks behave identically).
+    @State private var showBestValueInfo = false
+    @State private var showImportantInformation = false
+
     /// Station picked for the More-info sheet (tap action = showDetails).
     @State private var detailStation: FuelStation?
 
@@ -69,6 +77,15 @@ struct FavouritesView: View {
     }
     private var cheapestPrice: Double? { cheapest?.prices[activeFuel] }
 
+    /// The baseline note is useful only when at least one visible favourite has
+    /// an actual savings comparison. An unavailable result (for example, while
+    /// location is missing) must not leave an orphaned explanation below the list.
+    private var showsSavingsComparisonExplanation: Bool {
+        fuelSavingsSettings.isConfigured && ordered.contains { station in
+            savingsForStation(station)?.result != nil
+        }
+    }
+
     /// IDs favourited for the active fuel — the star state on each row.
     private var activeFuelFavouriteIDs: Set<String> {
         Set(favourites.filter { $0.fuel == activeFuel }.map(\.station.id))
@@ -145,8 +162,15 @@ struct FavouritesView: View {
                     if fuelSavingsSettings.isConfigured {
                         Section {
                             FuelSavingsAdjustmentView(amount: $fuelSavingsAmount)
-                        } footer: {
+                        }
-                            Text(String(localized: "Savings below are estimated against the closest station by journey distance — the same baseline as the Stations list.", comment: "Favourites fuel-savings explanation"))
+                    }
+
+                    if showsSavingsComparisonExplanation {
+                        Section {
+                            Text(String(localized: "Price colours show pump price competitiveness. Savings compare with your closest station, including journey costs.", comment: "Station listing price and savings explanation"))
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
+                                .fixedSize(horizontal: false, vertical: true)
                         }
                     }
 
@@ -171,8 +195,13 @@ struct FavouritesView: View {
                     } header: {
                         Text(String(format: String(localized: "%@ favourites", comment: "Favourites section title for fuel type"), activeFuel.displayName))
                     } footer: {
+                        VStack(alignment: .leading, spacing: 12) {
                             Text(String(localized: "The first station is the favourite used in single widgets. Tap Edit, then drag to reorder.", comment: "Favourites reorder explanation"))
                         }
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    }
 
                     if let cheapest = cheapest {
                         Section {
@@ -185,8 +214,8 @@ struct FavouritesView: View {
             }
             .navigationTitle(String(localized: "Favourites", comment: "Favourites tab title"))
             .toolbar {
-                if !favourites.isEmpty {
                 ToolbarItemGroup(placement: .topBarTrailing) {
+                    if !favourites.isEmpty {
                         Button {
                             showTrends = true
                         } label: {
@@ -195,7 +224,24 @@ struct FavouritesView: View {
                         }
                         EditButton()
                     }
+                    // Same button and same slot as the Stations tab: last in the
+                    // group, so it sits to the right of Edit. Shown even with no
+                    // favourites — the legend explains the prices and labels, which
+                    // matter before anything is starred.
+                    Button {
+                        showKey = true
+                    } label: {
+                        Image(systemName: "info.circle")
                     }
+                    .accessibilityLabel(String(localized: "Key", comment: "Key button accessibility label"))
+                }
+            }
+            .sheet(isPresented: $showKey) {
+                KeySheetView(
+                    fuelTint: activeFuel.tintColor,
+                    showBestValueInfo: $showBestValueInfo,
+                    showImportantInformation: $showImportantInformation
+                )
             }
             .sheet(isPresented: $showTrends) {
                 TrendsView(
@@ -211,6 +257,7 @@ struct FavouritesView: View {
                     station: station,
                     location: location,
                     distanceUnit: distanceUnit,
+                    priceStyle: priceDisplayStyle,
                     selectedFuel: activeFuel,
                     fuelSavings: savingsForStation(station),
                     fuelSavingsAmount: fuelSavingsAmount,
@@ -221,6 +268,12 @@ struct FavouritesView: View {
                     onToggleFavourite: { onToggleFavourite(station, activeFuel) }
                 )
             }
+            .onReceive(NotificationCenter.default.publisher(for: .fuelBoardOpenBestValueSettings)) { _ in
+                // "Setup Best Value" from the explanation sheet, opened inside
+                // this view's More info sheet. That sheet closes itself; this one
+                // is presented from HERE and would otherwise stay over Settings.
+                detailStation = nil
+            }
             .onAppear {
 #if DEBUG
                 // QA hook: launch with `-showTrends` to open the sheet

FuelBoard/FuelBoardDisabledState.swift

@@ -0,0 +1,12 @@
+import SwiftUI
+
+/// Applies FuelBoard's shared unavailable appearance and native interaction state
+/// to a complete dependent row or group. Apply it once at the highest dependent
+/// container so labels, values, icons, descriptions and controls fade together.
+extension View {
+    func fuelBoardDisabledState(isEnabled: Bool) -> some View {
+        disabled(!isEnabled)
+            .allowsHitTesting(isEnabled)
+            .opacity(isEnabled ? 1 : 0.5)
+    }
+}

FuelBoard/FuelSavingsViews.swift

@@ -3,7 +3,7 @@ import SwiftUI
 struct FuelSavingsAdjustmentView: View {
     @Binding var amount: FuelSavingsFillAmount
 
-    @State private var unitChangeNotice: String?
+    @State private var showingComparisonHelp = false
 
     private var range: ClosedRange<Double> {
         FuelSavingsCalculator.fillAmountSliderRange(for: amount.unit)
@@ -26,8 +26,33 @@ struct FuelSavingsAdjustmentView: View {
 
     var body: some View {
         VStack(alignment: .leading, spacing: 10) {
-            Text("How much are you filling up?")
+            HStack {
+                Text("How much fuel?")
                     .font(.subheadline.weight(.semibold))
+                Spacer()
+                Button {
+                    showingComparisonHelp = true
+                } label: {
+                    Image(systemName: "info.circle")
+                }
+                .buttonStyle(.plain)
+                .foregroundStyle(.secondary)
+                .accessibilityLabel("About comparison modes")
+                .popover(isPresented: $showingComparisonHelp) {
+                    VStack(alignment: .leading, spacing: 12) {
+                        Text("Comparison modes")
+                            .font(.headline)
+                        Text("£: Compare how much fuel your budget buys at each station.")
+                            .fixedSize(horizontal: false, vertical: true)
+                        Text("Litres: Compare the cost of buying the same amount of fuel.")
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+                    .font(.footnote)
+                    .frame(width: 280, alignment: .leading)
+                    .padding()
+                    .presentationCompactAdaptation(.popover)
+                }
+            }
             Picker("Fill-up unit", selection: unitBinding) {
                 ForEach(FuelSavingsFillUnit.allCases) { unit in
                     Text(unit.displayName).tag(unit)
@@ -42,17 +67,9 @@ struct FuelSavingsAdjustmentView: View {
                     .monospacedDigit()
                     .frame(width: 72, alignment: .trailing)
             }
-            Text("Changes the estimate for this session only — your Settings default stays unchanged.")
+            Text("Adjust your fill-up amount for this visit. Your default won’t change.")
                 .font(.caption2)
                 .foregroundStyle(.secondary)
-            Text("£ compares the litres your budget buys at each station; Litres compares one fixed quantity.")
-                .font(.caption2)
-                .foregroundStyle(.secondary)
-            if let unitChangeNotice {
-                Text(unitChangeNotice)
-                    .font(.caption2)
-                    .foregroundStyle(.orange)
-            }
         }
     }
 
@@ -61,10 +78,9 @@ struct FuelSavingsAdjustmentView: View {
             get: { amount.unit },
             set: { newUnit in
                 guard newUnit != amount.unit else { return }
-                // No one litre figure equals a budget at every candidate price.
+                // No one litre figure equals a budget at every candidate price,
-                // A unit change starts a new, explicitly labelled comparison.
+                // so switching modes starts from that mode's configured default.
                 amount = FuelSavingsCalculator.newComparisonAmount(afterSwitching: amount, to: newUnit)
-                unitChangeNotice = "New comparison basis — adjust the \(newUnit.displayName) amount to your intended fill-up."
             }
         )
     }
@@ -77,206 +93,8 @@ struct FuelSavingsAdjustmentView: View {
     }
 }
 
-struct FuelSavingsSummaryView: View {
+/// The colour-coded monetary verdict capsule used by the detail sheet and other
-    let availability: FuelSavingsAvailability?
+/// full financial summaries. Listing rows use `ListingFuelSavingsCapsule`.
-    let amount: FuelSavingsFillAmount
-    var baselineStationName: String? = nil
-    var compact: Bool = false
-    /// Sizes the "extra return travel" caption in the user's own unit (the
-    /// stored figure is miles) — used by both the row banner and the detail sheet.
-    var distanceUnit: DistanceUnit = .miles
-    var showInfoAction: (() -> Void)? = nil
-
-    private func comparisonLabel(for result: FuelSavingsResult) -> String {
-        FuelSavingsFormat.comparisonLabel(status: result.status)
-    }
-
-    var body: some View {
-        switch availability {
-        case .available(let result):
-            if compact {
-                // FULL-WIDTH banner under the row. Inline inside the middle
-                // column the capsule truncated ("Approx. £2.75 better off after
-                // tra…") because
-                // the column is squeezed by the price block — the verdict is the
-                // point of this sort mode, so it gets its own line with room.
-                // Colour carries the verdict: green save, red worse off, grey
-                // break even, blue baseline. lineLimit + minimumScaleFactor keep
-                // it to one line, so rows stay even.
-                VStack(alignment: .leading, spacing: 2) {
-                    // The capsule gets the WHOLE line and the comparison caption
-                    // sits beneath it. Side by side, the caption's layoutPriority
-                    // squeezed the verdict until it truncated ("Approx. £2.75
-                    // better off after tra…"), and in this sort mode the verdict
-                    // is the point of the row.
-                    capsule(for: result, compact: true)
-                        .accessibilityLabel(accessibilityHeadline(for: result))
-                    Text(comparisonLabel(for: result))
-                        .font(.caption2)
-                        .foregroundStyle(.secondary)
-                        .lineLimit(1)
-                        .minimumScaleFactor(0.85)
-                        .accessibilityLabel("Comparison: \(comparisonLabel(for: result))")
-                    if let extraTravel = FuelSavingsFormat.extraTravelLabel(
-                        extraDistanceMiles: result.extraDistanceMiles,
-                        unit: distanceUnit,
-                        confidence: result.journeyConfidence
-                    ) {
-                        Text(extraTravel)
-                            .font(.caption2)
-                            .foregroundStyle(.secondary)
-                            .lineLimit(1)
-                            .minimumScaleFactor(0.85)
-                            .accessibilityLabel(spokenExtraTravel(for: result, fallback: extraTravel))
-                    }
-                }
-                // Aligns the banner with the row's text column (46 pt logo + 12
-                // pt spacing) so it reads as part of the row, not the cell.
-                .padding(.leading, 58)
-            } else {
-                // Detail sheet: the SAME verdict capsule and the SAME caption as
-                // the listing rows (one implementation, so wording and colour
-                // cannot drift), followed by the breakdown only this view has
-                // room for. The old shape led with a status word + headline that
-                // matched neither the listing nor each other.
-                VStack(alignment: .leading, spacing: 10) {
-                    // Same shape as the listing rows: the capsule takes the line
-                    // and the comparison caption sits directly beneath it, so the
-                    // verdict never competes for width with its own caption.
-                    VStack(alignment: .leading, spacing: 4) {
-                        capsule(for: result, compact: false)
-                            .accessibilityLabel(accessibilityHeadline(for: result))
-                        Text(comparisonLabel(for: result))
-                            .font(.subheadline)
-                            .foregroundStyle(.secondary)
-                            .lineLimit(1)
-                            .minimumScaleFactor(0.85)
-                            .accessibilityLabel("Comparison: \(comparisonLabel(for: result))")
-                    }
-                    LabeledContent("Your fill-up", value: amountText)
-                    LabeledContent("Fuel you'll receive", value: String(format: "%.2f litres", result.fillLitres))
-                        .monospacedDigit()
-                    if amount.unit == .pounds {
-                        Text("You pay the selected budget here. The saving compares the same litres at your closest station; litres differ between stations, and this is not a refund.")
-                            .font(.caption2)
-                            .foregroundStyle(.secondary)
-                    }
-                    if let extraTravel = FuelSavingsFormat.extraTravelLabel(
-                        extraDistanceMiles: result.extraDistanceMiles,
-                        unit: distanceUnit,
-                        confidence: result.journeyConfidence
-                    ) {
-                        Text(extraTravel)
-                            .font(.subheadline)
-                            .foregroundStyle(.secondary)
-                            .accessibilityLabel(spokenExtraTravel(for: result, fallback: extraTravel))
-                    }
-                    if result.status == .baseline {
-                        Text("Your closest station by journey distance is the baseline — every other saving is measured against it.")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    } else {
-                        Text(baselineStationName.map { "Compared with \($0)." } ?? "Compared with your closest station.")
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                        LabeledContent(
-                            result.grossSavingGBP >= 0 ? "Fuel-price saving" : "Fuel-price difference",
-                            value: result.grossSavingGBP >= 0
-                                ? FuelSavingsFormat.money(result.grossSavingGBP)
-                                : "Costs \(FuelSavingsFormat.money(abs(result.grossSavingGBP))) more"
-                        )
-                        LabeledContent("Extra driving cost", value: FuelSavingsFormat.money(result.extraDrivingCostGBP))
-                        Divider()
-                        LabeledContent {
-                            Text(result.headline())
-                                .fontWeight(.semibold)
-                                .foregroundStyle(capsuleColor(for: result.status))
-                                .monospacedDigit()
-                        } label: {
-                            Text("Total")
-                                .fontWeight(.semibold)
-                        }
-                        if result.journeyConfidence.isEstimated {
-                            Text("Estimated from straight-line or incomplete route data — refined once both routes are measured.")
-                                .font(.caption2)
-                                .foregroundStyle(.secondary)
-                        }
-                        Text("Estimate covers fuel cost only. It excludes time, parking, tolls and wear.")
-                            .font(.caption2)
-                            .foregroundStyle(.secondary)
-                    }
-                    if let showInfoAction {
-                        Rectangle()
-                            .fill(Color(.separator))
-                            .frame(height: 0.5)
-                            .padding(.vertical, 4)
-                        Button(action: showInfoAction) {
-                            HStack(spacing: 8) {
-                                Text("How Best Value works")
-                                Spacer(minLength: 8)
-                                Image(systemName: "chevron.forward")
-                                    .font(.footnote.weight(.semibold))
-                                    .foregroundStyle(.tertiary)
-                            }
-                        }
-                        .buttonStyle(.plain)
-                    }
-                }
-            }
-        case .unavailable(let reason):
-            Text(compact ? "Savings unavailable" : "Best Value unavailable: \(reason)")
-                .font(compact ? .caption2 : .caption)
-                .foregroundStyle(.secondary)
-        case nil:
-            EmptyView()
-        }
-    }
-
-    private var amountText: String {
-        switch amount.unit {
-        case .pounds: return String(format: "£%.0f", amount.value)
-        case .litres: return String(format: "%.0f litres", amount.value)
-        }
-    }
-
-    /// VoiceOver form of the extra-travel caption ("Approximately 6.4 miles extra
-    /// return travel"): the abbreviation is spelled out and the unit is a word.
-    /// Falls back to the visible string if no spoken form exists.
-    private func spokenExtraTravel(for result: FuelSavingsResult, fallback: String) -> String {
-        FuelSavingsFormat.extraTravelSpokenLabel(
-            extraDistanceMiles: result.extraDistanceMiles,
-            unit: distanceUnit,
-            confidence: result.journeyConfidence
-        ) ?? fallback
-    }
-
-    /// VoiceOver form of the verdict. `spokenHeadline()` spells "Approx." out for
-    /// and leaves the plain words ("Break even", "Closest station") alone —
-    /// one source, so visible and spoken copy cannot drift.
-    private func accessibilityHeadline(for result: FuelSavingsResult) -> String {
-        result.spokenHeadline()
-    }
-
-    /// The colour-coded verdict capsule lives in `FuelSavingsCapsule` — ONE
-    /// implementation for the listing rows, the detail sheet and this compact
-    /// summary, so the verdict reads identically everywhere; the sheet just
-    /// gets the larger font and padding.
-    private func capsule(for result: FuelSavingsResult, compact: Bool) -> some View {
-        FuelSavingsCapsule(result: result, compact: compact)
-    }
-
-    /// Verdict colour lives in `FuelSavingsCapsule.color(for:)`.
-    private func capsuleColor(for status: FuelSavingsStatus) -> Color {
-        FuelSavingsCapsule.color(for: status)
-    }
-
-    private func symbol(for status: FuelSavingsStatus) -> String {
-        FuelSavingsCapsule.symbol(for: status)
-    }
-}
-
-/// The colour-coded verdict capsule shared by the station listing rows, the
-/// detail sheet and the compact summary.
 ///
 /// An HStack with an explicit spacing, NOT a Label: given the width to spare,
 /// a Label lays its icon and title out across the row and leaves a visible gap
@@ -291,7 +109,7 @@ struct FuelSavingsCapsule: View {
         HStack(spacing: compact ? 3 : 5) {
             Image(systemName: Self.symbol(for: result.status))
                 .accessibilityHidden(true)
-            Text(result.capsuleHeadline())
+            Text(compact ? result.capsuleHeadline() : result.detailCapsuleHeadline())
                 .lineLimit(1)
                 // Measured on a 393pt screen: the capsule is handed ~101pt, of
                 // which the icon, its spacing and the 8pt padding either side
@@ -328,3 +146,156 @@ struct FuelSavingsCapsule: View {
         }
     }
 }
+
+/// The station listing's verdict capsule: the words on the first line, the figure
+/// on its own line beneath, and "(approx.)" on a third when the journey is an
+/// estimate.
+///
+/// Stations and Favourites share `StationRow`, so both render this. The detail
+/// sheet keeps `FuelSavingsCapsule`'s colour-coded monetary verdict on one line;
+/// the Key sheet's legend renders this with `showsAmount: false` so it never
+/// displays an invented figure.
+struct ListingFuelSavingsCapsule: View {
+    let result: FuelSavingsResult
+    /// Station rows carry the figure; the Key sheet's legend shows the wording only.
+    var showsAmount: Bool = true
+
+    /// The height the text actually drew, so the shape can follow the drawn line
+    /// count rather than the data's. See `drawnLineCount`.
+    @State private var textHeight: CGFloat = 0
+    /// One caption line's height, scaled with Dynamic Type, to divide that by.
+    @ScaledMetric(relativeTo: .caption) private var captionLineHeight: CGFloat = 14
+
+    private var verdict: FuelSavingsResult.ListingVerdict {
+        result.listingVerdict(showsAmount: showsAmount)
+    }
+
+    var body: some View {
+        HStack(alignment: .firstTextBaseline, spacing: 3) {
+            Image(systemName: symbol)
+                .accessibilityHidden(true)
+            // One Text per line, not a "\n" inside one string: each line keeps its
+            // own localisation key and the amount can be monospaced on its own.
+            // Left-aligned: the word and its figure share a left edge, so the
+            // block reads as a column rather than a ragged centre.
+            VStack(alignment: .leading, spacing: 0) {
+                Text(verdict.headline)
+                if let amount = verdict.amount {
+                    Text(amount)
+                        .monospacedDigit()
+                }
+                if let qualifier = verdict.qualifier {
+                    Text(qualifier)
+                }
+            }
+            .multilineTextAlignment(.leading)
+            // Never compress or truncate: the capsule wraps and the row grows taller.
+            .fixedSize(horizontal: false, vertical: true)
+            .background(
+                GeometryReader { proxy in
+                    Color.clear
+                        .preference(key: CapsuleTextHeightKey.self,
+                                    value: proxy.size.height)
+                }
+            )
+        }
+        // White on the muted fill. These capsules carry a figure the eye is asked
+        // to read at a glance, which is why they are the only filled-and-white
+        // surfaces in the app; every badge stays tinted with coloured text.
+        .font(.caption.weight(.semibold))
+        .foregroundStyle(.white)
+        .padding(.horizontal, 8)
+        .padding(.vertical, 4)
+        // Saves and Costs share one minimum width, so their trailing edges line
+        // up down the list whatever the figure's length. Break even and Closest
+        // station carry no figure and keep their natural width.
+        .frame(minWidth: minimumWidth, alignment: .leading)
+        .background(shape.fill(fill))
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel(verdict.spokenText)
+        .onPreferenceChange(CapsuleTextHeightKey.self) { textHeight = $0 }
+    }
+
+    /// Saves and Costs only — the two verdicts that carry a figure. See the
+    /// frame above: 84pt is the width the widest common amount needs
+    /// ("£123.45 more"), so shorter figures pad rather than shrink the pill.
+    private var minimumWidth: CGFloat {
+        switch result.status {
+        case .worthTheDrive, .notWorthTheDrive: return 84
+        case .breakEven, .baseline: return 0
+        }
+    }
+
+    private var fill: Color {
+        ListingCapsuleFill.color(for: result.status)
+    }
+
+    /// How many lines the text DREW, not how many the verdict declares.
+    /// "Closest station" is one declared line that wraps to two in the row's
+    /// narrow column, and the shape has to follow what is on screen or the pill's
+    /// semicircular ends crowd the text they are wrapping. Falls back to the
+    /// declared count on the first layout pass, before there is a height.
+    private var drawnLineCount: Int {
+        guard textHeight > 0, captionLineHeight > 0 else { return verdict.lines.count }
+        return max(1, Int((textHeight / captionLineHeight).rounded()))
+    }
+
+    /// One line keeps the capsule. Two or more switch to a rounded rect: a pill's
+    /// semicircular ends crowd the text corners at that height, while an 8pt
+    /// radius does not. Keyed to the DRAWN line count, so a wrapped "Closest
+    /// station" gets the same rounded rect as a figure pushed onto its own line.
+    private var shape: AnyShape {
+        drawnLineCount > 1
+            ? AnyShape(RoundedRectangle(cornerRadius: 8))
+            : AnyShape(Capsule())
+    }
+
+    private var symbol: String {
+        switch result.status {
+        case .worthTheDrive: return "checkmark.circle"
+        case .notWorthTheDrive: return "arrow.up.circle"
+        case .breakEven: return "equal.circle"
+        case .baseline: return "location.circle"
+        }
+    }
+}
+
+/// Carries the drawn height of a capsule's text block up to `drawnLineCount`.
+private struct CapsuleTextHeightKey: PreferenceKey {
+    static let defaultValue: CGFloat = 0
+    static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}
+
+/// The station listing's verdict-capsule fills: muted semantic colours carrying
+/// white text and icon.
+///
+/// Muted AND fixed, deliberately not the translucent tints used elsewhere in the
+/// app: white text on a 15% tint over a white row measures ~1.8:1 and is
+/// unreadable. Each tone below sits at a relative luminance of ~0.18 — the band
+/// where white text clears 4.5:1 AND the pill still separates ~3:1 from BOTH a
+/// white row and the dark card fill — so one value each works in both
+/// appearances without a dynamic colour.
+///
+/// The saturated palette colours cannot carry white text at all: measured
+/// white-on-fill is 2.2:1 for `systemGreen`, 3.6:1 for `systemRed` and 4.0:1 for
+/// `systemBlue`, every one of them below the 4.5:1 a caption needs. Muting is
+/// therefore a contrast requirement here, not only the mockup's taste.
+enum ListingCapsuleFill {
+    // Trailing comments record, per colour: white-on-fill / fill-vs-white-row /
+    // fill-vs-dark-row, measured rather than estimated.
+    static let saves = Color(red: 0x45 / 255, green: 0x82 / 255, blue: 0x5E / 255)     // 4.56 / 4.56 / 3.06
+    static let costs = Color(red: 0xA9 / 255, green: 0x63 / 255, blue: 0x5B / 255)     // 4.54 / 4.54 / 3.07
+    static let breakEven = Color(red: 0x70 / 255, green: 0x70 / 255, blue: 0x70 / 255) // 4.95 / 4.95 / 2.81
+    static let closest = Color(red: 0x58 / 255, green: 0x78 / 255, blue: 0x9D / 255)   // 4.52 / 4.52 / 3.09
+
+    static func color(for status: FuelSavingsStatus) -> Color {
+        switch status {
+        case .worthTheDrive: return saves
+        case .notWorthTheDrive: return costs
+        case .breakEven: return breakEven
+        case .baseline: return closest
+        }
+    }
+}

FuelBoard/HowBestValueSheet.swift

@@ -16,6 +16,50 @@ struct HowBestValueSheet: View {
                     VStack(alignment: .leading, spacing: 10) {
                         Text("Best Value compares each station with the closest station by journey distance. It works out what you could save at the pump, then takes off the fuel used for the extra return journey.")
                         Text("Your fill-up amount and MPG are used to show whether you could save overall.")
+                        // The whole point of the sheet is to explain the feature,
+                        // so the way to switch it on lives here rather than only
+                        // in Settings. Full-width: this is the card's one action.
+                        Button {
+                            openBestValueSettings()
+                        } label: {
+                            Text("Setup Best Value")
+                                .font(.subheadline.weight(.semibold))
+                                .frame(maxWidth: .infinity)
+                        }
+                        // `.large` is the standard iOS button height (~50pt): the
+                        // default `.borderedProminent` is considerably shorter and
+                        // read as a compact control rather than a button.
+                        .buttonStyle(.borderedProminent)
+                        .controlSize(.large)
+                        .padding(.top, 2)
+                    }
+                    .font(.subheadline)
+                    .padding(.vertical, 4)
+                }
+
+                Section("The working, step by step") {
+                    VStack(alignment: .leading, spacing: 12) {
+                        step("1. The baseline",
+                             "The closest station by journey distance. It is the trip you would make anyway, so everything else is measured against it.")
+                        step("2. The return trip",
+                             "For each station we work out the journey there and back. Where the roads have been measured we use the real driving route; until then we double the straight-line distance and mark the figure “Approx.”.")
+                        step("3. Extra return travel",
+                             "This station's return trip minus the baseline's. It is the extra you add on top of the journey you were already making — not the whole trip. Because both figures are return trips, it can read larger than the one-way distance shown above the map.")
+                        step("4. Extra driving cost",
+                             "What that extra distance costs in fuel: the extra miles, divided by your MPG, priced at the station you are driving to.")
+                        step("5. Fuel-price saving",
+                             "What the difference in price per litre is worth on your fill-up.")
+                        step("6. Total",
+                             "The fuel-price saving minus the extra driving cost. If the drive costs more than the price saves, the total is shown as an extra cost instead, and the station is not Best Value.")
+                        step("7. Best Value",
+                             "The total clears the minimum saving you set in Settings → Fuel Savings.")
+                    }
+                    .font(.subheadline)
+                    .padding(.vertical, 4)
+                }
+
+                Section {
+                    VStack(alignment: .leading, spacing: 10) {
                         Text("With a £ budget you spend that amount at each station; the litres differ by station. Savings compare those litres with the same quantity at your closest station, then deduct extra journey fuel. You do not receive cash back.")
                         Text("With Litres, every station is compared for the fixed quantity you selected.")
                         Text("Results are marked “Approx.” until road distances are available.")
@@ -33,8 +77,46 @@ struct HowBestValueSheet: View {
                 }
             }
         }
-        .presentationDetents([.fraction(0.42)])
+        .presentationDetents([.fraction(0.72)])
         .presentationBackground(Color(UIColor.systemGroupedBackground))
+#if DEBUG
+        // QA hook: `-qaSetupBestValue` runs the Setup Best Value action without a
+        // tap (simctl cannot tap), so the tab switch can be screenshotted.
+        .task {
+            guard ProcessInfo.processInfo.arguments.contains("-qaSetupBestValue") else { return }
+            try? await Task.sleep(nanoseconds: 2_000_000_000)
+            openBestValueSettings()
+        }
+#endif
+    }
+
+    /// Closes this sheet and asks the app to land on Settings → Best Value, whose
+    /// section is the first thing in its list and holds the fill-up amount, MPG
+    /// and minimum saving. This sheet sits two levels below the tab view — More
+    /// info sheet, or the Key sheet — so it cannot switch tabs itself: it closes
+    /// itself and posts, and ContentView does the rest.
+    private func openBestValueSettings() {
+        dismiss()
+        // Announce only once this sheet has animated away. The host then closes
+        // the sheet this one was presented from — the More info sheet, or the Key
+        // sheet — and switches to Settings. Asking for that while the child was
+        // still dismissing could drop one of the two dismissals, which is what
+        // left the Settings tab covered by a sheet.
+        Task { @MainActor in
+            try? await Task.sleep(nanoseconds: 500_000_000)
+            NotificationCenter.default.post(name: .fuelBoardOpenBestValueSettings, object: nil)
+        }
+    }
+
+    /// One numbered step: a lead-in, then the plain explanation. Same words
+    /// either way — this only sets the hierarchy.
+    private func step(_ title: String, _ explanation: String) -> some View {
+        VStack(alignment: .leading, spacing: 2) {
+            Text(title)
+                .font(.subheadline.weight(.semibold))
+            Text(explanation)
+                .foregroundStyle(.secondary)
+        }
     }
 }
 
@@ -48,7 +130,7 @@ struct HowBestValueRow: View {
     var body: some View {
         Button(action: action) {
             HStack(spacing: 8) {
-                Text("How Best Value works")
+                Text(KeySheetContent.helpTitle)
                 Spacer(minLength: 8)
                 Image(systemName: "chevron.forward")
                     .font(.footnote.weight(.semibold))

FuelBoard/ImportantInformationSheet.swift

@@ -0,0 +1,193 @@
+import SwiftUI
+
+/// "Important information" — FuelBoard's prices, availability, savings, journey
+/// and liability disclaimer as ONE reusable sheet.
+///
+/// The disclaimer is shown from more than one place, so the copy and its layout
+/// live here once: a host adds an `ImportantInformationRow` (or the
+/// `.importantInformationSheet(isPresented:)` modifier) and the wording can
+/// never drift between entry points.
+///
+/// One `Section` per topic, so every heading gets its own card: an accent
+/// symbol beside a semibold title, with the secondary-coloured description
+/// beneath. First host: the Stations tab's Key sheet (a row at the bottom). Copy
+/// lives in `Localizable.strings`, keyed by the English source string, so the web
+/// copy editor covers it.
+struct ImportantInformationSheet: View {
+    @Environment(\.dismiss) private var dismiss
+
+    /// Width of the symbol column that every heading's icon sits in.
+    ///
+    /// Symbols have wildly different ink widths — `car.side` is ~34 pt wide at
+    /// this size while `info.circle` is ~20 pt — so without a shared column each
+    /// heading's TEXT would start at a different x (measured: 180 px vs 233 px
+    /// at 3x), which is exactly the inconsistent alignment the brief rules out.
+    /// `@ScaledMetric` keeps the column in step with the icon font, so it still
+    /// can't overrun at large Dynamic Type sizes.
+    @ScaledMetric(relativeTo: .title3) private var iconSlot: CGFloat = 34
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section {
+                    paragraphs(
+                        "FuelBoard uses fuel price information published through the UK Government's fuel price data scheme. Prices are supplied by retailers and may change or differ from those displayed in the app.",
+                        "While we aim to provide accurate, up-to-date information, we cannot guarantee that displayed prices reflect those currently available at the pump."
+                    )
+                } header: {
+                    heading("Fuel Prices", systemImage: "sterlingsign.circle")
+                }
+
+                Section {
+                    paragraphs(
+                        "A displayed fuel price does not guarantee availability. Stations may temporarily run out of fuel, have pumps out of service, be closed or no longer offer a particular fuel type.",
+                        "We recommend checking availability before making a special journey."
+                    )
+                } header: {
+                    heading("Fuel Availability", systemImage: "fuelpump.fill")
+                }
+
+                Section {
+                    paragraphs(
+                        "Savings and Best Value recommendations are estimates based on available fuel prices, your selected fill-up amount, estimated travel costs and other relevant settings.",
+                        "Actual savings may vary depending on fuel consumption, driving conditions, routes and current pump prices. A Best Value recommendation does not guarantee the lowest overall cost."
+                    )
+                } header: {
+                    heading("Savings & Best Value", systemImage: "arrow.down.circle")
+                }
+
+                Section {
+                    paragraphs(
+                        "Travel distances, journey times and associated fuel costs are estimates. Where actual road distances are unavailable, approximate distances may be used.",
+                        "Actual journeys may differ due to traffic, road conditions, diversions and individual driving habits."
+                    )
+                } header: {
+                    heading("Journey Estimates", systemImage: "car.side")
+                }
+
+                Section {
+                    paragraphs(
+                        "Fuel prices and availability can change without notice. Always check the current price and fuel availability before making a special journey or filling up."
+                    )
+                } header: {
+                    heading("Before You Travel", systemImage: "checkmark.circle")
+                }
+
+                Section {
+                    paragraphs(
+                        "FuelBoard provides information to help you compare fuel prices and make informed decisions. We cannot guarantee the accuracy, completeness or availability of fuel price information, savings estimates or recommendations.",
+                        "FuelBoard accepts no responsibility for additional travel costs, financial losses or decisions made using the information provided."
+                    )
+                } header: {
+                    heading("Disclaimer", systemImage: "info.circle")
+                }
+            }
+            // The brief asks for ~24 pt between topics; the list's own default is
+            // wider and unsettable, this pins it.
+            .listSectionSpacing(.custom(24))
+            .navigationTitle("Important information")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done") { dismiss() }
+                }
+            }
+        }
+        .presentationDetents([.large])
+        .presentationBackground(Color(UIColor.systemGroupedBackground))
+    }
+
+    /// A section heading: accent symbol + semibold title, laid out horizontally
+    /// and vertically centred, with the symbol at a consistent size in every
+    /// section.
+    ///
+    /// `.title3` is 20 pt at the default Dynamic Type size — inside the 18–20 pt
+    /// brief — and still scales with the user's text size, so the symbols stay in
+    /// proportion to the headings rather than drifting apart on large sizes.
+    ///
+    /// The symbol is decorative (the heading text already carries the meaning),
+    /// so it is hidden from VoiceOver to stop it being announced as a stray glyph.
+    private func heading(_ title: String, systemImage: String) -> some View {
+        HStack(alignment: .center, spacing: 8) {
+            Image(systemName: systemImage)
+                .font(.title3)
+                .foregroundStyle(Color.accentColor)
+                // Same-width column for every symbol, so all six headings'
+                // text starts at one x regardless of how wide the glyph is.
+                .frame(width: iconSlot)
+                .accessibilityHidden(true)
+            Text(LocalizedStringKey(title))
+                .font(.headline)
+                // `Color.primary`, not `.primary`: the bare ShapeStyle resolves
+                // against the List header's own secondary style and comes out
+                // grey — measured (152,152,159), i.e. identical to the body text,
+                // which throws away the heading/description hierarchy.
+                .foregroundStyle(Color.primary)
+                // Let a long heading wrap instead of truncating on a narrow
+                // device or at a large text size.
+                .fixedSize(horizontal: false, vertical: true)
+        }
+    }
+
+    /// A card's paragraphs, stacked as prose rather than as separate `List` rows
+    /// so the card reads as one statement and the list draws no hairline between
+    /// a topic's own sentences.
+    ///
+    /// `LocalizedStringKey` is what makes a `String` parameter localisable —
+    /// `Text(someString)` would render verbatim and the copy editor could never
+    /// reach it.
+    @ViewBuilder
+    private func paragraphs(_ lines: String...) -> some View {
+        VStack(alignment: .leading, spacing: 10) {
+            ForEach(Array(lines.enumerated()), id: \.offset) { _, line in
+                Text(LocalizedStringKey(line))
+            }
+        }
+        .font(.subheadline)
+        .foregroundStyle(.secondary)
+    }
+}
+
+/// The row that opens `ImportantInformationSheet`. Reusable: drop it in any
+/// `List` section.
+///
+/// `.buttonStyle(.plain)` keeps it from becoming a row-wide tap target that
+/// could swallow a neighbouring control (see the two-buttons-in-one-row rule).
+struct ImportantInformationRow: View {
+    let action: () -> Void
+
+    var body: some View {
+        Button(action: action) {
+            HStack(spacing: 8) {
+                Image(systemName: "info.circle")
+                Text("Important information")
+                Spacer(minLength: 8)
+                Image(systemName: "chevron.forward")
+                    .font(.footnote.weight(.semibold))
+                    .foregroundStyle(.tertiary)
+            }
+        }
+        .buttonStyle(.plain)
+    }
+}
+
+extension View {
+    /// Presents the shared "Important information" disclaimer. One call site per
+    /// surface — the sheet itself is never duplicated.
+    func importantInformationSheet(isPresented: Binding<Bool>) -> some View {
+        sheet(isPresented: isPresented) { ImportantInformationSheet() }
+    }
+}
+
+#if DEBUG
+/// QA hook support: `-showImportantInfo` opens the Key sheet and then the
+/// disclaimer on top of it, so the copy can be screenshotted without a tap
+/// (simctl has no tap command) — the same chained pattern as
+/// `-showBestValueInfo`. The disclaimer's `.sheet` lives inside the Key sheet's
+/// content, so it cannot present while the Key sheet is shut.
+enum ImportantInformationQA {
+    static var isRequested: Bool {
+        ProcessInfo.processInfo.arguments.contains("-showImportantInfo")
+    }
+}
+#endif

FuelBoard/RoadDistanceService.swift

@@ -132,7 +132,7 @@ enum RoadDistanceService {
         // visible to show for it: no pass, no requests, no widget reloads.
         guard FuelStore.accurateDistancesEnabled else {
             await updateDebug(baseDebugStatus(state: .gated,
-                                              reason: "Accurate distances off",
+                                              reason: "Driving distances off",
                                               stations: stations,
                                               lat: lat,
                                               lng: lng,

FuelBoard/SettingsView.swift

@@ -70,11 +70,21 @@ struct SettingsView: View {
     /// Hidden developer flag — the Debug section only appears when on. Toggled
     /// by tapping the About → Version row five times (NOT a user-facing switch).
     @State private var debugMode: Bool = FuelStore.loadDebugMode()
-    /// "Accurate distances" — read once on appear and written straight through to
+    /// "Driving distances" — read once on appear and written straight through to
     /// the shared store, which is what every display surface actually consults.
     @State private var accurateDistances: Bool = FuelStore.accurateDistancesEnabled
+    /// Slider drafts — the value under the thumb while it is down. `nil` means
+    /// "not dragging", in which case the stored setting is shown, so an external
+    /// change (a unit switch, the in-list control, a QA hook) is picked up with
+    /// no re-seeding. Dragging writes only the draft; the setting is saved once,
+    /// when the drag ends — see `commitMPG` / `commitFillUp`.
+    @State private var mpgDraft: Double?
+    @State private var fillUpDraft: Double?
     @State private var versionTapCount = 0
     @State private var lastVersionTap = Date.distantPast
+    /// The shared "Important information" disclaimer sheet, opened from the row
+    /// at the bottom of the tab.
+    @State private var showImportantInformation = false
     /// Widget diagnostics: the extension's last makeEntry beacon PER intent
     /// type (keychain) + the installed-widget inventory from WidgetCenter.
     @State private var smallWidgetDiag: String?
@@ -85,7 +95,6 @@ struct SettingsView: View {
     /// Return key, so the keyboard's Done button clears this to dismiss AND
     /// commit the typed value. Both Fuel Savings controls are sliders now, so
     /// nothing sets it — it stays for any numeric field this screen takes again.
-    @State private var settingsUnitChangeNotice: String?
     @FocusState private var focusedSavingsField: SavingsField?
 
     private enum SavingsField: Hashable {
@@ -117,6 +126,9 @@ struct SettingsView: View {
             List {
                 Section {
                     Toggle("Best Value", isOn: fuelSavingsEnabledBinding)
+                    Text("Find stations that could save you money, even after the cost of driving there.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                     // The feature's own controls follow its toggle: switched
                     // off they grey out but stay on screen (same rule as the
                     // distance picker in Closest mode) and keep their values, so
@@ -132,11 +144,20 @@ struct SettingsView: View {
                                 .monospacedDigit()
                                 .foregroundStyle(.secondary)
                         }
-                        Slider(value: fuelSavingsMPGBinding,
+                        // Draft-bound: the thumb moves a local value and the
+                        // setting is written once, when the drag ends. Writing
+                        // durable app-wide state on every step is what made this
+                        // slider stutter.
+                        Slider(value: mpgSliderValue,
                                in: FuelSavingsCalculator.mpgSliderRange,
-                               step: FuelSavingsCalculator.mpgSliderStep)
+                               step: FuelSavingsCalculator.mpgSliderStep) { editing in
+                            if !editing { commitMPG() }
+                        }
                             .accessibilityLabel("Average fuel economy")
                             .accessibilityValue(mpgText)
+                            Text("How many miles your car travels per gallon.")
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
                         Picker("Fill-up unit", selection: fuelSavingsUnitBinding) {
                             ForEach(FuelSavingsFillUnit.allCases) { unit in
                                 Text(unit.displayName).tag(unit)
@@ -144,17 +165,22 @@ struct SettingsView: View {
                         }
                         .pickerStyle(.segmented)
                         HStack {
-                            Text("Typical fill-up")
+                            Text("Fill-up amount")
                             Spacer()
                             Text(fillUpText)
                                 .monospacedDigit()
                                 .foregroundStyle(.secondary)
                         }
-                        Slider(value: fuelSavingsAmountBinding,
+                        Slider(value: fillUpSliderValue,
                                in: FuelSavingsCalculator.fillAmountSliderRange(for: fuelSavingsSettings.preferredAmount.unit),
-                               step: FuelSavingsCalculator.fillAmountSliderStep(for: fuelSavingsSettings.preferredAmount.unit))
+                               step: FuelSavingsCalculator.fillAmountSliderStep(for: fuelSavingsSettings.preferredAmount.unit)) { editing in
-                            .accessibilityLabel("Typical fill-up")
+                            if !editing { commitFillUp() }
+                        }
+                            .accessibilityLabel("Fill-up amount")
                             .accessibilityValue(fillUpText)
+                            Text(fillUpAmountDescription)
+                                .font(.footnote)
+                                .foregroundStyle(.secondary)
                         Picker("Minimum saving", selection: $bestValueThresholdGBP) {
                             ForEach(FuelStore.bestValueAlertThresholdOptionsGBP, id: \.self) { value in
                                 Text(FuelSavingsFormat.money(value)).tag(value)
@@ -166,25 +192,20 @@ struct SettingsView: View {
                         // needs no handler of its own. The store snaps to the
                         // nearest option, so the picker and the stored value
                         // cannot disagree.
-                        Text("A saving worth driving for: the net saving left after the extra travel cost. Stations above it are labelled BEST VALUE in the station list, and Best Value alerts use the same figure.")
+                        Text("The smallest saving you'd consider worth the extra drive.")
-                            .font(.caption)
+                            .font(.footnote)
                             .foregroundStyle(.secondary)
-                        if let settingsUnitChangeNotice {
-                            Text(settingsUnitChangeNotice)
-                                .font(.caption2)
-                                .foregroundStyle(.orange)
-                        }
                         if !fuelSavingsSettings.isConfigured && fuelSavingsSettings.enabled {
                             Text("Set a realistic UK MPG and fill-up amount before Best Value appears in sorting.")
-                                .font(.caption)
+                                .font(.footnote)
                                 .foregroundStyle(.orange)
                         }
                     }
-                    .disabled(!fuelSavingsSettings.enabled)
+                    .fuelBoardDisabledState(isEnabled: fuelSavingsSettings.enabled)
                 } header: {
                     Text("Fuel Savings")
                 } footer: {
-                    Text("Best Value estimates fuel cost only, using UK imperial MPG, your typical purchase amount, fuel prices and Apple Maps road distances. Real-world average MPG is better than manufacturer figures; the fill-up amount is your usual purchase, not tank capacity.")
+                    Text("FuelBoard compares fuel prices and travel costs to find stations that could save you money. Results are estimates based on your settings and driving distance.")
                 }
 
                 Section {
@@ -199,6 +220,9 @@ struct SettingsView: View {
                         WidgetCenter.shared.reloadAllTimelines()
                         WatchSyncManager.shared.pushSnapshot()
                     }
+                    Text("Choose how distances are displayed throughout FuelBoard.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                     Picker("Price display", selection: $priceDisplayStyle) {
                         ForEach(PriceDisplayStyle.allCases) { style in
                             Text(style.displayName).tag(style)
@@ -210,24 +234,26 @@ struct SettingsView: View {
                         WidgetCenter.shared.reloadAllTimelines()
                         WatchSyncManager.shared.pushSnapshot()
                     }
+                    Text("Show prices as 129.9p or £1.299 per litre.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                 } header: {
                     Text("Units")
-                } footer: {
-                    Text("Distances and search radii across the app, widget and alerts are shown in this unit. Prices can be shown as on a station sign (129.9) or in pounds and pence (£1.29⁹/L).")
                 }
 
                 Section {
-                    Toggle("Accurate distances", isOn: $accurateDistances)
+                    Toggle("Driving distances", isOn: $accurateDistances)
                         .onChange(of: accurateDistances) { _, newValue in
                             FuelStore.setAccurateDistancesEnabled(newValue)
                             WidgetCenter.shared.reloadAllTimelines()
                             NotificationCenter.default.post(name: .fuelBoardAccurateDistancesChanged,
                                                             object: nil)
                         }
+                    Text("Use actual driving distances instead of straight-line estimates. Routes are calculated while the app is open.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                 } header: {
                     Text("Distances")
-                } footer: {
-                    Text("Off (default): distances are straight-line estimates marked Approx. and the app makes no route requests. On: Apple Maps driving distances for every station in range, filled only while this app is open. Search radii then mean miles of driving.")
                 }
 
                 Section {
@@ -240,10 +266,11 @@ struct SettingsView: View {
                     .onChange(of: stationTapAction) { _, newValue in
                         FuelStore.saveStationTapAction(newValue)
                     }
+                    Text("Choose what happens when you tap a station: get directions or view its details.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                 } header: {
                     Text("Tap action")
-                } footer: {
-                    Text("Tapping a station either opens directions straight away or shows its details first.")
                 }
 
                 Section {
@@ -260,14 +287,12 @@ struct SettingsView: View {
                     }
                     VStack(alignment: .leading, spacing: 8) {
                         Text(dataRefreshMode.summary)
-                        Text("Background checks are best-effort and happen only when iOS allows, so timing is not exact.")
+                        Text("Background updates depend on when your iPhone allows them.")
                             .foregroundStyle(.secondary)
                     }
                     .font(.footnote)
                 } header: {
                     Text("Data checking")
-                } footer: {
-                    Text("Standard saves battery and refreshes price data up to twice daily. Smart checks for newer data more often in the background and only refreshes full prices when an update is available.")
                 }
 
                 Section {
@@ -276,8 +301,9 @@ struct SettingsView: View {
                     } label: {
                         Label("Show introduction", systemImage: "arrow.clockwise.circle")
                     }
-                } footer: {
+                    Text("View the welcome screens and set up permissions again.")
-                    Text("Replay the welcome screen, including the location and notification permission prompts.")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
                 }
 
                 if debugMode {
@@ -454,7 +480,7 @@ struct SettingsView: View {
                     } header: {
                         Text("Road distance fill")
                     } footer: {
-                        Text("Shows whether Accurate distances is running or gated. Distances stay Approx. until Ready is yes for the current origin; gated reasons explain why no fill is happening.")
+                        Text("Shows whether Driving distances is running or gated. Distances stay Approx. until Ready is yes for the current origin; gated reasons explain why no fill is happening.")
                     }
 
                     Section {
@@ -559,7 +585,7 @@ struct SettingsView: View {
                                 )
                             }
                             .buttonStyle(.plain)
-                            .disabled(tipStore.purchaseInProgress)
+                            .fuelBoardDisabledState(isEnabled: !tipStore.purchaseInProgress)
                         }
                     }
                     .listRowBackground(Color.clear)
@@ -584,11 +610,16 @@ struct SettingsView: View {
                     Text("About")
                 }
 
+                Section {
+                    ImportantInformationRow { showImportantInformation = true }
+                }
+
             }
             // Numeric entry must be escapable: `.decimalPad` has no Return key.
             .keyboardDoneButton { focusedSavingsField = nil }
             .scrollDismissesKeyboard(.interactively)
             .navigationTitle("Settings")
+            .importantInformationSheet(isPresented: $showImportantInformation)
             .onAppear {
                 Task { await tipStore.load() }
             }
@@ -710,27 +741,56 @@ struct SettingsView: View {
     private var fuelSavingsEnabledBinding: Binding<Bool> {
         Binding(
             get: { fuelSavingsSettings.enabled },
-            set: { fuelSavingsSettings.enabled = $0; persistFuelSavingsSettings() }
+            set: { fuelSavingsSettings.enabled = $0; saveFuelSavingsField(.enabled) }
         )
     }
 
-    private var fuelSavingsMPGBinding: Binding<Double> {
+    /// Slider values, draft-first: while the thumb is down the draft is what the
+    /// control and its read-out show; with no drag in progress the store's value
+    /// shows, so any external change (unit switch, in-list control, QA hook) is
+    /// reflected without re-seeding anything.
+    private var mpgSliderValue: Binding<Double> {
         Binding(
-            get: { fuelSavingsSettings.mpg },
+            get: { mpgDraft ?? fuelSavingsSettings.mpg },
-            set: { fuelSavingsSettings.mpg = min(max($0, 0), FuelSavingsCalculator.maximumMPG); persistFuelSavingsSettings() }
+            set: { mpgDraft = $0 }
         )
     }
 
-    private var fuelSavingsAmountBinding: Binding<Double> {
+    private var fillUpSliderValue: Binding<Double> {
         Binding(
-            get: { fuelSavingsSettings.preferredAmount.value },
+            get: { fillUpDraft ?? fuelSavingsSettings.preferredAmount.value },
-            set: {
+            set: { fillUpDraft = $0 }
-                fuelSavingsSettings.preferredAmount.value = min(max($0, 0), FuelSavingsCalculator.maximumFillAmount(for: fuelSavingsSettings.preferredAmount.unit))
-                persistFuelSavingsSettings()
-            }
         )
     }
 
+    /// The drag has ended: write the value once, and only if it actually moved.
+    /// The draft is cleared either way, so the control falls back to the stored
+    /// setting and shows what was saved — the clamps can lower it.
+    private func commitMPG() {
+        defer { mpgDraft = nil }
+        guard let draft = mpgDraft else { return }
+        let mpg = min(max(draft, 0), FuelSavingsCalculator.maximumMPG)
+        guard mpg != fuelSavingsSettings.mpg else { return }
+        fuelSavingsSettings.mpg = mpg
+        saveFuelSavingsField(.mpg)
+    }
+
+    private func commitFillUp() {
+        defer { fillUpDraft = nil }
+        guard let draft = fillUpDraft else { return }
+        let amount = min(max(draft, 0),
+                         FuelSavingsCalculator.maximumFillAmount(for: fuelSavingsSettings.preferredAmount.unit))
+        guard amount != fuelSavingsSettings.preferredAmount.value else { return }
+        fuelSavingsSettings.preferredAmount.value = amount
+        saveFuelSavingsField(.amount)
+    }
+
+    /// Persists the one field that changed. Saving the whole settings object
+    /// rewrites all four keys, which is only right when more than one has moved.
+    private func saveFuelSavingsField(_ field: FuelStore.FuelSavingsField) {
+        FuelStore.saveFuelSavingsField(field, from: fuelSavingsSettings)
+    }
+
     private var fuelSavingsUnitBinding: Binding<FuelSavingsFillUnit> {
         Binding(
             get: { fuelSavingsSettings.preferredAmount.unit },
@@ -738,31 +798,41 @@ struct SettingsView: View {
                 guard newUnit != fuelSavingsSettings.preferredAmount.unit else { return }
                 fuelSavingsSettings.preferredAmount = FuelSavingsCalculator.newComparisonAmount(
                     afterSwitching: fuelSavingsSettings.preferredAmount, to: newUnit)
-                settingsUnitChangeNotice = "New comparison basis — adjust the \(newUnit.displayName) amount to your intended fill-up."
+                // The unit and the amount move together, so both keys are written.
-                persistFuelSavingsSettings()
+                saveFuelSavingsField(.unit)
+                saveFuelSavingsField(.amount)
+                // A drag in progress on the old scale no longer maps to this one.
+                fillUpDraft = nil
             }
         )
     }
 
+    /// Describes the fill-up amount in the unit the user picked, so the copy stays
+    /// true whether the amount is a budget in pounds or a volume in litres.
+    private var fillUpAmountDescription: String {
+        switch fuelSavingsSettings.preferredAmount.unit {
+        case .pounds: return "How much you plan to spend on fuel."
+        case .litres: return "How many litres you usually buy."
+        }
+    }
+
     /// "45 MPG" / "45.5 MPG". The slider is the only control, so this read-out
-    /// is the one place the figure is stated.
+    /// is the one place the figure is stated. It follows the draft while the
+    /// thumb is down.
     private var mpgText: String {
-        let mpg = fuelSavingsSettings.mpg
+        let mpg = mpgDraft ?? fuelSavingsSettings.mpg
         return mpg.rounded() == mpg ? String(format: "%.0f MPG", mpg) : String(format: "%.1f MPG", mpg)
     }
 
-    /// "£40" / "40 L" — the fill-up slider's read-out.
+    /// "£40" / "40 L" — the fill-up slider's read-out, draft-first like the MPG one.
     private var fillUpText: String {
+        let value = fillUpDraft ?? fuelSavingsSettings.preferredAmount.value
         switch fuelSavingsSettings.preferredAmount.unit {
-        case .pounds: return String(format: "£%.0f", fuelSavingsSettings.preferredAmount.value)
+        case .pounds: return String(format: "£%.0f", value)
-        case .litres: return String(format: "%.0f L", fuelSavingsSettings.preferredAmount.value)
+        case .litres: return String(format: "%.0f L", value)
         }
     }
 
-    private func persistFuelSavingsSettings() {
-        FuelStore.saveFuelSavingsSettings(fuelSavingsSettings)
-    }
-
     /// "API" when the relay is serving the official Fuel Finder API, "CSV"
     /// when it fell back to the public mirror, "—" when unknown/never fetched.
     private var connectionText: String {

FuelBoard/StationDetailSections.swift

@@ -0,0 +1,283 @@
+import SwiftUI
+
+/// The More info sheet's facts row: the selected fuel's price on the left, the
+/// distance on the right, separated by a hairline down the middle.
+///
+/// Every figure comes from the sheet's existing sources — the price through
+/// `FuelStore.priceText` and the distance through
+/// `FuelStore.stationDistanceDisplay(...)` — so this row can never disagree with
+/// the listing row, the widget or the Live Activity, and both columns keep the
+/// shared "Approx." confidence marking.
+struct StationFactsRow: View {
+    let station: FuelStation
+    let selectedFuel: FuelType
+    let priceAge: FuelPriceFreshness.Assessment
+    let distance: StationDistanceDisplay?
+    let distanceUnit: DistanceUnit
+    /// The user's price display style, from the same Settings choice the listing
+    /// rows and the widgets read.
+    var priceStyle: PriceDisplayStyle = FuelStore.loadPriceDisplayStyle()
+
+    /// The price's point size, scaled with Dynamic Type: the price is built from
+    /// an explicit size (its "/L" suffix is sized relative to it inside
+    /// `priceTextAttributed`), so it needs a metric rather than a font style.
+    /// 22pt matches the listing row's price.
+    @ScaledMetric(relativeTo: .title2) private var priceSize: CGFloat = 22
+
+    var body: some View {
+        HStack(alignment: .top, spacing: 12) {
+            fuelColumn
+            StationFactsDivider()
+            distanceColumn
+        }
+        .padding(.vertical, 2)
+    }
+
+    private var fuelColumn: some View {
+        VStack(alignment: .leading, spacing: 3) {
+            Text(selectedFuel.displayName)
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            priceView
+            StationPriceAgeView(assessment: priceAge, compact: true)
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .accessibilityElement(children: .combine)
+    }
+
+    private var distanceColumn: some View {
+        VStack(alignment: .leading, spacing: 3) {
+            Text("Distance")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+            Text(distanceText)
+                .font(.title2.weight(.bold))
+                .monospacedDigit()
+            Text(returnText)
+                .font(.caption2)
+                .foregroundStyle(.secondary)
+                .monospacedDigit()
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .accessibilityElement(children: .combine)
+    }
+
+    /// The selected grade's price, in the user's chosen display style — the same
+    /// `priceTextAttributed` the listing row uses, so the sheet prints the bare
+    /// forecourt figure ("167.9") in Station sign and the superscripted
+    /// "£1.67⁹/L" in Pounds & pence, and the two surfaces cannot disagree.
+    /// The returned Text carries its own fonts, so no `.font(...)` goes on top.
+    ///
+    /// A missing grade shows an em dash rather than hiding the column, so the row
+    /// keeps its two-column shape.
+    @ViewBuilder
+    private var priceView: some View {
+        if let price = station.prices[selectedFuel] {
+            FuelStore.priceTextAttributed(price, style: priceStyle, size: priceSize, weight: .bold)
+        } else {
+            Text("—")
+                .font(.title2.weight(.bold))
+                .monospacedDigit()
+        }
+    }
+
+    /// One-way distance, with its confidence marker, from the shared display.
+    private var distanceText: String {
+        distance?.label(unit: distanceUnit) ?? "—"
+    }
+
+    /// Out-and-back distance, same source and same marker rule.
+    private var returnText: String {
+        distance?.returnLabel(unit: distanceUnit) ?? ""
+    }
+}
+
+/// A one-pixel vertical hairline between the facts row's two columns, drawn in
+/// the List's own separator colour so it matches every other line on the sheet.
+/// Decorative: VoiceOver reads each column as one phrase instead.
+private struct StationFactsDivider: View {
+    var body: some View {
+        Rectangle()
+            .fill(Color(.separator))
+            .frame(width: 0.5)
+            .frame(maxHeight: .infinity)
+            .accessibilityHidden(true)
+    }
+}
+
+/// The More info sheet's Best Value card: the verdict, then the figures it is
+/// built from.
+///
+/// Nothing is recomputed here — every number comes from the shared
+/// `FuelSavingsResult`, the verdict capsule is the same `FuelSavingsCapsule` the
+/// listing rows use, and the total is the shared `headline()`. Wording and
+/// colour therefore cannot drift between the sheet and the list.
+struct BestValueDetailCard: View {
+    let availability: FuelSavingsAvailability
+    let amount: FuelSavingsFillAmount
+    let baselineStationName: String?
+    let distanceUnit: DistanceUnit
+
+    var body: some View {
+        switch availability {
+        case .available(let result):
+            availableBody(result)
+        case .unavailable(let reason):
+            Text("Best Value unavailable: \(reason)")
+                .font(.caption)
+                .foregroundStyle(.secondary)
+        }
+    }
+
+    private func availableBody(_ result: FuelSavingsResult) -> some View {
+        VStack(alignment: .leading, spacing: 14) {
+            header(result)
+            panels(result)
+            workings(result)
+        }
+    }
+
+    /// Card title on the left, the verdict on the right — ONE capsule, in the
+    /// same large form the sheet used to repeat on its own line above the
+    /// working. The comparison caption sits UNDER the capsule, trailing-aligned
+    /// with it, the same way the listing rows lay the pair out.
+    private func header(_ result: FuelSavingsResult) -> some View {
+        HStack(alignment: .firstTextBaseline, spacing: 10) {
+            Text("Best Value")
+                .font(.headline)
+            Spacer(minLength: 8)
+            VStack(alignment: .trailing, spacing: 4) {
+                FuelSavingsCapsule(result: result, compact: false)
+                    .accessibilityLabel(result.detailCapsuleSpokenHeadline())
+                comparison(result)
+            }
+        }
+    }
+
+    /// The compact comparison caption ("vs closest station" / "your baseline"),
+    /// under the capsule it belongs to.
+    private func comparison(_ result: FuelSavingsResult) -> some View {
+        Text(FuelSavingsFormat.comparisonLabel(status: result.status))
+            .font(.subheadline)
+            .foregroundStyle(.secondary)
+            .multilineTextAlignment(.trailing)
+    }
+
+    /// The two figures the estimate is made OF, side by side: what the user
+    /// spends, and how much fuel that buys at this station.
+    private func panels(_ result: FuelSavingsResult) -> some View {
+        HStack(spacing: 10) {
+            panel(symbol: "fuelpump.fill",
+                  title: "Your fill-up",
+                  value: Self.amountText(amount))
+            panel(symbol: "drop.fill",
+                  title: "Fuel you'll receive",
+                  value: String(format: "%.2f litres", result.fillLitres))
+        }
+    }
+
+    private func panel(symbol: String, title: String, value: String) -> some View {
+        VStack(alignment: .leading, spacing: 6) {
+            HStack(spacing: 5) {
+                Image(systemName: symbol)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .accessibilityHidden(true)
+                Text(title)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+                    .minimumScaleFactor(0.8)
+            }
+            Text(value)
+                .font(.title3.weight(.semibold))
+                .monospacedDigit()
+                .lineLimit(1)
+                .minimumScaleFactor(0.8)
+        }
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .padding(.horizontal, 12)
+        .padding(.vertical, 10)
+        .background(RoundedRectangle(cornerRadius: 10).fill(Color.primary.opacity(0.06)))
+        .accessibilityElement(children: .combine)
+    }
+
+    /// The working: what the extra travel adds, what the pump saves, and the
+    /// total. A baseline station has nothing to save against itself, so it stops
+    /// after the panels — the capsule above already says "Closest station".
+    @ViewBuilder
+    private func workings(_ result: FuelSavingsResult) -> some View {
+        if result.status != .baseline {
+            Divider()
+            extraTravelRow(result)
+            savingRows(result)
+            Divider()
+            totalRow(result)
+            if let baselineStationName {
+                Text("Compared with \(baselineStationName).")
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+            }
+        }
+        if result.journeyConfidence.isEstimated {
+            Text("Estimated from straight-line or incomplete route data — refined once both routes are measured.")
+                .font(.caption2)
+                .foregroundStyle(.secondary)
+        }
+    }
+
+    /// The extra driving a saving has to beat, named in the row label and
+    /// measured in the value — same figure and same "Approx." rule as the shared
+    /// caption, from the shared formatter.
+    @ViewBuilder
+    private func extraTravelRow(_ result: FuelSavingsResult) -> some View {
+        if let extraTravel = FuelSavingsFormat.extraTravelDistanceLabel(
+            extraDistanceMiles: result.extraDistanceMiles,
+            unit: distanceUnit,
+            confidence: result.journeyConfidence
+        ) {
+            LabeledContent("Extra return travel", value: extraTravel)
+                .monospacedDigit()
+        }
+    }
+
+    @ViewBuilder
+    private func savingRows(_ result: FuelSavingsResult) -> some View {
+        LabeledContent(
+            result.grossSavingGBP >= 0 ? "Fuel-price saving" : "Fuel-price difference",
+            value: result.grossSavingGBP >= 0
+                ? FuelSavingsFormat.money(result.grossSavingGBP)
+                : "Costs \(FuelSavingsFormat.money(abs(result.grossSavingGBP))) more"
+        )
+        .monospacedDigit()
+        LabeledContent("Extra driving cost", value: FuelSavingsFormat.money(result.extraDrivingCostGBP))
+            .monospacedDigit()
+    }
+
+    /// The Total row is the WORKINGS; the capsule above is the quick verdict.
+    /// Both take their wording and colour from the shared result.
+    private func totalRow(_ result: FuelSavingsResult) -> some View {
+        LabeledContent {
+            Text(result.headline())
+                .fontWeight(.semibold)
+                .foregroundStyle(FuelSavingsCapsule.color(for: result.status))
+                .monospacedDigit()
+        } label: {
+            Text("Total")
+                .fontWeight(.semibold)
+        }
+    }
+
+    /// "£60" or "60 litres" — the same strings the sheet printed before the
+    /// redesign, so the fill-up reads identically in both units.
+    static func amountText(_ amount: FuelSavingsFillAmount) -> String {
+        switch amount.unit {
+        case .pounds: return String(format: "£%.0f", amount.value)
+        case .litres: return String(format: "%.0f litres", amount.value)
+        }
+    }
+}
+
+/// "How Best Value works" lives in the shared `HowBestValueRow`
+/// (HowBestValueSheet.swift) — the same row the Key sheet uses, so the sheet and
+/// the Key cannot drift.

FuelBoard/StationDetailView.swift

@@ -17,6 +17,9 @@ struct StationDetailView: View {
     let station: FuelStation
     let location: Coordinate?
     let distanceUnit: DistanceUnit
+    /// Price display style, from the same Settings choice the listing rows read,
+    /// so the sheet's price can never disagree with the row behind it.
+    var priceStyle: PriceDisplayStyle = FuelStore.loadPriceDisplayStyle()
     /// Fuel whose price is being shown by the surrounding station list.
     var selectedFuel: FuelType = FuelStore.loadSelectedFuel()
     var fuelSavings: FuelSavingsAvailability? = nil
@@ -63,12 +66,78 @@ struct StationDetailView: View {
         FuelPriceFreshness.assessment(for: station)
     }
 
-    /// The selected grade's current price, when present. Kept separate from
+    /// One-way and out-and-back distance from the current location, from the ONE
-    /// the price-age row so an old price remains visible rather than being
+    /// shared display helper — so this sheet's figures carry the same confidence
-    /// silently hidden.
+    /// marker as the listing row, the widget and the Live Activity.
-    private var selectedFuelPriceText: String {
+    private var distanceDisplay: StationDistanceDisplay? {
-        guard let price = station.prices[selectedFuel] else { return "—" }
+        guard let location else { return nil }
-        return FuelStore.priceText(price, style: .stationSign)
+        return FuelStore.stationDistanceDisplay(
+            station: station, userLat: location.lat, userLng: location.lng
+        )
+    }
+
+    /// Header title: the station name over its address, as the mockup shows.
+    /// Tapping copies the postcode, and the "Postcode copied" capsule floats over
+    /// the address line it confirms.
+    ///
+    /// The CARD'S FIRST ROW, above the map — deliberately not a toolbar
+    /// principal item: a principal item is clamped to one line, so a long
+    /// forecourt name ("Brighouse Bradford Rd Superstore - Petrol") showed an
+    /// ellipsis and `minimumScaleFactor` was not honoured. Inside the card it
+    /// wraps to two lines, and the confirmation capsule cannot be clipped by the
+    /// nav bar.
+    private var headerTitle: some View {
+        Button {
+            copyPostcode()
+        } label: {
+            VStack(alignment: .leading, spacing: 1) {
+                Text(station.name)
+                    .font(.title3.weight(.semibold))
+                    .multilineTextAlignment(.leading)
+                    .lineLimit(2)
+                Text(addressLine)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .multilineTextAlignment(.leading)
+                    .lineLimit(2)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+        }
+        .buttonStyle(.plain)
+        .disabled(postcodeForCopying.isEmpty)
+        .accessibilityLabel(String(localized: "Address: \(addressLine)",
+                                   comment: "Accessibility label for the address in the More info sheet header"))
+        .accessibilityHint(postcodeForCopying.isEmpty
+            ? ""
+            : String(localized: "Copies the postcode",
+                     comment: "Accessibility hint for the address in the More info sheet header"))
+        .overlay(alignment: .center) { copiedConfirmation }
+    }
+
+    /// The transient "Postcode copied" capsule. An overlay, so nothing moves
+    /// while it is up, and hit testing stays off so the header keeps its tap.
+    @ViewBuilder
+    private var copiedConfirmation: some View {
+        if showingCopied {
+            HStack(spacing: 4) {
+                Image(systemName: "checkmark")
+                Text("Postcode copied")
+            }
+            .font(.caption.weight(.semibold))
+            .foregroundStyle(.green)
+            .padding(.horizontal, 8)
+            .padding(.vertical, 4)
+            // A material base keeps it legible where the tint alone (the
+            // notice-capsule recipe) washes out.
+            .background {
+                Capsule()
+                    .fill(.regularMaterial)
+                    .overlay(Capsule().fill(Color.green.opacity(0.22)))
+            }
+            .allowsHitTesting(false)
+            .accessibilityHidden(true)
+            .transition(.opacity)
+        }
     }
 
     /// Opens Apple Maps driving directions — the same destination (and the same
@@ -90,8 +159,18 @@ struct StationDetailView: View {
         UINotificationFeedbackGenerator().notificationOccurred(.success)
         withAnimation(.easeInOut(duration: 0.2)) { showingCopied = true }
         copyResetTask?.cancel()
+#if DEBUG
+        // QA hook: `-qaCopyPostcode` holds the confirmation up long enough for a
+        // screenshot. The production window (2s) cannot be hit reliably — the app
+        // takes several seconds to render, and simctl cannot tap.
+        let hold: UInt64 = ProcessInfo.processInfo.arguments.contains("-qaCopyPostcode")
+            ? 25_000_000_000
+            : 2_000_000_000
+#else
+        let hold: UInt64 = 2_000_000_000
+#endif
         copyResetTask = Task {
-            try? await Task.sleep(nanoseconds: 2_000_000_000)
+            try? await Task.sleep(nanoseconds: hold)
             guard !Task.isCancelled else { return }
             withAnimation(.easeInOut(duration: 0.3)) { showingCopied = false }
         }
@@ -99,8 +178,18 @@ struct StationDetailView: View {
 
     var body: some View {
         NavigationStack {
+            // Wrapper exists only so the DEBUG scroll hook below can reach a
+            // section by id; it has no effect on layout or behaviour.
+            ScrollViewReader { proxy in
             List {
                 Section {
+                    // The sheet header is the CARD'S FIRST ROW, above the map:
+                    // the station name over its address, both wrapping rather
+                    // than truncating, on the card's own insets so it lines up
+                    // with the map and the rows below. Tapping it copies the
+                    // postcode. No hairline under it — the map follows.
+                    headerTitle
+                        .listRowSeparator(.hidden, edges: .bottom)
                     // Tapping anywhere on the map opens the same Apple Maps
                     // directions the Directions button below opens.
                     //
@@ -140,80 +229,27 @@ struct StationDetailView: View {
                     // clutter. The Address/Distance and Distance/actions lines
                     // stay.
                     .listRowSeparator(.hidden, edges: .bottom)
-                    // The map, the address, the distance, any notices and the two
+                    // The map, the facts row, any notices and the two station
-                    // station actions all share ONE card (the list's own row
+                    // actions all share ONE card (the list's own row hairlines
-                    // hairlines separate them), so no hand-rolled Divider here —
+                    // separate them), so no hand-rolled Divider here — adding one
-                    // adding one would double the line.
+                    // would double the line.
                     //
-                    // The station name is NOT repeated: the sheet header already
+                    // The station name AND the address live in the sheet header,
-                    // shows it.
+                    // which is also where a tap copies the postcode — see the
-                    //
+                    // principal toolbar item below.
-                    // The whole row is a copy control: it puts JUST the postcode
+                    // The price and the distance share one two-column row: each
-                    // on the clipboard so it can be pasted into another
+                    // figure comes from the same source it did before (the price
-                    // navigation app. The copy glyph sits ON the address line,
+                    // from FuelStore, the distance from the one shared display
-                    // and the "Postcode copied" confirmation is a capsule that floats OVER
+                    // helper), so the row cannot disagree with the listing row,
-                    // THIS ROW — it confirms the address, so it must not hover
+                    // the widget or the Live Activity.
-                    // over the map. It is an overlay, so nothing moves while it is
+                    StationFactsRow(
-                    // up, and `allowsHitTesting(false)` keeps the row tappable
+                        station: station,
-                    // through the capsule.
+                        selectedFuel: selectedFuel,
-                    Button {
+                        priceAge: priceFreshness,
-                        copyPostcode()
+                        distance: distanceDisplay,
-                    } label: {
+                        distanceUnit: distanceUnit,
-                        HStack(alignment: .firstTextBaseline, spacing: 8) {
+                        priceStyle: priceStyle
-                            Text("Address")
-                            Spacer(minLength: 8)
-                            Text(addressLine)
-                                .multilineTextAlignment(.trailing)
-                                .foregroundStyle(.secondary)
-                            // Stays the plain copy glyph — the capsule carries
-                            // the confirmation, so swapping this to a checkmark
-                            // would say it twice.
-                            Image(systemName: "doc.on.doc")
-                                .font(.footnote.weight(.semibold))
-                                .foregroundStyle(.secondary)
-                        }
-                    }
-                    .buttonStyle(.plain)
-                    .disabled(postcodeForCopying.isEmpty)
-                    .accessibilityLabel(String(localized: "Address: \(addressLine)",
-                                               comment: "Accessibility label for the address row in the More info sheet"))
-                    .accessibilityHint(postcodeForCopying.isEmpty
-                        ? ""
-                        : String(localized: "Copies the postcode",
-                                 comment: "Accessibility hint for the address row in the More info sheet"))
-                    // Horizontally centred over the address line itself.
-                    .overlay(alignment: .center) {
-                        if showingCopied {
-                            HStack(spacing: 4) {
-                                Image(systemName: "checkmark")
-                                Text("Postcode copied")
-                            }
-                            .font(.footnote.weight(.semibold))
-                            .foregroundStyle(.green)
-                            .padding(.horizontal, 10)
-                            .padding(.vertical, 6)
-                            // A material base keeps it legible where the tint
-                            // alone (the notice-capsule recipe) washes out.
-                            .background {
-                                Capsule()
-                                    .fill(.regularMaterial)
-                                    .overlay(Capsule().fill(Color.green.opacity(0.22)))
-                            }
-                            .allowsHitTesting(false)
-                            .accessibilityHidden(true)
-                            .transition(.opacity)
-                        }
-                    }
-                    if let location {
-                        let distance = FuelStore.stationDistanceDisplay(
-                            station: station, userLat: location.lat, userLng: location.lng
                     )
-                        LabeledContent("Distance", value: distance.labelWithReturn(unit: distanceUnit))
-                            .monospacedDigit()
-                    }
-                    LabeledContent("\(selectedFuel.displayName) price", value: selectedFuelPriceText)
-                        .monospacedDigit()
-                    StationPriceAgeView(assessment: priceFreshness)
                     ForEach(StationNotice.notices(for: station)) { notice in
                         Label(notice.title, systemImage: notice.symbolName)
                             .font(.subheadline.weight(.semibold))
@@ -222,15 +258,19 @@ struct StationDetailView: View {
                             .padding(.vertical, 6)
                             .background(Capsule().fill(Color.orange.opacity(0.14)))
                     }
-                    // The two station actions are the LAST row of the card: half
+                    // Half the width each, on one line, with the list's hairline
-                    // the width each, on one line, below Address and Distance.
+                    // running between them.
-                    HStack(spacing: 12) {
+                    HStack(spacing: 0) {
                         Button {
                             openDirections()
                         } label: {
                             Label("Directions", systemImage: "arrow.triangle.turn.up.right.diamond.fill")
                                 .frame(maxWidth: .infinity)
                         }
+                        Rectangle()
+                            .fill(Color(.separator))
+                            .frame(width: 0.5, height: 22)
+                            .accessibilityHidden(true)
                         Button(role: .destructive) {
                             showingReportIssueConfirmation = true
                         } label: {
@@ -250,16 +290,23 @@ struct StationDetailView: View {
                 // is not configured — so the heading cannot be left dangling
                 // over an empty section.
                 if let fuelSavings {
+                    // The card's own header row says "Best Value", so a section
+                    // header would repeat it; the green tint is what marks this
+                    // block as the savings card.
                     Section {
-                        FuelSavingsSummaryView(
+                        BestValueDetailCard(
                             availability: fuelSavings,
                             amount: fuelSavingsAmount,
                             baselineStationName: savingsBaselineStationName,
-                            distanceUnit: distanceUnit,
+                            distanceUnit: distanceUnit
-                            showInfoAction: { showBestValueInfo = true }
                         )
-                    } header: {
+                    }
-                        Text("Best Value")
+                    .listRowBackground(Color.green.opacity(0.08))
+                    .id("bestValueCard")
+
+                    Section {
+                        // The shared row — same component the Key sheet shows.
+                        HowBestValueRow { showBestValueInfo = true }
                     }
                 }
 
@@ -276,8 +323,27 @@ struct StationDetailView: View {
 #endif
 
             }
-            .navigationTitle(station.name)
+            // No navigationTitle: the sheet's header row carries the name and
-            .navigationBarTitleDisplayMode(.inline)
+            // address, and an inline title would print the name a second time.
+#if DEBUG
+            // QA hook: `-qaDetailBottom` scrolls to the Best Value card so its
+            // lower half (Extra driving cost, Total, the estimate caveat) can be
+            // screenshotted. `simctl` cannot scroll, and `.defaultScrollAnchor`
+            // is a no-op on a List — only scrollTo moves it.
+            .task {
+                guard ProcessInfo.processInfo.arguments.contains("-qaDetailBottom") else { return }
+                try? await Task.sleep(nanoseconds: 3_000_000_000)
+                withAnimation { proxy.scrollTo("bestValueCard", anchor: .bottom) }
+            }
+            .task {
+                // QA hook: `-qaDetailShowBestValueInfo` opens the explanation from
+                // THIS sheet (the More info path), so the two-sheet dismissal can
+                // be screenshotted — simctl has no tap.
+                guard ProcessInfo.processInfo.arguments.contains("-qaDetailShowBestValueInfo") else { return }
+                try? await Task.sleep(nanoseconds: 1_500_000_000)
+                showBestValueInfo = true
+            }
+#endif
             .alert("Report an error?", isPresented: $showingReportIssueConfirmation) {
                 Button("Cancel", role: .cancel) { }
                 Button("Report") {
@@ -320,5 +386,8 @@ struct StationDetailView: View {
             }
 #endif
             }
+            // Closes the ScrollViewReader wrapped around the List: kept last so
+            // every List modifier above stays inside `proxy`'s scope.
+        }
     }
 }

FuelBoard/StationPriceAgeView.swift

@@ -16,10 +16,25 @@ import SwiftUI
 struct StationPriceAgeView: View {
     let assessment: FuelPriceFreshness.Assessment
 
+    /// The More info sheet's facts row prints this under the fuel price inside a
+    /// half-width column, where a `LabeledContent`'s label + value pair cannot
+    /// fit on one line. Compact keeps the SAME words in one caption line.
+    var compact: Bool = false
+
     var body: some View {
         VStack(alignment: .leading, spacing: 2) {
+            if compact {
+                Text("Price updated \(assessment.updateAgeLabel)")
+                    .font(.caption2)
+                    .foregroundStyle(.secondary)
+                    .monospacedDigit()
+                    .lineLimit(1)
+                    .minimumScaleFactor(0.75)
+                    .accessibilityLabel("Price updated \(assessment.updateAgeLabel)")
+            } else {
                 LabeledContent("Price updated", value: assessment.updateAgeLabel)
                     .monospacedDigit()
+            }
             if let notice = assessment.outdatedNotice {
                 Text(notice)
                     .font(.caption2)

FuelBoard/StationsView.swift

@@ -1,6 +1,94 @@
 import SwiftUI
 import WidgetKit
 
+/// The "Key" legend: price ratings, savings capsules, station labels, the
+/// favourite glyph, then the two deeper explanations. One sheet for both list
+/// tabs — Stations opens it from the info button in the navigation bar,
+/// Favourites from the button beside Edit — so the legend cannot drift between
+/// them.
+///
+/// Dismisses through the environment rather than the presenting view's state, and
+/// takes the two nested-sheet flags as bindings, so each tab keeps owning its own
+/// QA launch-argument hooks.
+struct KeySheetView: View {
+    /// The selected fuel's colour. `KeyStationLabelIndicator` draws its pump badge
+    /// in it, so the legend matches the rows the reader is looking at.
+    let fuelTint: Color
+    @Binding var showBestValueInfo: Bool
+    @Binding var showImportantInformation: Bool
+
+    @Environment(\.dismiss) private var dismiss
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section {
+                    KeySheetDescriptionRow(item: KeySheetContent.priceRatings[0]) {
+                        KeyPriceRatingIndicator(item: KeySheetContent.priceRatings[0], color: .green)
+                    }
+                    KeySheetDescriptionRow(item: KeySheetContent.priceRatings[1]) {
+                        KeyPriceRatingIndicator(item: KeySheetContent.priceRatings[1], color: .orange)
+                    }
+                    KeySheetDescriptionRow(item: KeySheetContent.priceRatings[2]) {
+                        KeyPriceRatingIndicator(item: KeySheetContent.priceRatings[2], color: .red)
+                    }
+                } header: {
+                    Text("Price ratings")
+                }
+
+                Section {
+                    ForEach(KeySheetContent.savings, id: \.label) { item in
+                        KeySheetDescriptionRow(item: item) {
+                            KeySavingsCapsule(label: item.label)
+                        }
+                    }
+                } header: {
+                    Text("Savings")
+                }
+
+                Section {
+                    ForEach(KeySheetContent.stationLabels, id: \.label) { item in
+                        KeySheetDescriptionRow(item: item) {
+                            KeyStationLabelIndicator(label: item.label, fuelColor: fuelTint)
+                        }
+                    }
+                } header: {
+                    Text("Station labels")
+                }
+
+                Section {
+                    KeySheetDescriptionRow(item: KeySheetContent.favourite) {
+                        FavouriteStarGlyph(isFavourite: true)
+                    }
+                } header: {
+                    Text("Favourites")
+                }
+
+                Section {
+                    HowBestValueRow { showBestValueInfo = true }
+                }
+
+                Section {
+                    ImportantInformationRow { showImportantInformation = true }
+                }
+            }
+            .navigationTitle("Key")
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Done") { dismiss() }
+                }
+            }
+            // Nested sheet: the Key sheet stays behind the explanation.
+            .sheet(isPresented: $showBestValueInfo) { HowBestValueSheet() }
+            // Nested sheet: the Key sheet stays behind the disclaimer.
+            .importantInformationSheet(isPresented: $showImportantInformation)
+        }
+        .presentationDetents([.fraction(0.6), .large])
+        .presentationBackground(Color(UIColor.systemGroupedBackground))
+    }
+}
+
 /// Stations tab — the main list with fuel picker, distance filter, sort, pagination.
 struct StationsView: View {
     let stations: [FuelStation]
@@ -39,6 +127,11 @@ struct StationsView: View {
     /// the Key sheet and from the More info sheet.
     @State private var showBestValueInfo = false
 
+    /// The shared "Important information" disclaimer sheet. It lives at the
+    /// bottom of the Key sheet here; the same sheet is reused wherever else the
+    /// disclaimer is needed.
+    @State private var showImportantInformation = false
+
     /// Station picked for the More-info sheet (tap action = showDetails).
     @State private var detailStation: FuelStation?
 
@@ -123,6 +216,13 @@ struct StationsView: View {
                         FuelSavingsAdjustmentView(amount: $fuelSavingsAmount)
                     }
 
+                    if fuelSavingsSettings.isConfigured && !stations.isEmpty {
+                        Text(String(localized: "Price colours show pump price competitiveness. Savings compare with your closest station, including journey costs.", comment: "Station listing price and savings explanation"))
+                            .font(.footnote)
+                            .foregroundStyle(.secondary)
+                            .fixedSize(horizontal: false, vertical: true)
+                    }
+
                     if isLoading && stations.isEmpty {
                         HStack(spacing: 10) {
                             ProgressView()
@@ -216,8 +316,28 @@ struct StationsView: View {
                         showBestValueInfo = true
                     }
                 }
+                // QA hook: `-showImportantInfo` opens the Key sheet and then the
+                // shared disclaimer on top of it, so the copy can be
+                // screenshotted without a tap. Same chained requirement as
+                // `-showBestValueInfo` above.
+                if ImportantInformationQA.isRequested {
+                    showKey = true
+                    Task { @MainActor in
+                        try? await Task.sleep(nanoseconds: 1_200_000_000)
+                        showImportantInformation = true
+                    }
+                }
 #endif
             }
+            .onReceive(NotificationCenter.default.publisher(for: .fuelBoardOpenBestValueSettings)) { _ in
+                // "Setup Best Value" from the explanation sheet. That sheet closes
+                // itself and ContentView switches to Settings, but both of the
+                // sheets this view can have open are presented from HERE and each
+                // survived the tab switch, floating over Settings: the Key sheet
+                // and the More info sheet. Close whichever is up.
+                showKey = false
+                detailStation = nil
+            }
             .task(id: stations.count) {
 #if DEBUG
                 // QA hook: `-showDetail` opens the More info sheet for the first
@@ -254,6 +374,7 @@ struct StationsView: View {
             station: station,
             location: location,
             distanceUnit: distanceUnit,
+            priceStyle: priceDisplayStyle,
             selectedFuel: selectedFuel,
             fuelSavings: savingsForStation(station),
             fuelSavingsAmount: fuelSavingsAmount,
@@ -263,87 +384,15 @@ struct StationsView: View {
         )
     }
 
+    /// The legend sheet, shared with the Favourites tab. Only the fuel differs:
+    /// its colour tints the station-label row, so the legend matches the rows the
+    /// reader is actually looking at.
     private var keySheet: some View {
-                NavigationStack {
+        KeySheetView(
-                    List {
+            fuelTint: selectedFuel.tintColor,
-                        Section {
+            showBestValueInfo: $showBestValueInfo,
-                            VStack(spacing: 10) {
+            showImportantInformation: $showImportantInformation
-                                keyCard(
+        )
-                                    icon: "checkmark.circle.fill", color: .green,
-                                    title: "Good price", blurb: "Within 1.5p of the cheapest",
-                                    threshold: "0–1.5p")
-                                keyCard(
-                                    icon: "equal.circle.fill", color: .orange,
-                                    title: "Okay", blurb: "More than 1.5p, up to 4p above the cheapest",
-                                    threshold: ">1.5–4p")
-                                keyCard(
-                                    icon: "exclamationmark.circle.fill", color: .red,
-                                    title: "Pricey", blurb: "More than 4p above the cheapest",
-                                    threshold: ">4p")
-                                Rectangle()
-                                    .fill(Color(.separator))
-                                    .frame(height: 0.5)
-                                    .padding(.vertical, 2)
-                                HStack(spacing: 12) {
-                                    Text("TOP")
-                                        .font(.caption2.bold())
-                                        .padding(.horizontal, 7)
-                                        .padding(.vertical, 3)
-                                        .background(Capsule().fill(.blue.opacity(0.16)))
-                                        .foregroundStyle(.blue)
-                                    Text("Top result for the current sort")
-                                        .font(.subheadline.weight(.semibold))
-                                    Spacer(minLength: 0)
-                                }
-                                .padding(.horizontal, 14)
-                                .padding(.vertical, 12)
-                                .keyCardFill(color: .blue)
-                                HStack(spacing: 12) {
-                                    Image(systemName: "star.fill")
-                                        .font(.title3)
-                                        .foregroundStyle(.yellow)
-                                        .frame(width: 34)
-                                    Text("Star a station to add it to Favourites")
-                                        .font(.subheadline.weight(.semibold))
-                                    Spacer(minLength: 0)
-                                }
-                                .padding(.horizontal, 14)
-                                .padding(.vertical, 12)
-                                .keyCardFill(color: .yellow)
-                                Text("Price differences are shown in pence per litre (p/litre). Colours match each station's rating on the list.")
-                                    .font(.footnote)
-                                    .foregroundStyle(.secondary)
-                                    .frame(maxWidth: .infinity, alignment: .center)
-                                    .multilineTextAlignment(.center)
-                                    .padding(.top, 4)
-                            }
-                            .listRowBackground(Color.clear)
-                            .listRowInsets(EdgeInsets(top: 4, leading: 16, bottom: 4, trailing: 16))
-                        }
-
-                        // The explanation is its own sheet now, opened from this
-                        // row. Gated exactly like the More info row and the Best
-                        // Value card itself: `isConfigured` is the same condition
-                        // `savingsForStation` uses, so the row appears and
-                        // disappears with the feature.
-                        if fuelSavingsSettings.isConfigured {
-                            Section {
-                                HowBestValueRow { showBestValueInfo = true }
-                            }
-                        }
-                    }
-                    .navigationTitle("Key")
-                    .navigationBarTitleDisplayMode(.inline)
-                    .toolbar {
-                        ToolbarItem(placement: .confirmationAction) {
-                            Button("Done") { showKey = false }
-                        }
-                    }
-                    // Nested sheet: the Key sheet stays behind the explanation.
-                    .sheet(isPresented: $showBestValueInfo) { HowBestValueSheet() }
-                }
-                .presentationDetents([.fraction(0.6)])
-                .presentationBackground(Color(UIColor.systemGroupedBackground))
     }
 
     private func stationRow(_ station: FuelStation) -> some View {
@@ -371,45 +420,160 @@ struct StationsView: View {
         return modes
     }
 
-    /// One price-rating card for the Key sheet: accent icon, title + blurb,
+}
-    /// and the rating threshold in the accent colour (mirrors the tip cards).
+
-    private func keyCard(icon: String, color: Color, title: String, blurb: String, threshold: String) -> some View {
+/// The station list's real RAG dot, paired with the rating name. The range lives
-        HStack(spacing: 12) {
+/// in the aligned description column rather than as a separate trailing value.
-            Image(systemName: icon)
+private struct KeyPriceRatingIndicator: View {
-                .font(.title3)
+    let item: KeySheetContent.Item
-                .foregroundStyle(color)
+    let color: Color
-                .frame(width: 34)
+
-            VStack(alignment: .leading, spacing: 2) {
+    var body: some View {
-                Text(LocalizedStringKey(title)).font(.headline)
+        HStack(spacing: 5) {
-                Text(LocalizedStringKey(blurb))
+            PriceRatingDot(color: color)
-                    .font(.caption)
+            Text(LocalizedStringKey(item.label))
-                    .foregroundStyle(.secondary)
+                .font(.caption.weight(.semibold))
                 .fixedSize(horizontal: false, vertical: true)
         }
-            Spacer(minLength: 8)
-            HStack(spacing: 6) {
-                Circle().fill(color).frame(width: 10, height: 10)
-                Text(threshold)
-                    .font(.headline.weight(.bold))
-                    .foregroundStyle(color)
-                    .monospacedDigit()
-            }
-        }
-        .padding(.horizontal, 14)
-        .padding(.vertical, 10)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .keyCardFill(color: color)
     }
 }
 
-/// Card background shared by the Key sheet cards — subtle accent tint over
+/// Every Key section shares this one two-column row. The scaled first-column
-/// the grouped background, matching the tip-section card style.
+/// width keeps every description on the same leading axis while preserving the
-private extension View {
+/// inline layout at accessibility sizes; descriptions own the flexible column
-    func keyCardFill(color: Color) -> some View {
+/// and grow vertically without truncating.
-        background(
+private struct KeySheetDescriptionRow<Indicator: View>: View {
-            RoundedRectangle(cornerRadius: 12)
+    private let indicatorColumnWidth: CGFloat = 128
-                .fill(Color(.secondarySystemGroupedBackground))
+
-                .overlay(RoundedRectangle(cornerRadius: 12).fill(color.opacity(0.08)))
+    let item: KeySheetContent.Item
+    @ViewBuilder let indicator: Indicator
+
+    var body: some View {
+        HStack(alignment: .top, spacing: 12) {
+            indicator
+                .frame(width: indicatorColumnWidth, alignment: .leading)
+            description
+        }
+        .padding(.vertical, 3)
+        .accessibilityElement(children: .ignore)
+        .accessibilityLabel("\(item.label). \(item.description)")
+    }
+
+    private var description: some View {
+        Text(LocalizedStringKey(item.description))
+            .font(.subheadline)
+            .foregroundStyle(.secondary)
+            .fixedSize(horizontal: false, vertical: true)
+            .frame(maxWidth: .infinity, alignment: .leading)
+    }
+}
+
+/// Uses the same listing capsule component as real station rows, with neutral
+/// fixture numbers: only the verdict is visible in this compact variant.
+private struct KeySavingsCapsule: View {
+    let label: String
+
+    private var status: FuelSavingsStatus {
+        switch label {
+        case "Saves": return .worthTheDrive
+        case "Costs more": return .notWorthTheDrive
+        default: return .breakEven
+        }
+    }
+
+    private var result: FuelSavingsResult {
+        let netSaving = status == .worthTheDrive ? 1.0 : (status == .notWorthTheDrive ? -1.0 : 0)
+        return FuelSavingsResult(
+            fillLitres: 30,
+            grossSavingGBP: netSaving,
+            extraDrivingCostGBP: 0,
+            extraDistanceMiles: 0,
+            netSavingGBP: netSaving,
+            status: status,
+            journeyConfidence: .confirmed
+        )
+    }
+
+    var body: some View {
+        // The legend demonstrates the wording, not a figure: `result` above is a
+        // placeholder verdict, and its £1.00 must never reach the screen.
+        ListingFuelSavingsCapsule(result: result, showsAmount: false)
+    }
+}
+
+/// Shared RAG dot used beside live station prices and in the Key.
+struct PriceRatingDot: View {
+    let color: Color
+
+    var body: some View {
+        Circle()
+            .fill(color)
+            .frame(width: 8, height: 8)
+            .accessibilityHidden(true)
+    }
+}
+
+/// Shared favourite glyph used by station rows and the Key.
+struct FavouriteStarGlyph: View {
+    let isFavourite: Bool
+
+    var body: some View {
+        Image(systemName: isFavourite ? "star.fill" : "star")
+            .foregroundStyle(isFavourite ? .yellow : .secondary)
+    }
+}
+
+/// Shared station-label capsule. `StationRow` uses the same view for its live
+/// BEST VALUE/CHEAPEST badge, so the Key cannot drift from the listing style.
+struct StationLabelBadge: View {
+    let label: String
+    let color: Color
+
+    var body: some View {
+        Text(LocalizedStringKey(label))
+            .font(.caption2.bold())
+            .foregroundStyle(color)
+            .padding(.horizontal, 7)
+            .padding(.vertical, 3)
+            .background(Capsule().fill(color.opacity(0.15)))
+            .fixedSize(horizontal: true, vertical: false)
+    }
+}
+
+private struct KeyStationLabelIndicator: View {
+    let label: String
+    let fuelColor: Color
+
+    var body: some View {
+        switch label {
+        case "BEST VALUE":
+            StationLabelBadge(label: label, color: .green)
+        case "CHEAPEST":
+            StationLabelBadge(label: label, color: .blue)
+        case "CLOSEST":
+            // The listing's own capsule, so the Key demonstrates the same soft
+            // blue fill and white text the listing shows. `FuelSavingsCapsule`
+            // remains the detail sheet's alone.
+            ListingFuelSavingsCapsule(result: baselineResult)
+        default:
+            Text("TOP")
+                .font(.caption2.bold())
+                .padding(.horizontal, 4)
+                .padding(.vertical, 2)
+                .background(fuelColor.opacity(0.18), in: Capsule())
+                .fixedSize(horizontal: true, vertical: false)
+        }
+    }
+
+    private var baselineResult: FuelSavingsResult {
+        FuelSavingsResult(
+            fillLitres: 30,
+            grossSavingGBP: 0,
+            extraDrivingCostGBP: 0,
+            extraDistanceMiles: 0,
+            netSavingGBP: 0,
+            status: .baseline,
+            journeyConfidence: .confirmed
         )
     }
 }

FuelBoard/WatchSyncManager.swift

@@ -4,6 +4,11 @@ import WatchConnectivity
 extension Notification.Name {
     static let fuelBoardWatchRefreshRequested = Notification.Name("FuelBoardWatchRefreshRequested")
     static let fuelBoardShowStationDetail = Notification.Name("FuelBoardShowStationDetail")
+    /// Posted by the "How Best Value works" sheet's Setup Best Value button, so
+    /// the app can close that sheet's stack and land on Settings — whose Best
+    /// Value section is the first thing in its list. The sheet cannot switch
+    /// tabs itself: it is presented two levels below the tab view.
+    static let fuelBoardOpenBestValueSettings = Notification.Name("FuelBoardOpenBestValueSettings")
     /// Posted when a road-distance fill finishes, so the app's rows re-read the
     /// distance they are showing — those reads happen inside the row views, so
     /// nothing else would invalidate them.

FuelBoard/en.lproj/Localizable.strings

@@ -25,14 +25,32 @@
 "Show %lld more (%lld remaining)" = "Show %lld more (%lld remaining)";
 "All %lld stations shown" = "All %lld stations shown";
 "Key" = "Key";
+"Price ratings" = "Price ratings";
 "Good price" = "Good price";
-"Within 1.5p of the cheapest" = "Within 1.5p of the cheapest";
+"Within 1.5p/L of the cheapest." = "Within 1.5p/L of the cheapest.";
 "Okay" = "Okay";
-"More than 1.5p, up to 4p above the cheapest" = "More than 1.5p, up to 4p above the cheapest";
+"More than 1.5p/L, up to 4p/L above the cheapest." = "More than 1.5p/L, up to 4p/L above the cheapest.";
 "Pricey" = "Pricey";
-"More than 4p above the cheapest" = "More than 4p above the cheapest";
+"More than 4p/L above the cheapest." = "More than 4p/L above the cheapest.";
-"Top result for the current sort" = "Top result for the current sort";
+"Savings" = "Savings";
-"Star a station to add it to Favourites" = "Star a station to add it to Favourites";
+"Saves" = "Saves";
+"You’ll save money compared with your closest station, including travel costs." = "You’ll save money compared with your closest station, including travel costs.";
+"Break even" = "Break even";
+"The saving or extra cost is negligible." = "The saving or extra cost is negligible.";
+"Costs more" = "Costs more";
+"Filling up here costs more than at your closest station, including travel." = "Filling up here costs more than at your closest station, including travel.";
+/* Station listing verdict capsule: the words above the figure */
+"Costs" = "Costs";
+"(approx.)" = "(approx.)";
+"%@ more" = "%@ more";
+"Station labels" = "Station labels";
+"CLOSEST" = "CLOSEST";
+"Meets your minimum saving after travel costs." = "Meets your minimum saving after travel costs.";
+"The lowest fuel price per litre within your selected range." = "The lowest fuel price per litre within your selected range.";
+"The nearest station by journey distance." = "The nearest station by journey distance.";
+"The cheapest station in your Favourites for the selected fuel." = "The cheapest station in your Favourites for the selected fuel.";
+"Star a station to save it to your Favourites." = "Star a station to save it to your Favourites.";
+"How does Best Value work?" = "How does Best Value work?";
 /* Star button in the More info sheet heading (accessibility labels) */
 "Add to favourites" = "Add to favourites";
 "Remove from favourites" = "Remove from favourites";
@@ -41,7 +59,7 @@
 "Best Value compares each station with the closest station by journey distance. It works out what you could save at the pump, then takes off the fuel used for the extra return journey." = "Best Value compares each station with the closest station by journey distance. It works out what you could save at the pump, then takes off the fuel used for the extra return journey.";
 "With a £ budget you spend that amount at each station; the litres differ by station. Savings compare those litres with the same quantity at your closest station, then deduct extra journey fuel. You do not receive cash back." = "With a £ budget you spend that amount at each station; the litres differ by station. Savings compare those litres with the same quantity at your closest station, then deduct extra journey fuel. You do not receive cash back.";
 "Your closest station by journey distance is the baseline — every other saving is measured against it." = "Your closest station by journey distance is the baseline — every other saving is measured against it.";
-"Savings below are estimated against the closest station by journey distance — the same baseline as the Stations list." = "Savings below are estimated against the closest station by journey distance — the same baseline as the Stations list.";
+"Price colours show pump price competitiveness. Savings compare with your closest station, including journey costs." = "Price colours show pump price competitiveness. Savings compare with your closest station, including journey costs.";
 "Your fill-up amount and MPG are used to show whether you could save overall." = "Your fill-up amount and MPG are used to show whether you could save overall.";
 "Results are marked “Approx.” until road distances are available." = "Results are marked “Approx.” until road distances are available.";
 
@@ -58,19 +76,18 @@
 "Radius" = "Radius";
 "%lld %@" = "%lld %@";
 "Follow search (%@)" = "Follow search (%@)";
-"When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling %@ 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." = "When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling %@ 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.";
 "No stations monitored yet — open the Stations tab to load prices first." = "No stations monitored yet — open the Stations tab to load prices first.";
 "Last alert" = "Last alert";
 "Live Activity" = "Live Activity";
-"Shows the cheapest station for the fuel and distance you pick here on the Lock Screen and Dynamic Island — independent of the Stations tab (choose Follow search to mirror its distance instead). Updates as you drive; tap to open directions. Live Activities can be disabled in System Settings → Live Activities." = "Shows the cheapest station for the fuel and distance you pick here on the Lock Screen and Dynamic Island — independent of the Stations tab (choose Follow search to mirror its distance instead). Updates as you drive; tap to open directions. Live Activities can be disabled in System Settings → Live Activities.";
 
 /* Settings tab */
 "Units" = "Units";
 "Price display" = "Price display";
-"Distances and search radii across the app, widget and alerts are shown in this unit. Prices can be shown as on a station sign (129.9) or in pounds and pence (£1.29⁹/L)." = "Distances and search radii across the app, widget and alerts are shown in this unit. Prices can be shown as on a station sign (129.9) or in pounds and pence (£1.29⁹/L).";
+"Choose how distances are displayed throughout FuelBoard." = "Choose how distances are displayed throughout FuelBoard.";
+"Show prices as 129.9p or £1.299 per litre." = "Show prices as 129.9p or £1.299 per litre.";
 "Tap station" = "Tap station";
 "Tap action" = "Tap action";
-"Tapping a station either opens directions straight away or shows its details first." = "Tapping a station either opens directions straight away or shows its details first.";
+"Choose what happens when you tap a station: get directions or view its details." = "Choose what happens when you tap a station: get directions or view its details.";
 "Open map" = "Open map";
 "More info" = "More info";
 "Name" = "Name";
@@ -81,7 +98,18 @@
 "Directions to %@" = "Directions to %@";
 "Opens Apple Maps with driving directions" = "Opens Apple Maps with driving directions";
 "Show introduction" = "Replay onboarding";
-"Replay the welcome screen, including the location and notification permission prompts." = "Replay the welcome screen, including the location and notification permission prompts.";
+"View the welcome screens and set up permissions again." = "View the welcome screens and set up permissions again.";
+
+/* Settings — refined copy (Fuel Savings, Distances, Data checking) */
+"Fill-up amount" = "Fill-up amount";
+"Find stations that could save you money, even after the cost of driving there." = "Find stations that could save you money, even after the cost of driving there.";
+"How many miles your car travels per gallon." = "How many miles your car travels per gallon.";
+"How much you plan to spend on fuel." = "How much you plan to spend on fuel.";
+"How many litres you usually buy." = "How many litres you usually buy.";
+"The smallest saving you'd consider worth the extra drive." = "The smallest saving you'd consider worth the extra drive.";
+"FuelBoard compares fuel prices and travel costs to find stations that could save you money. Results are estimates based on your settings and driving distance." = "FuelBoard compares fuel prices and travel costs to find stations that could save you money. Results are estimates based on your settings and driving distance.";
+"Use actual driving distances instead of straight-line estimates. Routes are calculated while the app is open." = "Use actual driving distances instead of straight-line estimates. Routes are calculated while the app is open.";
+"Background updates depend on when your iPhone allows them." = "Background updates depend on when your iPhone allows them.";
 "Test alert notification (real data)" = "Test alert notification (real data)";
 "Send plain test notification" = "Send plain test notification";
 "Debug" = "Debug";
@@ -202,8 +230,6 @@
 /* Alerts and favourites localisation pass */
 "Cheapest favourite" = "Cheapest favourite";
 "Check now" = "Check now";
-"Price-drop alerts" = "Price-drop alerts";
-"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." = "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.";
 "Cheapest station" = "Cheapest station";
 "Alert type" = "Alert type";
 "Best Value" = "Best Value";
@@ -212,19 +238,15 @@
 "Minimum saving %@ — change in Settings, Fuel Savings." = "Minimum saving %@ — change in Settings, Fuel Savings.";
 "Set up Best Value first so FuelBoard can account for your fill size, MPG and travel cost." = "Set up Best Value first so FuelBoard can account for your fill size, MPG and travel cost.";
 "Set up Best Value first so Best Value alerts can account for your fill size, MPG and travel cost." = "Set up Best Value first so Best Value alerts can account for your fill size, MPG and travel cost.";
-"When you approach the Best Value station within the radius, FuelBoard sends a notification if it could leave you at least %@ better off after extra return travel. Nearby stations selling %@ are watched — favourites get priority — and each station alerts at most once per hour." = "When you approach the Best Value station within the radius, FuelBoard sends a notification if it could leave you at least %@ better off after extra return travel. Nearby stations selling %@ are watched — favourites get priority — and each station alerts at most once per hour.";
 "Proximity alerts" = "Proximity alerts";
-"When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling %@ 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." = "When you approach a station that is the cheapest within the radius, FuelBoard sends a notification — even with the app closed. Nearby stations selling %@ 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.";
-"Set-and-forget: alerts behave exactly like the Stations-tab search distance (capped at 8 miles for reliable geofencing)." = "Set-and-forget: alerts behave exactly like the Stations-tab search distance (capped at 8 miles for reliable geofencing).";
-"Town driving. Fires most often — you're rarely inside the circle for long, so pings are meaningful. Best for stop-start local trips." = "Town driving. Fires most often — you're rarely inside the circle for long, so pings are meaningful. Best for stop-start local trips.";
-"City or suburb commute. Slightly earlier heads-up than the smallest option; still fires regularly around town." = "City or suburb commute. Slightly earlier heads-up than the smallest option; still fires regularly around town.";
-"Mixed driving. Middle ground: heads-up a few minutes out, still works in most towns." = "Mixed driving. Middle ground: heads-up a few minutes out, still works in most towns.";
-"A-roads and motorway exits. Wide early warning for longer trips — but in town it rarely fires, because you're usually already inside the circle." = "A-roads and motorway exits. Wide early warning for longer trips — but in town it rarely fires, because you're usually already inside the circle.";
-"Long-distance journeys. Maximum reach: a ping when a cheap station is coming up from far out. In town this essentially never fires." = "Long-distance journeys. Maximum reach: a ping when a cheap station is coming up from far out. In town this essentially never fires.";
-"%@ — %@" = "%@ — %@";
 
 /* Best Value calculation and station price age */
-"£ compares the litres your budget buys at each station; Litres compares one fixed quantity." = "£ compares the litres your budget buys at each station; Litres compares one fixed quantity.";
+"How much fuel?" = "How much fuel?";
+"Adjust your fill-up amount for this visit. Your default won’t change." = "Adjust your fill-up amount for this visit. Your default won’t change.";
+"About comparison modes" = "About comparison modes";
+"Comparison modes" = "Comparison modes";
+"£: Compare how much fuel your budget buys at each station." = "£: Compare how much fuel your budget buys at each station.";
+"Litres: Compare the cost of buying the same amount of fuel." = "Litres: Compare the cost of buying the same amount of fuel.";
 "You pay the selected budget here. The saving compares the same litres at your closest station; litres differ between stations, and this is not a refund." = "You pay the selected budget here. The saving compares the same litres at your closest station; litres differ between stations, and this is not a refund.";
 "Best Value unavailable · location needed" = "Best Value unavailable · location needed";
 "your order" = "your order";
@@ -234,3 +256,34 @@
 "May be outdated" = "May be outdated";
 "Fuel you'll receive" = "Fuel you'll receive";
 "Compared with your closest station." = "Compared with your closest station.";
+
+/* Alerts tab — refined copy (sections, descriptions, limitations) */
+"Favourite price alerts" = "Favourite price alerts";
+"Get notified when a different favourite becomes the cheapest, or your cheapest favourite drops in price." = "Get notified when a different favourite becomes the cheapest, or your cheapest favourite drops in price.";
+"Get notified when you're near one of the cheapest stations for your chosen fuel." = "Get notified when you're near one of the cheapest stations for your chosen fuel.";
+"Get notified when you're near a station that could save you money after travel costs." = "Get notified when you're near a station that could save you money after travel costs.";
+"Get alerts when you're within %@ of a matching station." = "Get alerts when you're within %@ of a matching station.";
+"Get alerts when you're within %@ of a matching station (your search distance is capped for reliable alerts)." = "Get alerts when you're within %@ of a matching station (your search distance is capped for reliable alerts).";
+"Uses the same distance as your station search." = "Uses the same distance as your station search.";
+"See the cheapest nearby station on your Lock Screen and Dynamic Island, with updates as you travel." = "See the cheapest nearby station on your Lock Screen and Dynamic Island, with updates as you travel.";
+"Background alerts depend on when your iPhone allows them; each station alerts at most once an hour." = "Background alerts depend on when your iPhone allows them; each station alerts at most once an hour.";
+
+/* Important information — the shared disclaimer sheet (one card per heading) */
+"Important information" = "Important information";
+"Fuel Prices" = "Fuel Prices";
+"FuelBoard uses fuel price information published through the UK Government's fuel price data scheme. Prices are supplied by retailers and may change or differ from those displayed in the app." = "FuelBoard uses fuel price information published through the UK Government's fuel price data scheme. Prices are supplied by retailers and may change or differ from those displayed in the app.";
+"While we aim to provide accurate, up-to-date information, we cannot guarantee that displayed prices reflect those currently available at the pump." = "While we aim to provide accurate, up-to-date information, we cannot guarantee that displayed prices reflect those currently available at the pump.";
+"Fuel Availability" = "Fuel Availability";
+"A displayed fuel price does not guarantee availability. Stations may temporarily run out of fuel, have pumps out of service, be closed or no longer offer a particular fuel type." = "A displayed fuel price does not guarantee availability. Stations may temporarily run out of fuel, have pumps out of service, be closed or no longer offer a particular fuel type.";
+"We recommend checking availability before making a special journey." = "We recommend checking availability before making a special journey.";
+"Savings & Best Value" = "Savings & Best Value";
+"Savings and Best Value recommendations are estimates based on available fuel prices, your selected fill-up amount, estimated travel costs and other relevant settings." = "Savings and Best Value recommendations are estimates based on available fuel prices, your selected fill-up amount, estimated travel costs and other relevant settings.";
+"Actual savings may vary depending on fuel consumption, driving conditions, routes and current pump prices. A Best Value recommendation does not guarantee the lowest overall cost." = "Actual savings may vary depending on fuel consumption, driving conditions, routes and current pump prices. A Best Value recommendation does not guarantee the lowest overall cost.";
+"Journey Estimates" = "Journey Estimates";
+"Travel distances, journey times and associated fuel costs are estimates. Where actual road distances are unavailable, approximate distances may be used." = "Travel distances, journey times and associated fuel costs are estimates. Where actual road distances are unavailable, approximate distances may be used.";
+"Actual journeys may differ due to traffic, road conditions, diversions and individual driving habits." = "Actual journeys may differ due to traffic, road conditions, diversions and individual driving habits.";
+"Before You Travel" = "Before You Travel";
+"Fuel prices and availability can change without notice. Always check the current price and fuel availability before making a special journey or filling up." = "Fuel prices and availability can change without notice. Always check the current price and fuel availability before making a special journey or filling up.";
+"Disclaimer" = "Disclaimer";
+"FuelBoard provides information to help you compare fuel prices and make informed decisions. We cannot guarantee the accuracy, completeness or availability of fuel price information, savings estimates or recommendations." = "FuelBoard provides information to help you compare fuel prices and make informed decisions. We cannot guarantee the accuracy, completeness or availability of fuel price information, savings estimates or recommendations.";
+"FuelBoard accepts no responsibility for additional travel costs, financial losses or decisions made using the information provided." = "FuelBoard accepts no responsibility for additional travel costs, financial losses or decisions made using the information provided.";

FuelBoardTests/Tests/FuelBoardSharedTests/FuelBoardTests.swift

@@ -357,6 +357,68 @@ final class AlertsFuelTests: XCTestCase {
     }
 }
 
+/// The Settings sliders save ONE field per gesture instead of rewriting all four
+/// keys (four UserDefaults writes plus four keychain round trips per drag is what
+/// made them stutter). These pin the store half of that: a single-field save must
+/// leave the other three keys exactly as they were.
+final class FuelSavingsFieldSaveTests: XCTestCase {
+    private func seed() {
+        FuelStore.saveFuelSavingsSettings(FuelSavingsSettings(
+            enabled: true,
+            mpg: 40,
+            preferredAmount: FuelSavingsFillAmount(value: 50, unit: .pounds)
+        ))
+    }
+
+    func testSavingMPGLeavesTheOtherFieldsAlone() {
+        seed()
+        var edited = FuelStore.loadFuelSavingsSettings()
+        edited.mpg = 62
+        FuelStore.saveFuelSavingsField(.mpg, from: edited)
+        let reloaded = FuelStore.loadFuelSavingsSettings()
+        XCTAssertEqual(reloaded.mpg, 62, "the edited field is written")
+        XCTAssertTrue(reloaded.enabled, "enabled survives an MPG save")
+        XCTAssertEqual(reloaded.preferredAmount.value, 50, "the fill-up amount survives an MPG save")
+        XCTAssertEqual(reloaded.preferredAmount.unit, .pounds, "the unit survives an MPG save")
+    }
+
+    func testSavingFillAmountLeavesMPGAndUnitAlone() {
+        seed()
+        var edited = FuelStore.loadFuelSavingsSettings()
+        edited.preferredAmount.value = 75
+        FuelStore.saveFuelSavingsField(.amount, from: edited)
+        let reloaded = FuelStore.loadFuelSavingsSettings()
+        XCTAssertEqual(reloaded.preferredAmount.value, 75, "the edited field is written")
+        XCTAssertEqual(reloaded.mpg, 40, "MPG survives a fill-up save")
+        XCTAssertEqual(reloaded.preferredAmount.unit, .pounds, "the unit survives a fill-up save")
+    }
+
+    func testSavingEnabledLeavesTheNumbersAlone() {
+        seed()
+        var edited = FuelStore.loadFuelSavingsSettings()
+        edited.enabled = false
+        FuelStore.saveFuelSavingsField(.enabled, from: edited)
+        let reloaded = FuelStore.loadFuelSavingsSettings()
+        XCTAssertFalse(reloaded.enabled, "the edited field is written")
+        XCTAssertEqual(reloaded.mpg, 40, "MPG survives an enabled save")
+        XCTAssertEqual(reloaded.preferredAmount.value, 50, "the fill-up amount survives an enabled save")
+    }
+
+    func testWholeSettingsSaveStillWritesEveryField() {
+        seed()
+        FuelStore.saveFuelSavingsSettings(FuelSavingsSettings(
+            enabled: false,
+            mpg: 55,
+            preferredAmount: FuelSavingsFillAmount(value: 30, unit: .litres)
+        ))
+        let reloaded = FuelStore.loadFuelSavingsSettings()
+        XCTAssertFalse(reloaded.enabled)
+        XCTAssertEqual(reloaded.mpg, 55)
+        XCTAssertEqual(reloaded.preferredAmount.value, 30)
+        XCTAssertEqual(reloaded.preferredAmount.unit, .litres)
+    }
+}
+
 final class AlertRadiusFollowTests: XCTestCase {
     func testAlertRadiusOptionsAreMileFriendly() {
         // 1–2 city, 3 town, 5 default, 8 motorway — the geofence ceiling.
@@ -787,6 +849,12 @@ final class RoadDistanceCacheTests: XCTestCase {
         XCTAssertEqual(confirmed.labelWithReturn(unit: .kilometers), "3.2 km (6.8 km return)")
         XCTAssertEqual(confirmed.spokenLabel(unit: .miles), "2.0 miles")
         XCTAssertEqual(confirmed.spokenLabelWithReturn(unit: .miles), "2.0 miles, 4.2 miles return")
+        // The return figure split out on its own — a surface that prints the
+        // one-way and the return distance on separate lines still gets BOTH from
+        // this type, marker included.
+        XCTAssertEqual(confirmed.returnLabel(unit: .miles), "4.2 mi return")
+        XCTAssertEqual(confirmed.returnLabel(unit: .kilometers), "6.8 km return")
+        XCTAssertEqual(confirmed.spokenReturnLabel(unit: .miles), "4.2 miles return")
 
         let approximate = FuelStore.stationDistanceDisplay(station: unrouted, userLat: 51.6, userLng: -0.1)
         XCTAssertTrue(approximate.isApproximate, "the straight-line fallback must be identified as one")
@@ -828,6 +896,10 @@ final class RoadDistanceCacheTests: XCTestCase {
         XCTAssertFalse(display.returnIsApproximate)
         XCTAssertEqual(display.labelWithReturn(unit: .miles), "2.9 mi (5.9 mi return)")
         XCTAssertEqual(display.spokenLabelWithReturn(unit: .miles), "2.9 miles, 5.9 miles return")
+        // The split-out return figure must use the INDEPENDENT return route
+        // (9.47 km), not a doubled one-way (2 × 4.65 = 9.30 km → 5.8 mi).
+        XCTAssertEqual(display.returnLabel(unit: .miles), "5.9 mi return")
+        XCTAssertEqual(display.spokenReturnLabel(unit: .miles), "5.9 miles return")
     }
 
     /// The marker tracks the cache on its own: same station, bare figure once its

FuelBoardTests/Tests/FuelBoardSharedTests/FuelSavingsEstimateTests.swift

@@ -18,6 +18,70 @@ final class FuelSavingsEstimateTests: XCTestCase {
     )
     private let amount = FuelSavingsFillAmount(value: 40, unit: .pounds)
 
+    func testListingCapsulePutsTheFigureOnItsOwnLine() {
+        func result(_ status: FuelSavingsStatus, _ confidence: JourneyConfidence) -> FuelSavingsResult {
+            FuelSavingsResult(
+                fillLitres: 30,
+                grossSavingGBP: status == .notWorthTheDrive ? 0 : 12.50,
+                extraDrivingCostGBP: status == .notWorthTheDrive ? 123.45 : 0,
+                extraDistanceMiles: 2,
+                netSavingGBP: status == .notWorthTheDrive ? -123.45 : 12.50,
+                status: status,
+                journeyConfidence: confidence
+            )
+        }
+
+        // The figure takes its own line, so the capsule's shape is decided by the
+        // data rather than by how much width the price column hands it.
+        XCTAssertEqual(result(.worthTheDrive, .confirmed).listingVerdict().lines,
+                       ["Saves", "£12.50"])
+        XCTAssertEqual(result(.worthTheDrive, .estimated).listingVerdict().lines,
+                       ["Saves", "£12.50", "(approx.)"])
+        XCTAssertEqual(result(.notWorthTheDrive, .confirmed).listingVerdict().lines,
+                       ["Costs", "£123.45 more"])
+        XCTAssertEqual(result(.notWorthTheDrive, .estimated).listingVerdict().lines,
+                       ["Costs", "£123.45 more", "(approx.)"])
+
+        // Break even carries no figure — ±£0.05 is noise — so it stays one line
+        // when confirmed and gains a second only for the estimate qualifier.
+        XCTAssertEqual(result(.breakEven, .confirmed).listingVerdict().lines, ["Break even"])
+        XCTAssertEqual(result(.breakEven, .estimated).listingVerdict().lines,
+                       ["Break even", "(approx.)"])
+        XCTAssertEqual(result(.baseline, .confirmed).listingVerdict().lines, ["Closest station"])
+
+        // The Key sheet's legend demonstrates the wording, never a figure.
+        XCTAssertEqual(
+            result(.notWorthTheDrive, .confirmed).listingVerdict(showsAmount: false).lines,
+            ["Costs"]
+        )
+
+        // VoiceOver keeps a single line: a drawn break is a spoken pause.
+        XCTAssertEqual(result(.worthTheDrive, .estimated).listingCapsuleHeadline(),
+                       "Saves £12.50 (approx.)")
+    }
+
+    func testDetailCapsulePlacesApproximationAfterTheFinancialResult() {
+        func result(_ status: FuelSavingsStatus, _ confidence: JourneyConfidence) -> FuelSavingsResult {
+            FuelSavingsResult(
+                fillLitres: 30,
+                grossSavingGBP: status == .notWorthTheDrive ? 0 : 2.50,
+                extraDrivingCostGBP: status == .notWorthTheDrive ? 1.20 : 0,
+                extraDistanceMiles: 2,
+                netSavingGBP: status == .notWorthTheDrive ? -1.20 : 2.50,
+                status: status,
+                journeyConfidence: confidence
+            )
+        }
+
+        XCTAssertEqual(result(.worthTheDrive, .estimated).detailCapsuleHeadline(), "Save £2.50 (approx.)")
+        XCTAssertEqual(result(.notWorthTheDrive, .estimated).detailCapsuleHeadline(), "Costs £1.20 more (approx.)")
+        XCTAssertEqual(result(.breakEven, .estimated).detailCapsuleHeadline(), "Break even (approx.)")
+        XCTAssertEqual(result(.worthTheDrive, .confirmed).detailCapsuleHeadline(), "Save £2.50")
+        XCTAssertEqual(result(.notWorthTheDrive, .confirmed).detailCapsuleHeadline(), "Costs £1.20 more")
+        XCTAssertEqual(result(.breakEven, .confirmed).detailCapsuleHeadline(), "Break even")
+        XCTAssertEqual(result(.worthTheDrive, .estimated).detailCapsuleSpokenHeadline(), "Save £2.50 (approximately)")
+    }
+
     private func station(_ id: String,
                          price: Double?,
                          lat: Double = 51.5,
@@ -640,6 +704,29 @@ final class FuelSavingsEstimateTests: XCTestCase {
         )
     }
 
+    /// The same figure on its own, for the sheet's row form ("Extra return
+    /// travel | 6.4 mi"): identical value and identical marker rule, so the row
+    /// and the caption can never disagree about being an estimate. Below the
+    /// 0.05-mile floor both forms return nil together.
+    func testExtraTravelDistanceLabelMatchesTheCaption() {
+        XCTAssertEqual(
+            FuelSavingsFormat.extraTravelDistanceLabel(extraDistanceMiles: 6.4, unit: .miles),
+            "6.4 mi"
+        )
+        XCTAssertEqual(
+            FuelSavingsFormat.extraTravelDistanceLabel(extraDistanceMiles: 6.4, unit: .miles, confidence: .estimated),
+            "Approx. 6.4 mi"
+        )
+        XCTAssertEqual(
+            FuelSavingsFormat.extraTravelDistanceLabel(extraDistanceMiles: 6.4, unit: .kilometers),
+            "10.3 km"
+        )
+        XCTAssertNil(
+            FuelSavingsFormat.extraTravelDistanceLabel(extraDistanceMiles: 0.04, unit: .miles),
+            "below the floor there is no extra travel to name"
+        )
+    }
+
     /// VoiceOver gets words, not abbreviations: "Approx." → "Approximately" and
     /// "mi"/"km" → "miles"/"kilometres".
     func testSpokenLabelsSpellOutTheAbbreviations() {

FuelBoardTests/Tests/FuelBoardSharedTests/FuelSavingsTests.swift

@@ -257,3 +257,39 @@ final class StationRecommendationBadgeTests: XCTestCase {
         )
     }
 }
+
+final class KeySheetContentTests: XCTestCase {
+    func testPriceRatingsExplainTheImplementedRAGBoundaries() {
+        XCTAssertEqual(KeySheetContent.priceRatings, [
+            .init(label: "Good price", description: "Within 1.5p/L of the cheapest."),
+            .init(label: "Okay", description: "More than 1.5p/L, up to 4p/L above the cheapest."),
+            .init(label: "Pricey", description: "More than 4p/L above the cheapest.")
+        ])
+    }
+
+    func testSavingsExplainVerdictsWithoutImplyingMinimumSavingQualification() {
+        XCTAssertEqual(KeySheetContent.savings, [
+            .init(label: "Saves", description: "You’ll save money compared with your closest station, including travel costs."),
+            .init(label: "Break even", description: "The saving or extra cost is negligible."),
+            .init(label: "Costs more", description: "Filling up here costs more than at your closest station, including travel.")
+        ])
+        XCTAssertFalse(KeySheetContent.savings.contains { $0.label == "Small saving" })
+    }
+
+    func testStationLabelsDescribeTheCurrentQualificationAndRangeRules() {
+        XCTAssertEqual(KeySheetContent.stationLabels, [
+            .init(label: "BEST VALUE", description: "Meets your minimum saving after travel costs."),
+            .init(label: "CHEAPEST", description: "The lowest fuel price per litre within your selected range."),
+            .init(label: "CLOSEST", description: "The nearest station by journey distance."),
+            .init(label: "TOP", description: "The cheapest station in your Favourites for the selected fuel.")
+        ])
+    }
+
+    func testFavouriteAndHelpCopyRemainPinned() {
+        XCTAssertEqual(
+            KeySheetContent.favourite,
+            .init(label: "Favourites", description: "Star a station to save it to your Favourites.")
+        )
+        XCTAssertEqual(KeySheetContent.helpTitle, "How does Best Value work?")
+    }
+}

FuelBoardTests/Tests/FuelBoardSharedTests/FuelStoreTests.swift

@@ -31,3 +31,12 @@ final class FuelStoreBestValueThresholdTests: XCTestCase {
         }
     }
 }
+
+final class FuelStoreAlertModeTests: XCTestCase {
+    func testLegacyBestValueSelectionLoadsAsCheapest() {
+        FuelStore.saveAlertsMode(.bestValue)
+        defer { FuelStore.saveAlertsMode(.cheapest) }
+
+        XCTAssertEqual(FuelStore.loadAlertsMode(), .cheapest)
+    }
+}

Shared/DataRefreshMode.swift

@@ -16,9 +16,9 @@ enum DataRefreshMode: String, CaseIterable, Identifiable {
     var summary: String {
         switch self {
         case .standard:
-            return "Saves battery. Refreshes price data up to twice daily."
+            return "Saves battery by checking for new prices up to twice a day."
         case .smart:
-            return "Checks for newer data more often in the background and refreshes full prices only when an update is available."
+            return "Checks for new prices more often, keeping your data fresher."
         }
     }
 }

Shared/FuelSavings.swift

@@ -136,11 +136,25 @@ enum FuelSavingsFormat {
     static func extraTravelLabel(extraDistanceMiles: Double,
                                  unit: DistanceUnit,
                                  confidence: JourneyConfidence = .confirmed) -> String? {
+        guard let distanceText = extraTravelDistanceLabel(extraDistanceMiles: extraDistanceMiles,
+                                                         unit: unit,
+                                                         confidence: confidence) else { return nil }
+        return "\(distanceText) extra return travel"
+    }
+
+    /// The extra-travel FIGURE on its own, with its confidence marker: "4.3 mi"
+    /// or "Approx. 4.3 mi".
+    ///
+    /// A row form ("Extra return travel | 4.3 mi") names the journey in its own
+    /// label, so this is the same figure and the same "Approx." rule as
+    /// `extraTravelLabel`, from the same inputs — never rebuilt at a call site,
+    /// or one surface marks an estimate while another drops the marker.
+    static func extraTravelDistanceLabel(extraDistanceMiles: Double,
+                                         unit: DistanceUnit,
+                                         confidence: JourneyConfidence = .confirmed) -> String? {
         guard extraDistanceMiles > 0.05 else { return nil }
         let distanceText = distance(extraDistanceMiles, unit: unit)
-        return confidence == .estimated
+        return confidence == .estimated ? "Approx. \(distanceText)" : distanceText
-            ? "Approx. \(distanceText) extra return travel"
-            : "\(distanceText) extra return travel"
     }
 
     /// Compact comparison copy kept outside the coloured verdict capsule.
@@ -222,12 +236,100 @@ extension FuelSavingsResult {
         headline().replacingOccurrences(of: "Approx. ", with: "Approximately ")
     }
 
+    /// Full monetary verdict used by Station Details. Estimated confidence is a
+    /// trailing qualifier so the amount remains the first figure users scan.
+    func detailCapsuleHeadline() -> String {
+        let qualifier = journeyConfidence.isEstimated ? " (approx.)" : ""
+        switch status {
+        case .baseline:
+            return Self.baselineHeadline
+        case .breakEven:
+            return "\(Self.breakEvenHeadline)\(qualifier)"
+        case .worthTheDrive:
+            return "Save \(FuelSavingsFormat.money(netSavingGBP))\(qualifier)"
+        case .notWorthTheDrive:
+            return "Costs \(FuelSavingsFormat.money(abs(netSavingGBP))) more\(qualifier)"
+        }
+    }
+
+    func detailCapsuleSpokenHeadline() -> String {
+        detailCapsuleHeadline().replacingOccurrences(of: "(approx.)", with: "(approximately)")
+    }
+
     /// Row capsule copy. The baseline relationship is shown as secondary text
     /// beside the capsule in the station listing and detail summary, so the
     /// capsule itself contains only the verdict.
     func capsuleHeadline() -> String {
         headline(compact: true)
     }
+
+    /// The station-listing capsule's verdict, split into the lines the capsule
+    /// draws.
+    ///
+    /// The amount always takes its OWN line, so where the capsule breaks is
+    /// decided by the data, never by the width it was handed: the figure can
+    /// never straddle two lines, and a taller verdict grows the capsule downward
+    /// instead of widening the row's fixed price column.
+    struct ListingVerdict: Equatable {
+        /// "Saves", "Costs", "Break even" or "Closest station".
+        let headline: String
+        /// "£3.10" / "£1.20 more" — nil when there is no figure to show.
+        let amount: String?
+        /// "(approx.)" when the journey behind the figure was estimated.
+        let qualifier: String?
+
+        var lines: [String] { [headline, amount, qualifier].compactMap { $0 } }
+
+        /// Single-line form, for VoiceOver and tests. A drawn newline is a pause
+        /// in the middle of a phrase when spoken.
+        var spokenText: String { lines.joined(separator: " ") }
+    }
+
+    /// Verdict for the station listing rows — Stations and Favourites share one
+    /// row, so they share this. `showsAmount: false` is the Key sheet's legend,
+    /// which demonstrates the wording without inventing a figure.
+    func listingVerdict(showsAmount: Bool = true) -> ListingVerdict {
+        let qualifier = journeyConfidence.isEstimated ? String(localized: "(approx.)") : nil
+        switch status {
+        case .worthTheDrive:
+            return ListingVerdict(
+                headline: String(localized: "Saves"),
+                amount: showsAmount ? FuelSavingsFormat.money(netSavingGBP) : nil,
+                qualifier: qualifier
+            )
+        case .notWorthTheDrive:
+            return ListingVerdict(
+                headline: String(localized: "Costs"),
+                amount: showsAmount ? Self.amountWithMore(abs(netSavingGBP)) : nil,
+                qualifier: qualifier
+            )
+        case .breakEven:
+            // No figure: ±£0.05 is noise, so this stays a single line unless the
+            // estimate qualifier adds its own.
+            return ListingVerdict(
+                headline: String(localized: "Break even"),
+                amount: nil,
+                qualifier: qualifier
+            )
+        case .baseline:
+            return ListingVerdict(
+                headline: Self.baselineHeadline,
+                amount: nil,
+                qualifier: nil
+            )
+        }
+    }
+
+    /// "£1.20 more" — kept as a format string so the copy editor owns the word.
+    private static func amountWithMore(_ value: Double) -> String {
+        String(format: String(localized: "%@ more"), FuelSavingsFormat.money(value))
+    }
+
+    /// One-line verdict for voice and tests; the capsule itself renders
+    /// `listingVerdict()`'s lines separately.
+    func listingCapsuleHeadline() -> String {
+        listingVerdict().spokenText
+    }
 }
 
 /// One station's journey distance, plus how it was obtained.
@@ -262,6 +364,42 @@ struct FuelSavingsRankedStation: Equatable {
     let pricePencePerLitre: Double
 }
 
+/// The user-facing copy shown by the Stations tab's Key sheet. Keeping the
+/// descriptions in one Foundation-only model lets tests pin the exact meaning of
+/// each visual indicator without coupling the wording to SwiftUI layout.
+enum KeySheetContent {
+    struct Item: Equatable {
+        let label: String
+        let description: String
+    }
+
+    static let priceRatings = [
+        Item(label: "Good price", description: "Within 1.5p/L of the cheapest."),
+        Item(label: "Okay", description: "More than 1.5p/L, up to 4p/L above the cheapest."),
+        Item(label: "Pricey", description: "More than 4p/L above the cheapest.")
+    ]
+
+    static let savings = [
+        Item(label: "Saves", description: "You’ll save money compared with your closest station, including travel costs."),
+        Item(label: "Break even", description: "The saving or extra cost is negligible."),
+        Item(label: "Costs more", description: "Filling up here costs more than at your closest station, including travel.")
+    ]
+
+    static let stationLabels = [
+        Item(label: "BEST VALUE", description: "Meets your minimum saving after travel costs."),
+        Item(label: "CHEAPEST", description: "The lowest fuel price per litre within your selected range."),
+        Item(label: "CLOSEST", description: "The nearest station by journey distance."),
+        Item(label: "TOP", description: "The cheapest station in your Favourites for the selected fuel.")
+    ]
+
+    static let favourite = Item(
+        label: "Favourites",
+        description: "Star a station to save it to your Favourites."
+    )
+
+    static let helpTitle = "How does Best Value work?"
+}
+
 /// Which recommendation badge a station listing row shows, if any.
 ///
 /// Presentation only — no new rules: the BEST VALUE qualification reuses the

Shared/FuelStore.swift

@@ -236,7 +236,7 @@ enum PriceDisplayStyle: String, Codable, CaseIterable, Identifiable {
 
     var displayName: String {
         switch self {
-        case .stationSign: return "Station sign"
+        case .stationSign: return "Pence per litre"
         case .poundsPence: return "Pounds & pence"
         }
     }
@@ -255,8 +255,8 @@ enum StationTapAction: String, Codable, CaseIterable, Identifiable {
 
     var displayName: String {
         switch self {
-        case .openMap: return "Open map"
+        case .openMap: return "Directions"
-        case .showDetails: return "More info"
+        case .showDetails: return "Station details"
         }
     }
 }
@@ -701,11 +701,13 @@ struct FuelStore {
     }
 
     static func loadAlertsMode() -> AlertMode {
-        if let raw = loadString(service: alertsModeKey), let mode = AlertMode(rawValue: raw) {
+        guard let raw = loadString(service: alertsModeKey),
-            return mode
+              let mode = AlertMode(rawValue: raw),
-        }
+              mode == .cheapest else {
             return .cheapest
         }
+        return mode
+    }
 
     static func saveAlertsMode(_ mode: AlertMode) {
         saveString(mode.rawValue, service: alertsModeKey)
@@ -850,6 +852,26 @@ struct FuelStore {
         saveString(settings.preferredAmount.unit.rawValue, service: fuelSavingsUnitKey)
     }
 
+    /// One field of the Fuel Savings settings. A control that edits a single
+    /// value saves just that field, so moving the MPG slider rewrites the MPG key
+    /// instead of all four — four UserDefaults writes and four keychain round
+    /// trips per gesture is what made those sliders stutter.
+    enum FuelSavingsField {
+        case enabled
+        case mpg
+        case amount
+        case unit
+    }
+
+    static func saveFuelSavingsField(_ field: FuelSavingsField, from settings: FuelSavingsSettings) {
+        switch field {
+        case .enabled: saveString(settings.enabled ? "1" : "0", service: fuelSavingsEnabledKey)
+        case .mpg: saveString(String(settings.mpg), service: fuelSavingsMPGKey)
+        case .amount: saveString(String(settings.preferredAmount.value), service: fuelSavingsAmountKey)
+        case .unit: saveString(settings.preferredAmount.unit.rawValue, service: fuelSavingsUnitKey)
+        }
+    }
+
     /// Superscript digit glyphs for the pounds & pence format's small raised
     /// third digit (the forecourt style: "£1.29⁹").
     private static let superscriptDigits: [Character] = ["⁰", "¹", "²", "³", "⁴", "⁵", "⁶", "⁷", "⁸", "⁹"]
@@ -1719,11 +1741,18 @@ struct FuelStore {
     }
 
     private static func writeKeychain(data: Data, service: String) {
-        let deleteQuery: [String: Any] = [
+        // Update in place when the item already exists. Delete-then-add cost two
+        // round trips to securityd and briefly left the key holding no value at
+        // all, which is half of why a setting could disagree between launches.
+        let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: service,
         ]
-        SecItemDelete(deleteQuery as CFDictionary)
+        let status = SecItemUpdate(query as CFDictionary,
+                                   [kSecValueData as String: data] as CFDictionary)
+        guard status == errSecItemNotFound else { return }
+        // Nothing stored under this service yet — the first write after the app
+        // was deleted, or a key added since. Add it.
         let addQuery: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: service,
@@ -1806,9 +1835,24 @@ func label(unit: DistanceUnit) -> String {
 /// Row/sheet label that keeps the one-way station distance primary, then
 /// adds the independently measured or estimated out-and-back distance.
 func labelWithReturn(unit: DistanceUnit) -> String {
-    let returnText = unit.format(returnKM)
+    "\(label(unit: unit)) (\(returnLabel(unit: unit)))"
-    let returnLabel = returnIsApproximate ? "Approx. \(returnText)" : returnText
+}
-    return "\(label(unit: unit)) (\(returnLabel) return)"
+
+/// The out-and-back figure on its own: "5.0 mi return" / "Approx. 5.0 mi return".
+///
+/// Split out of `labelWithReturn` for surfaces that print the one-way and the
+/// return figure on SEPARATE lines (the More info sheet's distance column). Both
+/// figures still come from this one type, so a routed value can never be marked
+/// "Approx." while its return figure is not — or the other way round.
+func returnLabel(unit: DistanceUnit) -> String {
+    let text = unit.format(returnKM)
+    return returnIsApproximate ? "Approx. \(text) return" : "\(text) return"
+}
+
+/// VoiceOver form of `returnLabel(unit:)`.
+func spokenReturnLabel(unit: DistanceUnit) -> String {
+    let text = unit.spoken(returnKM)
+    return returnIsApproximate ? "Approximately \(text) return" : "\(text) return"
 }
 
 /// VoiceOver form of `label(unit:)`.